Rename a number of classes to enhance compatibility with KDE4

10 files changed, 31 insertions, 31 deletions

diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index c6df5cb71..76402e18d 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -35,7 +35,7 @@
 
 
 ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const char * name)
-  : KListView(parent, name)
+  : TDEListView(parent, name)
   , _path(KCGlobal::baseGroup())
   , _modules(list)
 {
@@ -155,7 +155,7 @@ void ModuleIconView::keyPressEvent(TQKeyEvent *e)
   }
   else
   {
-     KListView::keyPressEvent(e);
+     TDEListView::keyPressEvent(e);
   }
 }
 
diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h
index dcacf9770..a5d43a447 100644
--- a/kcontrol/kcontrol/moduleiconview.h
+++ b/kcontrol/kcontrol/moduleiconview.h
@@ -25,12 +25,12 @@
 class ConfigModule;
 class ConfigModuleList;
 
-class ModuleIconItem : public KListViewItem
+class ModuleIconItem : public TDEListViewItem
 {
 
 public:
   ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0)
-	: KListViewItem(parent, text)
+	: TDEListViewItem(parent, text)
 	, _tag(TQString::null)
 	, _module(m)
 	{
@@ -54,7 +54,7 @@ private:
   ConfigModule *_module;
 };
 
-class ModuleIconView : public KListView
+class ModuleIconView : public TDEListView
 {
   Q_OBJECT
 
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 2b8f74b12..77e442a98 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -41,7 +41,7 @@ that is intentional :-]
 
 
 ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * name)
-  : KPopupMenu(parent, name)
+  : TDEPopupMenu(parent, name)
   , _modules(list)
 {
   // use large id's to start with...
@@ -52,7 +52,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n
   connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
 }
 
-void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
+void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
 {
   TQStringList subMenus = _modules->submenus(parentPath);
   for(TQStringList::ConstIterator it = subMenus.begin();
@@ -64,7 +64,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
         continue;
      
      // create new menu
-     KPopupMenu *menu = new KPopupMenu(parentMenu);
+     TDEPopupMenu *menu = new TDEPopupMenu(parentMenu);
      connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
 
      // Item names may contain ampersands. To avoid them being converted to 
diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h
index feac18bd6..2ed12aa5b 100644
--- a/kcontrol/kcontrol/modulemenu.h
+++ b/kcontrol/kcontrol/modulemenu.h
@@ -38,7 +38,7 @@ class ConfigModule;
 class ConfigModuleList;
 
 
-class ModuleMenu : public KPopupMenu
+class ModuleMenu : public TDEPopupMenu
 {
   Q_OBJECT
 
@@ -52,7 +52,7 @@ private slots:
   void moduleSelected(int id);
 
 protected:
-  void fill(KPopupMenu *parentMenu, const TQString &parentPath);
+  void fill(TDEPopupMenu *parentMenu, const TQString &parentPath);
 
 private:
   int id;
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index 7c095c5f7..982cef297 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -72,7 +72,7 @@ private:
 };
 
 ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const char * name)
-  : KListView(parent, name)
+  : TDEListView(parent, name)
   , _modules(list)
 {
   addColumn(TQString::null);
@@ -262,7 +262,7 @@ void ModuleTreeView::keyPressEvent(TQKeyEvent *e)
       slotItemSelected(currentItem());
     }
   else
-    KListView::keyPressEvent(e);
+    TDEListView::keyPressEvent(e);
 }
 
 
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index 86bfecab4..d5e60cebf 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -64,7 +64,7 @@ private:
   TQString       _icon;
 };
 
-class ModuleTreeView : public KListView
+class ModuleTreeView : public TDEListView
 {
   Q_OBJECT
 
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index 1b32e0f7f..c98426641 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -74,14 +74,14 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name)
   TQVBoxLayout * l = new TQVBoxLayout(this, 0, 2);
 
   // keyword list
-  _keyList = new KListBox(this);
+  _keyList = new TDEListBox(this);
   TQLabel *keyl = new TQLabel(_keyList, i18n("&Keywords:"), this);
 
   l->addWidget(keyl);
   l->addWidget(_keyList);
 
   // result list
-  _resultList = new KListBox(this);
+  _resultList = new TDEListBox(this);
   TQLabel *resultl = new TQLabel(_resultList, i18n("&Results:"), this);
 
   l->addWidget(resultl);
diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h
index abf094c2d..2e6306bbc 100644
--- a/kcontrol/kcontrol/searchwidget.h
+++ b/kcontrol/kcontrol/searchwidget.h
@@ -28,7 +28,7 @@
 
 #include "modules.h"
 
-class KListBox;
+class TDEListBox;
 class KLineEdit;
 class TQListBoxItem;
 
@@ -71,7 +71,7 @@ protected slots:
   void slotModuleClicked(TQListBoxItem *item);
 
 private:
-  KListBox  *_keyList, *_resultList;
+  TDEListBox  *_keyList, *_resultList;
   TQPtrList<KeywordListEntry> _keywords;
 };
 
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 06a09e2d3..329cb6f89 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -49,7 +49,7 @@
 #include "toplevel.moc"
 
 TopLevel::TopLevel(const char* name)
-  : KMainWindow( 0, name, (WFlags)WStyle_ContextHelp  )
+  : TDEMainWindow( 0, name, (WFlags)WStyle_ContextHelp  )
   , _active(0), dummyAbout(0)
 {
   setCaption(TQString::null);
@@ -237,37 +237,37 @@ void TopLevel::setupActions()
   KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
   KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
-  icon_view = new KRadioAction
+  icon_view = new TDERadioAction
     (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()),
      actionCollection(), "activate_iconview");
   icon_view->setExclusiveGroup( "viewmode" );
 
-  tree_view = new KRadioAction
+  tree_view = new TDERadioAction
     (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()),
      actionCollection(), "activate_treeview");
   tree_view->setExclusiveGroup( "viewmode" );
 
-  icon_small = new KRadioAction
+  icon_small = new TDERadioAction
     (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()),
      actionCollection(), "activate_smallicons");
   icon_small->setExclusiveGroup( "iconsize" );
 
-  icon_medium = new KRadioAction
+  icon_medium = new TDERadioAction
     (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()),
      actionCollection(), "activate_mediumicons");
   icon_medium->setExclusiveGroup( "iconsize" );
 
-  icon_large = new KRadioAction
+  icon_large = new TDERadioAction
     (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()),
      actionCollection(), "activate_largeicons");
   icon_large->setExclusiveGroup( "iconsize" );
 
-  icon_huge = new KRadioAction
+  icon_huge = new TDERadioAction
     (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()),
      actionCollection(), "activate_hugeicons");
   icon_huge->setExclusiveGroup( "iconsize" );
 
-  about_module = new KAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
+  about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
   about_module->setEnabled(false);
 
   // I need to add this so that each module can get a bug reported,
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 1a7e1735f..8d4f0212d 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -28,8 +28,8 @@
 class TQSplitter;
 class TQWidgetStack;
 
-class KToggleAction;
-class KAction;
+class TDEToggleAction;
+class TDEAction;
 
 class DockContainer;
 class IndexWidget;
@@ -39,7 +39,7 @@ class ConfigModule;
 class ConfigModuleList;
 class ModuleTitle;
 
-class TopLevel : public KMainWindow
+class TopLevel : public TDEMainWindow
 {
   Q_OBJECT
 
@@ -84,9 +84,9 @@ private:
   DockContainer  *_dock;
   ModuleTitle    *_title;
 
-  KToggleAction *tree_view, *icon_view;
-  KToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge;
-  KAction *report_bug, *about_module;
+  TDEToggleAction *tree_view, *icon_view;
+  TDEToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge;
+  TDEAction *report_bug, *about_module;
 
   IndexWidget  *_index;
   SearchWidget *_search;