23
23
#include < cstdio> // for vsnprintf
24
24
#include < cstdlib> // for exit
25
25
26
- #include < QByteArray> // for QByteArray
27
26
#include < QDebug> // for QDebug
27
+ #include < QString> // for QString
28
28
#include < QtGlobal> // for qCritical, qDebug, qInfo, qWarning
29
29
30
30
#include " defs.h" // for DebugLog, gbFatal, gbDebug, gbInfo, gbWarning
@@ -59,6 +59,7 @@ gbFatal(const char* fmt, ...)
59
59
va_list args;
60
60
va_start (args, fmt);
61
61
gbVLog (QtCriticalMsg, fmt, args);
62
+ gbFlush (QtCriticalMsg);
62
63
va_end (args);
63
64
exit (1 );
64
65
}
@@ -97,24 +98,23 @@ static QString gbCriticalLogString_;
97
98
98
99
static QString& getLogString (QtMsgType type)
99
100
{
100
- QString& logString = gbDebugLogString_;
101
101
switch (type)
102
102
{
103
103
case QtDebugMsg:
104
- logString = gbDebugLogString_;
104
+ return gbDebugLogString_;
105
105
break ;
106
106
case QtInfoMsg:
107
- logString = gbInfoLogString_;
107
+ return gbInfoLogString_;
108
108
break ;
109
109
case QtWarningMsg:
110
- logString = gbWarningLogString_;
110
+ return gbWarningLogString_;
111
111
break ;
112
112
case QtCriticalMsg:
113
113
case QtFatalMsg:
114
- logString = gbCriticalLogString_;
114
+ default :
115
+ return gbCriticalLogString_;
115
116
break ;
116
117
}
117
- return logString;
118
118
}
119
119
120
120
static void sendLogMsg (QtMsgType type, const QString& msg)
@@ -132,6 +132,7 @@ static void sendLogMsg(QtMsgType type, const QString& msg)
132
132
break ;
133
133
case QtCriticalMsg:
134
134
case QtFatalMsg:
135
+ default :
135
136
qCritical ().noquote () << msg;
136
137
break ;
137
138
}
0 commit comments