diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kioslave/media/mounthelper | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/media/mounthelper')
| -rw-r--r-- | kioslave/media/mounthelper/decryptdialog.ui | 32 | ||||
| -rw-r--r-- | kioslave/media/mounthelper/kio_media_mounthelper.cpp | 6 |
2 files changed, 19 insertions, 19 deletions
diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui index 15790c8ef..dfb8c17d0 100644 --- a/kioslave/media/mounthelper/decryptdialog.ui +++ b/kioslave/media/mounthelper/decryptdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DecryptDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DecryptDialog</cstring> </property> @@ -27,7 +27,7 @@ <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>layout5</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>encryptedIcon</cstring> </property> @@ -55,13 +55,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>48</width> <height>48</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -70,7 +70,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>41</height> @@ -93,7 +93,7 @@ </spacer> </vbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>descLabel</cstring> </property> @@ -109,13 +109,13 @@ <string><p><b>%1</b> is an encrypted storage device.</p> <p>Please enter the password to decrypt the storage device.</p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout4</cstring> </property> @@ -123,7 +123,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -134,7 +134,7 @@ <cstring>passwordEdit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>passwordEdit</cstring> </property> @@ -155,7 +155,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>errorBox</cstring> </property> @@ -174,7 +174,7 @@ <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>errorLabel</cstring> </property> @@ -189,7 +189,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp index 01448f79d..83d57df85 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp +++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp @@ -88,8 +88,8 @@ MountHelper::MountHelper() : KApplication() TQString device = medium.deviceNode(); TQString mount_point = medium.mountPoint(); - m_isCdrom = medium.mimeType().find("dvd")!=-1 - || medium.mimeType().find("cd")!=-1; + m_isCdrom = medium.mimeType().tqfind("dvd")!=-1 + || medium.mimeType().tqfind("cd")!=-1; if (args->isSet("d")) { @@ -182,7 +182,7 @@ MountHelper::MountHelper() : KApplication() void MountHelper::invokeEject(const TQString &device, bool quiet) { - KProcess *proc = new KProcess(this); + KProcess *proc = new KProcess(TQT_TQOBJECT(this)); *proc << "kdeeject"; if (quiet) { |