Changeset 13864

Timestamp:

Jan 25, 2013, 5:43:22 AM (8 years ago)

Author:

jordan

Message:

(qt) #5252 'File-renaming causes QObject::startTimer error': probable fix.

Location:

trunk/qt

Files:

• session.cc (modified) (5 diffs)
• session.h (modified) (3 diffs)

trunk/qt/session.cc

@@ -28 +28 @@
 #include <QStyle>
 #include <QTextStream>
-#include <QTimer>
 
 #include <curl/curl.h>
@@ -249 +248 @@
     mySession( 0 ),
     myConfigDir( QString::fromUtf8( configDir ) ),
-    myNAM( 0 ),
-    myResponseTimer (this)
+    myNAM( 0 )
 {
     myStats.ratio = TR_RATIO_NA;
@@ -262 +260 @@
     connect( &myPrefs, SIGNAL(changed(int)), this, SLOT(updatePref(int)) );
 
-    connect (&myResponseTimer, SIGNAL(timeout()), this, SLOT(onResponseTimer()));
-    myResponseTimer.setSingleShot (true);
+    connect (this, SIGNAL(responseReceived(const QByteArray&)),
+             this, SLOT(onResponseReceived(const QByteArray&)));
 }
 
@@ -657 +655 @@
 
 void
-Session :: localSessionCallback( tr_session * session, struct evbuffer * json, void * vself )
-{
-  Q_UNUSED (session);
+Session :: localSessionCallback( tr_session * s, struct evbuffer * json, void * vself )
+{
+  Q_UNUSED (s);
 
   Session * self = static_cast<Session*>(vself);
 
-  self->myIdleJSON.append (QString ((const char*) evbuffer_pullup (json, -1)));
-
-  if (!self->myResponseTimer.isActive())
-    self->myResponseTimer.start(50);
+  /* this callback is invoked in the libtransmission thread, so we don't want
+     to process the response here... let's push it over to the Qt thread. */
+  self->responseReceived (QByteArray ((const char *)evbuffer_pullup (json, -1),
+                                      (int)evbuffer_get_length (json)));
 }
 
@@ -743 +741 @@
 
 void
-Session :: onResponseTimer ()
-{
-  QStringList responses = myIdleJSON;
-  myIdleJSON.clear();
-
-  foreach (QString response, responses)
-    {
-      const QByteArray utf8 (response.toUtf8());
-      parseResponse (utf8.constData(), utf8.length());
-    }
+Session :: onResponseReceived (const QByteArray& utf8)
+{
+  parseResponse (utf8.constData(), utf8.length());
 }
 

trunk/qt/session.h

@@ -21 +21 @@
 #include <QString>
 #include <QStringList>
-#include <QTimer>
 #include <QUrl>
 
@@ -132 +131 @@
     private slots:
         void onFinished( QNetworkReply * reply );
-        void onResponseTimer( );
+        void onResponseReceived (const QByteArray& json);
 
     signals:
+        void responseReceived (const QByteArray& json);
         void executed( int64_t tag, const QString& result, struct tr_variant * arguments );
         void sourceChanged( );
@@ -160 +160 @@
         struct tr_session_stats myCumulativeStats;
         QString mySessionVersion;
-        QTimer myResponseTimer;
 };