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

List:       kde-commits
Subject:    kdepim/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2004-10-03 12:36:08
Message-ID: 20041003123608.F24D5126E7 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

InteractiveSync was a pretty pointless subclass; merged with SyncAction so that \
everyone can now use the question* methods for proper timeout and tickle handling \
during a sync.


  M +3 -3      kpilot/interactiveSync.cc   1.35
  M +2 -2      kpilot/interactiveSync.h   1.9
  M +15 -17    lib/syncAction.cc   1.23
  M +5 -20     lib/syncAction.h   1.24


--- kdepim/kpilot/lib/syncAction.h  #1.23:1.24
@@ -50,4 +50,7 @@ public:
         SyncAction(KPilotDeviceLink *p,
                 const char *name=0L);
+        SyncAction(KPilotDeviceLink *p,
+                QWidget *visibleparent,
+                const char *name=0L);
         ~SyncAction();
 
@@ -167,26 +170,7 @@ protected:
 signals:
         void timeout();
-};
 
 
 
-class InteractiveAction : public SyncAction
-{
-Q_OBJECT
-public:
-        // Note that this takes a QWidget as additional parameter,
-        // so that it can display windows relative to that if necessary.
-        //
-        //
-        InteractiveAction(KPilotDeviceLink *p,
-                QWidget *visibleparent=0L,
-                const char *name=0L);
-        virtual ~InteractiveAction();
-
-        // Reminder that the whole point of the class is to implement
-        // the pure virtual function exec().
-        //
-        // virtual void exec()=0;
-
 
 protected:
@@ -215,5 +199,6 @@ protected:
                 const QString &yes = QString::null,
                 const QString &no = QString::null ) ;
-} ;
+};
+
 
 #endif

--- kdepim/kpilot/lib/syncAction.cc  #1.22:1.23
@@ -60,5 +60,6 @@ SyncAction::SyncAction(KPilotDeviceLink 
         const char *name) :
         QObject(p, name),
-        fHandle(p)
+        fHandle(p),
+        fParent(0L)
 {
         FUNCTIONSETUP;
@@ -66,4 +67,14 @@ SyncAction::SyncAction(KPilotDeviceLink 
 }
 
+SyncAction::SyncAction(KPilotDeviceLink *p,
+        QWidget * visibleparent,
+        const char *name) :
+        QObject(p, name),
+        fHandle(p),
+        fParent(visibleparent)
+{
+        FUNCTIONSETUP;
+}
+
 SyncAction::~SyncAction()
 {
@@ -144,19 +155,6 @@ void SyncAction::stopTickle()
 }
 
-InteractiveAction::InteractiveAction(KPilotDeviceLink *p,
-        QWidget * visibleparent,
-        const char *name) :
-        SyncAction(p, name),
-        fParent(visibleparent)
-{
-        FUNCTIONSETUP;
-}
-
-InteractiveAction::~InteractiveAction()
-{
-        FUNCTIONSETUP;
-}
 
-int InteractiveAction::questionYesNo(const QString & text,
+int SyncAction::questionYesNo(const QString & text,
         const QString & caption,
         const QString & key,
@@ -213,5 +211,5 @@ int InteractiveAction::questionYesNo(con
 
 
-int InteractiveAction::questionYesNoCancel(const QString & text,
+int SyncAction::questionYesNoCancel(const QString & text,
         const QString & caption,
         const QString & key,

--- kdepim/kpilot/kpilot/interactiveSync.h  #1.8:1.9
@@ -35,5 +35,5 @@ class QTimer;
 #include "syncAction.h"
 
-class CheckUser : public InteractiveAction
+class CheckUser : public SyncAction
 {
 public:
@@ -45,5 +45,5 @@ protected:
 } ;
 
-class RestoreAction : public InteractiveAction
+class RestoreAction : public SyncAction
 {
 Q_OBJECT

--- kdepim/kpilot/kpilot/interactiveSync.cc  #1.34:1.35
@@ -69,5 +69,5 @@ static const char *interactivesync_id =
 
 CheckUser::CheckUser(KPilotDeviceLink * p, QWidget * vp):
-        InteractiveAction(p, vp, "userCheck")
+        SyncAction(p, vp, "userCheck")
 {
         FUNCTIONSETUP;
@@ -240,5 +240,5 @@ public:
 
 RestoreAction::RestoreAction(KPilotDeviceLink * p, QWidget * visible ) :
-        InteractiveAction(p, visible, "restoreAction")
+        SyncAction(p, visible, "restoreAction")
 {
         FUNCTIONSETUP;


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