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/kgapp.cpp | |
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/kgapp.cpp')
-rw-r--r-- | tdm/kfrontend/kgapp.cpp | 6 |
1 files changed, 3 insertions, 3 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; |