summaryrefslogtreecommitdiffstats
path: root/tdefx
diff options
context:
space:
mode:
Diffstat (limited to 'tdefx')
-rw-r--r--tdefx/CMakeLists.txt4
-rw-r--r--tdefx/Makefile.am4
-rw-r--r--tdefx/tdestylen.cpp (renamed from tdefx/kstyle.cpp)4
-rw-r--r--tdefx/tdestylen.h (renamed from tdefx/kstyle.h)0
4 files changed, 6 insertions, 6 deletions
diff --git a/tdefx/CMakeLists.txt b/tdefx/CMakeLists.txt
index 1aa52627f..60d81fe38 100644
--- a/tdefx/CMakeLists.txt
+++ b/tdefx/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
install( FILES
kpixmap.h kpixmapsplitter.h kpixmapeffect.h
- kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+ kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
@@ -37,7 +37,7 @@ set( target tdefx )
set( ${target}_SRCS
kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp
- kimageeffect.cpp kdrawutil.cpp kstyle.cpp kcpuinfo.cpp
+ kimageeffect.cpp kdrawutil.cpp tdestyle.cpp kcpuinfo.cpp
)
tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdefx/Makefile.am b/tdefx/Makefile.am
index 2b588ba54..7fb97e400 100644
--- a/tdefx/Makefile.am
+++ b/tdefx/Makefile.am
@@ -30,10 +30,10 @@ libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/
$(top_srcdir)/tdecore/standard_weak.nmcheck
include_HEADERS = kpixmap.h kpixmapsplitter.h \
- kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+ kpixmapeffect.h kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
libtdefx_la_SOURCES = kpixmap.cpp kpixmapsplitter.cpp \
- kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp kstyle.cpp \
+ kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp tdestyle.cpp \
kcpuinfo.cpp
METASOURCES = AUTO
diff --git a/tdefx/kstyle.cpp b/tdefx/tdestylen.cpp
index 29663faf3..0c6a7f1fe 100644
--- a/tdefx/kstyle.cpp
+++ b/tdefx/tdestylen.cpp
@@ -27,7 +27,7 @@
#include "config.h"
#endif
-#include "kstyle.h"
+#include "tdestyle.h"
#include <tqapplication.h>
#include <tqbitmap.h>
@@ -2415,4 +2415,4 @@ void kde_kstyle_set_scrollbar_type_windows( void* style )
// vim: set noet ts=4 sw=4:
// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
-#include "kstyle.moc"
+#include "tdestyle.moc"
diff --git a/tdefx/kstyle.h b/tdefx/tdestylen.h
index 9c3867bb3..9c3867bb3 100644
--- a/tdefx/kstyle.h
+++ b/tdefx/tdestylen.h