From 126a1d40121c39d967ac7dc6bb817f82f55df408 Mon Sep 17 00:00:00 2001 From: drbob Date: Mon, 5 Jul 2010 19:41:46 +0000 Subject: [PATCH] Switched parent from MainPage to RsAutoUpdatePage ... in an attempt to fix GPG password freeze. don't think it worked! git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3259 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/ForumsDialog.cpp | 8 ++------ retroshare-gui/src/gui/ForumsDialog.h | 8 +++++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index b45a7bd28..e13c132a8 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -102,7 +102,7 @@ static int FilterColumnToComboBox(int nIndex) /** Constructor */ ForumsDialog::ForumsDialog(QWidget *parent) -: MainPage(parent) +: RsAutoUpdatePage(1000,parent) { /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); @@ -130,10 +130,6 @@ ForumsDialog::ForumsDialog(QWidget *parent) connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged())); connect(ui.filterColumnComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterColumnChanged())); - QTimer *timer = new QTimer(this); - timer->connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); - timer->start(1000); - /* Set header resize modes and initial section sizes */ QHeaderView * ftheader = ui.forumTreeWidget->header () ; ftheader->setResizeMode (0, QHeaderView::Interactive); @@ -377,7 +373,7 @@ void ForumsDialog::togglethreadview_internal() } } -void ForumsDialog::checkUpdate() +void ForumsDialog::updateDisplay() { std::list forumIds; std::list::iterator it; diff --git a/retroshare-gui/src/gui/ForumsDialog.h b/retroshare-gui/src/gui/ForumsDialog.h index 6e77cdc05..246fc1fba 100644 --- a/retroshare-gui/src/gui/ForumsDialog.h +++ b/retroshare-gui/src/gui/ForumsDialog.h @@ -23,9 +23,10 @@ #define _FORUMSDIALOG_H #include "mainpage.h" +#include "RsAutoUpdatePage.h" #include "ui_ForumsDialog.h" -class ForumsDialog : public MainPage +class ForumsDialog : public RsAutoUpdatePage { Q_OBJECT @@ -37,7 +38,9 @@ public: void insertPost(); void loadForumEmoticons(); - + + /* overloaded from RsAuthUpdatePage */ + virtual void updateDisplay(); private slots: @@ -49,7 +52,6 @@ private slots: void newforum(); - void checkUpdate(); void changedForum( QTreeWidgetItem *curr, QTreeWidgetItem *prev ); void changedThread();