TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename kdemacros.* files to tdemacros.*

Browse Source 
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>
(cherry picked from commit 1307964495)
pull/312/head
Michele Calgaro 5 months ago
parent 69ec8f3e01
commit 417373531b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
39 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape View File

@ -1400,7 +1400,7 @@ endif()
##### write configure files ##################### ##### write configure files #####################
configure_file( config.h.cmake config.h ) 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( kjs/global.h.in kjs/global.h )
configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h ) configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )

2
interfaces/tdescript/scriptinterface.h
Unescape View File

@ -29,7 +29,7 @@
#define __scriptinterface_h__ #define __scriptinterface_h__
#include <tqvariant.h> #include <tqvariant.h>
#include <tqobject.h> #include <tqobject.h>
#include <kdemacros.h> #include <tdemacros.h>
//#include <scripclientinterface.h> //#include <scripclientinterface.h>
class TQString; class TQString;

2
interfaces/terminal/kde_terminal_interface.h
Unescape View File

@ -22,7 +22,7 @@
class TQString; class TQString;
class TQStrList; class TQStrList;
#include <kdemacros.h> #include <tdemacros.h>
/** /**
* TerminalInterface is an interface implemented by KonsolePart to * TerminalInterface is an interface implemented by KonsolePart to

2
kimgio/psd.h
Unescape View File

@ -10,7 +10,7 @@
#ifndef KIMG_PSD_H #ifndef KIMG_PSD_H
#define KIMG_PSD_H #define KIMG_PSD_H
#include <kdemacros.h> #include <tdemacros.h>
class TQImageIO; class TQImageIO;

2
libtdemid/player.h
Unescape View File

@ -29,7 +29,7 @@
#include <libtdemid/deviceman.h> #include <libtdemid/deviceman.h>
#include <libtdemid/track.h> #include <libtdemid/track.h>
#include <libtdemid/notearray.h> #include <libtdemid/notearray.h>
#include <kdemacros.h> #include <tdemacros.h>
/** /**
* This struct stores text, lyrics and change tempo events among others. * This struct stores text, lyrics and change tempo events among others.

2
networkstatus/networkstatus.cpp
Unescape View File

@ -34,7 +34,7 @@
#include "network.h" #include "network.h"
#include <tdeversion.h> #include <tdeversion.h>
#include <kdemacros.h> #include <tdemacros.h>
extern "C" { extern "C" {
TDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj ) TDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj )

2
networkstatus/networkstatusindicator.h
Unescape View File

@ -24,7 +24,7 @@
#define KDE_NETWORKSTATUS_INDICATOR_H #define KDE_NETWORKSTATUS_INDICATOR_H
#include <tqhbox.h> #include <tqhbox.h>
#include <kdemacros.h> #include <tdemacros.h>
#include <networkstatuscommon.h> #include <networkstatuscommon.h>
class StatusBarNetworkStatusIndicator : public TQHBox class StatusBarNetworkStatusIndicator : public TQHBox

2
tdeabc/resourceselectdialog.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqmap.h> #include <tqmap.h>
#include <kdialog.h> #include <kdialog.h>
#include <kdemacros.h> #include <tdemacros.h>
class TDEListBox; class TDEListBox;

2
tdecore/CMakeLists.txt
Unescape View File

@ -73,7 +73,7 @@ install( FILES
kmanagerselection.h kmountpoint.h kuser.h klockfile.h kmanagerselection.h kmountpoint.h kuser.h klockfile.h
kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h
tdelibs_export.h kde_file.h ktimezones.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} ) DESTINATION ${INCLUDE_INSTALL_DIR} )

2
tdecore/Mainpage.dox
Unescape View File

@ -37,5 +37,5 @@ Some helper utilities: @gpl
*/ */
// DOXYGEN_EXCLUDE = malloc kde_file.h // 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 // DOXYGEN_SET_PROJECT_NAME = TrinityCore

2
tdecore/Makefile.am
Unescape View File

@ -59,7 +59,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \ kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
kmanagerselection.h kmountpoint.h kuser.h klockfile.h \ kmanagerselection.h kmountpoint.h kuser.h klockfile.h \
kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h tdelibs_export.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_SOURCES = fakes.c vsnprintf.c
libtdefakes_la_LDFLAGS = -version-info 6:0:2 libtdefakes_la_LDFLAGS = -version-info 6:0:2

2
tdecore/configure.in.in
Unescape View File

@ -169,7 +169,7 @@ AC_CHECK_HEADERS(sys/mount.h)
dnl AC_OUTPUT(tdecore/tde-config.cpp) dnl AC_OUTPUT(tdecore/tde-config.cpp)
AM_CONFIG_HEADER(tdecore/kdemacros.h) AM_CONFIG_HEADER(tdecore/tdemacros.h)
SVGICONS= SVGICONS=

1
tdecore/kdemacros.h
Unescape View File

@ -0,0 +1 @@
#include <tdemacros.h>

2
tdecore/netsupp.cpp
Unescape View File

@ -49,7 +49,7 @@
extern int h_errno; extern int h_errno;
#endif #endif
#include <kdemacros.h> #include <tdemacros.h>
#if !defined(kde_sockaddr_in6) #if !defined(kde_sockaddr_in6)
/* /*

2
tdecore/tdehw/tdestoragedevice.h
Unescape View File

@ -22,7 +22,7 @@
#include "tdegenericdevice.h" #include "tdegenericdevice.h"
#include "tqvariant.h" #include "tqvariant.h"
#include "kdemacros.h" #include "tdemacros.h"
struct crypt_device; struct crypt_device;

2
tdecore/tdelibs_export.h
Unescape View File

@ -21,7 +21,7 @@
#define _TDELIBS_EXPORT_H #define _TDELIBS_EXPORT_H
/* needed for TDE_EXPORT macros */ /* needed for TDE_EXPORT macros */
#include <kdemacros.h> #include <tdemacros.h>
/* needed, because e.g. Q_OS_UNIX is so frequently used */ /* needed, because e.g. Q_OS_UNIX is so frequently used */
#include <tqglobal.h> #include <tqglobal.h>

6
tdecore/kdemacros.h.cmake → tdecore/tdemacros.h.cmake
Unescape View File

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef _KDE_MACROS_H_ #ifndef _TDE_MACROS_H_
#define _KDE_MACROS_H_ #define _TDE_MACROS_H_
/* Set by configure */ /* Set by configure */
#cmakedefine __TDE_HAVE_TDEHWLIB 1 #cmakedefine __TDE_HAVE_TDEHWLIB 1
@ -183,4 +183,4 @@
#define TDE_WEAK_SYMBOL #define TDE_WEAK_SYMBOL
#endif #endif
#endif /* _KDE_MACROS_H_ */ #endif /* _TDE_MACROS_H_ */

6
tdecore/kdemacros.h.in → tdecore/tdemacros.h.in
Unescape View File

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef _KDE_MACROS_H_ #ifndef _TDE_MACROS_H_
#define _KDE_MACROS_H_ #define _TDE_MACROS_H_
/* Set by configure */ /* Set by configure */
#undef __KDE_HAVE_GCC_VISIBILITY #undef __KDE_HAVE_GCC_VISIBILITY
@ -182,4 +182,4 @@
#define TDE_WEAK_SYMBOL #define TDE_WEAK_SYMBOL
#endif #endif
#endif /* _KDE_MACROS_H_ */ #endif /* _TDE_MACROS_H_ */

2
tdehtml/css/css_base.h
Unescape View File

@ -29,7 +29,7 @@
#include "dom/dom_misc.h" #include "dom/dom_misc.h"
#include "xml/dom_nodeimpl.h" #include "xml/dom_nodeimpl.h"
#include "misc/shared.h" #include "misc/shared.h"
#include <kdemacros.h> #include <tdemacros.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqptrlist.h> #include <tqptrlist.h>

2
tdehtml/dom/css_value.h
Unescape View File

@ -31,7 +31,7 @@
#include <tqcolor.h> #include <tqcolor.h>
#include <kdemacros.h> #include <tdemacros.h>
namespace DOM { namespace DOM {

2
tdehtml/dom/html_form.h
Unescape View File

@ -33,7 +33,7 @@
#include <dom/html_element.h> #include <dom/html_element.h>
#include <dom/html_misc.h> #include <dom/html_misc.h>
#include <kdemacros.h> #include <tdemacros.h>
namespace DOM { namespace DOM {

2
tdehtml/dom/html_image.h
Unescape View File

@ -31,7 +31,7 @@
#include <dom/html_element.h> #include <dom/html_element.h>
#include <kdemacros.h> #include <tdemacros.h>
namespace DOM { namespace DOM {

2
tdehtml/dom/html_object.h
Unescape View File

@ -34,7 +34,7 @@
#include <dom/html_element.h> #include <dom/html_element.h>
#include <dom/html_form.h> #include <dom/html_form.h>
#include <kdemacros.h> #include <tdemacros.h>
namespace DOM { namespace DOM {

2
tdehtml/misc/htmlattrs.h
Unescape View File

@ -6,7 +6,7 @@ htmlattrs.in by makeattrs, do not edit */
#define HTML_ATTRS_H #define HTML_ATTRS_H
#include "dom/dom_string.h" #include "dom/dom_string.h"
#include <kdemacros.h> #include <tdemacros.h>
using namespace DOM; using namespace DOM;
#define ATTR_ACCEPT_CHARSET 1 #define ATTR_ACCEPT_CHARSET 1

2
tdehtml/misc/makeattrs
Unescape View File

@ -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 out "struct attrs {\n int name;\n int id;\n};\n%%\n";
print header "/* This file is automatically generated from 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 %amap = ();
my $last_ci_attr = 0; my $last_ci_attr = 0;

2
tdehtml/tdehtml_part.h
Unescape View File

@ -30,7 +30,7 @@
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <tdeparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kdemacros.h> #include <tdemacros.h>
#include <kfinddialog.h> #include <kfinddialog.h>
#include <tqregexp.h> #include <tqregexp.h>

2
tdeio/bookmarks/kbookmarkimporter_crash.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqmap.h> #include <tqmap.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kdemacros.h> #include <tdemacros.h>
#include "kbookmarkimporter.h" #include "kbookmarkimporter.h"

2
tdeio/bookmarks/kbookmarkimporter_ie.h
Unescape View File

@ -23,7 +23,7 @@
#include <tqcstring.h> #include <tqcstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kdemacros.h> #include <tdemacros.h>
#include <kbookmarkimporter.h> #include <kbookmarkimporter.h>

2
tdeio/bookmarks/kbookmarkimporter_ns.h
Unescape View File

@ -23,7 +23,7 @@
#include <tqcstring.h> #include <tqcstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kdemacros.h> #include <tdemacros.h>
#include "kbookmarkimporter.h" #include "kbookmarkimporter.h"
#include "kbookmarkexporter.h" #include "kbookmarkexporter.h"

2
tdeio/kssl/ksslcertchain.h
Unescape View File

@ -23,7 +23,7 @@
#include <tqglobal.h> #include <tqglobal.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kdemacros.h> #include <tdemacros.h>
class TQString; class TQString;
class TQCString; class TQCString;

2
tdeio/kssl/ksslutils.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef _INCLUDE_KSSLUTILS_H #ifndef _INCLUDE_KSSLUTILS_H
#define _INCLUDE_KSSLUTILS_H #define _INCLUDE_KSSLUTILS_H
#include <kdemacros.h> #include <tdemacros.h>
#ifdef TQ_WS_WIN #ifdef TQ_WS_WIN
#include "ksslconfig_win.h" #include "ksslconfig_win.h"

2
tdeio/tdefile/kpropertiesdialog.h
Unescape View File

@ -31,7 +31,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kdemacros.h> #include <tdemacros.h>
#include <kurl.h> #include <kurl.h>
#include <tdefileitem.h> #include <tdefileitem.h>
#include <kdialogbase.h> #include <kdialogbase.h>

2
tdeio/tdeio/posixacladdons.cpp
Unescape View File

@ -21,7 +21,7 @@
#if defined(USE_POSIX_ACL) && !defined(HAVE_NON_POSIX_ACL_EXTENSIONS) #if defined(USE_POSIX_ACL) && !defined(HAVE_NON_POSIX_ACL_EXTENSIONS)
#include <kdemacros.h> #include <tdemacros.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>

2
tdenewstuff/knewstuff.h
Unescape View File

@ -22,7 +22,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <kdemacros.h> #include <tdemacros.h>
class TQObject; class TQObject;
class TQWidget; class TQWidget;

2
tdeprint/kprinter.h
Unescape View File

@ -27,7 +27,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <kdemacros.h> #include <tdemacros.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>
#include <tdeprint/kpreloadobject.h> #include <tdeprint/kpreloadobject.h>

2
tdeprint/tools/escputil/escpwidget.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqaccel.h> #include <tqaccel.h>
#include <kdemacros.h> #include <tdemacros.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <tdemessagebox.h> #include <tdemessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

2
tdestyles/plastik/config/plastikconf.cpp
Unescape View File

@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kdemacros.h> #include <tdemacros.h>
#include "plastikconf.h" #include "plastikconf.h"

1
win/kdemacros.h
Unescape View File

@ -1 +0,0 @@
#include <kdemacros.h.in>

1
win/tdemacros.h
Unescape View File

@ -0,0 +1 @@
#include <tdemacros.h.in>
Write Preview
Loading…
Cancel
Save