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 <michele.calgaro@yahoo.it>
4 months ago · 1307964495
parent 6f4c529b36
commit 1307964495
39 changed files with 42 additions and 41 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1400,7 +1400,7 @@ endif()
 ##### write configure files #####################

 configure_file( config.h.cmake config.h )
-configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
+configure_file( tdecore/tdemacros.h.cmake tdecore/tdemacros.h )
 configure_file( kjs/global.h.in kjs/global.h )
 configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
 configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
--- a/interfaces/tdescript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
@ -29,7 +29,7 @@
 #define __scriptinterface_h__
 #include <tqvariant.h>
 #include <tqobject.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 //#include <scripclientinterface.h>
 class TQString;
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@ -22,7 +22,7 @@
 class TQString;
 class TQStrList;

-#include <kdemacros.h>
+#include <tdemacros.h>

 /**
 * TerminalInterface is an interface implemented by KonsolePart to
--- a/kimgio/psd.h
+++ b/kimgio/psd.h
@ -10,7 +10,7 @@
 #ifndef KIMG_PSD_H
 #define KIMG_PSD_H

-#include <kdemacros.h>
+#include <tdemacros.h>

 class TQImageIO;

--- a/libtdemid/player.h
+++ b/libtdemid/player.h
@ -29,7 +29,7 @@
 #include <libtdemid/deviceman.h>
 #include <libtdemid/track.h>
 #include <libtdemid/notearray.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 /**
 * This struct stores text, lyrics and change tempo events among others.
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@ -34,7 +34,7 @@
 #include "network.h"

 #include <tdeversion.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 extern "C" {
 	TDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj )
--- a/networkstatus/networkstatusindicator.h
+++ b/networkstatus/networkstatusindicator.h
@ -24,7 +24,7 @@
 #define KDE_NETWORKSTATUS_INDICATOR_H

 #include <tqhbox.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <networkstatuscommon.h>

 class StatusBarNetworkStatusIndicator : public TQHBox
--- a/tdeabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
@ -24,7 +24,7 @@
 #include <tqmap.h>

 #include <kdialog.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 class TDEListBox;

--- 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} )


--- 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
--- 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
--- 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=
 	
--- a/tdecore/kdemacros.h
+++ b/tdecore/kdemacros.h
@ -0,0 +1 @@
+#include <tdemacros.h>
--- 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)
 /*
--- 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;

--- 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>
--- a/tdecore/tdemacros.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_ */
--- a/tdecore/tdemacros.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_ */
--- a/tdehtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@ -29,7 +29,7 @@
 #include "dom/dom_misc.h"
 #include "xml/dom_nodeimpl.h"
 #include "misc/shared.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqdatetime.h>
 #include <tqptrlist.h>

--- a/tdehtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@ -31,7 +31,7 @@

 #include <tqcolor.h>

-#include <kdemacros.h>
+#include <tdemacros.h>

 namespace DOM {

--- a/tdehtml/dom/html_form.h
+++ b/tdehtml/dom/html_form.h
@ -33,7 +33,7 @@
 #include <dom/html_element.h>
 #include <dom/html_misc.h>

-#include <kdemacros.h>
+#include <tdemacros.h>

 namespace DOM {

--- a/tdehtml/dom/html_image.h
+++ b/tdehtml/dom/html_image.h
@ -31,7 +31,7 @@

 #include <dom/html_element.h>

-#include <kdemacros.h>
+#include <tdemacros.h>

 namespace DOM {

--- a/tdehtml/dom/html_object.h
+++ b/tdehtml/dom/html_object.h
@ -34,7 +34,7 @@

 #include <dom/html_element.h>
 #include <dom/html_form.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 namespace DOM {

--- a/tdehtml/misc/htmlattrs.h
+++ b/tdehtml/misc/htmlattrs.h
@ -6,7 +6,7 @@ htmlattrs.in by makeattrs, do not edit */
 #define HTML_ATTRS_H

 #include "dom/dom_string.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 using namespace DOM;

 #define ATTR_ACCEPT_CHARSET 1
--- a/tdehtml/misc/makeattrs
+++ b/tdehtml/misc/makeattrs
@ -36,7 +36,7 @@ print out "%{\n/* This file is automatically generated from
 print out "struct attrs {\n    int name;\n    int id;\n};\n%%\n";

 print header "/* This file is automatically generated from
-htmlattrs.in by makeattrs, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef HTML_ATTRS_H\n#define HTML_ATTRS_H\n\n#include \"dom/dom_string.h\"\n#include <kdemacros.h>\nusing namespace DOM;\n\n";
+htmlattrs.in by makeattrs, do not edit */\n/* Copyright 1999 Lars Knoll */\n\n#ifndef HTML_ATTRS_H\n#define HTML_ATTRS_H\n\n#include \"dom/dom_string.h\"\n#include <tdemacros.h>\nusing namespace DOM;\n\n";

 my %amap = ();
 my $last_ci_attr = 0;
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@ -30,7 +30,7 @@

 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kfinddialog.h>

 #include <tqregexp.h>
--- a/tdeio/bookmarks/kbookmarkimporter_crash.h
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.h
@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqmap.h>
 #include <ksimpleconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 #include "kbookmarkimporter.h"

--- a/tdeio/bookmarks/kbookmarkimporter_ie.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.h
@ -23,7 +23,7 @@
 #include <tqcstring.h>
 #include <tqstringlist.h>
 #include <ksimpleconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 #include <kbookmarkimporter.h>

--- a/tdeio/bookmarks/kbookmarkimporter_ns.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.h
@ -23,7 +23,7 @@
 #include <tqcstring.h>
 #include <tqstringlist.h>
 #include <ksimpleconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 #include "kbookmarkimporter.h"
 #include "kbookmarkexporter.h"
--- a/tdeio/kssl/ksslcertchain.h
+++ b/tdeio/kssl/ksslcertchain.h
@ -23,7 +23,7 @@

 #include <tqglobal.h>
 #include <tqptrlist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 class TQString;
 class TQCString;
--- a/tdeio/kssl/ksslutils.h
+++ b/tdeio/kssl/ksslutils.h
@ -20,7 +20,7 @@
 #ifndef _INCLUDE_KSSLUTILS_H
 #define _INCLUDE_KSSLUTILS_H

-#include <kdemacros.h>
+#include <tdemacros.h>

 #ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
--- a/tdeio/tdefile/kpropertiesdialog.h
+++ b/tdeio/tdefile/kpropertiesdialog.h
@ -31,7 +31,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>

-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 #include <tdefileitem.h>
 #include <kdialogbase.h>
--- a/tdeio/tdeio/posixacladdons.cpp
+++ b/tdeio/tdeio/posixacladdons.cpp
@ -21,7 +21,7 @@

 #if defined(USE_POSIX_ACL) && !defined(HAVE_NON_POSIX_ACL_EXTENSIONS)

-#include <kdemacros.h>
+#include <tdemacros.h>

 #include <errno.h>
 #include <sys/stat.h>
--- a/tdenewstuff/knewstuff.h
+++ b/tdenewstuff/knewstuff.h
@ -22,7 +22,7 @@

 #include <tqstring.h>

-#include <kdemacros.h>
+#include <tdemacros.h>

 class TQObject;
 class TQWidget;
--- a/tdeprint/kprinter.h
+++ b/tdeprint/kprinter.h
@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdelibs_export.h>

 #include <tdeprint/kpreloadobject.h>
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqaccel.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
--- a/tdestyles/plastik/config/plastikconf.cpp
+++ b/tdestyles/plastik/config/plastikconf.cpp
@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kcolorbutton.h>
-#include <kdemacros.h>
+#include <tdemacros.h>

 #include "plastikconf.h"

--- a/win/kdemacros.h
+++ b/win/kdemacros.h
@ -1 +0,0 @@
-#include <kdemacros.h.in>
--- a/win/tdemacros.h
+++ b/win/tdemacros.h
@ -0,0 +1 @@
+#include <tdemacros.h.in>