summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/config.h4
-rw-r--r--win/kdelibs_export_win.h34
-rw-r--r--win/pro_files/dcop/client/client.pro2
-rw-r--r--win/pro_files/dcop/client/dcop/dcop.pro2
-rw-r--r--win/pro_files/dcop/client/dcopfind/dcopfind.pro2
-rw-r--r--win/pro_files/dcop/client/dcopref/dcopref.pro2
-rw-r--r--win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro4
-rw-r--r--win/pro_files/tdecore/tdecore.pro2
-rw-r--r--win/pro_files/tdefx/tdefx.pro2
-rw-r--r--win/pro_files/tdefx/tdefx_rel.pro2
-rw-r--r--win/pro_files/tdeprint/tdeprint.pro2
-rw-r--r--win/pro_files/tdeui/tdeui.pro2
-rw-r--r--win/stdlib.h4
-rw-r--r--win/string.h4
14 files changed, 34 insertions, 34 deletions
diff --git a/win/config.h b/win/config.h
index 9d6f25e4b..465498141 100644
--- a/win/config.h
+++ b/win/config.h
@@ -44,8 +44,8 @@
extern "C" {
#endif
-KDECORE_EXPORT int mkstemps (char* _template, int suffix_len);
-KDECORE_EXPORT char* mkdtemp (char* _template);
+TDECORE_EXPORT int mkstemps (char* _template, int suffix_len);
+TDECORE_EXPORT char* mkdtemp (char* _template);
#ifdef __cplusplus
}
diff --git a/win/kdelibs_export_win.h b/win/kdelibs_export_win.h
index 064cc6484..17663a5fa 100644
--- a/win/kdelibs_export_win.h
+++ b/win/kdelibs_export_win.h
@@ -25,11 +25,11 @@
#define KDE_IMPORT __declspec(dllimport)
-#ifdef MAKE_KDECORE_LIB
-# define KDECORE_EXPORT KDE_EXPORT
+#ifdef MAKE_TDECORE_LIB
+# define TDECORE_EXPORT KDE_EXPORT
#else
-# ifndef KDECORE_EXPORT
-# define KDECORE_EXPORT KDE_IMPORT //for apps and other libs
+# ifndef TDECORE_EXPORT
+# define TDECORE_EXPORT KDE_IMPORT //for apps and other libs
# endif
#endif
@@ -40,27 +40,27 @@
#endif
/* some classes, i.e. KDock* already use EXPORT_* macro: define it too */
-#ifdef MAKE_KDEUI_LIB
-# define KDEUI_EXPORT KDE_EXPORT
+#ifdef MAKE_TDEUI_LIB
+# define TDEUI_EXPORT KDE_EXPORT
# define EXPORT_DOCKCLASS KDE_EXPORT
#elif KDE_MAKE_LIB
-# define KDEUI_EXPORT KDE_IMPORT
+# define TDEUI_EXPORT KDE_IMPORT
# define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */
#else
-# define KDEUI_EXPORT
+# define TDEUI_EXPORT
# define EXPORT_DOCKCLASS
#endif
-#ifdef MAKE_KDEFX_LIB
-# define KDEFX_EXPORT KDE_EXPORT
+#ifdef MAKE_TDEFX_LIB
+# define TDEFX_EXPORT KDE_EXPORT
#else
-# define KDEFX_EXPORT KDE_IMPORT
+# define TDEFX_EXPORT KDE_IMPORT
#endif
-#ifdef MAKE_KDEPRINT_LIB
-# define KDEPRINT_EXPORT KDE_EXPORT
+#ifdef MAKE_TDEPRINT_LIB
+# define TDEPRINT_EXPORT KDE_EXPORT
#else
-# define KDEPRINT_EXPORT KDE_IMPORT
+# define TDEPRINT_EXPORT KDE_IMPORT
#endif
#ifndef KIO_EXPORT
@@ -108,10 +108,10 @@
# define KRESOURCES_EXPORT KDE_IMPORT
#endif
-#ifdef MAKE_KDESU_LIB
-# define KDESU_EXPORT KDE_EXPORT
+#ifdef MAKE_TDESU_LIB
+# define TDESU_EXPORT KDE_EXPORT
#else
-# define KDESU_EXPORT KDE_IMPORT
+# define TDESU_EXPORT KDE_IMPORT
#endif
// all KStyle libs
diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro
index cb732b012..ad343ec0e 100644
--- a/win/pro_files/dcop/client/client.pro
+++ b/win/pro_files/dcop/client/client.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
#DEFINES += MAKE_DCOP_LIB
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
TARGET = dcopclient
diff --git a/win/pro_files/dcop/client/dcop/dcop.pro b/win/pro_files/dcop/client/dcop/dcop.pro
index 946a128c4..3d623054e 100644
--- a/win/pro_files/dcop/client/dcop/dcop.pro
+++ b/win/pro_files/dcop/client/dcop/dcop.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
#DEFINES += MAKE_DCOP_LIB
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
TARGET = dcop
diff --git a/win/pro_files/dcop/client/dcopfind/dcopfind.pro b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
index 6c643bb14..d52b1550a 100644
--- a/win/pro_files/dcop/client/dcopfind/dcopfind.pro
+++ b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
#DEFINES += MAKE_DCOP_LIB
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
TARGET = dcopfind
diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro
index 65ba00a9d..65af67a81 100644
--- a/win/pro_files/dcop/client/dcopref/dcopref.pro
+++ b/win/pro_files/dcop/client/dcopref/dcopref.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
#DEFINES += MAKE_DCOP_LIB
-DEFINES += KDECORE_EXPORT=
+DEFINES += TDECORE_EXPORT=
TARGET = dcopref
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index 549e2344f..7a81aa820 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -7,7 +7,7 @@ unix {
INCLUDEPATH += moc
#force finding libraries in current dir (for installer, etc):
QMAKE_LFLAGS += -Wl,-rpath,.
- DEFINES += KDEFX_EXPORT=
+ DEFINES += TDEFX_EXPORT=
}
@@ -25,7 +25,7 @@ LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS
CONFIG -= debug
# needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB MAKE_KDEFX_LIB
+DEFINES += MAKE_KSTYLE_LIB MAKE_TDEFX_LIB
TARGET = thinkeramik
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index c4579a5cf..04bfcd3fd 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
include( $(KDELIBS)/win/zlib.pro )
# needed to export library classes:
-DEFINES += MAKE_KDECORE_LIB
+DEFINES += MAKE_TDECORE_LIB
LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \
-lqassistantclient
diff --git a/win/pro_files/tdefx/tdefx.pro b/win/pro_files/tdefx/tdefx.pro
index eab9ea7d9..f37639f92 100644
--- a/win/pro_files/tdefx/tdefx.pro
+++ b/win/pro_files/tdefx/tdefx.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
-DEFINES += MAKE_KDEFX_LIB
+DEFINES += MAKE_TDEFX_LIB
TARGET = tdefx$$KDEBUG
diff --git a/win/pro_files/tdefx/tdefx_rel.pro b/win/pro_files/tdefx/tdefx_rel.pro
index 66ae8f1a4..e882168c8 100644
--- a/win/pro_files/tdefx/tdefx_rel.pro
+++ b/win/pro_files/tdefx/tdefx_rel.pro
@@ -8,7 +8,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
-DEFINES += MAKE_KDEFX_LIB
+DEFINES += MAKE_TDEFX_LIB
system( moc kstyle.h -o moc/kstyle.moc )
diff --git a/win/pro_files/tdeprint/tdeprint.pro b/win/pro_files/tdeprint/tdeprint.pro
index eb1bfff69..b5269d0f2 100644
--- a/win/pro_files/tdeprint/tdeprint.pro
+++ b/win/pro_files/tdeprint/tdeprint.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
-DEFINES += MAKE_KDEPRINT_LIB
+DEFINES += MAKE_TDEPRINT_LIB
TARGET = tdeprint$$KDEBUG
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index 20f8c26ee..be39628e7 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
# needed to export library classes:
-DEFINES += MAKE_KDEUI_LIB
+DEFINES += MAKE_TDEUI_LIB
LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX \
$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX
diff --git a/win/stdlib.h b/win/stdlib.h
index 1f5c01f89..967b76533 100644
--- a/win/stdlib.h
+++ b/win/stdlib.h
@@ -47,8 +47,8 @@ extern "C" {
#define EXIT_SUCCESS 0
/* from fakes.c */
-KDECORE_EXPORT int setenv(const char *__string, const char *__value, int __overwrite);
-KDECORE_EXPORT void unsetenv(const char *__string);
+TDECORE_EXPORT int setenv(const char *__string, const char *__value, int __overwrite);
+TDECORE_EXPORT void unsetenv(const char *__string);
#ifdef __cplusplus
}
diff --git a/win/string.h b/win/string.h
index 14127b6e8..4c4ae2b99 100644
--- a/win/string.h
+++ b/win/string.h
@@ -32,10 +32,10 @@ extern "C" {
#endif
/* implemented in fakes.c */
-KDECORE_EXPORT unsigned long strlcpy(char *dst, const char *src, unsigned long siz);
+TDECORE_EXPORT unsigned long strlcpy(char *dst, const char *src, unsigned long siz);
/* implemented in fakes.c */
-KDECORE_EXPORT unsigned long strlcat(char *dst, const char *src, unsigned long siz);
+TDECORE_EXPORT unsigned long strlcat(char *dst, const char *src, unsigned long siz);
KDEWIN32_EXPORT char* strndup(const char *src, size_t n);