diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 00:37:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 00:37:32 +0000 |
| commit | f6f9c296c3f9d39a8c3d0ee64a542a47f450be28 (patch) | |
| tree | d38fce8091ce66977004a5cb115768c7810aee30 /conduits/docconduit/doc-conflictdialog.h | |
| parent | e340db64991a06761aa6395ffe760b53e4c1dfbc (diff) | |
| download | kpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.tar.gz kpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.zip | |
TQt4 port kpilot
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238903 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'conduits/docconduit/doc-conflictdialog.h')
| -rw-r--r-- | conduits/docconduit/doc-conflictdialog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h index f0c8b21..83cb8d4 100644 --- a/conduits/docconduit/doc-conflictdialog.h +++ b/conduits/docconduit/doc-conflictdialog.h @@ -54,9 +54,10 @@ typedef struct conflictEntry { class ResolutionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); + ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); ~ResolutionDialog(); bool hasConflicts; |