diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:58:25 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:58:25 -0600 |
commit | 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch) | |
tree | 65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /kioslave/media | |
parent | 73c08b592db45af554b9f21029bc549d70f683ab (diff) | |
download | tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'kioslave/media')
-rw-r--r-- | kioslave/media/kcmodule/main.cpp | 2 | ||||
-rw-r--r-- | kioslave/media/kcmodule/managermoduleview.ui | 2 | ||||
-rw-r--r-- | kioslave/media/kcmodule/notifiermodule.cpp | 2 | ||||
-rw-r--r-- | kioslave/media/kcmodule/notifiermoduleview.ui | 2 | ||||
-rw-r--r-- | kioslave/media/kcmodule/serviceview.ui | 10 | ||||
-rw-r--r-- | kioslave/media/kfile-plugin/kfilemediaplugin.cpp | 4 | ||||
-rw-r--r-- | kioslave/media/mediamanager/halbackend.cpp | 4 | ||||
-rw-r--r-- | kioslave/media/medianotifier/notificationdialog.cpp | 4 | ||||
-rw-r--r-- | kioslave/media/medianotifier/notificationdialogview.ui | 4 | ||||
-rw-r--r-- | kioslave/media/mounthelper/decryptdialog.ui | 12 | ||||
-rw-r--r-- | kioslave/media/propsdlgplugin/propertiespagegui.ui | 2 | ||||
-rw-r--r-- | kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp | 2 |
12 files changed, 25 insertions, 25 deletions
diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp index 9a6f86ff0..da52ea119 100644 --- a/kioslave/media/kcmodule/main.cpp +++ b/kioslave/media/kcmodule/main.cpp @@ -20,7 +20,7 @@ #include "main.h" #include <tqtabwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kaboutdata.h> diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui index 8a088f7cf..d5d42a066 100644 --- a/kioslave/media/kcmodule/managermoduleview.ui +++ b/kioslave/media/kcmodule/managermoduleview.ui @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>360</height> diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp index 1035662dd..d5e36cc50 100644 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ b/kioslave/media/kcmodule/notifiermodule.cpp @@ -21,7 +21,7 @@ #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <kcombobox.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui index ad508c03d..50f93bc40 100644 --- a/kioslave/media/kcmodule/notifiermoduleview.ui +++ b/kioslave/media/kcmodule/notifiermoduleview.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>101</height> diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui index a6c3063f6..6ae357699 100644 --- a/kioslave/media/kcmodule/serviceview.ui +++ b/kioslave/media/kcmodule/serviceview.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>640</width> <height>480</height> @@ -80,13 +80,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>40</width> <height>40</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>40</height> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp index 2de8a44fa..580a678bc 100644 --- a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp +++ b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp @@ -140,7 +140,7 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) group = appendGroup(info, "mediumSummary"); - appendItem(group, "percent", TQString("%1%").arg(percent)); + appendItem(group, "percent", TQString("%1%").tqarg(percent)); TQPixmap bar(150, 20); TQPainter p(&bar); @@ -148,7 +148,7 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) p.fillRect(0, 0, length, 20, Qt::red); p.fillRect(length, 0, 150-length, 20, Qt::green); - TQColorGroup cg = TQApplication::palette().active(); + TQColorGroup cg = TQApplication::tqpalette().active(); TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &p, TQRect(0, 0, 150, 20), cg, diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index 1452b14c9..58e2992e0 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kprocess.h> #include <kconfig.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <kmountpoint.h> #include <kmessagebox.h> #include <kio/job.h> @@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi) void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification) { kdDebug(1219) << "HALBackend::setProperties" << endl; - if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) + if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) { const Medium *cmedium = m_mediaList.findById(mediumUdi); if ( cmedium ) diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp index 508af9819..9913f033d 100644 --- a/kioslave/media/medianotifier/notificationdialog.cpp +++ b/kioslave/media/medianotifier/notificationdialog.cpp @@ -18,7 +18,7 @@ */ #include "notificationdialog.h" -#include <layout.h> +#include <tqlayout.h> #include <krun.h> #include <klocale.h> @@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett updateActionsListBox(); - resize( TQSize(400,400).expandedTo( minimumSizeHint() ) ); + resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) ); m_actionWatcher = new KDirWatch(); diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui index f7bd744be..032ea1f10 100644 --- a/kioslave/media/medianotifier/notificationdialogview.ui +++ b/kioslave/media/medianotifier/notificationdialogview.ui @@ -42,13 +42,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>64</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>64</width> <height>64</height> diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui index 939f0a36a..dfb8c17d0 100644 --- a/kioslave/media/mounthelper/decryptdialog.ui +++ b/kioslave/media/mounthelper/decryptdialog.ui @@ -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> @@ -109,7 +109,7 @@ <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> @@ -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/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui index 51ead3a25..3c98e1eb7 100644 --- a/kioslave/media/propsdlgplugin/propertiespagegui.ui +++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui @@ -352,7 +352,7 @@ Display the short name as is; store a long name when the short name is not all u <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp index a3e237c40..59433a5da 100644 --- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +++ b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp @@ -19,7 +19,7 @@ #include <tqstring.h> #include <tqvbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqtimer.h> |