diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-04 19:54:24 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-04 19:54:24 +0000 |
| commit | d7633c195a464e4d344ada9eea61afd10110598a (patch) | |
| tree | 1f2da0b135f3ed84955e340cae823f00c4ce7284 /src/settings/diffmergesettings_impl.h | |
| parent | 3fa7eb804f67b2789f128075cc2522f398640250 (diff) | |
| download | tdesvn-d7633c195a464e4d344ada9eea61afd10110598a.tar.gz tdesvn-d7633c195a464e4d344ada9eea61afd10110598a.zip | |
Port kdesvn to TQt4
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/settings/diffmergesettings_impl.h')
| -rw-r--r-- | src/settings/diffmergesettings_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/settings/diffmergesettings_impl.h b/src/settings/diffmergesettings_impl.h index 639e38b..815b4f5 100644 --- a/src/settings/diffmergesettings_impl.h +++ b/src/settings/diffmergesettings_impl.h @@ -24,8 +24,9 @@ class DiffMergeSettings_impl: public DiffMergeSettings { Q_OBJECT + TQ_OBJECT public: - DiffMergeSettings_impl(QWidget *parent = 0, const char *name = 0); + DiffMergeSettings_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~DiffMergeSettings_impl(); protected slots: virtual void diffDispChanged(bool); |