From 3858c9720a0f7c205cf35da7becbf061612fbbf2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:58 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/kio_umountwrapper.cpp | 10 +++++----- src/kio_umountwrapper.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kio_umountwrapper.cpp b/src/kio_umountwrapper.cpp index 72ca45a..775215c 100644 --- a/src/kio_umountwrapper.cpp +++ b/src/kio_umountwrapper.cpp @@ -47,13 +47,13 @@ kio_umountwrapper::kio_umountwrapper(const TQString& url) connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(progressAdvance())); t->start(10, FALSE); - KProcess *p = new KProcess(TQT_TQOBJECT(this)); + TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this)); *p << "kio_media_mounthelper"; *p << "-s"; *p << url; - kdDebug() << "KProcess: " << url << endl; - connect(p, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(processFinished(KProcess *))); + kdDebug() << "TDEProcess: " << url << endl; + connect(p, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(processFinished(TDEProcess *))); p->start(); } @@ -62,7 +62,7 @@ void kio_umountwrapper::progressAdvance() m_progress->progressBar()->advance(1); } -void kio_umountwrapper::processFinished(KProcess* p) +void kio_umountwrapper::processFinished(TDEProcess* p) { if (p->normalExit() && p->exitStatus() == 0) { diff --git a/src/kio_umountwrapper.h b/src/kio_umountwrapper.h index da9b041..eb670b8 100644 --- a/src/kio_umountwrapper.h +++ b/src/kio_umountwrapper.h @@ -42,7 +42,7 @@ private: private slots: void progressAdvance(); - void processFinished(KProcess* p); + void processFinished(TDEProcess* p); };