TDE
/
tqt3
8
0
Fork 0
Code Issues 23 Pull Requests 7 Releases Wiki Activity

Always build with a clean namespace

Browse Source 
QT_CLEAN_NAMESPACE constant is no more needed

This may theoretically affect applications created for Qt1 and Qt2,
but such applications require further modifications as well.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/2/head
Slávek Banko 6 years ago
parent 02964eb384
commit ff63338d18
Signed by: SlavekB
GPG Key ID: 608F5293A04BE668
22 changed files with 4 additions and 171 deletions
Show Stats Download Patch File Download Diff File

4
doc/html/porting.html
Unescape View File

@ -217,9 +217,7 @@ previously disabled, please check these macro variables:
<li> <tt>CHECK_NULL</tt> becomes <tt>QT_CHECK_NULL</tt>
<li> <tt>CHECK_MATH</tt> becomes <tt>QT_CHECK_MATH</tt>
</ul>
<p> The name of some debugging macro functions has been changed as well
but source compatibility should not be affected if the macro variable
<tt>QT_CLEAN_NAMESPACE</tt> is not defined:
<p> The name of some debugging macro functions has been changed:
<p> <ul>
<li> <tt>ASSERT</tt> becomes <tt>Q_ASSERT</tt>
<li> <tt>CHECK_PTR</tt> becomes <tt>TQ_CHECK_PTR</tt>

14
doc/html/qcstring-h.html
Unescape View File

@ -117,20 +117,6 @@ Q_EXPORT int tqstricmp( const char *, const char * );
Q_EXPORT int tqstrnicmp( const char *, const char *, uint len );
#ifndef QT_CLEAN_NAMESPACE
Q_EXPORT inline uint cstrlen( const char *str )
{ return (uint)strlen(str); }
Q_EXPORT inline char *cstrcpy( char *dst, const char *src )
{ return strcpy(dst,src); }
Q_EXPORT inline int cstrcmp( const char *str1, const char *str2 )
{ return strcmp(str1,str2); }
Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
{ return strncmp(str1,str2,len); }
#endif
// tqChecksum: Internet checksum

13
doc/html/qcursor-h.html
Unescape View File

@ -158,19 +158,6 @@ private:
};
#if !defined(QT_CLEAN_NAMESPACE)
// CursorShape is defined in X11/X.h
#ifdef CursorShape
#define X_CursorShape CursorShape
#undef CursorShape
#endif
typedef TQt::CursorShape TQCursorShape;
#ifdef X_CursorShape
#define CursorShape X_CursorShape
#endif
#endif
/*****************************************************************************
TQCursor stream functions
*****************************************************************************/

32
doc/html/qglobal-h.html
Unescape View File

@ -734,16 +734,6 @@ inline int tqRound( double d )
// Size-dependent types (architechture-dependent byte order)
//
#if !defined(QT_CLEAN_NAMESPACE)
// source compatibility with TQt 1.x
typedef signed char INT8; // 8 bit signed
typedef unsigned char UINT8; // 8 bit unsigned
typedef short INT16; // 16 bit signed
typedef unsigned short UINT16; // 16 bit unsigned
typedef int INT32; // 32 bit signed
typedef unsigned int UINT32; // 32 bit unsigned
#endif
typedef signed char TQ_INT8; // 8 bit signed
typedef unsigned char TQ_UINT8; // 8 bit unsigned
typedef short TQ_INT16; // 16 bit signed
@ -1020,28 +1010,6 @@ Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit
Q_EXPORT void tqSystemWarning( const char *, int code = -1 );
#if !defined(QT_CLEAN_NAMESPACE) // compatibility with TQt 1
Q_EXPORT void debug( const char *, ... ) // print debug message
#if defined(Q_CC_GNU) &amp;&amp; !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
Q_EXPORT void warning( const char *, ... ) // print warning message
#if defined(Q_CC_GNU) &amp;&amp; !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit
#if defined(Q_CC_GNU) &amp;&amp; !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
#endif // QT_CLEAN_NAMESPACE
#if !defined(Q_ASSERT)
# if defined(QT_CHECK_STATE)

6
doc/html/qwindowdefs-h.html
Unescape View File

@ -224,12 +224,6 @@ typedef void (*TQtCleanUpFunction)();
Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction );
Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction );
#if !defined(QT_CLEAN_NAMESPACE)
// source compatibility with TQt 2.x
typedef TQtCleanUpFunction Q_CleanUpFunction;
#endif
#endif // TQWINDOWDEFS_H
</pre>
<!-- eof -->

4
doc/porting3.doc
Unescape View File

@ -165,9 +165,7 @@ previously disabled, please check these macro variables:
\i \c CHECK_MATH becomes \c QT_CHECK_MATH
\endlist
The name of some debugging macro functions has been changed as well
but source compatibility should not be affected if the macro variable
\c QT_CLEAN_NAMESPACE is not defined:
The name of some debugging macro functions has been changed:
\list
\i \c ASSERT becomes \c Q_ASSERT

2
examples/demo/opengl/glinfo_x11.cpp
Unescape View File

@ -7,8 +7,6 @@
**
*****************************************************************************/
#define QT_CLEAN_NAMESPACE // avoid clashes with Xmd.h
#include <ntqstringlist.h>
#include <ntqgl.h>
#include "glinfo.h"

3
plugins/src/imageformats/jpeg/main.cpp
Unescape View File

@ -1,6 +1,3 @@
#ifndef QT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE
#endif
#include <ntqimageformatplugin.h>
#ifndef QT_NO_IMAGEFORMATPLUGIN

4
plugins/src/imageformats/mng/main.cpp
Unescape View File

@ -1,7 +1,3 @@
#ifndef QT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE
#endif
#include <ntqimageformatplugin.h>
#ifndef QT_NO_IMAGEFORMATPLUGIN

3
plugins/src/imageformats/png/main.cpp
Unescape View File

@ -1,6 +1,3 @@
#ifndef QT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE
#endif
#include <ntqimageformatplugin.h>
#ifndef QT_NO_IMAGEFORMATPLUGIN

13
src/kernel/ntqcursor.h
Unescape View File

@ -122,19 +122,6 @@ private:
};
#if !defined(QT_CLEAN_NAMESPACE)
// CursorShape is defined in X11/X.h
#ifdef CursorShape
#define X_CursorShape CursorShape
#undef CursorShape
#endif
typedef TQt::CursorShape TQCursorShape;
#ifdef X_CursorShape
#define CursorShape X_CursorShape
#endif
#endif
/*****************************************************************************
TQCursor stream functions
*****************************************************************************/

6
src/kernel/ntqobjectdefs.h
Unescape View File

@ -142,12 +142,6 @@ private: \
#define SIGNAL(a) "2"#a
#endif
#ifndef QT_CLEAN_NAMESPACE
#define METHOD_CODE 0 // member type codes
#define SLOT_CODE 1
#define SIGNAL_CODE 2
#endif
#define TQMETHOD_CODE 0 // member type codes
#define TQSLOT_CODE 1
#define TQSIGNAL_CODE 2

6
src/kernel/ntqwindowdefs.h
Unescape View File

@ -188,10 +188,4 @@ typedef void (*TQtCleanUpFunction)();
Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction );
Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction );
#if !defined(QT_CLEAN_NAMESPACE)
// source compatibility with TQt 2.x
typedef TQtCleanUpFunction Q_CleanUpFunction;
#endif
#endif // TQWINDOWDEFS_H

3
src/kernel/qapplication_x11.cpp
Unescape View File

@ -44,9 +44,6 @@
// provide a proper alternative for others. See also the exports in
// qapplication_win.cpp which suggest a unification.
// ### needed for solaris-g++ in beta5
#define QT_CLEAN_NAMESPACE
#include "qplatformdefs.h"
// POSIX Large File Support redefines open -> open64

4
src/kernel/qjpegio.cpp
Unescape View File

@ -38,10 +38,6 @@
**
**********************************************************************/
#ifndef QT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE
#endif
#include "ntqimage.h"
#ifndef QT_NO_IMAGEIO_JPEG

4
src/kernel/qmngio.cpp
Unescape View File

@ -38,10 +38,6 @@
**
**********************************************************************/
#ifndef QT_CLEAN_NAMESPACE
#define QT_CLEAN_NAMESPACE
#endif
#include "ntqdatetime.h"
#ifndef QT_NO_IMAGEIO_MNG

2
src/kernel/qsound_x11.cpp
Unescape View File

@ -38,8 +38,6 @@
**
**********************************************************************/
#define QT_CLEAN_NAMESPACE
#include "ntqsound.h"
#ifndef QT_NO_SOUND

1
src/kernel/qtkdeintegration_x11.cpp
Unescape View File

@ -1,7 +1,6 @@
/* This file is licensed under the terms of the GPL v2 or v3, as it has been publicly released by
OpenSUSE as part of their GPLed TQt library disribution */
#define QT_CLEAN_NAMESPACE
#include "qtkdeintegration_x11_p.h"
#include <ntqcolordialog.h>

14
src/tools/ntqcstring.h
Unescape View File

@ -81,20 +81,6 @@ Q_EXPORT int tqstricmp( const char *, const char * );
Q_EXPORT int tqstrnicmp( const char *, const char *, uint len );
#ifndef QT_CLEAN_NAMESPACE
Q_EXPORT inline uint cstrlen( const char *str )
{ return (uint)strlen(str); }
Q_EXPORT inline char *cstrcpy( char *dst, const char *src )
{ return strcpy(dst,src); }
Q_EXPORT inline int cstrcmp( const char *str1, const char *str2 )
{ return strcmp(str1,str2); }
Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
{ return strncmp(str1,str2,len); }
#endif
// tqChecksum: Internet checksum

32
src/tools/ntqglobal.h
Unescape View File

@ -702,16 +702,6 @@ inline int tqRound( double d )
// Size-dependent types (architechture-dependent byte order)
//
#if !defined(QT_CLEAN_NAMESPACE)
// source compatibility with TQt 1.x
typedef signed char INT8; // 8 bit signed
typedef unsigned char UINT8; // 8 bit unsigned
typedef short INT16; // 16 bit signed
typedef unsigned short UINT16; // 16 bit unsigned
typedef int INT32; // 32 bit signed
typedef unsigned int UINT32; // 32 bit unsigned
#endif
typedef signed char TQ_INT8; // 8 bit signed
typedef unsigned char TQ_UINT8; // 8 bit unsigned
typedef short TQ_INT16; // 16 bit signed
@ -989,28 +979,6 @@ Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit
Q_EXPORT void tqSystemWarning( const char *, int code = -1 );
#if !defined(QT_CLEAN_NAMESPACE) // compatibility with TQt 1
Q_EXPORT void debug( const char *, ... ) // print debug message
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
Q_EXPORT void warning( const char *, ... ) // print warning message
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
#endif // QT_CLEAN_NAMESPACE
#if !defined(Q_ASSERT)
# if defined(QT_CHECK_STATE)

4
tools/msg2tqm/msg2tqm.cpp
Unescape View File

@ -192,10 +192,10 @@ void translate( const TQString& filename, const TQString& qmfile )
TQString charset = msgstr.mid( cpos, i-cpos );
codec = TQTextCodec::codecForName( charset.ascii() );
if ( codec ) {
debug( "PO file character set: %s. Codec: %s",
tqDebug( "PO file character set: %s. Codec: %s",
charset.ascii(), codec->name() );
} else {
debug( "No codec for %s", charset.ascii() );
tqDebug( "No codec for %s", charset.ascii() );
}
}
break;

1
tools/tqvfb/qanimationwriter.cpp
Unescape View File

@ -33,7 +33,6 @@
#include "qanimationwriter.h"
#define QT_CLEAN_NAMESPACE
#include <ntqfile.h>
#include <png.h>

Write Preview
Loading…
Cancel
Save