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 /tdeui/kmainwindow.cpp | |
parent | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff) | |
download | tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kmainwindow.cpp')
-rw-r--r-- | tdeui/kmainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp index ffb59588b..5d2a1e705 100644 --- a/tdeui/kmainwindow.cpp +++ b/tdeui/kmainwindow.cpp @@ -92,7 +92,7 @@ public: } bool saveState( TQSessionManager& ) { - KConfig* config = KApplication::kApplication()->sessionConfig(); + KConfig* config = TDEApplication::kApplication()->sessionConfig(); if ( KMainWindow::memberList->first() ){ // According to Jochen Wilhelmy <digisnap@cs.tu-berlin.de>, this // hook is useful for better document orientation @@ -303,9 +303,9 @@ void KMainWindow::parseGeometry(bool parsewidth) if ( parsewidth && !(m & YValue) ) y = geometry().y(); if ( (m & XNegative) ) - x = KApplication::desktop()->width() + x - w; + x = TDEApplication::desktop()->width() + x - w; if ( (m & YNegative) ) - y = KApplication::desktop()->height() + y - h; + y = TDEApplication::desktop()->height() + y - h; move(x, y); } #endif @@ -1226,7 +1226,7 @@ void KMainWindow::setIcon( const TQPixmap& p ) { TQMainWindow::setIcon( p ); #ifdef Q_WS_X11 - // Qt3 doesn't support _NET_WM_ICON, but KApplication::setTopWidget(), which + // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which // is used by KMainWindow, sets it KWin::setIcons( winId(), p, TQPixmap()); #endif |