diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /nsplugins/nspluginloader.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 'nsplugins/nspluginloader.cpp')
| -rw-r--r-- | nsplugins/nspluginloader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 5949fe461..71f6d588d 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -331,17 +331,17 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType) kdDebug() << "NSPluginLoader::loadViewer" << endl; _running = false; - _process = new KProcess; + _process = new TDEProcess; // get the dcop app id int pid = (int)getpid(); _dcopid.sprintf("nspluginviewer-%d", pid); - connect( _process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(processTerminated(KProcess*)) ); + connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(processTerminated(TDEProcess*)) ); // find the external viewer process - TQString viewer = KGlobal::dirs()->findExe("nspluginviewer"); + TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer"); if (!viewer) { kdDebug() << "can't find nspluginviewer" << endl; @@ -352,7 +352,7 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType) // find the external artsdsp process if( _useArtsdsp && mimeType != "application/pdf" ) { kdDebug() << "trying to use artsdsp" << endl; - TQString artsdsp = KGlobal::dirs()->findExe("artsdsp"); + TQString artsdsp = TDEGlobal::dirs()->findExe("artsdsp"); if (!artsdsp) { kdDebug() << "can't find artsdsp" << endl; @@ -441,7 +441,7 @@ void NSPluginLoader::applicationRegistered( const TQCString& appId ) } -void NSPluginLoader::processTerminated(KProcess *proc) +void NSPluginLoader::processTerminated(TDEProcess *proc) { if ( _process == proc) { |