Changeset 14378

Timestamp:

Dec 12, 2014, 11:21:04 PM (8 years ago)

Author:

mikedld

Message:

Remove redundant "struct" keyword use in C++ code (Qt client)

Location:

trunk/qt

Files:

• freespace-label.cc (modified) (2 diffs)
• freespace-label.h (modified) (2 diffs)
• make-dialog.h (modified) (1 diff)
• prefs.h (modified) (1 diff)
• session.cc (modified) (4 diffs)
• session.h (modified) (7 diffs)
• stats-dialog.cc (modified) (1 diff)

trunk/qt/freespace-label.cc

@@ -34 +34 @@
   connect (&myTimer, SIGNAL(timeout()), this, SLOT(onTimer()));
 
-  connect (&mySession, SIGNAL(executed(int64_t, const QString&, struct tr_variant*)),
-           this,       SLOT(onSessionExecuted(int64_t, const QString&, struct tr_variant*)));
+  connect (&mySession, SIGNAL(executed(int64_t, const QString&, tr_variant *)),
+           this,       SLOT(onSessionExecuted(int64_t, const QString&, tr_variant *)));
 
   setPath (path);
@@ -69 +69 @@
 
 void
-FreespaceLabel::onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments)
+FreespaceLabel::onSessionExecuted (int64_t tag, const QString& result, tr_variant * arguments)
 {
   Q_UNUSED (result);

trunk/qt/freespace-label.h

@@ -19 +19 @@
 class Session;
 
+extern "C"
+{
+  struct tr_variant;
+}
+
 class FreespaceLabel: public QLabel
 {
@@ -35 +40 @@
 
   private slots:
-    void onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments);
+    void onSessionExecuted (int64_t tag, const QString& result, tr_variant * arguments);
     void onTimer ();
 };

trunk/qt/make-dialog.h

@@ -81 +81 @@
     QDialogButtonBox * myNewButtonBox;
     QDialog * myNewDialog;
-    struct tr_metainfo_builder * myBuilder;
+    tr_metainfo_builder * myBuilder;
 
   protected:

trunk/qt/prefs.h

@@ -147 +147 @@
     QString myConfigDir;
     mutable QVariant myValues[PREFS_COUNT];
-    void initDefaults (struct tr_variant*);
+    void initDefaults (tr_variant *);
 
   public:

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, tr_variant * arguments)
 {
   Q_UNUSED (arguments);
@@ -701 +701 @@
 
 void
-Session::localSessionCallback (tr_session * s, struct evbuffer * json, void * vself)
+Session::localSessionCallback (tr_session * s, evbuffer * json, void * vself)
 {
   Q_UNUSED (s);
@@ -921 +921 @@
 
 void
-Session::updateStats (tr_variant * d, struct tr_session_stats * stats)
+Session::updateStats (tr_variant * d, tr_session_stats * stats)
 {
   int64_t i;
@@ -1107 +1107 @@
   if (trashOriginal && addMe.type == AddData::FILENAME)
     fileAdded->setFileToDelete (addMe.filename);
-  connect (this, SIGNAL (executed (int64_t, QString, struct tr_variant *)),
-           fileAdded, SLOT (executed (int64_t, QString, struct tr_variant *)));
+  connect (this, SIGNAL (executed (int64_t, QString, tr_variant *)),
+           fileAdded, SLOT (executed (int64_t, QString, tr_variant *)));
 
   exec (&top);

trunk/qt/session.h

@@ -46 +46 @@
 
   public slots:
-    void executed (int64_t tag, const QString& result, struct tr_variant * arguments);
+    void executed (int64_t tag, const QString& result, tr_variant * arguments);
 
   private:
@@ -71 +71 @@
   public:
     const QUrl& getRemoteUrl () const { return myUrl; }
-    const struct tr_session_stats& getStats () const { return myStats; }
-    const struct tr_session_stats& getCumulativeStats () const { return myCumulativeStats; }
+    const tr_session_stats& getStats () const { return myStats; }
+    const tr_session_stats& getCumulativeStats () const { return myCumulativeStats; }
     const QString& sessionVersion () const { return mySessionVersion; }
 
@@ -91 +91 @@
 
   private:
-    void updateStats (struct tr_variant * args);
-    void updateInfo (struct tr_variant * args);
+    void updateStats (tr_variant * args);
+    void updateInfo (tr_variant * args);
     void parseResponse (const char * json, size_t len);
-    static void localSessionCallback (tr_session *, struct evbuffer *, void *);
+    static void localSessionCallback (tr_session *, evbuffer *, void *);
 
   public:
     void exec (const char * json);
-    void exec (const struct tr_variant * request);
+    void exec (const tr_variant * request);
 
   public:
@@ -107 +107 @@
     void pumpRequests ();
     void sendTorrentRequest (const char * request, const QSet<int>& torrentIds);
-    static void updateStats (struct tr_variant * d, struct tr_session_stats * stats);
+    static void updateStats (tr_variant * d, tr_session_stats * stats);
     void refreshTorrents (const QSet<int>& torrentIds);
     QNetworkAccessManager * networkAccessManager ();
@@ -152 +152 @@
   signals:
     void responseReceived (const QByteArray& json);
-    void executed (int64_t tag, const QString& result, struct tr_variant * arguments);
+    void executed (int64_t tag, const QString& result, tr_variant * arguments);
     void sourceChanged ();
     void portTested (bool isOpen);
@@ -158 +158 @@
     void sessionUpdated ();
     void blocklistUpdated (int);
-    void torrentsUpdated (struct tr_variant * torrentList, bool completeList);
-    void torrentsRemoved (struct tr_variant * torrentList);
+    void torrentsUpdated (tr_variant * torrentList, bool completeList);
+    void torrentsRemoved (tr_variant * torrentList);
     void dataReadProgress ();
     void dataSendProgress ();
@@ -176 +176 @@
     QUrl myUrl;
     QNetworkAccessManager * myNAM;
-    struct tr_session_stats myStats;
-    struct tr_session_stats myCumulativeStats;
+    tr_session_stats myStats;
+    tr_session_stats myCumulativeStats;
     QString mySessionVersion;
 };

trunk/qt/stats-dialog.cc

@@ -80 +80 @@
 StatsDialog::updateStats ()
 {
-  const struct tr_session_stats& current (mySession.getStats ());
-  const struct tr_session_stats& total (mySession.getCumulativeStats ());
+  const tr_session_stats& current (mySession.getStats ());
+  const tr_session_stats& total (mySession.getCumulativeStats ());
 
   myCurrentUp->setText (Formatter::sizeToString (current.uploadedBytes));