From 687842a9496a0bcd7e5cdce5a73f9ec323e6f296 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 22 Aug 2009 02:30:28 +0000 Subject: [PATCH] Code cleanup --- src/GUI.cpp | 2 +- src/rss_imp.cpp | 4 +-- src/rss_imp.h | 66 ++++++++++++++++++++++++------------------------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/GUI.cpp b/src/GUI.cpp index 917a2c62a..451c5fdf6 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -911,7 +911,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis inDownloadList = false; break; case 3: //RSSImp - rssWidget->on_delStream_button_clicked(); + rssWidget->deleteSelectedFeeds(); return; default: return; diff --git a/src/rss_imp.cpp b/src/rss_imp.cpp index fdda79856..23764d4c5 100644 --- a/src/rss_imp.cpp +++ b/src/rss_imp.cpp @@ -116,7 +116,7 @@ void RSSImp::on_newFeedButton_clicked() { } // delete a stream by a button -void RSSImp::on_delStream_button_clicked() { +void RSSImp::deleteSelectedFeeds() { QList selectedItems = listStreams->selectedItems(); QTreeWidgetItem *item; if(!selectedItems.size()) return; @@ -367,7 +367,7 @@ RSSImp::RSSImp(bittorrent *BTSession) : QWidget(), BTSession(BTSession){ connect(listNews, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayItemsListMenu(const QPoint&))); // Feeds list actions - connect(actionDelete_feed, SIGNAL(triggered()), this, SLOT(on_delStream_button_clicked())); + connect(actionDelete_feed, SIGNAL(triggered()), this, SLOT(deleteSelectedFeeds())); connect(actionRename_feed, SIGNAL(triggered()), this, SLOT(renameStream())); connect(actionUpdate_feed, SIGNAL(triggered()), this, SLOT(refreshSelectedStreams())); connect(actionNew_subscription, SIGNAL(triggered()), this, SLOT(on_newFeedButton_clicked())); diff --git a/src/rss_imp.h b/src/rss_imp.h index f8177663e..6007a88c4 100644 --- a/src/rss_imp.h +++ b/src/rss_imp.h @@ -41,42 +41,42 @@ class bittorrent; class RSSImp : public QWidget, public Ui::RSS{ Q_OBJECT - private: - RssManager *rssmanager; - QTimer *refreshTimeTimer; - QString selectedFeedUrl; - bittorrent *BTSession; +private: + RssManager *rssmanager; + QTimer *refreshTimeTimer; + QString selectedFeedUrl; + bittorrent *BTSession; - public slots: - void on_delStream_button_clicked(); +public slots: + void deleteSelectedFeeds(); - protected slots: - void on_newFeedButton_clicked(); - void on_updateAllButton_clicked(); - void on_markReadButton_clicked(); - void displayRSSListMenu(const QPoint&); - void displayItemsListMenu(const QPoint&); - void renameStream(); - void refreshSelectedStreams(); - void copySelectedFeedsURL(); - void refreshNewsList(QTreeWidgetItem* item); - void refreshTextBrowser(QListWidgetItem *); - void updateLastRefreshedTimeForStreams(); - void updateFeedIcon(QString url, QString icon_path); - void updateFeedInfos(QString url, QString aliasOrUrl, unsigned int nbUnread); - void openNewsUrl(); - void downloadTorrent(); - void fillFeedsList(); - void selectFirstFeed(); - void updateFeedNbNews(QString url); - void saveSlidersPosition(); - void restoreSlidersPosition(); - void showFeedDownloader(); +protected slots: + void on_newFeedButton_clicked(); + void on_updateAllButton_clicked(); + void on_markReadButton_clicked(); + void displayRSSListMenu(const QPoint&); + void displayItemsListMenu(const QPoint&); + void renameStream(); + void refreshSelectedStreams(); + void copySelectedFeedsURL(); + void refreshNewsList(QTreeWidgetItem* item); + void refreshTextBrowser(QListWidgetItem *); + void updateLastRefreshedTimeForStreams(); + void updateFeedIcon(QString url, QString icon_path); + void updateFeedInfos(QString url, QString aliasOrUrl, unsigned int nbUnread); + void openNewsUrl(); + void downloadTorrent(); + void fillFeedsList(); + void selectFirstFeed(); + void updateFeedNbNews(QString url); + void saveSlidersPosition(); + void restoreSlidersPosition(); + void showFeedDownloader(); - public: - RSSImp(bittorrent *BTSession); - ~RSSImp(); - QTreeWidgetItem* getTreeItemFromUrl(QString url) const; +public: + RSSImp(bittorrent *BTSession); + ~RSSImp(); + QTreeWidgetItem* getTreeItemFromUrl(QString url) const; }; #endif