diff options
Diffstat (limited to 'tdecore')
37 files changed, 154 insertions, 154 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 2adc73c52..8d4939d83 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -85,9 +85,9 @@ install( FILES kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h - kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h ksycoca.h - ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h - klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc + kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h + tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h + klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h kmanagerselection.h kmountpoint.h kuser.h klockfile.h @@ -138,9 +138,9 @@ set( ${target}_SRCS kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp - fakes.c vsnprintf.c ksycoca.cpp ksycocadict.cpp ksycoca.skel - ksycocafactory.cpp kxmessages.cpp kstartupinfo.cpp - kcatalogue.cpp kasyncio.cpp kmultipledrag.cpp kstaticdeleter.cpp + fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel + tdesycocafactory.cpp kxmessages.cpp kstartupinfo.cpp + kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading index bcfb13c95..a9e57afbd 100644 --- a/tdecore/DESIGN.iconloading +++ b/tdecore/DESIGN.iconloading @@ -58,7 +58,7 @@ can copy this pixmap: // p contains now 30x30 pixels of test.png. The only hard part is then to publish the icons in a way that applications -know what to copy. I'm thinking about a ksycoca-sort-of index that +know what to copy. I'm thinking about a tdesycoca-sort-of index that applications can map and can use to do fast lookups with. This has no major problems except for the race-condition that might exist when an icon is removed. In that case you will remove it from the index first and then later @@ -79,7 +79,7 @@ sure that the index will no longer be used. I think the best way to distribute the index information is through the file system but the update mechanism for this file should probably more complex -than the one used in ksycoca. Since ksycoca updates only happen once in a +than the one used in tdesycoca. Since tdesycoca updates only happen once in a while, we can afford it to write out a whole new file. For icons this will probably be more difficult since updates will be part of normal operation, if the index file is rather large (no idea about that.. how much icons are in @@ -182,6 +182,6 @@ KDE 2.2: We deliver. <pmax> oh I see <Zogje> to answer you rfirst question: "won't the ipc be a bottleneck?" no, because you don't use ipc in the critical part (the icon loading) <pmax> yup I understand how it works now I think -<Zogje> instead you access an index from disk which is quite fast (as fast as ksycoca) +<Zogje> instead you access an index from disk which is quite fast (as fast as tdesycoca) <pmax> I think this will definitely speed things up on my machine since I have a relatively fast box with slow disks <Zogje> that's why I want to use the file-system instaed of X-properties diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS index 07a996b24..995ab753a 100644 --- a/tdecore/MAINTAINERS +++ b/tdecore/MAINTAINERS @@ -44,7 +44,7 @@ klibloader.cpp klocale.cpp Hans Petter Bieker <[email protected]> kmdcodec.cpp kmimesourcefactory.cpp -kmultipledrag.cpp David Faure <[email protected]> +tdemultipledrag.cpp David Faure <[email protected]> knotifyclient.cpp kpalette.cpp Waldo Bastian <[email protected]> kpixmapprovider.cpp Carsten Pfeiffer <[email protected]> @@ -64,9 +64,9 @@ kstartupinfo.cpp Lubos Lunak <[email protected]> kstaticdeleter.cpp Stephan Kulow <[email protected]> kstdaccel.cpp Ellis Whitehead <[email protected]> kstringhandler.cpp -ksycoca.cpp Waldo Bastian <[email protected]> -ksycocadict.cpp Waldo Bastian <[email protected]> -ksycocafactory.cpp Waldo Bastian <[email protected]> +tdesycoca.cpp Waldo Bastian <[email protected]> +tdesycocadict.cpp Waldo Bastian <[email protected]> +tdesycocafactory.cpp Waldo Bastian <[email protected]> ktempfile.cpp Waldo Bastian <[email protected]> kuniqueapplication.cpp Waldo Bastian <[email protected]> kurl.cpp Waldo Bastian <[email protected]> diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index f8856108c..75037eccf 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -53,8 +53,8 @@ include_HEADERS = kconfig.h kconfigskeleton.h \ netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \ kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \ kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \ - ksycoca.h ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h \ - klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc \ + tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h \ + klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \ ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \ kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \ kmanagerselection.h kmountpoint.h kuser.h klockfile.h \ @@ -84,7 +84,7 @@ libtdefakes_pic.a: libtdefakes.la noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \ kcompletion_private.h netwm_p.h \ kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \ - kregpriv.h kshortcutmenu.h ksycocadict.h ksycocafactory.h netsupp.h \ + kregpriv.h kshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \ kcheckaccelerators.h kcalendarsystemgregorian.h \ kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \ kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h @@ -108,9 +108,9 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \ ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \ kpixmapprovider.cpp kurldrag.cpp \ kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \ - ksycoca.cpp ksycocadict.cpp ksycocafactory.cpp ksycoca.skel \ + tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \ kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \ - kmultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \ + tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \ kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \ tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \ kcalendarsystem.cpp kcalendarsystemgregorian.cpp \ @@ -188,7 +188,7 @@ install-exec-hook: DISTCLEANFILES = tde-config.cpp -DOXYGEN_REFERENCES = dcop tdeui kparts kio +DOXYGEN_REFERENCES = dcop tdeui tdeparts kio DOXYGEN_EXCLUDE = malloc kde_file.h DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index 635c61f95..657a6a72b 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -492,11 +492,11 @@ of these actions then the application will not appear in the TDE menu and will n be used by KDE for opening files. IMPORTANT NOTE: -Changing restrictions may influence the data that is cached in the ksycoca +Changing restrictions may influence the data that is cached in the tdesycoca database. Since changes to .../share/config/kdeglobals do not trigger an -automatic ksycoca update you need to force an update manually. -To force an update of the ksycoca database touch the file -.../share/services/update_ksycoca. This will force a user's sycoca database +automatic tdesycoca update you need to force an update manually. +To force an update of the tdesycoca database touch the file +.../share/services/update_tdesycoca. This will force a user's sycoca database to be rebuild the next time the user logs in. KDE3 URL Restrictions diff --git a/tdecore/kaccelmanager.cpp b/tdecore/kaccelmanager.cpp index d4387e652..6c2233c81 100644 --- a/tdecore/kaccelmanager.cpp +++ b/tdecore/kaccelmanager.cpp @@ -47,7 +47,7 @@ #include "kaccelmanager_private.h" #include "../tdeui/kstdaction_p.h" -#include "../kutils/kmultitabbar.h" +#include "../tdeutils/tdemultitabbar.h" /********************************************************************* diff --git a/tdecore/kconfig_compiler/Makefile.am b/tdecore/kconfig_compiler/Makefile.am index 5a3b0f2e8..d4f287381 100644 --- a/tdecore/kconfig_compiler/Makefile.am +++ b/tdecore/kconfig_compiler/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes) bin_PROGRAMS = kconfig_compiler -kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kconfig_compiler_LDADD = $(LIB_TDECORE) kconfig_compiler_SOURCES = kconfig_compiler.cpp diff --git a/tdecore/kconfig_compiler/example/Makefile.am b/tdecore/kconfig_compiler/example/Makefile.am index f7834ba63..4e7a59fec 100644 --- a/tdecore/kconfig_compiler/example/Makefile.am +++ b/tdecore/kconfig_compiler/example/Makefile.am @@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes) check_PROGRAMS = example # autoexample EXTRA_PROGRAMS = autoexample -example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor example_LDADD = $(LIB_TDECORE) example_SOURCES = example.cpp exampleprefs_base.cpp -autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI) autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \ autoexample.cpp diff --git a/tdecore/kconfig_compiler/tests/Makefile.am b/tdecore/kconfig_compiler/tests/Makefile.am index 9462c800b..953d1c6b4 100644 --- a/tdecore/kconfig_compiler/tests/Makefile.am +++ b/tdecore/kconfig_compiler/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\" +AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\" check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer @@ -14,52 +14,52 @@ CLEANFILES = test1.cpp test1.h \ test_dpointer.cpp test_dpointer.h \ md5sums -test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test1_LDADD = $(LIB_TDECORE) test1_SOURCES = test1main.cpp test1.cpp -test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test2_LDADD = $(LIB_TDECORE) test2_SOURCES = test2main.cpp test2.cpp -test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test3_LDADD = $(LIB_TDECORE) test3_SOURCES = test3main.cpp test3.cpp -test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test4_LDADD = $(LIB_TDECORE) test4_SOURCES = test4main.cpp test4.cpp -test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test5_LDADD = $(LIB_TDECORE) test5_SOURCES = test5main.cpp test5.cpp -test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test6_LDADD = $(LIB_TDECORE) test6_SOURCES = test6main.cpp test6.cpp -test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test7_LDADD = $(LIB_TDECORE) test7_SOURCES = test7main.cpp test7.cpp -test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test8_LDADD = $(LIB_TDECORE) test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp -test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test9_LDADD = $(LIB_TDECORE) test9_SOURCES = test9main.cpp test9.cpp -test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test_dpointer_LDADD = $(LIB_TDECORE) test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp -check_LTLIBRARIES = kunittest_kconfigcompiler_test.la +check_LTLIBRARIES = tdeunittest_kconfigcompiler_test.la -kunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp -kunittest_kconfigcompiler_test_la_LIBADD = \ - $(top_builddir)/kunittest/libkunittest.la -kunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \ +tdeunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp +tdeunittest_kconfigcompiler_test_la_LIBADD = \ + $(top_builddir)/tdeunittest/libtdeunittest.la +tdeunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \ $(all_libraries) diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp index 143838908..c9f2f8471 100644 --- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp +++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp @@ -16,12 +16,12 @@ #include <tqfile.h> #include <tqstring.h> #include <kdebug.h> -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include "kconfigcompiler_test.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "TDEConfigXT") +KUNITTEST_MODULE( tdeunittest_kconfigcompiler_test, "TDEConfigXT") KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test ) typedef const char * CompilerTestSet[]; diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h index 1eba78b97..df3f4cf37 100644 --- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h +++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h @@ -16,7 +16,7 @@ #ifndef KCONFIGCOMPILER_TEST_H #define KCONFIGCOMPILER_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class TQString; diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index 92e62aaee..f2da61c43 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -47,27 +47,27 @@ 399 kimgio 400 artskde 500 tdeprint -700 kutils (KSettings::Dialog) -701 kutils (KSettings::Dispatcher) -702 kutils (KPluginSelector) -703 kutils (KPluginInfo) -704 kutils (KSettings::ComponentsDialog) -710 kutils (KCMultiDialog) -711 kutils (TDECModuleProxy) -712 kutils (TDECModuleInfo) -713 kutils (TDECModuleContainer) -750 kspell (tdelibs) -760 kmdi +700 tdeutils (KSettings::Dialog) +701 tdeutils (KSettings::Dispatcher) +702 tdeutils (KPluginSelector) +703 tdeutils (KPluginInfo) +704 tdeutils (KSettings::ComponentsDialog) +710 tdeutils (KCMultiDialog) +711 tdeutils (TDECModuleProxy) +712 tdeutils (TDECModuleInfo) +713 tdeutils (TDECModuleContainer) +750 tdespell (tdelibs) +760 tdemdi 780 kcmshell (tdelibs) -790 kimproxy (tdelibs) +790 tdeimproxy (tdelibs) 800 kabapi (tdelibs) 900 tdesu (tdelibs) 912 ksmartcard (tdelibs) -1000 kparts -1001 kparts (mainwindow) -1002 kparts (factory) +1000 tdeparts +1001 tdeparts (mainwindow) +1002 tdeparts (factory) # tdebase 1201 konqtree @@ -116,7 +116,7 @@ 2003 ksim 2100 kgpg 2200 kdf -2300 kwallet +2300 tdewallet # 2500-2999 Reserved for private use @@ -182,7 +182,7 @@ 5600 kontact (core) 5601 kontact (interfaces) 5602 kontact (plugins) -5650 kresources +5650 tderesources 5700 kabc 5710 kabc/vcard 5720 kaddressbook @@ -197,28 +197,28 @@ 5960 kandy 5970 karm -# libkhtml -6000 khtml -6005 khtml (encoding) -6010 khtml (dom) -6020 khtml (xml) -6030 khtml (html) -6031 khtml (frames & objects) -6035 khtml (parser) -6036 khtml (tokenizer) -6040 khtml (render) -6041 khtml (bidi) -6045 khtml (rendering tree) -6050 khtml (part) -6060 khtml (cache) -6061 khtml (cache-expiredates) -6070 khtml (jscript) -6080 khtml (css) -6090 khtml (memory) +# libtdehtml +6000 tdehtml +6005 tdehtml (encoding) +6010 tdehtml (dom) +6020 tdehtml (xml) +6030 tdehtml (html) +6031 tdehtml (frames & objects) +6035 tdehtml (parser) +6036 tdehtml (tokenizer) +6040 tdehtml (render) +6041 tdehtml (bidi) +6045 tdehtml (rendering tree) +6050 tdehtml (part) +6060 tdehtml (cache) +6061 tdehtml (cache-expiredates) +6070 tdehtml (jscript) +6080 tdehtml (css) +6090 tdehtml (memory) 6100 kjas -6200 khtml (caret) -6201 khtml (caret table) -6210 khtml (editor) +6200 tdehtml (caret) +6201 tdehtml (caret table) +6210 tdehtml (editor) # libkio 7000 kio @@ -556,7 +556,7 @@ 66666 noatun 67000 kscd 67100 kmix -67200 kmid +67200 tdemid # tdebindings 70001 dcoppython diff --git a/tdecore/kentities.c b/tdecore/kentities.c index 8181e5a6c..141ed9db0 100644 --- a/tdecore/kentities.c +++ b/tdecore/kentities.c @@ -53,7 +53,7 @@ kentities.gperf: input file to generate a hash table for entities kentities.c: DO NOT EDIT! generated by the command - "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c" + "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c" from kentities.gperf $Id$ diff --git a/tdecore/kentities.gperf b/tdecore/kentities.gperf index 08f712707..5d848b837 100644 --- a/tdecore/kentities.gperf +++ b/tdecore/kentities.gperf @@ -22,7 +22,7 @@ kentities.gperf: input file to generate a hash table for entities kentities.c: DO NOT EDIT! generated by the command - "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c" + "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c" from kentities.gperf $Id$ diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 1c6232068..de16f0128 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -150,7 +150,7 @@ void KProtocolInfo::load( TQDataStream& _str) { // You may add new fields at the end. Make sure to update the version - // number in ksycoca.h + // number in tdesycoca.h TQ_INT32 i_inputType, i_outputType; TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, i_supportsListing, i_supportsReading, @@ -205,7 +205,7 @@ KProtocolInfo::save( TQDataStream& _str) KSycocaEntry::save( _str ); // You may add new fields at the end. Make sure to update the version - // number in ksycoca.h + // number in tdesycoca.h TQ_INT32 i_inputType, i_outputType; TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, i_supportsListing, i_supportsReading, diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp index e47cbb881..c651024ef 100644 --- a/tdecore/kprotocolinfofactory.cpp +++ b/tdecore/kprotocolinfofactory.cpp @@ -21,8 +21,8 @@ #include <kglobal.h> #include <kapplication.h> #include <kdebug.h> -#include <ksycoca.h> -#include <ksycocadict.h> +#include <tdesycoca.h> +#include <tdesycocadict.h> #include "kprotocolinfofactory.h" diff --git a/tdecore/kprotocolinfofactory.h b/tdecore/kprotocolinfofactory.h index 6a10ac1e3..04883bde0 100644 --- a/tdecore/kprotocolinfofactory.h +++ b/tdecore/kprotocolinfofactory.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <kurl.h> -#include <ksycocafactory.h> +#include <tdesycocafactory.h> class KProtocolInfoPrivate; diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h index 40cfa3617..f20963d63 100644 --- a/tdecore/kstringhandler.h +++ b/tdecore/kstringhandler.h @@ -350,8 +350,8 @@ public: * * Example: * \code - * perlSplit(' ', "kparts reaches the parts other parts can't", 3) - * TQStringList contains: "kparts", "reaches", "the parts other parts can't" + * perlSplit(' ', "tdeparts reaches the parts other parts can't", 3) + * TQStringList contains: "tdeparts", "reaches", "the parts other parts can't" * \endcode * * @param sep is the character to use to delimit s. diff --git a/tdecore/network/CMakeLists.txt b/tdecore/network/CMakeLists.txt index addc3633b..5c213a752 100644 --- a/tdecore/network/CMakeLists.txt +++ b/tdecore/network/CMakeLists.txt @@ -24,7 +24,7 @@ install( FILES kresolver.h kreverseresolver.h tdesocketaddress.h tdesocketbase.h tdesocketdevice.h kclientsocketbase.h kstreamsocket.h kserversocket.h kdatagramsocket.h - kmulticastsocketdevice.h kmulticastsocket.h + tdemulticastsocketdevice.h tdemulticastsocket.h knetworkinterface.h khttpproxysocketdevice.h ksockssocketdevice.h kbufferedsocket.h kiobuffer.h DESTINATION ${INCLUDE_INSTALL_DIR} ) diff --git a/tdecore/network/Makefile.am b/tdecore/network/Makefile.am index 768180d1b..793b6d96d 100644 --- a/tdecore/network/Makefile.am +++ b/tdecore/network/Makefile.am @@ -38,8 +38,8 @@ include_HEADERS = kresolver.h \ kstreamsocket.h \ kserversocket.h \ kdatagramsocket.h \ - kmulticastsocketdevice.h \ - kmulticastsocket.h \ + tdemulticastsocketdevice.h \ + tdemulticastsocket.h \ knetworkinterface.h \ khttpproxysocketdevice.h \ ksockssocketdevice.h \ diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/tdemulticastsocket.h index 8fe413283..15d3a28ea 100644 --- a/tdecore/network/kmulticastsocket.h +++ b/tdecore/network/tdemulticastsocket.h @@ -26,13 +26,13 @@ #define KMULTICASTSOCKET_H #include "kdatagramsocket.h" -#include "kmulticastsocketdevice.h" +#include "tdemulticastsocketdevice.h" namespace KNetwork { class KMulticastSocketPrivate; /** - * @class KMulticastSocket kmulticastsocket.h kmulticastsocket.h + * @class KMulticastSocket tdemulticastsocket.h tdemulticastsocket.h * @brief A multicast-capable datagram socket class * * This class derives from @ref KDatagramSocket adding methods to it to diff --git a/tdecore/network/kmulticastsocketdevice.h b/tdecore/network/tdemulticastsocketdevice.h index a24ba326a..bddb048a8 100644 --- a/tdecore/network/kmulticastsocketdevice.h +++ b/tdecore/network/tdemulticastsocketdevice.h @@ -34,7 +34,7 @@ namespace KNetwork { class KMulticastSocketImplPrivate; /** - * @class KMulticastSocketImpl kmulticastsocketdevice.h kmulticastsocketdevice.h + * @class KMulticastSocketImpl tdemulticastsocketdevice.h tdemulticastsocketdevice.h * @brief The low-level backend for multicasting sockets. * * This class is an interface providing methods for handling multicast diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index bd5ee6ec6..d012c64aa 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -4458,7 +4458,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD } // FIXME - // Much of the code in libkrandr should be integrated into/interfaced with this library + // Much of the code in libtderandr should be integrated into/interfaced with this library } if (device->type() == TDEGenericDeviceType::RootSystem) { @@ -5587,7 +5587,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE ret = DesktopIcon("kcmpci", size); } else if (query == TDEGenericDeviceType::Backlight) { - ret = DesktopIcon("kscreensaver", size); // FIXME + ret = DesktopIcon("tdescreensaver", size); // FIXME } else if (query == TDEGenericDeviceType::Battery) { ret = DesktopIcon("energy", size); diff --git a/tdecore/kmultipledrag.cpp b/tdecore/tdemultipledrag.cpp index 29d56bd85..db71c9e87 100644 --- a/tdecore/kmultipledrag.cpp +++ b/tdecore/tdemultipledrag.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include "kmultipledrag.h" +#include "tdemultipledrag.h" #include "kdebug.h" #ifndef QT_NO_DRAGANDDROP @@ -77,6 +77,6 @@ const char* KMultipleDrag::format( int i ) const void KMultipleDrag::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -#include "kmultipledrag.moc" +#include "tdemultipledrag.moc" #endif diff --git a/tdecore/kmultipledrag.h b/tdecore/tdemultipledrag.h index 42baf3530..42baf3530 100644 --- a/tdecore/kmultipledrag.h +++ b/tdecore/tdemultipledrag.h diff --git a/tdecore/ksycoca.cpp b/tdecore/tdesycoca.cpp index 0a2cd2511..f433510d6 100644 --- a/tdecore/ksycoca.cpp +++ b/tdecore/tdesycoca.cpp @@ -18,9 +18,9 @@ #include "config.h" -#include "ksycoca.h" -#include "ksycocatype.h" -#include "ksycocafactory.h" +#include "tdesycoca.h" +#include "tdesycocatype.h" +#include "tdesycocafactory.h" #include <tqdatastream.h> #include <tqfile.h> @@ -87,7 +87,7 @@ int KSycoca::version() // Read-only constructor KSycoca::KSycoca() - : DCOPObject("ksycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false), + : DCOPObject("tdesycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false), m_sycoca_size(0), m_sycoca_mmap(0), m_timeStamp(0) { d = new KSycocaPrivate; @@ -112,21 +112,21 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) m_str = 0; m_barray = 0; TQString path; - TQCString ksycoca_env = getenv("TDESYCOCA"); - if (ksycoca_env.isEmpty()) - path = TDEGlobal::dirs()->saveLocation("cache") + "ksycoca"; + TQCString tdesycoca_env = getenv("TDESYCOCA"); + if (tdesycoca_env.isEmpty()) + path = TDEGlobal::dirs()->saveLocation("cache") + "tdesycoca"; else - path = TQFile::decodeName(ksycoca_env); + path = TQFile::decodeName(tdesycoca_env); - kdDebug(7011) << "Trying to open ksycoca from " << path << endl; + kdDebug(7011) << "Trying to open tdesycoca from " << path << endl; TQFile *database = new TQFile(path); bool bOpen = database->open( IO_ReadOnly ); if (!bOpen) { - path = locate("services", "ksycoca"); + path = locate("services", "tdesycoca"); if (!path.isEmpty()) { - kdDebug(7011) << "Trying to open global ksycoca from " << path << endl; + kdDebug(7011) << "Trying to open global tdesycoca from " << path << endl; delete database; database = new TQFile(path); bOpen = database->open( IO_ReadOnly ); @@ -166,7 +166,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) } else { - kdDebug(7011) << "Could not open ksycoca" << endl; + kdDebug(7011) << "Could not open tdesycoca" << endl; // No database file delete database; @@ -197,7 +197,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) // Read-write constructor - only for KBuildSycoca KSycoca::KSycoca( bool /* dummy */ ) - : DCOPObject("ksycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false), + : DCOPObject("tdesycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false), m_sycoca_size(0), m_sycoca_mmap(0) { d = new KSycocaPrivate; @@ -206,14 +206,14 @@ KSycoca::KSycoca( bool /* dummy */ ) _self = this; } -static void delete_ksycoca_self() { +static void delete_tdesycoca_self() { delete KSycoca::_self; } KSycoca * KSycoca::self() { if (!_self) { - tqAddPostRoutine(delete_ksycoca_self); + tqAddPostRoutine(delete_tdesycoca_self); _self = new KSycoca(); } return _self; @@ -525,4 +525,4 @@ void KSycoca::virtual_hook( int id, void* data ) void KSycocaEntry::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -#include "ksycoca.moc" +#include "tdesycoca.moc" diff --git a/tdecore/ksycoca.h b/tdecore/tdesycoca.h index adf9d2aa7..1b3355de3 100644 --- a/tdecore/ksycoca.h +++ b/tdecore/tdesycoca.h @@ -16,13 +16,13 @@ * Boston, MA 02110-1301, USA. **/ -#ifndef __ksycoca_h__ -#define __ksycoca_h__ +#ifndef __tdesycoca_h__ +#define __tdesycoca_h__ #include <dcopobject.h> #include <tqobject.h> #include <tqstringlist.h> -#include "ksycocatype.h" +#include "tdesycocatype.h" #include <tdelibs_export.h> class TQDataStream; @@ -99,7 +99,7 @@ public: * @internal - returns update signature of database * * Signature that keeps track of changes to - * $TDEDIR/share/services/update_ksycoca + * $TDEDIR/share/services/update_tdesycoca * * Touching this file causes the database to be recreated * from scratch. diff --git a/tdecore/ksycocadict.cpp b/tdecore/tdesycocadict.cpp index d8dcf3a24..702c163a7 100644 --- a/tdecore/ksycocadict.cpp +++ b/tdecore/tdesycocadict.cpp @@ -16,9 +16,9 @@ * Boston, MA 02110-1301, USA. **/ -#include "ksycocadict.h" -#include "ksycocaentry.h" -#include "ksycoca.h" +#include "tdesycocadict.h" +#include "tdesycocaentry.h" +#include "tdesycoca.h" #include <tqptrlist.h> #include <tqvaluelist.h> diff --git a/tdecore/ksycocadict.h b/tdecore/tdesycocadict.h index 79f1432e8..006e72a61 100644 --- a/tdecore/ksycocadict.h +++ b/tdecore/tdesycocadict.h @@ -16,8 +16,8 @@ * Boston, MA 02110-1301, USA. **/ -#ifndef __ksycocadict_h__ -#define __ksycocadict_h__ +#ifndef __tdesycocadict_h__ +#define __tdesycocadict_h__ #include <tqstring.h> #include <tqvaluelist.h> diff --git a/tdecore/ksycocaentry.h b/tdecore/tdesycocaentry.h index a3071ec5a..a4e2512e0 100644 --- a/tdecore/ksycocaentry.h +++ b/tdecore/tdesycocaentry.h @@ -16,10 +16,10 @@ * Boston, MA 02110-1301, USA. **/ -#ifndef __ksycocaentry_h__ -#define __ksycocaentry_h__ +#ifndef __tdesycocaentry_h__ +#define __tdesycocaentry_h__ -#include "ksycocatype.h" +#include "tdesycocatype.h" #include <tqstringlist.h> #include <ksharedptr.h> @@ -32,7 +32,7 @@ class TQDataStream; * the common functionality for servicetypes and services. * * @internal - * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/ksycoca.html + * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdesycoca.html */ class TDECORE_EXPORT KSycocaEntry : public KShared { diff --git a/tdecore/ksycocafactory.cpp b/tdecore/tdesycocafactory.cpp index c224ebe79..d7d350ddf 100644 --- a/tdecore/ksycocafactory.cpp +++ b/tdecore/tdesycocafactory.cpp @@ -16,11 +16,11 @@ * Boston, MA 02110-1301, USA. **/ -#include "ksycoca.h" -#include "ksycocatype.h" -#include "ksycocafactory.h" -#include "ksycocaentry.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocatype.h" +#include "tdesycocafactory.h" +#include "tdesycocaentry.h" +#include "tdesycocadict.h" #include <tqstringlist.h> #include <tqdict.h> #include <kdebug.h> diff --git a/tdecore/ksycocafactory.h b/tdecore/tdesycocafactory.h index 100047834..4569fff5a 100644 --- a/tdecore/ksycocafactory.h +++ b/tdecore/tdesycocafactory.h @@ -16,11 +16,11 @@ * Boston, MA 02110-1301, USA. **/ -#ifndef __ksycocafactory_h__ -#define __ksycocafactory_h__ +#ifndef __tdesycocafactory_h__ +#define __tdesycocafactory_h__ -#include "ksycocatype.h" -#include "ksycocaentry.h" +#include "tdesycocatype.h" +#include "tdesycocaentry.h" #include <tqdict.h> #include <tqptrlist.h> diff --git a/tdecore/ksycocatype.h b/tdecore/tdesycocatype.h index 889c3be6d..8407782fc 100644 --- a/tdecore/ksycocatype.h +++ b/tdecore/tdesycocatype.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __ksycocatype_h__ -#define __ksycocatype_h__ +#ifndef __tdesycocatype_h__ +#define __tdesycocatype_h__ /** * \relates KSycocaEntry diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am index e35ae68a4..9d2c5259c 100644 --- a/tdecore/tests/Makefile.am +++ b/tdecore/tests/Makefile.am @@ -79,8 +79,8 @@ kstdacceltest_SOURCES = kstdacceltest.cpp kglobaltest_SOURCES = kglobaltest.cpp ktimezonestest_SOURCES = ktimezonestest.cpp -check_LTLIBRARIES = kunittest_kconfig.la +check_LTLIBRARIES = tdeunittest_kconfig.la -kunittest_kconfig_la_SOURCES = kconfigtest.cpp -kunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST) -kunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) +tdeunittest_kconfig_la_SOURCES = kconfigtest.cpp +tdeunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST) +tdeunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp index 543efd706..79137cd5f 100644 --- a/tdecore/tests/dcopkonqtest.cpp +++ b/tdecore/tests/dcopkonqtest.cpp @@ -27,8 +27,8 @@ debug("sending configure to object KonquerorIface in konqueror"); debug("ko"); /// BROADCAST -debug("sending databaseChanged to object ksycoca in all apps"); - if (kapp->dcopClient()->send( "*", "ksycoca", "databaseChanged()", data )) +debug("sending databaseChanged to object tdesycoca in all apps"); + if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data )) debug("ok"); else debug("ko"); diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp index 53bb0f9f3..bae6a9c2e 100644 --- a/tdecore/tests/kapptest.cpp +++ b/tdecore/tests/kapptest.cpp @@ -23,7 +23,7 @@ #include <kcmdlineargs.h> #include <kaboutdata.h> #include <kglobalsettings.h> -#include <ksycoca.h> +#include <tdesycoca.h> int main(int argc, char *argv[]) diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/kconfigtest.cpp index e4768119c..d3421a3d8 100644 --- a/tdecore/tests/kconfigtest.cpp +++ b/tdecore/tests/kconfigtest.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include <kunittest/tester.h> -#include <kunittest/module.h> +#include <tdeunittest/tester.h> +#include <tdeunittest/module.h> #include <kconfig.h> @@ -31,7 +31,7 @@ private: void revertEntries(); }; -KUNITTEST_MODULE( kunittest_kconfig, "TDEConfigTest" ) +KUNITTEST_MODULE( tdeunittest_kconfig, "TDEConfigTest" ) KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest ) // test data |