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 /tdeui/krootpixmap.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 'tdeui/krootpixmap.cpp')
| -rw-r--r-- | tdeui/krootpixmap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 3530b5d45..6be62d157 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -14,7 +14,7 @@ #include <tqrect.h> #include <tqimage.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kimageeffect.h> #include <kpixmapio.h> #include <twinmodule.h> @@ -61,7 +61,7 @@ void KRootPixmap::init() m_Fade = 0; m_BlurRadius = 0; m_BlurSigma = 0; - m_pPixmap = new KSharedPixmap; //ordinary KPixmap on win32 + m_pPixmap = new TDESharedPixmap; //ordinary KPixmap on win32 m_pTimer = new TQTimer( this ); m_bInit = false; m_bActive = false; @@ -238,7 +238,7 @@ void KRootPixmap::repaint(bool force) m_Desk = currentDesktop(); } - // KSharedPixmap will correctly generate a tile for us. + // TDESharedPixmap will correctly generate a tile for us. m_pPixmap->loadFromShared(pixmapName(m_Desk), m_Rect); #else m_Desk = currentDesktop(); @@ -308,7 +308,7 @@ void KRootPixmap::slotDone(bool success) updateBackground( m_pPixmap ); } -void KRootPixmap::updateBackground( KSharedPixmap *spm ) +void KRootPixmap::updateBackground( TDESharedPixmap *spm ) { TQPixmap pm = *spm; |