Rename a number of classes to enhance compatibility with KDE4

23 files changed, 114 insertions, 114 deletions

diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc
index 3348e873..188a76d1 100644
--- a/lib/kofficecore/KoApplicationIface.cc
+++ b/lib/kofficecore/KoApplicationIface.cc
@@ -85,10 +85,10 @@ TQValueList<DCOPRef> KoApplicationIface::getViews()
 TQValueList<DCOPRef> KoApplicationIface::getWindows()
 {
     TQValueList<DCOPRef> lst;
-    TQPtrList<KMainWindow> *mainWindows = KMainWindow::memberList;
+    TQPtrList<TDEMainWindow> *mainWindows = TDEMainWindow::memberList;
     if ( mainWindows )
     {
-      TQPtrListIterator<KMainWindow> it( *mainWindows );
+      TQPtrListIterator<TDEMainWindow> it( *mainWindows );
       for (; it.current(); ++it )
         lst.append( DCOPRef( kapp->dcopClient()->appId(),
                              static_cast<KoMainWindow *>(it.current())->dcopObject()->objId() ) );
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 91cdb4ad..31cfde38 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -44,12 +44,12 @@
 
 #include "KoTemplates.h"
 
-class KoFileListItem : public KListViewItem
+class KoFileListItem : public TDEListViewItem
 {
   public:
-    KoFileListItem(KListView* listView, TQListViewItem* after, const TQString& filename,
+    KoFileListItem(TDEListView* listView, TQListViewItem* after, const TQString& filename,
                    const TQString& fullPath, KFileItem* fileItem)
-      : KListViewItem(listView, after, filename, fullPath), m_fileItem(fileItem)
+      : TDEListViewItem(listView, after, filename, fullPath), m_fileItem(fileItem)
     {
     }
 
@@ -107,10 +107,10 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
     connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(changePalette()));
   }
 
-  KListViewItem* selectItem = 0;
+  TDEListViewItem* selectItem = 0;
 
   for (KoTemplate* t = group->first(); t != 0L; t = group->next()) {
-    KListViewItem* item = new KListViewItem(m_documentList, t->name(), t->description(), t->file());
+    TDEListViewItem* item = new TDEListViewItem(m_documentList, t->name(), t->description(), t->file());
     TQImage icon = t->loadPicture(instance).convertToImage();
     icon = icon.smoothScale(64, 64, TQ_ScaleMin);
     icon.setAlphaBuffer(true);
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 15e7b892..184dcefd 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -557,10 +557,10 @@ void KoDocument::slotAutoSave()
     }
 }
 
-KAction *KoDocument::action( const TQDomElement &element ) const
+TDEAction *KoDocument::action( const TQDomElement &element ) const
 {
     // First look in the document itself
-    KAction* act = KParts::ReadWritePart::action( element );
+    TDEAction* act = KParts::ReadWritePart::action( element );
     if ( act )
         return act;
 
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 4947506d..cb4f9f25 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -114,7 +114,7 @@ public:
     /**
      * Returns the action described action object. In fact only the "name" attribute
      * of @p element is of interest here. The method searches first in the
-     * KActionCollection of the first view and then in the KActionCollection of this
+     * TDEActionCollection of the first view and then in the TDEActionCollection of this
      * document.
      * This allows %KOffice applications to define actions in both the view and the document.
      * They should only define view-actions (like zooming and stuff) in the view.
@@ -126,7 +126,7 @@ public:
      * @see KXMLGUIClient::actionCollection
      * @see KoView::action
      */
-    virtual KAction *action( const TQDomElement &element ) const;
+    virtual TDEAction *action( const TQDomElement &element ) const;
 
     /**
      * Returns the DOM document which describes the GUI of the
diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cc
index 2c9dbe70..cfa21a93 100644
--- a/lib/kofficecore/KoDocumentIface.cc
+++ b/lib/kofficecore/KoDocumentIface.cc
@@ -97,9 +97,9 @@ DCOPRef KoDocumentIface::action( const TQCString &name )
 QCStringList KoDocumentIface::actions()
 {
     QCStringList res;
-    TQValueList<KAction *> lst = m_actionProxy->actions();
-    TQValueList<KAction *>::ConstIterator it = lst.begin();
-    TQValueList<KAction *>::ConstIterator end = lst.end();
+    TQValueList<TDEAction *> lst = m_actionProxy->actions();
+    TQValueList<TDEAction *>::ConstIterator it = lst.begin();
+    TQValueList<TDEAction *>::ConstIterator end = lst.end();
     for (; it != end; ++it )
         res.append( (*it)->name() );
 
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 7e67c148..361cc5cd 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -301,7 +301,7 @@ void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMet
     {
         TQString name = it.key();
         TQString value = it.data();
-        KListViewItem* it = new KListViewItem( d->m_metaWidget->metaListView, name, value );
+        TDEListViewItem* it = new TDEListViewItem( d->m_metaWidget->metaListView, name, value );
         it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ) );
     }
 }
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index b1e845b7..c2ecb369 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -64,7 +64,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType
     TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel");
     layout->addWidget (filterLabel);
 
-    m_filterList = new KListBox (page, "filterlist");
+    m_filterList = new TDEListBox (page, "filterlist");
     layout->addWidget (m_filterList);
 
     Q_ASSERT (!m_mimeTypes.isEmpty ());
diff --git a/lib/kofficecore/KoFilterManager_p.h b/lib/kofficecore/KoFilterManager_p.h
index bdee8777..e446f6f7 100644
--- a/lib/kofficecore/KoFilterManager_p.h
+++ b/lib/kofficecore/KoFilterManager_p.h
@@ -24,7 +24,7 @@
 
 #include <kdialogbase.h>
 
-class KListBox;
+class TDEListBox;
 
 
 class KoFilterChooser : public KDialogBase
@@ -41,7 +41,7 @@ public:
 
 private:
     TQStringList m_mimeTypes;
-    KListBox *m_filterList;
+    TDEListBox *m_filterList;
 };
 
 #endif
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 12e0013d..f013ca36 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -144,16 +144,16 @@ public:
   TQLabel * statusBarLabel;
   KProgress *m_progress;
 
-  TQPtrList<KAction> m_splitViewActionList;
+  TQPtrList<TDEAction> m_splitViewActionList;
   // This additional list is needed, because we don't plug
   // the first list, when an embedded view gets activated (Werner)
-  TQPtrList<KAction> m_veryHackyActionList;
+  TQPtrList<TDEAction> m_veryHackyActionList;
   TQSplitter *m_splitter;
-  KSelectAction *m_orientation;
-  KAction *m_removeView;
+  TDESelectAction *m_orientation;
+  TDEAction *m_removeView;
   KoMainWindowIface *m_dcopObject;
 
-  TQPtrList <KAction> m_toolbarList;
+  TQPtrList <TDEAction> m_toolbarList;
 
   bool bMainWindowGUIBuilt;
   bool m_splitted;
@@ -161,17 +161,17 @@ public:
   bool m_firstTime;
   bool m_windowSizeDirty;
 
-  KAction *m_paDocInfo;
-  KAction *m_paSave;
-  KAction *m_paSaveAs;
-  KAction *m_paPrint;
-  KAction *m_paPrintPreview;
-  KAction *m_sendfile;
-  KAction *m_paCloseFile;
-  KAction *m_reloadfile;
-  KAction *m_versionsfile;
-  KAction *m_importFile;
-  KAction *m_exportFile;
+  TDEAction *m_paDocInfo;
+  TDEAction *m_paSave;
+  TDEAction *m_paSaveAs;
+  TDEAction *m_paPrint;
+  TDEAction *m_paPrintPreview;
+  TDEAction *m_sendfile;
+  TDEAction *m_paCloseFile;
+  TDEAction *m_reloadfile;
+  TDEAction *m_versionsfile;
+  TDEAction *m_importFile;
+  TDEAction *m_exportFile;
 
   bool m_isImporting;
   bool m_isExporting;
@@ -217,24 +217,24 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     d->m_paCloseFile = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" );
     KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" );
 
-    d->m_reloadfile = new KAction( i18n( "Reload"), 0,
+    d->m_reloadfile = new TDEAction( i18n( "Reload"), 0,
                     TQT_TQOBJECT(this), TQT_SLOT( slotReloadFile() ),
                     actionCollection(), "file_reload_file");
 
-    d->m_versionsfile = new KAction( i18n( "Versions..."), 0,
+    d->m_versionsfile = new TDEAction( i18n( "Versions..."), 0,
                     TQT_TQOBJECT(this), TQT_SLOT( slotVersionsFile() ),
                     actionCollection(), "file_versions_file");
 
-    d->m_importFile = new KAction( i18n( "I&mport..." ), 0, // clashing accel key :(
+    d->m_importFile = new TDEAction( i18n( "I&mport..." ), 0, // clashing accel key :(
                     TQT_TQOBJECT(this), TQT_SLOT( slotImportFile() ),
                     actionCollection(), "file_import_file");
-    d->m_exportFile = new KAction( i18n( "E&xport..." ), 0,
+    d->m_exportFile = new TDEAction( i18n( "E&xport..." ), 0,
                     TQT_TQOBJECT(this), TQT_SLOT( slotExportFile() ),
                     actionCollection(), "file_export_file");
 
     /* The following entry opens the document information dialog.  Since the action is named so it
         intends to show data this entry should not have a trailing ellipses (...).  */
-    d->m_paDocInfo = new KAction( i18n( "&Document Information" ), "documentinfo", 0,
+    d->m_paDocInfo = new TDEAction( i18n( "&Document Information" ), "documentinfo", 0,
                         TQT_TQOBJECT(this), TQT_SLOT( slotDocumentInfo() ),
                         actionCollection(), "file_documentinfo" );
 
@@ -259,20 +259,20 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     new KKbdAccessExtensions(this, "mw-panelSizer");
     // set up the action "list" for "Close all Views" (hacky :) (Werner)
     d->m_veryHackyActionList.append(
-        new KAction(i18n("&Close All Views"), "fileclose",
+        new TDEAction(i18n("&Close All Views"), "fileclose",
                     "ctrl+shift+w", TQT_TQOBJECT(this), TQT_SLOT(slotCloseAllViews()),
                     actionCollection(), "view_closeallviews") );
 
     // set up the action list for the splitter stuff
-    d->m_splitViewActionList.append(new KAction(i18n("&Split View"), "view_split", 0,
+    d->m_splitViewActionList.append(new TDEAction(i18n("&Split View"), "view_split", 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotSplitView()),
         actionCollection(), "view_split"));
-    d->m_removeView=new KAction(i18n("&Remove View"), "view_remove", 0,
+    d->m_removeView=new TDEAction(i18n("&Remove View"), "view_remove", 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotRemoveView()),
         actionCollection(), "view_rm_splitter");
     d->m_splitViewActionList.append(d->m_removeView);
     d->m_removeView->setEnabled(false);
-    d->m_orientation=new KSelectAction(i18n("Splitter &Orientation"), "view_orientation", 0,
+    d->m_orientation=new TDESelectAction(i18n("Splitter &Orientation"), "view_orientation", 0,
         TQT_TQOBJECT(this), TQT_SLOT(slotSetOrientation()),
         actionCollection(), "view_splitter_orientation");
     TQStringList items;
@@ -281,7 +281,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     d->m_orientation->setItems(items);
     d->m_orientation->setCurrentItem(static_cast<int>(d->m_splitter->orientation()));
     d->m_splitViewActionList.append(d->m_orientation);
-    d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this)));
+    d->m_splitViewActionList.append(new TDEActionSeparator(TQT_TQOBJECT(this)));
 
     // Load list of recent files
     TDEConfig * config = instance ? instance->config() : TDEGlobal::config();
@@ -448,10 +448,10 @@ void KoMainWindow::addRecentURL( const KURL& url )
                 if ( path.contains( *it ) )
                     ok = false; // it's in the tmp resource
             if ( ok )
-                KRecentDocument::add(path);
+                TDERecentDocument::add(path);
         }
         else
-            KRecentDocument::add(url.url(-1), true);
+            TDERecentDocument::add(url.url(-1), true);
 
         if ( ok )
             m_recent->addURL( url );
@@ -466,12 +466,12 @@ void KoMainWindow::saveRecentFiles()
     kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl;
     m_recent->saveEntries( config );
     config->sync();
-    if (KMainWindow::memberList)
+    if (TDEMainWindow::memberList)
     {
         // Tell all windows to reload their list, after saving
         // Doesn't work multi-process, but it's a start
-        KMainWindow *window = KMainWindow::memberList->first();
-        for (; window; window = KMainWindow::memberList->next())
+        TDEMainWindow *window = TDEMainWindow::memberList->first();
+        for (; window; window = TDEMainWindow::memberList->next())
             static_cast<KoMainWindow *>(window)->reloadRecentFileList();
     }
 }
@@ -1000,7 +1000,7 @@ void KoMainWindow::saveWindowSettings()
         //kdDebug(30003) << "KoMainWindow::closeEvent -> saveMainWindowSettings rootdoc's instance=" << rootDocument()->instance()->instanceName() << endl;
         saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
         TDEGlobal::config()->sync();
-        resetAutoSaveSettings(); // Don't let KMainWindow override the good stuff we wrote down
+        resetAutoSaveSettings(); // Don't let TDEMainWindow override the good stuff we wrote down
     }
 }
 
@@ -1306,7 +1306,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle )
 {
   //kdDebug(30003) << "KoMainWindow::slotToolbarToggled " << sender()->name() << " toggle=" << true << endl;
   // The action (sender) and the toolbar have the same name
-  KToolBar * bar = toolBar( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
+  TDEToolBar * bar = toolBar( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() );
   if (bar)
   {
     if (toggle)
@@ -1341,12 +1341,12 @@ void KoMainWindow::showToolbar( const char * tbName, bool shown )
         tb->hide();
 
     // Update the action appropriately
-    TQPtrListIterator<KAction> it( d->m_toolbarList );
+    TQPtrListIterator<TDEAction> it( d->m_toolbarList );
     for ( ; it.current() ; ++it )
         if ( !strcmp( it.current()->name(), tbName ) )
         {
             //kdDebug(30003) << "KoMainWindow::showToolbar setChecked " << shown << endl;
-            static_cast<KToggleAction *>(it.current())->setChecked( shown );
+            static_cast<TDEToggleAction *>(it.current())->setChecked( shown );
             break;
         }
 }
@@ -1521,15 +1521,15 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart )
     setAutoSaveSettings( newPart->instance()->instanceName(), false );
 
     // Create and plug toolbar list for Settings menu
-    //TQPtrListIterator<KToolBar> it = toolBarIterator();
+    //TQPtrListIterator<TDEToolBar> it = toolBarIterator();
     TQPtrList<TQWidget> toolBarList = factory->containers( "ToolBar" );
     TQPtrListIterator<TQWidget> it( toolBarList );
     for ( ; it.current() ; ++it )
     {
-      if ( it.current()->inherits("KToolBar") )
+      if ( it.current()->inherits("TDEToolBar") )
       {
-          KToolBar * tb = static_cast<KToolBar *>(it.current());
-          KToggleAction * act = new KToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0,
+          TDEToolBar * tb = static_cast<TDEToolBar *>(it.current());
+          TDEToggleAction * act = new TDEToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0,
                                                actionCollection(), tb->name() );
 	  act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() ));
 	  connect( act, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolbarToggled( bool ) ) );
diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h
index 6310deda..81dcd587 100644
--- a/lib/kofficecore/KoMainWindow.h
+++ b/lib/kofficecore/KoMainWindow.h
@@ -30,7 +30,7 @@ class TQLabel;
 class KoView;
 class KoMainWindowPrivate;
 class KURL;
-class KRecentFilesAction;
+class TDERecentFilesAction;
 class KoFilterManager;
 class DCOPObject;
 
@@ -354,7 +354,7 @@ protected: // protected methods are mostly for koshell, it's the only one derivi
      */
     void saveRecentFiles();
 
-    KRecentFilesAction *recentAction() const { return m_recent; }
+    TDERecentFilesAction *recentAction() const { return m_recent; }
 
 private:
 
@@ -368,7 +368,7 @@ private:
 
     void saveWindowSettings();
 
-    KRecentFilesAction *m_recent;
+    TDERecentFilesAction *m_recent;
 
 protected slots:
     virtual void slotActivePartChanged( KParts::Part *newPart );
diff --git a/lib/kofficecore/KoMainWindowIface.cc b/lib/kofficecore/KoMainWindowIface.cc
index 6d38fae0..08b3fdaa 100644
--- a/lib/kofficecore/KoMainWindowIface.cc
+++ b/lib/kofficecore/KoMainWindowIface.cc
@@ -46,9 +46,9 @@ DCOPRef KoMainWindowIface::action( const TQCString &name )
 QCStringList KoMainWindowIface::actions()
 {
     QCStringList res;
-    TQValueList<KAction *> lst = m_actionProxy->actions();
-    TQValueList<KAction *>::ConstIterator it = lst.begin();
-    TQValueList<KAction *>::ConstIterator end = lst.end();
+    TQValueList<TDEAction *> lst = m_actionProxy->actions();
+    TQValueList<TDEAction *>::ConstIterator it = lst.begin();
+    TQValueList<TDEAction *>::ConstIterator end = lst.end();
     for (; it != end; ++it )
         res.append( (*it)->name() );
 
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 5d23b113..4a2872c6 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -48,7 +48,7 @@
 class KoSectionListItem : public TQListViewItem
 {
   public:
-    KoSectionListItem(KListView* listView, const TQString& name, int sortWeight, int widgetIndex = -1)
+    KoSectionListItem(TDEListView* listView, const TQString& name, int sortWeight, int widgetIndex = -1)
       : TQListViewItem(listView, name), m_sortWeight(sortWeight), m_widgetIndex(widgetIndex)
     {
     }
diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h
index 0efad845..d9d3b43d 100644
--- a/lib/kofficecore/KoOpenPane.h
+++ b/lib/kofficecore/KoOpenPane.h
@@ -29,7 +29,7 @@ class KoTemplateGroup;
 class KoOpenPanePrivate;
 class TDEInstance;
 class TQPixmap;
-class KListViewItem;
+class TDEListViewItem;
 class KoTemplatesPane;
 class KoDetailsPaneBase;
 
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 7e4045a8..b78b937c 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -132,11 +132,11 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name )
 
   actionCollection()->setWidget( this );
   setupGlobalActions();
-  KActionCollection *coll = actionCollection();
+  TDEActionCollection *coll = actionCollection();
   /**** not needed anymore, according to David (Werner)
-  TQValueList<KAction*> docActions = document->actionCollection()->actions();
-  TQValueList<KAction*>::ConstIterator it = docActions.begin();
-  TQValueList<KAction*>::ConstIterator end = docActions.end();
+  TQValueList<TDEAction*> docActions = document->actionCollection()->actions();
+  TQValueList<TDEAction*>::ConstIterator it = docActions.begin();
+  TQValueList<TDEAction*>::ConstIterator end = docActions.end();
   for (; it != end; ++it )
       coll->insert( *it );
   */
@@ -217,12 +217,12 @@ KParts::PartManager *KoView::partManager() const
   return d->m_manager;
 }
 
-KAction *KoView::action( const TQDomElement &element ) const
+TDEAction *KoView::action( const TQDomElement &element ) const
 {
   static const TQString &attrName = TDEGlobal::staticQString( "name" );
   TQString name = element.attribute( attrName );
 
-  KAction *act = KXMLGUIClient::action( name.utf8() );
+  TDEAction *act = KXMLGUIClient::action( name.utf8() );
 
   if ( !act )
     act = d->m_doc->KXMLGUIClient::action( name.utf8() );
@@ -626,7 +626,7 @@ void KoView::slotAutoScroll(  )
 
 
 void KoView::setupGlobalActions() {
-    actionNewView = new KAction( i18n( "&New View" ), "window_new", 0,
+    actionNewView = new TDEAction( i18n( "&New View" ), "window_new", 0,
         TQT_TQOBJECT(this), TQT_SLOT( newView() ),
         actionCollection(), "view_newview" );
 }
@@ -674,9 +674,9 @@ KoMainWindow * KoView::shell() const
     return dynamic_cast<KoMainWindow *>( topLevelWidget() );
 }
 
-KMainWindow * KoView::mainWindow() const
+TDEMainWindow * KoView::mainWindow() const
 {
-    return dynamic_cast<KMainWindow *>( topLevelWidget() );
+    return dynamic_cast<TDEMainWindow *>( topLevelWidget() );
 }
 
 KStatusBar * KoView::statusBar() const
diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h
index a0113e07..b53c339a 100644
--- a/lib/kofficecore/KoView.h
+++ b/lib/kofficecore/KoView.h
@@ -27,12 +27,12 @@
 #include <KoChild.h>
 #include <koffice_export.h>
 
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class TQCustomEvent;
 class KoDocument;
 class KoMainWindow;
-class KMainWindow;
+class TDEMainWindow;
 class KoViewPrivate;
 class KoViewChild;
 class KoFrame;
@@ -101,7 +101,7 @@ public:
   /**
    * Returns the action described action object. In fact only the "name" attribute
    * of @p element is of interest here. The method searches in the
-   * KActionCollection of this view.
+   * TDEActionCollection of this view.
    *
    * Please notice that KoView indirectly inherits KXMLGUIClient.
    *
@@ -109,7 +109,7 @@ public:
    * @see KXMLGUIClient::actionCollection
    * @see KoDocument::action
    */
-  virtual KAction *action( const TQDomElement &element ) const;
+  virtual TDEAction *action( const TQDomElement &element ) const;
 
   /**
    *  Retrieves the document that is hit. This can be an embedded document.
@@ -321,10 +321,10 @@ public:
   KoMainWindow * shell() const;
 
   /**
-   * @return the KMainWindow in which this view is currently.
+   * @return the TDEMainWindow in which this view is currently.
    * This one should never return 0L, in a KDE app.
    */
-  KMainWindow* mainWindow() const;
+  TDEMainWindow* mainWindow() const;
 
   /**
    * @return the statusbar of the KoMainWindow in which this view is currently.
@@ -461,7 +461,7 @@ protected slots:
   virtual void slotAutoScroll( );
 
 private:
-  KAction *actionNewView;
+  TDEAction *actionNewView;
   virtual void setupGlobalActions( void );
   KoViewPrivate *d;
   int autoScrollAcceleration( int offset ) const;
diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cc
index 468a677e..df6eaa31 100644
--- a/lib/kofficecore/KoViewIface.cc
+++ b/lib/kofficecore/KoViewIface.cc
@@ -61,9 +61,9 @@ DCOPRef KoViewIface::action( const TQCString &name )
 QCStringList KoViewIface::actions()
 {
     QCStringList res;
-    TQValueList<KAction *> lst = m_actionProxy->actions();
-    TQValueList<KAction *>::ConstIterator it = lst.begin();
-    TQValueList<KAction *>::ConstIterator end = lst.end();
+    TQValueList<TDEAction *> lst = m_actionProxy->actions();
+    TQValueList<TDEAction *>::ConstIterator it = lst.begin();
+    TQValueList<TDEAction *>::ConstIterator end = lst.end();
     for (; it != end; ++it )
         res.append( (*it)->name() );
 
diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp
index 188d5888..eec3c41e 100644
--- a/lib/kofficecore/Koversiondialog.cpp
+++ b/lib/kofficecore/Koversiondialog.cpp
@@ -46,7 +46,7 @@ KoVersionDialog::KoVersionDialog( TQWidget* parent,  const char* name )
 
   TQGridLayout *grid1 = new TQGridLayout( page,10,3,KDialog::marginHint(), KDialog::spacingHint());
 
-  list=new KListView(page,  "versionlist");
+  list=new TDEListView(page,  "versionlist");
   list->addColumn(i18n("Date & Time"));
   list->addColumn(i18n("Saved By"));
   list->addColumn(i18n("Comment"));
diff --git a/lib/kofficecore/Koversiondialog.h b/lib/kofficecore/Koversiondialog.h
index 0827b929..9bf930a2 100644
--- a/lib/kofficecore/Koversiondialog.h
+++ b/lib/kofficecore/Koversiondialog.h
@@ -24,7 +24,7 @@
 
 class TQPushButton;
 class TQToolButton;
-class KListView;
+class TDEListView;
 class TQMultiLineEdit;
 
 class KoVersionDialog : public KDialogBase
@@ -47,7 +47,7 @@ protected:
     void init();
     void updateButton();
 
-    KListView * list;
+    TDEListView * list;
     TQPushButton* m_pRemove;
     TQPushButton* m_pAdd;
     TQPushButton* m_pOpen;
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 0652b742..407ebe4a 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -122,7 +122,7 @@ class KKbdAccessExtensionsPrivate
         ~KKbdAccessExtensionsPrivate()
         {
             delete icon;
-            // TODO: This crashes, but should delete in the event that KMainWindow is not deleted.
+            // TODO: This crashes, but should delete in the event that TDEMainWindow is not deleted.
             if (accessKeyLabels) {
                 accessKeyLabels->setAutoDelete(false);
                 delete accessKeyLabels;
@@ -130,11 +130,11 @@ class KKbdAccessExtensionsPrivate
         }
 
         // Action that starts panel sizing (defaults to F8), forward and reverse;
-        KAction* fwdAction;
-        KAction* revAction;
+        TDEAction* fwdAction;
+        TDEAction* revAction;
 
         // Action that starts access keys.
-        KAction* accessKeysAction;
+        TDEAction* accessKeysAction;
 
         // The splitter or dockwindow currently being sized.  If 0, sizing is not in progress.
         TQWidget* panel;
@@ -153,21 +153,21 @@ class KKbdAccessExtensionsPrivate
         // List of the access key TQLabels.  If not 0, access keys are onscreen.
         TQPtrList<TQLabel>* accessKeyLabels;
 
-        // Pointer to the KMainWindow.
-        KMainWindow* mainWindow;
+        // Pointer to the TDEMainWindow.
+        TDEMainWindow* mainWindow;
 };
 
-KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* parent, const char* name) :
+KKbdAccessExtensions::KKbdAccessExtensions(TDEMainWindow* parent, const char* name) :
     TQObject(parent, name)
 {
     // kdDebug() << "KKbdAccessExtensions::KKbdAccessExtensions: running." << endl;
     d = new KKbdAccessExtensionsPrivate;
     d->mainWindow = parent;
-    d->fwdAction = new KAction(i18n("Resize Panel Forward"), KShortcut("F8"),
+    d->fwdAction = new TDEAction(i18n("Resize Panel Forward"), TDEShortcut("F8"),
         0, 0, parent->actionCollection(), "resize_panel_forward");
-    d->revAction = new KAction(i18n("Resize Panel Reverse"), KShortcut("Shift+F8"),
+    d->revAction = new TDEAction(i18n("Resize Panel Reverse"), TDEShortcut("Shift+F8"),
         0, 0, parent->actionCollection(), "resize_panel_reverse");
-    d->accessKeysAction = new KAction(i18n("Access Keys"), KShortcut("Alt+F8"),
+    d->accessKeysAction = new TDEAction(i18n("Access Keys"), TDEShortcut("Alt+F8"),
         0, 0, parent->actionCollection(), "access_keys");
     // "Disable" the shortcuts so we can see them in eventFilter.
     d->fwdAction->setEnabled(false);
@@ -193,15 +193,15 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e )
     if ( e->type() == TQEvent::KeyPress ) {
         // TODO: This permits only a single-key shortcut.  For example, Alt+S,R would not work.
         // If user configures a multi-key shortcut, it is undefined what will happen here.
-        // It would be better to handle these as KShortcut activate() signals, but the problem
-        // is that once a TQDockWindow is undocked and has focus, the KShortcut activate() signals
+        // It would be better to handle these as TDEShortcut activate() signals, but the problem
+        // is that once a TQDockWindow is undocked and has focus, the TDEShortcut activate() signals
         // don't fire anymore.
-        KShortcut fwdSc = d->fwdAction->shortcut();
-        KShortcut revSc = d->revAction->shortcut();
-        KShortcut accessKeysSc = d->accessKeysAction->shortcut();
+        TDEShortcut fwdSc = d->fwdAction->shortcut();
+        TDEShortcut revSc = d->revAction->shortcut();
+        TDEShortcut accessKeysSc = d->accessKeysAction->shortcut();
         TQKeyEvent* kev = dynamic_cast<TQKeyEvent *>(e);
         KKey k = KKey(kev);
-        KShortcut sc = KShortcut(k);
+        TDEShortcut sc = TDEShortcut(k);
         // kdDebug() << "KKbdAccessExtensions::eventFilter: Key press " << sc << endl;
         if (!d->accessKeyLabels) {
             if (sc == fwdSc) {
@@ -555,10 +555,10 @@ void KKbdAccessExtensions::displayAccessKeys()
     while( (client=it.current()) !=0 )
     {
         ++it;
-        KActionPtrList actions = client->actionCollection()->actions();
+        TDEActionPtrList actions = client->actionCollection()->actions();
         for (int j = 0; j < (int)actions.count(); j++) {
-            KAction* action = actions[j];
-            KShortcut sc = action->shortcut();
+            TDEAction* action = actions[j];
+            TDEShortcut sc = action->shortcut();
             for (int i = 0; i < (int)sc.count(); i++) {
                 KKeySequence seq = sc.seq(i);
                 if (seq.count() == 1) {
diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h
index 46b99b2f..2aa64c74 100644
--- a/lib/kofficecore/kkbdaccessextensions.h
+++ b/lib/kofficecore/kkbdaccessextensions.h
@@ -32,7 +32,7 @@
 
 class KKbdAccessExtensionsPrivate;
 class TQWidgetList;
-class KMainWindow;
+class TDEMainWindow;
 
 /** KKbdAccessExtensions is an object that improves accessibility for motor impaired users
 *   who may not be able to easily use a mouse.  It adds two new capabilities using the keyboard:
@@ -98,7 +98,7 @@ class KMainWindow;
 *
 *   @section notes Notes
 *
-*   The F8, Shift+F8, and Alt+F8 keys are KShortcuts and therefore user may choose different keys in
+*   The F8, Shift+F8, and Alt+F8 keys are TDEShortcuts and therefore user may choose different keys in
 *   the application's Configure Shortcuts dialog.
 *
 *   @note At present, these shortcuts may not be multi-key.  If user sets multi-key
@@ -114,10 +114,10 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject
 
     public:
         /** Constructor.
-        *   @param parent       KMainWindow of the application.  Required.
+        *   @param parent       TDEMainWindow of the application.  Required.
         *   @param name         (optional) Name of this object.
         */
-        KKbdAccessExtensions(KMainWindow* parent, const char* name = 0);
+        KKbdAccessExtensions(TDEMainWindow* parent, const char* name = 0);
 
         /** Destructor. */
         virtual ~KKbdAccessExtensions();
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index 0b64d5eb..a34d3116 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -29,7 +29,7 @@
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
-            <widget class="KListView">
+            <widget class="TDEListView">
                 <column>
                     <property name="text">
                         <string></string>
diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
index bc650f10..35cd7b2a 100644
--- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
+++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="KListView" row="0" column="0">
+        <widget class="TDEListView" row="0" column="0">
             <property name="name">
                 <cstring>metaListView</cstring>
             </property>
diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui
index c0076afa..dcc563b1 100644
--- a/lib/kofficecore/koOpenPaneBase.ui
+++ b/lib/kofficecore/koOpenPaneBase.ui
@@ -34,7 +34,7 @@
                     <property name="margin">
                         <number>0</number>
                     </property>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <column>
                             <property name="text">
                                 <string></string>