diff options
Diffstat (limited to 'src/settings/diffmergesettings.ui')
| -rw-r--r-- | src/settings/diffmergesettings.ui | 48 |
1 files changed, 24 insertions, 24 deletions
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> |