summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/tools/ntqglobal.h11
-rw-r--r--src/tools/qglobal.cpp122
2 files changed, 85 insertions, 48 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 11d6db8bb..458389cfd 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -744,7 +744,7 @@ typedef TQ_UINT64 TQ_ULLONG; // unsigned long long
//
class TQDataStream;
-
+class TQString;
//
// Feature subsetting
@@ -959,19 +959,22 @@ Q_EXPORT int qWinVersion();
#endif
-Q_EXPORT void tqDebug( const char *, ... ) // print debug message
+Q_EXPORT void tqDebug( const TQString& ); // print debug message
+Q_EXPORT void tqDebug( const char *, ... ) // print debug message
#if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2)))
#endif
;
-Q_EXPORT void tqWarning( const char *, ... ) // print warning message
+Q_EXPORT void tqWarning( const TQString& ); // 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 char *, ... ) // print fatal message and exit
+Q_EXPORT void tqFatal( const TQString& ); // 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)))
#endif
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 46d90e1bb..e0a198ca3 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -465,21 +465,27 @@ static void mac_default_handler( const char *msg )
#endif
-void tqDebug( const char *msg, ... )
+void handle_buffer(const char *buf, TQtMsgType msgType)
{
- char buf[QT_BUFFER_LENGTH];
- strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").ascii() );
- int len = strlen(buf);
- va_list ap;
- va_start( ap, msg ); // use variable arg list
-#if defined(QT_VSNPRINTF)
- QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH, msg, ap );
+ if ( handler ) {
+ (*handler)( msgType, buf );
+ } else if (msgType == TQtFatalMsg) {
+#if defined(Q_CC_MWERKS)
+ mac_default_handler(buf);
#else
- vsprintf( &buf[len], msg, ap );
+ fprintf( stderr, "%s\n", buf ); // add newline
+#endif
+#if defined(Q_OS_UNIX) && defined(QT_DEBUG)
+ abort(); // trap; generates core dump
+#elif defined(Q_OS_TEMP) && defined(QT_DEBUG)
+ TQString fstr;
+ fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, TQT_VERSION_STR, buf );
+ OutputDebugString( fstr.ucs2() );
+#elif defined(_CRT_ERROR) && defined(_DEBUG)
+ _CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, TQT_VERSION_STR, buf );
+#else
+ exit( 1 ); // goodbye cruel world
#endif
- va_end( ap );
- if ( handler ) {
- (*handler)( TQtDebugMsg, buf );
} else {
#if defined(Q_CC_MWERKS)
mac_default_handler(buf);
@@ -492,10 +498,24 @@ void tqDebug( const char *msg, ... )
}
}
-void tqWarning( const char *msg, ... )
+void tqDebug( const TQString &msg )
{
char buf[QT_BUFFER_LENGTH];
- strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").ascii() );
+ strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").local8Bit() );
+ int len = strlen(buf);
+ strncpy( &buf[len], msg.local8Bit(), QT_BUFFER_LENGTH - len - 1 );
+ len += msg.length();
+ if (len >= QT_BUFFER_LENGTH) {
+ len = QT_BUFFER_LENGTH - 1;
+ }
+ buf[len] = '\0';
+ handle_buffer(buf, TQtDebugMsg);
+}
+
+void tqDebug( const char *msg, ... )
+{
+ char buf[QT_BUFFER_LENGTH];
+ strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").local8Bit() );
int len = strlen(buf);
va_list ap;
va_start( ap, msg ); // use variable arg list
@@ -505,24 +525,57 @@ void tqWarning( const char *msg, ... )
vsprintf( &buf[len], msg, ap );
#endif
va_end( ap );
- if ( handler ) {
- (*handler)( TQtWarningMsg, buf );
- } else {
-#if defined(Q_CC_MWERKS)
- mac_default_handler(buf);
-#elif defined(Q_OS_TEMP)
- TQString fstr( buf );
- OutputDebugString( (fstr + "\n").ucs2() );
+ handle_buffer(buf, TQtDebugMsg);
+}
+
+void tqWarning( const TQString &msg )
+{
+ char buf[QT_BUFFER_LENGTH];
+ strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").local8Bit() );
+ int len = strlen(buf);
+ strncpy( &buf[len], msg.local8Bit(), QT_BUFFER_LENGTH - len - 1 );
+ len += msg.length();
+ if (len >= QT_BUFFER_LENGTH) {
+ len = QT_BUFFER_LENGTH - 1;
+ }
+ buf[len] = '\0';
+ handle_buffer(buf, TQtWarningMsg);
+}
+
+void tqWarning( const char *msg, ... )
+{
+ char buf[QT_BUFFER_LENGTH];
+ strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").local8Bit() );
+ int len = strlen(buf);
+ va_list ap;
+ va_start( ap, msg ); // use variable arg list
+#if defined(QT_VSNPRINTF)
+ QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH, msg, ap );
#else
- fprintf( stderr, "%s\n", buf ); // add newline
+ vsprintf( &buf[len], msg, ap );
#endif
+ va_end( ap );
+ handle_buffer(buf, TQtWarningMsg);
+}
+
+void tqFatal( const TQString &msg )
+{
+ char buf[QT_BUFFER_LENGTH];
+ strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").local8Bit() );
+ int len = strlen(buf);
+ strncpy( &buf[len], msg.local8Bit(), QT_BUFFER_LENGTH - len - 1 );
+ len += msg.length();
+ if (len >= QT_BUFFER_LENGTH) {
+ len = QT_BUFFER_LENGTH - 1;
}
+ buf[len] = '\0';
+ handle_buffer(buf, TQtFatalMsg);
}
void tqFatal( const char *msg, ... )
{
char buf[QT_BUFFER_LENGTH];
- strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").ascii() );
+ strcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").local8Bit() );
int len = strlen(buf);
va_list ap;
va_start( ap, msg ); // use variable arg list
@@ -532,26 +585,7 @@ void tqFatal( const char *msg, ... )
vsprintf( &buf[len], msg, ap );
#endif
va_end( ap );
- if ( handler ) {
- (*handler)( TQtFatalMsg, buf );
- } else {
-#if defined(Q_CC_MWERKS)
- mac_default_handler(buf);
-#else
- fprintf( stderr, "%s\n", buf ); // add newline
-#endif
-#if defined(Q_OS_UNIX) && defined(QT_DEBUG)
- abort(); // trap; generates core dump
-#elif defined(Q_OS_TEMP) && defined(QT_DEBUG)
- TQString fstr;
- fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, TQT_VERSION_STR, buf );
- OutputDebugString( fstr.ucs2() );
-#elif defined(_CRT_ERROR) && defined(_DEBUG)
- _CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, TQT_VERSION_STR, buf );
-#else
- exit( 1 ); // goodbye cruel world
-#endif
- }
+ handle_buffer(buf, TQtFatalMsg);
}
/*!
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 00:59:59 +0000