Changeset 14377

Timestamp:

Dec 12, 2014, 11:05:10 PM (8 years ago)

Author:

mikedld

Message:

Strip spaces around :: in C++ code (Qt client)

Location:

trunk/qt

Files:

• about.cc (modified) (2 diffs)
• add-data.cc (modified) (3 diffs)
• app.cc (modified) (12 diffs)
• dbus-adaptor.cc (modified) (3 diffs)
• details.cc (modified) (38 diffs)
• favicon.cc (modified) (9 diffs)
• file-tree.cc (modified) (51 diffs)
• filterbar.cc (modified) (21 diffs)
• filters.cc (modified) (2 diffs)
• formatter.cc (modified) (11 diffs)
• freespace-label.cc (modified) (4 diffs)
• hig.cc (modified) (22 diffs)
• license.cc (modified) (1 diff)
• mainwin.cc (modified) (52 diffs)
• make-dialog.cc (modified) (23 diffs)
• options.cc (modified) (24 diffs)
• prefs-dialog.cc (modified) (49 diffs)
• prefs.cc (modified) (10 diffs)
• relocate.cc (modified) (5 diffs)
• session-dialog.cc (modified) (4 diffs)
• session.cc (modified) (56 diffs)
• squeezelabel.cc (modified) (3 diffs)
• stats-dialog.cc (modified) (4 diffs)
• torrent-delegate-min.cc (modified) (2 diffs)
• torrent-delegate.cc (modified) (12 diffs)
• torrent-filter.cc (modified) (12 diffs)
• torrent-model.cc (modified) (14 diffs)
• torrent.cc (modified) (42 diffs)
• tracker-delegate.cc (modified) (8 diffs)
• tracker-model-filter.cc (modified) (3 diffs)
• tracker-model.cc (modified) (4 diffs)
• triconpushbutton.cc (modified) (3 diffs)
• utils.cc (modified) (6 diffs)
• watchdir.cc (modified) (7 diffs)

trunk/qt/about.cc

@@ -28 +28 @@
 #include "license.h"
 
-AboutDialog :: AboutDialog (QWidget * parent):
+AboutDialog::AboutDialog (QWidget * parent):
   QDialog (parent, Qt::Dialog),
   myLicenseDialog (new LicenseDialog (this))
@@ -84 +84 @@
 
 void
-AboutDialog :: showCredits ()
+AboutDialog::showCredits ()
 {
   QMessageBox::about (

trunk/qt/add-data.cc

@@ -18 +18 @@
 
 int
-AddData :: set (const QString& key)
+AddData::set (const QString& key)
 {
   if (Utils::isMagnetLink (key))
@@ -65 +65 @@
 
 QByteArray
-AddData :: toBase64 () const
+AddData::toBase64 () const
 {
   QByteArray ret;
@@ -81 +81 @@
 
 QString
-AddData :: readableName () const
+AddData::readableName () const
 {
   QString ret;

trunk/qt/app.cc

@@ -83 +83 @@
 }
 
-MyApp :: MyApp (int& argc, char ** argv):
+MyApp::MyApp (int& argc, char ** argv):
   QApplication (argc, argv),
   myPrefs(nullptr),
@@ -309 +309 @@
 
 void
-MyApp :: onTorrentsAdded (QSet<int> torrents)
+MyApp::onTorrentsAdded (QSet<int> torrents)
 {
   if (!myPrefs->getBool (Prefs::SHOW_NOTIFICATION_ON_ADD))
@@ -333 +333 @@
 
 void
-MyApp :: onTorrentCompleted (int id)
+MyApp::onTorrentCompleted (int id)
 {
   Torrent * tor = myModel->getTorrentFromId (id);
@@ -356 +356 @@
 
 void
-MyApp :: onNewTorrentChanged (int id)
+MyApp::onNewTorrentChanged (int id)
 {
   Torrent * tor = myModel->getTorrentFromId (id);
@@ -378 +378 @@
 
 void
-MyApp :: consentGiven ()
+MyApp::consentGiven ()
 {
   myPrefs->set<bool> (Prefs::USER_HAS_GIVEN_INFORMED_CONSENT, true);
 }
 
-MyApp :: ~MyApp ()
+MyApp::~MyApp ()
 {
   if (myPrefs != nullptr && myWindow != nullptr)
     {
       const QRect mainwinRect (myWindow->geometry ());
-      myPrefs->set (Prefs :: MAIN_WINDOW_HEIGHT, std::max (100, mainwinRect.height ()));
-      myPrefs->set (Prefs :: MAIN_WINDOW_WIDTH, std::max (100, mainwinRect.width ()));
-      myPrefs->set (Prefs :: MAIN_WINDOW_X, mainwinRect.x ());
-      myPrefs->set (Prefs :: MAIN_WINDOW_Y, mainwinRect.y ());
+      myPrefs->set (Prefs::MAIN_WINDOW_HEIGHT, std::max (100, mainwinRect.height ()));
+      myPrefs->set (Prefs::MAIN_WINDOW_WIDTH, std::max (100, mainwinRect.width ()));
+      myPrefs->set (Prefs::MAIN_WINDOW_X, mainwinRect.x ());
+      myPrefs->set (Prefs::MAIN_WINDOW_Y, mainwinRect.y ());
     }
 
@@ -406 +406 @@
 
 void
-MyApp :: refreshPref (int key)
+MyApp::refreshPref (int key)
 {
   switch (key)
     {
-      case Prefs :: BLOCKLIST_UPDATES_ENABLED:
+      case Prefs::BLOCKLIST_UPDATES_ENABLED:
         maybeUpdateBlocklist ();
         break;
 
-      case Prefs :: DIR_WATCH:
-      case Prefs :: DIR_WATCH_ENABLED:
+      case Prefs::DIR_WATCH:
+      case Prefs::DIR_WATCH_ENABLED:
         {
           const QString path (myPrefs->getString (Prefs::DIR_WATCH));
@@ -429 +429 @@
 
 void
-MyApp :: maybeUpdateBlocklist ()
-{
-  if (!myPrefs->getBool (Prefs :: BLOCKLIST_UPDATES_ENABLED))
+MyApp::maybeUpdateBlocklist ()
+{
+  if (!myPrefs->getBool (Prefs::BLOCKLIST_UPDATES_ENABLED))
     return;
 
-  const QDateTime lastUpdatedAt = myPrefs->getDateTime (Prefs :: BLOCKLIST_DATE);
+  const QDateTime lastUpdatedAt = myPrefs->getDateTime (Prefs::BLOCKLIST_DATE);
   const QDateTime nextUpdateAt = lastUpdatedAt.addDays (7);
   const QDateTime now = QDateTime::currentDateTime ();
@@ -441 +441 @@
     {
       mySession->updateBlocklist ();
-      myPrefs->set (Prefs :: BLOCKLIST_DATE, now);
-    }
-}
-
-void
-MyApp :: onSessionSourceChanged ()
+      myPrefs->set (Prefs::BLOCKLIST_DATE, now);
+    }
+}
+
+void
+MyApp::onSessionSourceChanged ()
 {
   mySession->initTorrents ();
@@ -454 +454 @@
 
 void
-MyApp :: refreshTorrents ()
+MyApp::refreshTorrents ()
 {
   // usually we just poll the torrents that have shown recent activity,
@@ -476 +476 @@
 
 void
-MyApp :: addTorrent (const QString& key)
+MyApp::addTorrent (const QString& key)
 {
   const AddData addme (key);
@@ -485 +485 @@
 
 void
-MyApp :: addTorrent (const AddData& addme)
-{
-  if (!myPrefs->getBool (Prefs :: OPTIONS_PROMPT))
+MyApp::addTorrent (const AddData& addme)
+{
+  if (!myPrefs->getBool (Prefs::OPTIONS_PROMPT))
     {
       mySession->addTorrent (addme);
@@ -505 +505 @@
 
 void
-MyApp :: raise ()
-{
-  QApplication :: alert (myWindow);
+MyApp::raise ()
+{
+  QApplication::alert (myWindow);
 }
 
 bool
-MyApp :: notifyApp (const QString& title, const QString& body) const
+MyApp::notifyApp (const QString& title, const QString& body) const
 {
   const QString dbusServiceName   = QString::fromUtf8 ("org.freedesktop.Notifications");

trunk/qt/dbus-adaptor.cc

@@ -12 +12 @@
 #include "dbus-adaptor.h"
 
-TrDBusAdaptor :: TrDBusAdaptor (MyApp* app):
+TrDBusAdaptor::TrDBusAdaptor (MyApp* app):
   QDBusAbstractAdaptor (app),
   myApp (app)
@@ -19 +19 @@
 
 bool
-TrDBusAdaptor :: PresentWindow ()
+TrDBusAdaptor::PresentWindow ()
 {
   myApp->raise ();
@@ -26 +26 @@
 
 bool
-TrDBusAdaptor :: AddMetainfo (const QString& key)
+TrDBusAdaptor::AddMetainfo (const QString& key)
 {
   AddData addme (key);

trunk/qt/details.cc

@@ -138 +138 @@
 
 QIcon
-Details :: getStockIcon (const QString& freedesktop_name, int fallback)
+Details::getStockIcon (const QString& freedesktop_name, int fallback)
 {
   QIcon icon = QIcon::fromTheme (freedesktop_name);
@@ -148 +148 @@
 }
 
-Details :: Details (Session       & session,
-                    Prefs         & prefs,
-                    TorrentModel  & model,
-                    QWidget       * parent):
+Details::Details (Session       & session,
+                  Prefs         & prefs,
+                  TorrentModel  & model,
+                  QWidget       * parent):
   QDialog (parent, Qt::Dialog),
   mySession (session),
@@ -183 +183 @@
 
   QList<int> initKeys;
-  initKeys << Prefs :: SHOW_TRACKER_SCRAPES
-           << Prefs :: SHOW_BACKUP_TRACKERS;
+  initKeys << Prefs::SHOW_TRACKER_SCRAPES
+           << Prefs::SHOW_BACKUP_TRACKERS;
   foreach (int key, initKeys)
     refreshPref (key);
@@ -196 +196 @@
 }
 
-Details :: ~Details ()
+Details::~Details ()
 {
   myTrackerDelegate->deleteLater ();
@@ -204 +204 @@
 
 void
-Details :: setIds (const QSet<int>& ids)
+Details::setIds (const QSet<int>& ids)
 {
   if (ids == myIds)
@@ -238 +238 @@
 
 void
-Details :: refreshPref (int key)
+Details::refreshPref (int key)
 {
   QString str;
@@ -244 +244 @@
   switch (key)
     {
-      case Prefs :: SHOW_TRACKER_SCRAPES:
+      case Prefs::SHOW_TRACKER_SCRAPES:
         {
           QItemSelectionModel * selectionModel (myTrackerView->selectionModel ());
@@ -257 +257 @@
         }
 
-      case Prefs :: SHOW_BACKUP_TRACKERS:
+      case Prefs::SHOW_BACKUP_TRACKERS:
         myTrackerFilter->setShowBackupTrackers (myPrefs.getBool (key));
         break;
@@ -272 +272 @@
 
 QString
-Details :: timeToStringRounded (int seconds)
+Details::timeToStringRounded (int seconds)
 {
   if (seconds > 60)
@@ -281 +281 @@
 
 void
-Details :: onTimer ()
+Details::onTimer ()
 {
   getNewData ();
@@ -287 +287 @@
 
 void
-Details :: getNewData ()
+Details::getNewData ()
 {
   if (!myIds.empty ())
@@ -306 +306 @@
 
 void
-Details :: onTorrentChanged ()
+Details::onTorrentChanged ()
 {
   if (!myHavePendingRefresh)
@@ -349 +349 @@
 
 void
-Details :: refresh ()
+Details::refresh ()
 {
   const int n = myIds.size ();
@@ -924 +924 @@
 
 void
-Details :: enableWhenChecked (QCheckBox * box, QWidget * w)
+Details::enableWhenChecked (QCheckBox * box, QWidget * w)
 {
   connect (box, SIGNAL (toggled (bool)), w, SLOT (setEnabled (bool)));
@@ -936 +936 @@
 
 QWidget *
-Details :: createInfoTab ()
+Details::createInfoTab ()
 {
   HIG * hig = new HIG (this);
@@ -974 +974 @@
 
 void
-Details :: onShowTrackerScrapesToggled (bool val)
+Details::onShowTrackerScrapesToggled (bool val)
 {
   myPrefs.set (Prefs::SHOW_TRACKER_SCRAPES, val);
@@ -980 +980 @@
 
 void
-Details :: onShowBackupTrackersToggled (bool val)
+Details::onShowBackupTrackersToggled (bool val)
 {
   myPrefs.set (Prefs::SHOW_BACKUP_TRACKERS, val);
@@ -986 +986 @@
 
 void
-Details :: onHonorsSessionLimitsToggled (bool val)
+Details::onHonorsSessionLimitsToggled (bool val)
 {
   mySession.torrentSet (myIds, TR_KEY_honorsSessionLimits, val);
@@ -992 +992 @@
 }
 void
-Details :: onDownloadLimitedToggled (bool val)
+Details::onDownloadLimitedToggled (bool val)
 {
   mySession.torrentSet (myIds, TR_KEY_downloadLimited, val);
@@ -998 +998 @@
 }
 void
-Details :: onSpinBoxEditingFinished ()
+Details::onSpinBoxEditingFinished ()
 {
   const QObject * spin = sender ();
@@ -1011 +1011 @@
 
 void
-Details :: onUploadLimitedToggled (bool val)
+Details::onUploadLimitedToggled (bool val)
 {
   mySession.torrentSet (myIds, TR_KEY_uploadLimited, val);
@@ -1018 +1018 @@
 
 void
-Details :: onIdleModeChanged (int index)
+Details::onIdleModeChanged (int index)
 {
   const int val = myIdleCombo->itemData (index).toInt ();
@@ -1026 +1026 @@
 
 void
-Details :: onRatioModeChanged (int index)
+Details::onRatioModeChanged (int index)
 {
   const int val = myRatioCombo->itemData (index).toInt ();
@@ -1033 +1033 @@
 
 void
-Details :: onBandwidthPriorityChanged (int index)
+Details::onBandwidthPriorityChanged (int index)
 {
   if (index != -1)
@@ -1044 +1044 @@
 
 void
-Details :: onTrackerSelectionChanged ()
+Details::onTrackerSelectionChanged ()
 {
   const int selectionCount = myTrackerView->selectionModel ()->selectedRows ().size ();
@@ -1052 +1052 @@
 
 void
-Details :: onAddTrackerClicked ()
+Details::onAddTrackerClicked ()
 {
   bool ok = false;
@@ -1090 +1090 @@
 
 void
-Details :: onEditTrackerClicked ()
+Details::onEditTrackerClicked ()
 {
   QItemSelectionModel * selectionModel = myTrackerView->selectionModel ();
@@ -1126 +1126 @@
 
 void
-Details :: onRemoveTrackerClicked ()
+Details::onRemoveTrackerClicked ()
 {
   // make a map of torrentIds to announce URLs to remove
@@ -1151 +1151 @@
 
 QWidget *
-Details :: createOptionsTab ()
+Details::createOptionsTab ()
 {
   QSpinBox * s;
@@ -1204 +1204 @@
 
   h = new QHBoxLayout ();
-  h->setSpacing (HIG :: PAD);
+  h->setSpacing (HIG::PAD);
   m = new QComboBox;
   m->addItem (tr ("Use Global Settings"),      TR_RATIOLIMIT_GLOBAL);
@@ -1219 +1219 @@
 
   h = new QHBoxLayout ();
-  h->setSpacing (HIG :: PAD);
+  h->setSpacing (HIG::PAD);
   m = new QComboBox;
   m->addItem (tr ("Use Global Settings"),                 TR_IDLELIMIT_GLOBAL);
@@ -1256 +1256 @@
 
 QWidget *
-Details :: createTrackerTab ()
+Details::createTrackerTab ()
 {
   QCheckBox * c;
@@ -1339 +1339 @@
 
 QWidget *
-Details :: createPeersTab ()
+Details::createPeersTab ()
 {
   QWidget * top = new QWidget;
   QVBoxLayout * v = new QVBoxLayout (top);
-  v->setSpacing (HIG :: PAD_BIG);
+  v->setSpacing (HIG::PAD_BIG);
   v->setContentsMargins (HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG, HIG::PAD_BIG);
 
@@ -1380 +1380 @@
 
 QWidget *
-Details :: createFilesTab ()
+Details::createFilesTab ()
 {
   myFileTreeView = new FileTreeView ();
@@ -1400 +1400 @@
 
 void
-Details :: onFilePriorityChanged (const QSet<int>& indices, int priority)
+Details::onFilePriorityChanged (const QSet<int>& indices, int priority)
 {
   tr_quark key;
@@ -1424 +1424 @@
 
 void
-Details :: onFileWantedChanged (const QSet<int>& indices, bool wanted)
+Details::onFileWantedChanged (const QSet<int>& indices, bool wanted)
 {
   const tr_quark key = wanted ? TR_KEY_files_wanted : TR_KEY_files_unwanted;
@@ -1432 +1432 @@
 
 void
-Details :: onPathEdited (const QString& oldpath, const QString& newname)
+Details::onPathEdited (const QString& oldpath, const QString& newname)
 {
   mySession.torrentRenamePath (myIds, oldpath, newname);
@@ -1438 +1438 @@
 
 void
-Details :: onOpenRequested (const QString& path)
+Details::onOpenRequested (const QString& path)
 {
   if (!mySession.isLocal ())

trunk/qt/favicon.cc

@@ -25 +25 @@
 ***/
 
-Favicons :: Favicons ()
+Favicons::Favicons ()
 {
   myNAM = new QNetworkAccessManager ();
@@ -31 +31 @@
 }
 
-Favicons :: ~Favicons ()
+Favicons::~Favicons ()
 {
   delete myNAM;
@@ -41 +41 @@
 
 QString
-Favicons :: getCacheDir ()
+Favicons::getCacheDir ()
 {
   const QString base =
@@ -54 +54 @@
 
 void
-Favicons :: ensureCacheDirHasBeenScanned ()
+Favicons::ensureCacheDirHasBeenScanned ()
 {
   static bool hasBeenScanned = false;
@@ -77 +77 @@
 
 QString
-Favicons :: getHost (const QUrl& url)
+Favicons::getHost (const QUrl& url)
 {
   QString host = url.host ();
@@ -90 +90 @@
 
 QPixmap
-Favicons :: find (const QUrl& url)
+Favicons::find (const QUrl& url)
 {
   return findFromHost (getHost (url));
@@ -101 +101 @@
 
 QPixmap
-Favicons :: findFromHost (const QString& host)
+Favicons::findFromHost (const QString& host)
 {
   ensureCacheDirHasBeenScanned ();
@@ -110 +110 @@
 
 void
-Favicons :: add (const QUrl& url)
+Favicons::add (const QUrl& url)
 {
   ensureCacheDirHasBeenScanned ();
@@ -133 +133 @@
 
 void
-Favicons :: onRequestFinished (QNetworkReply * reply)
+Favicons::onRequestFinished (QNetworkReply * reply)
 {
   const QString host = reply->url().host();

trunk/qt/file-tree.cc

@@ -45 +45 @@
 
 const QHash<QString,int>&
-FileTreeItem :: getMyChildRows ()
+FileTreeItem::getMyChildRows ()
 {
   const size_t n = childCount();
@@ -61 +61 @@
 
 
-FileTreeItem :: ~FileTreeItem ()
+FileTreeItem::~FileTreeItem ()
 {
   assert(myChildren.isEmpty());
@@ -76 +76 @@
 
 void
-FileTreeItem :: appendChild (FileTreeItem * child)
+FileTreeItem::appendChild (FileTreeItem * child)
 {
   const size_t n = childCount();
@@ -85 +85 @@
 
 FileTreeItem *
-FileTreeItem :: child (const QString& filename)
+FileTreeItem::child (const QString& filename)
 {
   FileTreeItem * item(0);
@@ -100 +100 @@
 
 int
-FileTreeItem :: row () const
+FileTreeItem::row () const
 {
   int i(-1);
@@ -114 +114 @@
 
 QVariant
-FileTreeItem :: data (int column, int role) const
+FileTreeItem::data (int column, int role) const
 {
   QVariant value;
@@ -168 +168 @@
 
 void
-FileTreeItem :: getSubtreeWantedSize (uint64_t& have, uint64_t& total) const
+FileTreeItem::getSubtreeWantedSize (uint64_t& have, uint64_t& total) const
 {
   if (myIsWanted)
@@ -181 +181 @@
 
 double
-FileTreeItem :: progress () const
+FileTreeItem::progress () const
 {
   double d(0);
@@ -194 +194 @@
 
 QString
-FileTreeItem :: sizeString () const
+FileTreeItem::sizeString () const
 {
   QString str; 
@@ -214 +214 @@
 
 std::pair<int,int>
-FileTreeItem :: update (const QString& name,
-                        bool           wanted,
-                        int            priority,
-                        uint64_t       haveSize,
-                        bool           updateFields)
+FileTreeItem::update (const QString& name,
+                      bool           wanted,
+                      int            priority,
+                      uint64_t       haveSize,
+                      bool           updateFields)
 {
   int changed_count = 0;
@@ -267 +267 @@
 
 QString
-FileTreeItem :: priorityString () const
+FileTreeItem::priorityString () const
 {
   const int i = priority();
@@ -281 +281 @@
 
 int
-FileTreeItem :: priority () const
+FileTreeItem::priority () const
 {
   int i(0);
@@ -310 +310 @@
 
 void
-FileTreeItem :: setSubtreePriority (int i, QSet<int>& ids)
+FileTreeItem::setSubtreePriority (int i, QSet<int>& ids)
 {
   if (myPriority != i)
@@ -325 +325 @@
 
 void
-FileTreeItem :: twiddlePriority (QSet<int>& ids, int& p)
+FileTreeItem::twiddlePriority (QSet<int>& ids, int& p)
 {
   const int old(priority());
@@ -340 +340 @@
 
 int
-FileTreeItem :: isSubtreeWanted () const
+FileTreeItem::isSubtreeWanted () const
 {
   if(myChildren.isEmpty())
@@ -364 +364 @@
 
 void
-FileTreeItem :: setSubtreeWanted (bool b, QSet<int>& ids)
+FileTreeItem::setSubtreeWanted (bool b, QSet<int>& ids)
 {
   if (myIsWanted != b)
@@ -379 +379 @@
 
 void
-FileTreeItem :: twiddleWanted (QSet<int>& ids, bool& wanted)
+FileTreeItem::twiddleWanted (QSet<int>& ids, bool& wanted)
 {
   wanted = isSubtreeWanted() != Qt::Checked;
@@ -386 +386 @@
 
 QString
-FileTreeItem :: path () const
+FileTreeItem::path () const
 {
   QString itemPath;
@@ -404 +404 @@
 
 bool
-FileTreeItem :: isComplete () const
+FileTreeItem::isComplete () const
 {
   return myHaveSize == totalSize ();
@@ -414 +414 @@
 ***/
 
-FileTreeModel :: FileTreeModel (QObject *parent, bool isEditable):
+FileTreeModel::FileTreeModel (QObject * parent, bool isEditable):
   QAbstractItemModel(parent),
   myRootItem (new FileTreeItem),
@@ -422 +422 @@
 }
 
-FileTreeModel :: ~FileTreeModel()
+FileTreeModel::~FileTreeModel()
 {
   clear();
@@ -430 +430 @@
 
 FileTreeItem *
-FileTreeModel :: itemFromIndex (const QModelIndex& index) const
+FileTreeModel::itemFromIndex (const QModelIndex& index) const
 {
   return static_cast<FileTreeItem*>(index.internalPointer()); 
@@ -436 +436 @@
 
 QVariant
-FileTreeModel :: data (const QModelIndex &index, int role) const
+FileTreeModel::data (const QModelIndex &index, int role) const
 {
   QVariant value;
@@ -447 +447 @@
 
 Qt::ItemFlags
-FileTreeModel :: flags (const QModelIndex& index) const
+FileTreeModel::flags (const QModelIndex& index) const
 {
   int i(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
@@ -461 +461 @@
 
 bool
-FileTreeModel :: setData (const QModelIndex& index, const QVariant& newname, int role)
+FileTreeModel::setData (const QModelIndex& index, const QVariant& newname, int role)
 {
   if (role == Qt::EditRole)
@@ -474 +474 @@
 
 QVariant
-FileTreeModel :: headerData (int column, Qt::Orientation orientation, int role) const
+FileTreeModel::headerData (int column, Qt::Orientation orientation, int role) const
 {
   QVariant data;
@@ -511 +511 @@
 
 QModelIndex
-FileTreeModel :: index (int row, int column, const QModelIndex& parent) const
+FileTreeModel::index (int row, int column, const QModelIndex& parent) const
 {
   QModelIndex i;
@@ -534 +534 @@
 
 QModelIndex
-FileTreeModel :: parent (const QModelIndex& child) const
+FileTreeModel::parent (const QModelIndex& child) const
 {
   return parent (child, 0); // QAbstractItemModel::parent() wants col 0
@@ -540 +540 @@
 
 QModelIndex
-FileTreeModel :: parent (const QModelIndex& child, int column) const
+FileTreeModel::parent (const QModelIndex& child, int column) const
 {
   QModelIndex parent;
@@ -551 +551 @@
 
 int
-FileTreeModel :: rowCount (const QModelIndex& parent) const
+FileTreeModel::rowCount (const QModelIndex& parent) const
 {
   FileTreeItem * parentItem;
@@ -564 +564 @@
 
 int
-FileTreeModel :: columnCount (const QModelIndex &parent) const
+FileTreeModel::columnCount (const QModelIndex& parent) const
 {
   Q_UNUSED(parent);
@@ -572 +572 @@
 
 QModelIndex
-FileTreeModel :: indexOf (FileTreeItem * item, int column) const
+FileTreeModel::indexOf (FileTreeItem * item, int column) const
 {
   if (!item || item==myRootItem)
@@ -581 +581 @@
 
 void
-FileTreeModel :: clearSubtree (const QModelIndex& top)
+FileTreeModel::clearSubtree (const QModelIndex& top)
 {
   size_t i = rowCount (top);
@@ -599 +599 @@
 
 void
-FileTreeModel :: clear ()
+FileTreeModel::clear ()
 {
   beginResetModel ();
@@ -609 +609 @@
 
 FileTreeItem *
-FileTreeModel :: findItemForFileIndex (int fileIndex) const
+FileTreeModel::findItemForFileIndex (int fileIndex) const
 {
   return myIndexCache.value (fileIndex, 0);
@@ -615 +615 @@
 
 void
-FileTreeModel :: addFile (int                   fileIndex,
-                          const QString       & filename,
-                          bool                  wanted,
-                          int                   priority,
-                          uint64_t              totalSize,
-                          uint64_t              have,
-                          QList<QModelIndex>  & rowsAdded,
-                          bool                  updateFields)
+FileTreeModel::addFile (int                   fileIndex,
+                        const QString       & filename,
+                        bool                  wanted,
+                        int                   priority,
+                        uint64_t              totalSize,
+                        uint64_t              have,
+                        QList<QModelIndex>  & rowsAdded,
+                        bool                  updateFields)
 {
   bool added = false;
@@ -691 +691 @@
 
 void
-FileTreeModel :: parentsChanged (const QModelIndex& index, int firstColumn, int lastColumn)
+FileTreeModel::parentsChanged (const QModelIndex& index, int firstColumn, int lastColumn)
 {
   assert (firstColumn <= lastColumn);
@@ -708 +708 @@
 
 void
-FileTreeModel :: subtreeChanged (const QModelIndex& index, int firstColumn, int lastColumn)
+FileTreeModel::subtreeChanged (const QModelIndex& index, int firstColumn, int lastColumn)
 {
   assert (firstColumn <= lastColumn);
@@ -725 +725 @@
 
 void
-FileTreeModel :: clicked (const QModelIndex& index)
+FileTreeModel::clicked (const QModelIndex& index)
 {
   const int column (index.column());
@@ -763 +763 @@
 
 void
-FileTreeModel :: doubleClicked (const QModelIndex& index)
+FileTreeModel::doubleClicked (const QModelIndex& index)
 {
   if (!index.isValid())
@@ -783 +783 @@
 
 QSize
-FileTreeDelegate :: sizeHint(const QStyleOptionViewItem& item, const QModelIndex& index) const
+FileTreeDelegate::sizeHint(const QStyleOptionViewItem& item, const QModelIndex& index) const
 {
   QSize size;
@@ -803 +803 @@
 
 void
-FileTreeDelegate :: paint (QPainter                    * painter,
-                           const QStyleOptionViewItem  & option,
-                           const QModelIndex           & index) const
+FileTreeDelegate::paint (QPainter                    * painter,
+                         const QStyleOptionViewItem  & option,
+                         const QModelIndex           & index) const
 {
   const int column(index.column());
@@ -815 +815 @@
     }
 
-  QStyle * style (QApplication :: style());
+  QStyle * style (QApplication::style ());
 
   painter->save();
@@ -864 +864 @@
 ****/
 
-FileTreeView :: FileTreeView (QWidget * parent, bool isEditable):
+FileTreeView::FileTreeView (QWidget * parent, bool isEditable):
   QTreeView (parent),
   myModel (this, isEditable),
@@ -912 +912 @@
 }
 
-FileTreeView :: ~FileTreeView ()
+FileTreeView::~FileTreeView ()
 {
   myProxy->deleteLater();
@@ -918 +918 @@
 
 void
-FileTreeView :: onClicked (const QModelIndex& proxyIndex)
+FileTreeView::onClicked (const QModelIndex& proxyIndex)
 {
   const QModelIndex modelIndex = myProxy->mapToSource (proxyIndex);
@@ -925 +925 @@
 
 void
-FileTreeView :: onDoubleClicked (const QModelIndex& proxyIndex)
+FileTreeView::onDoubleClicked (const QModelIndex& proxyIndex)
 {
   const QModelIndex modelIndex = myProxy->mapToSource (proxyIndex);
@@ -932 +932 @@
 
 void
-FileTreeView :: onOpenRequested (const QString& path)
+FileTreeView::onOpenRequested (const QString& path)
 {
   if (state () == EditingState)
@@ -941 +941 @@
 
 bool
-FileTreeView :: eventFilter (QObject * o, QEvent * event)
+FileTreeView::eventFilter (QObject * o, QEvent * event)
 {
   // this is kind of a hack to get the last three columns be the
@@ -995 +995 @@
 
 void
-FileTreeView :: update (const FileList& files, bool updateFields)
+FileTreeView::update (const FileList& files, bool updateFields)
 {
   foreach (const TrFile file, files)
@@ -1007 +1007 @@
 
 void
-FileTreeView :: clear ()
+FileTreeView::clear ()
 {
   myModel.clear();

trunk/qt/filterbar.cc

@@ -49 +49 @@
 }
 
-FilterBarComboBoxDelegate :: FilterBarComboBoxDelegate (QObject * parent, QComboBox * combo):
+FilterBarComboBoxDelegate::FilterBarComboBoxDelegate (QObject * parent, QComboBox * combo):
   QItemDelegate (parent),
   myCombo (combo)
@@ -56 +56 @@
 
 bool
-FilterBarComboBoxDelegate :: isSeparator (const QModelIndex &index)
+FilterBarComboBoxDelegate::isSeparator (const QModelIndex& index)
 {
   return index.data (Qt::AccessibleDescriptionRole).toString () == QLatin1String ("separator");
 }
 void
-FilterBarComboBoxDelegate :: setSeparator (QAbstractItemModel * model, const QModelIndex& index)
+FilterBarComboBoxDelegate::setSeparator (QAbstractItemModel * model, const QModelIndex& index)
 {
   model->setData (index, QString::fromLatin1 ("separator"), Qt::AccessibleDescriptionRole);
@@ -71 +71 @@
 
 void
-FilterBarComboBoxDelegate :: paint (QPainter                    * painter,
-                                    const QStyleOptionViewItem  & option,
-                                    const QModelIndex           & index) const
+FilterBarComboBoxDelegate::paint (QPainter                    * painter,
+                                  const QStyleOptionViewItem  & option,
+                                  const QModelIndex           & index) const
 {
   if (isSeparator (index))
@@ -121 +121 @@
 
 QSize
-FilterBarComboBoxDelegate :: sizeHint (const QStyleOptionViewItem & option,
-                                       const QModelIndex          & index) const
+FilterBarComboBoxDelegate::sizeHint (const QStyleOptionViewItem & option,
+                                     const QModelIndex          & index) const
 {
   if (isSeparator (index))
@@ -147 +147 @@
 **/
 
-FilterBarComboBox :: FilterBarComboBox (QWidget * parent):
+FilterBarComboBox::FilterBarComboBox (QWidget * parent):
   QComboBox (parent)
 {
@@ -153 +153 @@
 
 int
-FilterBarComboBox :: currentCount () const
+FilterBarComboBox::currentCount () const
 {
   int count = 0;
@@ -165 +165 @@
 
 void
-FilterBarComboBox :: paintEvent (QPaintEvent * e)
+FilterBarComboBox::paintEvent (QPaintEvent * e)
 {
   Q_UNUSED (e);
@@ -227 +227 @@
 
 FilterBarComboBox *
-FilterBar :: createActivityCombo ()
+FilterBar::createActivityCombo ()
 {
   FilterBarComboBox * c = new FilterBarComboBox (this);
@@ -300 +300 @@
 
 void
-FilterBar :: refreshTrackers ()
+FilterBar::refreshTrackers ()
 {
   Favicons& favicons = dynamic_cast<MyApp*> (QApplication::instance ())->favicons;
@@ -393 +393 @@
 
 FilterBarComboBox *
-FilterBar :: createTrackerCombo (QStandardItemModel * model)
+FilterBar::createTrackerCombo (QStandardItemModel * model)
 {
   FilterBarComboBox * c = new FilterBarComboBox (this);
@@ -419 +419 @@
 ****/
 
-FilterBar :: FilterBar (Prefs& prefs, TorrentModel& torrents, TorrentFilter& filter, QWidget * parent):
+FilterBar::FilterBar (Prefs& prefs, TorrentModel& torrents, TorrentFilter& filter, QWidget * parent):
   QWidget (parent),
   myPrefs (prefs),
@@ -477 +477 @@
   // initialize our state
   QList<int> initKeys;
-  initKeys << Prefs :: FILTER_MODE
-           << Prefs :: FILTER_TRACKERS;
+  initKeys << Prefs::FILTER_MODE
+           << Prefs::FILTER_TRACKERS;
   foreach (int key, initKeys)
       refreshPref (key);
 }
 
-FilterBar :: ~FilterBar ()
+FilterBar::~FilterBar ()
 {
   delete myRecountTimer;
@@ -493 +493 @@
 
 void
-FilterBar :: refreshPref (int key)
+FilterBar::refreshPref (int key)
 {
   switch (key)
     {
-      case Prefs :: FILTER_MODE:
+      case Prefs::FILTER_MODE:
         {
           const FilterMode m = myPrefs.get<FilterMode> (key);
@@ -506 +506 @@
         }
 
-      case Prefs :: FILTER_TRACKERS:
+      case Prefs::FILTER_TRACKERS:
         {
           const QString tracker = myPrefs.getString (key);
@@ -527 +527 @@
 
 void
-FilterBar :: onTextChanged (const QString& str)
+FilterBar::onTextChanged (const QString& str)
 {
   if (!myIsBootstrapping)
@@ -534 +534 @@
 
 void
-FilterBar :: onTrackerIndexChanged (int i)
+FilterBar::onTrackerIndexChanged (int i)
 {
   if (!myIsBootstrapping)
@@ -556 +556 @@
 
 void
-FilterBar :: onActivityIndexChanged (int i)
+FilterBar::onActivityIndexChanged (int i)
 {
   if (!myIsBootstrapping)
@@ -569 +569 @@
 ***/
 
-void FilterBar :: onTorrentModelReset () { recountSoon (); }
-void FilterBar :: onTorrentModelRowsInserted (const QModelIndex&, int, int) { recountSoon (); }
-void FilterBar :: onTorrentModelRowsRemoved (const QModelIndex&, int, int) { recountSoon (); }
-void FilterBar :: onTorrentModelDataChanged (const QModelIndex&, const QModelIndex&) { recountSoon (); }
-
-void
-FilterBar :: recountSoon ()
+void FilterBar::onTorrentModelReset () { recountSoon (); }
+void FilterBar::onTorrentModelRowsInserted (const QModelIndex&, int, int) { recountSoon (); }
+void FilterBar::onTorrentModelRowsRemoved (const QModelIndex&, int, int) { recountSoon (); }
+void FilterBar::onTorrentModelDataChanged (const QModelIndex&, const QModelIndex&) { recountSoon (); }
+
+void
+FilterBar::recountSoon ()
 {
   if (!myRecountTimer->isActive ())
@@ -584 +584 @@
 }
 void
-FilterBar :: recount ()
+FilterBar::recount ()
 {
   QAbstractItemModel * model = myActivityCombo->model ();
@@ -605 +605 @@
 
 QString
-FilterBar :: getCountString (int n) const
+FilterBar::getCountString (int n) const
 {
   return QString ("%L1").arg (n);
@@ -611 +611 @@
 
 void
-FilterBar :: refreshCountLabel ()
+FilterBar::refreshCountLabel ()
 {
   const int visibleCount = myFilter.rowCount ();

trunk/qt/filters.cc

@@ -23 +23 @@
 
 int
-FilterMode :: modeFromName( const QString& name )
+FilterMode::modeFromName (const QString& name)
 {
   for (int i=0; i<NUM_MODES; ++i)
@@ -47 +47 @@
 
 int
-SortMode :: modeFromName (const QString& name)
+SortMode::modeFromName (const QString& name)
 {
   for (int i=0; i<NUM_MODES; ++i)

trunk/qt/formatter.cc

@@ -30 +30 @@
 
 void
-Formatter :: initUnits ()
+Formatter::initUnits ()
 {
  speed_K = 1000;
@@ -74 +74 @@
 
 double
-Speed :: KBps () const
+Speed::KBps () const
 {
   return _Bps / (double)speed_K;
@@ -80 +80 @@
 
 Speed
-Speed :: fromKBps (double KBps)
+Speed::fromKBps (double KBps)
 {
   return int (KBps * speed_K);
@@ -90 +90 @@
 
 QString
-Formatter :: memToString (int64_t bytes)
+Formatter::memToString (int64_t bytes)
 {
   if (bytes < 0)
@@ -104 +104 @@
 
 QString
-Formatter :: sizeToString (int64_t bytes)
+Formatter::sizeToString (int64_t bytes)
 {
   if (bytes < 0)
@@ -118 +118 @@
 
 QString
-Formatter :: speedToString (const Speed& speed)
+Formatter::speedToString (const Speed& speed)
 {
   char buf[128];
@@ -126 +126 @@
 
 QString
-Formatter :: uploadSpeedToString (const Speed& uploadSpeed)
+Formatter::uploadSpeedToString (const Speed& uploadSpeed)
 {
   static const QChar uploadSymbol (0x25B4);
@@ -134 +134 @@
 
 QString
-Formatter :: downloadSpeedToString (const Speed& downloadSpeed)
+Formatter::downloadSpeedToString (const Speed& downloadSpeed)
 {
   static const QChar downloadSymbol (0x25BE);
@@ -142 +142 @@
 
 QString
-Formatter :: percentToString (double x)
+Formatter::percentToString (double x)
 {
   char buf[128];
@@ -149 +149 @@
 
 QString
-Formatter :: ratioToString (double ratio)
+Formatter::ratioToString (double ratio)
 {
   char buf[128];
@@ -156 +156 @@
 
 QString
-Formatter :: timeToString (int seconds)
+Formatter::timeToString (int seconds)
 {
   int days, hours, minutes;

trunk/qt/freespace-label.cc

@@ -20 +20 @@
 }
 
-FreespaceLabel :: FreespaceLabel (Session        & session,
-                                  const QString  & path,
-                                  QWidget        * parent):
+FreespaceLabel::FreespaceLabel (Session        & session,
+                                const QString  & path,
+                                QWidget        * parent):
   QLabel (parent),
   mySession (session),
@@ -41 +41 @@
 
 void
-FreespaceLabel :: setPath (const QString& path)
+FreespaceLabel::setPath (const QString& path)
 {
   if (myPath != path)
@@ -52 +52 @@
 
 void
-FreespaceLabel :: onTimer ()
+FreespaceLabel::onTimer ()
 {
   const int64_t tag = mySession.getUniqueTag ();
@@ -69 +69 @@
 
 void
-FreespaceLabel :: onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments)
+FreespaceLabel::onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments)
 {
   Q_UNUSED (result);

trunk/qt/hig.cc

@@ -18 +18 @@
 
 
-HIG :: HIG (QWidget * parent):
+HIG::HIG (QWidget * parent):
   QWidget (parent),
   myRow (0),
@@ -30 +30 @@
 }
 
-HIG :: ~HIG ()
+HIG::~HIG ()
 {
   delete myGrid;
@@ -40 +40 @@
 
 void
-HIG :: addSectionDivider ()
+HIG::addSectionDivider ()
 {
   QWidget * w = new QWidget (this);
@@ -48 +48 @@
 
 void
-HIG :: addSectionTitle (const QString& title)
+HIG::addSectionTitle (const QString& title)
 {
   QLabel * label = new QLabel (this);
@@ -58 +58 @@
 
 void
-HIG :: addSectionTitle (QWidget * w)
+HIG::addSectionTitle (QWidget * w)
 {
   myGrid->addWidget (w, myRow, 0, 1, 2, Qt::AlignLeft|Qt::AlignVCenter);
@@ -65 +65 @@
 
 void
-HIG :: addSectionTitle (QLayout * l)
+HIG::addSectionTitle (QLayout * l)
 {
   myGrid->addLayout (l, myRow, 0, 1, 2, Qt::AlignLeft|Qt::AlignVCenter);
@@ -73 +73 @@
 
 QLayout *
-HIG :: addRow (QWidget * w)
+HIG::addRow (QWidget * w)
 {
   QHBoxLayout * h = new QHBoxLayout ();
@@ -87 +87 @@
 
 void
-HIG :: addWideControl (QLayout * l)
+HIG::addWideControl (QLayout * l)
 {
   QHBoxLayout * h = new QHBoxLayout ();
@@ -97 +97 @@
 
 void
-HIG :: addWideControl (QWidget * w)
+HIG::addWideControl (QWidget * w)
 {
   QHBoxLayout * h = new QHBoxLayout ();
@@ -107 +107 @@
 
 QCheckBox*
-HIG :: addWideCheckBox (const QString& text, bool isChecked)
+HIG::addWideCheckBox (const QString& text, bool isChecked)
 {
   QCheckBox * check = new QCheckBox (text, this);
@@ -116 +116 @@
 
 void
-HIG :: addLabel (QWidget * w)
+HIG::addLabel (QWidget * w)
 {
   QHBoxLayout * h = new QHBoxLayout ();
@@ -125 +125 @@
 
 QLabel*
-HIG :: addLabel (const QString& text)
+HIG::addLabel (const QString& text)
 {
   QLabel * label = new QLabel (text, this);
@@ -133 +133 @@
 
 void
-HIG :: addTallLabel (QWidget * w)
+HIG::addTallLabel (QWidget * w)
 {
   QHBoxLayout * h = new QHBoxLayout ();
@@ -142 +142 @@
 
 QLabel*
-HIG :: addTallLabel (const QString& text)
+HIG::addTallLabel (const QString& text)
 {
   QLabel * label = new QLabel (text, this);
@@ -150 +150 @@
 
 void
-HIG :: addControl (QWidget * w)
+HIG::addControl (QWidget * w)
 {
   myGrid->addWidget (w, myRow, 1, 1, 1);
@@ -156 +156 @@
 
 void
-HIG :: addControl (QLayout * l)
+HIG::addControl (QLayout * l)
 {
   myGrid->addLayout (l, myRow, 1, 1, 1);
@@ -162 +162 @@
 
 QLabel *
-HIG :: addRow (const QString& text, QWidget * control, QWidget * buddy)
+HIG::addRow (const QString& text, QWidget * control, QWidget * buddy)
 {
   QLabel * label = addLabel (text);
@@ -172 +172 @@
 
 QLabel *
-HIG :: addTallRow (const QString& text, QWidget * control, QWidget * buddy)
+HIG::addTallRow (const QString& text, QWidget * control, QWidget * buddy)
 {
   QLabel* label = addTallLabel (text);
@@ -184 +184 @@
 
 QLabel *
-HIG :: addRow (const QString& text, QLayout * control, QWidget * buddy)
+HIG::addRow (const QString& text, QLayout * control, QWidget * buddy)
 {
   QLabel * label = addLabel (text);
@@ -195 +195 @@
 
 void
-HIG :: addRow (QWidget * label, QWidget * control, QWidget * buddy)
+HIG::addRow (QWidget * label, QWidget * control, QWidget * buddy)
 {
   addLabel (label);
@@ -212 +212 @@
 
 void
-HIG :: addRow (QWidget * label, QLayout * control, QWidget * buddy)
+HIG::addRow (QWidget * label, QLayout * control, QWidget * buddy)
 {
   addLabel (label);
@@ -229 +229 @@
 
 void
-HIG :: finish ()
+HIG::finish ()
 {
   if (!myHasTall)

trunk/qt/license.cc

@@ -14 +14 @@
 #include "license.h"
 
-LicenseDialog :: LicenseDialog (QWidget * parent):
+LicenseDialog::LicenseDialog (QWidget * parent):
   QDialog (parent, Qt::Dialog)
 {

trunk/qt/mainwin.cc

@@ -73 +73 @@
 
 QIcon
-TrMainWindow :: getStockIcon (const QString& name, int fallback)
+TrMainWindow::getStockIcon (const QString& name, int fallback)
 {
   QIcon icon = QIcon::fromTheme (name);
@@ -83 +83 @@
 }
 
-TrMainWindow :: TrMainWindow (Session& session, Prefs& prefs, TorrentModel& model, bool minimized):
+TrMainWindow::TrMainWindow (Session& session, Prefs& prefs, TorrentModel& model, bool minimized):
   myLastFullUpdateTime (0),
   mySessionDialog (new SessionDialog (session, prefs, this)),
@@ -249 +249 @@
 
   QList<int> initKeys;
-  initKeys << Prefs :: MAIN_WINDOW_X
-           << Prefs :: SHOW_TRAY_ICON
-           << Prefs :: SORT_REVERSED
-           << Prefs :: SORT_MODE
-           << Prefs :: FILTERBAR
-           << Prefs :: STATUSBAR
-           << Prefs :: STATUSBAR_STATS
-           << Prefs :: TOOLBAR
-           << Prefs :: ALT_SPEED_LIMIT_ENABLED
-           << Prefs :: COMPACT_VIEW
-           << Prefs :: DSPEED
-           << Prefs :: DSPEED_ENABLED
-           << Prefs :: USPEED
-           << Prefs :: USPEED_ENABLED
-           << Prefs :: RATIO
-           << Prefs :: RATIO_ENABLED;
+  initKeys << Prefs::MAIN_WINDOW_X
+           << Prefs::SHOW_TRAY_ICON
+           << Prefs::SORT_REVERSED
+           << Prefs::SORT_MODE
+           << Prefs::FILTERBAR
+           << Prefs::STATUSBAR
+           << Prefs::STATUSBAR_STATS
+           << Prefs::TOOLBAR
+           << Prefs::ALT_SPEED_LIMIT_ENABLED
+           << Prefs::COMPACT_VIEW
+           << Prefs::DSPEED
+           << Prefs::DSPEED_ENABLED
+           << Prefs::USPEED
+           << Prefs::USPEED_ENABLED
+           << Prefs::RATIO
+           << Prefs::RATIO_ENABLED;
   foreach (int key, initKeys)
     refreshPref (key);
@@ -296 +296 @@
 }
 
-TrMainWindow :: ~TrMainWindow ()
+TrMainWindow::~TrMainWindow ()
 {
 }
@@ -305 +305 @@
 
 void
-TrMainWindow :: onSessionSourceChanged ()
+TrMainWindow::onSessionSourceChanged ()
 {
   myModel.clear ();
@@ -311 +311 @@
 
 void
-TrMainWindow :: onModelReset ()
+TrMainWindow::onModelReset ()
 {
   refreshTitle ();
@@ -326 +326 @@
 
 void
-TrMainWindow :: onSetPrefs ()
+TrMainWindow::onSetPrefs ()
 {
   const QVariantList p = sender ()->property (PREF_VARIANTS_KEY).toList ();
@@ -335 +335 @@
 
 void
-TrMainWindow :: onSetPrefs (bool isChecked)
+TrMainWindow::onSetPrefs (bool isChecked)
 {
   if (isChecked)
@@ -344 +344 @@
 
 QWidget *
-TrMainWindow :: createStatusBar ()
+TrMainWindow::createStatusBar ()
 {
   QMenu * m;
@@ -422 +422 @@
 
 QMenu *
-TrMainWindow :: createOptionsMenu ()
+TrMainWindow::createOptionsMenu ()
 {
   QMenu * menu;
@@ -510 +510 @@
 
 void
-TrMainWindow :: setSortPref (int i)
+TrMainWindow::setSortPref (int i)
 {
   myPrefs.set (Prefs::SORT_MODE, SortMode (i));
 }
-void TrMainWindow :: onSortByActivityToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_ACTIVITY); }
-void TrMainWindow :: onSortByAgeToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_AGE); }
-void TrMainWindow :: onSortByETAToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_ETA); }
-void TrMainWindow :: onSortByNameToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_NAME); }
-void TrMainWindow :: onSortByProgressToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_PROGRESS); }
-void TrMainWindow :: onSortByQueueToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_QUEUE); }
-void TrMainWindow :: onSortByRatioToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_RATIO); }
-void TrMainWindow :: onSortBySizeToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_SIZE); }
-void TrMainWindow :: onSortByStateToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_STATE); }
-
-void
-TrMainWindow :: setSortAscendingPref (bool b)
+void TrMainWindow::onSortByActivityToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_ACTIVITY); }
+void TrMainWindow::onSortByAgeToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_AGE); }
+void TrMainWindow::onSortByETAToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_ETA); }
+void TrMainWindow::onSortByNameToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_NAME); }
+void TrMainWindow::onSortByProgressToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_PROGRESS); }
+void TrMainWindow::onSortByQueueToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_QUEUE); }
+void TrMainWindow::onSortByRatioToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_RATIO); }
+void TrMainWindow::onSortBySizeToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_SIZE); }
+void TrMainWindow::onSortByStateToggled (bool b) { if (b) setSortPref (SortMode::SORT_BY_STATE); }
+
+void
+TrMainWindow::setSortAscendingPref (bool b)
 {
   myPrefs.set (Prefs::SORT_REVERSED, b);
@@ -535 +535 @@
 
 void
-TrMainWindow :: showEvent (QShowEvent * event)
+TrMainWindow::showEvent (QShowEvent * event)
 {
   Q_UNUSED (event);
@@ -547 +547 @@
 
 void
-TrMainWindow :: hideEvent (QHideEvent * event)
+TrMainWindow::hideEvent (QHideEvent * event)
 {
   Q_UNUSED (event);
@@ -560 +560 @@
 
 void
-TrMainWindow :: onPrefsDestroyed ()
+TrMainWindow::onPrefsDestroyed ()
 {
   myPrefsDialog = 0;
@@ -566 +566 @@
 
 void
-TrMainWindow :: openPreferences ()
+TrMainWindow::openPreferences ()
 {
   if (myPrefsDialog == 0)
@@ -578 +578 @@
 
 void
-TrMainWindow :: onDetailsDestroyed ()
+TrMainWindow::onDetailsDestroyed ()
 {
   myDetailsDialog = 0;
@@ -584 +584 @@
 
 void
-TrMainWindow :: openProperties ()
+TrMainWindow::openProperties ()
 {
   if (myDetailsDialog == 0)
@@ -597 +597 @@
 
 void
-TrMainWindow :: setLocation ()
+TrMainWindow::setLocation ()
 {
   QDialog * d = new RelocateDialog (mySession, myModel, getSelectedTorrents (), this);
@@ -635 +635 @@
 
 void
-TrMainWindow :: openFolder ()
+TrMainWindow::openFolder ()
 {
   const int torrentId (*getSelectedTorrents ().begin ());
@@ -654 +654 @@
     }
 #endif
-  QDesktopServices :: openUrl (QUrl::fromLocalFile (path));
-}
-
-void
-TrMainWindow :: copyMagnetLinkToClipboard ()
+  QDesktopServices::openUrl (QUrl::fromLocalFile (path));
+}
+
+void
+TrMainWindow::copyMagnetLinkToClipboard ()
 {
   const int id (*getSelectedTorrents ().begin ());
@@ -665 +665 @@
 
 void
-TrMainWindow :: openDonate ()
-{
-  QDesktopServices :: openUrl (QUrl ("http://www.transmissionbt.com/donate.php"));
-}
-
-void
-TrMainWindow :: openHelp ()
+TrMainWindow::openDonate ()
+{
+  QDesktopServices::openUrl (QUrl ("http://www.transmissionbt.com/donate.php"));
+}
+
+void
+TrMainWindow::openHelp ()
 {
   const char * fmt = "http://www.transmissionbt.com/help/gtk/%d.%dx";
@@ -678 +678 @@
   char url[128];
   tr_snprintf (url, sizeof (url), fmt, major, minor/10);
-  QDesktopServices :: openUrl (QUrl (url));
-}
-
-void
-TrMainWindow :: refreshTitle ()
+  QDesktopServices::openUrl (QUrl (url));
+}
+
+void
+TrMainWindow::refreshTitle ()
 {
   QString title ("Transmission");
@@ -692 +692 @@
 
 void
-TrMainWindow :: refreshTrayIconSoon ()
+TrMainWindow::refreshTrayIconSoon ()
 {
   if (!myRefreshTrayIconTimer.isActive ())
@@ -701 +701 @@
 }
 void
-TrMainWindow :: refreshTrayIcon ()
+TrMainWindow::refreshTrayIcon ()
 {
   Speed upSpeed, downSpeed;
@@ -731 +731 @@
 
 void
-TrMainWindow :: refreshStatusBar ()
+TrMainWindow::refreshStatusBar ()
 {
   Speed upSpeed, downSpeed;
@@ -774 +774 @@
 
 void
-TrMainWindow :: refreshActionSensitivitySoon ()
+TrMainWindow::refreshActionSensitivitySoon ()
 {
   if (!myRefreshActionSensitivityTimer.isActive ())
@@ -783 +783 @@
 }
 void
-TrMainWindow :: refreshActionSensitivity ()
+TrMainWindow::refreshActionSensitivity ()
 {
   int selected (0);
@@ -849 +849 @@
 
 void
-TrMainWindow :: clearSelection ()
+TrMainWindow::clearSelection ()
 {
   ui.action_DeselectAll->trigger ();
@@ -855 +855 @@
 
 QSet<int>
-TrMainWindow :: getSelectedTorrents () const
+TrMainWindow::getSelectedTorrents () const
 {
   QSet<int> ids;
@@ -869 +869 @@
 
 void
-TrMainWindow :: startSelected ()
+TrMainWindow::startSelected ()
 {
   mySession.startTorrents (getSelectedTorrents ());
 }
 void
-TrMainWindow :: startSelectedNow ()
+TrMainWindow::startSelectedNow ()
 {
   mySession.startTorrentsNow (getSelectedTorrents ());
 }
 void
-TrMainWindow :: pauseSelected ()
+TrMainWindow::pauseSelected ()
 {
   mySession.pauseTorrents (getSelectedTorrents ());
 }
 void
-TrMainWindow :: queueMoveTop ()
+TrMainWindow::queueMoveTop ()
 {
   mySession.queueMoveTop (getSelectedTorrents ());
 }
 void
-TrMainWindow :: queueMoveUp ()
+TrMainWindow::queueMoveUp ()
 {
   mySession.queueMoveUp (getSelectedTorrents ());
 }
 void
-TrMainWindow :: queueMoveDown ()
+TrMainWindow::queueMoveDown ()
 {
   mySession.queueMoveDown (getSelectedTorrents ());
 }
 void
-TrMainWindow :: queueMoveBottom ()
+TrMainWindow::queueMoveBottom ()
 {
   mySession.queueMoveBottom (getSelectedTorrents ());
 }
 void
-TrMainWindow :: startAll ()
+TrMainWindow::startAll ()
 {
   mySession.startTorrents ();
 }
 void
-TrMainWindow :: pauseAll ()
+TrMainWindow::pauseAll ()
 {
   mySession.pauseTorrents ();
 }
 void
-TrMainWindow :: removeSelected ()
+TrMainWindow::removeSelected ()
 {
   removeTorrents (false);
 }
 void
-TrMainWindow :: deleteSelected ()
+TrMainWindow::deleteSelected ()
 {
   removeTorrents (true);
 }
 void
-TrMainWindow :: verifySelected ()
+TrMainWindow::verifySelected ()
 {
   mySession.verifyTorrents (getSelectedTorrents ());
 }
 void
-TrMainWindow :: reannounceSelected ()
+TrMainWindow::reannounceSelected ()
 {
   mySession.reannounceTorrents (getSelectedTorrents ());
@@ -938 +938 @@
 **/
 
-void TrMainWindow :: showTotalRatio () { myPrefs.set (Prefs::STATUSBAR_STATS, "total-ratio"); }
-void TrMainWindow :: showTotalTransfer () { myPrefs.set (Prefs::STATUSBAR_STATS, "total-transfer"); }
-void TrMainWindow :: showSessionRatio () { myPrefs.set (Prefs::STATUSBAR_STATS, "session-ratio"); }
-void TrMainWindow :: showSessionTransfer () { myPrefs.set (Prefs::STATUSBAR_STATS, "session-transfer"); }
+void TrMainWindow::showTotalRatio () { myPrefs.set (Prefs::STATUSBAR_STATS, "total-ratio"); }
+void TrMainWindow::showTotalTransfer () { myPrefs.set (Prefs::STATUSBAR_STATS, "total-transfer"); }
+void TrMainWindow::showSessionRatio () { myPrefs.set (Prefs::STATUSBAR_STATS, "session-ratio"); }
+void TrMainWindow::showSessionTransfer () { myPrefs.set (Prefs::STATUSBAR_STATS, "session-transfer"); }
 
 /**
@@ -948 +948 @@
 
 void
-TrMainWindow :: setCompactView (bool visible)
-{
-  myPrefs.set (Prefs :: COMPACT_VIEW, visible);
-}
-void
-TrMainWindow :: toggleSpeedMode ()
-{
-  myPrefs.toggleBool (Prefs :: ALT_SPEED_LIMIT_ENABLED);
+TrMainWindow::setCompactView (bool visible)
+{
+  myPrefs.set (Prefs::COMPACT_VIEW, visible);
+}
+void
+TrMainWindow::toggleSpeedMode ()
+{
+  myPrefs.toggleBool (Prefs::ALT_SPEED_LIMIT_ENABLED);
   const bool mode = myPrefs.get<bool> (Prefs::ALT_SPEED_LIMIT_ENABLED);
   myAltSpeedAction->setIcon (mode ? mySpeedModeOnIcon : mySpeedModeOffIcon);
 }
 void
-TrMainWindow :: setToolbarVisible (bool visible)
+TrMainWindow::setToolbarVisible (bool visible)
 {
   myPrefs.set (Prefs::TOOLBAR, visible);
 }
 void
-TrMainWindow :: setFilterbarVisible (bool visible)
+TrMainWindow::setFilterbarVisible (bool visible)
 {
   myPrefs.set (Prefs::FILTERBAR, visible);
 }
 void
-TrMainWindow :: setStatusbarVisible (bool visible)
+TrMainWindow::setStatusbarVisible (bool visible)
 {
   myPrefs.set (Prefs::STATUSBAR, visible);
@@ -980 +980 @@
 
 void
-TrMainWindow :: toggleWindows (bool doShow)
+TrMainWindow::toggleWindows (bool doShow)
 {
   if (!doShow)
@@ -997 +997 @@
 
 void
-TrMainWindow :: trayActivated (QSystemTrayIcon::ActivationReason reason)
+TrMainWindow::trayActivated (QSystemTrayIcon::ActivationReason reason)
 {
   if ((reason == QSystemTrayIcon::Trigger) ||
@@ -1011 +1011 @@
 
 void
-TrMainWindow :: refreshPref (int key)
+TrMainWindow::refreshPref (int key)
 {
   bool b;
@@ -1119 +1119 @@
         break;
 
-      case Prefs :: ALT_SPEED_LIMIT_ENABLED:
-      case Prefs :: ALT_SPEED_LIMIT_UP:
-      case Prefs :: ALT_SPEED_LIMIT_DOWN:
+      case Prefs::ALT_SPEED_LIMIT_ENABLED:
+      case Prefs::ALT_SPEED_LIMIT_UP:
+      case Prefs::ALT_SPEED_LIMIT_DOWN:
         {
-          b = myPrefs.getBool (Prefs :: ALT_SPEED_LIMIT_ENABLED);
+          b = myPrefs.getBool (Prefs::ALT_SPEED_LIMIT_ENABLED);
           myAltSpeedButton->setChecked (b);
           myAltSpeedButton->setIcon (b ? mySpeedModeOnIcon : mySpeedModeOffIcon);
@@ -1147 +1147 @@
 
 void
-TrMainWindow :: newTorrent ()
+TrMainWindow::newTorrent ()
 {
   MakeDialog * dialog = new MakeDialog (mySession, this);
@@ -1154 +1154 @@
 
 void
-TrMainWindow :: openTorrent ()
+TrMainWindow::openTorrent ()
 {
   QFileDialog * d;
@@ -1182 +1182 @@
 
 void
-TrMainWindow :: openURL ()
+TrMainWindow::openURL ()
 {
   QString str = QApplication::clipboard ()->text (QClipboard::Selection);
@@ -1196 +1196 @@
 
 void
-TrMainWindow :: addTorrents (const QStringList& filenames)
+TrMainWindow::addTorrents (const QStringList& filenames)
 {
   bool showOptions = myPrefs.getBool (Prefs::OPTIONS_PROMPT);
@@ -1213 +1213 @@
 
 void
-TrMainWindow :: addTorrent (const AddData& addMe, bool showOptions)
+TrMainWindow::addTorrent (const AddData& addMe, bool showOptions)
 {
   if (showOptions)
@@ -1219 +1219 @@
       Options * o = new Options (mySession, myPrefs, addMe, this);
       o->show ();
-      QApplication :: alert (o);
+      QApplication::alert (o);
     }
   else
     {
       mySession.addTorrent (addMe);
-      QApplication :: alert (this);
-    }
-}
-
-void
-TrMainWindow :: removeTorrents (const bool deleteFiles)
+      QApplication::alert (this);
+    }
+}
+
+void
+TrMainWindow::removeTorrents (const bool deleteFiles)
 {
   QSet<int> ids;
@@ -1336 +1336 @@
 
 void
-TrMainWindow :: updateNetworkIcon ()
+TrMainWindow::updateNetworkIcon ()
 {
   const time_t now = time (NULL);
@@ -1377 +1377 @@
 
 void
-TrMainWindow :: onNetworkTimer ()
+TrMainWindow::onNetworkTimer ()
 {
   updateNetworkIcon ();
@@ -1383 +1383 @@
 
 void
-TrMainWindow :: dataReadProgress ()
+TrMainWindow::dataReadProgress ()
 {
   if (!myNetworkError)
@@ -1390 +1390 @@
 
 void
-TrMainWindow :: dataSendProgress ()
+TrMainWindow::dataSendProgress ()
 {
   myLastSendTime = time (NULL);
@@ -1396 +1396 @@
 
 void
-TrMainWindow :: onError (QNetworkReply::NetworkError code)
+TrMainWindow::onError (QNetworkReply::NetworkError code)
 {
   const bool hadError = myNetworkError;
@@ -1413 +1413 @@
 
 void
-TrMainWindow :: errorMessage (const QString msg)
+TrMainWindow::errorMessage (const QString msg)
 {
     myErrorMessage = msg;
@@ -1419 +1419 @@
 
 void
-TrMainWindow :: wrongAuthentication ()
+TrMainWindow::wrongAuthentication ()
 {
   mySession.stop ();
@@ -1430 +1430 @@
 
 void
-TrMainWindow :: dragEnterEvent (QDragEnterEvent * event)
+TrMainWindow::dragEnterEvent (QDragEnterEvent * event)
 {
   const QMimeData * mime = event->mimeData ();
@@ -1442 +1442 @@
 
 void
-TrMainWindow :: dropEvent (QDropEvent * event)
+TrMainWindow::dropEvent (QDropEvent * event)
 {
   QStringList list;
@@ -1477 +1477 @@
 
 void
-TrMainWindow :: contextMenuEvent (QContextMenuEvent * event)
+TrMainWindow::contextMenuEvent (QContextMenuEvent * event)
 {
   QMenu * menu = new QMenu (this);

trunk/qt/make-dialog.cc

@@ -44 +44 @@
 
 void
-MakeDialog :: onNewDialogDestroyed (QObject * o)
+MakeDialog::onNewDialogDestroyed (QObject * o)
 {
   Q_UNUSED (o);
@@ -52 +52 @@
 
 void
-MakeDialog :: onNewButtonBoxClicked (QAbstractButton * button)
+MakeDialog::onNewButtonBoxClicked (QAbstractButton * button)
 {
   switch (myNewButtonBox->standardButton (button))
@@ -72 +72 @@
 
 void
-MakeDialog :: onProgress ()
+MakeDialog::onProgress ()
 {
   // progress bar
@@ -105 +105 @@
 
 void
-MakeDialog :: makeTorrent ()
+MakeDialog::makeTorrent ()
 {
   if (!myBuilder)
@@ -173 +173 @@
 
 void
-MakeDialog :: onFileClicked ()
+MakeDialog::onFileClicked ()
 {
   QFileDialog * d = new QFileDialog (this, tr ("Select File"));
@@ -183 +183 @@
 }
 void
-MakeDialog :: onFileSelected (const QStringList& list)
+MakeDialog::onFileSelected (const QStringList& list)
 {
   if (!list.empty ())
@@ -189 +189 @@
 }
 void
-MakeDialog :: onFileSelected (const QString& filename)
+MakeDialog::onFileSelected (const QString& filename)
 {
   myFile = Utils::removeTrailingDirSeparator (filename);
@@ -197 +197 @@
 
 void
-MakeDialog :: onFolderClicked ()
+MakeDialog::onFolderClicked ()
 {
   QFileDialog * d = new QFileDialog (this, tr ("Select Folder"));
@@ -209 +209 @@
 
 void
-MakeDialog :: onFolderSelected (const QStringList& list)
+MakeDialog::onFolderSelected (const QStringList& list)
 {
   if (!list.empty ())
@@ -216 +216 @@
 
 void
-MakeDialog :: onFolderSelected (const QString& filename)
+MakeDialog::onFolderSelected (const QString& filename)
 {
   myFolder = Utils::removeTrailingDirSeparator (filename);
@@ -224 +224 @@
 
 void
-MakeDialog :: onDestinationClicked ()
+MakeDialog::onDestinationClicked ()
 {
   QFileDialog * d = new QFileDialog (this, tr ("Select Folder"));
@@ -235 +235 @@
 }
 void
-MakeDialog :: onDestinationSelected (const QStringList& list)
+MakeDialog::onDestinationSelected (const QStringList& list)
 {
   if (!list.empty ())
@@ -241 +241 @@
 }
 void
-MakeDialog :: onDestinationSelected (const QString& filename)
+MakeDialog::onDestinationSelected (const QString& filename)
 {
   myDestination = Utils::removeTrailingDirSeparator (filename);
@@ -248 +248 @@
 
 void
-MakeDialog :: enableBuddyWhenChecked (QRadioButton * box, QWidget * buddy)
+MakeDialog::enableBuddyWhenChecked (QRadioButton * box, QWidget * buddy)
 {
   connect (box, SIGNAL(toggled(bool)), buddy, SLOT(setEnabled(bool)));
@@ -254 +254 @@
 }
 void
-MakeDialog :: enableBuddyWhenChecked (QCheckBox * box, QWidget * buddy)
+MakeDialog::enableBuddyWhenChecked (QCheckBox * box, QWidget * buddy)
 {
   connect (box, SIGNAL(toggled(bool)), buddy, SLOT(setEnabled(bool)));
@@ -261 +261 @@
 
 QString
-MakeDialog :: getSource () const
+MakeDialog::getSource () const
 {
   return myFileRadio->isChecked () ? myFile : myFolder;
@@ -267 +267 @@
 
 void
-MakeDialog :: onButtonBoxClicked (QAbstractButton * button)
+MakeDialog::onButtonBoxClicked (QAbstractButton * button)
 {
   switch (myButtonBox->standardButton (button))
@@ -286 +286 @@
 
 void
-MakeDialog :: onSourceChanged ()
+MakeDialog::onSourceChanged ()
 {
   if (myBuilder)
@@ -328 +328 @@
 };
 
-MakeDialog :: MakeDialog (Session & session, QWidget * parent):
+MakeDialog::MakeDialog (Session& session, QWidget * parent):
   QDialog (parent, Qt::Dialog),
   mySession (session),
@@ -339 +339 @@
   setWindowTitle (tr ("New Torrent"));
   QVBoxLayout * top = new QVBoxLayout (this);
-  top->setSpacing (HIG :: PAD);
+  top->setSpacing (HIG::PAD);
 
   HIG * hig = new HIG;
@@ -420 +420 @@
 }
 
-MakeDialog :: ~MakeDialog ()
+MakeDialog::~MakeDialog ()
 {
   if (myBuilder)
@@ -431 +431 @@
 
 void
-MakeDialog :: dragEnterEvent (QDragEnterEvent * event)
+MakeDialog::dragEnterEvent (QDragEnterEvent * event)
 {
   const QMimeData * mime = event->mimeData ();
@@ -440 +440 @@
 
 void
-MakeDialog :: dropEvent (QDropEvent * event)
+MakeDialog::dropEvent (QDropEvent * event)
 {
   const QString filename = event->mimeData()->urls().front().path();

trunk/qt/options.cc

@@ -44 +44 @@
 ***/
 
-Options :: Options (Session& session, const Prefs& prefs, const AddData& addme, QWidget * parent):
+Options::Options (Session& session, const Prefs& prefs, const AddData& addme, QWidget * parent):
   QDialog (parent, Qt::Dialog),
   mySession (session),
@@ -73 +73 @@
   connect (&myEditTimer, SIGNAL (timeout ()), this, SLOT (onDestinationEditedIdle ()));
 
-  const int iconSize (style ()->pixelMetric (QStyle :: PM_SmallIconSize));
+  const int iconSize (style ()->pixelMetric (QStyle::PM_SmallIconSize));
   QIcon fileIcon = style ()->standardIcon (QStyle::SP_FileIcon);
   const QPixmap filePixmap = fileIcon.pixmap (iconSize);
@@ -164 +164 @@
   QCheckBox * c;
   c = myStartCheck = new QCheckBox (tr ("S&tart when added"));
-  c->setChecked (prefs.getBool (Prefs :: START));
+  c->setChecked (prefs.getBool (Prefs::START));
   layout->addWidget (c, ++row, 0, 1, 2, Qt::AlignLeft);
 
   c = myTrashCheck = new QCheckBox (tr ("Mo&ve .torrent file to the trash"));
-  c->setChecked (prefs.getBool (Prefs :: TRASH_ORIGINAL));
+  c->setChecked (prefs.getBool (Prefs::TRASH_ORIGINAL));
   layout->addWidget (c, ++row, 0, 1, 2, Qt::AlignLeft);
 
@@ -178 +178 @@
   layout->setRowStretch (3, 2);
   layout->setColumnStretch (1, 2);
-  layout->setSpacing (HIG :: PAD);
+  layout->setSpacing (HIG::PAD);
 
   connect (myTree, SIGNAL (priorityChanged (const QSet<int>&,int)), this, SLOT (onPriorityChanged (const QSet<int>&,int)));
@@ -190 +190 @@
 }
 
-Options :: ~Options ()
+Options::~Options ()
 {
   clearInfo ();
@@ -200 +200 @@
 
 void
-Options :: refreshButton (QPushButton * p, const QString& text, int width)
+Options::refreshButton (QPushButton * p, const QString& text, int width)
 {
   if (width <= 0)
@@ -211 +211 @@
 
 void
-Options :: refreshSource (int width)
+Options::refreshSource (int width)
 {
   QString text = myAdd.readableName ();
@@ -223 +223 @@
 
 void
-Options :: refreshDestinationButton (int width)
+Options::refreshDestinationButton (int width)
 {
   if (myDestinationButton != 0)
@@ -231 +231 @@
 
 bool
-Options :: eventFilter (QObject * o, QEvent * event)
+Options::eventFilter (QObject * o, QEvent * event)
 {
   if (event->type() == QEvent::Resize)
@@ -250 +250 @@
 
 void
-Options :: clearInfo ()
+Options::clearInfo ()
 {
   if (myHaveInfo)
@@ -260 +260 @@
 
 void
-Options :: reload ()
+Options::reload ()
 {
   clearInfo ();
@@ -320 +320 @@
 
 void
-Options :: onPriorityChanged (const QSet<int>& fileIndices, int priority)
+Options::onPriorityChanged (const QSet<int>& fileIndices, int priority)
 {
   foreach (int i, fileIndices)
@@ -327 +327 @@
 
 void
-Options :: onWantedChanged (const QSet<int>& fileIndices, bool isWanted)
+Options::onWantedChanged (const QSet<int>& fileIndices, bool isWanted)
 {
   foreach (int i, fileIndices)
@@ -334 +334 @@
 
 void
-Options :: onAccepted ()
+Options::onAccepted ()
 {
   // rpc spec section 3.4 "adding a torrent"
@@ -396 +396 @@
 
 void
-Options :: onFilenameClicked ()
+Options::onFilenameClicked ()
 {
   if (myAdd.type == AddData::FILENAME)
@@ -412 +412 @@
 
 void
-Options :: onFilesSelected (const QStringList& files)
+Options::onFilesSelected (const QStringList& files)
 {
   if (files.size () == 1)
@@ -423 +423 @@
 
 void
-Options :: onSourceEditingFinished ()
+Options::onSourceEditingFinished ()
 {
   myAdd.set (mySourceEdit->text());
@@ -429 +429 @@
 
 void
-Options :: onDestinationClicked ()
+Options::onDestinationClicked ()
 {
   QFileDialog * d = new QFileDialog (this, tr ("Select Destination"), myLocalDestination.absolutePath ());
@@ -439 +439 @@
 
 void
-Options :: onDestinationsSelected (const QStringList& destinations)
+Options::onDestinationsSelected (const QStringList& destinations)
 {
   if (destinations.size () == 1)
@@ -451 +451 @@
 
 void
-Options :: onDestinationEdited (const QString& text)
+Options::onDestinationEdited (const QString& text)
 {
   Q_UNUSED (text);
@@ -459 +459 @@
 
 void
-Options :: onDestinationEditedIdle ()
+Options::onDestinationEditedIdle ()
 {
   myFreespaceLabel->setPath (myDestinationEdit->text());
@@ -471 +471 @@
 
 void
-Options :: clearVerify ()
+Options::clearVerify ()
 {
   myVerifyHash.reset ();
@@ -489 +489 @@
 
 void
-Options :: onVerify ()
+Options::onVerify ()
 {
   clearVerify ();
@@ -508 +508 @@
 
 void
-Options :: onTimeout ()
+Options::onTimeout ()
 {
   if (myFiles.isEmpty())

trunk/qt/prefs-dialog.cc

@@ -52 +52 @@
 
 void
-PrefsDialog :: checkBoxToggled (bool checked)
+PrefsDialog::checkBoxToggled (bool checked)
 {
   const int key (sender ()->property (PREF_KEY).toInt ());
@@ -59 +59 @@
 
 QCheckBox *
-PrefsDialog :: checkBoxNew (const QString& text, int key)
+PrefsDialog::checkBoxNew (const QString& text, int key)
 {
   QCheckBox * box = new QCheckBox (text);
@@ -70 +70 @@
 
 void
-PrefsDialog :: enableBuddyWhenChecked (QCheckBox * box, QWidget * buddy)
+PrefsDialog::enableBuddyWhenChecked (QCheckBox * box, QWidget * buddy)
 {
   connect (box, SIGNAL(toggled(bool)), buddy, SLOT(setEnabled(bool)));
@@ -77 +77 @@
 
 void
-PrefsDialog :: spinBoxEditingFinished()
+PrefsDialog::spinBoxEditingFinished ()
 {
   const QObject * spin = sender();
@@ -90 +90 @@
 
 QSpinBox *
-PrefsDialog :: spinBoxNew (int key, int low, int high, int step)
+PrefsDialog::spinBoxNew (int key, int low, int high, int step)
 {
   QSpinBox * spin = new QSpinBox ();
@@ -103 +103 @@
 
 QDoubleSpinBox *
-PrefsDialog :: doubleSpinBoxNew (int key, double low, double high, double step, int decimals)
+PrefsDialog::doubleSpinBoxNew (int key, double low, double high, double step, int decimals)
 {
   QDoubleSpinBox * spin = new QDoubleSpinBox ();
@@ -143 +143 @@
 
 void
-PrefsDialog :: lineEditingFinished ()
+PrefsDialog::lineEditingFinished ()
 {
   QLineEdit * e = qobject_cast<QLineEdit*>(sender());
@@ -155 +155 @@
 
 QLineEdit*
-PrefsDialog :: lineEditNew (int key, int echoMode)
+PrefsDialog::lineEditNew (int key, int echoMode)
 {
   QLineEdit * e = new QLineEdit (myPrefs.getString (key));
@@ -170 +170 @@
 
 QWidget *
-PrefsDialog :: createRemoteTab (Session& session)
+PrefsDialog::createRemoteTab (Session& session)
 {
   HIG * hig = new HIG (this);
@@ -204 +204 @@
 
 void
-PrefsDialog :: altSpeedDaysEdited (int i)
+PrefsDialog::altSpeedDaysEdited (int i)
 {
   const int value = qobject_cast<QComboBox*>(sender())->itemData(i).toInt();
@@ -212 +212 @@
 
 QWidget *
-PrefsDialog :: createSpeedTab ()
+PrefsDialog::createSpeedTab ()
 {
   QWidget *l, *r;
@@ -231 +231 @@
   hig->addSectionDivider ();
   QHBoxLayout * h = new QHBoxLayout;
-  h->setSpacing (HIG :: PAD);
+  h->setSpacing (HIG::PAD);
   QLabel * label = new QLabel;
   label->setPixmap (QPixmap (QString::fromUtf8 (":/icons/alt-limit-off.png")));
@@ -246 +246 @@
 
     s = tr ("U&pload (%1):").arg (speed_K_str);
-    r = spinBoxNew (Prefs :: ALT_SPEED_LIMIT_UP, 0, INT_MAX, 5);
+    r = spinBoxNew (Prefs::ALT_SPEED_LIMIT_UP, 0, INT_MAX, 5);
     hig->addRow (s, r);
 
     s = tr ("Do&wnload (%1):").arg (speed_K_str);
-    r = spinBoxNew (Prefs :: ALT_SPEED_LIMIT_DOWN, 0, INT_MAX, 5);
+    r = spinBoxNew (Prefs::ALT_SPEED_LIMIT_DOWN, 0, INT_MAX, 5);
     hig->addRow (s, r);
 
@@ -256 +256 @@
     h = new QHBoxLayout ();
     h->setSpacing (HIG::PAD);
-    QWidget * w = timeEditNew (Prefs :: ALT_SPEED_LIMIT_TIME_BEGIN);
+    QWidget * w = timeEditNew (Prefs::ALT_SPEED_LIMIT_TIME_BEGIN);
     h->addWidget (w, 1);
     mySchedWidgets << w;
@@ -262 +262 @@
     h->addWidget (nd);
     mySchedWidgets << nd;
-    w = timeEditNew (Prefs :: ALT_SPEED_LIMIT_TIME_END);
+    w = timeEditNew (Prefs::ALT_SPEED_LIMIT_TIME_END);
     nd->setBuddy (w);
     h->addWidget (w, 1);
@@ -281 +281 @@
     box->addItem (noIcon, tr ("Friday"),    QVariant (TR_SCHED_FRI));
     box->addItem (noIcon, tr ("Saturday"),  QVariant (TR_SCHED_SAT));
-    box->setCurrentIndex (box->findData (myPrefs.getInt (Prefs :: ALT_SPEED_LIMIT_TIME_DAY)));
+    box->setCurrentIndex (box->findData (myPrefs.getInt (Prefs::ALT_SPEED_LIMIT_TIME_DAY)));
     connect (box, SIGNAL(activated(int)), this, SLOT(altSpeedDaysEdited(int)));
     w = hig->addRow (s, box);
@@ -295 +295 @@
 
 QWidget *
-PrefsDialog :: createDesktopTab ()
+PrefsDialog::createDesktopTab ()
 {
   HIG * hig = new HIG (this);
@@ -319 +319 @@
 
 void
-PrefsDialog :: onPortTested (bool isOpen)
+PrefsDialog::onPortTested (bool isOpen)
 {
   myPortButton->setEnabled (true);
@@ -328 +328 @@
 
 void
-PrefsDialog :: onPortTest ()
+PrefsDialog::onPortTest ()
 {
   myPortLabel->setText (tr ("Testing TCP Port..."));
@@ -337 +337 @@
 
 QWidget *
-PrefsDialog :: createNetworkTab ()
+PrefsDialog::createNetworkTab ()
 {
   HIG * hig = new HIG (this);
@@ -347 +347 @@
   QLabel * l = myPortLabel = new QLabel (tr ("Status unknown"));
   h->addWidget (l);
-  h->addSpacing (HIG :: PAD_BIG);
+  h->addSpacing (HIG::PAD_BIG);
   h->addWidget (b);
   h->setStretchFactor (l, 1);
@@ -355 +355 @@
   hig->addRow (tr ("&Port for incoming connections:"), s);
   hig->addRow (QString(), h, 0);
-  hig->addWideControl (checkBoxNew (tr ("Pick a &random port every time Transmission is started"), Prefs :: PEER_PORT_RANDOM_ON_START));
+  hig->addWideControl (checkBoxNew (tr ("Pick a &random port every time Transmission is started"), Prefs::PEER_PORT_RANDOM_ON_START));
   hig->addWideControl (checkBoxNew (tr ("Use UPnP or NAT-PMP port &forwarding from my router"), Prefs::PORT_FORWARDING));
 
@@ -385 +385 @@
 
 void
-PrefsDialog :: onBlocklistDialogDestroyed (QObject * o)
+PrefsDialog::onBlocklistDialogDestroyed (QObject * o)
 {
   Q_UNUSED (o);
@@ -393 +393 @@
 
 void
-PrefsDialog :: onUpdateBlocklistCancelled ()
+PrefsDialog::onUpdateBlocklistCancelled ()
 {
   disconnect (&mySession, SIGNAL(blocklistUpdated(int)), this, SLOT(onBlocklistUpdated(int)));
@@ -400 +400 @@
 
 void
-PrefsDialog :: onBlocklistUpdated (int n)
+PrefsDialog::onBlocklistUpdated (int n)
 {
   myBlocklistDialog->setText (tr ("<b>Update succeeded!</b><p>Blocklist now has %Ln rules.", 0, n));
@@ -407 +407 @@
 
 void
-PrefsDialog :: onUpdateBlocklistClicked ()
+PrefsDialog::onUpdateBlocklistClicked ()
 {
   myBlocklistDialog = new QMessageBox (QMessageBox::Information,
@@ -421 +421 @@
 
 void
-PrefsDialog :: encryptionEdited (int i)
+PrefsDialog::encryptionEdited (int i)
 {
   const int value (qobject_cast<QComboBox*>(sender())->itemData(i).toInt ());
@@ -428 +428 @@
 
 QWidget *
-PrefsDialog :: createPrivacyTab ()
+PrefsDialog::createPrivacyTab ()
 {
   QWidget * w;
@@ -439 +439 @@
   box->addItem (tr ("Prefer encryption"), 1);
   box->addItem (tr ("Require encryption"), 2);
-  myWidgets.insert (Prefs :: ENCRYPTION, box);
+  myWidgets.insert (Prefs::ENCRYPTION, box);
   connect (box, SIGNAL(activated(int)), this, SLOT(encryptionEdited(int)));
 
@@ -477 +477 @@
 
 void
-PrefsDialog :: onScriptClicked (void)
+PrefsDialog::onScriptClicked (void)
 {
   const QString title = tr ("Select \"Torrent Done\" Script");
@@ -488 +488 @@
 
 void
-PrefsDialog :: onIncompleteClicked (void)
+PrefsDialog::onIncompleteClicked (void)
 {
   const QString title = tr ("Select Incomplete Directory");
@@ -499 +499 @@
 
 void
-PrefsDialog :: onWatchClicked (void)
+PrefsDialog::onWatchClicked (void)
 {
   const QString title = tr ("Select Watch Directory");
@@ -510 +510 @@
 
 void
-PrefsDialog :: onDestinationClicked (void)
+PrefsDialog::onDestinationClicked (void)
 {
   const QString title = tr ("Select Destination");
@@ -521 +521 @@
 
 void
-PrefsDialog :: onLocationSelected (const QString& path, int key)
+PrefsDialog::onLocationSelected (const QString& path, int key)
 {
   setPref (key, path);
@@ -527 +527 @@
 
 QWidget *
-PrefsDialog :: createSeedingTab ()
-{
-  const int iconSize (style ()->pixelMetric (QStyle :: PM_SmallIconSize));
+PrefsDialog::createSeedingTab ()
+{
+  const int iconSize (style ()->pixelMetric (QStyle::PM_SmallIconSize));
   const QFileIconProvider iconProvider;
   const QIcon folderIcon = iconProvider.icon (QFileIconProvider::Folder);
@@ -555 +555 @@
 
 QWidget *
-PrefsDialog :: createDownloadingTab ()
-{
-  const int iconSize (style ()->pixelMetric (QStyle :: PM_SmallIconSize));
+PrefsDialog::createDownloadingTab ()
+{
+  const int iconSize (style ()->pixelMetric (QStyle::PM_SmallIconSize));
   const QFileIconProvider iconProvider;
   const QIcon folderIcon = iconProvider.icon (QFileIconProvider::Folder);
@@ -631 +631 @@
 ***/
 
-PrefsDialog :: PrefsDialog (Session& session, Prefs& prefs, QWidget * parent):
+PrefsDialog::PrefsDialog (Session& session, Prefs& prefs, QWidget * parent):
   QDialog (parent),
   myIsServer (session.isServer ()),
@@ -658 +658 @@
 
   QList<int> keys;
-  keys << Prefs :: RPC_ENABLED
-       << Prefs :: ALT_SPEED_LIMIT_ENABLED
-       << Prefs :: ALT_SPEED_LIMIT_TIME_ENABLED
-       << Prefs :: ENCRYPTION
-       << Prefs :: BLOCKLIST_ENABLED
-       << Prefs :: DIR_WATCH
-       << Prefs :: DOWNLOAD_DIR
-       << Prefs :: INCOMPLETE_DIR
-       << Prefs :: INCOMPLETE_DIR_ENABLED
-       << Prefs :: SCRIPT_TORRENT_DONE_FILENAME;
+  keys << Prefs::RPC_ENABLED
+       << Prefs::ALT_SPEED_LIMIT_ENABLED
+       << Prefs::ALT_SPEED_LIMIT_TIME_ENABLED
+       << Prefs::ENCRYPTION
+       << Prefs::BLOCKLIST_ENABLED
+       << Prefs::DIR_WATCH
+       << Prefs::DOWNLOAD_DIR
+       << Prefs::INCOMPLETE_DIR
+       << Prefs::INCOMPLETE_DIR_ENABLED
+       << Prefs::SCRIPT_TORRENT_DONE_FILENAME;
   foreach (int key, keys)
     refreshPref (key);
@@ -683 +683 @@
 }
 
-PrefsDialog :: ~PrefsDialog ()
-{
-}
-
-void
-PrefsDialog :: setPref (int key, const QVariant& v)
+PrefsDialog::~PrefsDialog ()
+{
+}
+
+void
+PrefsDialog::setPref (int key, const QVariant& v)
 {
   myPrefs.set (key, v);
@@ -699 +699 @@
 
 void
-PrefsDialog :: sessionUpdated ()
+PrefsDialog::sessionUpdated ()
 {
   updateBlocklistLabel ();
@@ -705 +705 @@
 
 void
-PrefsDialog :: updateBlocklistLabel ()
+PrefsDialog::updateBlocklistLabel ()
 {
   const int n = mySession.blocklistSize ();
@@ -712 +712 @@
 
 void
-PrefsDialog :: refreshPref (int key)
+PrefsDialog::refreshPref (int key)
 {
   switch (key)
     {
-      case Prefs :: RPC_ENABLED:
-      case Prefs :: RPC_WHITELIST_ENABLED:
-      case Prefs :: RPC_AUTH_REQUIRED:
+      case Prefs::RPC_ENABLED:
+      case Prefs::RPC_WHITELIST_ENABLED:
+      case Prefs::RPC_AUTH_REQUIRED:
         {
           const bool enabled (myPrefs.getBool (Prefs::RPC_ENABLED));
@@ -729 +729 @@
         }
 
-      case Prefs :: ALT_SPEED_LIMIT_TIME_ENABLED:
+      case Prefs::ALT_SPEED_LIMIT_TIME_ENABLED:
         {
           const bool enabled = myPrefs.getBool (key);
@@ -736 +736 @@
         }
 
-      case Prefs :: BLOCKLIST_ENABLED:
+      case Prefs::BLOCKLIST_ENABLED:
         {
           const bool enabled = myPrefs.getBool (key);
@@ -743 +743 @@
         }
 
-      case Prefs :: DIR_WATCH:
+      case Prefs::DIR_WATCH:
         myWatchButton->setText (QFileInfo(myPrefs.getString(Prefs::DIR_WATCH)).fileName());
         break;
 
-      case Prefs :: SCRIPT_TORRENT_DONE_FILENAME:
+      case Prefs::SCRIPT_TORRENT_DONE_FILENAME:
         {
           const QString path (myPrefs.getString (key));
@@ -754 +754 @@
         }
 
-      case Prefs :: PEER_PORT:
+      case Prefs::PEER_PORT:
         myPortLabel->setText (tr ("Status unknown"));
         myPortButton->setEnabled (true);
         break;
 
-      case Prefs :: DOWNLOAD_DIR:
+      case Prefs::DOWNLOAD_DIR:
         {
           const QString path (myPrefs.getString (key));
@@ -767 +767 @@
         }
 
-      case Prefs :: INCOMPLETE_DIR:
+      case Prefs::INCOMPLETE_DIR:
         {
           QString path (myPrefs.getString (key));
@@ -774 +774 @@
         }
 
-      case Prefs :: INCOMPLETE_DIR_ENABLED:
+      case Prefs::INCOMPLETE_DIR_ENABLED:
         {
           const bool enabled = myPrefs.getBool (key);
@@ -826 +826 @@
 
 bool
-PrefsDialog :: isAllowed (int key) const
+PrefsDialog::isAllowed (int key) const
 {
   Q_UNUSED (key);

trunk/qt/prefs.cc

@@ -126 +126 @@
 ***/
 
-Prefs :: Prefs (const char * configDir):
+Prefs::Prefs (const char * configDir):
   myConfigDir (QString::fromUtf8 (configDir))
 {
@@ -188 +188 @@
           case QVariant::DateTime:
             if (tr_variantGetInt (b, &intVal))
-                myValues[i].setValue (QDateTime :: fromTime_t (intVal));
+                myValues[i].setValue (QDateTime::fromTime_t (intVal));
             break;
 
@@ -200 +200 @@
 }
 
-Prefs :: ~Prefs ()
+Prefs::~Prefs ()
 {
   // make a dict from settings.json
@@ -274 +274 @@
  */
 void
-Prefs :: initDefaults (tr_variant * d)
+Prefs::initDefaults (tr_variant * d)
 {
   tr_variantDictReserve (d, 38);
@@ -322 +322 @@
 
 bool
-Prefs :: getBool (int key) const
+Prefs::getBool (int key) const
 {
   assert (myItems[key].type == QVariant::Bool);
@@ -329 +329 @@
 
 QString
-Prefs :: getString (int key) const
+Prefs::getString (int key) const
 {
   assert (myItems[key].type == QVariant::String);
@@ -339 +339 @@
 
 int
-Prefs :: getInt (int key) const
+Prefs::getInt (int key) const
 {
   assert (myItems[key].type == QVariant::Int);
@@ -346 +346 @@
 
 double
-Prefs :: getDouble (int key) const
+Prefs::getDouble (int key) const
 {
   assert (myItems[key].type == QVariant::Double);
@@ -353 +353 @@
 
 QDateTime
-Prefs :: getDateTime (int key) const
+Prefs::getDateTime (int key) const
 {
   assert (myItems[key].type == QVariant::DateTime);
@@ -364 +364 @@
 
 void
-Prefs :: toggleBool (int key)
+Prefs::toggleBool (int key)
 {
   set (key, !getBool(key));

trunk/qt/relocate.cc

@@ -27 +27 @@
 #include "utils.h"
 
-bool RelocateDialog :: myMoveFlag = true;
+bool RelocateDialog::myMoveFlag = true;
 
 void
-RelocateDialog :: onSetLocation ()
+RelocateDialog::onSetLocation ()
 {
   mySession.torrentSetLocation (myIds, myPath, myMoveFlag);
@@ -37 +37 @@
 
 void
-RelocateDialog :: onFileSelected (const QString& path)
+RelocateDialog::onFileSelected (const QString& path)
 {
   myPath = path;
@@ -44 +44 @@
 
 void
-RelocateDialog :: onDirButtonClicked ()
+RelocateDialog::onDirButtonClicked ()
 {
   const QString title = tr ("Select Location");
@@ -54 +54 @@
 
 void
-RelocateDialog :: onMoveToggled (bool b)
+RelocateDialog::onMoveToggled (bool b)
 {
   myMoveFlag = b;
 }
 
-RelocateDialog :: RelocateDialog (Session          & session,
-                                  TorrentModel     & model,
-                                  const QSet<int>  & ids,
-                                  QWidget          * parent):
+RelocateDialog::RelocateDialog (Session          & session,
+                                TorrentModel     & model,
+                                const QSet<int>  & ids,
+                                QWidget          * parent):
   QDialog (parent),
   mySession (session),
@@ -68 +68 @@
   myIds (ids)
 {
-  const int iconSize (style ()->pixelMetric (QStyle :: PM_SmallIconSize));
+  const int iconSize (style ()->pixelMetric (QStyle::PM_SmallIconSize));
   const QFileIconProvider iconProvider;
   const QIcon folderIcon = iconProvider.icon (QFileIconProvider::Folder);

trunk/qt/session-dialog.cc

@@ -26 +26 @@
 
 void
-SessionDialog :: onAccepted ()
+SessionDialog::onAccepted ()
 {
   myPrefs.set (Prefs::SESSION_IS_REMOTE, myRemoteRadioButton->isChecked ());
@@ -39 +39 @@
 
 void
-SessionDialog :: resensitize ()
+SessionDialog::resensitize ()
 {
   const bool isRemote = myRemoteRadioButton->isChecked();
@@ -55 +55 @@
 ***/
 
-SessionDialog :: SessionDialog (Session& session, Prefs& prefs, QWidget * parent):
+SessionDialog::SessionDialog (Session& session, Prefs& prefs, QWidget * parent):
   QDialog (parent),
   mySession (session),
@@ -68 +68 @@
   setWindowTitle (tr ("Change Session"));
   QVBoxLayout * top = new QVBoxLayout (this);
-  top->setSpacing (HIG :: PAD);
+  top->setSpacing (HIG::PAD);
 
   HIG * hig = new HIG;

trunk/qt/session.cc

@@ -90 +90 @@
 
 void
-FileAdded :: executed (int64_t tag, const QString& result, struct tr_variant * arguments)
+FileAdded::executed (int64_t tag, const QString& result, struct tr_variant * arguments)
 {
   Q_UNUSED (arguments);
@@ -127 +127 @@
 
 void
-Session :: sessionSet (const tr_quark key, const QVariant& value)
+Session::sessionSet (const tr_quark key, const QVariant& value)
 {
   tr_variant top;
@@ -146 +146 @@
 
 void
-Session :: portTest ()
+Session::portTest ()
 {
   tr_variant top;
@@ -157 +157 @@
 
 void
-Session :: copyMagnetLinkToClipboard (int torrentId)
+Session::copyMagnetLinkToClipboard (int torrentId)
 {
   tr_variant top;
@@ -171 +171 @@
 
 void
-Session :: updatePref (int key)
+Session::updatePref (int key)
 {
   if (myPrefs.isCore (key)) switch (key)
     {
-      case Prefs :: ALT_SPEED_LIMIT_DOWN:
-      case Prefs :: ALT_SPEED_LIMIT_ENABLED:
-      case Prefs :: ALT_SPEED_LIMIT_TIME_BEGIN:
-      case Prefs :: ALT_SPEED_LIMIT_TIME_DAY:
-      case Prefs :: ALT_SPEED_LIMIT_TIME_ENABLED:
-      case Prefs :: ALT_SPEED_LIMIT_TIME_END:
-      case Prefs :: ALT_SPEED_LIMIT_UP:
-      case Prefs :: BLOCKLIST_DATE:
-      case Prefs :: BLOCKLIST_ENABLED:
-      case Prefs :: BLOCKLIST_URL:
-      case Prefs :: DHT_ENABLED:
-      case Prefs :: DOWNLOAD_QUEUE_ENABLED:
-      case Prefs :: DOWNLOAD_QUEUE_SIZE:
-      case Prefs :: DSPEED:
-      case Prefs :: DSPEED_ENABLED:
-      case Prefs :: IDLE_LIMIT:
-      case Prefs :: IDLE_LIMIT_ENABLED:
-      case Prefs :: INCOMPLETE_DIR:
-      case Prefs :: INCOMPLETE_DIR_ENABLED:
-      case Prefs :: LPD_ENABLED:
-      case Prefs :: PEER_LIMIT_GLOBAL:
-      case Prefs :: PEER_LIMIT_TORRENT:
-      case Prefs :: PEER_PORT:
-      case Prefs :: PEER_PORT_RANDOM_ON_START:
-      case Prefs :: QUEUE_STALLED_MINUTES:
-      case Prefs :: PEX_ENABLED:
-      case Prefs :: PORT_FORWARDING:
-      case Prefs :: RENAME_PARTIAL_FILES:
-      case Prefs :: SCRIPT_TORRENT_DONE_ENABLED:
-      case Prefs :: SCRIPT_TORRENT_DONE_FILENAME:
-      case Prefs :: START:
-      case Prefs :: TRASH_ORIGINAL:
-      case Prefs :: USPEED:
-      case Prefs :: USPEED_ENABLED:
-      case Prefs :: UTP_ENABLED:
+      case Prefs::ALT_SPEED_LIMIT_DOWN:
+      case Prefs::ALT_SPEED_LIMIT_ENABLED:
+      case Prefs::ALT_SPEED_LIMIT_TIME_BEGIN:
+      case Prefs::ALT_SPEED_LIMIT_TIME_DAY:
+      case Prefs::ALT_SPEED_LIMIT_TIME_ENABLED:
+      case Prefs::ALT_SPEED_LIMIT_TIME_END:
+      case Prefs::ALT_SPEED_LIMIT_UP:
+      case Prefs::BLOCKLIST_DATE:
+      case Prefs::BLOCKLIST_ENABLED:
+      case Prefs::BLOCKLIST_URL:
+      case Prefs::DHT_ENABLED:
+      case Prefs::DOWNLOAD_QUEUE_ENABLED:
+      case Prefs::DOWNLOAD_QUEUE_SIZE:
+      case Prefs::DSPEED:
+      case Prefs::DSPEED_ENABLED:
+      case Prefs::IDLE_LIMIT:
+      case Prefs::IDLE_LIMIT_ENABLED:
+      case Prefs::INCOMPLETE_DIR:
+      case Prefs::INCOMPLETE_DIR_ENABLED:
+      case Prefs::LPD_ENABLED:
+      case Prefs::PEER_LIMIT_GLOBAL:
+      case Prefs::PEER_LIMIT_TORRENT:
+      case Prefs::PEER_PORT:
+      case Prefs::PEER_PORT_RANDOM_ON_START:
+      case Prefs::QUEUE_STALLED_MINUTES:
+      case Prefs::PEX_ENABLED:
+      case Prefs::PORT_FORWARDING:
+      case Prefs::RENAME_PARTIAL_FILES:
+      case Prefs::SCRIPT_TORRENT_DONE_ENABLED:
+      case Prefs::SCRIPT_TORRENT_DONE_FILENAME:
+      case Prefs::START:
+      case Prefs::TRASH_ORIGINAL:
+      case Prefs::USPEED:
+      case Prefs::USPEED_ENABLED:
+      case Prefs::UTP_ENABLED:
         sessionSet (myPrefs.getKey (key), myPrefs.variant (key));
         break;
 
-      case Prefs :: DOWNLOAD_DIR:
+      case Prefs::DOWNLOAD_DIR:
         sessionSet (myPrefs.getKey (key), myPrefs.variant (key));
         /* this will change the 'freespace' argument, so refresh */
@@ -219 +219 @@
         break;
 
-      case Prefs :: RATIO:
+      case Prefs::RATIO:
         sessionSet (TR_KEY_seedRatioLimit, myPrefs.variant (key));
         break;
-      case Prefs :: RATIO_ENABLED:
+      case Prefs::RATIO_ENABLED:
         sessionSet (TR_KEY_seedRatioLimited, myPrefs.variant (key));
         break;
 
-      case Prefs :: ENCRYPTION:
+      case Prefs::ENCRYPTION:
         {
           const int i = myPrefs.variant (key).toInt ();
@@ -244 +244 @@
         }
 
-      case Prefs :: RPC_AUTH_REQUIRED:
+      case Prefs::RPC_AUTH_REQUIRED:
         if (mySession)
           tr_sessionSetRPCPasswordEnabled (mySession, myPrefs.getBool (key));
         break;
 
-      case Prefs :: RPC_ENABLED:
+      case Prefs::RPC_ENABLED:
         if (mySession)
           tr_sessionSetRPCEnabled (mySession, myPrefs.getBool (key));
         break;
 
-      case Prefs :: RPC_PASSWORD:
+      case Prefs::RPC_PASSWORD:
         if (mySession)
           tr_sessionSetRPCPassword (mySession, myPrefs.getString (key).toUtf8 ().constData ());
         break;
 
-      case Prefs :: RPC_PORT:
+      case Prefs::RPC_PORT:
         if (mySession)
           tr_sessionSetRPCPort (mySession, myPrefs.getInt (key));
         break;
 
-      case Prefs :: RPC_USERNAME:
+      case Prefs::RPC_USERNAME:
         if (mySession)
           tr_sessionSetRPCUsername (mySession, myPrefs.getString (key).toUtf8 ().constData ());
         break;
 
-      case Prefs :: RPC_WHITELIST_ENABLED:
+      case Prefs::RPC_WHITELIST_ENABLED:
         if (mySession)
           tr_sessionSetRPCWhitelistEnabled (mySession, myPrefs.getBool (key));
         break;
 
-      case Prefs :: RPC_WHITELIST:
+      case Prefs::RPC_WHITELIST:
         if (mySession)
           tr_sessionSetRPCWhitelist (mySession, myPrefs.getString (key).toUtf8 ().constData ());
@@ -288 +288 @@
 ***/
 
-Session :: Session (const char * configDir, Prefs& prefs):
+Session::Session (const char * configDir, Prefs& prefs):
   nextUniqueTag (FIRST_UNIQUE_TAG),
   myBlocklistSize (-1),
@@ -310 +310 @@
 }
 
-Session :: ~Session ()
+Session::~Session ()
 {
     stop ();
@@ -316 +316 @@
 
 QNetworkAccessManager *
-Session :: networkAccessManager ()
+Session::networkAccessManager ()
 {
   if (myNAM == 0)
@@ -337 +337 @@
 
 void
-Session :: stop ()
+Session::stop ()
 {
   if (myNAM != 0)
@@ -355 +355 @@
 
 void
-Session :: restart ()
+Session::restart ()
 {
   stop ();
@@ -362 +362 @@
 
 void
-Session :: start ()
+Session::start ()
 {
   if (myPrefs.get<bool> (Prefs::SESSION_IS_REMOTE))
@@ -397 +397 @@
 
 bool
-Session :: isServer () const
+Session::isServer () const
 {
   return mySession != 0;
@@ -403 +403 @@
 
 bool
-Session :: isLocal () const
+Session::isLocal () const
 {
   if (mySession != 0)
@@ -448 +448 @@
 
 void
-Session :: torrentSet (const QSet<int>& ids, const tr_quark key, double value)
+Session::torrentSet (const QSet<int>& ids, const tr_quark key, double value)
 {
   tr_variant top;
@@ -461 +461 @@
 
 void
-Session :: torrentSet (const QSet<int>& ids, const tr_quark key, int value)
+Session::torrentSet (const QSet<int>& ids, const tr_quark key, int value)
 {
   tr_variant top;
@@ -474 +474 @@
 
 void
-Session :: torrentSet (const QSet<int>& ids, const tr_quark key, bool value)
+Session::torrentSet (const QSet<int>& ids, const tr_quark key, bool value)
 {
   tr_variant top;
@@ -487 +487 @@
 
 void
-Session :: torrentSet (const QSet<int>& ids, const tr_quark key, const QStringList& value)
+Session::torrentSet (const QSet<int>& ids, const tr_quark key, const QStringList& value)
 {
   tr_variant top;
@@ -502 +502 @@
 
 void
-Session :: torrentSet (const QSet<int>& ids, const tr_quark key, const QList<int>& value)
+Session::torrentSet (const QSet<int>& ids, const tr_quark key, const QList<int>& value)
 {
   tr_variant top;
@@ -517 +517 @@
 
 void
-Session :: torrentSet (const QSet<int>& ids, const tr_quark key, const QPair<int,QString>& value)
+Session::torrentSet (const QSet<int>& ids, const tr_quark key, const QPair<int,QString>& value)
 {
   tr_variant top;
@@ -532 +532 @@
 
 void
-Session :: torrentSetLocation (const QSet<int>& ids, const QString& location, bool doMove)
+Session::torrentSetLocation (const QSet<int>& ids, const QString& location, bool doMove)
 {
   tr_variant top;
@@ -546 +546 @@
 
 void
-Session :: torrentRenamePath (const QSet<int>& ids, const QString& oldpath, const QString& newname)
+Session::torrentRenamePath (const QSet<int>& ids, const QString& oldpath, const QString& newname)
 {
   tr_variant top;
@@ -561 +561 @@
 
 void
-Session :: refreshTorrents (const QSet<int>& ids)
+Session::refreshTorrents (const QSet<int>& ids)
 {
   if (ids.empty ())
@@ -582 +582 @@
 
 void
-Session :: refreshExtraStats (const QSet<int>& ids)
+Session::refreshExtraStats (const QSet<int>& ids)
 {
   tr_variant top;
@@ -596 +596 @@
 
 void
-Session :: sendTorrentRequest (const char * request, const QSet<int>& ids)
+Session::sendTorrentRequest (const char * request, const QSet<int>& ids)
 {
   tr_variant top;
@@ -608 +608 @@
 }
 
-void Session :: pauseTorrents    (const QSet<int>& ids) { sendTorrentRequest ("torrent-stop",      ids); }
-void Session :: startTorrents    (const QSet<int>& ids) { sendTorrentRequest ("torrent-start",     ids); } 
-void Session :: startTorrentsNow (const QSet<int>& ids) { sendTorrentRequest ("torrent-start-now", ids); }
-void Session :: queueMoveTop     (const QSet<int>& ids) { sendTorrentRequest ("queue-move-top",    ids); } 
-void Session :: queueMoveUp      (const QSet<int>& ids) { sendTorrentRequest ("queue-move-up",     ids); } 
-void Session :: queueMoveDown    (const QSet<int>& ids) { sendTorrentRequest ("queue-move-down",   ids); } 
-void Session :: queueMoveBottom  (const QSet<int>& ids) { sendTorrentRequest ("queue-move-bottom", ids); } 
-
-void
-Session :: refreshActiveTorrents ()
+void Session::pauseTorrents    (const QSet<int>& ids) { sendTorrentRequest ("torrent-stop",      ids); }
+void Session::startTorrents    (const QSet<int>& ids) { sendTorrentRequest ("torrent-start",     ids); } 
+void Session::startTorrentsNow (const QSet<int>& ids) { sendTorrentRequest ("torrent-start-now", ids); }
+void Session::queueMoveTop     (const QSet<int>& ids) { sendTorrentRequest ("queue-move-top",    ids); } 
+void Session::queueMoveUp      (const QSet<int>& ids) { sendTorrentRequest ("queue-move-up",     ids); } 
+void Session::queueMoveDown    (const QSet<int>& ids) { sendTorrentRequest ("queue-move-down",   ids); } 
+void Session::queueMoveBottom  (const QSet<int>& ids) { sendTorrentRequest ("queue-move-bottom", ids); } 
+
+void
+Session::refreshActiveTorrents ()
 {
   tr_variant top;
@@ -631 +631 @@
 
 void
-Session :: refreshAllTorrents ()
+Session::refreshAllTorrents ()
 {
   tr_variant top;
@@ -644 +644 @@
 
 void
-Session :: initTorrents (const QSet<int>& ids)
+Session::initTorrents (const QSet<int>& ids)
 {
   tr_variant top;
@@ -656 +656 @@
 
 void
-Session :: refreshSessionStats ()
+Session::refreshSessionStats ()
 {
   tr_variant top;
@@ -667 +667 @@
 
 void
-Session :: refreshSessionInfo ()
+Session::refreshSessionInfo ()
 {
   tr_variant top;
@@ -678 +678 @@
 
 void
-Session :: updateBlocklist ()
+Session::updateBlocklist ()
 {
   tr_variant top;
@@ -693 +693 @@
 
 void
-Session :: exec (const tr_variant * request)
+Session::exec (const tr_variant * request)
 {
   char * str = tr_variantToStr (request, TR_VARIANT_FMT_JSON_LEAN, NULL);
@@ -701 +701 @@
 
 void
-Session :: localSessionCallback (tr_session * s, struct evbuffer * json, void * vself)
+Session::localSessionCallback (tr_session * s, struct evbuffer * json, void * vself)
 {
   Q_UNUSED (s);
@@ -716 +716 @@
 
 void
-Session :: exec (const char * json)
+Session::exec (const char * json)
 {
   if (mySession )
@@ -752 +752 @@
 
 void
-Session :: onFinished (QNetworkReply * reply)
+Session::onFinished (QNetworkReply * reply)
 {
 #ifdef DEBUG_HTTP
@@ -790 +790 @@
 
 void
-Session :: onResponseReceived (const QByteArray& utf8)
+Session::onResponseReceived (const QByteArray& utf8)
 {
   parseResponse (utf8.constData (), utf8.length ());
@@ -796 +796 @@
 
 void
-Session :: parseResponse (const char * json, size_t jsonLength)
+Session::parseResponse (const char * json, size_t jsonLength)
 {
     tr_variant top;
@@ -921 +921 @@
 
 void
-Session :: updateStats (tr_variant * d, struct tr_session_stats * stats)
+Session::updateStats (tr_variant * d, struct tr_session_stats * stats)
 {
   int64_t i;
@@ -940 +940 @@
 
 void
-Session :: updateStats (tr_variant * d)
+Session::updateStats (tr_variant * d)
 {
   tr_variant * c;
@@ -954 +954 @@
 
 void
-Session :: updateInfo (tr_variant * d)
+Session::updateInfo (tr_variant * d)
 {
   int64_t i;
@@ -968 +968 @@
         continue;
 
-      if (i == Prefs :: ENCRYPTION)
+      if (i == Prefs::ENCRYPTION)
         {
           const char * val;
@@ -985 +985 @@
       switch (myPrefs.type (i))
         {
-          case QVariant :: Int:
+          case QVariant::Int:
             {
               int64_t val;
@@ -992 +992 @@
               break;
             }
-          case QVariant :: Double:
+          case QVariant::Double:
             {
               double val;
@@ -999 +999 @@
               break;
             }
-          case QVariant :: Bool:
+          case QVariant::Bool:
             {
               bool val;
@@ -1006 +1006 @@
               break;
             }
-          case TrTypes :: FilterModeType:
-          case TrTypes :: SortModeType:
-          case QVariant :: String:
+          case TrTypes::FilterModeType:
+          case TrTypes::SortModeType:
+          case QVariant::String:
             {
               const char * val;
@@ -1045 +1045 @@
     mySessionVersion = str;
 
-  //std::cerr << "Session :: updateInfo end" << std::endl;
+  //std::cerr << "Session::updateInfo end" << std::endl;
   connect (&myPrefs, SIGNAL (changed (int)), this, SLOT (updatePref (int)));
 
@@ -1052 +1052 @@
 
 void
-Session :: setBlocklistSize (int64_t i)
+Session::setBlocklistSize (int64_t i)
 {
   myBlocklistSize = i;
@@ -1060 +1060 @@
 
 void
-Session :: addTorrent (const AddData& addMe, tr_variant& top, bool trashOriginal)
+Session::addTorrent (const AddData& addMe, tr_variant& top, bool trashOriginal)
 {
   assert (tr_variantDictFind (&top, TR_KEY_method) == nullptr);
@@ -1114 +1114 @@
 
 void
-Session :: addTorrent (const AddData& addMe)
+Session::addTorrent (const AddData& addMe)
 {
   tr_variant top;
@@ -1125 +1125 @@
 
 void
-Session :: addNewlyCreatedTorrent (const QString& filename, const QString& localPath)
+Session::addNewlyCreatedTorrent (const QString& filename, const QString& localPath)
 {
   const QByteArray b64 = AddData (filename).toBase64 ();
@@ -1142 +1142 @@
 
 void
-Session :: removeTorrents (const QSet<int>& ids, bool deleteFiles)
+Session::removeTorrents (const QSet<int>& ids, bool deleteFiles)
 {
   if (!ids.isEmpty ())
@@ -1158 +1158 @@
 
 void
-Session :: verifyTorrents (const QSet<int>& ids)
+Session::verifyTorrents (const QSet<int>& ids)
 {
   if (!ids.isEmpty ())
@@ -1173 +1173 @@
 
 void
-Session :: reannounceTorrents (const QSet<int>& ids)
+Session::reannounceTorrents (const QSet<int>& ids)
 {
   if (!ids.isEmpty ())
@@ -1192 +1192 @@
 
 void
-Session :: launchWebInterface ()
+Session::launchWebInterface ()
 {
   QUrl url;
@@ -1208 +1208 @@
     }
 
-  QDesktopServices :: openUrl (url);
-}
+  QDesktopServices::openUrl (url);
+}

trunk/qt/squeezelabel.cc

@@ -48 +48 @@
 
 void
-SqueezeLabel :: init ()
+SqueezeLabel::init ()
 {
   setTextInteractionFlags(Qt::TextSelectableByMouse);
 }
 
-SqueezeLabel :: SqueezeLabel (const QString& text, QWidget *parent):
+SqueezeLabel::SqueezeLabel (const QString& text, QWidget * parent):
   QLabel (text, parent)
 {
@@ -59 +59 @@
 }
 
-SqueezeLabel :: SqueezeLabel (QWidget * parent):
+SqueezeLabel::SqueezeLabel (QWidget * parent):
   QLabel (parent)
 {
@@ -66 +66 @@
 
 void
-SqueezeLabel :: paintEvent (QPaintEvent * paintEvent)
+SqueezeLabel::paintEvent (QPaintEvent * paintEvent)
 {
   Q_UNUSED (paintEvent);

trunk/qt/stats-dialog.cc

@@ -23 +23 @@
 };
 
-StatsDialog :: StatsDialog (Session & session, QWidget * parent):
+StatsDialog::StatsDialog (Session& session, QWidget * parent):
   QDialog (parent, Qt::Dialog),
   mySession (session),
@@ -58 +58 @@
 }
 
-StatsDialog :: ~StatsDialog ()
+StatsDialog::~StatsDialog ()
 {
 }
 
 void
-StatsDialog :: setVisible (bool visible)
+StatsDialog::setVisible (bool visible)
 {
   myTimer->stop ();
@@ -72 +72 @@
 
 void
-StatsDialog :: onTimer ()
+StatsDialog::onTimer ()
 {
   mySession.refreshSessionStats ();
@@ -78 +78 @@
 
 void
-StatsDialog :: updateStats ()
+StatsDialog::updateStats ()
 {
   const struct tr_session_stats& current (mySession.getStats ());

trunk/qt/torrent-delegate-min.cc

@@ -45 +45 @@
 
 QSize
-TorrentDelegateMin :: sizeHint (const QStyleOptionViewItem & option,
-                                const Torrent              & tor) const
+TorrentDelegateMin::sizeHint (const QStyleOptionViewItem & option,
+                              const Torrent              & tor) const
 {
   const QStyle* style (QApplication::style());
-  static const int iconSize (style->pixelMetric (QStyle :: PM_SmallIconSize));
+  static const int iconSize (style->pixelMetric (QStyle::PM_SmallIconSize));
 
   QFont nameFont (option.font);
@@ -72 +72 @@
 
 void
-TorrentDelegateMin :: drawTorrent (QPainter                   * painter,
-                                   const QStyleOptionViewItem & option,
-                                   const Torrent              & tor) const
+TorrentDelegateMin::drawTorrent (QPainter                   * painter,
+                                 const QStyleOptionViewItem & option,
+                                 const Torrent              & tor) const
 {
   const bool isPaused (tor.isPaused());
   const QStyle * style (QApplication::style());
-  static const int iconSize (style->pixelMetric (QStyle :: PM_SmallIconSize));
+  static const int iconSize (style->pixelMetric (QStyle::PM_SmallIconSize));
 
   QFont nameFont (option.font);

trunk/qt/torrent-delegate.cc

@@ -32 +32 @@
 };
 
-QColor TorrentDelegate :: greenBrush;
-QColor TorrentDelegate :: blueBrush;
-QColor TorrentDelegate :: silverBrush;
-QColor TorrentDelegate :: greenBack;
-QColor TorrentDelegate :: blueBack;
-QColor TorrentDelegate :: silverBack;
-
-TorrentDelegate :: TorrentDelegate (QObject * parent):
+QColor TorrentDelegate::greenBrush;
+QColor TorrentDelegate::blueBrush;
+QColor TorrentDelegate::silverBrush;
+QColor TorrentDelegate::greenBack;
+QColor TorrentDelegate::blueBack;
+QColor TorrentDelegate::silverBack;
+
+TorrentDelegate::TorrentDelegate (QObject * parent):
   QStyledItemDelegate (parent),
   myProgressBarStyle (new QStyleOptionProgressBar)
@@ -56 +56 @@
 }
 
-TorrentDelegate :: ~TorrentDelegate ()
+TorrentDelegate::~TorrentDelegate ()
 {
   delete myProgressBarStyle;
@@ -66 +66 @@
 
 QSize
-TorrentDelegate :: margin (const QStyle& style) const
+TorrentDelegate::margin (const QStyle& style) const
 {
   Q_UNUSED (style);
@@ -74 +74 @@
 
 QString
-TorrentDelegate :: progressString (const Torrent& tor) const
+TorrentDelegate::progressString (const Torrent& tor) const
 {
   const bool isMagnet (!tor.hasMetadata());
@@ -173 +173 @@
 
 QString
-TorrentDelegate :: shortTransferString (const Torrent& tor) const
+TorrentDelegate::shortTransferString (const Torrent& tor) const
 {
   QString str;
@@ -192 +192 @@
 
 QString
-TorrentDelegate :: shortStatusString (const Torrent& tor) const
+TorrentDelegate::shortStatusString (const Torrent& tor) const
 {
   QString str;
@@ -220 +220 @@
 
 QString
-TorrentDelegate :: statusString (const Torrent& tor) const
+TorrentDelegate::statusString (const Torrent& tor) const
 {
   QString str;
@@ -289 +289 @@
 
 QSize
-TorrentDelegate :: sizeHint (const QStyleOptionViewItem& option, const Torrent& tor) const
+TorrentDelegate::sizeHint (const QStyleOptionViewItem& option, const Torrent& tor) const
 {
   const QStyle* style (QApplication::style ());
@@ -315 +315 @@
 
 QSize
-TorrentDelegate :: sizeHint (const QStyleOptionViewItem  & option,
-                             const QModelIndex           & index) const
+TorrentDelegate::sizeHint (const QStyleOptionViewItem  & option,
+                           const QModelIndex           & index) const
 {
   const Torrent * tor (index.data (TorrentModel::TorrentRole).value<const Torrent*>());
@@ -323 +323 @@
 
 void
-TorrentDelegate :: paint (QPainter                    * painter,
-                          const QStyleOptionViewItem  & option,
-                          const QModelIndex           & index) const
+TorrentDelegate::paint (QPainter                    * painter,
+                        const QStyleOptionViewItem  & option,
+                        const QModelIndex           & index) const
 {
   const Torrent * tor (index.data (TorrentModel::TorrentRole).value<const Torrent*>());
@@ -335 +335 @@
 
 void
-TorrentDelegate :: setProgressBarPercentDone (const QStyleOptionViewItem & option,
-                                              const Torrent              & tor) const
+TorrentDelegate::setProgressBarPercentDone (const QStyleOptionViewItem & option,
+                                            const Torrent              & tor) const
 {
   double seedRatioLimit;
@@ -354 +354 @@
 
 void
-TorrentDelegate :: drawTorrent (QPainter                   * painter,
-                                const QStyleOptionViewItem & option,
-                                const Torrent              & tor) const
+TorrentDelegate::drawTorrent (QPainter                   * painter,
+                              const QStyleOptionViewItem & option,
+                              const Torrent              & tor) const
 {
   const QStyle * style (QApplication::style ());

trunk/qt/torrent-filter.cc

@@ -19 +19 @@
 #include "utils.h"
 
-TorrentFilter :: TorrentFilter (Prefs& prefs):
+TorrentFilter::TorrentFilter (Prefs& prefs):
   myPrefs (prefs)
 {
@@ -29 +29 @@
   // initialize our state from the current prefs
   QList<int> initKeys;
-  initKeys << Prefs :: SORT_MODE
-           << Prefs :: FILTER_MODE
-           << Prefs :: FILTER_TRACKERS
-           << Prefs :: FILTER_TEXT;
+  initKeys << Prefs::SORT_MODE
+           << Prefs::FILTER_MODE
+           << Prefs::FILTER_TRACKERS
+           << Prefs::FILTER_TEXT;
   foreach (int key, initKeys)
     refreshPref (key);
 }
 
-TorrentFilter :: ~TorrentFilter ()
+TorrentFilter::~TorrentFilter ()
 {
 }
 
 void
-TorrentFilter :: refreshPref (int key)
+TorrentFilter::refreshPref (int key)
 {
   switch (key)
     {
-      case Prefs :: FILTER_TEXT:
-      case Prefs :: FILTER_MODE:
-      case Prefs :: FILTER_TRACKERS:
+      case Prefs::FILTER_TEXT:
+      case Prefs::FILTER_MODE:
+      case Prefs::FILTER_TRACKERS:
         invalidateFilter ();
         /* force a re-sort */
         sort (0, !myPrefs.getBool(Prefs::SORT_REVERSED) ? Qt::AscendingOrder : Qt::DescendingOrder);
 
-      case Prefs :: SORT_MODE:
-      case Prefs :: SORT_REVERSED:
+      case Prefs::SORT_MODE:
+      case Prefs::SORT_REVERSED:
         sort (0, myPrefs.getBool(Prefs::SORT_REVERSED) ? Qt::AscendingOrder : Qt::DescendingOrder);
         invalidate ();
@@ -80 +80 @@
 
 bool
-TorrentFilter :: lessThan (const QModelIndex& left, const QModelIndex& right) const
+TorrentFilter::lessThan (const QModelIndex& left, const QModelIndex& right) const
 {
   int val = 0;
@@ -88 +88 @@
   switch (myPrefs.get<SortMode>(Prefs::SORT_MODE).mode())
     {
-      case SortMode :: SORT_BY_QUEUE:
+      case SortMode::SORT_BY_QUEUE:
         if (!val)
           val = -compare (a->queuePosition(), b->queuePosition());
         break;
 
-      case SortMode :: SORT_BY_SIZE:
+      case SortMode::SORT_BY_SIZE:
         if (!val)
           val = compare (a->sizeWhenDone(), b->sizeWhenDone());
         break;
 
-      case SortMode :: SORT_BY_AGE:
+      case SortMode::SORT_BY_AGE:
         val = compare (a->dateAdded().toTime_t(), b->dateAdded().toTime_t());
         break;
 
-      case SortMode :: SORT_BY_ID:
+      case SortMode::SORT_BY_ID:
         if (!val)
           val = compare (a->id(), b->id());
         break;
 
-      case SortMode :: SORT_BY_ACTIVITY:
+      case SortMode::SORT_BY_ACTIVITY:
         if (!val)
           val = compare (a->downloadSpeed() + a->uploadSpeed(), b->downloadSpeed() + b->uploadSpeed());
@@ -115 +115 @@
         // fall through
 
-      case SortMode :: SORT_BY_STATE:
+      case SortMode::SORT_BY_STATE:
         if (!val)
           val = -compare (a->isPaused(), b->isPaused());
@@ -126 +126 @@
         // fall through
 
-      case SortMode :: SORT_BY_PROGRESS:
+      case SortMode::SORT_BY_PROGRESS:
         if (!val)
           val = compare (a->percentComplete(), b->percentComplete());
@@ -134 +134 @@
           val = -compare (a->queuePosition(), b->queuePosition());
 
-      case SortMode :: SORT_BY_RATIO:
+      case SortMode::SORT_BY_RATIO:
         if (!val)
           val = a->compareRatio (*b);
         break;
 
-      case SortMode :: SORT_BY_ETA:
+      case SortMode::SORT_BY_ETA:
         if (!val)
           val = a->compareETA (*b);
@@ -163 +163 @@
 
 bool
-TorrentFilter :: trackerFilterAcceptsTorrent (const Torrent * tor, const QString& tracker) const
+TorrentFilter::trackerFilterAcceptsTorrent (const Torrent * tor, const QString& tracker) const
 {
   return tracker.isEmpty() || tor->hasTrackerSubstring (tracker);
@@ -169 +169 @@
 
 bool
-TorrentFilter :: activityFilterAcceptsTorrent (const Torrent * tor, const FilterMode& m) const
+TorrentFilter::activityFilterAcceptsTorrent (const Torrent * tor, const FilterMode& m) const
 {
   bool accepts;
@@ -212 +212 @@
 
 bool
-TorrentFilter :: filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const
+TorrentFilter::filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const
 {
   QModelIndex childIndex = sourceModel()->index (sourceRow, 0, sourceParent);
@@ -241 +241 @@
 
 int
-TorrentFilter :: hiddenRowCount () const
+TorrentFilter::hiddenRowCount () const
 {
   return sourceModel()->rowCount () - rowCount ();
@@ -247 +247 @@
 
 void
-TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const
+TorrentFilter::countTorrentsPerMode (int * setmeCounts) const
 {
   std::fill_n (setmeCounts, static_cast<std::size_t>(FilterMode::NUM_MODES), 0);

trunk/qt/torrent-model.cc

@@ -18 +18 @@
 
 void
-TorrentModel :: clear ()
+TorrentModel::clear ()
 {
   beginResetModel ();
@@ -31 +31 @@
 
 int
-TorrentModel :: rowCount (const QModelIndex& parent) const
+TorrentModel::rowCount (const QModelIndex& parent) const
 {
   Q_UNUSED (parent);
@@ -39 +39 @@
 
 QVariant
-TorrentModel :: data (const QModelIndex& index, int role) const
+TorrentModel::data (const QModelIndex& index, int role) const
 {
   QVariant var;
@@ -74 +74 @@
 
 void
-TorrentModel :: addTorrent (Torrent * t)
+TorrentModel::addTorrent (Torrent * t)
 {
   myIdToTorrent.insert (t->id (), t);
@@ -81 +81 @@
 }
 
-TorrentModel :: TorrentModel (Prefs& prefs):
+TorrentModel::TorrentModel (Prefs& prefs):
   myPrefs (prefs)
 {
 }
 
-TorrentModel :: ~TorrentModel ()
+TorrentModel::~TorrentModel ()
 {
   clear ();
@@ -96 +96 @@
 
 Torrent*
-TorrentModel :: getTorrentFromId (int id)
+TorrentModel::getTorrentFromId (int id)
 {
   id_to_torrent_t::iterator it (myIdToTorrent.find (id));
@@ -103 +103 @@
 
 const Torrent*
-TorrentModel :: getTorrentFromId (int id) const
+TorrentModel::getTorrentFromId (int id) const
 {
   id_to_torrent_t::const_iterator it (myIdToTorrent.find (id));
@@ -114 +114 @@
 
 void
-TorrentModel :: onTorrentChanged (int torrentId)
+TorrentModel::onTorrentChanged (int torrentId)
 {
   const int row (myIdToRow.value (torrentId, -1));
@@ -125 +125 @@
 
 void
-TorrentModel :: removeTorrents (tr_variant * torrents)
+TorrentModel::removeTorrents (tr_variant * torrents)
 {
   int i = 0;
@@ -138 +138 @@
 
 void
-TorrentModel :: updateTorrents (tr_variant * torrents, bool isCompleteList)
+TorrentModel::updateTorrents (tr_variant * torrents, bool isCompleteList)
 {
   QList<Torrent*> newTorrents;
@@ -214 +214 @@
 
 void
-TorrentModel :: removeTorrent (int id)
+TorrentModel::removeTorrent (int id)
 {
   const int row = myIdToRow.value (id, -1);
@@ -236 +236 @@
 
 void
-TorrentModel :: getTransferSpeed (Speed   & uploadSpeed,
-                                  size_t  & uploadPeerCount,
-                                  Speed   & downloadSpeed,
-                                  size_t  & downloadPeerCount)
+TorrentModel::getTransferSpeed (Speed   & uploadSpeed,
+                                size_t  & uploadPeerCount,
+                                Speed   & downloadSpeed,
+                                size_t  & downloadPeerCount)
 {
   Speed upSpeed, downSpeed;
@@ -260 +260 @@
 
 QSet<int>
-TorrentModel :: getIds () const
+TorrentModel::getIds () const
 {
   QSet<int> ids;
@@ -272 +272 @@
 
 bool
-TorrentModel :: hasTorrent (const QString& hashString) const
+TorrentModel::hasTorrent (const QString& hashString) const
 {
   foreach (const Torrent * tor, myTorrents)

trunk/qt/torrent.cc

@@ -30 +30 @@
 
 
-Torrent :: Torrent (Prefs& prefs, int id):
+Torrent::Torrent (Prefs& prefs, int id):
   magnetTorrent (false),
   myPrefs (prefs)
@@ -43 +43 @@
 }
 
-Torrent :: ~Torrent ()
+Torrent::~Torrent ()
 {
 }
@@ -51 +51 @@
 ***/
 
-Torrent :: Property
-Torrent :: myProperties[] =
+Torrent::Property
+Torrent::myProperties[] =
 {
   { ID, TR_KEY_id, QVariant::Int, INFO, },
@@ -112 +112 @@
 };
 
-Torrent :: KeyList
-Torrent :: buildKeyList (Group group)
+Torrent::KeyList
+Torrent::buildKeyList (Group group)
 {
   KeyList keys;
@@ -125 +125 @@
 }
 
-const Torrent :: KeyList&
-Torrent :: getInfoKeys ()
+const Torrent::KeyList&
+Torrent::getInfoKeys ()
 {
   static KeyList keys;
@@ -136 +136 @@
 }
 
-const Torrent :: KeyList&
-Torrent :: getStatKeys ()
+const Torrent::KeyList&
+Torrent::getStatKeys ()
 {
   static KeyList keys (buildKeyList(STAT));
@@ -143 +143 @@
 }
 
-const Torrent :: KeyList&
-Torrent :: getExtraStatKeys()
+const Torrent::KeyList&
+Torrent::getExtraStatKeys()
 {
   static KeyList keys;
@@ -155 +155 @@
 
 bool
-Torrent :: setInt (int i, int value)
+Torrent::setInt (int i, int value)
 {
   bool changed = false;
@@ -172 +172 @@
 
 bool
-Torrent :: setBool (int i, bool value)
+Torrent::setBool (int i, bool value)
 {
   bool changed = false;
@@ -189 +189 @@
 
 bool
-Torrent :: setDouble (int i, double value)
+Torrent::setDouble (int i, double value)
 {
   bool changed = false;
@@ -206 +206 @@
 
 bool
-Torrent :: setDateTime (int i, const QDateTime& value)
+Torrent::setDateTime (int i, const QDateTime& value)
 {
   bool changed = false;
@@ -223 +223 @@
 
 bool
-Torrent :: setSize (int i, qulonglong value)
+Torrent::setSize (int i, qulonglong value)
 {
   bool changed = false;
@@ -240 +240 @@
 
 bool
-Torrent :: setString (int i, const char * value)
+Torrent::setString (int i, const char * value)
 {
   bool changed = false;
@@ -257 +257 @@
 
 bool
-Torrent :: setIcon (int i, const QIcon& value)
+Torrent::setIcon (int i, const QIcon& value)
 {
   assert (0<=i && i<PROPERTY_COUNT);
@@ -267 +267 @@
 
 int
-Torrent :: getInt (int i) const
+Torrent::getInt (int i) const
 {
   assert (0<=i && i<PROPERTY_COUNT);
@@ -276 +276 @@
 
 QDateTime
-Torrent :: getDateTime (int i) const
+Torrent::getDateTime (int i) const
 {
   assert (0<=i && i<PROPERTY_COUNT);
@@ -285 +285 @@
 
 bool
-Torrent :: getBool (int i) const
+Torrent::getBool (int i) const
 {
   assert (0<=i && i<PROPERTY_COUNT);
@@ -294 +294 @@
 
 qulonglong
-Torrent :: getSize (int i) const
+Torrent::getSize (int i) const
 {
     assert (0<=i && i<PROPERTY_COUNT);
@@ -302 +302 @@
 }
 double
-Torrent :: getDouble (int i) const
+Torrent::getDouble (int i) const
 {
   assert (0<=i && i<PROPERTY_COUNT);
@@ -310 +310 @@
 }
 QString
-Torrent :: getString (int i) const
+Torrent::getString (int i) const
 {
   assert (0<=i && i<PROPERTY_COUNT);
@@ -318 +318 @@
 }
 QIcon
-Torrent :: getIcon (int i) const
+Torrent::getIcon (int i) const
 {
   assert (0<=i && i<PROPERTY_COUNT);
@@ -331 +331 @@
 
 bool
-Torrent :: getSeedRatio (double& ratio) const
+Torrent::getSeedRatio (double& ratio) const
 {
   bool isLimited;
@@ -343 +343 @@
 
       case TR_RATIOLIMIT_GLOBAL:
-        if ((isLimited = myPrefs.getBool (Prefs :: RATIO_ENABLED)))
-          ratio = myPrefs.getDouble (Prefs :: RATIO);
+        if ((isLimited = myPrefs.getBool (Prefs::RATIO_ENABLED)))
+          ratio = myPrefs.getDouble (Prefs::RATIO);
         break;
 
@@ -356 +356 @@
 
 bool
-Torrent :: hasFileSubstring (const QString& substr) const
+Torrent::hasFileSubstring (const QString& substr) const
 {
   foreach (const TrFile file, myFiles)
@@ -366 +366 @@
 
 bool
-Torrent :: hasTrackerSubstring (const QString& substr) const
+Torrent::hasTrackerSubstring (const QString& substr) const
 {
   foreach (QString s, myValues[TRACKERS].toStringList())
@@ -376 +376 @@
 
 int
-Torrent :: compareSeedRatio (const Torrent& that) const
+Torrent::compareSeedRatio (const Torrent& that) const
 {
   double a;
@@ -390 +390 @@
 
 int
-Torrent :: compareRatio (const Torrent& that) const
+Torrent::compareRatio (const Torrent& that) const
 {
   const double a = ratio ();
@@ -403 +403 @@
 
 int
-Torrent :: compareETA (const Torrent& that) const
+Torrent::compareETA (const Torrent& that) const
 {
   const bool haveA (hasETA ());
@@ -414 +414 @@
 
 int
-Torrent :: compareTracker (const Torrent& that) const
+Torrent::compareTracker (const Torrent& that) const
 {
   Q_UNUSED (that);
@@ -427 +427 @@
 
 void
-Torrent :: updateMimeIcon ()
+Torrent::updateMimeIcon ()
 {
   const FileList& files (myFiles);
@@ -436 +436 @@
     icon = QFileIconProvider().icon (QFileIconProvider::Folder);
   else if (files.size () == 1)
-    icon = Utils :: guessMimeIcon (files.at(0).filename);
+    icon = Utils::guessMimeIcon (files.at(0).filename);
   else
     icon = QIcon ();
@@ -448 +448 @@
 
 void
-Torrent :: notifyComplete () const
+Torrent::notifyComplete () const
 {
     // if someone wants to implement notification, here's the hook.
@@ -458 +458 @@
 
 void
-Torrent :: update (tr_variant * d)
+Torrent::update (tr_variant * d)
 {
   static bool lookup_initialized = false;
@@ -488 +488 @@
       switch (myProperties[property_index].type)
         {
-          case QVariant :: Int:
+          case QVariant::Int:
             {
               int64_t val;
@@ -495 +495 @@
               break;
             }
-          case QVariant :: Bool:
+          case QVariant::Bool:
             {
               bool val;
@@ -502 +502 @@
               break;
             }
-          case QVariant :: String:
+          case QVariant::String:
             {
               const char * val;
@@ -509 +509 @@
               break;
             }
-          case QVariant :: ULongLong:
+          case QVariant::ULongLong:
             {
               int64_t val;
@@ -516 +516 @@
               break;
             }
-          case QVariant :: Double:
+          case QVariant::Double:
             {
               double val;
@@ -523 +523 @@
               break;
             }
-          case QVariant :: DateTime:
+          case QVariant::DateTime:
             {
               int64_t val;
               if (tr_variantGetInt (child, &val) && val)
-                changed |= setDateTime (property_index, QDateTime :: fromTime_t(val));
+                changed |= setDateTime (property_index, QDateTime::fromTime_t(val));
               break;
             }
 
-          case QVariant :: StringList:
-          case TrTypes :: PeerList:
+          case QVariant::StringList:
+          case TrTypes::PeerList:
             // handled below
             break;
@@ -765 +765 @@
 
 QString
-Torrent :: activityString () const
+Torrent::activityString () const
 {
   QString str;
@@ -784 +784 @@
 
 QString
-Torrent :: getError () const
+Torrent::getError () const
 {
   QString s = getString (ERROR_STRING);
@@ -800 +800 @@
 
 QPixmap
-TrackerStat :: getFavicon () const
+TrackerStat::getFavicon () const
 {
   MyApp * myApp = dynamic_cast<MyApp*>(QApplication::instance());

trunk/qt/tracker-delegate.cc

@@ -34 +34 @@
 
 QSize
-TrackerDelegate :: margin (const QStyle& style) const
+TrackerDelegate::margin (const QStyle& style) const
 {
   Q_UNUSED (style);
@@ -46 +46 @@
 
 QSize
-TrackerDelegate :: sizeHint (const QStyleOptionViewItem & option,
-                             const TrackerInfo          & info) const
+TrackerDelegate::sizeHint (const QStyleOptionViewItem & option,
+                           const TrackerInfo          & info) const
 {
   Q_UNUSED (option);
@@ -53 +53 @@
   QPixmap favicon = info.st.getFavicon ();
 
-  const QString text = TrackerDelegate :: getText(info);
+  const QString text = TrackerDelegate::getText(info);
   QTextDocument textDoc;
   textDoc.setHtml (text);
@@ -63 +63 @@
 
 QSize
-TrackerDelegate :: sizeHint (const QStyleOptionViewItem  & option,
-                             const QModelIndex           & index) const
+TrackerDelegate::sizeHint (const QStyleOptionViewItem  & option,
+                           const QModelIndex           & index) const
 {
   const TrackerInfo trackerInfo = index.data (TrackerModel::TrackerRole).value<TrackerInfo>();
@@ -71 +71 @@
 
 void
-TrackerDelegate :: paint (QPainter                    * painter,
-                          const QStyleOptionViewItem  & option,
-                          const QModelIndex           & index) const
+TrackerDelegate::paint (QPainter                    * painter,
+                        const QStyleOptionViewItem  & option,
+                        const QModelIndex           & index) const
 {
   const TrackerInfo trackerInfo = index.data (TrackerModel::TrackerRole).value<TrackerInfo>();
@@ -85 +85 @@
 
 void
-TrackerDelegate :: drawTracker (QPainter                    * painter,
-                                const QStyleOptionViewItem  & option,
-                                const TrackerInfo           & inf) const
+TrackerDelegate::drawTracker (QPainter                    * painter,
+                              const QStyleOptionViewItem  & option,
+                              const TrackerInfo           & inf) const
 {
   painter->save();
@@ -111 +111 @@
 
 void
-TrackerDelegate :: setShowMore (bool b)
+TrackerDelegate::setShowMore (bool b)
 {
   myShowMore = b;
@@ -128 +128 @@
 
 QString
-TrackerDelegate :: getText (const TrackerInfo& inf) const
+TrackerDelegate::getText (const TrackerInfo& inf) const
 {
   QString key;

trunk/qt/tracker-model-filter.cc

@@ -11 +11 @@
 #include "tracker-model-filter.h"
 
-TrackerModelFilter :: TrackerModelFilter (QObject * parent):
+TrackerModelFilter::TrackerModelFilter (QObject * parent):
   QSortFilterProxyModel (parent),
   myShowBackups (false)
@@ -18 +18 @@
 
 void
-TrackerModelFilter :: setShowBackupTrackers (bool b)
+TrackerModelFilter::setShowBackupTrackers (bool b)
 {
   myShowBackups = b;
@@ -25 +25 @@
 
 bool
-TrackerModelFilter :: filterAcceptsRow (int                 sourceRow,
-                                        const QModelIndex & sourceParent) const
+TrackerModelFilter::filterAcceptsRow (int                 sourceRow,
+                                      const QModelIndex & sourceParent) const
 {
   QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);

trunk/qt/tracker-model.cc

@@ -16 +16 @@
 
 int
-TrackerModel :: rowCount (const QModelIndex& parent) const
+TrackerModel::rowCount (const QModelIndex& parent) const
 {
   Q_UNUSED (parent);
@@ -24 +24 @@
 
 QVariant
-TrackerModel :: data (const QModelIndex& index, int role) const
+TrackerModel::data (const QModelIndex& index, int role) const
 {
   QVariant var;
@@ -78 +78 @@
 
 void
-TrackerModel :: refresh (const TorrentModel& torrentModel, const QSet<int>& ids)
+TrackerModel::refresh (const TorrentModel& torrentModel, const QSet<int>& ids)
 {
   // build a list of the TrackerInfos
@@ -153 +153 @@
 
 int
-TrackerModel :: find (int torrentId, const QString& url) const
+TrackerModel::find (int torrentId, const QString& url) const
 {
   for (int i=0, n=myRows.size(); i<n; ++i)

trunk/qt/triconpushbutton.cc

@@ -17 +17 @@
 #include "triconpushbutton.h"
 
-TrIconPushButton :: TrIconPushButton (QWidget * parent):
+TrIconPushButton::TrIconPushButton (QWidget * parent):
   QPushButton (parent)
 {
 }
 
-TrIconPushButton :: TrIconPushButton (const QIcon& icon, QWidget * parent):
+TrIconPushButton::TrIconPushButton (const QIcon& icon, QWidget * parent):
   QPushButton (parent)
 {
@@ -29 +29 @@
 
 QSize
-TrIconPushButton :: sizeHint () const
+TrIconPushButton::sizeHint () const
 {
   QSize s = iconSize ();
@@ -37 +37 @@
 
 void
-TrIconPushButton :: paintEvent (QPaintEvent *)
+TrIconPushButton::paintEvent (QPaintEvent *)
 {
   QStylePainter p (this);

trunk/qt/utils.cc

@@ -41 +41 @@
 
 QString
-Utils :: remoteFileChooser (QWidget * parent, const QString& title, const QString& myPath, bool dir, bool local)
+Utils::remoteFileChooser (QWidget * parent, const QString& title, const QString& myPath, bool dir, bool local)
 {
   QString path;
@@ -61 +61 @@
 
 void
-Utils :: toStderr (const QString& str)
+Utils::toStderr (const QString& str)
 {
   std::cerr << qPrintable(str) << std::endl;
@@ -108 +108 @@
 
 QIcon
-Utils :: guessMimeIcon (const QString& filename)
+Utils::guessMimeIcon (const QString& filename)
 {
 #ifdef _WIN32
@@ -134 +134 @@
   if (fileIcons[0].isNull ())
     {
-      fallback = QApplication::style()->standardIcon (QStyle :: SP_FileIcon);
+      fallback = QApplication::style()->standardIcon (QStyle::SP_FileIcon);
 
       suffixes[DISK] << QString::fromLatin1("iso");
@@ -189 +189 @@
 
 bool
-Utils :: isValidUtf8  (const char *s)
+Utils::isValidUtf8 (const char * s)
 {
   int n;  // number of bytes in a UTF-8 sequence
@@ -212 +212 @@
 
 QString
-Utils :: removeTrailingDirSeparator (const QString& path)
+Utils::removeTrailingDirSeparator (const QString& path)
 {
   return path.endsWith (QDir::separator ())

trunk/qt/watchdir.cc

@@ -24 +24 @@
 ***/
 
-WatchDir :: WatchDir (const TorrentModel& model):
+WatchDir::WatchDir (const TorrentModel& model):
   myModel (model),
   myWatcher (0)
@@ -30 +30 @@
 }
 
-WatchDir :: ~WatchDir ()
+WatchDir::~WatchDir ()
 {
 }
@@ -39 +39 @@
 
 int
-WatchDir :: metainfoTest (const QString& filename) const
+WatchDir::metainfoTest (const QString& filename) const
 {
   int ret;
@@ -63 +63 @@
 
 void
-WatchDir :: onTimeout ()
+WatchDir::onTimeout ()
 {
   QTimer * t = qobject_cast<QTimer*>(sender());
@@ -75 +75 @@
 
 void
-WatchDir :: setPath (const QString& path, bool isEnabled)
+WatchDir::setPath (const QString& path, bool isEnabled)
 {
   // clear out any remnants of the previous watcher, if any
@@ -98 +98 @@
 
 void
-WatchDir :: watcherActivated (const QString& path)
+WatchDir::watcherActivated (const QString& path)
 {
   const QDir dir(path);
@@ -143 +143 @@
 
 void
-WatchDir :: rescanAllWatchedDirectories ()
+WatchDir::rescanAllWatchedDirectories ()
 {
   if (myWatcher == nullptr)