diff options
Diffstat (limited to 'kopete/kopete')
| -rw-r--r-- | kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp | 4 | ||||
| -rw-r--r-- | kopete/kopete/kopeteapplication.cpp | 2 | ||||
| -rw-r--r-- | kopete/kopete/kopetewindow.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 7e6e3132..f779dcfa 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -183,9 +183,9 @@ void ChatWindowStyleRendering_Test::allTests() // change user data dir to avoid messing with user's .kde dir setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); //TDECmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); - KApplication app; + TDEApplication app; chatPart = new ChatMessagePart(d->fakeChatSession, 0, 0); diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index ef8160c1..4c37e059 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -71,7 +71,7 @@ KopeteApplication::KopeteApplication() * When the messagebox is finished the loop_level will drop down to zero and * TQApplication thinks the application shuts down (this is usually the case * when the loop_level goes down to zero) . So it emits aboutToQuit(), to - * which KApplication is connected and re-emits shutdown() , to which again + * which TDEApplication is connected and re-emits shutdown() , to which again * KMainWindow (a KopeteWindow instance exists already) is connected. KMainWindow's * shuttingDown() slot calls queryExit() which results in KopeteWindow::queryExit() * calling unloadPlugins() . This of course is wrong and just shouldn't happen. diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index e3410a5b..87581866 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -112,8 +112,8 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event ) * shuts down the PluginManager in queryExit(). When the PluginManager has completed its * shutdown, the app is finally deref()ed, and the contactlist and accountmanager * are saved. - * and calling KApplication::quit() - * 2) session - KopeteWindow and all chatwindows are closed by KApplication session management. + * and calling TDEApplication::quit() + * 2) session - KopeteWindow and all chatwindows are closed by TDEApplication session management. * quit Then the shutdown proceeds as above. * * queryClose() is honoured so group chats and chats receiving recent messages can interrupt |