Rename a number of classes to enhance compatibility with KDE4

96 files changed, 380 insertions, 380 deletions

diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index baf56c5c3..6bb368fe2 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -145,7 +145,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this );
     topLayout->addWidget( group, 1, 0 );
 
-    sList = new KListBox( group );
+    sList = new TDEListBox( group );
     mSchemeList = new KColorSchemeList();
     readSchemeNames();
     sList->setCurrentItem( 0 );
diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h
index abfd3d403..ca8718f74 100644
--- a/kcontrol/colors/colorscm.h
+++ b/kcontrol/colors/colorscm.h
@@ -25,7 +25,7 @@ class TQCheckBox;
 class TQResizeEvent;
 class KLineEdit;
 class TQPalette;
-class KListBox;
+class TDEListBox;
 class KColorButton;
 class TDEConfig;
 class KStdDirs;
@@ -76,7 +76,7 @@ private:
     TQSlider *sb;
     TQComboBox *wcCombo;
     TQPushButton *addBt, *removeBt, *importBt;
-    KListBox *sList;
+    TDEListBox *sList;
     KColorSchemeList *mSchemeList;
     TQString sCurrentScheme;
 
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index fb5915f1b..697759af4 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -97,7 +97,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="KListBox" row="0" column="0" rowspan="2" colspan="1">
+        <widget class="TDEListBox" row="0" column="0" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>ServiceChooser</cstring>
             </property>
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index b35c9c04c..d69023db5 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -47,7 +47,7 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &)
 
 
   TQStringList fonts;
-  KFontChooser::getFontList(fonts, 0);
+  TDEFontChooser::getFontList(fonts, 0);
   customDialog->fontFamily->insertStringList(fonts);
 
   connect(configDialog->useDefault, TQT_SIGNAL(clicked()),
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h
index 3591bd93d..a52ebb3fc 100644
--- a/kcontrol/displayconfig/displayconfig.h
+++ b/kcontrol/displayconfig/displayconfig.h
@@ -41,8 +41,8 @@
 #include "displayconfigbase.h"
 
 class TDEConfig;
-class KPopupMenu;
-class KListViewItem;
+class TDEPopupMenu;
+class TDEListViewItem;
 
 typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap;
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index f036dd6be..5e9545270 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -168,7 +168,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
                         </size>
                     </property>
                 </spacer>
-                <widget class="KListView" row="0" column="0" rowspan="4" colspan="2">
+                <widget class="TDEListView" row="0" column="0" rowspan="4" colspan="2">
                     <column>
                         <property name="text">
                             <string>Name</string>
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index 89310a137..e898bd0db 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -69,7 +69,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
   if ( cmd.contains( exp ) )
   {
     if (verbose)
-      kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
+      kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
                 << " matches FQDN_PATTERN" << endl;
 
     // bug 133687
@@ -88,7 +88,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
   if ( cmd.contains( exp ) )
   {
     if (verbose)
-      kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
+      kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
                 << " matches IPv4_PATTERN" << endl;
     return true;
   }
@@ -98,13 +98,13 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
   if ( cmd.contains( exp ) )
   {
     if (verbose)
-      kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
+      kdDebug() << "TDEShortURIFilter::isValidShortURL: " << cmd
                 << " matches IPv6_PATTERN" << endl;
     return true;
   }
 
   if (verbose)
-    kdDebug() << "KShortURIFilter::isValidShortURL: '" << cmd
+    kdDebug() << "TDEShortURIFilter::isValidShortURL: '" << cmd
               << "' is not a short URL." << endl;
 
   return false;
@@ -134,15 +134,15 @@ static TQString removeArgs( const TQString& _cmd )
   return cmd;
 }
 
-KShortURIFilter::KShortURIFilter( TQObject *parent, const char *name,
+TDEShortURIFilter::TDEShortURIFilter( TQObject *parent, const char *name,
                                   const TQStringList & /*args*/ )
                 :KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0),
-                 DCOPObject("KShortURIFilterIface")
+                 DCOPObject("TDEShortURIFilterIface")
 {
     configure();
 }
 
-bool KShortURIFilter::filterURI( KURIFilterData& data ) const
+bool TDEShortURIFilter::filterURI( KURIFilterData& data ) const
 {
  /*
   * Here is a description of how the shortURI deals with the supplied
@@ -533,23 +533,23 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   return false;
 }
 
-TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const
+TDECModule* TDEShortURIFilter::configModule( TQWidget*, const char* ) const
 {
-    return 0; //new KShortURIOptions( parent, name );
+    return 0; //new TDEShortURIOptions( parent, name );
 }
 
-TQString KShortURIFilter::configName() const
+TQString TDEShortURIFilter::configName() const
 {
     return i18n("&ShortURLs");
 }
 
-void KShortURIFilter::configure()
+void TDEShortURIFilter::configure()
 {
   TDEConfig config( name() + QFL1("rc"), false, false );
   m_bVerbose = config.readBoolEntry( "Verbose", false );
 
   if ( m_bVerbose )
-    kdDebug() << "KShortURIFilter::configure: Config reload request..." << endl;
+    kdDebug() << "TDEShortURIFilter::configure: Config reload request..." << endl;
 
   m_strDefaultProtocol = config.readEntry( "DefaultProtocol", QFL1("http://") );
   EntryMap patterns = config.entryMap( QFL1("Pattern") );
@@ -571,6 +571,6 @@ void KShortURIFilter::configure()
 }
 
 K_EXPORT_COMPONENT_FACTORY( libkshorturifilter,
-                            KGenericFactory<KShortURIFilter>( "kcmkurifilt" ) )
+                            KGenericFactory<TDEShortURIFilter>( "kcmkurifilt" ) )
 
 #include "kshorturifilter.moc"
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
index 33ba20cad..16eb0cd02 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
@@ -37,7 +37,7 @@ class TDEInstance;
 * @author Dawit Alemayehu <adawit@kde.org>
 * @author Malte Starostik <starosti@zedat.fu-berlin.de>
 */
-class KShortURIFilter : public KURIFilterPlugin , public DCOPObject
+class TDEShortURIFilter : public KURIFilterPlugin , public DCOPObject
 {
     K_DCOP
     Q_OBJECT
@@ -49,13 +49,13 @@ public:
      * @param parent the parent of this class.
      * @param name the internal name for this object.
      */
-    KShortURIFilter( TQObject *parent = 0, const char *name = 0,
+    TDEShortURIFilter( TQObject *parent = 0, const char *name = 0,
 	             const TQStringList &args = TQStringList() );
 
     /**
      * Destructor
      */
-    virtual ~KShortURIFilter() {};
+    virtual ~TDEShortURIFilter() {};
 
     /**
      * Converts short URIs into fully qualified valid URIs
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index bf8551fb7..a47743bc6 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -75,7 +75,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
   TQWhatsThis::add( patternFilterLE, wtstr );
   TQWhatsThis::add( patternFilterLBL, wtstr );
 
-  typesLV = new KListView(this);
+  typesLV = new TDEListView(this);
   typesLV->setRootIsDecorated(true);
   typesLV->setFullWidth(true);
 
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index 63909d718..405238e0e 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -10,7 +10,7 @@
 #include "typeslistitem.h"
 
 class TQLabel;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQListBox;
 class TQPushButton;
@@ -51,7 +51,7 @@ protected:
   bool sync( TQValueList<TypesListItem *>& itemsModified );
 
 private:
-  KListView *typesLV;
+  TDEListView *typesLV;
   TQPushButton *m_removeTypeB;
 
   TQWidgetStack * m_widgetStack;
diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp
index c8b203d84..b0cf1e3b1 100644
--- a/kcontrol/filetypes/kserviceselectdlg.cpp
+++ b/kcontrol/filetypes/kserviceselectdlg.cpp
@@ -33,7 +33,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
 
     vbox->setSpacing( KDialog::spacingHint() );
     new TQLabel( i18n( "Select service:" ), vbox );
-    m_listbox=new KListBox( vbox );
+    m_listbox=new TDEListBox( vbox );
 
     // Can't make a TDETrader query since we don't have a servicetype to give,
     // we want all services that are not applications.......
diff --git a/kcontrol/filetypes/kserviceselectdlg.h b/kcontrol/filetypes/kserviceselectdlg.h
index 6f9bbe568..3b3ea87e7 100644
--- a/kcontrol/filetypes/kserviceselectdlg.h
+++ b/kcontrol/filetypes/kserviceselectdlg.h
@@ -41,7 +41,7 @@ public:
      */
     KService::Ptr service();
 private:
-    KListBox * m_listbox;
+    TDEListBox * m_listbox;
 };
 
 #endif
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 7efe76b6d..e450629f1 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -126,7 +126,7 @@ static const char *aa_vbgr_xpm[]={
 static const char** aaPixmaps[]={ aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm };
 
 /**** DLL Interface ****/
-typedef KGenericFactory<KFonts, TQWidget> FontFactory;
+typedef KGenericFactory<TDEFonts, TQWidget> FontFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_fonts, FontFactory("kcmfonts") )
 
 /**** FontUseItem ****/
@@ -140,13 +140,13 @@ FontUseItem::FontUseItem(
   const TQFont &default_fnt,
   bool f
 )
-  : KFontRequester(parent, 0L, f),
+  : TDEFontRequester(parent, 0L, f),
     _rcfile(rc),
     _rcgroup(grp),
     _rckey(key),
     _default(default_fnt)
 {
-  KAcceleratorManager::setNoAccel( this );
+  TDEAcceleratorManager::setNoAccel( this );
   setTitle( name );
   readFont( false );
 }
@@ -198,13 +198,13 @@ void FontUseItem::applyFontDiff( const TQFont &fnt, int fontDiffFlags )
 {
   TQFont _font( font() );
 
-  if (fontDiffFlags & KFontChooser::FontDiffSize) {
+  if (fontDiffFlags & TDEFontChooser::FontDiffSize) {
     _font.setPointSize( fnt.pointSize() );
   }
-  if (fontDiffFlags & KFontChooser::FontDiffFamily) {
+  if (fontDiffFlags & TDEFontChooser::FontDiffFamily) {
     if (!isFixedOnly()) _font.setFamily( fnt.family() );
   }
-  if (fontDiffFlags & KFontChooser::FontDiffStyle) {
+  if (fontDiffFlags & TDEFontChooser::FontDiffStyle) {
     _font.setBold( fnt.bold() );
     _font.setItalic( fnt.italic() );
     _font.setUnderline( fnt.underline() );
@@ -490,7 +490,7 @@ int FontAASettings::exec()
     return i && changesMade;
 }
 
-/**** KFonts ****/
+/**** TDEFonts ****/
 
 static TQCString desktopConfigName()
 {
@@ -506,7 +506,7 @@ static TQCString desktopConfigName()
   return name;
 }
 
-KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
+TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
     :   TDECModule(FontFactory::instance(), parent, name)
 {
   TQStringList nameGroupKeyRc;
@@ -662,30 +662,30 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
    load();
 }
 
-KFonts::~KFonts()
+TDEFonts::~TDEFonts()
 {
   fontUseList.setAutoDelete(true);
   fontUseList.clear();
 }
 
-void KFonts::fontSelected()
+void TDEFonts::fontSelected()
 {
   emit changed(true);
 }
 
-void KFonts::defaults()
+void TDEFonts::defaults()
 {
   load( true );
   aaSettings->defaults();
 }
 
-void KFonts::load()
+void TDEFonts::load()
 {
   load( false );
 }
 
 
-void KFonts::load( bool useDefaults )
+void TDEFonts::load( bool useDefaults )
 {
   for ( uint i = 0; i < fontUseList.count(); i++ )
     fontUseList.at( i )->readFont( useDefaults );
@@ -708,7 +708,7 @@ void KFonts::load( bool useDefaults )
   emit changed( useDefaults );
 }
 
-void KFonts::save()
+void TDEFonts::save()
 {
 
   for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() )
@@ -770,11 +770,11 @@ void KFonts::save()
 }
 
 
-void KFonts::slotApplyFontDiff()
+void TDEFonts::slotApplyFontDiff()
 {
   TQFont font = TQFont(fontUseList.first()->font());
   int fontDiffFlags = 0;
-  int ret = KFontDialog::getFontDiff(font,fontDiffFlags);
+  int ret = TDEFontDialog::getFontDiff(font,fontDiffFlags);
 
   if (ret == KDialog::Accepted && fontDiffFlags)
   {
@@ -784,14 +784,14 @@ void KFonts::slotApplyFontDiff()
   }
 }
 
-void KFonts::slotUseAntiAliasing()
+void TDEFonts::slotUseAntiAliasing()
 {
     useAA = static_cast< AASetting >( cbAA->currentItem());
     aaSettingsButton->setEnabled( cbAA->currentItem() == AAEnabled );
     emit changed(true);
 }
 
-void KFonts::slotCfgAa()
+void TDEFonts::slotCfgAa()
 {
   if(aaSettings->exec())
   {
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index f8b5e8fe6..db933d8a0 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -22,7 +22,7 @@ class TQComboBox;
 class KDoubleNumInput;
 class FontAASettings;
 
-class FontUseItem : public KFontRequester
+class FontUseItem : public TDEFontRequester
 {
   Q_OBJECT
 
@@ -89,13 +89,13 @@ private:
 /**
  * The Desktop/fonts tab in kcontrol.
  */
-class KFonts : public TDECModule
+class TDEFonts : public TDECModule
 {
     Q_OBJECT
 
 public:
-    KFonts(TQWidget *parent, const char *name, const TQStringList &);
-    ~KFonts();
+    TDEFonts(TQWidget *parent, const char *name, const TQStringList &);
+    ~TDEFonts();
 
     virtual void load();
     virtual void load( bool useDefaults );
diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp
index f38f35460..d5ebbabce 100644
--- a/kcontrol/hwmanager/deviceiconview.cpp
+++ b/kcontrol/hwmanager/deviceiconview.cpp
@@ -33,7 +33,7 @@
 #include "deviceiconview.moc"
 
 DeviceIconView::DeviceIconView(TQWidget * parent, const char * name)
-	: KListView(parent, name)
+	: TDEListView(parent, name)
 {
 	setSorting(0, true);
 	addColumn(TQString::null);
@@ -88,7 +88,7 @@ void DeviceIconView::keyPressEvent(TQKeyEvent *e)
 		}
 	}
 	else {
-		KListView::keyPressEvent(e);
+		TDEListView::keyPressEvent(e);
 	}
 }
 
diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h
index 76c18e93f..cdc5cd6d4 100644
--- a/kcontrol/hwmanager/deviceiconview.h
+++ b/kcontrol/hwmanager/deviceiconview.h
@@ -29,18 +29,18 @@
 class ConfigModule;
 class ConfigModuleList;
 
-class DeviceIconItem : public KListViewItem
+class DeviceIconItem : public TDEListViewItem
 {
 public:
 	DeviceIconItem(TQListViewItem *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0)
-		: KListViewItem(parent, text)
+		: TDEListViewItem(parent, text)
 		, _tag(TQString::null)
 		, _device(d)
 		{
 			setPixmap(0, pm);
 		}
 	DeviceIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0)
-		: KListViewItem(parent, text)
+		: TDEListViewItem(parent, text)
 		, _tag(TQString::null)
 		, _device(d)
 		{
@@ -59,7 +59,7 @@ private:
 		TDEGenericDevice *_device;
 };
 
-class DeviceIconView : public KListView
+class DeviceIconView : public TDEListView
 {
 	Q_OBJECT
 
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index 0a3fa2221..9d0e86d40 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -35,8 +35,8 @@
 #include "deviceiconview.h"
 
 class TDEConfig;
-class KPopupMenu;
-class KListViewItem;
+class TDEPopupMenu;
+class TDEListViewItem;
 
 class TDEHWManager : public TDECModule, public DCOPObject
 {
diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui
index 632ec2259..47de4caf5 100644
--- a/kcontrol/hwmanager/hwmanagerbase.ui
+++ b/kcontrol/hwmanager/hwmanagerbase.ui
@@ -58,7 +58,7 @@
 						<string>Filter by Name:</string>
 					</property>
 				</widget>
-				<widget class="KListViewSearchLine" row="2" column="1" colspan="3">
+				<widget class="TDEListViewSearchLine" row="2" column="1" colspan="3">
 					<property name="name">
 						<cstring>deviceFilter</cstring>
 					</property>
diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index 1f8408e8f..4fd29e4e9 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -32,8 +32,8 @@
 #include "iccconfigbase.h"
 
 class TDEConfig;
-class KPopupMenu;
-class KListViewItem;
+class TDEPopupMenu;
+class TDEListViewItem;
 
 class KICCConfig : public TDECModule, public DCOPObject
 {
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 812f382d2..802f1759d 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -77,7 +77,7 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
   lh2->addStretch(10);
 
 
-  m_iconThemes=new KListView(this,"IconThemeList");
+  m_iconThemes=new TDEListView(this,"IconThemeList");
   m_iconThemes->addColumn(i18n("Name"));
   m_iconThemes->addColumn(i18n("Description"));
   m_iconThemes->setAllColumnsShowFocus( true );
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index f648bf02c..fde163127 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -58,7 +58,7 @@ protected slots:
 private:
   TQListViewItem *iconThemeItem(const TQString &name);
 
-  KListView *m_iconThemes;
+  TDEListView *m_iconThemes;
   TQPushButton *m_removeButton;
 
   TQLabel *m_previewExec;
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 558998b4e..53c33ff2b 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -60,7 +60,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	new TQLabel( i18n("Select the cursor theme you want to use:"), this );
 
 	// Create the theme list view
-	listview = new KListView( this );
+	listview = new TDEListView( this );
 	listview->setFullWidth( true );
 	listview->setAllColumnsShowFocus( true );
 	listview->addColumn( i18n("Name") );
@@ -143,24 +143,24 @@ void ThemePage::defaults()
 
 void ThemePage::insertThemes()
 {
-	KListViewItem *item;
+	TDEListViewItem *item;
 
-	item = new KListViewItem( listview, i18n("Small black"),
+	item = new TDEListViewItem( listview, i18n("Small black"),
 			i18n("Small black cursors"), "SmallBlack" );
 	item->setPixmap( 0, TQPixmap( arrow_small_black_xpm ) );
 	listview->insertItem( item );
 
-	item = new KListViewItem( listview, i18n("Large black"),
+	item = new TDEListViewItem( listview, i18n("Large black"),
 			i18n("Large black cursors"), "LargeBlack" );
 	item->setPixmap( 0, TQPixmap( arrow_large_black_xpm ) );
 	listview->insertItem( item );
 
-	item = new KListViewItem( listview, i18n("Small white"),
+	item = new TDEListViewItem( listview, i18n("Small white"),
 			i18n("Small white cursors"), "SmallWhite" );
 	item->setPixmap( 0, TQPixmap( arrow_small_white_xpm ) );
 	listview->insertItem( item );
 
-	item = new KListViewItem( listview, i18n("Large white"),
+	item = new TDEListViewItem( listview, i18n("Large white"),
 			i18n("Large white cursors"), "LargeWhite" );
 	item->setPixmap( 0, TQPixmap( arrow_large_white_xpm ) );
 	listview->insertItem( item );
diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h
index 42d24dbe4..d1060797a 100644
--- a/kcontrol/input/core/themepage.h
+++ b/kcontrol/input/core/themepage.h
@@ -21,7 +21,7 @@
 
 #include <tqwidget.h>
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 
 class ThemePage : public TQWidget
@@ -49,7 +49,7 @@ class ThemePage : public TQWidget
 		void insertThemes();
 		void fixCursorFile();
 
-		KListView *listview;
+		TDEListView *listview;
 		TQString currentTheme, selectedTheme;
 };
 
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index e8a918512..0c81eff90 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -94,7 +94,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 	preview = new PreviewWidget( new TQHBox( this ) );
 
 	// Create the theme list view
-	listview = new KListView( this );
+	listview = new TDEListView( this );
 	listview->setFullWidth( true );
 	listview->setAllColumnsShowFocus( true );
 	listview->addColumn( i18n("Name") );
@@ -374,7 +374,7 @@ void ThemePage::insertTheme( const TQString &path )
 	delete listview->findItem( dirName, DirColumn );
 
 	// Create the listview item and insert it into the list.
-	KListViewItem *item = new KListViewItem( listview, name, desc, /*hidden*/ dirName );
+	TDEListViewItem *item = new TDEListViewItem( listview, name, desc, /*hidden*/ dirName );
 	item->setPixmap( NameColumn, createIcon( dirName, sample ) );
 	listview->insertItem( item );
 }
@@ -529,7 +529,7 @@ void ThemePage::insertThemes()
 			themeInfo.insert( *it, info );
 
 			// Create the listview item and insert it into the list.
-			KListViewItem *item = new KListViewItem( listview, name, desc, /*hidden*/ *it );
+			TDEListViewItem *item = new TDEListViewItem( listview, name, desc, /*hidden*/ *it );
 			item->setPixmap( NameColumn, createIcon( *it, sample ) );
 			listview->insertItem( item );
 		}
@@ -541,9 +541,9 @@ void ThemePage::insertThemes()
 	// Sort the theme list
 	listview->sort();
 
-	KListViewItem *item = new KListViewItem( listview, ' ' + i18n( "No theme" ), i18n( "The old classic X cursors") , /*hidden*/ "none" );
+	TDEListViewItem *item = new TDEListViewItem( listview, ' ' + i18n( "No theme" ), i18n( "The old classic X cursors") , /*hidden*/ "none" );
 	listview->insertItem( item );
-	item = new KListViewItem( listview, ' ' + i18n( "System theme" ), i18n( "Do not change cursor theme") , /*hidden*/ "system" );
+	item = new TDEListViewItem( listview, ' ' + i18n( "System theme" ), i18n( "Do not change cursor theme") , /*hidden*/ "system" );
 	listview->insertItem( item );
         // no ThemeInfo object for this one
 }
diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h
index 4197d73d1..22bca16db 100644
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@@ -22,7 +22,7 @@
 #include <tqdict.h>
 
 
-class KListView;
+class TDEListView;
 class TQString;
 class PreviewWidget;
 class TQStringList;
@@ -62,7 +62,7 @@ class ThemePage : public TQWidget
 		void insertThemes();
 		TQPixmap createIcon( const TQString &, const TQString & ) const;
 
-		KListView *listview;
+		TDEListView *listview;
 		PreviewWidget *preview;
 		TQPushButton *installButton, *removeButton;
 		TQString selectedTheme;
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index b0ae6866d..719c5abf8 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -58,7 +58,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
 
    TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this);
    TQHBox *hbox=new TQHBox(this);
-   m_ioslavesLb=new KListBox(hbox);
+   m_ioslavesLb=new TDEListBox(hbox);
    m_ioslavesLb->setMinimumSize(fontMetrics().width("blahfaselwhatever----"),10);
    connect( m_ioslavesLb, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( showInfo( TQListBoxItem * ) ) );
    //TODO make something useful after 2.1 is released
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
index f2df0e1e4..24247ad90 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h
@@ -45,7 +45,7 @@ public:
     KCMIOSlaveInfo(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &lits=TQStringList() );
 
 protected:
-    KListBox *m_ioslavesLb;
+    TDEListBox *m_ioslavesLb;
     KTextBrowser *m_info;
     TQCString helpData;
     TDEIO::Job *m_tfj;
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;
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index eeccfb362..8f8b836e2 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -75,7 +75,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 			"cannot manipulate these services."));
 	lay->addWidget( gb );
 
-	_lvLoD = new KListView( gb );
+	_lvLoD = new TDEListView( gb );
 	_lvLoD->addColumn(i18n("Service"));
 	_lvLoD->addColumn(i18n("Description"));
 	_lvLoD->addColumn(i18n("Status"));
@@ -88,7 +88,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 				"Be careful with deactivation of unknown services."));
 	lay->addWidget( gb );
 
-	_lvStartup = new KListView( gb );
+	_lvStartup = new TDEListView( gb );
 	_lvStartup->addColumn(i18n("Use"));
 	_lvStartup->addColumn(i18n("Service"));
 	_lvStartup->addColumn(i18n("Description"));
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 4f49ab140..6dff072ea 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -23,7 +23,7 @@
 
 #include <tdecmodule.h>
 
-class KListView;
+class TDEListView;
 
 class TQStringList;
 class TQPushButton;
@@ -53,8 +53,8 @@ protected slots:
         void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b);
 
 private:
-	KListView *_lvLoD;
-	KListView *_lvStartup;
+	TDEListView *_lvLoD;
+	TDEListView *_lvStartup;
 	TQPushButton *_pbStart;
 	TQPushButton *_pbStop;
 	
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 9f5a49040..262aaac69 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -121,8 +121,8 @@ void CommandShortcutsModule::initGUI()
                          "to the currently selected command."));
     buttonLayout->addSpacing(KDialog::spacingHint() * 2);
     buttonLayout->addWidget(m_shortcutButton);
-    connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const KShortcut&)),
-            this, TQT_SLOT(shortcutChanged(const KShortcut&)));
+    connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
+            this, TQT_SLOT(shortcutChanged(const TDEShortcut&)));
     connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
     connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
     buttonLayout->addStretch(1);
@@ -170,7 +170,7 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove)
     }
 }
 
-void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut)
+void CommandShortcutsModule::shortcutChanged(const TDEShortcut& shortcut)
 {
     AppTreeItem *item = static_cast<AppTreeItem*>(m_tree->currentItem());
     if (!item || item->isDirectory())
diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 3650b4e8c..2e0f0a76e 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -55,7 +55,7 @@ class CommandShortcutsModule : public TQWidget
 
     protected slots:
         void commandSelected(const TQString&, const TQString &, bool);
-        void shortcutChanged(const KShortcut& shortcut);
+        void shortcutChanged(const TDEShortcut& shortcut);
         void shortcutRadioToggled(bool remove);
         void commandDoubleClicked(TQListViewItem *item, const TQPoint &, int);
         void launchMenuEditor();
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index a50d7a41d..248ff2278 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -30,30 +30,30 @@
 
 #include <kshortcut.h>
 
-class KAccelBase;
+class TDEAccelBase;
 
 class TQObject;
 class TDEConfig;
 class TDEConfigBase;
 
 /*
-	KAccelAction holds information an a given action, such as "Run Command"
+	TDEAccelAction holds information an a given action, such as "Run Command"
 
-	1) KAccelAction = "Run Command"
+	1) TDEAccelAction = "Run Command"
 		Default3 = "Alt+F2"
 		Default4 = "Meta+Enter;Alt+F2"
-		1) KShortcut = "Meta+Enter"
+		1) TDEShortcut = "Meta+Enter"
 			1) KKeySequence = "Meta+Enter"
 				1) KKey = "Meta+Enter"
 					1) Meta+Enter
 					2) Meta+Keypad_Enter
-		2) KShortcut = "Alt+F2"
+		2) TDEShortcut = "Alt+F2"
 			1) KKeySequence = "Alt+F2"
 				1) Alt+F2
-	2) KAccelAction = "Something"
+	2) TDEAccelAction = "Something"
 		Default3 = ""
 		Default4 = ""
-		1) KShortcut = "Meta+X,Asterisk"
+		1) TDEShortcut = "Meta+X,Asterisk"
 			1) KKeySequence = "Meta+X,Asterisk"
 				1) KKey = "Meta+X"
 					1) Meta+X
@@ -63,35 +63,35 @@ class TDEConfigBase;
 */
 
 //---------------------------------------------------------------------
-// KAccelAction
+// TDEAccelAction
 //---------------------------------------------------------------------
 
-class KAccelAction
+class TDEAccelAction
 {
  public:
-	KAccelAction();
-	KAccelAction( const KAccelAction& );
-	KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& cutDef3, const KShortcut& cutDef4,
+	TDEAccelAction();
+	TDEAccelAction( const TDEAccelAction& );
+	TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
-	~KAccelAction();
+	~TDEAccelAction();
 
 	void clear();
 	bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& cutDef3, const KShortcut& cutDef4,
+			const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
 
-	KAccelAction& operator=( const KAccelAction& );
+	TDEAccelAction& operator=( const TDEAccelAction& );
 
 	const TQString& name() const                { return m_sName; }
 	const TQString& label() const               { return m_sLabel; }
 	const TQString& whatsThis() const           { return m_sWhatsThis; }
-	const KShortcut& shortcut() const          { return m_cut; }
-	const KShortcut& shortcutDefault() const;
-	const KShortcut& shortcutDefault3() const  { return m_cutDefault3; }
-	const KShortcut& shortcutDefault4() const  { return m_cutDefault4; }
+	const TDEShortcut& shortcut() const          { return m_cut; }
+	const TDEShortcut& shortcutDefault() const;
+	const TDEShortcut& shortcutDefault3() const  { return m_cutDefault3; }
+	const TDEShortcut& shortcutDefault4() const  { return m_cutDefault4; }
 	const TQObject* objSlotPtr() const          { return m_pObjSlot; }
 	const char* methodSlotPtr() const          { return m_psMethodSlot; }
 	bool isConfigurable() const                { return m_bConfigurable; }
@@ -100,7 +100,7 @@ class KAccelAction
 	void setName( const TQString& );
 	void setLabel( const TQString& );
 	void setWhatsThis( const TQString& );
-	bool setShortcut( const KShortcut& rgCuts );
+	bool setShortcut( const TDEShortcut& rgCuts );
 	void setSlot( const TQObject* pObjSlot, const char* psMethodSlot );
 	void setConfigurable( bool );
 	void setEnabled( bool );
@@ -123,8 +123,8 @@ class KAccelAction
 	TQString m_sName,
 	        m_sLabel,
 	        m_sWhatsThis;
-	KShortcut m_cut;
-	KShortcut m_cutDefault3, m_cutDefault4;
+	TDEShortcut m_cut;
+	TDEShortcut m_cutDefault3, m_cutDefault4;
 	const TQObject* m_pObjSlot;
 	const char* m_psMethodSlot;
 	bool m_bConfigurable,
@@ -137,43 +137,43 @@ class KAccelAction
 
  private:
 	static int g_bUseFourModifierKeys;
-	class KAccelActionPrivate* d;
+	class TDEAccelActionPrivate* d;
 
-	friend class KAccelActions;
-	friend class KAccelBase;
+	friend class TDEAccelActions;
+	friend class TDEAccelBase;
 };
 
 //---------------------------------------------------------------------
-// KAccelActions
+// TDEAccelActions
 //---------------------------------------------------------------------
 
-class KAccelActions
+class TDEAccelActions
 {
  public:
-	KAccelActions();
-	KAccelActions( const KAccelActions& );
-	virtual ~KAccelActions();
+	TDEAccelActions();
+	TDEAccelActions( const TDEAccelActions& );
+	virtual ~TDEAccelActions();
 
 	void clear();
-	bool init( const KAccelActions& );
+	bool init( const TDEAccelActions& );
 	bool init( TDEConfigBase& config, const TQString& sGroup );
 
-	void updateShortcuts( KAccelActions& );
+	void updateShortcuts( TDEAccelActions& );
 
 	int actionIndex( const TQString& sAction ) const;
-	KAccelAction* actionPtr( uint );
-	const KAccelAction* actionPtr( uint ) const;
-	KAccelAction* actionPtr( const TQString& sAction );
-	const KAccelAction* actionPtr( const TQString& sAction ) const;
-	KAccelAction* actionPtr( KKeySequence cut );
-	KAccelAction& operator []( uint );
-	const KAccelAction& operator []( uint ) const;
-
-	KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+	TDEAccelAction* actionPtr( uint );
+	const TDEAccelAction* actionPtr( uint ) const;
+	TDEAccelAction* actionPtr( const TQString& sAction );
+	const TDEAccelAction* actionPtr( const TQString& sAction ) const;
+	TDEAccelAction* actionPtr( KKeySequence cut );
+	TDEAccelAction& operator []( uint );
+	const TDEAccelAction& operator []( uint ) const;
+
+	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
 			const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
 			bool bConfigurable = true, bool bEnabled = true );
-	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+	TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
 	bool remove( const TQString& sAction );
 
 	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
@@ -185,21 +185,21 @@ class KAccelActions
 	uint count() const;
 
  protected:
-	KAccelBase* m_pKAccelBase;
-	KAccelAction** m_prgActions;
+	TDEAccelBase* m_pTDEAccelBase;
+	TDEAccelAction** m_prgActions;
 	uint m_nSizeAllocated, m_nSize;
 
 	void resize( uint );
-	void insertPtr( KAccelAction* );
+	void insertPtr( TDEAccelAction* );
 
  private:
-	class KAccelActionsPrivate* d;
+	class TDEAccelActionsPrivate* d;
 
-	KAccelActions( KAccelBase* );
-	void initPrivate( KAccelBase* );
-	KAccelActions& operator =( KAccelActions& );
+	TDEAccelActions( TDEAccelBase* );
+	void initPrivate( TDEAccelBase* );
+	TDEAccelActions& operator =( TDEAccelActions& );
 
-	friend class KAccelBase;
+	friend class TDEAccelBase;
 };
 
 #endif // _KACCELACTION_H
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 88f3aabe0..1696abf59 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -57,17 +57,17 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 
   kdDebug(125) << "KKeyModule::init() - Get default key bindings." << endl;
   if ( KeyType == "global" ) {
-    KAccelActions* keys = &actions;
+    TDEAccelActions* keys = &actions;
 // see also KKeyModule::init() below !!!
 #define NOSLOTS
-#define KShortcuts KAccelShortcuts
+#define TDEShortcuts TDEAccelShortcuts
 #include "../../twin/twinbindings.cpp"
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
 #include "../../kdesktop/kdesktopbindings.cpp"
 #include "../../klipper/klipperbindings.cpp"
 #include "../../kxkb/kxkbbindings.cpp"
-#undef KShortcuts
+#undef TDEShortcuts
     KeyScheme = "Global Key Scheme";
     KeySet    = "Global Keys";
     // Sorting Hack: I'll re-write the module once feature-adding begins again.
@@ -92,12 +92,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   }
 
   if ( KeyType == "standard" ) {
-    for(uint i=0; i<KStdAccel::NB_STD_ACCELS; i++) {
-      KStdAccel::StdAccel id = (KStdAccel::StdAccel)i;
-      actions.insertAction( KStdAccel::action(id),
-                          KStdAccel::description(id),
-                          KStdAccel::defaultKey3(id),
-                          KStdAccel::defaultKey4(id) );
+    for(uint i=0; i<TDEStdAccel::NB_STD_ACCELS; i++) {
+      TDEStdAccel::StdAccel id = (TDEStdAccel::StdAccel)i;
+      actions.insertAction( TDEStdAccel::action(id),
+                          TDEStdAccel::description(id),
+                          TDEStdAccel::defaultKey3(id),
+                          TDEStdAccel::defaultKey4(id) );
     }
 
     KeyScheme = "Standard Key Scheme";
@@ -459,7 +459,7 @@ void KKeyModule::readScheme( int index )
   }
 }*/
 
-/*void KKeyModule::updateKeys( const KAccelActions* map_P )
+/*void KKeyModule::updateKeys( const TDEAccelActions* map_P )
     {
     kc->updateKeys( map_P );
     }*/
@@ -473,24 +473,24 @@ void KKeyModule::init()
 
   /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
   TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
-  TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
-  KAccel::useFourModifierKeys( fourMods == "true" );
-  bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
+  TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" );
+  TDEAccel::useFourModifierKeys( fourMods == "true" );
+  bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys();
   TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
   */
-  KAccelActions* keys = new KAccelActions();
+  TDEAccelActions* keys = new TDEAccelActions();
 
   kdDebug(125) << "KKeyModule::init() - Load Included Bindings\n";
 // this should match the included files above
 #define NOSLOTS
-#define KShortcuts KAccelShortcuts
+#define TDEShortcuts TDEAccelShortcuts
 #include "../../klipper/klipperbindings.cpp"
 #include "../../twin/twinbindings.cpp"
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
 #include "../../kdesktop/kdesktopbindings.cpp"
 #include "../../kxkb/kxkbbindings.cpp"
-#undef KShortcuts
+#undef TDEShortcuts
 
   kdDebug(125) << "KKeyModule::init() - Read Config Bindings\n";
   keys->readActions( "Global Keys" );
@@ -508,19 +508,19 @@ void KKeyModule::init()
 // KeyChooserSpec
 //-----------------------------------------------------------------
 
-KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool bGlobal )
+KeyChooserSpec::KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent, bool bGlobal )
     : KKeyChooser( actions, parent, bGlobal, false, true ), m_bGlobal( bGlobal )
     {
     //if( global )
     //    globalDict()->clear(); // don't check against global keys twice
     }
 
-/*void KeyChooserSpec::updateKeys( const KAccelActions* map_P )
+/*void KeyChooserSpec::updateKeys( const TDEAccelActions* map_P )
     {
     if( global )
         {
         stdDict()->clear();
-        for( KAccelActions::ConstIterator gIt( map_P->begin());
+        for( TDEAccelActions::ConstIterator gIt( map_P->begin());
              gIt != map_P->end();
              ++gIt )
             {
@@ -532,7 +532,7 @@ KeyChooserSpec::KeyChooserSpec( KAccelActions& actions, TQWidget* parent, bool b
     else
         {
         globalDict()->clear();
-        for( KAccelActions::ConstIterator gIt( map_P->begin());
+        for( TDEAccelActions::ConstIterator gIt( map_P->begin());
              gIt != map_P->end();
              ++gIt )
             {
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index d1760728d..fb9136184 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -24,8 +24,8 @@ class KKeyModule : public TQWidget
 {
 	Q_OBJECT
 public:
-	KAccelActions actions;
-        //KAccelActions dict;
+	TDEAccelActions actions;
+        //TDEAccelActions dict;
         KeyChooserSpec *kc;
 
 	KKeyModule( TQWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name = 0 );
@@ -51,12 +51,12 @@ public slots:
 	//void slotRemove();
 	void slotKeyChange();
 	void slotPreferMeta();
-        //void updateKeys( const KAccelActions* map_P );
+        //void updateKeys( const TDEAccelActions* map_P );
 	//void readSchemeNames();
 
 signals:
 	void keyChange();
-        //void keysChanged( const KAccelActions* map_P );
+        //void keysChanged( const TDEAccelActions* map_P );
 
 protected:
 	TQListBox *sList;
@@ -79,9 +79,9 @@ class KeyChooserSpec : public KKeyChooser
 {
         Q_OBJECT
 public:
-        KeyChooserSpec( KAccelActions& actions, TQWidget* parent,
+        KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent,
                  bool bGlobal );
-        //void updateKeys( const KAccelActions* map_P );
+        //void updateKeys( const TDEAccelActions* map_P );
 protected:
         bool m_bGlobal;
 };
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 0c6d13c4d..736a937bd 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -154,12 +154,12 @@ extern "C"
 
 	/*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n";
 	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
-	TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" );
-	KAccel::useFourModifierKeys( fourMods == "true" );
-	bool bUseFourModifierKeys = KAccel::useFourModifierKeys();
+	TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", TDEAccel::keyboardHasMetaKey() ? "true" : "false" );
+	TDEAccel::useFourModifierKeys( fourMods == "true" );
+	bool bUseFourModifierKeys = TDEAccel::useFourModifierKeys();
 	TDEGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true );
 	*/
-	KAccelActions* keys = new KAccelActions();
+	TDEAccelActions* keys = new TDEAccelActions();
 
 	kdDebug(125) << "KeyModule::init() - Load Included Bindings\n";
 // this should match the included files above
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 15cad733a..c014a8b54 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -229,20 +229,20 @@ void ModifiersModule::initGUI()
 	pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
 	pLayoutTop->addWidget( pGroup, 4, 0 );
 
-	m_plstXMods = new KListView( pGroup );
+	m_plstXMods = new TDEListView( pGroup );
 	m_plstXMods->setSorting( -1 );
 	m_plstXMods->setSelectionMode( TQListView::NoSelection );
 	m_plstXMods->setAllColumnsShowFocus( true );
 	m_plstXMods->addColumn( i18n("X11-Mod") );
 
-	new KListViewItem( m_plstXMods, "mod5" );
-	new KListViewItem( m_plstXMods, "mod4" );
-	new KListViewItem( m_plstXMods, "mod3" );
-	new KListViewItem( m_plstXMods, "mod2" );
-	new KListViewItem( m_plstXMods, "mod1" );
-	new KListViewItem( m_plstXMods, "control" );
-	new KListViewItem( m_plstXMods, "lock" );
-	new KListViewItem( m_plstXMods, "shift" );
+	new TDEListViewItem( m_plstXMods, "mod5" );
+	new TDEListViewItem( m_plstXMods, "mod4" );
+	new TDEListViewItem( m_plstXMods, "mod3" );
+	new TDEListViewItem( m_plstXMods, "mod2" );
+	new TDEListViewItem( m_plstXMods, "mod1" );
+	new TDEListViewItem( m_plstXMods, "control" );
+	new TDEListViewItem( m_plstXMods, "lock" );
+	new TDEListViewItem( m_plstXMods, "shift" );
 
 	//------------------
 	pLayoutTop->setRowStretch( 5, 1 );
diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h
index 5cb57bfcb..b600bfafb 100644
--- a/kcontrol/keys/modifiers.h
+++ b/kcontrol/keys/modifiers.h
@@ -6,7 +6,7 @@
 class TQCheckBox;
 class TQLabel;
 class KComboBox;
-class KListView;
+class TDEListView;
 
 class ModifiersModule : public TQWidget
 {
@@ -30,7 +30,7 @@ class ModifiersModule : public TQWidget
 	TQLabel* m_plblCtrl, * m_plblAlt, * m_plblWin;
 	TQLabel* m_plblWinModX;
 	TQCheckBox* m_pchkMacKeyboard;
-	KListView* m_plstXMods;
+	TDEListView* m_plstXMods;
 	TQCheckBox* m_pchkMacSwap;
 
 	void initGUI();
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 3dac9dcf7..e45953056 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -107,8 +107,8 @@ void ShortcutsModule::initGUI()
 	TQString kde_winkeys_env_dir = TDEGlobal::dirs()->localtdedir() + "/env/";
 
 	kdDebug(125) << "A-----------" << endl;
-	KAccelActions* keys = &m_actionsGeneral;
-// see also KShortcutsModule::init() below !!!
+	TDEAccelActions* keys = &m_actionsGeneral;
+// see also TDEShortcutsModule::init() below !!!
 #define NOSLOTS
 #define KICKER_ALL_BINDINGS
 #include "../../twin/twinbindings.cpp"
@@ -187,7 +187,7 @@ void ShortcutsModule::initGUI()
 		// Yes, it does, so Win is a key
 		m_bUseRmWinKeys = false;
 	}
-	m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true );
+	m_pListGeneral = new TDEAccelShortcutList( m_actionsGeneral, true );
 
 	m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false );
 	m_pkcGeneral->resize (m_pkcGeneral->sizeHint() );
@@ -201,12 +201,12 @@ void ShortcutsModule::initGUI()
 	m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
 	connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
 
-	m_pListSequence = new KAccelShortcutList( m_actionsSequence, true );
+	m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true );
 	m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
 	m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
 	connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
 
-	m_pListApplication = new KStdAccel::ShortcutList;
+	m_pListApplication = new TDEStdAccel::ShortcutList;
 	m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
 	m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
 	connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
@@ -222,7 +222,7 @@ void ShortcutsModule::initGUI()
 
 void ShortcutsModule::createActionsGeneral()
 {
-	KAccelActions& actions = m_actionsGeneral;
+	TDEAccelActions& actions = m_actionsGeneral;
 
 	for( uint i = 0; i < actions.count(); i++ ) {
 		TQString sConfigKey = actions[i].name();
@@ -243,7 +243,7 @@ void ShortcutsModule::createActionsGeneral()
 
 void ShortcutsModule::createActionsSequence()
 {
-	KAccelActions& actions = m_actionsSequence;
+	TDEAccelActions& actions = m_actionsSequence;
 
 	for( uint i = 0; i < actions.count(); i++ ) {
 		TQString sConfigKey = actions[i].name();
@@ -410,7 +410,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 
 	TQDir dir( kksPath );
 	if( !dir.exists() && !dir.mkdir( kksPath ) ) {
-		tqWarning("KShortcutsModule: Could not make directory to store user info.");
+		tqWarning("TDEShortcutsModule: Could not make directory to store user info.");
 		return;
 	}
 
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index 0fa8818a8..76c3890c6 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -71,8 +71,8 @@ class ShortcutsModule : public TQWidget
 	TQPushButton* m_pbtnSave, * m_pbtnRemove;
 	int m_nSysSchemes;
 	TQStringList m_rgsSchemeFiles;
-	KAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
-	KShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
+	TDEAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
+	TDEShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
 	KKeyChooser* m_pkcGeneral, * m_pkcSequence, * m_pkcApplication;
 	TQCheckBox* m_useRmWinKeys;
 	bool m_bUseRmWinKeys;
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 31b39974f..361c1cfb8 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -35,16 +35,16 @@
 #include "khotkeys.h"
 
 AppTreeItem::AppTreeItem(TQListViewItem *parent, const TQString& storageId)
-    : KListViewItem(parent), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent), m_init(false), m_storageId(storageId) {}
 
 AppTreeItem::AppTreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& storageId)
-    : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
 
 AppTreeItem::AppTreeItem(TQListView *parent, const TQString& storageId)
-    : KListViewItem(parent), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent), m_init(false), m_storageId(storageId) {}
 
 AppTreeItem::AppTreeItem(TQListView *parent, TQListViewItem *after, const TQString& storageId)
-    : KListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
+    : TDEListViewItem(parent, after), m_init(false), m_storageId(storageId) {}
 
 void AppTreeItem::setName(const TQString &name)
 {
@@ -94,7 +94,7 @@ static TQPixmap appIcon(const TQString &iconName)
 
 
 AppTreeView::AppTreeView( TQWidget *parent, const char *name )
-    : KListView(parent, name)
+    : TDEListView(parent, name)
 {
     setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
     setAllColumnsShowFocus(true);
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index d31ba2d00..36d8b91ca 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -25,10 +25,10 @@
 #include <klistview.h>
 
 class TQPopupMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KDesktopFile;
 
-class AppTreeItem : public KListViewItem
+class AppTreeItem : public TDEListViewItem
 {
 
 public:
@@ -58,7 +58,7 @@ private:
     TQString m_accel;
 };
 
-class AppTreeView : public KListView
+class AppTreeView : public TDEListView
 {
     friend class AppTreeItem;
     Q_OBJECT
diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog
index 7916d0b45..27f3c8c9b 100644
--- a/kcontrol/kfontinst/ChangeLog
+++ b/kcontrol/kfontinst/ChangeLog
@@ -248,7 +248,7 @@ KDE3.1 -> KDE3.2
 6. Advanced editing of XftConfig.
 7. Added help on XftConfig - from Danny Tholen (obiwan@mailmij.org) 
 8. Removed some memory leaks
-10. Default folders changed for non-root users. KFontinst will now (upon initial start-up) select the following:
+10. Default folders changed for non-root users. TDEFontinst will now (upon initial start-up) select the following:
 
      X fonts dir:    $TDEHOME/share/fonts
      XConfig file:   $TDEHOME/share/fonts/fontpaths
@@ -261,7 +261,7 @@ KDE3.1 -> KDE3.2
 
    ...Also to accomplish this, some changes are needed to 'starttde' - see file README.starttde
 
-11. Because of the above, when started as non-root, KFontinst will create Type1 and TrueType sub-folders in
+11. Because of the above, when started as non-root, TDEFontinst will create Type1 and TrueType sub-folders in
     $TDEHOME/share/fonts - if they do not already exist.
 12. Moved XftConfig stuff from a sub-page of settings tab into its own tab.
 13. Added question dialog if module is unloaded before system has been configured.
@@ -301,23 +301,23 @@ KDE3.1 -> KDE3.2
 11. Support more encodings - encodings combos now list standard encodings as well as those read from
     .enc(.gz) files.
 12. Internal AMF creator for Type1 and TrueType fonts - ttf2pt1 and pf2afm.ps are no longer used/supplied.
-13. Removed the 'Process AFMs' & 'Delete AFMs' options - all AFMs are created be KFontinst, therefore they
+13. Removed the 'Process AFMs' & 'Delete AFMs' options - all AFMs are created be TDEFontinst, therefore they
     should be OK for StarOffice and AbiWord.
 14. If a writable XF86Config file is found - then complete folders may be installed, and folders in the X11
     directory may be uninstalled or disabled (i.e. the folder is not deleted, but it's entry is removed from
     the XF86Config file).
-15. No longer supply .enc files with KFontinst - they should be provided by the distro.
+15. No longer supply .enc files with TDEFontinst - they should be provided by the distro.
 
 0.9.1->0.9.2
 ============
 1. Removed a bug where the "Configure System" menu entry was always disabled!
 2. Spelling error in Settings dialog.
 3. t1lib has problems with some of the fonts supplied with Adobe acrobat - therefore, if t1lib fails to load the
-   font, then KFontinst itself will try to read the header information (although no preview will be available,
+   font, then TDEFontinst itself will try to read the header information (although no preview will be available,
    everything else should still work).
-4. Fixed multiple installing of programs in other/ directory. For instance KFontinst's version of ttmkfdir
+4. Fixed multiple installing of programs in other/ directory. For instance TDEFontinst's version of ttmkfdir
    was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/kfontinst - this was incorrect
-   as KFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version
+   as TDEFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version
    of ttmkfdir (such as that supplied with XFree86) would have been overwritten.
 5. Fixed bug where the user was allowed to select (and subsequently install) fonts which could not be loaded correctly.
 6. Added the ability to enter a custom preview string.
diff --git a/kcontrol/kfontinst/configure.in.bot b/kcontrol/kfontinst/configure.in.bot
index 99042cbdb..b9d9e6c6d 100644
--- a/kcontrol/kfontinst/configure.in.bot
+++ b/kcontrol/kfontinst/configure.in.bot
@@ -2,7 +2,7 @@ dnl put here things which have to be done as very last part of configure
 
 if test -z "$FONTINST_SUBDIR"; then
   echo ""
-  echo "KFontInstall control module got disabled from compilation"
+  echo "TDEFontInstall control module got disabled from compilation"
   echo "because of missing FreeType 2.x libraries/headers."
   echo "You can download the freetype library from http://www.freetype.org/."
   echo ""
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index bce091cd7..da1e5f2e2 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -137,7 +137,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1);
     TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
-    KToolBar    *toolbar=new KToolBar(this);
+    TDEToolBar    *toolbar=new TDEToolBar(this);
     bool        showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
 
     fontsFrame->setLineWidth(0);
@@ -177,10 +177,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     //
     // Now for the hack!
-    KAction     *act;
-    KActionMenu *topMnu=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("popupMenu"));
+    TDEAction     *act;
+    TDEActionMenu *topMnu=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("popupMenu"));
 
-    itsViewMenuAct=dynamic_cast<KActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
+    itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
     topMnu->popupMenu()->clear();
     connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu()));
     if((act=itsDirOp->actionCollection()->action("up")))
@@ -197,28 +197,28 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     topMnu->insert(itsViewMenuAct);
 
-    if((itsIconAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("short view"))))
+    if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view"))))
     {
         disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView()));
         connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView()));
         itsIconAct->plug(toolbar);
     }
 
-    if((itsListAct=dynamic_cast<KRadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
+    if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
     {
         disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView()));
         connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView()));
         itsListAct->plug(toolbar);
     }
 
-    itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), 
+    itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), 
                                        itsDirOp->actionCollection(), "showbitmap");
     itsShowBitmapAct->setChecked(showBitmap);
     itsShowBitmapAct->plug(toolbar);
 
     toolbar->insertLineSeparator();
 
-    act=new KAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
+    act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
     act->plug(toolbar);
     topMnu->insert(act);
 
@@ -232,11 +232,11 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     }
 
     toolbar->insertLineSeparator();
-    act=new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
+    act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
     act->plug(toolbar);
 #ifdef HAVE_XFT
     toolbar->insertLineSeparator();
-    act=new KAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+    act=new TDEAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
     act->plug(toolbar);
 #endif
 
@@ -251,7 +251,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 #ifdef HAVE_XFT
     if(itsPreview)
     {
-        KActionCollection *previewCol=itsPreview->actionCollection();
+        TDEActionCollection *previewCol=itsPreview->actionCollection();
 
         if(previewCol && previewCol->count()>0 && (act=previewCol->action("changeText")))
             act->plug(toolbar);
@@ -616,7 +616,7 @@ void CKCmFontInst::jobResult(TDEIO::Job *job)
                                  i18n("Please note that any open applications will need to be restarted in order "
                                       "for any changes to be noticed."),
 #endif
-                                 i18n("Success"), "KFontinst_WarnAboutFontChangesAndOpenApps");
+                                 i18n("Success"), "TDEFontinst_WarnAboutFontChangesAndOpenApps");
 }
 
 void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 4895f273e..a5dccb161 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -43,10 +43,10 @@
 #endif
 
 class KDirOperator;
-class KAction;
-class KRadioAction;
-class KActionMenu;
-class KToggleAction;
+class TDEAction;
+class TDERadioAction;
+class TDEActionMenu;
+class TDEToggleAction;
 class KFileItem;
 class TQLabel;
 class TQSplitter;
@@ -95,13 +95,13 @@ class CKCmFontInst : public TDECModule
 
     KDirOperator         *itsDirOp;
     KURL                 itsTop;
-    KToggleAction        *itsShowBitmapAct;
-    KAction              *itsSepDirsAct,
+    TDEToggleAction        *itsShowBitmapAct;
+    TDEAction              *itsSepDirsAct,
                          *itsShowHiddenAct,
                          *itsDeleteAct;
-    KRadioAction         *itsListAct,
+    TDERadioAction         *itsListAct,
                          *itsIconAct;
-    KActionMenu          *itsViewMenuAct;
+    TDEActionMenu          *itsViewMenuAct;
 #ifdef HAVE_XFT
     KParts::ReadOnlyPart *itsPreview;
 #endif
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index 3c8801e75..fb45b44ca 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -64,7 +64,7 @@ class CKFileFontView::CKFileFontViewPrivate
 };
 
 CKFileFontView::CKFileFontView(TQWidget *parent, const char *name)
-              : KListView(parent, name),
+              : TDEListView(parent, name),
                 KFileView(),
                 d(new CKFileFontViewPrivate())
 {
@@ -106,7 +106,7 @@ void CKFileFontView::setSelected(const KFileItem *info, bool enable)
         CFontListViewItem *item = (CFontListViewItem*)info->extraData(this);
 
         if (item)
-	    KListView::setSelected(item, enable);
+	    TDEListView::setSelected(item, enable);
     }
 }
 
@@ -117,7 +117,7 @@ void CKFileFontView::setCurrentItem(const KFileItem *item)
         CFontListViewItem *it = (CFontListViewItem*) item->extraData(this);
 
         if (it)
-            KListView::setCurrentItem(it);
+            TDEListView::setCurrentItem(it);
     }
 }
 
@@ -130,18 +130,18 @@ KFileItem * CKFileFontView::currentFileItem() const
 
 void CKFileFontView::clearSelection()
 {
-    KListView::clearSelection();
+    TDEListView::clearSelection();
 }
 
 void CKFileFontView::selectAll()
 {
     if (KFile::NoSelection!=KFileView::selectionMode() && KFile::Single!=KFileView::selectionMode())
-        KListView::selectAll(true);
+        TDEListView::selectAll(true);
 }
 
 void CKFileFontView::invertSelection()
 {
-    KListView::invertSelection();
+    TDEListView::invertSelection();
 }
 
 void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos)
@@ -158,7 +158,7 @@ void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos)
 void CKFileFontView::clearView()
 {
     itsResolver->m_lstPendingMimeIconItems.clear();
-    KListView::clear();
+    TDEListView::clear();
 }
 
 void CKFileFontView::insertItem(KFileItem *i)
@@ -357,8 +357,8 @@ void CKFileFontView::slotSortingChanged(int col)
             i->setKey(sortingKey(i->text(itsSortingCol), item->isDir(), sortSpec));
         }
 
-    KListView::setSorting(itsSortingCol, !reversed);
-    KListView::sort();
+    TDEListView::setSorting(itsSortingCol, !reversed);
+    TDEListView::sort();
 
     if (!itsBlockSortingSignal)
         sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) );
@@ -392,7 +392,7 @@ void CKFileFontView::ensureItemVisible(const KFileItem *i)
         CFontListViewItem *item = (CFontListViewItem*) i->extraData(this);
         
         if ( item )
-            KListView::ensureItemVisible(item);
+            TDEListView::ensureItemVisible(item);
     }
 }
 
@@ -435,7 +435,7 @@ KFileItem * CKFileFontView::prevItem(const KFileItem *fileItem) const
 
 void CKFileFontView::keyPressEvent(TQKeyEvent *e)
 {
-    KListView::keyPressEvent(e);
+    TDEListView::keyPressEvent(e);
 
     if (Key_Return==e->key() || Key_Enter==e->key())
         if (e->state() & ControlButton)
@@ -638,7 +638,7 @@ void CFontListViewItem::init()
 
 void CKFileFontView::virtual_hook(int id, void *data)
 {
-    KListView::virtual_hook(id, data);
+    TDEListView::virtual_hook(id, data);
     KFileView::virtual_hook(id, data);
 }
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index 7a6adb448..2950d3c33 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -48,12 +48,12 @@ class TQKeyEvent;
  * An item for the listiew, that has a reference to its corresponding
  * @ref KFileItem.
  */
-class CFontListViewItem : public KListViewItem
+class CFontListViewItem : public TDEListViewItem
 {
     public:
 
     CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi)
-	: KListViewItem(parent, text),
+	: TDEListViewItem(parent, text),
           itsInf(fi)
     {
         setPixmap(0, icon);
@@ -61,14 +61,14 @@ class CFontListViewItem : public KListViewItem
     }
 
     CFontListViewItem(TQListView *parent, KFileItem *fi)
-        : KListViewItem(parent),
+        : TDEListViewItem(parent),
           itsInf(fi)
     {
         init();
     }
 
     CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi, TQListViewItem *after)
-	: KListViewItem(parent, after),
+	: TDEListViewItem(parent, after),
           itsInf(fi)
     {
         setPixmap(0, icon);
@@ -113,7 +113,7 @@ class CFontListViewItem : public KListViewItem
  * @see KCombiView
  * @see KFileIconView
  */
-class CKFileFontView : public KListView, public KFileView
+class CKFileFontView : public TDEListView, public KFileView
 {
     Q_OBJECT
 
@@ -192,9 +192,9 @@ class CKFileFontView : public KListView, public KFileView
 
     private:
 
-    virtual void        insertItem(TQListViewItem *i)          { KListView::insertItem(i); }
-    virtual void        setSorting(int i, bool b)             { KListView::setSorting(i, b); }
-    virtual void        setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); }
+    virtual void        insertItem(TQListViewItem *i)          { TDEListView::insertItem(i); }
+    virtual void        setSorting(int i, bool b)             { TDEListView::setSorting(i, b); }
+    virtual void        setSelected(TQListViewItem *i, bool b) { TDEListView::setSelected(i, b); }
 
     inline CFontListViewItem * viewItem( const KFileItem *item ) const
     {
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index 6147363b9..a95c4e4e6 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -107,7 +107,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
     connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
 
-    itsChangeTextAction=new KAction(i18n("Change Text..."), "text", KShortcut(),
+    itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(),
                                     this, TQT_SLOT(changeText()), actionCollection(), "changeText");
     itsChangeTextAction->setEnabled(false);
     itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 1e4500c5a..29ef28d6c 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -35,7 +35,7 @@ class TQPushButton;
 class TQFrame;
 class TQLabel;
 class KIntNumInput;
-class KAction;
+class TDEAction;
 class KURL;
 
 namespace KFI
@@ -74,7 +74,7 @@ class CFontViewPart : public KParts::ReadOnlyPart
                   *itsToolsFrame;
     TQLabel        *itsFaceLabel;
     KIntNumInput  *itsFaceSelector;
-    KAction       *itsChangeTextAction,
+    TDEAction       *itsChangeTextAction,
                   *itsPrintAction;
     bool          itsShowInstallButton;
     int           itsFace;
diff --git a/kcontrol/kfontinst/viewpart/kfontview.desktop b/kcontrol/kfontinst/viewpart/kfontview.desktop
index f774dba33..88a964974 100644
--- a/kcontrol/kfontinst/viewpart/kfontview.desktop
+++ b/kcontrol/kfontinst/viewpart/kfontview.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=KFontView
+Name=TDEFontView
 Name[be]=Прагляд шрыфтоў
 Name[bn]=কে-ফন্ট-ভিউ
 Name[cs]=Prohlížeč písem
 Name[eo]=Tiparorigardilo
-Name[eu]=KFontWiew
+Name[eu]=TDEFontWiew
 Name[he]=מציג גופנים
 Name[hi]=के-फ़ॉन्ट-व्यू
 Name[mk]=КФонтПреглед
@@ -18,7 +18,7 @@ Name[sk]=Prehliadač písiem
 Name[sv]=Kfontview
 Name[tg]=Намоишгари КҲарф
 Name[vi]=Trình xem phông chữ TDE
-Name[wa]=Håyneu di fontes (KFontView)
+Name[wa]=Håyneu di fontes (TDEFontView)
 Name[zh_CN]=字体预览
 Exec=kfontview %i %u
 Icon=fonts
diff --git a/kcontrol/kicker/applettab_impl.h b/kcontrol/kicker/applettab_impl.h
index 83b80da0e..a92e166d6 100644
--- a/kcontrol/kicker/applettab_impl.h
+++ b/kcontrol/kicker/applettab_impl.h
@@ -28,7 +28,7 @@ class TQGroupBox;
 class TQButtonGroup;
 class TQRadioButton;
 class TQPushButton;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 
 class AppletTab : public AppletTabBase
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 49c2502b6..5d82d9e95 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -193,7 +193,7 @@
 					</spacer>
 				</vbox>
 			</widget>
-			<widget class="KListView">
+			<widget class="TDEListView">
 				<column>
 					<property name="text">
 					<string>Optional Menus</string>
@@ -366,7 +366,7 @@
 								<string>Font:</string>
 							</property>
 						</widget>
-						<widget class="KFontRequester" row="2" column="1" rowspan="1" colspan="3">
+						<widget class="TDEFontRequester" row="2" column="1" rowspan="1" colspan="3">
 							<property name="name">
 								<cstring>kcfg_ButtonFont</cstring>
 							</property>
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index 63a8de7c4..e2593e205 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -330,7 +330,7 @@
 &lt;p&gt;For example, files which are named ".directory" are plain text files which contain information for Konqueror, such as the icon to use in displaying a directory, the order in which files should be sorted, etc. You should not change or delete these files unless you know what you are doing.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="KListView" row="2" column="0">
+                    <widget class="TDEListView" row="2" column="0">
                         <column>
                             <property name="text">
                                 <string>Show Icon Previews For</string>
@@ -373,7 +373,7 @@
                             <string>&amp;Show device icons:</string>
                         </property>
                     </widget>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <column>
                             <property name="text">
                                 <string>Device Types to Display</string>
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index e7c3fd9cf..1f795c6a8 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -56,7 +56,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
 
     row++;
 
-    m_pStandard = new KFontCombo( this );
+    m_pStandard = new TDEFontCombo( this );
     label = new TQLabel( m_pStandard, i18n("&Standard font:"), this );
     lay->addWidget(label,row,0);
     lay->addMultiCellWidget(m_pStandard,row,row,1,1);
diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h
index 0a0a18823..c163deb70 100644
--- a/kcontrol/konq/fontopts.h
+++ b/kcontrol/konq/fontopts.h
@@ -44,7 +44,7 @@ class TQRadioButton;
 
 class KColorButton;
 class TDEConfig;
-class KFontCombo;
+class TDEFontCombo;
 
 
 //-----------------------------------------------------------------------------
@@ -88,7 +88,7 @@ private:
   TQRadioButton* m_pMedium;
   TQRadioButton* m_pLarge;
   */
-  KFontCombo* m_pStandard;
+  TDEFontCombo* m_pStandard;
   TQSpinBox* m_pSize;
 
   int m_fSize;
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index d69333a7c..b0528b5dc 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -77,7 +77,7 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ )
                 "no preview will be generated for files bigger than 10 MB, for speed reasons."));
 
     // Listview containing checkboxes for all protocols that support listing
-    KListView *listView = new KListView( this, "listView" );
+    TDEListView *listView = new TDEListView( this, "listView" );
     listView->addColumn( i18n( "Select Protocols" ) );
     listView->setFullWidth( true );
 
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index ec4510b1c..ffbf24a5a 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -24,7 +24,7 @@ class TQComboBox;
 class TQPushButton;
 
 class TDEConfig;
-class KListView;
+class TDEListView;
 class KURLRequester;
 
 namespace TDEIO { class Job; }
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 617197eba..cd54cd003 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -67,7 +67,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   TQLabel* label = new TQLabel( i18n("S&tandard font:"), this );
   lay->addWidget( label , ++r, E);
 
-  m_pFonts[0] = new KFontCombo( emptyList, this );
+  m_pFonts[0] = new TDEFontCombo( emptyList, this );
 
   label->setBuddy( m_pFonts[0] );
   lay->addMultiCellWidget(m_pFonts[0], r, r, M, W);
@@ -88,7 +88,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label = new TQLabel( i18n( "&Fixed font:"), this );
   lay->addWidget( label, ++r, E );
 
-  m_pFonts[1] = new KFontCombo( emptyList, this );
+  m_pFonts[1] = new TDEFontCombo( emptyList, this );
 
   label->setBuddy( m_pFonts[1] );
   lay->addMultiCellWidget(m_pFonts[1], r, r, M, W);
@@ -109,7 +109,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label = new TQLabel( i18n( "S&erif font:" ), this );
   lay->addWidget( label, ++r, E );
 
-  m_pFonts[2] = new KFontCombo( emptyList, this );
+  m_pFonts[2] = new TDEFontCombo( emptyList, this );
 
   label->setBuddy( m_pFonts[2] );
   lay->addMultiCellWidget( m_pFonts[2], r, r, M, W );
@@ -130,7 +130,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label = new TQLabel( i18n( "Sa&ns serif font:" ), this );
   lay->addWidget( label, ++r, E );
 
-  m_pFonts[3] = new KFontCombo( emptyList, this );
+  m_pFonts[3] = new TDEFontCombo( emptyList, this );
 
   label->setBuddy( m_pFonts[3] );
   lay->addMultiCellWidget( m_pFonts[3], r, r, M, W );
@@ -152,7 +152,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label = new TQLabel( i18n( "C&ursive font:" ), this );
   lay->addWidget( label, ++r, E );
 
-  m_pFonts[4] = new KFontCombo( emptyList, this );
+  m_pFonts[4] = new TDEFontCombo( emptyList, this );
 
   label->setBuddy( m_pFonts[4] );
   lay->addMultiCellWidget( m_pFonts[4], r, r, M, W );
@@ -174,7 +174,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   label = new TQLabel( i18n( "Fantas&y font:" ), this );
   lay->addWidget( label, ++r, E );
 
-  m_pFonts[5] = new KFontCombo( emptyList, this );
+  m_pFonts[5] = new TDEFontCombo( emptyList, this );
 
   label->setBuddy( m_pFonts[5] );
   lay->addMultiCellWidget( m_pFonts[5], r, r, M, W );
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index c833e8111..3c5131abf 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -17,7 +17,7 @@
 #include <tdecmodule.h>
 
 class TQSpinBox;
-class KFontCombo;
+class TDEFontCombo;
 
 class KAppearanceOptions : public TDECModule
 {
@@ -55,7 +55,7 @@ private:
   KIntNumInput* m_minSize;
   KIntNumInput* m_MedSize;
   KIntNumInput* m_pageDPI;
-  KFontCombo* m_pFonts[6];
+  TDEFontCombo* m_pFonts[6];
   TQComboBox* m_pEncoding;
   TQSpinBox *m_pFontSizeAdjust;
 
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 8bc8a3e50..3c8086abf 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -43,7 +43,7 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title,
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
 
-  domainSpecificLV = new KListView(this);
+  domainSpecificLV = new TDEListView(this);
   domainSpecificLV->addColumn(i18n("Host/Domain"));
   domainSpecificLV->addColumn(i18n("Policy"), 100);
   connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed()));
diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index f62b2e46a..f5844071e 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -30,7 +30,7 @@ class TQPushButton;
 class TQStringList;
 
 class TDEConfig;
-class KListView;
+class TDEListView;
 
 class Policies;
 class PolicyDialog;
@@ -80,7 +80,7 @@ public:
   /**
    * returns the list view displaying the domains
    */
-  KListView *listView() const { return domainSpecificLV; }
+  TDEListView *listView() const { return domainSpecificLV; }
 
   /**
    * returns the add push-button.
@@ -193,7 +193,7 @@ protected:
 
     TDEConfig *config;
 
-  KListView *domainSpecificLV;
+  TDEListView *domainSpecificLV;
 
   TQPushButton* addDomainPB;
   TQPushButton* changeDomainPB;
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index 0c179edd0..ea854aed3 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -22,7 +22,7 @@
 
 class KColorButton;
 class TDEConfig;
-class KListView;
+class TDEListView;
 class KURLRequester;
 class KIntNumInput;
 
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index be05b0aa6..a20a0f02f 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -161,7 +161,7 @@
                                     <string>&amp;Up</string>
                                 </property>
                             </widget>
-                            <widget class="KListBox" row="1" column="0" rowspan="4" colspan="2">
+                            <widget class="TDEListBox" row="1" column="0" rowspan="4" colspan="2">
                                 <property name="name">
                                     <cstring>dirList</cstring>
                                 </property>
diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui
index b6182c61f..5c2afe250 100644
--- a/kcontrol/privacy/kcmprivacydialog.ui
+++ b/kcontrol/privacy/kcmprivacydialog.ui
@@ -50,7 +50,7 @@
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
-            <widget class="KListView">
+            <widget class="TDEListView">
                 <property name="name">
                     <cstring>privacyListView</cstring>
                 </property>
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 869446e42..13b376cd4 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -117,8 +117,8 @@ bool KPrivacyManager::clearWebCache() const
 
 bool KPrivacyManager::clearRecentDocuments() const
 {
-  KRecentDocument::clear();
-  return KRecentDocument::recentDocuments().isEmpty();
+  TDERecentDocument::clear();
+  return TDERecentDocument::recentDocuments().isEmpty();
 }
 
 bool KPrivacyManager::clearQuickStartMenu() const
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 6f5d52c33..c175384c2 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -71,7 +71,7 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   //privacyTabs->addTab(p3pSettings, i18n("Privacy Settings"));
 
 
-  KListView *sw = cleaningDialog->privacyListView;
+  TDEListView *sw = cleaningDialog->privacyListView;
 
   sw->addColumn(i18n("Privacy Settings"));
   sw->addColumn(i18n("Description"));
@@ -82,8 +82,8 @@ Privacy::Privacy(TQWidget *parent, const char *name)
 
 
 
-  generalCLI     = new KListViewItem(sw, i18n("General") );
-  webbrowsingCLI = new KListViewItem(sw, i18n("Web Browsing") );
+  generalCLI     = new TDEListViewItem(sw, i18n("General") );
+  webbrowsingCLI = new TDEListViewItem(sw, i18n("Web Browsing") );
 
   generalCLI->setOpen(true);
   webbrowsingCLI->setOpen(true);
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 3300fec6d..495b2fa6c 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -53,8 +53,8 @@ private:
 
     TQPtrList<TQCheckListItem> checklist;
 
-    KListViewItem *generalCLI;
-    KListViewItem *webbrowsingCLI;
+    TDEListViewItem *generalCLI;
+    TDEListViewItem *webbrowsingCLI;
 
     TQCheckListItem *clearThumbnails;	
     TQCheckListItem *clearRunCommandHistory;
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 561732078..9ec755834 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -35,7 +35,7 @@
 
 class TDEGlobalAccel;
 class KKeyChooser;
-class KListView;
+class TDEListView;
 class TQPushButton;
 class TQDialog;
 class ConfigDialog;
@@ -56,11 +56,11 @@ private:
 
 };
 
-class ListView : public KListView
+class ListView : public TDEListView
 {
 public:
     ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
-	: KListView( parent, name ), _configWidget( configWidget ),
+	: TDEListView( parent, name ), _configWidget( configWidget ),
           _regExpEditor(0L) {}
     // TQListView has a weird idea of a sizeHint...
     virtual TQSize sizeHint () const {
diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index b7df41602..07702633b 100644
--- a/kcontrol/randr/tderandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -28,7 +28,7 @@
 
 	keys->insert( "Program:tderandrtray", i18n("Display Control") );
 
-	DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() );
+	DEF( I18N_NOOP("Switch Displays"), TDEShortcut(TQString("XF86Display")), TDEShortcut(TQString("XF86Display")), slotCycleDisplays() );
 
 #undef DEF
 #undef WIN
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 42151d87e..845f3e498 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -223,7 +223,7 @@ void KRandRSystemTray::reloadDisplayConfiguration()
 	}
 }
 
-void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
+void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 {
 	int lastIndex = 0;
 
@@ -247,7 +247,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
 				/*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1));
 				menu->setItemEnabled(lastIndex, false);*/
 			} else {
-				KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
+				TDEPopupMenu* subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
 				m_screenPopups.append(subMenu);
 				populateMenu(subMenu);
 				lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
@@ -293,23 +293,23 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
 
 	menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation"));
 
-	KAction *actColors = new KAction( i18n( "Configure Displays..." ),
-		SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
+	TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ),
+		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
 		actionCollection() );
 	actColors->plug( menu );
 
-// 	KAction *actPrefs = new KAction( i18n( "Configure Display..." ),
-// 		SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotPrefs() ),
+// 	TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ),
+// 		SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ),
 // 		actionCollection() );
 // 	actPrefs->plug( menu );
 
-	KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ),
-		SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
+	TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ),
+		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
 		actionCollection() );
 	actSKeys->plug( menu );
 
 	menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), m_help->menu());
-	KAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
+	TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
 	quitAction->plug(menu);
 
 	m_menu = menu;
@@ -317,7 +317,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
 
 void KRandRSystemTray::slotScreenActivated()
 {
-	setCurrentScreen(m_screenPopups.find(static_cast<const KPopupMenu*>(sender())));
+	setCurrentScreen(m_screenPopups.find(static_cast<const TDEPopupMenu*>(sender())));
 }
 
 void KRandRSystemTray::configChanged()
@@ -391,7 +391,7 @@ int KRandRSystemTray::GetHackResolutionParameter() {
 	return resparm;
 }
 
-void KRandRSystemTray::populateMenu(KPopupMenu* menu)
+void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 {
 	int lastIndex = 0;
 
@@ -718,7 +718,7 @@ void KRandRSystemTray::findPrimaryDisplay()
 	}
 }
 
-void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
+void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 {
 	XRROutputInfo *output_info;
 	char *output_name;
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 6c96203e4..aee432b4a 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -28,7 +28,7 @@
 #include <tdehardwaredevices.h>
 
 class KHelpMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class KRandRSystemTray :  public KSystemTray, public KRandrSimpleAPI
 {
@@ -38,7 +38,7 @@ public:
 	KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
 	TDEGlobalAccel *globalKeys;
 
-	virtual void contextMenuAboutToShow(KPopupMenu* menu);
+	virtual void contextMenuAboutToShow(TDEPopupMenu* menu);
 
 	void configChanged();
 
@@ -64,8 +64,8 @@ protected:
 	void resizeEvent ( TQResizeEvent * );
 
 private:
-	void populateMenu(KPopupMenu* menu);
-	void addOutputMenu(KPopupMenu* menu);
+	void populateMenu(TDEPopupMenu* menu);
+	void addOutputMenu(TDEPopupMenu* menu);
 	int GetDefaultResolutionParameter();
 	int GetHackResolutionParameter();
 	void findPrimaryDisplay();
@@ -73,7 +73,7 @@ private:
 
 	bool m_popupUp;
 	KHelpMenu* m_help;
-	TQPtrList<KPopupMenu> m_screenPopups;
+	TQPtrList<TDEPopupMenu> m_screenPopups;
 
 	Display *randr_display;
 	ScreenInfo *randr_screen_info;
@@ -82,7 +82,7 @@ private:
 	int last_known_x;
 	int last_known_y;
 
-	KPopupMenu* m_menu;
+	TDEPopupMenu* m_menu;
 	KSimpleConfig *r_config;
 	KSimpleConfig *t_config;
 
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index 2105c34d0..d802df1a6 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -69,7 +69,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
      base = new SmartcardBase(this);
      layout->add(base);
 
-     _popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser");
+     _popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser");
      _popUpKardChooser->insertItem(i18n("Change Module..."),
 				   this,
 				   TQT_SLOT(slotLaunchChooser()));
@@ -145,16 +145,16 @@ void KSmartcardConfig::updateReadersState (TQString readerName,
                                            bool isCardPresent,
                                            TQString atr) {
 
-    KListViewItem * tID=(KListViewItem *) base->_readerHostsListView->findItem(readerName, 0);
+    TDEListViewItem * tID=(TDEListViewItem *) base->_readerHostsListView->findItem(readerName, 0);
     if (tID==0) return;
 
-    KListViewItem * tIDChild=(KListViewItem*) tID->firstChild();
+    TDEListViewItem * tIDChild=(TDEListViewItem*) tID->firstChild();
     if (tIDChild==NULL) return;
 
     delete tIDChild;
 
     if (!isCardPresent)
-                (void) new KListViewItem(tID,i18n("No card inserted"));
+                (void) new TDEListViewItem(tID,i18n("No card inserted"));
     else{
 
         getSupportingModule(tID,atr);
@@ -175,7 +175,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
   arg << modName;
 
   //  New view items
-  KListViewItem * temp;
+  TDEListViewItem * temp;
 
   //If the smartcard support is disabled we unload the kardsvc KDED module
   //  and return
@@ -188,11 +188,11 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
 
 
     //  New view items
-    KListViewItem * temp;
+    TDEListViewItem * temp;
     kapp->dcopClient()->call("kded", "kded", "unloadModule(TQCString)",
 			     data, rettype, retval);
 
-    (void) new KListViewItem(base->_readerHostsListView,
+    (void) new TDEListViewItem(base->_readerHostsListView,
 			     i18n("Smart card support disabled"));
 
 
@@ -203,14 +203,14 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
   if (lr.isEmpty()){
 
 
-    (void) new KListViewItem(base->_readerHostsListView,
+    (void) new TDEListViewItem(base->_readerHostsListView,
 			     i18n("No readers found. Check 'pcscd' is running"));
     return;
   }
 
   for (TQStringList::Iterator _slot=lr.begin();_slot!=lr.end();++_slot){
 
-   temp= new KListViewItem(base->_readerHostsListView,*_slot);
+   temp= new TDEListViewItem(base->_readerHostsListView,*_slot);
 
 
    TQByteArray dataATR;
@@ -227,7 +227,7 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
 
    if (cardATR.isNull()){
 
-     (void) new KListViewItem(temp,i18n("NO ATR or no card inserted"));
+     (void) new TDEListViewItem(temp,i18n("NO ATR or no card inserted"));
      continue;
    }
 
@@ -241,13 +241,13 @@ void KSmartcardConfig::loadReadersTab( TQStringList lr){
 }
 
 
-void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
+void KSmartcardConfig::getSupportingModule( TDEListViewItem * ant,
                                             TQString & cardATR) const{
 
 
     if (cardATR.isNull()){
 
-        (void) new KListViewItem(ant,i18n("NO ATR or no card inserted"));
+        (void) new TDEListViewItem(ant,i18n("NO ATR or no card inserted"));
         return;
     }
 
@@ -258,7 +258,7 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
         TQString type=mng[0];
         TQString subType=mng[1];
         TQString subSubType=mng[2];
-        KListViewItem * hil =new KListViewItem(ant,
+        TDEListViewItem * hil =new TDEListViewItem(ant,
                                                i18n("Managed by: "),
                                                type,
                                                subType,
@@ -268,7 +268,7 @@ void KSmartcardConfig::getSupportingModule( KListViewItem * ant,
     else{
 
 
-        KListViewItem * hil =new KListViewItem(ant,
+        TDEListViewItem * hil =new TDEListViewItem(ant,
                                                i18n("No module managing this card"));
         hil->setSelectable(FALSE);
     }
diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h
index 0a4b7d704..7cb90478e 100644
--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@@ -34,8 +34,8 @@
 
 class TDEConfig;
 class KCardDB;
-class KPopupMenu;
-class KListViewItem;
+class TDEPopupMenu;
+class TDEListViewItem;
 
 class KSmartcardConfig : public TDECModule, public DCOPObject
 {
@@ -77,9 +77,9 @@ private:
   TDEConfig *config;
   bool _ok;
   KCardDB * _cardDB;
-  KPopupMenu * _popUpKardChooser;
+  TDEPopupMenu * _popUpKardChooser;
   
-  void getSupportingModule( KListViewItem * ant,
+  void getSupportingModule( TDEListViewItem * ant,
                             TQString & cardATR) const ;
 
 
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index 2949e87e7..c3104f05b 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -146,7 +146,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="KListView">
+                            <widget class="TDEListView">
                                 <column>
                                     <property name="text">
                                         <string>Reader</string>
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index ea6c11a08..1b592cc52 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -648,7 +648,7 @@ void KCMStyle::save()
 
 	if ( m_bToolbarsDirty )
 		// ##### FIXME - Doesn't apply all settings correctly due to bugs in
-		// TDEApplication/KToolbar
+		// TDEApplication/TDEToolbar
 		KIPC::sendMessageAll(KIPC::ToolbarStyleChanged);
 
 	if (m_bEffectsDirty) {
diff --git a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
index e4fb65121..6b7bd409f 100644
--- a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView" row="1" column="0">
+                <widget class="TDEListView" row="1" column="0">
                     <column>
                         <property name="text">
                             <string>Domain [Group]</string>
@@ -158,7 +158,7 @@
                                 <cstring>kListViewSearchLine</cstring>
                             </property>
                         </widget>
-                        <widget class="KListViewSearchLine">
+                        <widget class="TDEListViewSearchLine">
                             <property name="name">
                                 <cstring>kListViewSearchLine</cstring>
                             </property>
diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index 803edf07f..9241e1a04 100644
--- a/kcontrol/tdeio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -53,8 +53,8 @@ KCookiesPolicies::KCookiesPolicies(TQWidget *parent)
 
     dlg = new KCookiesPolicyDlgUI (this);
     dlg->lvDomainPolicy->header()->setStretchEnabled(true, 0);
-    dlg->lvDomainPolicy->setColumnWidthMode(0, KListView::Manual);
-    dlg->lvDomainPolicy->setColumnWidthMode(1, KListView::Maximum);
+    dlg->lvDomainPolicy->setColumnWidthMode(0, TDEListView::Manual);
+    dlg->lvDomainPolicy->setColumnWidthMode(1, TDEListView::Maximum);
     dlg->tbClearSearchLine->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
     dlg->kListViewSearchLine->setListView(dlg->lvDomainPolicy);
     TQValueList<int> columns;
diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
index 880b41cba..fb315acf7 100644
--- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
@@ -210,7 +210,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="KListView" row="1" column="0" rowspan="2" colspan="1">
+                <widget class="TDEListView" row="1" column="0" rowspan="2" colspan="1">
                     <column>
                         <property name="text">
                             <string>Domain</string>
@@ -284,7 +284,7 @@ List of sites for which you have set a specific cookie policy. Specific policies
                                 <cstring>kListViewSearchLine</cstring>
                             </property>
                         </widget>
-                        <widget class="KListViewSearchLine">
+                        <widget class="TDEListViewSearchLine">
                             <property name="name">
                                 <cstring>kListViewSearchLine</cstring>
                             </property>
diff --git a/kcontrol/tdeio/manualproxy_ui.ui b/kcontrol/tdeio/manualproxy_ui.ui
index 43567977e..dec7e70d4 100644
--- a/kcontrol/tdeio/manualproxy_ui.ui
+++ b/kcontrol/tdeio/manualproxy_ui.ui
@@ -287,7 +287,7 @@ Reverse the use of the exception list. Checking this box will result in the prox
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="KListBox" row="0" column="0" rowspan="5" colspan="1">
+                        <widget class="TDEListBox" row="0" column="0" rowspan="5" colspan="1">
                             <property name="name">
                                 <cstring>lbExceptions</cstring>
                             </property>
diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui
index 1e5d55c4e..db158b1d0 100644
--- a/kcontrol/tdeio/useragentdlg_ui.ui
+++ b/kcontrol/tdeio/useragentdlg_ui.ui
@@ -192,7 +192,7 @@ By default, only minimal identification information is sent to remote sites. The
                 <property name="margin">
                     <number>11</number>
                 </property>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>Site Name</string>
diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp
index fa1260b7e..105630f40 100644
--- a/kcontrol/tdm/tdm-conv.cpp
+++ b/kcontrol/tdm/tdm-conv.cpp
@@ -134,7 +134,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
     connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
 
     pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup);
-    npuserlv = new KListView(npGroup);
+    npuserlv = new TDEListView(npGroup);
     pl_label->setBuddy(npuserlv);
     npuserlv->addColumn(TQString::null);
     npuserlv->header()->hide();
diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h
index 3f8dda974..1a086ec6c 100644
--- a/kcontrol/tdm/tdm-conv.h
+++ b/kcontrol/tdm/tdm-conv.h
@@ -73,7 +73,7 @@ private:
 	TQRadioButton	*npRadio, *ppRadio, *spRadio;
 	KComboBox	*userlb, *puserlb;
 	TQSpinBox	*delaysb;
-	KListView	*npuserlv;
+	TDEListView	*npuserlv;
 	TQLabel		*u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label;
 	TQString	autoUser, preselUser;
 	TQStringList	noPassUsers;
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 9947101c1..954759df6 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -44,7 +44,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
 {
   TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
   TQLabel *label = new TQLabel(i18n("&General:"), this);
-  stdFontChooser = new KFontRequester(this);
+  stdFontChooser = new TDEFontRequester(this);
   label->setBuddy(stdFontChooser);
   TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") );
   connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
@@ -52,7 +52,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   ml->addWidget(stdFontChooser, 1, 1);
 
   label = new TQLabel(i18n("&Failures:"), this);
-  failFontChooser = new KFontRequester(this);
+  failFontChooser = new TDEFontRequester(this);
   label->setBuddy(failFontChooser);
   TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") );
   connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
@@ -60,7 +60,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
   ml->addWidget(failFontChooser, 2, 1);
 
   label = new TQLabel(i18n("Gree&ting:"), this);
-  greetingFontChooser = new KFontRequester(this);
+  greetingFontChooser = new TDEFontRequester(this);
   label->setBuddy(greetingFontChooser);
   TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") );
   connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged()));
diff --git a/kcontrol/tdm/tdm-font.h b/kcontrol/tdm/tdm-font.h
index 67b2c864d..fbbbc5028 100644
--- a/kcontrol/tdm/tdm-font.h
+++ b/kcontrol/tdm/tdm-font.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 
-class KFontRequester;
+class TDEFontRequester;
 class TQCheckBox;
 
 class TDMFontWidget : public TQWidget
@@ -46,9 +46,9 @@ protected slots:
 
 private:
 	TQCheckBox	*aacb;
-        KFontRequester *greetingFontChooser;
-        KFontRequester *failFontChooser;
-        KFontRequester *stdFontChooser;
+        TDEFontRequester *greetingFontChooser;
+        TDEFontRequester *failFontChooser;
+        TDEFontRequester *stdFontChooser;
 };
 
 
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index daa507a51..65d57a894 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -127,7 +127,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 
     wstack = new TQWidgetStack( this );
     s_label = new TQLabel( wstack, i18n("S&elect users and groups:"), this );
-    optinlv = new KListView( this );
+    optinlv = new TDEListView( this );
     optinlv->addColumn( i18n("Selected Users") );
     optinlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
@@ -136,7 +136,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 	     TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) );
     connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
 	     TQT_SLOT(slotChanged()) );
-    optoutlv = new KListView( this );
+    optoutlv = new TDEListView( this );
     optoutlv->addColumn( i18n("Hidden Users") );
     optoutlv->setResizeMode( TQListView::LastColumn );
     TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h
index 8a87c28dd..c5167655c 100644
--- a/kcontrol/tdm/tdm-users.h
+++ b/kcontrol/tdm/tdm-users.h
@@ -84,7 +84,7 @@ private:
 
 	TQLabel		*s_label; // middle
 	TQWidgetStack	*wstack;
-	KListView	*optoutlv, *optinlv;
+	TDEListView	*optoutlv, *optinlv;
 
 	TQButtonGroup	*faceGroup; // right
 	TQRadioButton	*rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;