Rename a number of classes to enhance compatibility with KDE4

6 files changed, 28 insertions, 28 deletions

diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp
index 8e62a2d6..7ecc032e 100644
--- a/kcoloredit/kcoloredit.cpp
+++ b/kcoloredit/kcoloredit.cpp
@@ -40,7 +40,7 @@
 #include <kstatusbar.h>
 
 
-KColorEditApp::KColorEditApp() : KMainWindow(0) {
+KColorEditApp::KColorEditApp() : TDEMainWindow(0) {
   config=kapp->config();
 
   ///////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ void KColorEditApp::initActions()
   m_actRecent = KStdAction::openRecent( TQT_TQOBJECT(this),
           TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
 
-  ( void ) new KAction( i18n("New &Window"), kapp->miniIcon(), KShortcut(),
+  ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(),
           TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(),
           "file_new_window" );
 
@@ -89,14 +89,14 @@ void KColorEditApp::initActions()
   m_actPaste->setEnabled( false );
 
   // Color Menu
-  m_actNames = new KToggleAction( i18n("Show &Color Names"), KShortcut(), TQT_TQOBJECT(this),
+  m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), TQT_TQOBJECT(this),
           TQT_SLOT( slotViewColorNames() ), actionCollection(),
           "color_view_names" );
   m_actNames->setCheckedState(i18n("Hide &Color Names"));
-  m_actPalette = new KAction( i18n("From &Palette"), KShortcut(), TQT_TQOBJECT(this),
+  m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), TQT_TQOBJECT(this),
           TQT_SLOT( slotColorFromPalette() ), actionCollection(),
           "color_from_palette" );
-  ( void ) new KAction( i18n("From &Screen"), KShortcut(), TQT_TQOBJECT(this),
+  ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), TQT_TQOBJECT(this),
           TQT_SLOT( slotColorFromScreen() ), actionCollection(),
           "color_from_screen" );
 }
@@ -125,7 +125,7 @@ void KColorEditApp::initDocument()
 void KColorEditApp::initView()
 {
   ////////////////////////////////////////////////////////////////////
-  // create the main widget here that is managed by KMainWindow's view-region
+  // create the main widget here that is managed by TDEMainWindow's view-region
   // and connect the widget to your document to display document contents.
 
   view = new KColorEditView(this);
@@ -303,7 +303,7 @@ void KColorEditApp::slotQuit()
   saveOptions();
   // close the first window, the list makes the next one the first again.
   // This ensures that queryClose() is called on each window to ask for closing
-  KMainWindow* w;
+  TDEMainWindow* w;
   if(memberList)
   {
     for(w=memberList->first(); w!=0; w=memberList->next())
@@ -357,7 +357,7 @@ void KColorEditApp::mouseReleaseEvent(TQMouseEvent* event) {
 		color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
 		view->chooseColor(&color);
 	} else
-		KMainWindow::mouseReleaseEvent(event);
+		TDEMainWindow::mouseReleaseEvent(event);
 }
 
 #include "kcoloredit.moc"
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index 59969965..557cdc02 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -41,17 +41,17 @@ class KColorEditView;
   * window and reads the config file as well as providing a menubar, toolbar
   * and statusbar. An instance of KColorEditView creates your center view, which is connected
   * to the window's Doc object.
-  * KColorEditApp reimplements the methods that KMainWindow provides for main window handling and supports
-  * full session management as well as keyboard accelerator configuration by using KAccel.
-  * @see KMainWindow
+  * KColorEditApp reimplements the methods that TDEMainWindow provides for main window handling and supports
+  * full session management as well as keyboard accelerator configuration by using TDEAccel.
+  * @see TDEMainWindow
   * @see TDEApplication
   * @see TDEConfig
-  * @see KAccel
+  * @see TDEAccel
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 0.4 code generation
   */
-class KColorEditApp : public KMainWindow
+class KColorEditApp : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -68,7 +68,7 @@ class KColorEditApp : public KMainWindow
     /** opens a file specified by commandline option
      */
     void openDocumentFile(const char *_cmdl=0);
-    /** returns a pointer to the current document connected to the KMainWindow instance and is used by
+    /** returns a pointer to the current document connected to the TDEMainWindow instance and is used by
      * the View class to access the document object's methods
      */
     KColorEditDoc *document() const;
@@ -92,21 +92,21 @@ class KColorEditApp : public KMainWindow
      * @see initView();
      */
     void initDocument();
-    /** creates the centerwidget of the KMainWindow instance and sets it as the view
+    /** creates the centerwidget of the TDEMainWindow instance and sets it as the view
      */
     void initView();
-    /** queryClose is called by KMainWindow on each closeEvent of a window. Against the
+    /** queryClose is called by TDEMainWindow on each closeEvent of a window. Against the
      * default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall
      * be saved if Modified; on cancel the closeEvent is rejected.
-     * @see KMainWindow#queryClose
-     * @see KMainWindow#closeEvent
+     * @see TDEMainWindow#queryClose
+     * @see TDEMainWindow#closeEvent
      */
     virtual bool queryClose();
-    /** queryExit is called by KMainWindow when the last window of the application is going to be closed during the closeEvent().
+    /** queryExit is called by TDEMainWindow when the last window of the application is going to be closed during the closeEvent().
      * Against the default implementation that just returns true, this calls saveOptions() to save the settings of the last window's
      * properties.
-     * @see KMainWindow#queryExit
-     * @see KMainWindow#closeEvent
+     * @see TDEMainWindow#queryExit
+     * @see TDEMainWindow#closeEvent
      */
     virtual bool queryExit();
 
@@ -168,9 +168,9 @@ class KColorEditApp : public KMainWindow
     /** the configuration object of the application */
     TDEConfig *config;
 
-    KAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
-    KToggleAction *m_actNames;
-    KRecentFilesAction *m_actRecent;
+    TDEAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
+    TDEToggleAction *m_actNames;
+    TDERecentFilesAction *m_actRecent;
 
     /** view is the main widget which represents your working area. The View
      * class should handle all events of the view widget.  It is kept empty so
diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h
index edf5242c..abb499bf 100644
--- a/kcoloredit/kcoloreditdoc.h
+++ b/kcoloredit/kcoloreditdoc.h
@@ -37,7 +37,7 @@ class KColorEditView;
 /**	KColorEditDoc provides a document object for a document-view model.
   *
   * The KColorEditDoc class provides a document object that can be used in conjunction with the classes KColorEditApp and KColorEditView
-  * to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object
+  * to create a document-view model for standard TDE applications based on TDEApplication and TDEMainWindow. Thereby, the document object
   * is created by the KColorEditApp instance and contains the document structure with the according methods for manipulation of the document
   * data by KColorEditView objects. Also, KColorEditDoc contains the methods for serialization of the document data from and to files.
   *
diff --git a/kcoloredit/kcoloreditview.h b/kcoloredit/kcoloreditview.h
index 18709764..a41b0a47 100644
--- a/kcoloredit/kcoloreditview.h
+++ b/kcoloredit/kcoloreditview.h
@@ -34,7 +34,7 @@
 class KColorEditDoc;
 
 /** The KColorEditView class provides the view widget for the KColorEditApp instance.	
- * The View instance inherits TQWidget as a base class and represents the view object of a KMainWindow. As KColorEditView is part of the
+ * The View instance inherits TQWidget as a base class and represents the view object of a TDEMainWindow. As KColorEditView is part of the
  * docuement-view model, it needs a reference to the document object connected with it by the KColorEditApp class to manipulate and display
  * the document structure provided by the KColorEditDoc class.
  * 	
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index bb4a3c23..f753649e 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -24,7 +24,7 @@
 #include "kzcolorselector.h"
 
 KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) :
-	KSelector(o, parent, name) {
+	TDESelector(o, parent, name) {
 	baseColorH = -1;
 	baseColorS = 0;
 	baseColorV = 0;
diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h
index 13d627c1..6afd369d 100644
--- a/kcoloredit/kzcolorselector.h
+++ b/kcoloredit/kzcolorselector.h
@@ -27,7 +27,7 @@
 /** A widget for selecting a color component
  * @author Artur Rataj
  */
-class KZColorSelector : public KSelector {
+class KZColorSelector : public TDESelector {
    Q_OBJECT