diff options
| author | Slávek Banko <[email protected]> | 2013-09-03 20:01:54 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2013-09-03 20:58:45 +0200 |
| commit | 3e88ddfbc3df52c97d5354890fb9ac68af49bddd (patch) | |
| tree | f6830215ebdc83e794a7a223042537595490265f /kcontrol/ebrowsing | |
| parent | 5607b4ae2272da03b692475c2f773f3e27e671b8 (diff) | |
| download | tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.tar.gz tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'kcontrol/ebrowsing')
| -rw-r--r-- | kcontrol/ebrowsing/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/ebrowsing/plugins/ikws/Makefile.am | 4 | ||||
| -rw-r--r-- | kcontrol/ebrowsing/plugins/localdomain/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/ebrowsing/plugins/shorturi/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am index 87587fd4e..7f59498bd 100644 --- a/kcontrol/ebrowsing/Makefile.am +++ b/kcontrol/ebrowsing/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) +kcm_kurifilt_la_LIBADD = $(LIB_TDESYCOCA) # Don't link this lib to the plugins. They are dlopened and linking to them # results in crashes when closing tdecmshell. # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libtdeshorturifilter.la diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am index 4cdb46d42..6482d7a3e 100644 --- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am +++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am @@ -9,10 +9,10 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +libkuriikwsfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +libkurisearchfilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \ kuriikwsfilter.cpp searchprovider.cpp diff --git a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am index 362aacbf5..e9713b8ef 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am +++ b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = liblocaldomainurifilter.la liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) +liblocaldomainurifilter_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am index fccf0ef62..c9ad8e085 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am +++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = libtdeshorturifilter.la libtdeshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libtdeshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) +libtdeshorturifilter_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI) libtdeshorturifilter_la_SOURCES = tdeshorturifilter.cpp tdeshorturifilter.skel diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h index db3f1480f..1d48e7c2a 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KSHORTURIFILTER_H_ -#define _KSHORTURIFILTER_H_ +#ifndef _TDESHORTURIFILTER_H_ +#define _TDESHORTURIFILTER_H_ #include <dcopobject.h> #include <kgenericfactory.h> |