diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:49 -0600 |
| commit | 548395e018d377eaa8fede0fba271da8b6c49fc9 (patch) | |
| tree | 6b6acd1baf1a63c2dfb1735461d8a1e2e20f8385 /src/settings/diffmergesettings.ui | |
| parent | bb7be2361770a435b3e2e8ae2ac4250bf9810bb4 (diff) | |
| download | tdesvn-548395e018d377eaa8fede0fba271da8b6c49fc9.tar.gz tdesvn-548395e018d377eaa8fede0fba271da8b6c49fc9.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bb7be2361770a435b3e2e8ae2ac4250bf9810bb4.
Diffstat (limited to 'src/settings/diffmergesettings.ui')
| -rw-r--r-- | src/settings/diffmergesettings.ui | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui index 86c8e2f..106fb72 100644 --- a/src/settings/diffmergesettings.ui +++ b/src/settings/diffmergesettings.ui @@ -75,7 +75,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -88,13 +88,13 @@ <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="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -107,7 +107,7 @@ <property name="text"> <string>Conflict resolver program:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -118,7 +118,7 @@ <property name="text"> <string>External merge program:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -156,7 +156,7 @@ Default: <tt>kdiff3 %o %m %n -o %t</tt> <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, tdesvn 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> |