diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
| commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
| tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kitchensync/src/conflictdialog.h | |
| parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
| download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip | |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/src/conflictdialog.h')
| -rw-r--r-- | kitchensync/src/conflictdialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kitchensync/src/conflictdialog.h b/kitchensync/src/conflictdialog.h index 1a17e06ca..81c91138b 100644 --- a/kitchensync/src/conflictdialog.h +++ b/kitchensync/src/conflictdialog.h @@ -28,10 +28,10 @@ /** Base class for SingleConflictDialog and MultiConflictDialog. */ -class ConflictDialog : public QDialog +class ConflictDialog : public TQDialog { public: - ConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); + ConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); protected: QSync::SyncMapping mMapping; |