From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kioslave/media/mediamanager/dialog.cpp | 2 +- kioslave/media/mediamanager/halbackend.cpp | 16 +++++++-------- kioslave/media/mediamanager/mediamanager.cpp | 2 +- kioslave/media/mediamanager/tdehardwarebackend.cpp | 24 +++++++++++----------- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kioslave/media/mediamanager') diff --git a/kioslave/media/mediamanager/dialog.cpp b/kioslave/media/mediamanager/dialog.cpp index 549bbdc4a..40e99a84d 100644 --- a/kioslave/media/mediamanager/dialog.cpp +++ b/kioslave/media/mediamanager/dialog.cpp @@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) : enableButton( User1, false ); - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge); + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge); decryptDialog->encryptedIcon->setPixmap( pixmap ); connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index ca0c4e26c..9ebf0ade7 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -376,9 +376,9 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition) } } if (medium) { - KProcess p; + TDEProcess p; p << "kio_media_mounthelper" << "-e" << medium->name(); - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); } } @@ -1128,7 +1128,7 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command, const TQString& dialogCaption, const TQString& dialogComment) { - KProcess tdesudoProcess; + TDEProcess tdesudoProcess; tdesudoProcess << tdesudoPath << "-d" @@ -1138,7 +1138,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman << "-c" << command; // @todo handle tdesudo output - tdesudoProcess.start(KProcess::Block); + tdesudoProcess.start(TDEProcess::Block); return TQString(); } @@ -1146,7 +1146,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command, const TQString& dialogCaption) { - KProcess tdesuProcess; + TDEProcess tdesuProcess; tdesuProcess << tdesuPath << "-d" @@ -1155,7 +1155,7 @@ TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command, << "-c" << command; // @todo handle tdesu output - tdesuProcess.start(KProcess::Block); + tdesuProcess.start(TDEProcess::Block); return TQString(); } @@ -1299,7 +1299,7 @@ static TQString mount_priv(const char *udi, const char *mount_point, const char TQString HALBackend::listUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; @@ -1336,7 +1336,7 @@ TQString HALBackend::listUsingProcesses(const Medium* medium) TQString HALBackend::killUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; diff --git a/kioslave/media/mediamanager/mediamanager.cpp b/kioslave/media/mediamanager/mediamanager.cpp index 6223036a6..db2c12a71 100644 --- a/kioslave/media/mediamanager/mediamanager.cpp +++ b/kioslave/media/mediamanager/mediamanager.cpp @@ -415,7 +415,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam extern "C" { KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("kio_media"); + TDEGlobal::locale()->insertCatalogue("kio_media"); return new MediaManager(obj); } } diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/kioslave/media/mediamanager/tdehardwarebackend.cpp index 15e27a43a..1086a3e77 100644 --- a/kioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/kioslave/media/mediamanager/tdehardwarebackend.cpp @@ -63,7 +63,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent) , m_parent(parent) { // Initialize the TDE device manager - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); // Connect device monitoring signals/slots connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*))); @@ -78,7 +78,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent) TDEBackend::~TDEBackend() { // Remove all media from the media list - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices(); TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { @@ -113,7 +113,7 @@ void TDEBackend::ModifyDeviceHandler(TDEGenericDevice *device) { // List devices (at startup) bool TDEBackend::ListDevices() { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices(); TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { @@ -391,7 +391,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat void TDEBackend::setVolumeProperties(Medium* medium) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -570,7 +570,7 @@ void TDEBackend::setVolumeProperties(Medium* medium) // Handle floppies and zip drives bool TDEBackend::setFloppyProperties(Medium* medium) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -636,7 +636,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium) void TDEBackend::setCameraProperties(Medium* medium) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -702,7 +702,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name) return TQStringList(); } - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -961,7 +961,7 @@ TQString TDEBackend::mount(const Medium *medium) } - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -1162,7 +1162,7 @@ TQString TDEBackend::unmount(const TQString &_udi) TQString udi = TQString::null; - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -1271,7 +1271,7 @@ TQString TDEBackend::isInFstab(const Medium *medium) TQString TDEBackend::listUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; @@ -1308,7 +1308,7 @@ TQString TDEBackend::listUsingProcesses(const Medium* medium) TQString TDEBackend::killUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; @@ -1346,7 +1346,7 @@ TQString TDEBackend::generateName(const TQString &devNode) } TQString TDEBackend::driveUDIFromDeviceUID(TQString uuid) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(uuid); TQString ret; -- cgit v1.2.3