[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kpilot/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-04-09 9:52:37
Message-ID: 20050409095237.42724494 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Rip out test mode


  M +2 -32     main-test.cc   1.44
  M +2 -3      syncStack.cc   1.40
  M +0 -4      syncStack.h   1.25


--- kdepim/kpilot/kpilot/main-test.cc  #1.43:1.44
@@ -283,27 +283,4 @@ int execConduit(KCmdLineArgs *p)
 }
 
-int testConduit(KCmdLineArgs *p)
-{
-        FUNCTIONSETUP;
-
-        // get --exec-conduit value
-        QString s = p->getOption("conduit-exec");
-        if (s.isEmpty()) return 1;
-
-        createLogWidget();
-        createLink();
-
-        syncStack = new ActionQueue(deviceLink);
-        syncStack->setTestMode(true);
-        syncStack->queueConduits(QStringList(s),SyncAction::eTest,true);
-
-        connectStack();
-
-        QTimer::singleShot(10,syncStack,SLOT(execConduit()));
-
-        return kapp->exec();
-}
-
-
 int listConduits(KCmdLineArgs *)
 {
@@ -377,13 +354,6 @@ int main(int argc, char **argv)
         if (p->isSet("conduit-exec"))
         {
-                if (p->isSet("test-local"))
-                {
-                        return testConduit(p);
-                }
-                else
-                {
                         return execConduit(p);
                 }
-        }
 
         // The default is supposed to be "list"

--- kdepim/kpilot/kpilot/syncStack.cc  #1.39:1.40
@@ -302,5 +302,4 @@ void ConduitProxy::execDone(SyncAction *
 ActionQueue::ActionQueue(KPilotDeviceLink *d) :
         SyncAction(d,"ActionQueue"),
-        fTestMode(false),
         fReady(false)
         // The string lists have default constructors
@@ -392,5 +391,5 @@ void ActionQueue::actionCompleted(SyncAc
                 return;
         }
-        if (!fTestMode && !fHandle->tickle())
+        if (!fHandle->tickle())
         {
                 emit logError(i18n("The connection to the handheld "

--- kdepim/kpilot/kpilot/syncStack.h  #1.24:1.25
@@ -66,10 +66,6 @@ public:
         virtual ~ActionQueue();
 
-        void setTestMode(bool b) { fTestMode=b; } ;
-        bool isTestMode() const { return fTestMode; } ;
-
 private:
         QPtrQueue < SyncAction > SyncActionQueue;
-        bool fTestMode;
 
 public:


[prev in list] [next in list] [prev in thread] [next in thread]