summaryrefslogtreecommitdiffstats
path: root/kstyles
diff options
context:
space:
mode:
Diffstat (limited to 'kstyles')
-rw-r--r--kstyles/asteroid/CMakeLists.txt8
-rw-r--r--kstyles/asteroid/Makefile.am2
-rw-r--r--kstyles/highcolor/CMakeLists.txt8
-rw-r--r--kstyles/highcolor/Makefile.am4
-rw-r--r--kstyles/highcontrast/CMakeLists.txt8
-rw-r--r--kstyles/highcontrast/Makefile.am2
-rw-r--r--kstyles/highcontrast/config/CMakeLists.txt8
-rw-r--r--kstyles/keramik/CMakeLists.txt10
-rw-r--r--kstyles/keramik/Makefile.am8
-rw-r--r--kstyles/kthemestyle/CMakeLists.txt8
-rw-r--r--kstyles/kthemestyle/Makefile.am4
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp2
-rw-r--r--kstyles/light/CMakeLists.txt8
-rw-r--r--kstyles/light/Makefile.am4
-rw-r--r--kstyles/plastik/CMakeLists.txt8
-rw-r--r--kstyles/plastik/Makefile.am2
-rw-r--r--kstyles/plastik/config/CMakeLists.txt8
-rw-r--r--kstyles/utils/installtheme/CMakeLists.txt6
-rw-r--r--kstyles/utils/installtheme/Makefile.am2
19 files changed, 55 insertions, 55 deletions
diff --git a/kstyles/asteroid/CMakeLists.txt b/kstyles/asteroid/CMakeLists.txt
index 264a16085..d198efdef 100644
--- a/kstyles/asteroid/CMakeLists.txt
+++ b/kstyles/asteroid/CMakeLists.txt
@@ -16,9 +16,9 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -41,6 +41,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdefx-shared
+ LINK tdefx-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/kstyles/asteroid/Makefile.am b/kstyles/asteroid/Makefile.am
index 3011909e3..2b8735e08 100644
--- a/kstyles/asteroid/Makefile.am
+++ b/kstyles/asteroid/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS = asteroid.h
kde_style_LTLIBRARIES = asteroid.la
asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-asteroid_la_LIBADD = -lkdefx -lkutils
+asteroid_la_LIBADD = -ltdefx -lkutils
asteroid_la_SOURCES = asteroid.cpp
themercdir = $(kde_datadir)/kstyle/themes
diff --git a/kstyles/highcolor/CMakeLists.txt b/kstyles/highcolor/CMakeLists.txt
index fb923ce51..8b601d6ac 100644
--- a/kstyles/highcolor/CMakeLists.txt
+++ b/kstyles/highcolor/CMakeLists.txt
@@ -16,9 +16,9 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdefx-shared
+ LINK tdefx-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/kstyles/highcolor/Makefile.am b/kstyles/highcolor/Makefile.am
index 635a37353..5b2880215 100644
--- a/kstyles/highcolor/Makefile.am
+++ b/kstyles/highcolor/Makefile.am
@@ -20,10 +20,10 @@
AM_CPPFLAGS = -DQT_PLUGIN
-INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
noinst_HEADERS = highcolor.h bitmaps.h
kde_style_LTLIBRARIES = highcolor.la
highcolor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcolor_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT)
+highcolor_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT)
highcolor_la_SOURCES = highcolor.cpp
highcolor_la_METASOURCES = AUTO
diff --git a/kstyles/highcontrast/CMakeLists.txt b/kstyles/highcontrast/CMakeLists.txt
index d3dc224bb..ec948a719 100644
--- a/kstyles/highcontrast/CMakeLists.txt
+++ b/kstyles/highcontrast/CMakeLists.txt
@@ -19,9 +19,9 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -44,6 +44,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdefx-shared
+ LINK tdefx-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/kstyles/highcontrast/Makefile.am b/kstyles/highcontrast/Makefile.am
index 9a6f38cd7..dade3965a 100644
--- a/kstyles/highcontrast/Makefile.am
+++ b/kstyles/highcontrast/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = highcontrast.h
kde_style_LTLIBRARIES = highcontrast.la
highcontrast_la_SOURCES = highcontrast.cpp
highcontrast_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-highcontrast_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT)
+highcontrast_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT)
highcontrast_la_METASOURCES = AUTO
DISTCLEANFILES = $(highcontrast_la_METASOURCES)
diff --git a/kstyles/highcontrast/config/CMakeLists.txt b/kstyles/highcontrast/config/CMakeLists.txt
index cd575ff3e..07b378372 100644
--- a/kstyles/highcontrast/config/CMakeLists.txt
+++ b/kstyles/highcontrast/config/CMakeLists.txt
@@ -12,9 +12,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
)
link_directories(
@@ -32,6 +32,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kstyles/keramik/CMakeLists.txt b/kstyles/keramik/CMakeLists.txt
index 5862a8653..8ee7c9730 100644
--- a/kstyles/keramik/CMakeLists.txt
+++ b/kstyles/keramik/CMakeLists.txt
@@ -19,9 +19,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -39,7 +39,7 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK kdefx-shared
+ LINK tdefx-shared
)
@@ -65,6 +65,6 @@ set_source_files_properties( pixmaploader.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdefx-shared Xext
+ LINK tdefx-shared Xext
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am
index 5931485be..87e68132b 100644
--- a/kstyles/keramik/Makefile.am
+++ b/kstyles/keramik/Makefile.am
@@ -1,12 +1,12 @@
AM_CPPFLAGS = -DQT_PLUGIN
-INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
# qembed's output needs that...
KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h
kde_style_LTLIBRARIES = keramik.la
keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-keramik_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT) $(LIB_XEXT)
+keramik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT) $(LIB_XEXT)
keramik_la_SOURCES = keramik.cpp pixmaploader.cpp gradients.cpp colorutil.cpp
keramik_la_COMPILE_FIRST = keramikrc.h
keramik_la_METASOURCES = AUTO
@@ -14,8 +14,8 @@ keramik_la_METASOURCES = AUTO
noinst_PROGRAMS = genembed
genembed_SOURCES = genembed.cpp
-genembed_LDADD = ../../kdefx/libtdefx.la
-genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+genembed_LDADD = ../../tdefx/libtdefx.la
+genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\
diff --git a/kstyles/kthemestyle/CMakeLists.txt b/kstyles/kthemestyle/CMakeLists.txt
index 45bdb0b68..ee6995f2d 100644
--- a/kstyles/kthemestyle/CMakeLists.txt
+++ b/kstyles/kthemestyle/CMakeLists.txt
@@ -16,9 +16,9 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdefx-shared kdecore-shared dl
+ LINK tdefx-shared tdecore-shared dl
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/kstyles/kthemestyle/Makefile.am b/kstyles/kthemestyle/Makefile.am
index b2c3be33f..407ac1b2a 100644
--- a/kstyles/kthemestyle/Makefile.am
+++ b/kstyles/kthemestyle/Makefile.am
@@ -20,10 +20,10 @@
AM_CPPFLAGS = -DQT_PLUGIN
-INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h
kde_style_LTLIBRARIES = kthemestyle.la
kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kthemestyle_la_LIBADD = ../../kdefx/libtdefx.la ../../kdecore/libtdecore.la -ldl $(LIB_QT)
+kthemestyle_la_LIBADD = ../../tdefx/libtdefx.la ../../tdecore/libtdecore.la -ldl $(LIB_QT)
kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
kthemestyle_la_METASOURCES = AUTO
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index ffd2ffda8..d986b0147 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -115,7 +115,7 @@ public:
{
#ifdef __GLIBC__
dlopen("kthemestyle.so",RTLD_LAZY);
- //####### Keep reference count up so kdecore w. fast-malloc doesn't get unloaded
+ //####### Keep reference count up so tdecore w. fast-malloc doesn't get unloaded
//####### (Fixes exit crashes with qt-only apps that occur on Linux)
//####### This should be rethought after 3.0,
//####### as it relies on the implementation-specific behavior
diff --git a/kstyles/light/CMakeLists.txt b/kstyles/light/CMakeLists.txt
index 7a0ee6610..af512b94f 100644
--- a/kstyles/light/CMakeLists.txt
+++ b/kstyles/light/CMakeLists.txt
@@ -16,9 +16,9 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdefx-shared
+ LINK tdefx-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/kstyles/light/Makefile.am b/kstyles/light/Makefile.am
index 8e2ebf301..8233d22df 100644
--- a/kstyles/light/Makefile.am
+++ b/kstyles/light/Makefile.am
@@ -20,10 +20,10 @@
AM_CPPFLAGS = -DQT_PLUGIN
-INCLUDES = -I$(top_srcdir)/kdefx $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
noinst_HEADERS = lightstyle-v2.h lightstyle-v3.h
kde_style_LTLIBRARIES = light.la
light_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-light_la_LIBADD = $(LIB_QT) ../../kdefx/libtdefx.la
+light_la_LIBADD = $(LIB_QT) ../../tdefx/libtdefx.la
light_la_SOURCES = light.cpp lightstyle-v2.cpp lightstyle-v3.cpp
light_la_METASOURCES = AUTO
diff --git a/kstyles/plastik/CMakeLists.txt b/kstyles/plastik/CMakeLists.txt
index a57af7c1f..9459f3615 100644
--- a/kstyles/plastik/CMakeLists.txt
+++ b/kstyles/plastik/CMakeLists.txt
@@ -18,9 +18,9 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -43,6 +43,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdefx-shared
+ LINK tdefx-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/kstyles/plastik/Makefile.am b/kstyles/plastik/Makefile.am
index 477e7f68c..70d6377e2 100644
--- a/kstyles/plastik/Makefile.am
+++ b/kstyles/plastik/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = plastik.h misc.h
kde_style_LTLIBRARIES = plastik.la
plastik_la_SOURCES = plastik.cpp misc.cpp
plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-plastik_la_LIBADD = ../../kdefx/libtdefx.la $(LIB_QT)
+plastik_la_LIBADD = ../../tdefx/libtdefx.la $(LIB_QT)
plastik_la_METASOURCES = AUTO
DISTCLEANFILES = $(plastik_la_METASOURCES)
diff --git a/kstyles/plastik/config/CMakeLists.txt b/kstyles/plastik/config/CMakeLists.txt
index 13eb35234..b8534cea7 100644
--- a/kstyles/plastik/config/CMakeLists.txt
+++ b/kstyles/plastik/config/CMakeLists.txt
@@ -12,9 +12,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
)
link_directories(
@@ -32,6 +32,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kstyles/utils/installtheme/CMakeLists.txt b/kstyles/utils/installtheme/CMakeLists.txt
index 8becda904..da9b81b9a 100644
--- a/kstyles/utils/installtheme/CMakeLists.txt
+++ b/kstyles/utils/installtheme/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -29,6 +29,6 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am
index 52073666f..f2f88dbbc 100644
--- a/kstyles/utils/installtheme/Makefile.am
+++ b/kstyles/utils/installtheme/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = kinstalltheme
kinstalltheme_SOURCES = main.cpp
# the library search path.
-kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.