summaryrefslogtreecommitdiffstats
path: root/kioslave/media
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kioslave/media
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/media')
-rw-r--r--kioslave/media/kcmodule/main.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifieraction.cpp2
-rw-r--r--kioslave/media/libmediacommon/notifiersettings.cpp2
-rw-r--r--kioslave/media/mediamanager/dialog.cpp2
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp16
-rw-r--r--kioslave/media/mediamanager/mediamanager.cpp2
-rw-r--r--kioslave/media/mediamanager/tdehardwarebackend.cpp24
-rw-r--r--kioslave/media/medianotifier/medianotifier.cpp4
-rw-r--r--kioslave/media/mounthelper/dialog.cpp2
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.cpp10
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.h2
11 files changed, 34 insertions, 34 deletions
diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp
index 6760b4e8f..29c48d990 100644
--- a/kioslave/media/kcmodule/main.cpp
+++ b/kioslave/media/kcmodule/main.cpp
@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) )
MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& )
: KCModule(MediaFactory::instance(), parent, name )
{
- KGlobal::locale()->insertCatalogue("kio_media");
+ TDEGlobal::locale()->insertCatalogue("kio_media");
TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
TQTabWidget *tab = new TQTabWidget( this );
diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp
index d10314701..0dfc4110e 100644
--- a/kioslave/media/libmediacommon/notifieraction.cpp
+++ b/kioslave/media/libmediacommon/notifieraction.cpp
@@ -57,7 +57,7 @@ TQPixmap NotifierAction::pixmap() const
}
else
{
- TQString path = KGlobal::iconLoader()->iconPath( m_iconName, -32 );
+ TQString path = TDEGlobal::iconLoader()->iconPath( m_iconName, -32 );
return TQPixmap( path );
}
}
diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp
index 0cdf6f26b..cc90e5ef7 100644
--- a/kioslave/media/libmediacommon/notifiersettings.cpp
+++ b/kioslave/media/libmediacommon/notifiersettings.cpp
@@ -361,7 +361,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString
TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQString &mimetype ) const
{
TQValueList<NotifierServiceAction*> services;
- TQStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
+ TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "konqueror/servicemenus/");
TQStringList::ConstIterator dir_it = dirs.begin();
TQStringList::ConstIterator dir_end = dirs.end();
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;
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index d02f1c4b5..94ee0e8c2 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -199,7 +199,7 @@ bool MediaNotifier::execAutorun( const KFileItem &medium, const TQString &path,
// confirmed its execution the autostart file MUST be executed
// with the current working directory ( CWD ) set to the root
// directory of the medium.
- KProcess proc;
+ TDEProcess proc;
proc << "sh" << autorunFile;
proc.setWorkingDirectory( path );
proc.start();
@@ -313,7 +313,7 @@ extern "C"
{
KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name)
{
- KGlobal::locale()->insertCatalogue("kay");
+ TDEGlobal::locale()->insertCatalogue("kay");
return new MediaNotifier(name);
}
}
diff --git a/kioslave/media/mounthelper/dialog.cpp b/kioslave/media/mounthelper/dialog.cpp
index 549bbdc4a..40e99a84d 100644
--- a/kioslave/media/mounthelper/dialog.cpp
+++ b/kioslave/media/mounthelper/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/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 23a207fab..f321293d6 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -182,19 +182,19 @@ MountHelper::MountHelper() : TDEApplication()
void MountHelper::invokeEject(const TQString &device, bool quiet)
{
- KProcess *proc = new KProcess(TQT_TQOBJECT(this));
+ TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
*proc << "kdeeject";
if (quiet)
{
*proc << "-q";
}
*proc << device;
- connect( proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT( ejectFinished(KProcess *) ) );
+ connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT( ejectFinished(TDEProcess *) ) );
proc->start();
}
-void MountHelper::ejectFinished(KProcess* proc)
+void MountHelper::ejectFinished(TDEProcess* proc)
{
/*
* If eject failed, report the error stored in m_errorStr
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
"0.1");
TDECmdLineArgs::addCmdLineOptions( options );
- KGlobal::locale()->setMainCatalogue("kio_media");
+ TDEGlobal::locale()->setMainCatalogue("kio_media");
TDEApplication::addCmdLineOptions();
if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h
index ffb5d1dba..7eff1e54a 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.h
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.h
@@ -47,7 +47,7 @@ private:
private slots:
void slotSendPassword();
void slotCancel();
- void ejectFinished(KProcess* proc);
+ void ejectFinished(TDEProcess* proc);
void error();
signals: