From 5fbaba69567fec6978b2587fc1cd4fe66a9e6f80 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 16 Feb 2013 17:55:55 -0600 Subject: [PATCH] Rename additional kabc files --- tdeabc/plugins/dir/CMakeLists.txt | 10 ++++---- tdeabc/plugins/dir/Makefile.am | 20 ++++++++-------- tdeabc/plugins/dir/dir.desktop | 2 +- tdeabc/plugins/dir/resourcedir.cpp | 2 +- tdeabc/plugins/dir/resourcedirplugin.cpp | 2 +- tdeabc/plugins/evolution/Makefile.am | 8 +++---- tdeabc/plugins/evolution/evolution.desktop | 2 +- tdeabc/plugins/evolution/resourceevo.cpp | 2 +- tdeabc/plugins/file/CMakeLists.txt | 10 ++++---- tdeabc/plugins/file/Makefile.am | 24 +++++++++---------- tdeabc/plugins/file/file.desktop | 2 +- tdeabc/plugins/file/resourcefileplugin.cpp | 2 +- tdeabc/plugins/ldaptdeio/CMakeLists.txt | 10 ++++---- tdeabc/plugins/ldaptdeio/Makefile.am | 20 ++++++++-------- tdeabc/plugins/ldaptdeio/ldaptdeio.desktop | 2 +- .../ldaptdeio/resourceldaptdeioplugin.cpp | 4 ++-- tdeabc/plugins/net/CMakeLists.txt | 10 ++++---- tdeabc/plugins/net/Makefile.am | 20 ++++++++-------- tdeabc/plugins/net/net.desktop | 2 +- tdeabc/plugins/net/resourcenetplugin.cpp | 2 +- tdeabc/plugins/sql/Makefile.am | 8 +++---- tdeabc/plugins/sql/resourcesql.cpp | 2 +- tdeabc/plugins/sql/sql.desktop | 2 +- tdeabc/tests/Makefile.am | 8 +++---- 24 files changed, 88 insertions(+), 88 deletions(-) diff --git a/tdeabc/plugins/dir/CMakeLists.txt b/tdeabc/plugins/dir/CMakeLists.txt index 2d648622c..322c659d4 100644 --- a/tdeabc/plugins/dir/CMakeLists.txt +++ b/tdeabc/plugins/dir/CMakeLists.txt @@ -42,9 +42,9 @@ install( FILES install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_dir (library) ######################## +##### tdeabc_dir (library) ######################## -set( target kabc_dir ) +set( target tdeabc_dir ) set( ${target}_SRCS resourcedir.cpp resourcedirconfig.cpp @@ -58,9 +58,9 @@ tde_add_library( ${target} SHARED AUTOMOC ) -##### kabc_dir (module) ######################### +##### tdeabc_dir (module) ######################### -set( target kabc_dir ) +set( target tdeabc_dir ) set( ${target}_SRCS resourcedirplugin.cpp @@ -68,6 +68,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kabc_dir-shared + LINK tdeabc_dir-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am index 4daeaa972..39e8a7af4 100644 --- a/tdeabc/plugins/dir/Makefile.am +++ b/tdeabc/plugins/dir/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_builddir) $(a # these are the headers for your project noinst_HEADERS = resourcedirconfig.h -lib_LTLIBRARIES = libkabc_dir.la -libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp -libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI) -libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h - -kde_module_LTLIBRARIES = kabc_dir.la -kabc_dir_la_SOURCES = resourcedirplugin.cpp -kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_TDECORE) +lib_LTLIBRARIES = libtdeabc_dir.la +libtdeabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp +libtdeabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI) +libtdeabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + +kde_module_LTLIBRARIES = tdeabc_dir.la +tdeabc_dir_la_SOURCES = resourcedirplugin.cpp +tdeabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined +tdeabc_dir_la_LIBADD = libtdeabc_dir.la $(LIB_QT) $(LIB_TDECORE) METASOURCES = AUTO diff --git a/tdeabc/plugins/dir/dir.desktop b/tdeabc/plugins/dir/dir.desktop index a841040f9..292815637 100644 --- a/tdeabc/plugins/dir/dir.desktop +++ b/tdeabc/plugins/dir/dir.desktop @@ -85,7 +85,7 @@ Name[zh_CN]=目录 Name[zh_HK]=目錄 Name[zh_TW]=目錄 Name[zu]=Uhlu lwamafayela -X-TDE-Library=kabc_dir +X-TDE-Library=tdeabc_dir Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp index 53f178a6d..4d0ff54ef 100644 --- a/tdeabc/plugins/dir/resourcedir.cpp +++ b/tdeabc/plugins/dir/resourcedir.cpp @@ -49,7 +49,7 @@ using namespace KABC; extern "C" { - void *init_kabc_dir() + void *init_tdeabc_dir() { return new KRES::PluginFactory(); } diff --git a/tdeabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp index a2bd6d138..d789a93f4 100644 --- a/tdeabc/plugins/dir/resourcedirplugin.cpp +++ b/tdeabc/plugins/dir/resourcedirplugin.cpp @@ -25,7 +25,7 @@ using namespace KABC; extern "C" { - KDE_EXPORT void *init_kabc_dir() + KDE_EXPORT void *init_tdeabc_dir() { return new KRES::PluginFactory(); } diff --git a/tdeabc/plugins/evolution/Makefile.am b/tdeabc/plugins/evolution/Makefile.am index de62b2f17..67a5a64b8 100644 --- a/tdeabc/plugins/evolution/Makefile.am +++ b/tdeabc/plugins/evolution/Makefile.am @@ -3,12 +3,12 @@ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourceevo.h dbwrapper.h -kde_module_LTLIBRARIES = kabc_evo.la +kde_module_LTLIBRARIES = tdeabc_evo.la -kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp +tdeabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp -kabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_evo_la_LIBADD = ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la +tdeabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabc_evo_la_LIBADD = ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la METASOURCES = AUTO diff --git a/tdeabc/plugins/evolution/evolution.desktop b/tdeabc/plugins/evolution/evolution.desktop index 98030e906..6893abdad 100644 --- a/tdeabc/plugins/evolution/evolution.desktop +++ b/tdeabc/plugins/evolution/evolution.desktop @@ -19,7 +19,7 @@ Name[ven]=Tsikoni Name[wa]=Evolucion Name[xh]=Utshintsho lwendawo ngokwenqanawa Name[zu]=Evolushini -X-TDE-Library=kabc_evo +X-TDE-Library=tdeabc_evo Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tdeabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp index e6545f738..75de2ea82 100644 --- a/tdeabc/plugins/evolution/resourceevo.cpp +++ b/tdeabc/plugins/evolution/resourceevo.cpp @@ -30,7 +30,7 @@ class EvolutionFactory : public KRES::PluginFactoryBase extern "C" { - KDE_EXPORT void *init_kabc_evo() + KDE_EXPORT void *init_tdeabc_evo() { return ( new EvolutionFactory() ); } diff --git a/tdeabc/plugins/file/CMakeLists.txt b/tdeabc/plugins/file/CMakeLists.txt index f5d5e2cdc..c7dbfef46 100644 --- a/tdeabc/plugins/file/CMakeLists.txt +++ b/tdeabc/plugins/file/CMakeLists.txt @@ -42,9 +42,9 @@ install( FILES install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_file (library) ####################### +##### tdeabc_file (library) ####################### -set( target kabc_file ) +set( target tdeabc_file ) set( ${target}_SRCS resourcefile.cpp resourcefileconfig.cpp @@ -58,9 +58,9 @@ tde_add_library( ${target} SHARED AUTOMOC ) -##### kabc_file (module) ######################## +##### tdeabc_file (module) ######################## -set( target kabc_file ) +set( target tdeabc_file ) set( ${target}_SRCS resourcefileplugin.cpp @@ -68,6 +68,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kabc_file-shared + LINK tdeabc_file-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am index bf85d8bd6..2df682794 100644 --- a/tdeabc/plugins/file/Makefile.am +++ b/tdeabc/plugins/file/Makefile.am @@ -3,18 +3,18 @@ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourcefileconfig.h -lib_LTLIBRARIES = libkabc_file.la -libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp -libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) -libkabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h - - -kde_module_LTLIBRARIES = kabc_file.la -kabc_file_la_SOURCES = resourcefileplugin.cpp -kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE) -kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h +lib_LTLIBRARIES = libtdeabc_file.la +libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp +libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI) +libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + + +kde_module_LTLIBRARIES = tdeabc_file.la +tdeabc_file_la_SOURCES = resourcefileplugin.cpp +tdeabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined +tdeabc_file_la_LIBADD = libtdeabc_file.la $(LIB_QT) $(LIB_TDECORE) +tdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h METASOURCES = AUTO diff --git a/tdeabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop index 1359dd1c6..4c7991989 100644 --- a/tdeabc/plugins/file/file.desktop +++ b/tdeabc/plugins/file/file.desktop @@ -75,7 +75,7 @@ Name[wa]=Fitchî Name[zh_CN]=文件 Name[zh_HK]=檔案 Name[zh_TW]=檔案 -X-TDE-Library=kabc_file +X-TDE-Library=tdeabc_file Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp index 4dce19bc0..7c5b3359d 100644 --- a/tdeabc/plugins/file/resourcefileplugin.cpp +++ b/tdeabc/plugins/file/resourcefileplugin.cpp @@ -25,7 +25,7 @@ using namespace KABC; extern "C" { - KDE_EXPORT void *init_kabc_file() + KDE_EXPORT void *init_tdeabc_file() { return new KRES::PluginFactory(); } diff --git a/tdeabc/plugins/ldaptdeio/CMakeLists.txt b/tdeabc/plugins/ldaptdeio/CMakeLists.txt index 58e54de0d..6e85a73d5 100644 --- a/tdeabc/plugins/ldaptdeio/CMakeLists.txt +++ b/tdeabc/plugins/ldaptdeio/CMakeLists.txt @@ -42,9 +42,9 @@ install( FILES install( FILES ldaptdeio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_ldaptdeio ############################## +##### tdeabc_ldaptdeio ############################## -set( target kabc_ldaptdeio ) +set( target tdeabc_ldaptdeio ) set( ${target}_SRCS resourceldaptdeio.cpp resourceldaptdeioconfig.cpp @@ -58,9 +58,9 @@ tde_add_library( ${target} SHARED AUTOMOC ) -##### kabc_ldaptdeio ############################## +##### tdeabc_ldaptdeio ############################## -set( target kabc_ldaptdeio ) +set( target tdeabc_ldaptdeio ) set( ${target}_SRCS resourceldaptdeioplugin.cpp @@ -68,6 +68,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kabc_ldaptdeio-shared + LINK tdeabc_ldaptdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am index 9b2fc49a1..f1e8c57d1 100644 --- a/tdeabc/plugins/ldaptdeio/Makefile.am +++ b/tdeabc/plugins/ldaptdeio/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourceldaptdeioconfig.h -lib_LTLIBRARIES = libkabc_ldaptdeio.la -libkabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp -libkabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_ldaptdeio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE) -libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h - -kde_module_LTLIBRARIES = kabc_ldaptdeio.la -kabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp -kabc_ldaptdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_ldaptdeio_la_LIBADD = libkabc_ldaptdeio.la $(LIB_QT) $(LIB_TDECORE) +lib_LTLIBRARIES = libtdeabc_ldaptdeio.la +libtdeabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp +libtdeabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_ldaptdeio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE) +libtdeabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + +kde_module_LTLIBRARIES = tdeabc_ldaptdeio.la +tdeabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp +tdeabc_ldaptdeio_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabc_ldaptdeio_la_LIBADD = libtdeabc_ldaptdeio.la $(LIB_QT) $(LIB_TDECORE) METASOURCES = AUTO diff --git a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop index 9bcd13337..683a38d13 100644 --- a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop +++ b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop @@ -3,7 +3,7 @@ Name=LDAP Name[bn]=এল-ডি-এ-পি (LDAP) Name[hi]=एलडीएपी (LDAP) Name[te]=ఎల్డిఏపి -X-TDE-Library=kabc_ldaptdeio +X-TDE-Library=tdeabc_ldaptdeio Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp index 6d173eb51..2c4a7d4e0 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp @@ -28,9 +28,9 @@ using namespace KABC; extern "C" { - KDE_EXPORT void *init_kabc_ldaptdeio() + KDE_EXPORT void *init_tdeabc_ldaptdeio() { - TDEGlobal::locale()->insertCatalogue("kabc_ldaptdeio"); + TDEGlobal::locale()->insertCatalogue("tdeabc_ldaptdeio"); return new KRES::PluginFactory(); } } diff --git a/tdeabc/plugins/net/CMakeLists.txt b/tdeabc/plugins/net/CMakeLists.txt index d7bcb02e1..71a5c49df 100644 --- a/tdeabc/plugins/net/CMakeLists.txt +++ b/tdeabc/plugins/net/CMakeLists.txt @@ -42,9 +42,9 @@ install( FILES install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_net (library) ######################## +##### tdeabc_net (library) ######################## -set( target kabc_net ) +set( target tdeabc_net ) set( ${target}_SRCS resourcenet.cpp resourcenetconfig.cpp @@ -58,9 +58,9 @@ tde_add_library( ${target} SHARED AUTOMOC ) -##### kabc_net (module) ######################### +##### tdeabc_net (module) ######################### -set( target kabc_net ) +set( target tdeabc_net ) set( ${target}_SRCS resourcenetplugin.cpp @@ -68,6 +68,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kabc_net-shared + LINK tdeabc_net-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am index ea921ccbd..8fd53f34f 100644 --- a/tdeabc/plugins/net/Makefile.am +++ b/tdeabc/plugins/net/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourcenetconfig.h -lib_LTLIBRARIES = libkabc_net.la -libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp -libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_net_la_LIBADD = $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO) -libkabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h - -kde_module_LTLIBRARIES = kabc_net.la -kabc_net_la_SOURCES = resourcenetplugin.cpp -kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore -kabc_net_la_LIBADD = libkabc_net.la +lib_LTLIBRARIES = libtdeabc_net.la +libtdeabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp +libtdeabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_net_la_LIBADD = $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO) +libtdeabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h + +kde_module_LTLIBRARIES = tdeabc_net.la +tdeabc_net_la_SOURCES = resourcenetplugin.cpp +tdeabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore +tdeabc_net_la_LIBADD = libtdeabc_net.la METASOURCES = AUTO diff --git a/tdeabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop index 2c72c202d..adc7394b5 100644 --- a/tdeabc/plugins/net/net.desktop +++ b/tdeabc/plugins/net/net.desktop @@ -83,7 +83,7 @@ Name[zh_CN]=网络 Name[zh_HK]=網絡 Name[zh_TW]=網路 Name[zu]=Umsebenzi wokuxhumana okusakazekile -X-TDE-Library=kabc_net +X-TDE-Library=tdeabc_net Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp index 189bab051..51fa507cc 100644 --- a/tdeabc/plugins/net/resourcenetplugin.cpp +++ b/tdeabc/plugins/net/resourcenetplugin.cpp @@ -25,7 +25,7 @@ using namespace KABC; extern "C" { - KDE_EXPORT void *init_kabc_net() + KDE_EXPORT void *init_tdeabc_net() { return new KRES::PluginFactory(); } diff --git a/tdeabc/plugins/sql/Makefile.am b/tdeabc/plugins/sql/Makefile.am index a504950cc..43dd193f6 100644 --- a/tdeabc/plugins/sql/Makefile.am +++ b/tdeabc/plugins/sql/Makefile.am @@ -3,12 +3,12 @@ INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes) # these are the headers for your project noinst_HEADERS = resourcesql.h resourcesqlconfig.h -kde_module_LTLIBRARIES = kabc_sql.la +kde_module_LTLIBRARIES = tdeabc_sql.la -kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp +tdeabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp -kabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la +tdeabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la METASOURCES = AUTO diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp index e3744eeec..bab9b5c06 100644 --- a/tdeabc/plugins/sql/resourcesql.cpp +++ b/tdeabc/plugins/sql/resourcesql.cpp @@ -33,7 +33,7 @@ using namespace KABC; extern "C" { - KDE_EXPORT void *init_kabc_sql() + KDE_EXPORT void *init_tdeabc_sql() { return new KRES::PluginFactory(); } diff --git a/tdeabc/plugins/sql/sql.desktop b/tdeabc/plugins/sql/sql.desktop index 4ac553008..6881ebebe 100644 --- a/tdeabc/plugins/sql/sql.desktop +++ b/tdeabc/plugins/sql/sql.desktop @@ -7,4 +7,4 @@ Name[te]=ఏస్క్యుఎల్ [Plugin] Type=sql -X-TDE-Library=kabc_sql +X-TDE-Library=tdeabc_sql diff --git a/tdeabc/tests/Makefile.am b/tdeabc/tests/Makefile.am index e3ce8fbd9..aca0597ad 100644 --- a/tdeabc/tests/Makefile.am +++ b/tdeabc/tests/Makefile.am @@ -18,8 +18,8 @@ testldapclient_SOURCES = testldapclient.cpp EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \ testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit -testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -testkabc_SOURCES = testkabc.cpp +testtdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testtdeabc_SOURCES = testkabc.cpp testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testaddressee_SOURCES = testaddressee.cpp @@ -40,11 +40,11 @@ testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(L testaddresslineedit_SOURCES = testaddresslineedit.cpp bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -bigread_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la +bigread_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la bigread_SOURCES = bigread.cpp bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -bigwrite_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la +bigwrite_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la bigwrite_SOURCES = bigwrite.cpp testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor