From d70ce47c224b328c429a5f2406e5e793b009541d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:31:44 -0600 Subject: Additional kde to tde renaming --- kaddressbook/CMakeLists.txt | 2 +- kaddressbook/Makefile.am | 4 ++-- kaddressbook/common/kabprefs.h | 2 +- kaddressbook/common/kaddressbook.kcfg | 2 +- kaddressbook/features/CMakeLists.txt | 4 ++-- kaddressbook/interfaces/configurewidget.h | 2 +- kaddressbook/interfaces/contacteditorwidget.h | 2 +- kaddressbook/interfaces/core.h | 2 +- kaddressbook/interfaces/extensionwidget.h | 2 +- kaddressbook/interfaces/xxport.h | 2 +- kaddressbook/kabcore.h | 2 +- kaddressbook/kaddressbookiface.h | 2 +- kaddressbook/kaddressbookview.h | 2 +- kaddressbook/kcmconfigs/CMakeLists.txt | 6 +++--- kaddressbook/kcmconfigs/kcmkabconfig.cpp | 2 +- kaddressbook/kcmconfigs/kcmkabcustomfields.cpp | 2 +- kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 2 +- kaddressbook/thumbnailcreator/Makefile.am | 2 +- kaddressbook/viewconfigurewidget.h | 2 +- kaddressbook/xxport/HACKING | 2 +- kaddressbook/xxportmanager.h | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) (limited to 'kaddressbook') diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt index ba095f2e3..e198127a0 100644 --- a/kaddressbook/CMakeLists.txt +++ b/kaddressbook/CMakeLists.txt @@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC LINK kabcommon-static kabim-static printer-static kabinterfaces-shared - kdepim-shared kabc_file-shared kdeprint-shared kutils-shared + tdepim-shared kabc_file-shared tdeprint-shared kutils-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index e091cbd11..b0c2d96cc 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \ bin_PROGRAMS = kaddressbook kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp -kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kaddressbook_LDADD = libkaddressbook.la kde_module_LTLIBRARIES = libkaddressbookpart.la @@ -48,7 +48,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la -lkabc_file $(LIB_KABC) $(LIB_KHTML) \ $(top_builddir)/kaddressbook/common/libkabcommon.la \ $(top_builddir)/kaddressbook/editors/libkabim.la \ - -lkdeprint + -ltdeprint libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libtdepim/categoryselectdialog.h \ $(top_srcdir)/libtdepim/categoryeditdialog.h \ $(top_builddir)/kaddressbook/common/kabprefs_base.h diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index bab2cb70b..35abdd04b 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -25,7 +25,7 @@ #define KABPREFS_H #include -#include +#include #include "kabprefs_base.h" class KConfig; diff --git a/kaddressbook/common/kaddressbook.kcfg b/kaddressbook/common/kaddressbook.kcfg index d0a48c251..5f8080c9c 100644 --- a/kaddressbook/common/kaddressbook.kcfg +++ b/kaddressbook/common/kaddressbook.kcfg @@ -21,7 +21,7 @@ - kdeprintfax --phone %N + tdeprintfax --phone %N diff --git a/kaddressbook/features/CMakeLists.txt b/kaddressbook/features/CMakeLists.txt index e2fcee1fe..f85bbf7e4 100644 --- a/kaddressbook/features/CMakeLists.txt +++ b/kaddressbook/features/CMakeLists.txt @@ -46,7 +46,7 @@ install( FILES tde_add_kpart( ${TARGET} AUTOMOC SOURCES ${SOURCE} - LINK kabinterfaces-shared kdepim-shared kabc-shared + LINK kabinterfaces-shared tdepim-shared kabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -55,6 +55,6 @@ tde_add_kpart( ${TARGET} AUTOMOC tde_add_kpart( libkaddrbk_resourceselection AUTOMOC SOURCES resourceselection.cpp - LINK kabinterfaces-shared kdepim-shared kabc-shared + LINK kabinterfaces-shared tdepim-shared kabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 04cea9cf7..10eb3de88 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace KABC { class AddressBook; diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 5903981dd..6f57d2002 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -28,7 +28,7 @@ #include #include -#include +#include #define KAB_CEW_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index d94e2cee9..3b5e1cf34 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include namespace KABC { class AddressBook; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 8302c5b9a..400472e34 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -28,7 +28,7 @@ #include #include -#include +#include #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 996767185..73710d82b 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define KAB_XXPORT_PLUGIN_VERSION 1 diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index f8c166a2a..47e55243f 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -33,7 +33,7 @@ #include #include "core.h" -#include +#include namespace KABC { class AddressBook; diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h index 2b70849f7..b7fa5f5c8 100644 --- a/kaddressbook/kaddressbookiface.h +++ b/kaddressbook/kaddressbookiface.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include class KDE_EXPORT KAddressBookIface : virtual public DCOPObject { diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index ed4cfc6c4..3df35eacf 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include "filter.h" #include "viewconfigurewidget.h" diff --git a/kaddressbook/kcmconfigs/CMakeLists.txt b/kaddressbook/kcmconfigs/CMakeLists.txt index c273a9e3c..82d494cd8 100644 --- a/kaddressbook/kcmconfigs/CMakeLists.txt +++ b/kaddressbook/kcmconfigs/CMakeLists.txt @@ -38,7 +38,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC SOURCES kcmkabconfig.cpp kabconfigwidget.cpp extensionconfigdialog.cpp addresseewidget.cpp - LINK kabcommon-static kdepim-shared + LINK kabcommon-static tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -48,7 +48,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC tde_add_kpart( kcm_kabldapconfig AUTOMOC SOURCES addhostdialog.cpp kcmkabldapconfig.cpp ldapoptionswidget.cpp - LINK kdepim-shared + LINK tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -57,6 +57,6 @@ tde_add_kpart( kcm_kabldapconfig AUTOMOC tde_add_kpart( kcm_kabcustomfields AUTOMOC SOURCES kcmkabcustomfields.cpp - LINK kabcommon-static kdepim-shared + LINK kabcommon-static tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 3ceca5b52..4217a0a82 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -31,7 +31,7 @@ #include "kcmkabconfig.h" -#include +#include extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index d6974a1b8..e397f01f6 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -29,7 +29,7 @@ #include -#include +#include extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index e6f25529c..e9541ea9f 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -32,7 +32,7 @@ #include "kcmkabldapconfig.h" -#include +#include extern "C" { diff --git a/kaddressbook/thumbnailcreator/Makefile.am b/kaddressbook/thumbnailcreator/Makefile.am index 2e37c0098..1140f1df4 100644 --- a/kaddressbook/thumbnailcreator/Makefile.am +++ b/kaddressbook/thumbnailcreator/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ldifvcardthumbnail.la ldifvcardthumbnail_la_SOURCES = ldifvcardcreator.cpp ldifvcardthumbnail_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -lkdefx +ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -ltdefx noinst_HEADERS = ldifvcardcreator.h diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index 63ed11167..d5f8a1d4b 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -25,7 +25,7 @@ #define VIEWCONFIGUREWIDGET_H #include -#include +#include #include #include "configurewidget.h" diff --git a/kaddressbook/xxport/HACKING b/kaddressbook/xxport/HACKING index fb02930cd..f0bbc1790 100644 --- a/kaddressbook/xxport/HACKING +++ b/kaddressbook/xxport/HACKING @@ -1,7 +1,7 @@ Coding Style ============= -Please use the coding style conventions from kdepim/kaddressbook/HACKING +Please use the coding style conventions from tdepim/kaddressbook/HACKING if you want to commit your xxport plugin into the cvs. diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 116326617..593436ed7 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -29,7 +29,7 @@ #include -#include +#include #include "xxport.h" -- cgit v1.2.1