diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kio/tests | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kio/tests')
| -rw-r--r-- | kio/tests/kdcopcheck.cpp | 2 | ||||
| -rw-r--r-- | kio/tests/kdcopcheck.h | 2 | ||||
| -rw-r--r-- | kio/tests/kprotocolinfotest.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp index 1626f2ebc..79f050f51 100644 --- a/kio/tests/kdcopcheck.cpp +++ b/kio/tests/kdcopcheck.cpp @@ -44,7 +44,7 @@ TestService::TestService(const TQString &exec) this, TQT_SLOT(newApp(const TQCString&))); connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(KProcess *)), + connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(appExit())); TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h index 9a76e6246..593dbba1e 100644 --- a/kio/tests/kdcopcheck.h +++ b/kio/tests/kdcopcheck.h @@ -22,7 +22,7 @@ public slots: protected: int result; TQString m_exec; - KProcess proc; + TDEProcess proc; }; #endif diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp index 03bbbdac6..845f3367c 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -45,7 +45,7 @@ int main(int argc, char **argv) { assert( KProtocolInfo::showFilePreview( "file" ) == true ); assert( KProtocolInfo::showFilePreview( "audiocd" ) == false ); - assert( KGlobalSettings::showFilePreview( "audiocd:/" ) == false ); + assert( TDEGlobalSettings::showFilePreview( "audiocd:/" ) == false ); TQString proxy; TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.kde.org", proxy ); |