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/ebrowsing/plugins/shorturi | |
| 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/ebrowsing/plugins/shorturi')
5 files changed, 18 insertions, 18 deletions
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> |