diff options
author | Michele Calgaro <[email protected]> | 2024-06-30 19:08:44 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2024-06-30 19:08:44 +0900 |
commit | 1307964495cdc9a74f7b4aabab14ad9ffaa93dd6 (patch) | |
tree | 1aaa2e5fab40b31281d139824c0a0cf1d2cc63b9 /tdecore | |
parent | 6f4c529b36bcea84d6f05a724d99f476ced08fe9 (diff) | |
download | tdelibs-1307964495cdc9a74f7b4aabab14ad9ffaa93dd6.tar.gz tdelibs-1307964495cdc9a74f7b4aabab14ad9ffaa93dd6.zip |
Rename kdemacros.* files to tdemacros.*
A dummy 'kdemacros.h' has been added to allow TDE to built till renaming is carried out across the whole code base. It will then be removed.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdecore')
-rw-r--r-- | tdecore/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tdecore/Mainpage.dox | 2 | ||||
-rw-r--r-- | tdecore/Makefile.am | 2 | ||||
-rw-r--r-- | tdecore/configure.in.in | 2 | ||||
-rw-r--r-- | tdecore/kdemacros.h | 1 | ||||
-rw-r--r-- | tdecore/netsupp.cpp | 2 | ||||
-rw-r--r-- | tdecore/tdehw/tdestoragedevice.h | 2 | ||||
-rw-r--r-- | tdecore/tdelibs_export.h | 2 | ||||
-rw-r--r-- | tdecore/tdemacros.h.cmake (renamed from tdecore/kdemacros.h.cmake) | 6 | ||||
-rw-r--r-- | tdecore/tdemacros.h.in (renamed from tdecore/kdemacros.h.in) | 6 |
10 files changed, 14 insertions, 13 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index c794a8039..7fb7cdccf 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -73,7 +73,7 @@ install( FILES kmanagerselection.h kmountpoint.h kuser.h klockfile.h kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h tdelibs_export.h kde_file.h ktimezones.h - ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h + ${CMAKE_CURRENT_BINARY_DIR}/tdemacros.h kdemacros.h DESTINATION ${INCLUDE_INSTALL_DIR} ) diff --git a/tdecore/Mainpage.dox b/tdecore/Mainpage.dox index c275aa84e..4a74d242a 100644 --- a/tdecore/Mainpage.dox +++ b/tdecore/Mainpage.dox @@ -37,5 +37,5 @@ Some helper utilities: @gpl */ // DOXYGEN_EXCLUDE = malloc kde_file.h -// DOXYGEN_SET_INPUT += @topdir@/kdemacros.h.cmake +// DOXYGEN_SET_INPUT += @topdir@/tdemacros.h.cmake // DOXYGEN_SET_PROJECT_NAME = TrinityCore diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index 58e74a010..1bc47e379 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -59,7 +59,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \ kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \ kmanagerselection.h kmountpoint.h kuser.h klockfile.h \ kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h tdelibs_export.h \ - kdemacros.h kde_file.h ktimezones.h + tdemacros.h kde_file.h ktimezones.h libtdefakes_la_SOURCES = fakes.c vsnprintf.c libtdefakes_la_LDFLAGS = -version-info 6:0:2 diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in index d7ef1cd08..7ecda35e7 100644 --- a/tdecore/configure.in.in +++ b/tdecore/configure.in.in @@ -169,7 +169,7 @@ AC_CHECK_HEADERS(sys/mount.h) dnl AC_OUTPUT(tdecore/tde-config.cpp) -AM_CONFIG_HEADER(tdecore/kdemacros.h) +AM_CONFIG_HEADER(tdecore/tdemacros.h) SVGICONS= diff --git a/tdecore/kdemacros.h b/tdecore/kdemacros.h new file mode 100644 index 000000000..73808c60d --- /dev/null +++ b/tdecore/kdemacros.h @@ -0,0 +1 @@ +#include <tdemacros.h> diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp index 397005183..0ea43178d 100644 --- a/tdecore/netsupp.cpp +++ b/tdecore/netsupp.cpp @@ -49,7 +49,7 @@ extern int h_errno; #endif -#include <kdemacros.h> +#include <tdemacros.h> #if !defined(kde_sockaddr_in6) /* diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h index 891b31573..ad0468ed9 100644 --- a/tdecore/tdehw/tdestoragedevice.h +++ b/tdecore/tdehw/tdestoragedevice.h @@ -22,7 +22,7 @@ #include "tdegenericdevice.h" #include "tqvariant.h" -#include "kdemacros.h" +#include "tdemacros.h" struct crypt_device; diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index bfe07b0e3..78f129f89 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -21,7 +21,7 @@ #define _TDELIBS_EXPORT_H /* needed for TDE_EXPORT macros */ -#include <kdemacros.h> +#include <tdemacros.h> /* needed, because e.g. Q_OS_UNIX is so frequently used */ #include <tqglobal.h> diff --git a/tdecore/kdemacros.h.cmake b/tdecore/tdemacros.h.cmake index 1c652176a..b8d5abd43 100644 --- a/tdecore/kdemacros.h.cmake +++ b/tdecore/tdemacros.h.cmake @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KDE_MACROS_H_ -#define _KDE_MACROS_H_ +#ifndef _TDE_MACROS_H_ +#define _TDE_MACROS_H_ /* Set by configure */ #cmakedefine __TDE_HAVE_TDEHWLIB 1 @@ -183,4 +183,4 @@ #define TDE_WEAK_SYMBOL #endif -#endif /* _KDE_MACROS_H_ */ +#endif /* _TDE_MACROS_H_ */ diff --git a/tdecore/kdemacros.h.in b/tdecore/tdemacros.h.in index 571d5fafe..721b6849b 100644 --- a/tdecore/kdemacros.h.in +++ b/tdecore/tdemacros.h.in @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KDE_MACROS_H_ -#define _KDE_MACROS_H_ +#ifndef _TDE_MACROS_H_ +#define _TDE_MACROS_H_ /* Set by configure */ #undef __KDE_HAVE_GCC_VISIBILITY @@ -182,4 +182,4 @@ #define TDE_WEAK_SYMBOL #endif -#endif /* _KDE_MACROS_H_ */ +#endif /* _TDE_MACROS_H_ */ |