diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kdesktop/bgmanager.cc | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/bgmanager.cc')
| -rw-r--r-- | kdesktop/bgmanager.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index 278f267d5..aa0aa598d 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule m_pDesktop = desktop; if (desktop == 0L) - desktop = TQT_TQWIDGET(KApplication::desktop()->screen()); + desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen()); m_Renderer.resize( 1 ); m_Cache.resize( 1 ); @@ -529,14 +529,14 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) root_cleared = true; TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot())); // but make the pixmap visible until m_pDesktop is visible - TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } } else { - TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } // and export it via Esetroot-style for gnome/GTK apps to share in the pretties @@ -556,8 +556,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) void KBackgroundManager::clearRoot() { - TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap()); - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap()); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } /* @@ -925,7 +925,7 @@ void KBackgroundManager::repaintBackground() if (m_pDesktop) m_pDesktop->repaint(); else - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } void KBackgroundManager::desktopResized() |