Fixed broken Q_FULL_TEMPLATE_INSTANTIATION define (renamed to TQ_FULL_TEMPLATE_INSTANTIATION).

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 0f480dc43f6a3dc50b438a17fc2526ca444065ec)

11 files changed, 21 insertions, 21 deletions

diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html
index fb33afb32..a61b0503c 100644
--- a/doc/html/canvas-chart-example.html
+++ b/doc/html/canvas-chart-example.html
@@ -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& e) const {
diff --git a/doc/html/chart-element-h.html b/doc/html/chart-element-h.html
index b5efd1db9..db2295b01 100644
--- a/doc/html/chart-element-h.html
+++ b/doc/html/chart-element-h.html
@@ -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& e) const {
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 953f5d895..9905ca805 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -322,9 +322,9 @@ body { background: #ffffff; color: black; }
 #    define QT_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 QT_NO_QWS_MULTIPROCESS
@@ -336,7 +336,7 @@ body { background: #ffffff; color: black; }
 #  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
@@ -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__ < 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
@@ -1122,7 +1122,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& ) const { \
         tqWarning( #C"::operator==( const "#C"& ) got called." ); \
diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html
index aa67795ec..4f2a90f04 100644
--- a/doc/html/qmap-h.html
+++ b/doc/html/qmap-h.html
@@ -764,7 +764,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 QT_NO_STL
     bool operator==( const std::map<Key,T>& ) const { return FALSE; }
diff --git a/examples/chart/element.h b/examples/chart/element.h
index da5476842..4b1b81ad0 100644
--- a/examples/chart/element.h
+++ b/examples/chart/element.h
@@ -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 {
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 8d1da7d1c..bc67fcae4 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -290,9 +290,9 @@
 #    define QT_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 QT_NO_QWS_MULTIPROCESS
@@ -304,7 +304,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
@@ -354,7 +354,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
@@ -538,7 +538,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
@@ -1095,7 +1095,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." ); \
diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h
index 3139e7fe9..f4cf4b9c8 100644
--- a/src/tools/ntqmap.h
+++ b/src/tools/ntqmap.h
@@ -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 QT_NO_STL
     bool operator==( const std::map<Key,T>& ) const { return FALSE; }
diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h
index cfbfed213..12f27998f 100644
--- a/tools/designer/designer/formwindow.h
+++ b/tools/designer/designer/formwindow.h
@@ -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;
diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h
index b18618a98..e5037451a 100644
--- a/tools/designer/designer/mainwindow.h
+++ b/tools/designer/designer/mainwindow.h
@@ -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;
diff --git a/tools/designer/plugins/cppeditor/yyreg.h b/tools/designer/plugins/cppeditor/yyreg.h
index a39eac828..5ac3fc2f3 100644
--- a/tools/designer/plugins/cppeditor/yyreg.h
+++ b/tools/designer/plugins/cppeditor/yyreg.h
@@ -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
 
diff --git a/tools/designer/plugins/dlg/dlg2ui.h b/tools/designer/plugins/dlg/dlg2ui.h
index 2aaf5672a..73150f77f 100644
--- a/tools/designer/plugins/dlg/dlg2ui.h
+++ b/tools/designer/plugins/dlg/dlg2ui.h
@@ -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;
     }