Rename a number of classes to enhance compatibility with KDE4

4 files changed, 65 insertions, 65 deletions

diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 57b1e7db..97c6965b 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -187,34 +187,34 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     //-- File Menu ----------------------------------------------------------
     KStdAction::saveAs( document(), TQT_SLOT( saveAs() ),
                         actionCollection() );
-    new KAction( i18n( "Document &Info" ), 0,
+    new TDEAction( i18n( "Document &Info" ), 0,
                  miniWidget(), TQT_SLOT( info() ),
                  actionCollection(), "info" );
 
     //-- Edit Menu -----------------------------------------------------
-    _popup = new KPopupMenu( _markList, "marklist_menu" );
+    _popup = new TDEPopupMenu( _markList, "marklist_menu" );
 
-    KAction *act = new KAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
+    TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
                  actionCollection(), "mark_current" );
     act->plug( _popup );
-    act = new KAction( i18n( "Mark &All Pages" ), 0,
+    act = new TDEAction( i18n( "Mark &All Pages" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ),
                  actionCollection(), "mark_all" );
     act->plug( _popup );
-    act = new KAction( i18n( "Mark &Even Pages" ), 0,
+    act = new TDEAction( i18n( "Mark &Even Pages" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ),
                  actionCollection(), "mark_even" );
     act->plug( _popup );
-    act = new KAction( i18n( "Mark &Odd Pages" ), 0,
+    act = new TDEAction( i18n( "Mark &Odd Pages" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ),
                  actionCollection(), "mark_odd" );
     act->plug( _popup );
-    act = new KAction( i18n( "&Toggle Page Marks" ), 0,
+    act = new TDEAction( i18n( "&Toggle Page Marks" ), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ),
                  actionCollection(), "toggle" );
     act->plug( _popup );
-    act = new KAction( i18n("&Remove Page Marks"), 0,
+    act = new TDEAction( i18n("&Remove Page Marks"), 0,
                  TQT_TQOBJECT(_markList), TQT_SLOT( removeMarks() ),
                  actionCollection(), "remove" );
     act->plug( _popup );
@@ -222,12 +222,12 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     // TODO -- disable entry if there aren't any page names
 
     //-- View Menu ----------------------------------------------------------
-    _selectOrientation = new KSelectAction( i18n( "&Orientation" ), 0, 0, 0,
+    _selectOrientation = new TDESelectAction( i18n( "&Orientation" ), 0, 0, 0,
                                     actionCollection(), "orientation_menu" );
-    _selectMedia       = new KSelectAction( i18n( "Paper &Size" ), 0, 0, 0,
+    _selectMedia       = new TDESelectAction( i18n( "Paper &Size" ), 0, 0, 0,
                                     actionCollection(), "media_menu" );
 
-    _flick = new KToggleAction( i18n( "No &Flicker" ), 0,
+    _flick = new TDEToggleAction( i18n( "No &Flicker" ), 0,
                                 this, TQT_SLOT( slotFlicker() ),
                                 actionCollection(), "no_flicker" );
     
@@ -245,7 +245,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
              this, TQT_SLOT( slotMedia( int ) ) );
 
     {
-	KShortcut zoomInShort = KStdAccel::zoomIn();
+	TDEShortcut zoomInShort = TDEStdAccel::zoomIn();
 	zoomInShort.append( KKey( CTRL+Key_Equal ) );
 	_zoomIn = KStdAction::zoomIn( this, TQT_SLOT( slotZoomIn() ),
 				    actionCollection(), "zoomIn" );
@@ -253,7 +253,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     }
     _zoomOut = KStdAction::zoomOut( this,  TQT_SLOT( slotZoomOut() ),
                                     actionCollection(), "zoomOut" );
-    _zoomTo = new KSelectAction(  i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
+    _zoomTo = new TDESelectAction(  i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
     connect(  _zoomTo, TQT_SIGNAL(  activated(  const TQString & ) ), this, TQT_SLOT(  slotZoom( const TQString& ) ) );
     _zoomTo->setEditable(  true );
     _zoomTo->clear();
@@ -273,18 +273,18 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     _zoomTo->setItems( zooms );
     _zoomTo->setCurrentItem( idx );
 
-    _fitWidth = new KAction( i18n( "&Fit to Page Width" ), 0, this,
+    _fitWidth = new TDEAction( i18n( "&Fit to Page Width" ), 0, this,
 	    TQT_SLOT( slotFitToPage() ), actionCollection(),
 	    "fit_to_page");
-    _fitScreen = new KAction( i18n( "&Fit to Screen" ), Key_S, this,
+    _fitScreen = new TDEAction( i18n( "&Fit to Screen" ), Key_S, this,
 	    TQT_SLOT( slotFitToScreen() ), actionCollection(),
 	    "fit_to_screen");
 
-    _prevPage  = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
+    _prevPage  = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
                                     actionCollection(), "prevPage" );
     _prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
 
-    _nextPage  = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
+    _nextPage  = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
                                    actionCollection(), "nextPage" );
     _nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
 
@@ -296,15 +296,15 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
                                    actionCollection(), "goToEnd" );
     _lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) );
 
-    KShortcut readUpShort = KStdAccel::shortcut( KStdAccel::Prior );
+    TDEShortcut readUpShort = TDEStdAccel::shortcut( TDEStdAccel::Prior );
     readUpShort.append( KKey( SHIFT+Key_Space ) );
-    _readUp    = new KAction( i18n( "Read Up" ), "up",
+    _readUp    = new TDEAction( i18n( "Read Up" ), "up",
                               readUpShort, this, TQT_SLOT( slotReadUp() ),
                               actionCollection(), "readUp" );
 
-    KShortcut readDownShort = KStdAccel::shortcut( KStdAccel::Next );
+    TDEShortcut readDownShort = TDEStdAccel::shortcut( TDEStdAccel::Next );
     readDownShort.append( KKey( Key_Space ) );
-    _readDown  = new KAction( i18n( "Read Down" ), "down",
+    _readDown  = new TDEAction( i18n( "Read Down" ), "down",
                               readDownShort, this, TQT_SLOT( slotReadDown() ),
                               actionCollection(), "readDown" );
 
@@ -312,16 +312,16 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
                                       actionCollection(), "goToPage" );
 
     //-- Settings Menu ------------------------------------------------------
-    _showScrollBars = new KToggleAction( i18n( "Show &Scrollbars" ), 0,
+    _showScrollBars = new TDEToggleAction( i18n( "Show &Scrollbars" ), 0,
                                 actionCollection(), "show_scrollbars" );
     _showScrollBars->setCheckedState(i18n("Hide &Scrollbars"));
-    _watchFile	    = new KToggleAction( i18n( "&Watch File" ), 0,
+    _watchFile	    = new TDEToggleAction( i18n( "&Watch File" ), 0,
                                 this, TQT_SLOT( slotWatchFile() ),
                                 actionCollection(), "watch_file" );
-    _showPageList   = new KToggleAction( i18n( "Show &Page List" ), 0,
+    _showPageList   = new TDEToggleAction( i18n( "Show &Page List" ), 0,
                                 actionCollection(), "show_page_list" );
     _showPageList->setCheckedState(i18n("Hide &Page List"));
-    _showPageLabels = new KToggleAction( i18n("Show Page &Labels"), 0,
+    _showPageLabels = new TDEToggleAction( i18n("Show Page &Labels"), 0,
                                 actionCollection(), "show_page_labels" );
     _showPageLabels->setCheckedState(i18n("Hide Page &Labels"));
     KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection() );
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index e9feb249..ee863731 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -32,13 +32,13 @@ class TQFrame;
 class TQWidget;
 
 class TDEAboutData;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class KDirWatch;
 class TDEInstance;
-class KPopupMenu;
-class KSelectAction;
-class KToggleAction;
+class TDEPopupMenu;
+class TDESelectAction;
+class TDEToggleAction;
 
 class KGVBrowserExtension;
 class KGVConfigDialog;
@@ -187,26 +187,26 @@ private:
 
     TQTimer*		_fitTimer;
 
-    KSelectAction* _selectOrientation;
-    KSelectAction* _selectMedia;
-    KAction*       _zoomIn;
-    KAction*       _zoomOut;
-    KSelectAction* _zoomTo;
-    KAction *      _fitWidth;
-    KAction *      _fitScreen;
-    KAction*       _prevPage;
-    KAction*       _nextPage;
-    KAction*       _firstPage;
-    KAction*       _lastPage;
-    KAction*       _readUp;
-    KAction*       _readDown;
-    KAction*       _gotoPage;
-    KToggleAction* _showScrollBars;
-    KToggleAction* _watchFile;
-    KToggleAction* _flick;
-    KToggleAction* _showPageList;
-    KToggleAction* _showPageLabels;
-    KPopupMenu*    _popup;
+    TDESelectAction* _selectOrientation;
+    TDESelectAction* _selectMedia;
+    TDEAction*       _zoomIn;
+    TDEAction*       _zoomOut;
+    TDESelectAction* _zoomTo;
+    TDEAction *      _fitWidth;
+    TDEAction *      _fitScreen;
+    TDEAction*       _prevPage;
+    TDEAction*       _nextPage;
+    TDEAction*       _firstPage;
+    TDEAction*       _lastPage;
+    TDEAction*       _readUp;
+    TDEAction*       _readDown;
+    TDEAction*       _gotoPage;
+    TDEToggleAction* _showScrollBars;
+    TDEToggleAction* _watchFile;
+    TDEToggleAction* _flick;
+    TDEToggleAction* _showPageList;
+    TDEToggleAction* _showPageLabels;
+    TDEPopupMenu*    _popup;
 
     TQFile             _tmpFile;
     TDEIO::TransferJob* _job;
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 75f27dad..2cf72258 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -75,11 +75,11 @@ KGVShell::KGVShell() :
 	    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
 
     /*---- View -----------------------------------------------------------*/
-            new KAction( i18n(  "&Reload" ), "reload",
-		    KStdAccel::shortcut( KStdAccel::Reload ),
+            new TDEAction( i18n(  "&Reload" ), "reload",
+		    TDEStdAccel::shortcut( TDEStdAccel::Reload ),
 		    m_gvpart, TQT_SLOT(  reloadFile() ),
 		    actionCollection(), "reload" );
-	    new KAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
+	    new TDEAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
 			 TQT_SLOT( slotMaximize() ), actionCollection(),
 			 "maximize");
     _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() );
@@ -93,14 +93,14 @@ KGVShell::KGVShell() :
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
     m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
 #else
-    m_fullScreenAction = new KToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
+    m_fullScreenAction = new TDEToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
 #endif
     KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
     KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
 
-    //_popup = new KPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
-    _popup = new KPopupMenu( this, "rmb popup" );
+    //_popup = new TDEPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
+    _popup = new TDEPopupMenu( this, "rmb popup" );
     _popup->insertTitle( i18n( "Full Screen Options" ) );
     m_fullScreenAction->plug( _popup );
     _showMenuBarAction->plug( _popup );
@@ -339,7 +339,7 @@ void KGVShell::slotUpdateFullScreen()
 	m_gvpart->updateFullScreen( false );
 	menuBar()->show();
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
-	KToggleAction *statusbarAction = dynamic_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
+	TDEToggleAction *statusbarAction = dynamic_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
 	assert( statusbarAction );
 	if (statusbarAction->isChecked()) statusBar()->show();
 #endif
diff --git a/kghostview/kgvshell.h b/kghostview/kgvshell.h
index 0f1fa60f..f273cfbb 100644
--- a/kghostview/kgvshell.h
+++ b/kghostview/kgvshell.h
@@ -25,13 +25,13 @@
 
 class TQTimer;
 
-class KRecentFilesAction;
+class TDERecentFilesAction;
 class ScrollBox;
 class KGVPart;
-class KAction;
+class TDEAction;
 class TDEConfig;
 class KTempFile;
-class KPopupMenu;
+class TDEPopupMenu;
 class DisplayOptions;
 class FullScreenFilter;
 
@@ -79,12 +79,12 @@ private:
     KGVPart* m_gvpart;
     TQString cwd;
 
-    KAction* openact;
-    KToggleAction* _showMenuBarAction;
-    KToggleAction* m_fullScreenAction;
+    TDEAction* openact;
+    TDEToggleAction* _showMenuBarAction;
+    TDEToggleAction* m_fullScreenAction;
     FullScreenFilter* m_fsFilter;
-    KPopupMenu* _popup;
-    KRecentFilesAction* recent;
+    TDEPopupMenu* _popup;
+    TDERecentFilesAction* recent;
     KTempFile* _tmpFile; // Used for storing data received from stdin
 };