From ce77ebdfe159acdf47e458fe1af091fa84de35ef Mon Sep 17 00:00:00 2001 From: thalieht Date: Thu, 9 Mar 2017 18:25:41 +0200 Subject: [PATCH] Coding style of whole trackerlist.h and a little in trackerlist.cpp --- src/gui/properties/trackerlist.cpp | 54 +++++++++++--------- src/gui/properties/trackerlist.h | 79 +++++++++++++++++------------- 2 files changed, 75 insertions(+), 58 deletions(-) diff --git a/src/gui/properties/trackerlist.cpp b/src/gui/properties/trackerlist.cpp index 716be9c52..350f73ddd 100644 --- a/src/gui/properties/trackerlist.cpp +++ b/src/gui/properties/trackerlist.cpp @@ -30,31 +30,34 @@ #include "trackerlist.h" -#include -#include -#include -#include -#include #include +#include #include #include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include "base/bittorrent/peerinfo.h" #include "base/bittorrent/session.h" #include "base/bittorrent/torrenthandle.h" -#include "base/bittorrent/peerinfo.h" #include "base/bittorrent/trackerentry.h" #include "base/preferences.h" #include "base/utils/misc.h" +#include "autoexpandabledialog.h" +#include "guiiconprovider.h" #include "propertieswidget.h" #include "trackersadditiondlg.h" -#include "guiiconprovider.h" -#include "autoexpandabledialog.h" -TrackerList::TrackerList(PropertiesWidget *properties): QTreeWidget(), properties(properties) { +TrackerList::TrackerList(PropertiesWidget *properties) + : QTreeWidget() + , properties(properties) +{ // Graphical settings setRootIsDecorated(false); setAllColumnsShowFocus(true); @@ -98,11 +101,12 @@ TrackerList::TrackerList(PropertiesWidget *properties): QTreeWidget(), propertie loadSettings(); } -TrackerList::~TrackerList() { - delete editHotkey; - delete deleteHotkey; - delete copyHotkey; - saveSettings(); +TrackerList::~TrackerList() +{ + delete editHotkey; + delete deleteHotkey; + delete copyHotkey; + saveSettings(); } QList TrackerList::getSelectedTrackerItems() const { @@ -524,13 +528,15 @@ void TrackerList::showTrackerListMenu(QPoint) { } } -void TrackerList::loadSettings() { - if (!header()->restoreState(Preferences::instance()->getPropTrackerListState())) { - setColumnWidth(0, 30); - setColumnWidth(1, 300); - } +void TrackerList::loadSettings() +{ + if (!header()->restoreState(Preferences::instance()->getPropTrackerListState())) { + setColumnWidth(0, 30); + setColumnWidth(1, 300); + } } -void TrackerList::saveSettings() const { - Preferences::instance()->setPropTrackerListState(header()->saveState()); +void TrackerList::saveSettings() const +{ + Preferences::instance()->setPropTrackerListState(header()->saveState()); } diff --git a/src/gui/properties/trackerlist.h b/src/gui/properties/trackerlist.h index dc964c71f..0d7521b9e 100644 --- a/src/gui/properties/trackerlist.h +++ b/src/gui/properties/trackerlist.h @@ -31,14 +31,13 @@ #ifndef TRACKERLIST_H #define TRACKERLIST_H +#include +#include #include #include -#include -#include #include "propertieswidget.h" -enum TrackerListColumn {COL_TIER, COL_URL, COL_STATUS, COL_RECEIVED, COL_SEEDS, COL_PEERS, COL_DOWNLOADED, COL_MSG}; #define NB_STICKY_ITEM 3 namespace BitTorrent @@ -46,45 +45,57 @@ namespace BitTorrent class TorrentHandle; } -class TrackerList: public QTreeWidget { - Q_OBJECT - Q_DISABLE_COPY(TrackerList) - -private: - PropertiesWidget *properties; - QHash tracker_items; - QTreeWidgetItem* dht_item; - QTreeWidgetItem* pex_item; - QTreeWidgetItem* lsd_item; - QShortcut *editHotkey; - QShortcut *deleteHotkey; - QShortcut *copyHotkey; +class TrackerList: public QTreeWidget +{ + Q_OBJECT + Q_DISABLE_COPY(TrackerList) public: - TrackerList(PropertiesWidget *properties); - ~TrackerList(); + enum TrackerListColumn + { + COL_TIER, + COL_URL, + COL_STATUS, + COL_RECEIVED, + COL_SEEDS, + COL_PEERS, + COL_DOWNLOADED, + COL_MSG + }; -protected: - QList getSelectedTrackerItems() const; + TrackerList(PropertiesWidget *properties); + ~TrackerList(); public slots: - void setRowColor(int row, QColor color); + void setRowColor(int row, QColor color); - void moveSelectionUp(); - void moveSelectionDown(); + void moveSelectionUp(); + void moveSelectionDown(); - void clear(); - void loadStickyItems(BitTorrent::TorrentHandle *const torrent); - void loadTrackers(); - void askForTrackers(); - void copyTrackerUrl(); - void reannounceSelected(); - void deleteSelectedTrackers(); - void editSelectedTracker(); - void showTrackerListMenu(QPoint); - void loadSettings(); - void saveSettings() const; + void clear(); + void loadStickyItems(BitTorrent::TorrentHandle *const torrent); + void loadTrackers(); + void askForTrackers(); + void copyTrackerUrl(); + void reannounceSelected(); + void deleteSelectedTrackers(); + void editSelectedTracker(); + void showTrackerListMenu(QPoint); + void loadSettings(); + void saveSettings() const; +protected: + QList getSelectedTrackerItems() const; + +private: + PropertiesWidget *properties; + QHash tracker_items; + QTreeWidgetItem *dht_item; + QTreeWidgetItem *pex_item; + QTreeWidgetItem *lsd_item; + QShortcut *editHotkey; + QShortcut *deleteHotkey; + QShortcut *copyHotkey; }; #endif // TRACKERLIST_H