[vidalia-svn] r1913: Let Qt pick the best connection type between these slots and (in trunk: . src/control)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-09-05 23:51:29 -0400 (Wed, 05 Sep 2007)
New Revision: 1913

Modified:
   trunk/
   trunk/src/control/torcontrol.cpp
Log:
 r2130@adrastea:  edmanm | 2007-09-05 23:37:19 -0400
 Let Qt pick the best connection type between these slots and signals. At the
 very least, these should all be the same connection type, otherwise signals
 can be delivered out of order.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2130] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/control/torcontrol.cpp
===================================================================
--- trunk/src/control/torcontrol.cpp	2007-09-06 03:51:22 UTC (rev 1912)
+++ trunk/src/control/torcontrol.cpp	2007-09-06 03:51:29 UTC (rev 1913)
@@ -56,13 +56,11 @@
 
 #if defined(Q_OS_WIN32)
   _torService = new TorService(this);
-  QObject::connect(_torService, SIGNAL(started()),
-                   this, SLOT(onStarted()), Qt::QueuedConnection);
+  QObject::connect(_torService, SIGNAL(started()), this, SLOT(onStarted()));
   QObject::connect(_torService, SIGNAL(finished(int, QProcess::ExitStatus)),
                    this, SLOT(onStopped(int, QProcess::ExitStatus)));
   QObject::connect(_torService, SIGNAL(startFailed(QString)),
-                   this, SLOT(onStartFailed(QString)), 
-                   Qt::QueuedConnection);
+                   this, SLOT(onStartFailed(QString))); 
 #endif
 }
 
@@ -107,13 +105,13 @@
   
       /* Plumb the process signals */
       QObject::connect(_torProcess, SIGNAL(started()),
-           this, SLOT(onStarted()), Qt::QueuedConnection);
+                       this, SLOT(onStarted()));
       QObject::connect(_torProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
-           this, SLOT(onStopped(int, QProcess::ExitStatus)));
+                       this, SLOT(onStopped(int, QProcess::ExitStatus)));
       QObject::connect(_torProcess, SIGNAL(startFailed(QString)),
-           this, SLOT(onStartFailed(QString)), Qt::QueuedConnection);
+                       this, SLOT(onStartFailed(QString)));
       QObject::connect(_torProcess, SIGNAL(log(QString, QString)),
-           this, SLOT(onLogStdout(QString, QString)));
+                       this, SLOT(onLogStdout(QString, QString)));
   
       /* Kick off the Tor process. */
       _torProcess->start(expand_filename(settings.getExecutable()),