diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /tdm/kfrontend | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend')
| -rw-r--r-- | tdm/kfrontend/kgapp.cpp | 6 | ||||
| -rw-r--r-- | tdm/kfrontend/kgapp.h | 4 | ||||
| -rw-r--r-- | tdm/kfrontend/krootimage.cpp | 4 | ||||
| -rw-r--r-- | tdm/kfrontend/krootimage.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 707cdd372..f6a5a0b15 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -94,12 +94,12 @@ GreeterApp::GreeterApp() init(); } -GreeterApp::GreeterApp(Display *dpy) : KApplication(dpy) +GreeterApp::GreeterApp(Display *dpy) : TDEApplication(dpy) { init(); } -GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : KApplication(dpy, visual, colormap) +GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : TDEApplication(dpy, visual, colormap) { init(); } @@ -199,7 +199,7 @@ kg_main( const char *argv0 ) kdDebug() << timestamp() << "start" << endl; kde_have_kipc = false; - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KCrash::setSafer( true ); KProcess *tsak = 0; diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h index 41a1dcabd..ed799672d 100644 --- a/tdm/kfrontend/kgapp.h +++ b/tdm/kfrontend/kgapp.h @@ -29,9 +29,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kapplication.h> #include <tdehardwaredevices.h> -class GreeterApp : public KApplication { +class GreeterApp : public TDEApplication { Q_OBJECT - typedef KApplication inherited; + typedef TDEApplication inherited; public: GreeterApp(); diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 69faf2d7c..baf3b3699 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -48,7 +48,7 @@ static Atom prop_root; static bool properties_inited = false; MyApplication::MyApplication( const char *conf ) - : KApplication(), + : TDEApplication(), renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) ) { connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); @@ -115,7 +115,7 @@ MyApplication::slotTimeout() int main( int argc, char *argv[] ) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KLocale::setMainCatalogue( "kdesktop" ); TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version ); diff --git a/tdm/kfrontend/krootimage.h b/tdm/kfrontend/krootimage.h index e46190116..e71ae3b4c 100644 --- a/tdm/kfrontend/krootimage.h +++ b/tdm/kfrontend/krootimage.h @@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA. #include <bgrender.h> -class MyApplication : public KApplication +class MyApplication : public TDEApplication { Q_OBJECT |