summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/common.pro2
-rw-r--r--win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro (renamed from win/pro_files/kstyles/activeheart/widget-engine/genembed.pro)0
-rw-r--r--win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro (renamed from win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro)0
-rw-r--r--win/pro_files/tdestyles/common.pro (renamed from win/pro_files/kstyles/common.pro)4
-rw-r--r--win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro (renamed from win/pro_files/kstyles/dotNET/dotnet/dotnet.pro)0
-rw-r--r--win/pro_files/tdestyles/highcolor/highcolor.pro (renamed from win/pro_files/kstyles/highcolor/highcolor.pro)0
-rw-r--r--win/pro_files/tdestyles/keramik/genembed.pro (renamed from win/pro_files/kstyles/keramik/genembed.pro)0
-rw-r--r--win/pro_files/tdestyles/keramik/keramik.pro (renamed from win/pro_files/kstyles/keramik/keramik.pro)0
-rw-r--r--win/pro_files/tdestyles/klegacy/klegacy.pro (renamed from win/pro_files/kstyles/klegacy/klegacy.pro)0
-rw-r--r--win/pro_files/tdestyles/kthemestyle/themestyle.pro (renamed from win/pro_files/kstyles/kthemestyle/themestyle.pro)2
-rw-r--r--win/pro_files/tdestyles/light/light.pro (renamed from win/pro_files/kstyles/light/light.pro)0
-rw-r--r--win/pro_files/tdestyles/plastik/plastik.pro (renamed from win/pro_files/kstyles/plastik/plastik.pro)0
-rw-r--r--win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro (renamed from win/pro_files/kstyles/slickerstyle/slicker/slicker.pro)0
-rw-r--r--win/pro_files/tdestyles/tdestyles.pro (renamed from win/pro_files/kstyles/kstyles.pro)0
-rw-r--r--win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro (renamed from win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro)0
-rw-r--r--win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro (renamed from win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro)4
-rw-r--r--win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro (renamed from win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro)0
-rw-r--r--win/tdelibs_export_win.h6
-rw-r--r--win/tools/build_tdelibs_dbg4
-rw-r--r--win/tools/build_tdelibs_rel2
20 files changed, 12 insertions, 12 deletions
diff --git a/win/common.pro b/win/common.pro
index 52478b898..f5c2f1af7 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -109,7 +109,7 @@ contains( TEMPLATE, lib ) {
!contains( CONFIG, trinitylib ) {
DESTDIR = $$KDELIBDESTDIR
}
- contains( CONFIG, kstyle ) {
+ contains( CONFIG, tdestyle ) {
DESTDIR = $$KDEBINDESTDIR/lib/trinity/plugins/styles
CONFIG += plugin
}
diff --git a/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro b/win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro
index 21ab07a78..21ab07a78 100644
--- a/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro
+++ b/win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro
diff --git a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro b/win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro
index 9245377cc..9245377cc 100644
--- a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
+++ b/win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro
diff --git a/win/pro_files/kstyles/common.pro b/win/pro_files/tdestyles/common.pro
index 6cc40111c..2f03e7d98 100644
--- a/win/pro_files/kstyles/common.pro
+++ b/win/pro_files/tdestyles/common.pro
@@ -1,12 +1,12 @@
TEMPLATE = lib
-CONFIG += kstyle
+CONFIG += tdestyle
include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB
+DEFINES += MAKE_TDESTYLE_LIB
LIBS += $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX
diff --git a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro b/win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro
index d9ca9d8c3..d9ca9d8c3 100644
--- a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
+++ b/win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro
diff --git a/win/pro_files/kstyles/highcolor/highcolor.pro b/win/pro_files/tdestyles/highcolor/highcolor.pro
index 57bfca812..57bfca812 100644
--- a/win/pro_files/kstyles/highcolor/highcolor.pro
+++ b/win/pro_files/tdestyles/highcolor/highcolor.pro
diff --git a/win/pro_files/kstyles/keramik/genembed.pro b/win/pro_files/tdestyles/keramik/genembed.pro
index 21ab07a78..21ab07a78 100644
--- a/win/pro_files/kstyles/keramik/genembed.pro
+++ b/win/pro_files/tdestyles/keramik/genembed.pro
diff --git a/win/pro_files/kstyles/keramik/keramik.pro b/win/pro_files/tdestyles/keramik/keramik.pro
index 42094301c..42094301c 100644
--- a/win/pro_files/kstyles/keramik/keramik.pro
+++ b/win/pro_files/tdestyles/keramik/keramik.pro
diff --git a/win/pro_files/kstyles/klegacy/klegacy.pro b/win/pro_files/tdestyles/klegacy/klegacy.pro
index 1f280202c..1f280202c 100644
--- a/win/pro_files/kstyles/klegacy/klegacy.pro
+++ b/win/pro_files/tdestyles/klegacy/klegacy.pro
diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/tdestyles/kthemestyle/themestyle.pro
index fa55f19e3..55d61d97e 100644
--- a/win/pro_files/kstyles/kthemestyle/themestyle.pro
+++ b/win/pro_files/tdestyles/kthemestyle/themestyle.pro
@@ -7,7 +7,7 @@ TARGET = kthemestyle$$KDEBUG
SOURCES = \
kthemestyle.cpp \
kthemebase.cpp \
-kstyledirs.cpp
+tdestyledirs.cpp
system( moc kthemestyle.h -o moc/kthemestyle.moc )
system( moc kthemebase.h -o moc/kthemebase.moc )
diff --git a/win/pro_files/kstyles/light/light.pro b/win/pro_files/tdestyles/light/light.pro
index 025158c3a..025158c3a 100644
--- a/win/pro_files/kstyles/light/light.pro
+++ b/win/pro_files/tdestyles/light/light.pro
diff --git a/win/pro_files/kstyles/plastik/plastik.pro b/win/pro_files/tdestyles/plastik/plastik.pro
index 51937369c..51937369c 100644
--- a/win/pro_files/kstyles/plastik/plastik.pro
+++ b/win/pro_files/tdestyles/plastik/plastik.pro
diff --git a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro b/win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro
index 0f7bab178..0f7bab178 100644
--- a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
+++ b/win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro
diff --git a/win/pro_files/kstyles/kstyles.pro b/win/pro_files/tdestyles/tdestyles.pro
index c556acfaa..c556acfaa 100644
--- a/win/pro_files/kstyles/kstyles.pro
+++ b/win/pro_files/tdestyles/tdestyles.pro
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro
index 0424eb476..0424eb476 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
+++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index 62b5d6b39..2d243f7de 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -11,7 +11,7 @@ unix {
}
-CONFIG += kstyle
+CONFIG += tdestyle
KW_CONFIG = release
CONFIG -= debug
@@ -25,7 +25,7 @@ LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS
CONFIG -= debug
# needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB MAKE_TDEFX_LIB
+DEFINES += MAKE_TDESTYLE_LIB MAKE_TDEFX_LIB
TARGET = thinkeramik
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro
index 41181415f..41181415f 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
+++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro
diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h
index b9c42bde4..98f055ae5 100644
--- a/win/tdelibs_export_win.h
+++ b/win/tdelibs_export_win.h
@@ -115,10 +115,10 @@
#endif
// all TDEStyle libs
-#ifdef MAKE_KSTYLE_LIB
-# define KSTYLE_EXPORT KDE_EXPORT
+#ifdef MAKE_TDESTYLE_LIB
+# define TDESTYLE_EXPORT KDE_EXPORT
#else
-# define KSTYLE_EXPORT KDE_IMPORT
+# define TDESTYLE_EXPORT KDE_IMPORT
#endif
#ifdef MAKE_KMDI_LIB
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index b3dcd7695..25212f67a 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -27,8 +27,8 @@ echo
cd win/9x && $make || exit 1
cd "$pwd"
-if [ -d "kstyles/thinkeramik/widget-engine" ] ; then
- additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine "
+if [ -d "tdestyles/thinkeramik/widget-engine" ] ; then
+ additional="tdestyles/thinkeramik/widget-engine/genembed tdestyles/thinkeramik/widget-engine "
fi
# all
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2fe77ef36..39b8f9928 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -45,7 +45,7 @@ dcop/iceauth \
tdefx \
tdecore \
tdeui \
-kstyles/thinkeramik/widget-engine \
+tdestyles/thinkeramik/widget-engine \
kio \
tderesources \
tdeabc/vcard \