summaryrefslogtreecommitdiffstats
path: root/lib/syncAction.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/syncAction.h')
-rw-r--r--lib/syncAction.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/syncAction.h b/lib/syncAction.h
index 8636731..42b1854 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -60,7 +60,7 @@ public:
const char *name=0L);
~SyncAction();
- typedef enum { Error=-1 } Status;
+ typedef enum { Error=-1 } tqStatus;
/** A syncaction has a status, which can be expressed as an
* integer. Subclasses are expected to define their own status
@@ -68,7 +68,7 @@ public:
*/
int status() const
{
- return fActionStatus;
+ return fActiontqStatus;
}
/** Return a human-readable representation of the status. */
virtual TQString statusString() const;
@@ -156,7 +156,7 @@ public:
protected:
/** Connection to the device. @todo make private. */
KPilotLink *fHandle;
- int fActionStatus;
+ int fActiontqStatus;
/** Returns a pointer to the connection to the device. */
inline KPilotLink *deviceLink() const