summaryrefslogtreecommitdiffstats
path: root/kpilot/conduits/docconduit/doc-conflictdialog.h
diff options
context:
space:
mode:
Diffstat (limited to 'kpilot/conduits/docconduit/doc-conflictdialog.h')
-rw-r--r--kpilot/conduits/docconduit/doc-conflictdialog.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.h b/kpilot/conduits/docconduit/doc-conflictdialog.h
index f8ad8caf7..00a3ef1a5 100644
--- a/kpilot/conduits/docconduit/doc-conflictdialog.h
+++ b/kpilot/conduits/docconduit/doc-conflictdialog.h
@@ -43,9 +43,9 @@ class KPilotLink;
typedef struct conflictEntry {
- QLabel*dbname;
- QComboBox* resolution;
- QPushButton*info;
+ TQLabel*dbname;
+ TQComboBox* resolution;
+ TQPushButton*info;
int index;
bool conflict;
};
@@ -56,23 +56,23 @@ class ResolutionDialog : public KDialogBase
Q_OBJECT
public:
- ResolutionDialog( QWidget* parent=0, const QString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
+ ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
~ResolutionDialog();
bool hasConflicts;
public slots:
void _tickle();
protected:
- QTimer* tickleTimer;
+ TQTimer* tickleTimer;
KPilotLink* fHandle;
protected:
- QGroupBox* resolutionGroupBox;
- QGridLayout*resolutionGroupBoxLayout;
+ TQGroupBox* resolutionGroupBox;
+ TQGridLayout*resolutionGroupBoxLayout;
syncInfoList*syncInfo;
- QValueList<conflictEntry> conflictEntries;
- QLabel *textLabel1,*textLabel2;
+ TQValueList<conflictEntry> conflictEntries;
+ TQLabel *textLabel1,*textLabel2;
protected slots:
virtual void slotOk();