Added tqDebug/tqWarning/tqFatal functions that takes a TQCString

argument. This fixes FTBFS of examples caused by previous ambiguous
call and solves bug 3021.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 80dc1e5317)
r14.0.x
Michele Calgaro 5 years ago committed by Slávek Banko
parent 3823c75b92
commit c133a629f0
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -753,6 +753,7 @@ typedef TQ_UINT64 TQ_ULLONG; // unsigned long long
// Data stream functions is provided by many classes (defined in ntqdatastream.h)
//
class TQCString;
class TQDataStream;
class TQString;
@ -976,6 +977,7 @@ Q_EXPORT int qWinVersion();
Q_EXPORT void tqDebug( const TQString& ); // print debug message
Q_EXPORT void tqDebug( const TQCString& ); // print debug message
Q_EXPORT void tqDebug( const char *, ... ) // print debug message
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
@ -983,13 +985,15 @@ Q_EXPORT void tqDebug( const char *, ... ) // print debug message
;
Q_EXPORT void tqWarning( const TQString& ); // print warning message
Q_EXPORT void tqWarning( const TQCString& ); // print warning message
Q_EXPORT void tqWarning( const char *, ... ) // print warning message
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
Q_EXPORT void tqFatal( const TQString& ); // print fatal message and exit
Q_EXPORT void tqFatal( const TQString& ); // print fatal message and exit
Q_EXPORT void tqFatal( const TQCString& ); // print fatal message and exit
Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit
#if defined(Q_CC_GNU)
__attribute__ ((format (printf, 1, 2)))

@ -582,6 +582,11 @@ void warning( const char *msg, ... )
handle_buffer(buf, TQtDebugMsg);
}
void tqDebug( const TQCString &s )
{
tqDebug(s.data());
}
void tqWarning( const TQString &msg )
{
char buf[QT_BUFFER_LENGTH];
@ -612,6 +617,11 @@ void tqWarning( const char *msg, ... )
handle_buffer(buf, TQtWarningMsg);
}
void tqWarning( const TQCString &s )
{
tqWarning(s.data());
}
void tqFatal( const TQString &msg )
{
char buf[QT_BUFFER_LENGTH];
@ -677,6 +687,11 @@ void fatal( const char *msg, ... )
handle_buffer(buf, TQtFatalMsg);
}
void tqFatal( const TQCString &s )
{
tqWarning(s.data());
}
/*!
\relates TQApplication

Loading…
Cancel
Save