summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-09-05 11:02:47 +0900
committerSlávek Banko <slavek.banko@axis.cz>2021-12-30 00:01:58 +0100
commitc133a629f0f947ea6cddc1f938f8cbb9c42d87e5 (patch)
tree23a5eccc17a6b0d54098642182a9b4f46e6e3da4
parent3823c75b929667be742871103295ed225fb570f8 (diff)
downloadtqt3-c133a629f0f947ea6cddc1f938f8cbb9c42d87e5.tar.gz
tqt3-c133a629f0f947ea6cddc1f938f8cbb9c42d87e5.zip
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 80dc1e5317f9bf799df2493381484b1b65e77b5f)
-rw-r--r--src/tools/ntqglobal.h6
-rw-r--r--src/tools/qglobal.cpp15
2 files changed, 20 insertions, 1 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 9b0dbed20..c88e18463 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -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)))
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 5c9663df5..9d7d89378 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -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