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

Fixed broken Q_FULL_TEMPLATE_INSTANTIATION define (renamed to TQ_FULL_TEMPLATE_INSTANTIATION).

Browse Source 
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
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
doc/html/canvas-chart-example.html
Unescape View File

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

2
doc/html/chart-element-h.html
Unescape View File

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

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

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

2
doc/html/qmap-h.html
Unescape View File

@ -764,7 +764,7 @@ public:
void remove( iterator it ) { detach(); sh-&gt;remove( it ); } void remove( iterator it ) { detach(); sh-&gt;remove( it ); }
void remove( const Key&amp; k ); 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; } bool operator==( const TQMap&lt;Key,T&gt;&amp; ) const { return FALSE; }
#ifndef TQT_NO_STL #ifndef TQT_NO_STL
bool operator==( const std::map&lt;Key,T&gt;&amp; ) const { return FALSE; } bool operator==( const std::map&lt;Key,T&gt;&amp; ) const { return FALSE; }

2
examples/chart/element.h
Unescape View File

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

12
src/tools/ntqglobal.h
Unescape View File

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

2
src/tools/ntqmap.h
Unescape View File

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

2
tools/designer/designer/formwindow.h
Unescape View File

@ -63,7 +63,7 @@ class Project;
struct DesignerFormWindow; struct DesignerFormWindow;
class FormFile; 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" #include "orderindicator.h"
#else #else
class OrderIndicator; class OrderIndicator;

2
tools/designer/designer/mainwindow.h
Unescape View File

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

2
tools/designer/plugins/cppeditor/yyreg.h
Unescape View File

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

2
tools/designer/plugins/dlg/dlg2ui.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save