diff options
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/cmdexecsettings.ui | 32 | ||||
| -rw-r--r-- | src/settings/cmdexecsettings_impl.cpp | 6 | ||||
| -rw-r--r-- | src/settings/cmdexecsettings_impl.h | 3 | ||||
| -rw-r--r-- | src/settings/diffmergesettings.ui | 48 | ||||
| -rw-r--r-- | src/settings/diffmergesettings_impl.cpp | 10 | ||||
| -rw-r--r-- | src/settings/diffmergesettings_impl.h | 3 | ||||
| -rw-r--r-- | src/settings/dispcolor_settings.ui | 54 | ||||
| -rw-r--r-- | src/settings/dispcolorsettings_impl.cpp | 6 | ||||
| -rw-r--r-- | src/settings/dispcolorsettings_impl.h | 3 | ||||
| -rw-r--r-- | src/settings/display_settings.ui | 44 | ||||
| -rw-r--r-- | src/settings/displaysettings_impl.cpp | 10 | ||||
| -rw-r--r-- | src/settings/displaysettings_impl.h | 3 | ||||
| -rw-r--r-- | src/settings/kdesvn_part.kcfg | 2 | ||||
| -rw-r--r-- | src/settings/revisiontree_settings.ui | 58 | ||||
| -rw-r--r-- | src/settings/revisiontreesettingsdlg_impl.cpp | 4 | ||||
| -rw-r--r-- | src/settings/revisiontreesettingsdlg_impl.h | 3 | ||||
| -rw-r--r-- | src/settings/subversion_settings.ui | 34 | ||||
| -rw-r--r-- | src/settings/subversionsettings_impl.cpp | 4 | ||||
| -rw-r--r-- | src/settings/subversionsettings_impl.h | 3 |
19 files changed, 168 insertions, 162 deletions
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 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CmdExecSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CmdExecSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_cmdline_show_logwindow</cstring> </property> @@ -27,15 +27,15 @@ <string>Show a small window containing the log after command executed</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -63,7 +63,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_no_konqueror_contextmenu</cstring> </property> @@ -74,7 +74,7 @@ <string>If set, kdesvn will not show a menu inside "Action" menu of konqueror</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_kio_use_standard_logmsg</cstring> </property> @@ -82,9 +82,9 @@ <string>KIO operations use standard logmessage</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -95,14 +95,14 @@ <cstring>kcfg_kio_standard_logmsg</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>stdLogmsgLabel</cstring> </property> <property name="text"> <string>Standard message:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -143,10 +143,10 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">showLogToggled(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> 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 <klocale.h> #include <knuminput.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <klineedit.h> -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 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DiffMergeSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DiffMergeSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_diff_ignore_content</cstring> </property> @@ -27,7 +27,7 @@ <string>Diff ignores content type</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_tree_diff_rec</cstring> </property> @@ -35,7 +35,7 @@ <string>Diff in revisiontree is recursive</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_diff_ignore_spaces</cstring> </property> @@ -43,7 +43,7 @@ <string>Diff ignores white space changes</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_diff_ignore_all_white_spaces</cstring> </property> @@ -51,7 +51,7 @@ <string>Diff ignores all white spaces</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_use_external_diff</cstring> </property> @@ -62,7 +62,7 @@ <string>If kdesvn should use an external diff display and/or generator. If not checked use internal display.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_extern_merge_default</cstring> </property> @@ -73,52 +73,52 @@ <string>Set if merge with external program is prefered and not subversions merge</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_extern_hint</cstring> </property> <property name="text"> <string>see "Whats this" for details</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>resolveLabel</cstring> </property> <property name="text"> <string>Conflict resolver program:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>External merge program:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -149,14 +149,14 @@ Default: <tt>kdiff3 %o %m %n -o %t</tt> </p></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>mdiff_display_label</cstring> </property> <property name="text"> <string>External diff display:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -220,7 +220,7 @@ When %1 and %2 is given, kdesvn let this display make the diff. For that it it m <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -239,10 +239,10 @@ When %1 and %2 is given, kdesvn let this display make the diff. For that it it m <slot>diffDispChanged(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">diffDispChanged(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> 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 <qbuttongroup.h> -#include <qcheckbox.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> #include <klineedit.h> #include <kdebug.h> -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 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DispColorSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ColorSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_colored_state</cstring> </property> @@ -30,9 +30,9 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -65,14 +65,14 @@ <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> <property name="text"> <string>Locked items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -84,47 +84,47 @@ <string></string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> <property name="text"> <string>Not versioned items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Remote changed items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Added items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Deleted items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -160,47 +160,47 @@ <string></string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>Conflicted_items_label</cstring> </property> <property name="text"> <string>Conflicted items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>Missed_items_label</cstring> </property> <property name="text"> <string>Missed items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Local changed items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>Need_lock_label_2</cstring> </property> <property name="text"> <string>Item needs lock:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -241,10 +241,10 @@ <slot>coloredStateToggled(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">coloredStateToggled(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> 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 <kcolorbutton.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> -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 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DisplaySettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DisplaySettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_ListIconsSize_label</cstring> </property> @@ -51,7 +51,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_display_file_tips</cstring> </property> @@ -62,7 +62,7 @@ <string>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</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_display_previews_in_file_tips</cstring> </property> @@ -73,7 +73,7 @@ <string>Here you can control if you want the popup window to contain a larger preview for the file, when moving the mouse over it</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_display_overlays</cstring> </property> @@ -90,7 +90,7 @@ see which items has newer items in repository you may have to set "Check for upd </p></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_case_sensitive_sort</cstring> </property> @@ -98,7 +98,7 @@ see which items has newer items in repository you may have to set "Check for upd <string>Items sortorder is case sensitive</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_display_ignored_files</cstring> </property> @@ -109,7 +109,7 @@ see which items has newer items in repository you may have to set "Check for upd <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_start_log_cache_on_open</cstring> </property> @@ -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.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2_2</cstring> + <cstring>tqlayout2_2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_display_label</cstring> </property> @@ -158,15 +158,15 @@ When kde-default is wanted for opening on double click, enter &quot;default& </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_MaxLogLabel</cstring> </property> @@ -187,7 +187,7 @@ When kde-default is wanted for opening on double click, enter &quot;default& </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_colored_blame</cstring> </property> @@ -205,7 +205,7 @@ When kde-default is wanted for opening on double click, enter &quot;default& <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -230,11 +230,11 @@ When kde-default is wanted for opening on double click, enter &quot;default& <slot>diffDispChanged()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">diffDispChanged()</slot> <slot access="protected">dispFileInfotoggled(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>klineedit.h</includehint> 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 <qbuttongroup.h> -#include <qcheckbox.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> #include <klineedit.h> #include <kdebug.h> -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 @@ <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd"> <kcfg> <kcfgfile name="kdesvnpartrc" /> - <include>qstring.h</include> + <include>tqstring.h</include> <group name="general_items" > <entry key="case_sensitive_sort" type="Bool" > <label>Set if items sortorder should be case sensitive or not</label> 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 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>RevisiontreeSettingsDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>RevisionTreeSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_tree_direction</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_LeftRight</cstring> </property> @@ -38,7 +38,7 @@ <string>Left to right</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_BottomTop</cstring> </property> @@ -46,7 +46,7 @@ <string>Bottom to top</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_RightLeft</cstring> </property> @@ -54,7 +54,7 @@ <string>Right to left</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_Topbottom</cstring> </property> @@ -64,22 +64,22 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_AddColorLabel</cstring> </property> <property name="text"> <string>Color for added items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -93,22 +93,22 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Color for deleted items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -122,22 +122,22 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Color for copied items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -151,22 +151,22 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Color for renamed items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -180,22 +180,22 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> <property name="text"> <string>Color for modified items:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -236,7 +236,7 @@ <tabstop>m_Topbottom</tabstop> <tabstop>m_BottomTop</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> 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 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SubversionSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SubversionSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_start_updates_check_on_open</cstring> </property> @@ -33,7 +33,7 @@ <string>Select if kdesvn should check for updates when open a working copy</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_log_cache_on_open</cstring> </property> @@ -44,7 +44,7 @@ <string>Start refresh the logcache for repository when networking enabled</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_check_needslock</cstring> </property> @@ -58,7 +58,7 @@ <string>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.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_details_on_remote_listing</cstring> </property> @@ -77,7 +77,7 @@ <p align="left"><i>Be careful: This may let listings REAL slow!</i></p></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_info_recursive</cstring> </property> @@ -88,7 +88,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_properties_on_remote_items</cstring> </property> @@ -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.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_store_passwords</cstring> </property> @@ -123,7 +123,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re <string>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.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_passwords_in_wallet</cstring> </property> @@ -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></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_use_password_cache</cstring> </property> @@ -153,7 +153,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re <string>Use an internal password cache</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_log_follows_nodes</cstring> </property> @@ -164,7 +164,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_log_always_list_changed_files</cstring> </property> @@ -181,7 +181,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re <string>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.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_review_commit</cstring> </property> @@ -195,7 +195,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re <string>List items next commit will send or not</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_commit_hide_new</cstring> </property> @@ -230,7 +230,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -241,7 +241,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> 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$*/ |