From 7a873c3b534adb897fe7a4e7a81f7439fedc87ca Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 12 Oct 2023 20:18:21 +0200 Subject: [PATCH 1/3] fixed compilation on ubuntu 18.04 --- .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp index ea27be6f9..2e292444e 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp @@ -514,13 +514,13 @@ void GxsChannelPostsWidgetWithModel::keyPressEvent(QKeyEvent *e) if(e->key() == Qt::Key_Left && index.column()==0) { - ui->postsTree->setCurrentIndex(index.siblingAtColumn(n)); + ui->postsTree->setCurrentIndex(index.sibling(index.row(),n)); e->accept(); return; } if(e->key() == Qt::Key_Right && index.column()==n) { - ui->postsTree->setCurrentIndex(index.siblingAtColumn(0)); + ui->postsTree->setCurrentIndex(index.sibling(index.row(),0)); e->accept(); return; } From d83709d51997760d237d8c0c426f5b599763b34b Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 12 Oct 2023 20:18:36 +0200 Subject: [PATCH 2/3] fixed implicit type warning --- retroshare-gui/src/gui/msgs/MessageComposer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h index 0df2dbd8e..040681095 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.h +++ b/retroshare-gui/src/gui/msgs/MessageComposer.h @@ -255,7 +255,7 @@ private: QList tagLabels; // needed to send system flags with reply - unsigned msgFlags; + unsigned int msgFlags; RSTreeWidgetItemCompareRole *m_compareRole; QCompleter *m_completer; From d8bca5c56db4f58b8afe486fde87fde97bef1102 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 12 Oct 2023 20:18:53 +0200 Subject: [PATCH 3/3] removed some debug output --- retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp index 517543b9a..4de6e8675 100644 --- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp +++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp @@ -42,6 +42,8 @@ #include +//#define DEBUG_COMMENT_TREE_WIDGET + #define PCITEM_COLUMN_COMMENT 0 #define PCITEM_COLUMN_AUTHOR 1 #define PCITEM_COLUMN_DATE 2 @@ -765,8 +767,10 @@ void GxsCommentTreeWidget::insertComments(const std::vector& comme new_comments.push_back(comment.mMeta.mMsgId); /* convert to a QTreeWidgetItem */ +#ifdef DEBUG_COMMENT_TREE_WIDGET std::cerr << "GxsCommentTreeWidget::service_loadThread() Got Comment: " << comment.mMeta.mMsgId; std::cerr << std::endl; +#endif GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_AVATAR) ; QString text;