Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

4 files changed, 20 insertions, 20 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)
    {
diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h
index 13e77093d..988697848 100644
--- a/nsplugins/nspluginloader.h
+++ b/nsplugins/nspluginloader.h
@@ -39,7 +39,7 @@
 
 #define EMBEDCLASS QXEmbed
 
-class KProcess;
+class TDEProcess;
 class TQPushButton;
 class TQGridLayout;
 
@@ -106,13 +106,13 @@ protected:
 
 protected slots:
   void applicationRegistered( const TQCString& appId );
-  void processTerminated( KProcess *proc );
+  void processTerminated( TDEProcess *proc );
 
 private:
   TQStringList _searchPaths;
   TQDict<TQString> _mapping, _filetype;
 
-  KProcess *_process;
+  TDEProcess *_process;
   bool _running;
   TQCString _dcopid;
   NSPluginViewerIface_stub *_viewer;
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 116308a77..29d4b6b4d 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -121,7 +121,7 @@ bool isPluginMimeType( TQString fname )
 void deletePluginMimeTypes()
 {
     // iterate through local mime type directories
-    TQString dir = KGlobal::dirs()->saveLocation( "mime" );
+    TQString dir = TDEGlobal::dirs()->saveLocation( "mime" );
     kdDebug(1433) << "Removing nsplugin MIME types in " << dir << endl;
     TQDir dirs( dir, TQString::null, TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs );
     if ( !dirs.exists() ) {
@@ -168,7 +168,7 @@ void generateMimeType( TQString mime, TQString extensions, TQString pluginName,
         kdDebug(1433) << "<- generateMimeType" << endl;
         return;
     }
-    dir = KGlobal::dirs()->saveLocation( "mime", mime.left(pos) );
+    dir = TDEGlobal::dirs()->saveLocation( "mime", mime.left(pos) );
     name = mime.mid(pos);
 
     // create mimelnk file
@@ -455,7 +455,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
 
 void writeServicesFile( TQStringList mimeTypes )
 {
-    TQString fname = KGlobal::dirs()->saveLocation("services", "")
+    TQString fname = TDEGlobal::dirs()->saveLocation("services", "")
                     + "/nsplugin.desktop";
     kdDebug(1433) << "Creating services file " << fname << endl;
 
@@ -566,12 +566,12 @@ int main( int argc, char **argv )
     TQStringList searchPaths = getSearchPaths();
     TQStringList mimeInfoList;
 
-    infoConfig = new KConfig( KGlobal::dirs()->saveLocation("data", "nsplugins") +
+    infoConfig = new KConfig( TDEGlobal::dirs()->saveLocation("data", "nsplugins") +
                               "/pluginsinfo" );
     infoConfig->writeEntry( "number", 0 );
 
     // open the cache file for the mime information
-    TQString cacheName = KGlobal::dirs()->saveLocation("data", "nsplugins")+"/cache";
+    TQString cacheName = TDEGlobal::dirs()->saveLocation("data", "nsplugins")+"/cache";
     kdDebug(1433) << "Creating MIME cache file " << cacheName << endl;
     TQFile cachef(cacheName);
     if (!cachef.open(IO_WriteOnly))
@@ -625,7 +625,7 @@ int main( int argc, char **argv )
               mimeTypes.append( type );
 
               // check mimelnk file
-              TQString fname = KGlobal::dirs()->findResource("mime", type+".desktop");
+              TQString fname = TDEGlobal::dirs()->findResource("mime", type+".desktop");
               if ( fname.isEmpty() || isPluginMimeType(fname) ) {
                   kdDebug(1433) << " - creating MIME type description" << endl;
                   removeExistingExtensions( extension );
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index af9e72d32..493f149b6 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -514,20 +514,20 @@ void g_NPN_ReloadPlugins(NPBool reloadPages)
 {
    // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api15.html#999713
    kdDebug(1431) << "g_NPN_ReloadPlugins()" << endl;
-   KProcess p;
-   p << KGlobal::dirs()->findExe("nspluginscan");
+   TDEProcess p;
+   p << TDEGlobal::dirs()->findExe("nspluginscan");
 
    if (reloadPages) {
       // This is the proper way, but it cannot be done because we have no
       // handle to the caller!  How stupid!  We cannot force all konqi windows
       // to reload - that would be evil.
-      //p.start(KProcess::Block);
+      //p.start(TDEProcess::Block);
       // Let's only allow the caller to be reloaded, not everything.
       //if (_callback)
       //   _callback->reloadPage();
-      p.start(KProcess::DontCare);
+      p.start(TDEProcess::DontCare);
    } else {
-      p.start(KProcess::DontCare);
+      p.start(TDEProcess::DontCare);
    }
 }