diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /nsplugins/viewer | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'nsplugins/viewer')
| -rw-r--r-- | nsplugins/viewer/kxt.cpp | 4 | ||||
| -rw-r--r-- | nsplugins/viewer/kxt.h | 2 | ||||
| -rw-r--r-- | nsplugins/viewer/nsplugin.cpp | 2 | ||||
| -rw-r--r-- | nsplugins/viewer/viewer.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
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 |