Added tqDebug/tqWarning/tqFatal functions that takes a QCString

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 300c4d2bd2)
r14.0.x
Michele Calgaro 5 years ago committed by Slávek Banko
parent 1b74fac43d
commit 0e9efe6bf1
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -582,6 +582,11 @@ void warning( const char *msg, ... )
handle_buffer(buf, QtDebugMsg);
}
void qDebug( const QCString &s )
{
qDebug(s.data());
}
void qWarning( const QString &msg )
{
char buf[QT_BUFFER_LENGTH];
@ -612,6 +617,11 @@ void qWarning( const char *msg, ... )
handle_buffer(buf, QtWarningMsg);
}
void qWarning( const QCString &s )
{
qWarning(s.data());
}
void qFatal( const QString &msg )
{
char buf[QT_BUFFER_LENGTH];
@ -677,6 +687,11 @@ void fatal( const char *msg, ... )
handle_buffer(buf, QtFatalMsg);
}
void qFatal( const QCString &s )
{
qWarning(s.data());
}
/*!
\relates QApplication

@ -751,6 +751,7 @@ typedef Q_UINT64 Q_ULLONG; // unsigned long long
// Data stream functions is provided by many classes (defined in qdatastream.h)
//
class QCString;
class QDataStream;
class QString;
@ -974,6 +975,7 @@ Q_EXPORT int qWinVersion();
Q_EXPORT void qDebug( const QString& ); // print debug message
Q_EXPORT void qDebug( const QCString& ); // print debug message
Q_EXPORT void qDebug( const char *, ... ) // print debug message
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
@ -981,13 +983,15 @@ Q_EXPORT void qDebug( const char *, ... ) // print debug message
;
Q_EXPORT void qWarning( const QString& ); // print warning message
Q_EXPORT void qWarning( const QCString& ); // print warning message
Q_EXPORT void qWarning( const char *, ... ) // print warning message
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
Q_EXPORT void qFatal( const QString& ); // print fatal message and exit
Q_EXPORT void qFatal( const QString& ); // print fatal message and exit
Q_EXPORT void qFatal( const QCString& ); // print fatal message and exit
Q_EXPORT void qFatal( const char *, ... ) // print fatal message and exit
#if defined(Q_CC_GNU)
__attribute__ ((format (printf, 1, 2)))

Loading…
Cancel
Save