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/svnfrontend/merge_dlg.ui | |
| 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/svnfrontend/merge_dlg.ui')
| -rw-r--r-- | src/svnfrontend/merge_dlg.ui | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui index f26179a..142342c 100644 --- a/src/svnfrontend/merge_dlg.ui +++ b/src/svnfrontend/merge_dlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MergeDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MergeDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> @@ -45,14 +45,14 @@ <cstring>m_SrcTwoInput</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_SrcOneLabel</cstring> </property> <property name="text"> <string>Source 1:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -61,39 +61,39 @@ <cstring>m_OutInput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_SrcTwoLabel</cstring> </property> <property name="text"> <string>Source 2:</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>m_OutLabel</cstring> </property> <property name="text"> <string>Output to:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_ForceCheck</cstring> </property> @@ -104,7 +104,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_RelatedCheck</cstring> </property> @@ -112,7 +112,7 @@ <string>Handle unrelated as related items</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>m_DryCheck</cstring> </property> @@ -123,7 +123,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_RecursiveCheck</cstring> </property> @@ -145,14 +145,14 @@ <property name="name"> <cstring>m_RangeInput</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>40</height> </size> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_useExternMerge</cstring> </property> @@ -194,10 +194,10 @@ <slot>externDisplayToggled(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">externDisplayToggled(bool)</slot> -</slots> -<layoutdefaults spacing="2" margin="2"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="2" margin="2"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> |