diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kioslave/media/mounthelper/kio_media_mounthelper.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/media/mounthelper/kio_media_mounthelper.cpp')
| -rw-r--r-- | kioslave/media/mounthelper/kio_media_mounthelper.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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(); |