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/cmdexecsettings.ui | 32 +++++++-------- src/settings/cmdexecsettings_impl.cpp | 6 +-- src/settings/cmdexecsettings_impl.h | 3 +- src/settings/diffmergesettings.ui | 48 +++++++++++----------- src/settings/diffmergesettings_impl.cpp | 10 ++--- src/settings/diffmergesettings_impl.h | 3 +- src/settings/dispcolor_settings.ui | 54 ++++++++++++------------- src/settings/dispcolorsettings_impl.cpp | 6 +-- src/settings/dispcolorsettings_impl.h | 3 +- src/settings/display_settings.ui | 44 ++++++++++---------- src/settings/displaysettings_impl.cpp | 10 ++--- src/settings/displaysettings_impl.h | 3 +- src/settings/kdesvn_part.kcfg | 2 +- src/settings/revisiontree_settings.ui | 58 +++++++++++++-------------- src/settings/revisiontreesettingsdlg_impl.cpp | 4 +- src/settings/revisiontreesettingsdlg_impl.h | 3 +- src/settings/subversion_settings.ui | 34 ++++++++-------- src/settings/subversionsettings_impl.cpp | 4 +- src/settings/subversionsettings_impl.h | 3 +- 19 files changed, 168 insertions(+), 162 deletions(-) (limited to 'src/settings') diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui index e2b4a4e..dbfa62d 100644 --- a/src/settings/cmdexecsettings.ui +++ b/src/settings/cmdexecsettings.ui @@ -1,10 +1,10 @@ CmdExecSettings - + CmdExecSettings - + 0 0 @@ -16,7 +16,7 @@ unnamed - + kcfg_cmdline_show_logwindow @@ -27,15 +27,15 @@ Show a small window containing the log after command executed - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -63,7 +63,7 @@ - + kcfg_no_konqueror_contextmenu @@ -74,7 +74,7 @@ If set, kdesvn will not show a menu inside "Action" menu of konqueror - + kcfg_kio_use_standard_logmsg @@ -82,9 +82,9 @@ KIO operations use standard logmessage - + - layout2 + tqlayout2 @@ -95,14 +95,14 @@ kcfg_kio_standard_logmsg - + stdLogmsgLabel Standard message: - + AlignVCenter|AlignRight @@ -118,7 +118,7 @@ Expanding - + 20 16 @@ -143,10 +143,10 @@ setEnabled(bool) - + showLogToggled(bool) - - + + knuminput.h knuminput.h diff --git a/src/settings/cmdexecsettings_impl.cpp b/src/settings/cmdexecsettings_impl.cpp index 94f4f3d..07fe43d 100644 --- a/src/settings/cmdexecsettings_impl.cpp +++ b/src/settings/cmdexecsettings_impl.cpp @@ -23,11 +23,11 @@ #include #include -#include +#include #include -CmdExecSettings_impl::CmdExecSettings_impl(QWidget* parent, const char* name, WFlags fl) -: CmdExecSettings(parent,name,fl) +CmdExecSettings_impl::CmdExecSettings_impl(TQWidget* tqparent, const char* name, WFlags fl) +: CmdExecSettings(tqparent,name,fl) { kcfg_cmdline_log_minline->setSpecialValueText(i18n("No minimum")); kcfg_cmdline_log_minline->setEnabled(kcfg_cmdline_show_logwindow->isChecked()); diff --git a/src/settings/cmdexecsettings_impl.h b/src/settings/cmdexecsettings_impl.h index ab1749b..23f2098 100644 --- a/src/settings/cmdexecsettings_impl.h +++ b/src/settings/cmdexecsettings_impl.h @@ -26,9 +26,10 @@ class CmdExecSettings_impl : public CmdExecSettings { Q_OBJECT + TQ_OBJECT public: - CmdExecSettings_impl(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CmdExecSettings_impl(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~CmdExecSettings_impl(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui index 07638a0..f97ee72 100644 --- a/src/settings/diffmergesettings.ui +++ b/src/settings/diffmergesettings.ui @@ -1,10 +1,10 @@ DiffMergeSettings - + DiffMergeSettings - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_diff_ignore_content @@ -27,7 +27,7 @@ Diff ignores content type - + kcfg_tree_diff_rec @@ -35,7 +35,7 @@ Diff in revisiontree is recursive - + kcfg_diff_ignore_spaces @@ -43,7 +43,7 @@ Diff ignores white space changes - + kcfg_diff_ignore_all_white_spaces @@ -51,7 +51,7 @@ Diff ignores all white spaces - + kcfg_use_external_diff @@ -62,7 +62,7 @@ If kdesvn should use an external diff display and/or generator. If not checked use internal display. - + kcfg_extern_merge_default @@ -73,52 +73,52 @@ Set if merge with external program is prefered and not subversions merge - + - layout2 + tqlayout2 unnamed - + m_extern_hint see "Whats this" for details - + WordBreak|AlignCenter - + - layout2 + tqlayout2 unnamed - + resolveLabel Conflict resolver program: - + AlignVCenter|AlignRight - + textLabel1 External merge program: - + AlignVCenter|AlignRight @@ -149,14 +149,14 @@ Default: <tt>kdiff3 %o %m %n -o %t</tt> </p> - + mdiff_display_label External diff display: - + AlignVCenter|AlignRight @@ -220,7 +220,7 @@ When %1 and %2 is given, kdesvn let this display make the diff. For that it it m Expanding - + 20 16 @@ -239,10 +239,10 @@ When %1 and %2 is given, kdesvn let this display make the diff. For that it it m diffDispChanged(bool) - + diffDispChanged(bool) - - + + klineedit.h klineedit.h 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()); } 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); diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui index c5118ba..3bf12e2 100644 --- a/src/settings/dispcolor_settings.ui +++ b/src/settings/dispcolor_settings.ui @@ -1,10 +1,10 @@ DispColorSettings - + ColorSettings - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_colored_state @@ -30,9 +30,9 @@ - + - layout2 + tqlayout2 @@ -65,14 +65,14 @@ - + textLabel5 Locked items: - + AlignVCenter|AlignRight @@ -84,47 +84,47 @@ - + textLabel2_2 Not versioned items: - + AlignVCenter|AlignRight - + textLabel3 Remote changed items: - + AlignVCenter|AlignRight - + textLabel1 Added items: - + AlignVCenter|AlignRight - + textLabel4 Deleted items: - + AlignVCenter|AlignRight @@ -160,47 +160,47 @@ - + Conflicted_items_label Conflicted items: - + AlignVCenter|AlignRight - + Missed_items_label Missed items: - + AlignVCenter|AlignRight - + textLabel2 Local changed items: - + AlignVCenter|AlignRight - + Need_lock_label_2 Item needs lock: - + AlignVCenter|AlignRight @@ -224,7 +224,7 @@ Expanding - + 20 40 @@ -241,10 +241,10 @@ coloredStateToggled(bool) - + coloredStateToggled(bool) - - + + kcolorbutton.h kcolorbutton.h diff --git a/src/settings/dispcolorsettings_impl.cpp b/src/settings/dispcolorsettings_impl.cpp index 1b3ad0c..b81854b 100644 --- a/src/settings/dispcolorsettings_impl.cpp +++ b/src/settings/dispcolorsettings_impl.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include "dispcolorsettings_impl.h" #include -#include +#include -DispColorSettings_impl::DispColorSettings_impl(QWidget *parent, const char *name) - :DispColorSettings(parent, name) +DispColorSettings_impl::DispColorSettings_impl(TQWidget *tqparent, const char *name) + :DispColorSettings(tqparent, name) { coloredStateToggled(kcfg_colored_state->isChecked()); } diff --git a/src/settings/dispcolorsettings_impl.h b/src/settings/dispcolorsettings_impl.h index 56e0edd..62dd36f 100644 --- a/src/settings/dispcolorsettings_impl.h +++ b/src/settings/dispcolorsettings_impl.h @@ -24,8 +24,9 @@ class DispColorSettings_impl: public DispColorSettings { Q_OBJECT + TQ_OBJECT public: - DispColorSettings_impl(QWidget *parent = 0, const char *name = 0); + DispColorSettings_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~DispColorSettings_impl(); protected slots: virtual void coloredStateToggled(bool); diff --git a/src/settings/display_settings.ui b/src/settings/display_settings.ui index f3dfe98..681ddf1 100644 --- a/src/settings/display_settings.ui +++ b/src/settings/display_settings.ui @@ -1,10 +1,10 @@ DisplaySettings - + DisplaySettings - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + m_ListIconsSize_label @@ -51,7 +51,7 @@ - + kcfg_display_file_tips @@ -62,7 +62,7 @@ Here you can control if, when moving the mouse over a file, you want to see a small popup window with additional information about that file - + kcfg_display_previews_in_file_tips @@ -73,7 +73,7 @@ Here you can control if you want the popup window to contain a larger preview for the file, when moving the mouse over it - + kcfg_display_overlays @@ -90,7 +90,7 @@ see which items has newer items in repository you may have to set "Check for upd </p> - + kcfg_case_sensitive_sort @@ -98,7 +98,7 @@ see which items has newer items in repository you may have to set "Check for upd Items sortorder is case sensitive - + kcfg_display_ignored_files @@ -109,7 +109,7 @@ see which items has newer items in repository you may have to set "Check for upd - + kcfg_start_log_cache_on_open @@ -125,15 +125,15 @@ see which items has newer items in repository you may have to set "Check for upd If networking is disabled, then this flag is ignored. - + - layout2_2 + tqlayout2_2 unnamed - + m_display_label @@ -158,15 +158,15 @@ When kde-default is wanted for opening on double click, enter &quot;default& - + - layout3 + tqlayout3 unnamed - + m_MaxLogLabel @@ -187,7 +187,7 @@ When kde-default is wanted for opening on double click, enter &quot;default& - + kcfg_colored_blame @@ -205,7 +205,7 @@ When kde-default is wanted for opening on double click, enter &quot;default& Expanding - + 20 16 @@ -230,11 +230,11 @@ When kde-default is wanted for opening on double click, enter &quot;default& diffDispChanged() - + diffDispChanged() dispFileInfotoggled(bool) - - + + knuminput.h klineedit.h diff --git a/src/settings/displaysettings_impl.cpp b/src/settings/displaysettings_impl.cpp index 3f4e79c..e50a484 100644 --- a/src/settings/displaysettings_impl.cpp +++ b/src/settings/displaysettings_impl.cpp @@ -20,14 +20,14 @@ #include "displaysettings_impl.h" #include "src/settings/kdesvnsettings.h" -#include -#include -#include +#include +#include +#include #include #include -DisplaySettings_impl::DisplaySettings_impl(QWidget *parent, const char *name) - :DisplaySettings(parent, name) +DisplaySettings_impl::DisplaySettings_impl(TQWidget *tqparent, const char *name) + :DisplaySettings(tqparent, name) { kcfg_display_previews_in_file_tips->setEnabled(kcfg_display_file_tips->isChecked()); } diff --git a/src/settings/displaysettings_impl.h b/src/settings/displaysettings_impl.h index 944333e..947c007 100644 --- a/src/settings/displaysettings_impl.h +++ b/src/settings/displaysettings_impl.h @@ -24,8 +24,9 @@ class DisplaySettings_impl: public DisplaySettings { Q_OBJECT + TQ_OBJECT public: - DisplaySettings_impl(QWidget *parent = 0, const char *name = 0); + DisplaySettings_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~DisplaySettings_impl(); protected slots: virtual void dispFileInfotoggled(bool); diff --git a/src/settings/kdesvn_part.kcfg b/src/settings/kdesvn_part.kcfg index 382ddde..59290ac 100644 --- a/src/settings/kdesvn_part.kcfg +++ b/src/settings/kdesvn_part.kcfg @@ -1,7 +1,7 @@ - qstring.h + tqstring.h diff --git a/src/settings/revisiontree_settings.ui b/src/settings/revisiontree_settings.ui index 2d9133e..f95b337 100644 --- a/src/settings/revisiontree_settings.ui +++ b/src/settings/revisiontree_settings.ui @@ -1,10 +1,10 @@ RevisiontreeSettingsDlg - + RevisionTreeSettings - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_tree_direction @@ -30,7 +30,7 @@ unnamed - + m_LeftRight @@ -38,7 +38,7 @@ Left to right - + m_BottomTop @@ -46,7 +46,7 @@ Bottom to top - + m_RightLeft @@ -54,7 +54,7 @@ Right to left - + m_Topbottom @@ -64,22 +64,22 @@ - + - layout4 + tqlayout4 unnamed - + m_AddColorLabel Color for added items: - + AlignVCenter|AlignRight @@ -93,22 +93,22 @@ - + - layout3 + tqlayout3 unnamed - + textLabel2 Color for deleted items: - + AlignVCenter|AlignRight @@ -122,22 +122,22 @@ - + - layout2 + tqlayout2 unnamed - + textLabel3 Color for copied items: - + AlignVCenter|AlignRight @@ -151,22 +151,22 @@ - + - layout5 + tqlayout5 unnamed - + textLabel4 Color for renamed items: - + AlignVCenter|AlignRight @@ -180,22 +180,22 @@ - + - layout6 + tqlayout6 unnamed - + textLabel5 Color for modified items: - + AlignVCenter|AlignRight @@ -219,7 +219,7 @@ Expanding - + 20 40 @@ -236,7 +236,7 @@ m_Topbottom m_BottomTop - + kcolorbutton.h kcolorbutton.h diff --git a/src/settings/revisiontreesettingsdlg_impl.cpp b/src/settings/revisiontreesettingsdlg_impl.cpp index 0cad80f..6b5256f 100644 --- a/src/settings/revisiontreesettingsdlg_impl.cpp +++ b/src/settings/revisiontreesettingsdlg_impl.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "src/settings/revisiontreesettingsdlg_impl.h" -RevisiontreeSettingsDlg_impl::RevisiontreeSettingsDlg_impl(QWidget *parent, const char *name) - :RevisiontreeSettingsDlg(parent, name) +RevisiontreeSettingsDlg_impl::RevisiontreeSettingsDlg_impl(TQWidget *tqparent, const char *name) + :RevisiontreeSettingsDlg(tqparent, name) { } diff --git a/src/settings/revisiontreesettingsdlg_impl.h b/src/settings/revisiontreesettingsdlg_impl.h index cc17b72..63f021b 100644 --- a/src/settings/revisiontreesettingsdlg_impl.h +++ b/src/settings/revisiontreesettingsdlg_impl.h @@ -25,8 +25,9 @@ class RevisiontreeSettingsDlg_impl: public RevisiontreeSettingsDlg { Q_OBJECT + TQ_OBJECT public: - RevisiontreeSettingsDlg_impl(QWidget *parent = 0, const char *name = 0); + RevisiontreeSettingsDlg_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~RevisiontreeSettingsDlg_impl(); }; diff --git a/src/settings/subversion_settings.ui b/src/settings/subversion_settings.ui index 9d86625..466cc3c 100644 --- a/src/settings/subversion_settings.ui +++ b/src/settings/subversion_settings.ui @@ -1,10 +1,10 @@ SubversionSettings - + SubversionSettings - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_start_updates_check_on_open @@ -33,7 +33,7 @@ Select if kdesvn should check for updates when open a working copy - + kcfg_log_cache_on_open @@ -44,7 +44,7 @@ Start refresh the logcache for repository when networking enabled - + kcfg_check_needslock @@ -58,7 +58,7 @@ When listing on working copies kdesvn may check for <tt>svn:needs-lock</tt> property.<br>But due this listings/updating on folders containing lot of items may get slow. So you should only switch on if you have repositories containing lot of such entries. - + kcfg_details_on_remote_listing @@ -77,7 +77,7 @@ <p align="left"><i>Be careful: This may let listings REAL slow!</i></p> - + kcfg_info_recursive @@ -88,7 +88,7 @@ - + kcfg_properties_on_remote_items @@ -106,7 +106,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get real slow. So if you have slow network connections or when browsing hangs often you should deactivate it. - + kcfg_store_passwords @@ -123,7 +123,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re Storing passwords is often a security problem. Kdesvn itself doesn't store any passwords, but the subversion itself inside the configuration area of subversion. If this area is readable from others you should not set it, but you may select for single non critical accounts inside the authentication dialog. - + kcfg_passwords_in_wallet @@ -142,7 +142,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re <p>If you're HOME storage eg. subversions configfolder is on a network drive you should hard think about not storing passwords in a plain text file like subversion does but put it into an encrypted storage like kde wallet or don't save passwords.</p> - + kcfg_use_password_cache @@ -153,7 +153,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re Use an internal password cache - + kcfg_log_follows_nodes @@ -164,7 +164,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re - + kcfg_log_always_list_changed_files @@ -181,7 +181,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re Reading lists of changed files may sometimes a little bit slow down things. But if this feature is switched off, kdesvn may fail generating differences between nodechanges from within the logviewer. - + kcfg_review_commit @@ -195,7 +195,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re List items next commit will send or not - + kcfg_commit_hide_new @@ -230,7 +230,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re Expanding - + 20 16 @@ -241,7 +241,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re - + knuminput.h knuminput.h diff --git a/src/settings/subversionsettings_impl.cpp b/src/settings/subversionsettings_impl.cpp index aa0e96a..e3536d5 100644 --- a/src/settings/subversionsettings_impl.cpp +++ b/src/settings/subversionsettings_impl.cpp @@ -21,8 +21,8 @@ #include "subversionsettings_impl.h" -SubversionSettings_impl::SubversionSettings_impl(QWidget* parent, const char* name, WFlags fl) -: SubversionSettings(parent,name,fl) +SubversionSettings_impl::SubversionSettings_impl(TQWidget* tqparent, const char* name, WFlags fl) +: SubversionSettings(tqparent,name,fl) { } diff --git a/src/settings/subversionsettings_impl.h b/src/settings/subversionsettings_impl.h index e2c42ec..1a069ea 100644 --- a/src/settings/subversionsettings_impl.h +++ b/src/settings/subversionsettings_impl.h @@ -26,9 +26,10 @@ class SubversionSettings_impl : public SubversionSettings { Q_OBJECT + TQ_OBJECT public: - SubversionSettings_impl(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SubversionSettings_impl(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~SubversionSettings_impl(); /*$PUBLIC_FUNCTIONS$*/ -- cgit v1.2.1