diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:11:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:11:21 -0600 |
| commit | f537c21b68e08f649b1b297bce8f3904603137e0 (patch) | |
| tree | fb33065387509dea898c90022ddec9c3f8ede86d /kdesktop/desktop.cc | |
| parent | dc5f267664506a312203c26bfe9001a448b0bb0f (diff) | |
| download | tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kdesktop/desktop.cc')
| -rw-r--r-- | kdesktop/desktop.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 07fbaf5cd..9ff390ec6 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -62,7 +62,7 @@ #include <kpopupmenu.h> #include <kapplication.h> #include <kdirlister.h> -// Create the equivalent of KAccelBase::connectItem +// Create the equivalent of TDEAccelBase::connectItem // and then remove this include and fix reconnects in initRoot() -- ellis //#include <kaccelbase.h> @@ -454,8 +454,8 @@ void KDesktop::initConfig() keys->updateConnections(); } - KLaunchSettings::self()->readConfig(); - if( !KLaunchSettings::busyCursor() ) + TDELaunchSettings::self()->readConfig(); + if( !TDELaunchSettings::busyCursor() ) { delete startup_id; startup_id = NULL; @@ -748,7 +748,7 @@ void KDesktop::toggleShowDesktop() setShowDesktop(!showDesktopState()); } -KActionCollection * KDesktop::actionCollection() +TDEActionCollection * KDesktop::actionCollection() { if (!m_pIconView) return 0; @@ -929,7 +929,7 @@ void KDesktop::slotSwitchDesktops(int delta) void KDesktop::handleColorDropEvent(TQDropEvent * e) { - KPopupMenu popup; + TDEPopupMenu popup; popup.insertItem(SmallIconSet("colors"),i18n("Set as Primary Background Color"), 1); popup.insertItem(SmallIconSet("colors"),i18n("Set as Secondary Background Color"), 2); int result = popup.exec(e->pos()); @@ -946,7 +946,7 @@ void KDesktop::handleColorDropEvent(TQDropEvent * e) void KDesktop::handleImageDropEvent(TQDropEvent * e) { - KPopupMenu popup; + TDEPopupMenu popup; if ( m_pIconView ) popup.insertItem(SmallIconSet("filesave"),i18n("&Save to Desktop..."), 1); if ( ( m_pIconView && m_pIconView->maySetWallpaper() ) || m_pRootWidget ) |