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/singleconflictdialog.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/singleconflictdialog.h')
| -rw-r--r-- | kitchensync/src/singleconflictdialog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h index 25ff4bd7..9c80f7fc 100644 --- a/kitchensync/src/singleconflictdialog.h +++ b/kitchensync/src/singleconflictdialog.h @@ -33,9 +33,10 @@ class HTMLDiffAlgoDisplay; class SingleConflictDialog : public ConflictDialog { Q_OBJECT + TQ_OBJECT public: - SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent ); + SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *tqparent ); ~SingleConflictDialog(); private slots: |