From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:17:06 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 nsplugins/kcm_nsplugins.cpp     | 2 +-
 nsplugins/pluginscan.cpp        | 2 +-
 nsplugins/test/testnsplugin.cpp | 2 +-
 nsplugins/viewer/kxt.cpp        | 4 ++--
 nsplugins/viewer/kxt.h          | 2 +-
 nsplugins/viewer/nsplugin.cpp   | 2 +-
 nsplugins/viewer/viewer.cpp     | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'nsplugins')

diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index d5cd54347..7b3bddabd 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -116,7 +116,7 @@ extern "C"
 
         if ( scan || firstTime )
         {
-            KApplication::tdeinitExec("nspluginscan");
+            TDEApplication::tdeinitExec("nspluginscan");
         }
 
         if (firstTime) {
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 5f3db42f4..e6891ba97 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -539,7 +539,7 @@ int main( int argc, char **argv )
       printf("10\n"); fflush(stdout);
     }
 
-    KApplication app(false, false);
+    TDEApplication app(false, false);
 
     // Set up SIGCHLD handler
     struct sigaction act;
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 93ebaccde..986595816 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
    setvbuf( stderr, NULL, _IONBF, 0 );
    TDECmdLineArgs::init(argc, argv, "nsplugin", "A Netscape Plugin test program", "0.1");
 
-   KApplication app("nsplugin");
+   TDEApplication app("nsplugin");
 
    app.dcopClient()->attach();
    app.dcopClient()->registerAs(app.name());
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index b8992b171..9147285dc 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -314,7 +314,7 @@ KXtApplication::KXtApplication(int& argc, char** argv,
         const TQCString& rAppName, bool allowStyles, bool GUIenabled,
         XrmOptionDescRec *options, int num_options,
         char** resources)
-  : KApplication(argc, argv, rAppName, allowStyles, GUIenabled)
+  : TDEApplication(argc, argv, rAppName, allowStyles, GUIenabled)
 {
     my_xt = TRUE;
 
@@ -335,7 +335,7 @@ KXtApplication::KXtApplication(int& argc, char** argv,
 */
 KXtApplication::KXtApplication(Display* dpy, int& argc, char** argv,
         const TQCString& rAppName, bool allowStyles, bool GUIenabled)
-   : KApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled)
+   : TDEApplication(dpy, argc, argv, rAppName, allowStyles, GUIenabled)
 {
     my_xt = FALSE;
     init();
diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h
index d7c46a594..f4791f114 100644
--- a/nsplugins/viewer/kxt.h
+++ b/nsplugins/viewer/kxt.h
@@ -53,7 +53,7 @@
 #include <tqwidget.h>
 #include <X11/Intrinsic.h>
 
-class KXtApplication : public KApplication {
+class KXtApplication : public TDEApplication {
     Q_OBJECT
     void init();
 
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index f8e3a37f8..af9e72d32 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1254,7 +1254,7 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId,
    : DCOPObject(dcopId), TQObject( parent, name ) 
 {
     _classes.setAutoDelete( true );
-    connect(KApplication::dcopClient(),
+    connect(TDEApplication::dcopClient(),
             TQT_SIGNAL(applicationRemoved(const TQCString&)),
             this,
             TQT_SLOT(appUnregistered(const TQCString&)));
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index a02db4c52..654ba68e6 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -248,8 +248,8 @@ int main(int argc, char** argv)
    parseCommandLine(argc, argv);
    KLocale::setMainCatalogue("nsplugin");
 
-   kdDebug(1430) << "4 - create KApplication" << endl;
-   KApplication app( argc,  argv, "nspluginviewer" );
+   kdDebug(1430) << "4 - create TDEApplication" << endl;
+   TDEApplication app( argc,  argv, "nspluginviewer" );
    GlibEvents glibevents;
 #endif
 
-- 
cgit v1.2.3