diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kcontrol | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol')
122 files changed, 232 insertions, 232 deletions
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 <kglobal.h> #include <klocale.h> #include <netwm.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kkeynative.h> #include <twin.h> 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 <tdefiledialog.h> #include <kapplication.h> #include <kaboutdata.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kkeynative.h> #include <knotifydialog.h> 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 @@ </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> 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 <kcolorbutton.h> #include <tdeconfig.h> #include <kdialogbase.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kgenericfactory.h> #include <kglobalsettings.h> #include <kstandarddirs.h> 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 <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> 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 <kcombobox.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kservice.h> 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 <llunak@suse.cz> 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 <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" 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 <adawit@kde.org> 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 <kdesktopfile.h> #include <kipc.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index e450629f1..96fbc7d68 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/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> diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index db933d8a0..cd9f52e02 100644 --- a/kcontrol/fonts/fonts.h +++ b/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" diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h index cdc5cd6d4..2046c165f 100644 --- a/kcontrol/hwmanager/deviceiconview.h +++ b/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> diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 35845a380..0ea803ff5 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/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> diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index 9d0e86d40..b75a494d9 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -26,7 +26,7 @@ #endif #include <tdecmodule.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <dcopobject.h> diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index a12d26b2d..73aaf73b4 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/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> diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 802f1759d..cb0d23508 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/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> diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h index fde163127..ccb914846 100644 --- a/kcontrol/icons/iconthemes.h +++ b/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; diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index 53c33ff2b..bb8e7ca0c 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/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> diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 0c81eff90..71787d793 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/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> diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index 24247ad90..5149bc940 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/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; diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h index a5d43a447..12cb14d73 100644 --- a/kcontrol/kcontrol/moduleiconview.h +++ b/kcontrol/kcontrol/moduleiconview.h @@ -20,7 +20,7 @@ #ifndef __moduleiconview_h__ #define __moduleiconview_h__ -#include <klistview.h> +#include <tdelistview.h> class ConfigModule; class ConfigModuleList; diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h index 2ed12aa5b..9ce39b584 100644 --- a/kcontrol/kcontrol/modulemenu.h +++ b/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; diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index d5e60cebf..271214c98 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/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> diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index c98426641..cee6cbfd4 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/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" diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 329cb6f89..87661f8d5 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/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> diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h index 8d4f0212d..39aa25090 100644 --- a/kcontrol/kcontrol/toplevel.h +++ b/kcontrol/kcontrol/toplevel.h @@ -21,7 +21,7 @@ #ifndef __TOPLEVEL_H__ #define __TOPLEVEL_H__ -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqlistview.h> diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index 8f8b836e2..1d71b58ac 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/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> diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt index 739cd47f2..3e58f720d 100644 --- a/kcontrol/keys/CMakeLists.txt +++ b/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 diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am index a41bbaa71..2a6fc4ab1 100644 --- a/kcontrol/keys/Makefile.am +++ b/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 -update_DATA = kaccel.upd +update_DATA = tdeaccel.upd update_SCRIPTS = convertShortcuts.pl updatedir = $(kde_datadir)/tdeconf_update diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h index 2e0f0a76e..54be5345b 100644 --- a/kcontrol/keys/commandShortcuts.h +++ b/kcontrol/keys/commandShortcuts.h @@ -22,7 +22,7 @@ #define __COMMAND_SHORTCUTS_MODULE_H #include <tqtabwidget.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tqptrlist.h> class AppTreeView; diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index fb9136184..f442a2c31 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -11,7 +11,7 @@ #include <tqpushbutton.h> #include <tqlistbox.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kkeydialog.h> //#include <tdecmodule.h> #include <tqdict.h> diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index c014a8b54..c9a956298 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -11,7 +11,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kkeynative.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index e45953056..d28a4ed08 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -38,7 +38,7 @@ #include <kinputdialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <kshortcutlist.h> +#include <tdeshortcutlist.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h index 76c3890c6..c1f1b2822 100644 --- a/kcontrol/keys/shortcuts.h +++ b/kcontrol/keys/shortcuts.h @@ -29,7 +29,7 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqtabwidget.h> -#include "kaccelaction.h" +#include "tdeaccelaction.h" #include <kcombobox.h> #include <kkeydialog.h> diff --git a/kcontrol/keys/tdeaccelaction.h b/kcontrol/keys/tdeaccelaction.h index 248ff2278..5cc6ca02a 100644 --- a/kcontrol/keys/tdeaccelaction.h +++ b/kcontrol/keys/tdeaccelaction.h @@ -1,4 +1,4 @@ -// THIS FILE IS A COPY OF tdelibs/tdecore/kaccelaction.h AND MUST BE KEPT +// THIS FILE IS A COPY OF tdelibs/tdecore/tdeaccelaction.h AND MUST BE KEPT // IN SYNC WITH THAT FILE. /* This file is part of the KDE libraries @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <kshortcut.h> +#include <tdeshortcut.h> class TDEAccelBase; diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h index 36d8b91ca..4da6d2351 100644 --- a/kcontrol/keys/treeview.h +++ b/kcontrol/keys/treeview.h @@ -22,7 +22,7 @@ #define __treeview_h__ #include <tqstring.h> -#include <klistview.h> +#include <tdelistview.h> class TQPopupMenu; class TDEActionCollection; diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index e6eb85cb0..50a6b925c 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <kdialog.h> #include <kstandarddirs.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include "applettab_impl.h" diff --git a/kcontrol/kicker/kicker_config.desktop b/kcontrol/kicker/kicker_config.desktop index f68d12082..1e45359e1 100644 --- a/kcontrol/kicker/kicker_config.desktop +++ b/kcontrol/kicker/kicker_config.desktop @@ -172,7 +172,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων -Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo +Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons diff --git a/kcontrol/kicker/kicker_config_appearance.desktop b/kcontrol/kicker/kicker_config_appearance.desktop index 3becc6a76..32b6dcba2 100644 --- a/kcontrol/kicker/kicker_config_appearance.desktop +++ b/kcontrol/kicker/kicker_config_appearance.desktop @@ -178,7 +178,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων -Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo +Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons diff --git a/kcontrol/kicker/kicker_config_arrangement.desktop b/kcontrol/kicker/kicker_config_arrangement.desktop index e9f6a5da4..ca48b5c3e 100644 --- a/kcontrol/kicker/kicker_config_arrangement.desktop +++ b/kcontrol/kicker/kicker_config_arrangement.desktop @@ -161,7 +161,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων -Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo +Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons diff --git a/kcontrol/kicker/kicker_config_hiding.desktop b/kcontrol/kicker/kicker_config_hiding.desktop index 368142cc5..abf2e4481 100644 --- a/kcontrol/kicker/kicker_config_hiding.desktop +++ b/kcontrol/kicker/kicker_config_hiding.desktop @@ -151,7 +151,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,εφαρμογίδια,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων -Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo +Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE Menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons diff --git a/kcontrol/kicker/kicker_config_menus.desktop b/kcontrol/kicker/kicker_config_menus.desktop index 4caf125f7..3f27aebde 100644 --- a/kcontrol/kicker/kicker_config_menus.desktop +++ b/kcontrol/kicker/kicker_config_menus.desktop @@ -148,7 +148,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,εφαρμογίδια,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων -Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo +Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index 75f2baa90..4e4e0d706 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -23,7 +23,7 @@ #include <tdecmodulecontainer.h> #include <kdirwatch.h> #include <kimageio.h> -#include <klistview.h> +#include <tdelistview.h> #include <kstaticdeleter.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index 5d82d9e95..3c06ddfd4 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -732,14 +732,14 @@ <tabstop>kcfg_NumVisibleEntries</tabstop> </tabstops> <includes> - <include location="global" impldecl="in implementation">klistview.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>knuminput.h</includehint> </includehints> </UI> diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 51113e685..58cade0cc 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -31,12 +31,12 @@ #include <kdebug.h> #include <kdesktopfile.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <kicondialog.h> #include <kiconloader.h> diff --git a/kcontrol/kicker/panel.desktop b/kcontrol/kicker/panel.desktop index 57e5e86a3..c708be142 100644 --- a/kcontrol/kicker/panel.desktop +++ b/kcontrol/kicker/panel.desktop @@ -171,7 +171,7 @@ Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoli Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,TDE Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner Keywords[de]=Kicker,Panel,Taskbar,Kontrollleiste,Startleiste,Klickstartleiste,Fensterleiste,Autom. ausblenden,Ausblenden, TDEnöpfe,Animation,Hintergründe,Stile,Design,Themes,Menü-Zwischenspeicher, TDE Menü,Zwischenspeicher,Lesezeichen,Zuletzt geöffnete Dateien, Schnellanzeiger,Menüs,Symbole,Icons,Kacheln,Applets,Miniprogramme, Java-Miniprogramme,Hervorhebung,Anfasser,Sicherheitsstufen,Zoom für Symbole Keywords[el]=kicker,πίνακας,kpanel,γραμμή εργασιών,γραμμή έναρξης,γραμμή εκκίνησης,τοποθεσία,μέγεθος,αυτόματη απόκρυψη,απόκρυψη,κουμπιά,εφέ κίνησης,φόντο,θέματα,λανθάνουσα μνήμη μενού,λανθάνουσα μνήμη,κρυφό, TDE Μενού,σελιδοδείκτες,πρόσφατα έγγραφα,γρήγορος εξερευνητής,μενού εξερευνητή,μενού,εικονίδια,tiles,μικροεφαρμογές,έναρξη,τονισμός,χειριστήρια, μεγέθυνση εικονιδίων -Keywords[eo]=lanĉilo,panelo,tasklistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo +Keywords[eo]=lanĉilo,panelo,tastdelistelo,situo,grandeco,aŭtokaŝo,kaŝo,butono,fono,etoso,menubufro,TDE Menuo,legosigno,lasta dokumento,rapidrigardilo,rigardmenuo,piktogramo,kahelo,aplikaĵo,lanĉo,emfazo,teniloj,pligrandigo,fidindaj aplikaĵetoj,sekurecnivelo Keywords[es]=kicker,panel,kpanel,barra de tareas,barra de inicio,barra de lanzamiento,dirección,tamaño,auto ocultar,ocultar,botones,animación,fondo,temas,caché de menú,caché,oculto,Menú TDE,marcadores,documentos recientes,navegador rápido,menú navegador,menú,iconos,mosaicos,miniaplicaciones,arranque,resaltado,asas,iconos ampliados Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,TDE menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase Keywords[eu]=kicker,panela,kpanela,ataza-barra,hasiera-barra,abiarazte-barra,kokapena, neurria,auto ezkutatu,ezkutatu,botoiak,animazioa,atzeko planoa, gaiak,menu-katxea,katxea,ezkutatu,TDE menua,laster-markak,oraintsuko dokumentuak, arakatzaile bizkorra,arakatzaile menua,menua,ikonoak,baldosak,appletak,abiatu,nabarmendu,heldulekuak,zooming icons diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index e2593e205..e6acb6ed6 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -412,7 +412,7 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 1134dd8ed..c7242de26 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -30,7 +30,7 @@ #include <tqbuttongroup.h> #include <tqtabwidget.h> #include <tqwhatsthis.h> -#include <klistview.h> +#include <tdelistview.h> #include <kservice.h> #include <klocale.h> #include <kglobalsettings.h> diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 1f795c6a8..c002c5197 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -30,8 +30,8 @@ #include <kcolorbutton.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kfontcombo.h> -#include <kfontdialog.h> +#include <tdefontcombo.h> +#include <tdefontdialog.h> #include <klocale.h> #include <konq_defaults.h> // include default values directly from konqueror diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index b0528b5dc..ea1d637a4 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <knuminput.h> #include <kprotocolinfo.h> diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 52e8a07cb..4fa7620a8 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -29,7 +29,7 @@ #include <tdefileitem.h> #include <kglobalsettings.h> #include <kipc.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeio/job.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index cd54cd003..bb9db714a 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -12,7 +12,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kfontcombo.h> +#include <tdefontcombo.h> #include <kglobal.h> #include <tdehtmldefaults.h> #include <klocale.h> diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 3c8086abf..87daeea69 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -24,7 +24,7 @@ #include <tqwhatsthis.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index d08e0cdfc..f5cc93f12 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -12,7 +12,7 @@ // (c) Leo Savernik 2002-2003 #include <config.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index f27cd4153..adb00bd94 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -15,7 +15,7 @@ #include <tqwhatsthis.h> #include <tqvgroupbox.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <kurlrequester.h> diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index a20a0f02f..b784048e5 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -258,7 +258,7 @@ <includes> <include location="global" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> - <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"/> @@ -268,6 +268,6 @@ <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 6be5c1972..c02eb1679 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kprocio.h> diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 6001c26d9..56c093226 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -25,7 +25,7 @@ #include <kaboutdata.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kgenericfactory.h> #include <kmessagebox.h> diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 950d40ad8..87be37c02 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -31,7 +31,7 @@ #include <tdefiledialog.h> #include <kglobal.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kservicegroup.h> diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index c02101d54..6b979ab1f 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -155,7 +155,7 @@ LaunchConfig::load() void LaunchConfig::load(bool useDefaults) { - TDEConfig c("klaunchrc", false, false); + TDEConfig c("tdelaunchrc", false, false); c.setReadDefaults( useDefaults ); @@ -194,7 +194,7 @@ LaunchConfig::load(bool useDefaults) void LaunchConfig::save() { - TDEConfig c("klaunchrc", false, false); + TDEConfig c("tdelaunchrc", false, false); c.setGroup("FeedbackStyle"); c.writeEntry("BusyCursor", cb_busyCursor->currentItem() != 0); @@ -228,7 +228,7 @@ LaunchConfig::defaults() void LaunchConfig::checkChanged() { - TDEConfig c("klaunchrc", false, false); + TDEConfig c("tdelaunchrc", false, false); c.setGroup("FeedbackStyle"); diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index 5c2afe250..05d23882a 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -194,7 +194,7 @@ </vbox> </widget> <includes> - <include location="global" impldecl="in implementation">klistview.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> <include location="global" impldecl="in implementation">ktextedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 13b376cd4..cfed89e7a 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -27,7 +27,7 @@ #include <kglobal.h> #include <kapplication.h> #include <kdebug.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <kstandarddirs.h> #include <tqstringlist.h> diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index c175384c2..dc2dcacc5 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <ktextedit.h> diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h index 495b2fa6c..18d234230 100644 --- a/kcontrol/privacy/privacy.h +++ b/kcontrol/privacy/privacy.h @@ -22,7 +22,7 @@ #define _PRIVACY_H_ #include <tdecmodule.h> -#include <klistview.h> +#include <tdelistview.h> #include "kcmprivacydialog.h" #include "kprivacymanager.h" diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index f2344f1c0..1d7ffcc41 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -28,7 +28,7 @@ #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 9ec755834..0728146ee 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -30,7 +30,7 @@ #include <kdialogbase.h> #include <keditlistbox.h> #include <kkeydialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <knuminput.h> class TDEGlobalAccel; diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 845f3e498..d44600c1d 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -20,14 +20,14 @@ #include <tqimage.h> #include <tqtooltip.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcmultidialog.h> #include <kdebug.h> #include <khelpmenu.h> #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> #include <kstdguiitem.h> #include <kglobal.h> diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index d802df1a6..989ef45f4 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -36,10 +36,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 "smartcard.h" diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 1b592cc52..c9f1ecfcd 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -49,7 +49,7 @@ #include <kaboutdata.h> #include <kdialog.h> #include <klibloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <ksimpleconfig.h> #include <kstyle.h> diff --git a/kcontrol/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/CMakeLists.txt index e974f2a10..42f3f497d 100644 --- a/kcontrol/tdefontinst/CMakeLists.txt +++ b/kcontrol/tdefontinst/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory( thumbnail ) add_subdirectory( viewpart ) add_subdirectory( kcmfontinst ) add_subdirectory( tdefile-plugin ) -add_subdirectory( kfontinst ) +add_subdirectory( tdefontinst ) add_subdirectory( tdeio ) install( FILES installfont.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) diff --git a/kcontrol/tdefontinst/ChangeLog b/kcontrol/tdefontinst/ChangeLog index 27f3c8c9b..9dc01a578 100644 --- a/kcontrol/tdefontinst/ChangeLog +++ b/kcontrol/tdefontinst/ChangeLog @@ -175,9 +175,9 @@ KDE3.1 -> KDE3.2 1. StarOffice psstd.fonts generated output is no longer marked line-by line, instead it is marked as a section, e.g. - # kfontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType + # tdefontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType <fonts...> - # kfontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType + # tdefontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType ...Likewise for Ghostscript's Fontmap @@ -200,7 +200,7 @@ KDE3.1 -> KDE3.2 for helping me discover the various bugs with Bitmap output. 3. When displaying bitmap details, if individual entries (family, point size, etc) can't be read, then the Xlfd will be displayed. -4. Ghostscript & StarOffice include guards changed from "kfontinst" to "kfi" -- this will *require" removing of any previous output! +4. Ghostscript & StarOffice include guards changed from "tdefontinst" to "kfi" -- this will *require" removing of any previous output! 5. Shortened generated TrueType foundry fields - to help with StarOffice 0.10b6->0.10b7 (Test version...) @@ -237,7 +237,7 @@ KDE3.1 -> KDE3.2 ============== *** NOTE -*** Please delete your existing ~/.kde/share/config/kfontinstrc -or- ~/.kde2/share/config/kfontinstrc file +*** Please delete your existing ~/.kde/share/config/tdefontinstrc -or- ~/.kde2/share/config/tdefontinstrc file *** before using this version 1. Added support for X font server config files. @@ -316,8 +316,8 @@ KDE3.1 -> KDE3.2 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 TDEFontinst's version of ttmkfdir - was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/kfontinst - this was incorrect - as TDEFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version + was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/tdefontinst - this was incorrect + as TDEFontinst will only use the version in $(KDE_DATADIR)/tdefontinst, 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. @@ -345,13 +345,13 @@ KDE3.1 -> KDE3.2 0.8.2->0.8.3 ============ -1. Modified 'kfontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted +1. Modified 'tdefontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted for the root password. -2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("kfontinst") +2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("tdefontinst") 3. Corrected size of Configure dialog. 4. Fixed a minor bug where if all fonts were uninstalled, the 'Configure System' button was disabled - therefore not allowing you to activate the changes! -5. Added a command line interface. (type 'kfontinst --help' for details) +5. Added a command line interface. (type 'tdefontinst --help' for details) 6. Added option to automatically fix TTF postscript names upon install. 0.8.1->0.8.2 @@ -400,21 +400,21 @@ KDE3.1 -> KDE3.2 2. Modified ttf2pt1 to accept a parameter to just create .afm files 3. Added option to modify a .afm file when installing. 4. Added "Unicode" to list of encodings that can be used. -5. Removed kfontinst-cp1252.enc, kfontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to +5. Removed tdefontinst-cp1252.enc, tdefontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to support cp1252 by a hard-coded codec, there's no real point... 6. Rearranged the Configure System dialog - so that Force AFM regeneration is grouped next to the Generate AFMs option. -7. Encoding files now stored in <TDEDIR>/share/apps/kfontinst/Encodings +7. Encoding files now stored in <TDEDIR>/share/apps/tdefontinst/Encodings 0.6.1->0.7 ========== 1. Modified ttmkfdir & ttf2pt1 to allow usage of X11 style font re-encoding files. -2. Because .enc files are now used by kfontinst, removed the possibility of using gzipped encodings. +2. Because .enc files are now used by tdefontinst, removed the possibility of using gzipped encodings. 3. Added the ability to delete an installed font's .afm file. 4. Fixed a bug in the TtfPsNameFixer class - this would cause ttf2pt1 to creash when accessing a modified font! 5. Font encodings are now stored in <KDEDir>/share/x11encodings 6. Removed the reencode shell script, as the encodng is all done by ttmkfdir. 7. Removed xfinst shell script - handled internally. -8. Supplied a kfontinst-cp1252 encoding - with the ugly single-quotes normaly found in .ttf files remapped to +8. Supplied a tdefontinst-cp1252 encoding - with the ugly single-quotes normaly found in .ttf files remapped to the nice looking ones. 9. Added functionality, when configuring StarOffice, to select an appropriate xprinter.prolog for the selected encoding (if one exists)... @@ -434,9 +434,9 @@ KDE3.1 -> KDE3.2 to use the microsoft cp1252 enocding scheme. (Previosuly the PS output from StarOffice would not print OK with ghostscript - when using extra characters - unless the .ttf file was modified.) 2. Because of 1, removed the abilty to modify a TrueType font's internal charactermap - this was a hack anyway. -3. xfinst now uses mkfontdir to create encodings.dir - instead of kfontinst's install procedure copying a standard +3. xfinst now uses mkfontdir to create encodings.dir - instead of tdefontinst's install procedure copying a standard one in (this didn't actually work...) -4. As kfontinst no longer reads the .enc files themselves, added the ability to use .enc.gz files as well +4. As tdefontinst no longer reads the .enc files themselves, added the ability to use .enc.gz files as well when selecting an encoding for X. 5. Re-wrote xfinst & reencode to be plain 'sh' scripts, as opposed to 'tcsh' scripts. diff --git a/kcontrol/tdefontinst/Makefile.am b/kcontrol/tdefontinst/Makefile.am index 190855a8a..f81ef525a 100644 --- a/kcontrol/tdefontinst/Makefile.am +++ b/kcontrol/tdefontinst/Makefile.am @@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail FONTINST_VP_SUBDIR=viewpart endif -SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin kfontinst kio +SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst kio EXTRA_DIST = TODO @@ -11,4 +11,4 @@ konqservicedir = $(kde_datadir)/konqueror/servicemenus konqservice_DATA = installfont.desktop messages: rc.cpp - $(XGETTEXT) rc.cpp */*.cpp */*.h -o $(podir)/kfontinst.pot + $(XGETTEXT) rc.cpp */*.cpp */*.h -o $(podir)/tdefontinst.pot diff --git a/kcontrol/tdefontinst/configure.in.in b/kcontrol/tdefontinst/configure.in.in index df6d3d34c..65a5bc3f4 100644 --- a/kcontrol/tdefontinst/configure.in.in +++ b/kcontrol/tdefontinst/configure.in.in @@ -119,7 +119,7 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then fi AC_SUBST(LIB_FONT_ENC) - FONTINST_SUBDIR="kfontinst" + FONTINST_SUBDIR="tdefontinst" # Check for Xft... ac_xft_headers=0 ac_CXXFLAGS_save="$CXXFLAGS" @@ -140,10 +140,10 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then CFLAGS="$ac_CFLAGS_save" CPPFLAGS="$ac_CPPFLAGS_save" else - AC_MSG_WARN([Missing FontConfig - disabling kfontinst!]) + AC_MSG_WARN([Missing FontConfig - disabling tdefontinst!]) fi else - AC_MSG_WARN([Missing FreeType2 - disabling kfontinst!]) + AC_MSG_WARN([Missing FreeType2 - disabling tdefontinst!]) fi AM_CONDITIONAL(include_fontinst_tn, test "$ac_xft_headers" -eq 1) @@ -152,4 +152,4 @@ if test "$ac_xft_headers" -eq 1 ; then AC_DEFINE(HAVE_XFT, 1, [Defines if you have Xft]) fi -AM_CONDITIONAL(include_kcontrol_kfontinst, test -n "$FONTINST_SUBDIR") +AM_CONDITIONAL(include_kcontrol_tdefontinst, test -n "$FONTINST_SUBDIR") diff --git a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt index b5a0da812..e3b89dfba 100644 --- a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt +++ b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt @@ -12,8 +12,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/viewpart + ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib + ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/viewpart ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -35,6 +35,6 @@ tde_add_kpart( kcm_fontinst AUTOMOC SOURCES KCmFontInst.cpp KFileFontIconView.cpp KFileFontView.cpp PrintDialog.cpp SettingsDialog.cpp - LINK kfontinstprint-static kfontinst-shared + LINK tdefontinstprint-static tdefontinst-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index da1e5f2e2..2a46fd2d8 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -47,10 +47,10 @@ #include "Misc.h" #include "KFileFontIconView.h" #include "KFileFontView.h" -#include <kpopupmenu.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> -#include <kstdaccel.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> +#include <tdestdaccel.h> #include <tdefiledialog.h> #include <kmessagebox.h> #include <kcmdlineargs.h> @@ -76,7 +76,7 @@ namespace KFI { CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) - : TDECModule(parent, "kfontinst"), + : TDECModule(parent, "tdefontinst"), #ifdef HAVE_XFT itsPreview(NULL), #endif @@ -107,7 +107,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) TQFrame *fontsFrame; #ifdef HAVE_XFT - KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart"); + KLibFactory *factory=KLibLoader::self()->factory("libtdefontviewpart"); if(factory) { diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h index 2950d3c33..646359280 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h @@ -39,7 +39,7 @@ class KFileItem; class TQWidget; class TQKeyEvent; -#include <klistview.h> +#include <tdelistview.h> #include <kmimetyperesolver.h> #include "tdefileview.h" diff --git a/kcontrol/tdefontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am index 7a4c78920..b6e658096 100644 --- a/kcontrol/tdefontinst/kcmfontinst/Makefile.am +++ b/kcontrol/tdefontinst/kcmfontinst/Makefile.am @@ -1,10 +1,10 @@ if include_fontinst_tn FONTINST_PRINT_INC=-I$(srcdir)/../viewpart -FONTINST_PRINT_LIB=../viewpart/libkfontinstprint.la +FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la endif kde_module_LTLIBRARIES = kcm_fontinst.la -kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la +kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la METASOURCES = AUTO kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) diff --git a/kcontrol/tdefontinst/lib/CMakeLists.txt b/kcontrol/tdefontinst/lib/CMakeLists.txt index 83f977aaa..325b1b51d 100644 --- a/kcontrol/tdefontinst/lib/CMakeLists.txt +++ b/kcontrol/tdefontinst/lib/CMakeLists.txt @@ -23,9 +23,9 @@ link_directories( ) -##### kfontinst (shared) ######################## +##### tdefontinst (shared) ######################## -tde_add_library( kfontinst SHARED +tde_add_library( tdefontinst SHARED SOURCES Misc.cpp FcEngine.cpp VERSION 0.0.0 LINK tdeio-shared ${XFT_LIBRARIES} diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index 6faf700c6..8ac8f4fb4 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -734,7 +734,7 @@ TQString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo) TQString CFcEngine::createName(FcPattern *pat, int faceNo) { -//CPD: TODO: the names *need* to match up with kfontchooser's... +//CPD: TODO: the names *need* to match up with tdefontchooser's... TQString name(getFcString(pat, FC_FAMILY, faceNo)), str; int intVal; diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h index e50acb5fb..d7f5ef03f 100644 --- a/kcontrol/tdefontinst/lib/KfiConstants.h +++ b/kcontrol/tdefontinst/lib/KfiConstants.h @@ -3,7 +3,7 @@ #include <klocale.h> -#define KFI_CATALOGUE "kfontinst" +#define KFI_CATALOGUE "tdefontinst" // io-slave #define KFI_KIO_FONTS_PROTOCOL "fonts" diff --git a/kcontrol/tdefontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am index 59b85e0a3..a0ecdfbbf 100644 --- a/kcontrol/tdefontinst/lib/Makefile.am +++ b/kcontrol/tdefontinst/lib/Makefile.am @@ -1,6 +1,6 @@ -lib_LTLIBRARIES = libkfontinst.la +lib_LTLIBRARIES = libtdefontinst.la -libkfontinst_la_SOURCES = \ +libtdefontinst_la_SOURCES = \ Misc.cpp \ FcEngine.cpp @@ -9,6 +9,6 @@ Misc.h \ FcEngine.h \ KfiConstants.h -libkfontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) -libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined +libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) +libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE diff --git a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt index d12537903..37fab1445 100644 --- a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt +++ b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib + ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -31,6 +31,6 @@ install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( tdefile_font SOURCES KFileFont.cpp - LINK kfontinst-shared tdeio-shared + LINK tdefontinst-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp index 4ac55807f..6cbeb5b3b 100644 --- a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp +++ b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp @@ -260,7 +260,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt } typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory; -K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst")) +K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("tdefontinst")) namespace KFI { diff --git a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am index 04ab41861..a7f829214 100644 --- a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am +++ b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_font.la tdefile_font_la_SOURCES = KFileFont.cpp tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) -tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la +tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la kdelnkdir = $(kde_servicesdir) kde_services_DATA = tdefile_font.desktop diff --git a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt index fdcb51b15..b1f541f05 100644 --- a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt +++ b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt @@ -13,7 +13,7 @@ add_definitions( -DOS_${CMAKE_SYSTEM_NAME} ) include_directories( ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib + ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib ${CMAKE_SOURCE_DIR}/kcontrol/fonts/ ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -25,12 +25,12 @@ link_directories( ) -##### kfontinst (executable) #################### +##### tdefontinst (executable) #################### -tde_add_executable( kfontinst +tde_add_executable( tdefontinst SOURCES Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c XConfig.cpp - LINK kxftconfig-static kfontinst-shared tdeio-shared + LINK kxftconfig-static tdefontinst-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/tdefontinst/tdefontinst/Makefile.am b/kcontrol/tdefontinst/tdefontinst/Makefile.am index 3cfcfa689..a8b782b85 100644 --- a/kcontrol/tdefontinst/tdefontinst/Makefile.am +++ b/kcontrol/tdefontinst/tdefontinst/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = kfontinst -kfontinst_SOURCES = \ +bin_PROGRAMS = tdefontinst +tdefontinst_SOURCES = \ Main.cpp \ FontEngine.cpp \ Fontmap.cpp \ @@ -11,6 +11,6 @@ FontEngine.h \ Fontmap.h \ XConfig.h -kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la -kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH) +tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libtdefontinst.la +tdefontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH) AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) diff --git a/kcontrol/tdefontinst/tdeio/CMakeLists.txt b/kcontrol/tdefontinst/tdeio/CMakeLists.txt index dff38b281..ac2429162 100644 --- a/kcontrol/tdefontinst/tdeio/CMakeLists.txt +++ b/kcontrol/tdefontinst/tdeio/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib + ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib ${CMAKE_SOURCE_DIR}/kcontrol/fonts ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -34,6 +34,6 @@ install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION tde_add_kpart( tdeio_fonts AUTOMOC SOURCES KioFonts.cpp - LINK kxftconfig-static kfontinst-shared tdesu-shared + LINK kxftconfig-static tdefontinst-shared tdesu-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index 171cb806d..f42d50c0b 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -785,7 +785,7 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app) Misc::createDir(itsFolders[mainFolder].location); // - // Work out best params to send to kfontinst + // Work out best params to send to tdefontinst // ...determine if X already knows about the system font path... Display *xDisplay=XOpenDisplay(NULL); @@ -1723,7 +1723,7 @@ void CKioFonts::modified(EFolder folder, bool clearList, const CDirList &dirs) if(FOLDER_SYS==folder && !itsRoot && !itsCanStorePasswd) { - // If we modified sys, we're not root, and couldn't store the passwd, then kfontinst has already been called + // If we modified sys, we're not root, and couldn't store the passwd, then tdefontinst has already been called // so no need to ask it to add folder to fontconfig and X's config files... itsHasSys=true; itsAddToSysFc=false; @@ -1797,7 +1797,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool if(!tmpCmd.isEmpty()) { - cmd+=" && kfontinst "; + cmd+=" && tdefontinst "; cmd+=tmpCmd; cmd+=" "; cmd+=TQFile::encodeName(TDEProcess::quote(*it)); @@ -1806,7 +1806,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool } else if (0!=itsNrsKfiParams[0]) { - cmd+=" && kfontinst "; + cmd+=" && tdefontinst "; cmd+=itsNrsKfiParams; cmd+=" "; cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[FOLDER_SYS].location)); @@ -1846,8 +1846,8 @@ void CKioFonts::doModified() for(; it!=end; ++it) { - Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it)); - KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl; + Misc::doCmd("tdefontinst", itsKfiParams, TQFile::encodeName(*it)); + KFI_DBUG << "RUN(root): tdefontinst " << itsKfiParams << ' ' << *it << endl; } if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) @@ -1885,8 +1885,8 @@ void CKioFonts::doModified() for(; it!=end; ++it) { - Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it)); - KFI_DBUG << "RUN(non-root): kfontinst " << itsKfiParams << ' ' << *it << endl; + Misc::doCmd("tdefontinst", itsKfiParams, TQFile::encodeName(*it)); + KFI_DBUG << "RUN(non-root): tdefontinst " << itsKfiParams << ' ' << *it << endl; } } itsFolders[FOLDER_USER].modified.clear(); diff --git a/kcontrol/tdefontinst/tdeio/Makefile.am b/kcontrol/tdefontinst/tdeio/Makefile.am index 9f59e28b8..bde654358 100644 --- a/kcontrol/tdefontinst/tdeio/Makefile.am +++ b/kcontrol/tdefontinst/tdeio/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdeio_fonts.la tdeio_fonts_la_SOURCES = \ KioFonts.cpp -tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la +tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libtdefontinst.la tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE diff --git a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt index 8d3c04b86..7d4ce2fb5 100644 --- a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt +++ b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib + ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -30,6 +30,6 @@ install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( fontthumbnail SOURCES FontThumbnail.cpp - LINK kfontinst-shared + LINK tdefontinst-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/tdefontinst/thumbnail/Makefile.am b/kcontrol/tdefontinst/thumbnail/Makefile.am index 49213a019..d9005a335 100644 --- a/kcontrol/tdefontinst/thumbnail/Makefile.am +++ b/kcontrol/tdefontinst/thumbnail/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = fontthumbnail.la fontthumbnail_la_SOURCES = FontThumbnail.cpp -fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libkfontinst.la +fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/kcontrol/tdefontinst/viewpart/CMakeLists.txt b/kcontrol/tdefontinst/viewpart/CMakeLists.txt index 7fb621fec..5dd3ddc63 100644 --- a/kcontrol/tdefontinst/viewpart/CMakeLists.txt +++ b/kcontrol/tdefontinst/viewpart/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib + ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -24,32 +24,32 @@ link_directories( ##### other data ################################ -install( FILES kfontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kfontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/kfontview ) +install( FILES tdefontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdefontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdefontviewpart.rc tdefontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefontview ) -##### libkfontviewpart (module) ################# +##### libtdefontviewpart (module) ################# -tde_add_kpart( libkfontviewpart AUTOMOC +tde_add_kpart( libtdefontviewpart AUTOMOC SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp - LINK kfontinstprint-static kfontinst-shared tdeparts-shared + LINK tdefontinstprint-static tdefontinst-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kfontview (executable) #################### +##### tdefontview (executable) #################### -tde_add_executable( kfontview AUTOMOC +tde_add_executable( tdefontview AUTOMOC SOURCES FontViewerApp.cpp LINK tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) -##### kfontinstprint (static) ################### +##### tdefontinstprint (static) ################### -tde_add_library( kfontinstprint STATIC_PIC +tde_add_library( tdefontinstprint STATIC_PIC SOURCES KfiPrint.cpp LINK tdeprint-shared ) diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index a95c4e4e6..d04d1b3dc 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -49,7 +49,7 @@ #include <kmessagebox.h> #include <knuminput.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <kinputdialog.h> #include <kdialog.h> #include <kprinter.h> @@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); - setInstance(new TDEInstance("kfontview")); + setInstance(new TDEInstance("tdefontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); @@ -113,7 +113,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print"); itsPrintAction->setEnabled(false); - setXMLFile("kfontviewpart.rc"); + setXMLFile("tdefontviewpart.rc"); setWidget(itsFrame); } diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h index 29ef28d6c..24f6d8d8b 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.h +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h @@ -5,7 +5,7 @@ // // Class Name : KFI::CFontViewPart // Author : Craig Drummond -// Project : K Font Installer (kfontinst-kcontrol) +// Project : K Font Installer (tdefontinst-kcontrol) // Creation Date : 03/08/2002 // Version : $Revision$ $Date$ // diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index 41d06984e..244c223d8 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp @@ -35,9 +35,9 @@ extern "C" { - KDE_EXPORT void* init_libkfontviewpart() + KDE_EXPORT void* init_libtdefontviewpart() { - TDEGlobal::locale()->insertCatalogue("kfontinst"); + TDEGlobal::locale()->insertCatalogue("tdefontinst"); return new KFI::CFontViewPartFactory; } } diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index 6690cc44b..7df50ac8f 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -2,7 +2,7 @@ // // Class Names : KFI::CFontViewerApp, KFI::CFontViewerAppMainWindow // Author : Craig Drummond -// Project : K Font Installer (kfontinst-kcontrol) +// Project : K Font Installer (tdefontinst-kcontrol) // Creation Date : 30/04/2004 // Version : $Revision$ $Date$ // @@ -45,7 +45,7 @@ namespace KFI CFontViewerAppMainWindow::CFontViewerAppMainWindow() : KParts::MainWindow((TQWidget *)0L) { - KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart"); + KLibFactory *factory=KLibLoader::self()->factory("libtdefontviewpart"); if(factory) { @@ -112,7 +112,7 @@ static KCmdLineOptions options[] = KCmdLineLastOption }; -static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"), +static TDEAboutData aboutData("tdefontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"), TDEAboutData::License_GPL, I18N_NOOP("(c) Craig Drummond, 2004")); diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h index 150c8ccab..61ec7e4b1 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h @@ -5,7 +5,7 @@ // // Class Name : KFI::CFontViewerApp, KFI::CFontViewAppMainWindow // Author : Craig Drummond -// Project : K Font Installer (kfontinst-kcontrol) +// Project : K Font Installer (tdefontinst-kcontrol) // Creation Date : 30/04/2004 // Version : $Revision$ $Date$ // diff --git a/kcontrol/tdefontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am index dc6bbd115..22403916d 100644 --- a/kcontrol/tdefontinst/viewpart/Makefile.am +++ b/kcontrol/tdefontinst/viewpart/Makefile.am @@ -1,30 +1,30 @@ -noinst_LTLIBRARIES = libkfontinstprint.la -libkfontinstprint_la_SOURCES = KfiPrint.cpp -libkfontinstprint_la_LDFLAGS = $(all_libraries) -libkfontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libkfontinst.la +noinst_LTLIBRARIES = libtdefontinstprint.la +libtdefontinstprint_la_SOURCES = KfiPrint.cpp +libtdefontinstprint_la_LDFLAGS = $(all_libraries) +libtdefontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libtdefontinst.la -kde_module_LTLIBRARIES = libkfontviewpart.la +kde_module_LTLIBRARIES = libtdefontviewpart.la -libkfontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp -libkfontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libkfontviewpart_la_LIBADD = $(LIB_KPARTS) libkfontinstprint.la ../lib/libkfontinst.la +libtdefontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp +libtdefontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libtdefontviewpart_la_LIBADD = $(LIB_KPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la noinst_HEADERS = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h -kde_services_DATA = kfontviewpart.desktop +kde_services_DATA = tdefontviewpart.desktop AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) METASOURCES = AUTO -kfontview_LDADD = $(LIB_KPARTS) -kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdefontview_LDADD = $(LIB_KPARTS) +tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -bin_PROGRAMS = kfontview -xdg_apps_DATA = kfontview.desktop +bin_PROGRAMS = tdefontview +xdg_apps_DATA = tdefontview.desktop -appdata_DATA = kfontviewpart.rc kfontviewui.rc -appdatadir = $(kde_datadir)/kfontview +appdata_DATA = tdefontviewpart.rc tdefontviewui.rc +appdatadir = $(kde_datadir)/tdefontview -kfontview_SOURCES = FontViewerApp.cpp +tdefontview_SOURCES = FontViewerApp.cpp diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop index 88a964974..3e52511b5 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop @@ -20,7 +20,7 @@ Name[tg]=Намоишгари КҲарф Name[vi]=Trình xem phông chữ TDE Name[wa]=Håyneu di fontes (TDEFontView) Name[zh_CN]=字体预览 -Exec=kfontview %i %u +Exec=tdefontview %i %u Icon=fonts X-TDE-StartupNotify=true Type=Application diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop index 1e624e00b..ac1746bdd 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop @@ -80,7 +80,7 @@ Name[zh_TW]=字型檢視器 Name[zu]=Umbukisi Wohlobo lwamagama MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;fonts/package ServiceTypes=KParts/ReadOnlyPart,Browser/View -X-TDE-Library=libkfontviewpart +X-TDE-Library=libtdefontviewpart Type=Service InitialPreference=1 Icon=fonts diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc b/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc index 5df54a47c..cbd4bdfa2 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc +++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="kfontviewpart" version="1"> +<kpartgui name="tdefontviewpart" version="1"> <ToolBar name="mainToolBar"> <text>&Main Toolbar</text> <Action name="print"/> diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewui.rc b/kcontrol/tdefontinst/viewpart/tdefontviewui.rc index f2e4a86fa..ad26d192d 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontviewui.rc +++ b/kcontrol/tdefontinst/viewpart/tdefontviewui.rc @@ -1,4 +1,4 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="kfontviewui" version="1"> +<kpartgui name="tdefontviewui" version="1"> </kpartgui> diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp index 172b0f5e0..0fc8e9941 100644 --- a/kcontrol/tdeio/kcookiesmanagement.cpp +++ b/kcontrol/tdeio/kcookiesmanagement.cpp @@ -35,8 +35,8 @@ #include <kdialog.h> #include <kiconloader.h> #include <klineedit.h> -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> #include <kmessagebox.h> #include <dcopref.h> diff --git a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui index 6b7bd409f..724901ccd 100644 --- a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui @@ -318,6 +318,6 @@ <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>klistviewsearchline.h</includehint> + <includehint>tdelistviewsearchline.h</includehint> </includehints> </UI> diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp index 9241e1a04..7e9b39f65 100644 --- a/kcontrol/tdeio/kcookiespolicies.cpp +++ b/kcontrol/tdeio/kcookiespolicies.cpp @@ -35,8 +35,8 @@ #include <kiconloader.h> #include <kidna.h> #include <kmessagebox.h> -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> #include <klocale.h> #include <tdeconfig.h> #include <dcopref.h> diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui index fb315acf7..03703bf1a 100644 --- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui @@ -317,7 +317,7 @@ List of sites for which you have set a specific cookie policy. Specific policies <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistviewsearchline.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistviewsearchline.h</includehint> </includehints> </UI> diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp index dd5dcfd16..eed6d6f7c 100644 --- a/kcontrol/tdeio/kmanualproxydlg.cpp +++ b/kcontrol/tdeio/kmanualproxydlg.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <klocale.h> #include <knuminput.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klineedit.h> #include <kicontheme.h> #include <kurifilter.h> @@ -411,7 +411,7 @@ bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const KURL url (_url); TQStringList filters; - filters << "kshorturifilter" << "localdomainurifilter"; + filters << "tdeshorturifilter" << "localdomainurifilter"; // If the typed URL is malformed, and the filters cannot filter it // then it must be an invalid entry. diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp index a27f0c2df..0456aabdd 100644 --- a/kcontrol/tdeio/socks.cpp +++ b/kcontrol/tdeio/socks.cpp @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tdefiledialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <ksocks.h> #include <kapplication.h> diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp index 67f13bf8b..c325d2bce 100644 --- a/kcontrol/tdeio/useragentdlg.cpp +++ b/kcontrol/tdeio/useragentdlg.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <tdeconfig.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <ksimpleconfig.h> #include <tdeio/http_slave_defaults.h> diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui index db158b1d0..c3c364f84 100644 --- a/kcontrol/tdeio/useragentdlg_ui.ui +++ b/kcontrol/tdeio/useragentdlg_ui.ui @@ -350,6 +350,6 @@ By default, only minimal identification information is sent to remote sites. The <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h index 1a086ec6c..4015e21b3 100644 --- a/kcontrol/tdm/tdm-conv.h +++ b/kcontrol/tdm/tdm-conv.h @@ -30,10 +30,10 @@ #include <tqcheckbox.h> #include <tqspinbox.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kcombobox.h> #include <kcolorbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurl.h> #include <pwd.h> diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp index 954759df6..c0e317180 100644 --- a/kcontrol/tdm/tdm-font.cpp +++ b/kcontrol/tdm/tdm-font.cpp @@ -31,7 +31,7 @@ #include <kdialog.h> #include <ksimpleconfig.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <klocale.h> #include "tdm-font.h" diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h index c5167655c..08c66c6f8 100644 --- a/kcontrol/tdm/tdm-users.h +++ b/kcontrol/tdm/tdm-users.h @@ -30,7 +30,7 @@ #include <tqwidgetstack.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kcombobox.h> #include <kurl.h> |