summaryrefslogtreecommitdiffstats
path: root/kpilot/conduits/abbrowserconduit/resolutionTable.h
diff options
context:
space:
mode:
Diffstat (limited to 'kpilot/conduits/abbrowserconduit/resolutionTable.h')
-rw-r--r--kpilot/conduits/abbrowserconduit/resolutionTable.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/kpilot/conduits/abbrowserconduit/resolutionTable.h b/kpilot/conduits/abbrowserconduit/resolutionTable.h
index 760f962e..51c25190 100644
--- a/kpilot/conduits/abbrowserconduit/resolutionTable.h
+++ b/kpilot/conduits/abbrowserconduit/resolutionTable.h
@@ -29,7 +29,7 @@
*/
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include "syncAction.h"
typedef enum eExistItems {
@@ -41,12 +41,12 @@ class ResolutionItem
{
public:
enum eExistItems fExistItems;
- QString fEntries[3];
- QString fResolved;
- QString fName;
+ TQString fEntries[3];
+ TQString fResolved;
+ TQString fName;
public:
ResolutionItem() {}
- ResolutionItem(QString name, int ex, QString pc, QString palm, QString backup):fExistItems((eExistItems)ex),fName(name)
+ ResolutionItem(TQString name, int ex, TQString pc, TQString palm, TQString backup):fExistItems((eExistItems)ex),fName(name)
{fEntries[0]=pc;fEntries[1]=palm; fEntries[2]=backup; /*fExistItems=(eExistItems)ex;*/ }
~ResolutionItem() {}
};
@@ -54,15 +54,15 @@ public:
/**
@author Reinhold Kainhofer
*/
-class ResolutionTable : public QPtrList<ResolutionItem>
+class ResolutionTable : public TQPtrList<ResolutionItem>
{
public:
- ResolutionTable():QPtrList<ResolutionItem>() {fResolution=SyncAction::eAskUser;};
+ ResolutionTable():TQPtrList<ResolutionItem>() {fResolution=SyncAction::eAskUser;};
~ResolutionTable() {};
SyncAction::ConflictResolution fResolution;
- QString labels[3];
+ TQString labels[3];
enum eExistItems fExistItems;
};