Changeset 14379

Timestamp:

Dec 12, 2014, 11:52:17 PM (8 years ago)

Author:

mikedld

Message:

Fix various cppcheck comments for Qt client code

Location:

trunk/qt

Files:

• app.cc (modified) (1 diff)
• app.h (modified) (1 diff)
• details.cc (modified) (4 diffs)
• file-tree.cc (modified) (2 diffs)
• filterbar.cc (modified) (1 diff)
• mainwin.cc (modified) (1 diff)
• mainwin.h (modified) (1 diff)
• torrent-model.cc (modified) (2 diffs)

trunk/qt/app.cc

@@ -309 +309 @@
 
 void
-MyApp::onTorrentsAdded (QSet<int> torrents)
+MyApp::onTorrentsAdded (const QSet<int>& torrents)
 {
   if (!myPrefs->getBool (Prefs::SHOW_NOTIFICATION_ON_ADD))

trunk/qt/app.h

@@ -58 +58 @@
     void refreshPref (int key);
     void refreshTorrents ();
-    void onTorrentsAdded (QSet<int>);
+    void onTorrentsAdded (const QSet<int>& torrents);
     void onTorrentCompleted (int);
     void onNewTorrentChanged (int);

trunk/qt/details.cc

@@ -99 +99 @@
     virtual ~PeerItem () {}
 
-    PeerItem (const Peer& p)
-    {
-      peer = p;
+    PeerItem (const Peer& p):
+      peer(p)
+    {
       int q[4];
       if (sscanf (p.address.toUtf8 ().constData (), "%d.%d.%d.%d", q+0, q+1, q+2, q+3) == 4)
@@ -409 +409 @@
   // myHaveLabel
   double sizeWhenDone = 0;
-  double leftUntilDone = 0;
   double available = 0;
-  int64_t haveTotal = 0;
-  int64_t haveVerified = 0;
-  int64_t haveUnverified = 0;
-  int64_t verifiedPieces = 0;
   if (torrents.empty ())
     {
@@ -421 +416 @@
   else
     {
+      double leftUntilDone = 0;
+      int64_t haveTotal = 0;
+      int64_t haveVerified = 0;
+      int64_t haveUnverified = 0;
+      int64_t verifiedPieces = 0;
+
       foreach (const Torrent * t, torrents)
         {
@@ -842 +843 @@
         {
           const QString key = idStr + ":" + peer.address;
-          PeerItem * item = (PeerItem*) myPeers.value (key, 0);
+          PeerItem * item = static_cast<PeerItem*> (myPeers.value (key, 0));
 
           if (item == 0) // new peer has connected

trunk/qt/file-tree.cc

@@ -624 +624 @@
                         bool                  updateFields)
 {
-  bool added = false;
   FileTreeItem * item;
   QStringList tokens = filename.split (QChar::fromLatin1('/'));
@@ -652 +651 @@
   else // we haven't build the FileTreeItems for these tokens yet
     {
+      bool added = false;
+
       item = myRootItem;
       while (!tokens.isEmpty())

trunk/qt/filterbar.cc

@@ -286 +286 @@
 namespace
 {
-  QString readableHostName (const QString host)
+  QString readableHostName (const QString& host)
   {
     // get the readable name...

trunk/qt/mainwin.cc

@@ -1413 +1413 @@
 
 void
-TrMainWindow::errorMessage (const QString msg)
+TrMainWindow::errorMessage (const QString& msg)
 {
     myErrorMessage = msg;

trunk/qt/mainwin.h

@@ -122 +122 @@
     void dataSendProgress ();
     void onError (QNetworkReply::NetworkError);
-    void errorMessage (const QString);
+    void errorMessage (const QString&);
     void toggleWindows (bool doShow);
     void onSetPrefs ();

trunk/qt/torrent-model.cc

@@ -144 +144 @@
   QSet<int> addIds;
   QSet<int> newIds;
-  int updatedCount = 0;
 
   if  (isCompleteList)
@@ -173 +172 @@
                 {
                   tor->update (child);
-                  ++updatedCount;
                   if (tor->isMagnet() && tor->hasMetadata())
                     {