diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/ebrowsing/plugins/ikws | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/ebrowsing/plugins/ikws')
6 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt index b5c470483..9fffe268e 100644 --- a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt +++ b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt @@ -34,7 +34,7 @@ tde_add_kpart( libkuriikwsfilter AUTOMOC SOURCES kuriikwsfiltereng.cpp kuriikwsfilter.skel kuriikwsfilter.cpp searchprovider.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -46,6 +46,6 @@ tde_add_kpart( libkurisearchfilter AUTOMOC kurisearchfilter.cpp kurisearchfilter.skel kuriikwsfiltereng.cpp ikwsopts.cpp searchproviderdlg.cpp searchprovider.cpp searchproviderdlg_ui.ui ikwsopts_ui.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} )
\ No newline at end of file diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am index bb00b6e90..4cdb46d42 100644 --- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am +++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am @@ -22,7 +22,7 @@ libkurisearchfilter_la_SOURCES = kurisearchfilter.cpp kurisearchfilter.skel \ searchproviderdlg_ui.ui ikwsopts_ui.ui update_DATA = kuriikwsfilter.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update service_DATA = kuriikwsfilter.desktop kurisearchfilter.desktop servicedir = $(kde_servicesdir) diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 3073250f7..474394108 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -32,7 +32,7 @@ #include <dcopref.h> #include <kapplication.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <klistview.h> #include <klocale.h> diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index 4631524e0..e0acab4e4 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -32,7 +32,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest + * tdelibs/tdeio/tests/kurifiltertest */ typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory; diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index c57d3e080..63c61eaf4 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -31,7 +31,7 @@ #include <kurl.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kstandarddirs.h> #include <kprotocolinfo.h> @@ -46,7 +46,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest + * tdelibs/tdeio/tests/kurifiltertest */ KURISearchFilterEngine *KURISearchFilterEngine::s_pSelf = 0; diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index a8c8dbda9..c42a6be0c 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -32,7 +32,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest + * tdelibs/tdeio/tests/kurifiltertest */ typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory; |