Fixed broken Q_FULL_TEMPLATE_INSTANTIATION define (renamed to TQ_FULL_TEMPLATE_INSTANTIATION).

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/47/head
Michele Calgaro 3 years ago
parent 2a00c1661b
commit 0f480dc43f
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -123,7 +123,7 @@ public:
void setProX( int index, double value );
void setProY( int index, double value );
#ifdef Q_FULL_TEMPLATE_INSTANTIATION
#ifdef TQ_FULL_TEMPLATE_INSTANTIATION
// xlC 3.x workaround
Q_DUMMY_COMPARISON_OPERATOR(Element)
bool operator!=( const Element&amp; e) const {

@ -91,7 +91,7 @@ public:
void setProX( int index, double value );
void setProY( int index, double value );
#ifdef Q_FULL_TEMPLATE_INSTANTIATION
#ifdef TQ_FULL_TEMPLATE_INSTANTIATION
// xlC 3.x workaround
Q_DUMMY_COMPARISON_OPERATOR(Element)
bool operator!=( const Element&amp; e) const {

@ -322,9 +322,9 @@ body { background: #ffffff; color: black; }
# define TQT_NO_TEMPLATE_VARIANT
/* Wcc does not fill in functions needed by valuelists, maps, and
valuestacks implicitly */
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
/* can we just compare the structures? */
# define Q_FULL_TEMPLATE_INSTANTIATION_MEMCMP
# define TQ_FULL_TEMPLATE_INSTANTIATION_MEMCMP
/* these are not useful to our customers */
# define QT_QWS_NO_SHM
# define TQT_NO_QWS_MULTIPROCESS
@ -336,7 +336,7 @@ body { background: #ffffff; color: black; }
# define Q_CC_GNU
# define Q_C_CALLBACKS
# if __GNUC__ == 2 &amp;&amp; __GNUC_MINOR__ &lt;= 7
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
# endif
/* GCC 2.95 knows "using" but does not support it correctly */
# if __GNUC__ == 2 &amp;&amp; __GNUC_MINOR__ &lt;= 95
@ -386,7 +386,7 @@ body { background: #ffffff; color: black; }
but it is not defined on older compilers like C Set 3.1 */
#elif defined(__xlC__)
# define Q_CC_XLC
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
# if __xlC__ &lt; 0x400
# define Q_NO_BOOL_TYPE
# define Q_NO_EXPLICIT_KEYWORD
@ -570,7 +570,7 @@ body { background: #ffffff; color: black; }
# else
# define Q_CC_HP
# define Q_NO_BOOL_TYPE
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
# define Q_BROKEN_TEMPLATE_SPECIALIZATION
# define Q_NO_EXPLICIT_KEYWORD
# endif
@ -1081,7 +1081,7 @@ Q_EXPORT const char *tqInstallPathSysconf();
Just in case other code relies on it we better trigger a warning
mandating a real implementation.
*/
#ifdef Q_FULL_TEMPLATE_INSTANTIATION
#ifdef TQ_FULL_TEMPLATE_INSTANTIATION
# define Q_DUMMY_COMPARISON_OPERATOR(C) \
bool operator==( const C&amp; ) const { \
tqWarning( #C"::operator==( const "#C"&amp; ) got called." ); \

@ -764,7 +764,7 @@ public:
void remove( iterator it ) { detach(); sh-&gt;remove( it ); }
void remove( const Key&amp; k );
#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
bool operator==( const TQMap&lt;Key,T&gt;&amp; ) const { return FALSE; }
#ifndef TQT_NO_STL
bool operator==( const std::map&lt;Key,T&gt;&amp; ) const { return FALSE; }

@ -57,7 +57,7 @@ public:
void setProX( int index, double value );
void setProY( int index, double value );
#ifdef Q_FULL_TEMPLATE_INSTANTIATION
#ifdef TQ_FULL_TEMPLATE_INSTANTIATION
// xlC 3.x workaround
Q_DUMMY_COMPARISON_OPERATOR(Element)
bool operator!=( const Element& e) const {

@ -288,9 +288,9 @@
# define TQT_NO_TEMPLATE_VARIANT
/* Wcc does not fill in functions needed by valuelists, maps, and
valuestacks implicitly */
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
/* can we just compare the structures? */
# define Q_FULL_TEMPLATE_INSTANTIATION_MEMCMP
# define TQ_FULL_TEMPLATE_INSTANTIATION_MEMCMP
/* these are not useful to our customers */
# define QT_QWS_NO_SHM
# define TQT_NO_QWS_MULTIPROCESS
@ -302,7 +302,7 @@
# define Q_CC_GNU
# define Q_C_CALLBACKS
# if __GNUC__ == 2 && __GNUC_MINOR__ <= 7
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
# endif
/* GCC 2.95 knows "using" but does not support it correctly */
# if __GNUC__ == 2 && __GNUC_MINOR__ <= 95
@ -352,7 +352,7 @@
but it is not defined on older compilers like C Set 3.1 */
#elif defined(__xlC__)
# define Q_CC_XLC
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
# if __xlC__ < 0x400
# define Q_NO_BOOL_TYPE
# define Q_NO_EXPLICIT_KEYWORD
@ -536,7 +536,7 @@
# else
# define Q_CC_HP
# define Q_NO_BOOL_TYPE
# define Q_FULL_TEMPLATE_INSTANTIATION
# define TQ_FULL_TEMPLATE_INSTANTIATION
# define Q_BROKEN_TEMPLATE_SPECIALIZATION
# define Q_NO_EXPLICIT_KEYWORD
# endif
@ -1056,7 +1056,7 @@ Q_EXPORT const char *tqInstallPathShare();
Just in case other code relies on it we better trigger a warning
mandating a real implementation.
*/
#ifdef Q_FULL_TEMPLATE_INSTANTIATION
#ifdef TQ_FULL_TEMPLATE_INSTANTIATION
# define Q_DUMMY_COMPARISON_OPERATOR(C) \
bool operator==( const C& ) const { \
tqWarning( #C"::operator==( const "#C"& ) got called." ); \

@ -733,7 +733,7 @@ public:
void remove( iterator it ) { detach(); sh->remove( it ); }
void remove( const Key& k );
#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
bool operator==( const TQMap<Key,T>& ) const { return FALSE; }
#ifndef TQT_NO_STL
bool operator==( const std::map<Key,T>& ) const { return FALSE; }

@ -63,7 +63,7 @@ class Project;
struct DesignerFormWindow;
class FormFile;
#if defined(Q_CC_MSVC) || defined(Q_FULL_TEMPLATE_INSTANTIATION)
#if defined(Q_CC_MSVC) || defined(TQ_FULL_TEMPLATE_INSTANTIATION)
#include "orderindicator.h"
#else
class OrderIndicator;

@ -74,7 +74,7 @@ class SourceFile;
class FormFile;
class TQAssistantClient;
#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
#include <ntqtoolbar.h>
#else
class TQToolBar;

@ -66,7 +66,7 @@ public:
int openingBraceLineNum() const { return lineno1; }
int closingBraceLineNum() const { return lineno2; }
#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
bool operator==( const CppFunction& ) const { return FALSE; }
#endif

@ -48,7 +48,7 @@ struct DlgConnection
TQString signal;
TQString slot;
#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
bool operator==( const DlgConnection& ) const {
return sender == sender && signal == signal && slot == slot;
}

Loading…
Cancel
Save