diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/twin.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/twin.cpp')
| -rw-r--r-- | tdecore/twin.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp index 63cdc761f..e96c25011 100644 --- a/tdecore/twin.cpp +++ b/tdecore/twin.cpp @@ -35,18 +35,18 @@ #include "config.h" #include "twin.h" -#include "kapplication.h" +#include "tdeapplication.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> #include <kdatastream.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <dcopref.h> #ifdef Q_WS_X11 -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <kxerrorhandler.h> #include <X11/Xlib.h> @@ -483,8 +483,8 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) if( XGetClassHint( tqt_xdisplay(), win, &hint ) ) { TQString className = hint.res_class; - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, - KIcon::DefaultState, 0, true ); + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( className.lower(), TDEIcon::Small, iconWidth, + TDEIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); else @@ -500,8 +500,8 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) // If the icon is still a null pixmap, load the 'xapp' icon // as a last resort: if ( result.isNull() ) { - TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, - KIcon::DefaultState, 0, true ); + TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( "xapp", TDEIcon::Small, iconWidth, + TDEIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); else @@ -731,7 +731,7 @@ void KWin::lowerWindow( WId win ) void KWin::appStarted() { #ifdef Q_WS_X11 - KStartupInfo::appStarted(); + TDEStartupInfo::appStarted(); #endif } |