Rename many classes and header files to avoid conflicts with KDE4

config.h.cmake

@@ -81,7 +81,7 @@
 #cmakedefine HAVE_FONTCONFIG 1
 #cmakedefine HAVE_FREETYPE2 1
 
-// kcontrol/kfontinst
+// kcontrol/tdefontinst
 #cmakedefine HAVE_XFT 1
 #cmakedefine HAVE_GETOPT_H 1
 

doc/userguide/font-installation.docbook

@@ -56,7 +56,7 @@ choose <guibutton>Delete</guibutton>.</para>
 
 <para>Configuration (anti-aliasing)</para>
 
-<para>kfontinst and kfontview should probably get a mention too, since
+<para>tdefontinst and tdefontview should probably get a mention too, since
 they don't seem to have any existing docs.</para>
 </sect1>
 

kappfinder/apps/Development/j2mewtk.desktop

@@ -73,7 +73,7 @@ GenericName[xh]=J2ME Ibhokisi yesixhobo
 GenericName[zh_CN]=J2ME 工具包
 GenericName[zh_TW]=J2ME 工具組
 GenericName[zu]=Ibhokisi lamathuluzi le-J2ME
-Exec=ktoolbar
+Exec=tdetoolbar
 Icon=ksmiletris
 Name=J2ME
 Name[af]=J2me

kappfinder/toplevel.cpp

@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>

kate/app/kateconfigdialog.cpp

@@ -52,7 +52,7 @@
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>

kate/app/kateconfigplugindialogpage.cpp

@@ -22,7 +22,7 @@
 
 #include "katepluginmanager.h"
 #include "kateconfigdialog.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include "kateapp.h"
 #include <tqstringlist.h>
 #include <tqhbox.h>

kate/app/kateconfigplugindialogpage.h

@@ -23,7 +23,7 @@
 #include "katemain.h"
 #include "katepluginmanager.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqvbox.h>
 

kate/app/kateexternaltools.cpp

@@ -33,7 +33,7 @@
 #include <kate/view.h>
 #include <kate/document.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -41,7 +41,7 @@
 #include <tdeconfig.h>
 #include <krun.h>
 #include <kicondialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include <tqbitmap.h>

kate/app/kateexternaltools.h

@@ -24,7 +24,7 @@
 #ifndef _KATE_EXTERNAL_TOOLS_H_
 #define _KATE_EXTERNAL_TOOLS_H_
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kate/document.h>
 #include <kmacroexpander.h>

kate/app/katefilelist.h

@@ -25,7 +25,7 @@
 
 #include <kate/document.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqtooltip.h>
 #include <tqcolor.h>

kate/app/katefileselector.cpp

@@ -26,7 +26,7 @@
 #include "kateviewmanager.h"
 #include "kbookmarkhandler.h"
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
@@ -56,11 +56,11 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <tqtoolbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialog.h>
 #include <kdebug.h>
 //END Includes
@@ -166,7 +166,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ),
            filter, TQT_SLOT( addToHistory(const TQString&) ) );
 
-  // kaction for the dir sync method
+  // tdeaction for the dir sync method
   acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0,
         TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
   toolbar->setIconText( TDEToolBar::IconOnly );

kate/app/katefileselector.h

@@ -28,7 +28,7 @@
 #include <tqvbox.h>
 #include <tdefile.h>
 #include <kurl.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqframe.h>
 
 class KateMainWindow;

kate/app/kategrepdialog.cpp

@@ -32,7 +32,7 @@
 #include <tqcursor.h>
 
 #include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>

kate/app/katemailfilesdialog.cpp

@@ -21,7 +21,7 @@
 #include "kateviewmanager.h"
 #include "katedocmanager.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kurl.h>
 

kate/app/katemainwindow.cpp

@@ -46,7 +46,7 @@
 #include <dcopclient.h>
 #include <kinstance.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
@@ -63,7 +63,7 @@
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kopenwith.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksimpleconfig.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>

kate/app/katemainwindow.h

@@ -29,7 +29,7 @@
 
 #include <tdeparts/part.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KateTabWidget;
 class GrepTool;

kate/app/katemdi.cpp

@@ -2,7 +2,7 @@
    Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org>
    Copyright (C) 2002, 2003 Joseph Wenninger <jowenn@kde.org>
 
-   GUIClient partly based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+   GUIClient partly based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -23,7 +23,7 @@
 #include "katemdi.h"
 #include "katemdi.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 
 #include <tqvbox.h>
@@ -134,7 +134,7 @@ GUIClient::GUIClient ( MainWindow *mw )
     setXML( completeDescription, false /*merge*/ );
   }
 
-  if (actionCollection()->kaccel()==0)
+  if (actionCollection()->tdeaccel()==0)
     actionCollection()->setWidget(m_mw);
 
   m_toolMenu = new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu");

kate/app/katemdi.h

@@ -25,7 +25,7 @@
 
 #include <tdemultitabbar.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqdict.h>
 #include <tqintdict.h>

kate/app/katemwmodonhddialog.cpp

@@ -25,7 +25,7 @@
 #include <kate/document.h>
 
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocio.h>

kate/app/katesavemodifieddialog.cpp

@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kguiitem.h>
 #include <kactivelabel.h>
 #include <kstdguiitem.h>

kate/app/katesession.cpp

@@ -27,14 +27,14 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kmdcodec.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqdir.h>
 #include <tqlabel.h>

kate/app/katesession.h

@@ -24,7 +24,7 @@
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
 #include <ksharedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqobject.h>
 #include <tqvaluelist.h>

kate/app/kateviewmanager.cpp

@@ -28,7 +28,7 @@
 #include "katetabwidget.h"
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kdiroperator.h>
@@ -37,13 +37,13 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include <tdetexteditor/encodinginterface.h>
 

kate/app/kateviewspacecontainer.cpp

@@ -29,7 +29,7 @@
 #include "kateviewspace.h"
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kdiroperator.h>
@@ -38,7 +38,7 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>

kate/app/kbookmarkhandler.cpp

@@ -25,21 +25,21 @@
 #include <tqtextstream.h>
 
 #include <kbookmarkimporter.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kdiroperator.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "kbookmarkhandler.h"
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* kpopupmenu )
+KBookmarkHandler::KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu* tdepopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
-      m_menu( kpopupmenu ),
+      m_menu( tdepopupmenu ),
       m_importStream( 0L )
 {
     if (!m_menu)

kate/app/kbookmarkhandler.h

@@ -35,7 +35,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
     Q_OBJECT
 
 public:
-    KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *kpopupmenu=0 );
+    KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:

kate/app/kwritemain.cpp

@@ -43,7 +43,7 @@
 #include <kaboutdata.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kapplication.h>

kate/utils/listboxview.cpp

@@ -19,7 +19,7 @@
 #include "listboxview.h"
 #include "listboxview.moc"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 namespace Kate {
 

kcontrol/CMakeLists.txt

@@ -63,7 +63,7 @@ if( BUILD_KCONTROL )
   add_subdirectory( xinerama )
   add_subdirectory( display )
   add_subdirectory( kthememanager )
-  add_subdirectory( kfontinst )
+  add_subdirectory( tdefontinst )
   add_subdirectory( access )
   add_subdirectory( hwmanager )
 

kcontrol/Makefile.am

@@ -3,8 +3,8 @@ if include_kcontrol_access
 ACCESS_SUBDIR=access
 endif
 
-if include_kcontrol_kfontinst
-FONTINST_SUBDIR=kfontinst
+if include_kcontrol_tdefontinst
+FONTINST_SUBDIR=tdefontinst
 endif
 
 if include_kcontrol_smartcard

kcontrol/access/kaccess.cpp

@@ -18,7 +18,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <netwm.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kkeynative.h>
 #include <twin.h>
 

kcontrol/access/kcmaccess.cpp

@@ -29,7 +29,7 @@
 #include <tdefiledialog.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kkeynative.h>
 #include <knotifydialog.h>
 

kcontrol/access/kcmaccess.desktop

@@ -224,7 +224,7 @@ Keywords[sk]=prístup,prístupnosť,hluchý,postihnutý,zvonček,hlasný zvonče
 Keywords[sl]=dostop,dostopnost,gluh,gluhota,prizadetost,zvonec,vidni zvonec,zvonček,tipkovnica,tipke,lepljive tipke,počasne tipke,navigacija miške,numerična tipkovnica,invalidnost,invalid
 Keywords[sr]=приступ,приступачност,глув,хендикепиран,звоно,звучно звоно,визуелно звоно,тастатура,тастери,лепљиви тастери,спори тастери,померање миша,нумеричка тастатура
 Keywords[sr@Latn]=pristup,pristupačnost,gluv,hendikepiran,zvono,zvučno zvono,vizuelno zvono,tastatura,tasteri,lepljivi tasteri,spori tasteri,pomeranje miša,numerička tastatura
-Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,klistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
+Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,tdelistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
 Keywords[ta]=அணுகல்,அணுகும் முறை,காது கேளாத,ஆற்றல் குறைந்த,மணியோசை,காதால் கேட்கும் அளவிற்கு மணியோசை,தெரியும் மணியோசை,விசைபலகை,விசைகள்,ஒட்டும் விசைகள்,மீளும் தன்மையுடைய விசைகள்,மெதுவான விசைகள்,சுட்டிநாவிகேஷன்,எண்ணிக்கை அட்டை
 Keywords[th]=การเข้าถึง,ความง่ายในการใช้งาน,หูหนวก,บกพร่อง,ออด, ออดใช้ฟัง,ออดใช้ดู,แป้นพิมพ์,ปุ่ม,ปุ่มติดหนึบ,ปุ่มสะท้อน, ปุ่มชะลอ,นำทางโดยเมาส์,แผงปุ่มตัวเลข
 Keywords[tr]=erişim,erişilebilirlik,sağır,özürlü,zil,duyulabilir zil,görünür zil,Klavye,tuşlar,yapışkan tuşlar,zıplayan tuşlar,yavaş tuşlar,fare yönlendirmesi,num pad

kcontrol/accessibility/accessibility.desktop

@@ -223,7 +223,7 @@ Keywords[sk]=prístup,prístupnosť,hluchý,postihnutý,zvonček,hlasný zvonče
 Keywords[sl]=dostop,dostopnost,gluh,gluhota,prizadetost,zvonec,vidni zvonec,zvonček,tipkovnica,tipke,lepljive tipke,počasne tipke,navigacija miške,numerična tipkovnica,invalidnost,invalid
 Keywords[sr]=приступ,приступачност,глув,хендикепиран,звоно,звучно звоно,визуелно звоно,тастатура,тастери,лепљиви тастери,спори тастери,померање миша,нумеричка тастатура
 Keywords[sr@Latn]=pristup,pristupačnost,gluv,hendikepiran,zvono,zvučno zvono,vizuelno zvono,tastatura,tasteri,lepljivi tasteri,spori tasteri,pomeranje miša,numerička tastatura
-Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,klistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
+Keywords[sv]=tillgång,tillgänglighet,döv,handikappad,signal,ljudsignal,visuell signal,Tangentbord,tangenter,tdelistriga tangenter,studsande tangenter,långsamma tangenter,musnavigering,numeriskt tangentbord
 Keywords[ta]=அணுகல்,அணுகும் முறை,காது கேளாத,ஆற்றல் குறைந்த,மணியோசை,காதால் கேட்கும் அளவிற்கு மணியோசை,தெரியும் மணியோசை,விசைபலகை,விசைகள்,ஒட்டும் விசைகள்,மீளும் தன்மையுடைய விசைகள்,மெதுவான விசைகள்,சுட்டிநாவிகேஷன்,எண்ணிக்கை அட்டை
 Keywords[th]=การเข้าถึง,ความง่ายในการใช้งาน,หูหนวก,บกพร่อง,ออด, ออดใช้ฟัง,ออดใช้ดู,แป้นพิมพ์,ปุ่ม,ปุ่มติดหนึบ,ปุ่มสะท้อน, ปุ่มชะลอ,นำทางโดยเมาส์,แผงปุ่มตัวเลข
 Keywords[tr]=erişim,erişilebilirlik,sağır,özürlü,zil,duyulabilir zil,görünür zil,Klavye,tuşlar,yapışkan tuşlar,zıplayan tuşlar,yavaş tuşlar,fare yönlendirmesi,num pad

kcontrol/componentchooser/componentchooser_ui.ui

@@ -122,12 +122,12 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">klistbox.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>

kcontrol/css/kcmcss.cpp

@@ -9,7 +9,7 @@
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kgenericfactory.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>

kcontrol/displayconfig/displayconfig.cpp

@@ -35,10 +35,10 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <kurlrequester.h>
 #include <tdecmoduleloader.h>

kcontrol/ebrowsing/Makefile.am

@@ -12,7 +12,7 @@ kcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
 kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
 # Don't link this lib to the plugins. They are dlopened and linking to them
 # results in crashes when closing tdecmshell.
-# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la
+# plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libtdeshorturifilter.la
 
 messages: rc.cpp
 	$(EXTRACTRC) plugins/*/*.ui >> rc.cpp

kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp

@@ -34,7 +34,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kservice.h>

kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c

@@ -1,5 +1,5 @@
 /*
-    kshorturifilterhelper.cpp
+    tdeshorturifilterhelper.cpp
 
     This file is part of the KDE project
     Copyright (C) 2002 Lubos Lunak <llunak@suse.cz>

kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt

@@ -21,14 +21,14 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kshorturifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdeshorturifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdeshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} )
 
 
-##### libkshorturifilter (module) ###############
+##### libtdeshorturifilter (module) ###############
 
-tde_add_kpart( libkshorturifilter AUTOMOC
-  SOURCES kshorturifilter.cpp kshorturifilter.skel
+tde_add_kpart( libtdeshorturifilter AUTOMOC
+  SOURCES tdeshorturifilter.cpp tdeshorturifilter.skel
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kcontrol/ebrowsing/plugins/shorturi/Makefile.am

@@ -2,17 +2,17 @@
 
 AM_CPPFLAGS   =  $(all_includes) -DQT_NO_CAST_ASCII
 
-kde_module_LTLIBRARIES = libkshorturifilter.la
+kde_module_LTLIBRARIES = libtdeshorturifilter.la
 
-libkshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+libtdeshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+libtdeshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
 
-libkshorturifilter_la_SOURCES = kshorturifilter.cpp kshorturifilter.skel
+libtdeshorturifilter_la_SOURCES = tdeshorturifilter.cpp tdeshorturifilter.skel
 
-service_DATA = kshorturifilter.desktop
+service_DATA = tdeshorturifilter.desktop
 servicedir = $(kde_servicesdir)
 
-rc_DATA = kshorturifilterrc
+rc_DATA = tdeshorturifilterrc
 rcdir = $(kde_confdir)
 
 METASOURCES = AUTO

kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp

@@ -1,6 +1,6 @@
 /*  -*- c-basic-offset: 2 -*-
 
-    kshorturifilter.h
+    tdeshorturifilter.h
 
     This file is part of the KDE project
     Copyright (C) 2000 Dawit Alemayehu <adawit@kde.org>
@@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 #include <kmimetype.h>
 
-#include "kshorturifilter.h"
+#include "tdeshorturifilter.h"
 
 #define FQDN_PATTERN    "(?:[a-zA-Z0-9][a-zA-Z0-9+-]*\\.[a-zA-Z]+)"
 #define IPv4_PATTERN    "[0-9]{1,3}\\.[0-9]{1,3}(?:\\.[0-9]{0,3})?(?:\\.[0-9]{0,3})?"
@@ -136,7 +136,7 @@ static TQString removeArgs( const TQString& _cmd )
 
 TDEShortURIFilter::TDEShortURIFilter( TQObject *parent, const char *name,
                                   const TQStringList & /*args*/ )
-                :KURIFilterPlugin( parent, name ? name : "kshorturifilter", 1.0),
+                :KURIFilterPlugin( parent, name ? name : "tdeshorturifilter", 1.0),
                  DCOPObject("TDEShortURIFilterIface")
 {
     configure();
@@ -570,7 +570,7 @@ void TDEShortURIFilter::configure()
   }
 }
 
-K_EXPORT_COMPONENT_FACTORY( libkshorturifilter,
+K_EXPORT_COMPONENT_FACTORY( libtdeshorturifilter,
                             KGenericFactory<TDEShortURIFilter>( "kcmkurifilt" ) )
 
-#include "kshorturifilter.moc"
+#include "tdeshorturifilter.moc"

kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop

@@ -49,6 +49,6 @@ Name[vi]=Lọc Địa chỉ URI Ngắn
 Name[wa]=PasseteCoutURI
 Name[zh_CN]=短 URI 过滤
 Name[zh_TW]=短 URI 過濾器
-X-TDE-Library=libkshorturifilter
+X-TDE-Library=libtdeshorturifilter
 ServiceTypes=KURIFilter/Plugin
 InitialPreference=5

kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h

@@ -1,5 +1,5 @@
 /*
-    kshorturifilter.h
+    tdeshorturifilter.h
 
     This file is part of the KDE project
     Copyright (C) 2000 Dawit Alemayehu <adawit@kde.org>

kcontrol/filetypes/filetypesview.cpp

@@ -14,7 +14,7 @@
 #include <kdesktopfile.h>
 #include <kipc.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 

kcontrol/fonts/fonts.cpp

@@ -22,7 +22,7 @@
 
 #include <dcopclient.h>
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <kipc.h>

kcontrol/fonts/fonts.h

@@ -12,8 +12,8 @@
 
 #include <tdecmodule.h>
 #include <kdialogbase.h>
-#include <kfontdialog.h>
-#include <kfontrequester.h>
+#include <tdefontdialog.h>
+#include <tdefontrequester.h>
 
 #include "kxftconfig.h"
 

kcontrol/hwmanager/deviceiconview.h

@@ -20,7 +20,7 @@
 #ifndef __deviceiconview_h__
 #define __deviceiconview_h__
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <tdehardwaredevices.h>
 

kcontrol/hwmanager/hwmanager.cpp

@@ -33,10 +33,10 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <kurlrequester.h>
 #include <kgenericfactory.h>

kcontrol/hwmanager/hwmanager.h

@@ -26,7 +26,7 @@
 #endif
 
 #include <tdecmodule.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include <dcopobject.h>
 

kcontrol/iccconfig/iccconfig.cpp

@@ -33,10 +33,10 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <kurlrequester.h>
 #include <kgenericfactory.h>

kcontrol/icons/iconthemes.cpp

@@ -35,7 +35,7 @@
 #undef Unsorted
 #include <kipc.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequesterdlg.h>
 #include <kmessagebox.h>
 #include <kprogress.h>

kcontrol/icons/iconthemes.h

@@ -22,7 +22,7 @@
 #include <tqimage.h>
 #include <tdecmodule.h>
 #include <tqmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQPushButton;
 class DeviceManager;

kcontrol/input/core/themepage.cpp

@@ -28,7 +28,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>

kcontrol/input/xcursor/themepage.cpp

@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <kstandarddirs.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>
 #include <kdialog.h>

kcontrol/ioslaveinfo/kcmioslaveinfo.h

@@ -30,7 +30,7 @@
 #include <kaboutdata.h>
 #include <tdecmodule.h>
 #include <tdeio/job.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <ktextbrowser.h>
 
 class KIOTimeoutControl;

kcontrol/kcontrol/moduleiconview.h

@@ -20,7 +20,7 @@
 #ifndef __moduleiconview_h__
 #define __moduleiconview_h__
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class ConfigModule;
 class ConfigModuleList;

kcontrol/kcontrol/modulemenu.h

@@ -31,7 +31,7 @@ that is intentional :-]
 #include <tqwidget.h>
 #include <tqdict.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 class ConfigModule;

kcontrol/kcontrol/moduletreeview.h

@@ -23,7 +23,7 @@
 #include <tqpalette.h>
 #include <tqptrlist.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdict.h>
 
 

kcontrol/kcontrol/searchwidget.cpp

@@ -26,7 +26,7 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 #include "searchwidget.h"
 #include "searchwidget.moc"

kcontrol/kcontrol/toplevel.cpp

@@ -25,7 +25,7 @@
 #include <kaboutapplication.h>
 #include <kmessagebox.h>
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <twin.h>
 #include <kiconloader.h>
 #include <klineedit.h>

kcontrol/kcontrol/toplevel.h

@@ -21,7 +21,7 @@
 #ifndef __TOPLEVEL_H__
 #define __TOPLEVEL_H__
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqlistview.h>
 
 

kcontrol/kded/kcmkded.cpp

@@ -34,7 +34,7 @@
 #include <kdesktopfile.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kservice.h>
 #include <kstandarddirs.h>

kcontrol/keys/CMakeLists.txt

@@ -23,7 +23,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES keys.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES tdeaccel.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( PROGRAMS convertShortcuts.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( FILES

kcontrol/keys/Makefile.am

@@ -12,7 +12,7 @@ messages:
 	customkeys=`grep "^.include .\.\." keyconfig.cpp | sed -e "s#.*\"\(.*\)\"#\1#"` ;\
 	$(XGETTEXT) $(kcm_keys_la_SOURCES) $$customkeys -o $(podir)/kcmkeys.pot