diff options
Diffstat (limited to 'kdecore')
| -rw-r--r-- | kdecore/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kdecore/Makefile.am | 36 | ||||
| -rw-r--r-- | kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc | 2 | ||||
| -rw-r--r-- | kdecore/kconfig_compiler/tests/test1.kcfgc | 2 | ||||
| -rw-r--r-- | kdecore/kconfig_compiler/tests/test9.kcfgc | 2 | ||||
| -rw-r--r-- | kdecore/kdebug.areas | 8 | ||||
| -rw-r--r-- | kdecore/ksock.h | 6 | ||||
| -rw-r--r-- | kdecore/kstandarddirs.h | 12 | ||||
| -rw-r--r-- | kdecore/malloc/README | 2 | ||||
| -rw-r--r-- | kdecore/network/Makefile.am | 4 | ||||
| -rw-r--r-- | kdecore/tests/Makefile.am | 2 |
11 files changed, 40 insertions, 40 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index efe2c8f3c..2cad31cb0 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -88,7 +88,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/knotify ) -##### libkdecore ################################ +##### libtdecore ################################ set( target kdecore ) @@ -162,7 +162,7 @@ tde_add_library( ${target} STATIC_PIC ) -##### libkdefakes ############################### +##### libtdefakes ############################### set( target kdefakes ) diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am index b5a9c5a80..32ccec1ca 100644 --- a/kdecore/Makefile.am +++ b/kdecore/Makefile.am @@ -33,8 +33,8 @@ SUBDIRS = malloc network $(SVGICONS) . kconfig_compiler tests # into $(all_libraries) isn't better AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) -lib_LTLIBRARIES = libkdefakes.la libkdecore.la -lib_LIBRARIES = libkdefakes_nonpic.a libkdefakes_pic.a +lib_LTLIBRARIES = libtdefakes.la libtdecore.la +lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a include_HEADERS = kconfig.h kconfigskeleton.h \ kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \ @@ -61,11 +61,11 @@ include_HEADERS = kconfig.h kconfigskeleton.h \ kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h kdelibs_export.h \ kdemacros.h kde_file.h ktimezones.h -libkdefakes_la_SOURCES = fakes.c vsnprintf.c -libkdefakes_la_LDFLAGS = -version-info 6:0:2 -libkdefakes_la_LIBADD = $(LIBSOCKET) +libtdefakes_la_SOURCES = fakes.c vsnprintf.c +libtdefakes_la_LDFLAGS = -version-info 6:0:2 +libtdefakes_la_LIBADD = $(LIBSOCKET) -libkdefakes_nonpic_a_SOURCES = fakes_nonpic.c vsnprintf_nonpic.c +libtdefakes_nonpic_a_SOURCES = fakes_nonpic.c vsnprintf_nonpic.c fakes_nonpic.c:$(srcdir)/fakes.c -rm -f fakes_nonpic.c @@ -75,11 +75,11 @@ vsnprintf_nonpic.c: $(srcdir)/vsnprintf.c -rm -f vsnprintf_nonpic.c $(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c -libkdefakes_pic.a: libkdefakes.la - -rm -f libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o +libtdefakes_pic.a: libtdefakes.la + -rm -f libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o cp -f .libs/fakes.o fakes_pic.o; cp -f .libs/vsnprintf.o vsnprintf_pic.o - ar cru libkdefakes_pic.a fakes_pic.o vsnprintf_pic.o - ranlib libkdefakes_pic.a + ar cru libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o + ranlib libtdefakes_pic.a noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \ kcompletion_private.h netwm_p.h \ @@ -89,7 +89,7 @@ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \ kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \ kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h -libkdecore_la_SOURCES = libintl.cpp kapplication.cpp \ +libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \ kdebug.cpp netwm.cpp kconfigbase.cpp kconfig.cpp ksimpleconfig.cpp \ kconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \ kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \ @@ -121,14 +121,14 @@ libkdecore_la_SOURCES = libintl.cpp kapplication.cpp \ kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ kqiodevicegzip_p.cpp ktimezones.cpp -libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined -libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \ - $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libkdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL) -libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck -libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ +libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined +libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \ + $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL) +libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck +libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck -libkdecore_la_METASOURCES = AUTO +libtdecore_la_METASOURCES = AUTO SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore @@ -171,7 +171,7 @@ parser: kentities.gperf bin_PROGRAMS = kde-config kgrantpty kde_config_SOURCES = kde-config.cpp -kde_config_LDADD = ./libkdecore.la +kde_config_LDADD = ./libtdecore.la kde_config_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) kgrantpty_SOURCES = kgrantpty.c diff --git a/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc b/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc index 957ed9123..829ec2e29 100644 --- a/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc +++ b/kdecore/kconfig_compiler/example/exampleprefs_base.kcfgc @@ -5,7 +5,7 @@ ClassName=ExamplePrefsBase # # Inherits=KConfigSkeleton # -# IncludeFiles=libkdepim/kpimprefs.h +# IncludeFiles=libtdepim/kpimprefs.h # # MemberVariables=public # diff --git a/kdecore/kconfig_compiler/tests/test1.kcfgc b/kdecore/kconfig_compiler/tests/test1.kcfgc index 6e0edd366..3b74d7c51 100644 --- a/kdecore/kconfig_compiler/tests/test1.kcfgc +++ b/kdecore/kconfig_compiler/tests/test1.kcfgc @@ -5,7 +5,7 @@ ClassName=Test1 # # Inherits=KConfigSkeleton # -# IncludeFiles=libkdepim/kpimprefs.h +# IncludeFiles=libtdepim/kpimprefs.h # # MemberVariables=public # diff --git a/kdecore/kconfig_compiler/tests/test9.kcfgc b/kdecore/kconfig_compiler/tests/test9.kcfgc index d44233380..8f124fc25 100644 --- a/kdecore/kconfig_compiler/tests/test9.kcfgc +++ b/kdecore/kconfig_compiler/tests/test9.kcfgc @@ -5,7 +5,7 @@ ClassName=Test9 # # Inherits=KConfigSkeleton # -# IncludeFiles=libkdepim/kpimprefs.h +# IncludeFiles=libtdepim/kpimprefs.h # MemberVariables=public # diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas index d1dc1ffa1..e4c526be1 100644 --- a/kdecore/kdebug.areas +++ b/kdecore/kdebug.areas @@ -172,7 +172,7 @@ 5230 kitchensync SyncEntry 5231 kitchensync SyncUI 5250 kitchensync (Syncing Algorithm) -5300 libkdepim +5300 libtdepim 5310 kprefs 5400 calendarsystem 5500 knotes @@ -346,9 +346,9 @@ # toys and games 10000 amor 10500 KBackgammon -11000 libkdegames -11001 libkdegames (KGame) -11002 libkdegames (Highscores) +11000 libtdegames +11001 libtdegames (KGame) +11002 libtdegames (Highscores) 11111 kpat 12000 KPoker 12001 KPoker (Server) diff --git a/kdecore/ksock.h b/kdecore/ksock.h index 67de00dc3..5c3eced8a 100644 --- a/kdecore/ksock.h +++ b/kdecore/ksock.h @@ -146,7 +146,7 @@ public: void enableWrite( bool enable ); #ifdef KSOCK_NO_BROKEN - // BCI: remove in libkdecore.so.4 + // BCI: remove in libtdecore.so.4 /** * Return address. * This function is dumb. Don't ever use it @@ -156,7 +156,7 @@ public: */ unsigned long ipv4_addr() KDE_DEPRECATED; - // BCI: remove in libkdecore.so.4 + // BCI: remove in libtdecore.so.4 /** * A small wrapper around gethostbyname() and such. * Don't use this in new programs. Use KExtendedSocket::lookup @@ -300,7 +300,7 @@ public: unsigned short int port(); #ifdef KSOCK_NO_BROKEN - // BCI: remove in libkdecore.so.4 + // BCI: remove in libtdecore.so.4 /** * The address. * This is dumb. Don't use it diff --git a/kdecore/kstandarddirs.h b/kdecore/kstandarddirs.h index 16bfd1847..3f1fd14c1 100644 --- a/kdecore/kstandarddirs.h +++ b/kdecore/kstandarddirs.h @@ -210,11 +210,11 @@ public: * @li All absolute paths (most recent first). * * The filename should be a filename relative to the base dir - * for resources. So is a way to get the path to libkdecore.la - * to findResource("lib", "libkdecore.la"). KStandardDirs will + * for resources. So is a way to get the path to libtdecore.la + * to findResource("lib", "libtdecore.la"). KStandardDirs will * then look into the subdir lib of all elements of all prefixes - * ($KDEDIRS) for a file libkdecore.la and return the path to - * the first one it finds (e.g. /opt/kde/lib/libkdecore.la) + * ($KDEDIRS) for a file libtdecore.la and return the path to + * the first one it finds (e.g. /opt/kde/lib/libtdecore.la) * * @param type The type of the wanted resource * @param filename A relative filename of the resource. @@ -286,8 +286,8 @@ public: * that have been installed into the same directory without * having to look for each file. * - * findResourceDir("lib", "libkdecore.la") would return the - * path of the subdir libkdecore.la is found first in + * findResourceDir("lib", "libtdecore.la") would return the + * path of the subdir libtdecore.la is found first in * (e.g. /opt/kde/lib/) * * @param type The type of the wanted resource diff --git a/kdecore/malloc/README b/kdecore/malloc/README index 181c29764..6a24a39db 100644 --- a/kdecore/malloc/README +++ b/kdecore/malloc/README @@ -19,7 +19,7 @@ the system libc malloc is used, otherwise this malloc is used. If you have any problem with this malloc, try first using --enable-fast-malloc=debug and -recompiling libkdecore, or use valgrind. This malloc seems to be more vulnerable to heap +recompiling libtdecore, or use valgrind. This malloc seems to be more vulnerable to heap corruption, such as deleting a block twice, so faulty code may run without problems with standard malloc shipped with your libc, but it will crash with this malloc. In case you think there's any problem with this malloc, please mail me. diff --git a/kdecore/network/Makefile.am b/kdecore/network/Makefile.am index 71ed013d9..f686a50ca 100644 --- a/kdecore/network/Makefile.am +++ b/kdecore/network/Makefile.am @@ -2,7 +2,7 @@ # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables -noinst_LTLIBRARIES = libkdecorenetwork.la +noinst_LTLIBRARIES = libtdecorenetwork.la # set the include path for X, qt and KDE INCLUDES = $(all_includes) @@ -11,7 +11,7 @@ INCLUDES = $(all_includes) # convenience lib - no LDFLAGS or LIBADD ! # Note: # ksocketdevice.cpp must appear before any inclusion of ksocketdevice.h -libkdecorenetwork_la_SOURCES = kresolver.cpp \ +libtdecorenetwork_la_SOURCES = kresolver.cpp \ kresolvermanager.cpp \ kresolverworkerbase.cpp \ ksocketaddress.cpp \ diff --git a/kdecore/tests/Makefile.am b/kdecore/tests/Makefile.am index 3d05e1ac2..71e6faa92 100644 --- a/kdecore/tests/Makefile.am +++ b/kdecore/tests/Makefile.am @@ -37,7 +37,7 @@ noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \ METASOURCES = AUTO -LDADD = ../libkdecore.la +LDADD = ../libtdecore.la kconfigtestgui_SOURCES = kconfigtestgui.cpp kdebugtest_SOURCES = kdebugtest.cpp klocaletest_SOURCES = klocaletest.cpp |