From 65eca7929c22f0f0bc64135c02d85d1243df376c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:51 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kfax/ChangeLog | 2 +- kfax/kfax.cpp | 12 ++++++------ kfax/kfax.h | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kfax') diff --git a/kfax/ChangeLog b/kfax/ChangeLog index 39accef4..8eab19cb 100644 --- a/kfax/ChangeLog +++ b/kfax/ChangeLog @@ -19,7 +19,7 @@ Sun Oct 5 22:17:09 1997 Bernd Johannes Wuebben Sun Aug 3 09:55:52 1997 Bernd Johannes Wuebben - * Made kfax work with the new KToolBar etc. + * Made kfax work with the new TDEToolBar etc. Thu Jul 24 20:44:33 1997 Bernd Johannes Wuebben diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index 9e3479c1..b742a372 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -189,7 +189,7 @@ bool MyApp::x11EventFilter( XEvent * ev) } TopLevel::TopLevel (TQWidget *, const char *name) - : KMainWindow (0, name) + : TDEMainWindow (0, name) { setMinimumSize (100, 100); @@ -244,7 +244,7 @@ void TopLevel::setupMenuBar() actionCollection() ); actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - actAdd = new KAction( i18n( "A&dd..." ), "filenew", KShortcut(), TQT_TQOBJECT(this), + actAdd = new TDEAction( i18n( "A&dd..." ), "filenew", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); actRecent->setMaxItems( 5 ); @@ -256,11 +256,11 @@ void TopLevel::setupMenuBar() actZoomOut = KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( zoomout() ), actionCollection() ); - actRotate = new KAction( i18n( "&Rotate Page" ), "rotate", KShortcut(), TQT_TQOBJECT(this), + actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" ); - actMirror = new KAction( i18n( "Mirror Page" ), KShortcut(), TQT_TQOBJECT(this), + actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" ); - actFlip = new KAction( i18n( "&Flip Page" ), KShortcut(), TQT_TQOBJECT(this), + actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( flipPage() ), actionCollection(), "view_flip" ); // Go menu @@ -560,7 +560,7 @@ void TopLevel::openadd(TQString filename) void TopLevel::resizeEvent(TQResizeEvent *e) { - KMainWindow::resizeEvent(e); + TDEMainWindow::resizeEvent(e); resizeView(); } diff --git a/kfax/kfax.h b/kfax/kfax.h index 1b1d2449..2627cff1 100644 --- a/kfax/kfax.h +++ b/kfax/kfax.h @@ -38,20 +38,20 @@ class TQPopupMenu; class TDEConfig; class KStatusBar; -class KAction; -class KRecentFilesAction; +class TDEAction; +class TDERecentFilesAction; class KPrinter; class TQPainter; class TQScrollBar; -typedef KToolBar::BarPosition BarPosition; +typedef TDEToolBar::BarPosition BarPosition; class MyApp:public TDEApplication { public: virtual bool x11EventFilter( XEvent * ); }; -class TopLevel : public KMainWindow +class TopLevel : public TDEMainWindow { Q_OBJECT @@ -105,10 +105,10 @@ private: KURL fileURL; KStatusBar *statusbar; - KRecentFilesAction *actRecent; - KAction *actAdd, *actSave, *actSaveAs, *actPrint; - KAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror; - KAction *actFlip, *actNext, *actPrev, *actFirst, *actLast; + TDERecentFilesAction *actRecent; + TDEAction *actAdd, *actSave, *actSaveAs, *actPrint; + TDEAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror; + TDEAction *actFlip, *actNext, *actPrev, *actFirst, *actLast; int open_mode; -- cgit v1.2.1