diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
commit | 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch) | |
tree | 19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /libkscreensaver | |
parent | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff) | |
download | tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'libkscreensaver')
-rw-r--r-- | libkscreensaver/kscreensaver.cpp | 6 | ||||
-rw-r--r-- | libkscreensaver/main.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libkscreensaver/kscreensaver.cpp b/libkscreensaver/kscreensaver.cpp index 4c7b343cb..e4a1f89a0 100644 --- a/libkscreensaver/kscreensaver.cpp +++ b/libkscreensaver/kscreensaver.cpp @@ -67,7 +67,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget() if ( w == 0 ) w = 600; if ( h == 0 ) h = 420; resize( w, h ); - KApplication::sendPostedEvents(); + TDEApplication::sendPostedEvents(); show(); } @@ -79,12 +79,12 @@ KScreenSaver::~KScreenSaver() void KScreenSaver::embed( TQWidget *w ) { - KApplication::sendPostedEvents(); + TDEApplication::sendPostedEvents(); #ifdef Q_WS_X11 //FIXME XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0); #endif w->setGeometry( 0, 0, width(), height() ); - KApplication::sendPostedEvents(); + TDEApplication::sendPostedEvents(); } bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e ) diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp index da5b2a2df..75c2e72dd 100644 --- a/libkscreensaver/main.cpp +++ b/libkscreensaver/main.cpp @@ -98,7 +98,7 @@ KDE_EXPORT int main(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; KCrash::setCrashHandler( crashHandler ); KGlobal::locale()->insertCatalogue("klock"); |