Do not use void to denote argumentless functions in C++ code

diff --git a/qt/app.cc b/qt/app.cc
index 10ab3150c60bf59098cc2d217e699d41328f7b91..d21c9d3fbedd5a1d85274609d737fdc9a25f2c7b 100644 (file)
--- a/qt/app.cc
+++ b/qt/app.cc
@@ -61,14 +61,14 @@ namespace
   };
 
   const char*
-  getUsage (void)
+  getUsage ()
   {
     return "Usage:\n"
            "  transmission [OPTIONS...] [torrent files]";
   }
 
   void
-  showUsage (void)
+  showUsage ()
   {
     tr_getopt_usage (MY_READABLE_NAME, getUsage (), opts);
     exit (0);

diff --git a/qt/mainwin.h b/qt/mainwin.h
index a2ccb2525631fc6874c6ec319f754bcd15995946..d5a81cf5bb2f433834794f10aa7141e8968c05e5 100644 (file)
--- a/qt/mainwin.h
+++ b/qt/mainwin.h
@@ -145,8 +145,8 @@ class TrMainWindow: public QMainWindow
     QWidget * myFilterBar;
 
   private:
-    QMenu * createOptionsMenu (void);
-    QWidget * createStatusBar (void);
+    QMenu * createOptionsMenu ();
+    QWidget * createStatusBar ();
     QWidget * myStatusBar;
     QPushButton * myAltSpeedButton;
     QAction * myAltSpeedAction;

diff --git a/qt/make-dialog.cc b/qt/make-dialog.cc
index 197176d4f07737245634d689f5277b2415bd49be..a8bc3882b8ade5ef96fc7cb76e97d4e60a876fe7 100644 (file)
--- a/qt/make-dialog.cc
+++ b/qt/make-dialog.cc
@@ -354,7 +354,7 @@ MakeDialog::MakeDialog (Session& session, QWidget * parent):
     myDestination = QDir::homePath();
     b->setText (myDestination);
     connect (b, SIGNAL(clicked(bool)),
-             this, SLOT(onDestinationClicked(void)));
+             this, SLOT(onDestinationClicked()));
     myDestinationButton = b;
     hig->addRow (tr ("Sa&ve to:"), b);
 
@@ -366,7 +366,7 @@ MakeDialog::MakeDialog (Session& session, QWidget * parent):
     myFolderButton->setText (tr ("(None)"));
     myFolderButton->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
     connect (myFolderButton, SIGNAL(clicked(bool)),
-             this, SLOT(onFolderClicked(void)));
+             this, SLOT(onFolderClicked()));
     hig->addRow (myFolderRadio, myFolderButton);
     enableBuddyWhenChecked (myFolderRadio, myFolderButton);
 
@@ -381,7 +381,7 @@ MakeDialog::MakeDialog (Session& session, QWidget * parent):
     myFileButton->setIcon (filePixmap);
     myFileButton->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
     connect (myFileButton, SIGNAL(clicked(bool)),
-             this, SLOT(onFileClicked(void)));
+             this, SLOT(onFileClicked()));
     hig->addRow (myFileRadio, myFileButton);
     enableBuddyWhenChecked (myFileRadio, myFileButton);
 

diff --git a/qt/prefs-dialog.cc b/qt/prefs-dialog.cc
index 451b303fb4d81e5bdc7f086321e52ee6a652cf86..4129aec7c8fa5fe95f4aedf3ace6eaf25d63da64 100644 (file)
--- a/qt/prefs-dialog.cc
+++ b/qt/prefs-dialog.cc
@@ -476,7 +476,7 @@ PrefsDialog::createPrivacyTab ()
 ***/
 
 void
-PrefsDialog::onScriptClicked (void)
+PrefsDialog::onScriptClicked ()
 {
   const QString title = tr ("Select \"Torrent Done\" Script");
   const QString myPath = myPrefs.getString (Prefs::SCRIPT_TORRENT_DONE_FILENAME);
@@ -487,7 +487,7 @@ PrefsDialog::onScriptClicked (void)
 }
 
 void
-PrefsDialog::onIncompleteClicked (void)
+PrefsDialog::onIncompleteClicked ()
 {
   const QString title = tr ("Select Incomplete Directory");
   const QString myPath = myPrefs.getString (Prefs::INCOMPLETE_DIR);
@@ -498,7 +498,7 @@ PrefsDialog::onIncompleteClicked (void)
 }
 
 void
-PrefsDialog::onWatchClicked (void)
+PrefsDialog::onWatchClicked ()
 {
   const QString title = tr ("Select Watch Directory");
   const QString myPath = myPrefs.getString (Prefs::DIR_WATCH);
@@ -509,7 +509,7 @@ PrefsDialog::onWatchClicked (void)
 }
 
 void
-PrefsDialog::onDestinationClicked (void)
+PrefsDialog::onDestinationClicked ()
 {
   const QString title = tr ("Select Destination");
   const QString myPath = myPrefs.getString (Prefs::DOWNLOAD_DIR);
@@ -572,7 +572,7 @@ PrefsDialog::createDownloadingTab ()
     b = myWatchButton = new QPushButton;
     b->setIcon (folderPixmap);
     b->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
-    connect (b, SIGNAL(clicked(bool)), this, SLOT(onWatchClicked(void)));
+    connect (b, SIGNAL(clicked(bool)), this, SLOT(onWatchClicked()));
     hig->addRow (l, b);
     enableBuddyWhenChecked (qobject_cast<QCheckBox*>(l), b);
 
@@ -585,7 +585,7 @@ PrefsDialog::createDownloadingTab ()
     b = myDestinationButton = new QPushButton;
     b->setIcon (folderPixmap);
     b->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
-    connect (b, SIGNAL(clicked(bool)), this, SLOT(onDestinationClicked(void)));
+    connect (b, SIGNAL(clicked(bool)), this, SLOT(onDestinationClicked()));
     hig->addRow (tr ("Save to &Location:"), b);
 
     const QString downloadDir (myPrefs.getString(Prefs::DOWNLOAD_DIR));
@@ -610,7 +610,7 @@ PrefsDialog::createDownloadingTab ()
     b = myIncompleteButton = new QPushButton;
     b->setIcon (folderPixmap);
     b->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
-    connect (b, SIGNAL(clicked(bool)), this, SLOT(onIncompleteClicked(void)));
+    connect (b, SIGNAL(clicked(bool)), this, SLOT(onIncompleteClicked()));
     hig->addRow (myIncompleteCheckbox, b);
     enableBuddyWhenChecked (qobject_cast<QCheckBox*>(l), b);
 
@@ -618,7 +618,7 @@ PrefsDialog::createDownloadingTab ()
     b = myTorrentDoneScriptButton = new QPushButton;
     b->setIcon (filePixmap);
     b->setStyleSheet (QString::fromUtf8 ("text-align: left; padding-left: 5; padding-right: 5"));
-    connect (b, SIGNAL(clicked(bool)), this, SLOT(onScriptClicked(void)));
+    connect (b, SIGNAL(clicked(bool)), this, SLOT(onScriptClicked()));
     hig->addRow (myTorrentDoneScriptCheckbox, b);
     enableBuddyWhenChecked (qobject_cast<QCheckBox*>(l), b);