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 /kicker/applets/minipager | |
| parent | dc5f267664506a312203c26bfe9001a448b0bb0f (diff) | |
| download | tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kicker/applets/minipager')
| -rw-r--r-- | kicker/applets/minipager/pagerapplet.cpp | 6 | ||||
| -rw-r--r-- | kicker/applets/minipager/pagerapplet.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 9d12279c2..6662d57d4 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -143,7 +143,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); - if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) + if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) { m_contextMenu = new TQPopupMenu(); connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); @@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( m_desktopLayoutOwner == NULL ) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( tqt_xdisplay()); - m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), + m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), screen, TQT_TQOBJECT(this) ); if( !m_desktopLayoutOwner->claim( false )) { @@ -717,7 +717,7 @@ void KMiniPager::aboutToShowContextMenu() .arg(twin()->desktopName(m_rmbDesk)), RenameDesktop); m_contextMenu->insertSeparator(); - KPopupMenu* showMenu = new KPopupMenu(m_contextMenu); + TDEPopupMenu* showMenu = new TDEPopupMenu(m_contextMenu); showMenu->setCheckable(true); showMenu->insertTitle(i18n("Pager Layout")); diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 9abe65f34..1f0edc409 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -40,7 +40,7 @@ class TQTimer; class TDEProcess; class KWinModule; class KTextShadowEngine; -class KSelectionOwner; +class TDESelectionOwner; class PagerSettings; @@ -128,7 +128,7 @@ private: int desktopLayoutOrientation; int desktopLayoutX; int desktopLayoutY; - KSelectionOwner* m_desktopLayoutOwner; + TDESelectionOwner* m_desktopLayoutOwner; KWinModule *m_twin; KTextShadowEngine* m_shadowEngine; |