diff --git a/config.h.cmake b/config.h.cmake
index 9f877ced1..1227b709c 100644
--- a/config.h.cmake
+++ b/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
diff --git a/doc/userguide/font-installation.docbook b/doc/userguide/font-installation.docbook
index 683c878bd..df810d55f 100644
--- a/doc/userguide/font-installation.docbook
+++ b/doc/userguide/font-installation.docbook
@@ -56,7 +56,7 @@ choose Delete.
Configuration (anti-aliasing)
-kfontinst and kfontview should probably get a mention too, since
+tdefontinst and tdefontview should probably get a mention too, since
they don't seem to have any existing docs.
diff --git a/kappfinder/apps/Development/j2mewtk.desktop b/kappfinder/apps/Development/j2mewtk.desktop
index bbde79f48..d4860e1c5 100644
--- a/kappfinder/apps/Development/j2mewtk.desktop
+++ b/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
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 6270add55..23ea31df0 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include
+#include
#include
#include
#include
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index afa77b6a5..0efaa6aa9 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -52,7 +52,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp
index 1b5c29aac..8e12e2d81 100644
--- a/kate/app/kateconfigplugindialogpage.cpp
+++ b/kate/app/kateconfigplugindialogpage.cpp
@@ -22,7 +22,7 @@
#include "katepluginmanager.h"
#include "kateconfigdialog.h"
-#include
+#include
#include "kateapp.h"
#include
#include
diff --git a/kate/app/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h
index c0294b0e9..009f30739 100644
--- a/kate/app/kateconfigplugindialogpage.h
+++ b/kate/app/kateconfigplugindialogpage.h
@@ -23,7 +23,7 @@
#include "katemain.h"
#include "katepluginmanager.h"
-#include
+#include
#include
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 2f2ae3487..90e934409 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -33,7 +33,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -41,7 +41,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index 1cee371f3..363ae6377 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -24,7 +24,7 @@
#ifndef _KATE_EXTERNAL_TOOLS_H_
#define _KATE_EXTERNAL_TOOLS_H_
-#include
+#include
#include
#include
#include
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index f310562bc..49987edd1 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -25,7 +25,7 @@
#include
-#include
+#include
#include
#include
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 7a0e429f8..1ff9ef47f 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -26,7 +26,7 @@
#include "kateviewmanager.h"
#include "kbookmarkhandler.h"
-#include "kactionselector.h"
+#include "tdeactionselector.h"
#include
#include
@@ -56,11 +56,11 @@
#include
#include
#include
-#include
+#include
#include
-#include
+#include
#include
-#include
+#include
#include
#include
//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 );
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index ddacb6422..33482faba 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -28,7 +28,7 @@
#include
#include
#include
-#include
+#include
#include
class KateMainWindow;
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index a1f4cac1a..bb0d7e9f8 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -32,7 +32,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 651269bb7..b402ca58d 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -21,7 +21,7 @@
#include "kateviewmanager.h"
#include "katedocmanager.h"
-#include
+#include
#include
#include
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 949166c86..9e27e55b8 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -46,7 +46,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -63,7 +63,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index 0905f2b6a..30582ed3e 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -29,7 +29,7 @@
#include
-#include
+#include
class KateTabWidget;
class GrepTool;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 6138915ab..6480d5fd3 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -2,7 +2,7 @@
Copyright (C) 2005 Christoph Cullmann
Copyright (C) 2002, 2003 Joseph Wenninger
- GUIClient partly based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann
+ GUIClient partly based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann
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
+#include
#include
#include
#include
@@ -31,7 +31,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -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");
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 4cc63abac..a291ebb8c 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -25,7 +25,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index d81e0de60..3abf12754 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -25,7 +25,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 144e701e2..4925b6e90 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -21,7 +21,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 168b760f1..d55af0c9d 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -27,14 +27,14 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index 1b3c4a966..b62e72a48 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 39a969b6f..562e41e27 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -28,7 +28,7 @@
#include "katetabwidget.h"
#include
-#include
+#include
#include
#include
#include
@@ -37,13 +37,13 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
#include
#include
-#include
+#include
#include
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 059178746..9af161b93 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -29,7 +29,7 @@
#include "kateviewspace.h"
#include
-#include
+#include
#include
#include
#include
@@ -38,7 +38,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index 35fa87fec..2ff3c7e63 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -25,21 +25,21 @@
#include
#include
-#include
+#include
#include
#include
#include
-#include
+#include
#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)
diff --git a/kate/app/kbookmarkhandler.h b/kate/app/kbookmarkhandler.h
index 6147a9d73..612c15a18 100644
--- a/kate/app/kbookmarkhandler.h
+++ b/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:
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 641db4865..58a6368d1 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -43,7 +43,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/utils/listboxview.cpp b/kate/utils/listboxview.cpp
index a3f56700f..3cbdd8a06 100644
--- a/kate/utils/listboxview.cpp
+++ b/kate/utils/listboxview.cpp
@@ -19,7 +19,7 @@
#include "listboxview.h"
#include "listboxview.moc"
-#include
+#include
namespace Kate {
diff --git a/kcontrol/CMakeLists.txt b/kcontrol/CMakeLists.txt
index 1d4dfcf59..72ca6fac5 100644
--- a/kcontrol/CMakeLists.txt
+++ b/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 )
diff --git a/kcontrol/Makefile.am b/kcontrol/Makefile.am
index 1b848574a..30f03338c 100644
--- a/kcontrol/Makefile.am
+++ b/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
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 7d66fa17f..8c6717e63 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -18,7 +18,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 3a7833c05..2533cfe52 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/kcontrol/access/kcmaccess.desktop b/kcontrol/access/kcmaccess.desktop
index c748c636a..1ce0924c2 100644
--- a/kcontrol/access/kcmaccess.desktop
+++ b/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
diff --git a/kcontrol/accessibility/accessibility.desktop b/kcontrol/accessibility/accessibility.desktop
index 058d178db..f0b73472c 100644
--- a/kcontrol/accessibility/accessibility.desktop
+++ b/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
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index 697759af4..c810f1e31 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -122,12 +122,12 @@
- klistbox.h
+ tdelistbox.h
kdialog.h
- klistbox.h
+ tdelistbox.h
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index d69023db5..bf06c3bc5 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -9,7 +9,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 34259f425..2a758d6e0 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -35,10 +35,10 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am
index 72bb632cd..87587fd4e 100644
--- a/kcontrol/ebrowsing/Makefile.am
+++ b/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
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 35a059710..919adf305 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -34,7 +34,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c b/kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c
index 2f61d6824..bb7c17cd4 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/klocaldomainurifilterhelper.c
+++ b/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
diff --git a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
index 4eb1c5441..b95ddd9ad 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt
+++ b/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}
)
diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
index 7ac64dd84..fccf0ef62 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am
+++ b/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
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
index e898bd0db..273534237 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
+++ b/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
@@ -36,7 +36,7 @@
#include
#include
-#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( "kcmkurifilt" ) )
-#include "kshorturifilter.moc"
+#include "tdeshorturifilter.moc"
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
index d607a4e6f..32e544a6d 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
+++ b/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
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
index 16eb0cd02..db3f1480f 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
+++ b/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
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index a47743bc6..5dd2cd484 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -14,7 +14,7 @@
#include