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 /kpager | |
| parent | dc5f267664506a312203c26bfe9001a448b0bb0f (diff) | |
| download | tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kpager')
| -rw-r--r-- | kpager/desktop.h | 2 | ||||
| -rw-r--r-- | kpager/kpager.cpp | 6 | ||||
| -rw-r--r-- | kpager/kpager.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kpager/desktop.h b/kpager/desktop.h index 5a861c738..cff05594a 100644 --- a/kpager/desktop.h +++ b/kpager/desktop.h @@ -30,7 +30,7 @@ #include <twin.h> class TDESharedPixmap; -class KPopupMenu; +class TDEPopupMenu; class TQPainter; class TQPoint; diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index e75f1a0f1..d689b7140 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -60,7 +60,7 @@ #include <assert.h> KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) - : DCOPObject("KPagerIface"), KMainWindow(parent, name) + : DCOPObject("KPagerIface"), TDEMainWindow(parent, name) { m_reallyClose=false; @@ -144,7 +144,7 @@ bool KPagerMainWindow::queryClose() void KPagerMainWindow::showEvent( TQShowEvent *ev ) { timeout->stop(); - KMainWindow::showEvent(ev); + TDEMainWindow::showEvent(ev); } void KPagerMainWindow::reallyClose() @@ -319,7 +319,7 @@ void KPager::showPopupMenu( WId wid, TQPoint pos) m_winfo = KWin::windowInfo(wid); if (!m_mnu) { - m_mnu = new KPopupMenu(this); + m_mnu = new TDEPopupMenu(this); m_mnu->insertTitle( TQString::fromUtf8("KPager"), 1); m_mnu->setCheckable(true); diff --git a/kpager/kpager.h b/kpager/kpager.h index aa194b4df..b1d0dacf5 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -34,7 +34,7 @@ class KPager; class TQPopupMenu; -class KPagerMainWindow : public KMainWindow, public virtual KPagerIface +class KPagerMainWindow : public TDEMainWindow, public virtual KPagerIface { Q_OBJECT @@ -122,10 +122,10 @@ protected: LayoutTypes m_layoutType; class TQGridLayout *m_layout; - KPopupMenu *m_mnu; + TDEPopupMenu *m_mnu; TQPopupMenu *m_smnu, *m_dmnu; - KAction *m_quit_action; - KAction *m_prefs_action; + TDEAction *m_quit_action; + TDEAction *m_prefs_action; KWin::WindowInfo m_winfo; bool m_showStickyOption; // To be removed after the message freeze |