From 73c08b592db45af554b9f21029bc549d70f683ab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:46:05 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kioslave/media/kcmodule/main.cpp | 2 +- kioslave/media/kcmodule/managermoduleview.ui | 2 +- kioslave/media/kcmodule/notifiermodule.cpp | 2 +- kioslave/media/kcmodule/notifiermoduleview.ui | 2 +- kioslave/media/kcmodule/serviceview.ui | 10 +++++----- kioslave/media/kfile-plugin/kfilemediaplugin.cpp | 4 ++-- kioslave/media/mediamanager/halbackend.cpp | 4 ++-- kioslave/media/medianotifier/notificationdialog.cpp | 4 ++-- kioslave/media/medianotifier/notificationdialogview.ui | 4 ++-- kioslave/media/mounthelper/decryptdialog.ui | 12 ++++++------ kioslave/media/propsdlgplugin/propertiespagegui.ui | 2 +- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) (limited to 'kioslave/media') diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp index da52ea119..9a6f86ff0 100644 --- a/kioslave/media/kcmodule/main.cpp +++ b/kioslave/media/kcmodule/main.cpp @@ -20,7 +20,7 @@ #include "main.h" #include -#include +#include #include #include diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui index d5d42a066..8a088f7cf 100644 --- a/kioslave/media/kcmodule/managermoduleview.ui +++ b/kioslave/media/kcmodule/managermoduleview.ui @@ -59,7 +59,7 @@ Expanding - + 21 360 diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp index d5e36cc50..1035662dd 100644 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ b/kioslave/media/kcmodule/notifiermodule.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui index 50f93bc40..ad508c03d 100644 --- a/kioslave/media/kcmodule/notifiermoduleview.ui +++ b/kioslave/media/kcmodule/notifiermoduleview.ui @@ -138,7 +138,7 @@ Expanding - + 70 101 diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui index 6ae357699..a6c3063f6 100644 --- a/kioslave/media/kcmodule/serviceview.ui +++ b/kioslave/media/kcmodule/serviceview.ui @@ -20,7 +20,7 @@ 0 - + 640 480 @@ -80,13 +80,13 @@ 0 - + 40 40 - + 40 40 @@ -117,7 +117,7 @@ Minimum - + 20 20 @@ -147,7 +147,7 @@ Minimum - + 20 21 diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp index 580a678bc..2de8a44fa 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%").tqarg(percent)); + appendItem(group, "percent", TQString("%1%").arg(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::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().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 58e2992e0..1452b14c9 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -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::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) + if ( TQString::fromLatin1( 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 9913f033d..508af9819 100644 --- a/kioslave/media/medianotifier/notificationdialog.cpp +++ b/kioslave/media/medianotifier/notificationdialog.cpp @@ -18,7 +18,7 @@ */ #include "notificationdialog.h" -#include +#include #include #include @@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett updateActionsListBox(); - resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize(400,400).expandedTo( minimumSizeHint() ) ); m_actionWatcher = new KDirWatch(); diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui index 032ea1f10..f7bd744be 100644 --- a/kioslave/media/medianotifier/notificationdialogview.ui +++ b/kioslave/media/medianotifier/notificationdialogview.ui @@ -42,13 +42,13 @@ 0 - + 64 64 - + 64 64 diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui index dfb8c17d0..939f0a36a 100644 --- a/kioslave/media/mounthelper/decryptdialog.ui +++ b/kioslave/media/mounthelper/decryptdialog.ui @@ -55,13 +55,13 @@ 0 - + 48 48 - + 32 32 @@ -70,7 +70,7 @@ true - + AlignTop @@ -84,7 +84,7 @@ Expanding - + 31 41 @@ -109,7 +109,7 @@ <p><b>%1</b> is an encrypted storage device.</p> <p>Please enter the password to decrypt the storage device.</p> - + WordBreak|AlignTop @@ -189,7 +189,7 @@ - + WordBreak|AlignTop diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui index 3c98e1eb7..51ead3a25 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 Expanding - + 20 20 diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp index 59433a5da..a3e237c40 100644 --- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +++ b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include -- cgit v1.2.3