From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 4 May 2011 19:54:24 +0000 Subject: 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 --- src/settings/diffmergesettings_impl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/settings/diffmergesettings_impl.cpp') diff --git a/src/settings/diffmergesettings_impl.cpp b/src/settings/diffmergesettings_impl.cpp index 91ddab3..bec03b6 100644 --- a/src/settings/diffmergesettings_impl.cpp +++ b/src/settings/diffmergesettings_impl.cpp @@ -20,14 +20,14 @@ #include "diffmergesettings_impl.h" #include "src/settings/kdesvnsettings.h" -#include -#include -#include +#include +#include +#include #include #include -DiffMergeSettings_impl::DiffMergeSettings_impl(QWidget *parent, const char *name) - :DiffMergeSettings(parent, name) +DiffMergeSettings_impl::DiffMergeSettings_impl(TQWidget *tqparent, const char *name) + :DiffMergeSettings(tqparent, name) { kcfg_external_diff_display->setEnabled(Kdesvnsettings::use_external_diff()); } -- cgit v1.2.3