aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QStringLiteral everywhere inside noisyFailureMsgHandler().

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-07-20 11:25:53 +03:00
parent dc275dce14
commit f477904ef3
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/tape/mapplication.cpp
View File

@ -79,14 +79,14 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
Q_UNUSED(context) Q_UNUSED(context)
// Why on earth didn't Qt want to make failed signal/slot connections qWarning? // Why on earth didn't Qt want to make failed signal/slot connections qWarning?
if ((type == QtDebugMsg) && msg.contains("::connect")) if ((type == QtDebugMsg) && msg.contains(QStringLiteral("::connect")))
{ {
type = QtWarningMsg; type = QtWarningMsg;
} }
#if !defined(V_NO_ASSERT) #if !defined(V_NO_ASSERT)
// I have decided to hide this annoing message for release builds. // I have decided to hide this annoing message for release builds.
if ((type == QtWarningMsg) && msg.contains("setGeometry: Unable to set geometry")) if ((type == QtWarningMsg) && msg.contains(QStringLiteral("setGeometry: Unable to set geometry")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
@ -97,7 +97,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// Try hide very annoying, Qt related, warnings in Mac OS X // Try hide very annoying, Qt related, warnings in Mac OS X
// QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton) // QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton)
// https://bugreports.qt.io/browse/QTBUG-42846 // https://bugreports.qt.io/browse/QTBUG-42846
if ((type == QtWarningMsg) && msg.contains("QNSView")) if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QNSView")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
@ -106,7 +106,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// Hide Qt bug 'Assertion when reading an icns file' // Hide Qt bug 'Assertion when reading an icns file'
// https://bugreports.qt.io/browse/QTBUG-45537 // https://bugreports.qt.io/browse/QTBUG-45537
// Remove after Qt fix will be released // Remove after Qt fix will be released
if ((type == QtWarningMsg) && msg.contains("QICNSHandler::read()")) if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QICNSHandler::read()")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
@ -115,7 +115,8 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// this is another one that doesn't make sense as just a debug message. pretty serious // this is another one that doesn't make sense as just a debug message. pretty serious
// sign of a problem // sign of a problem
// http://www.developer.nokia.com/Community/Wiki/QPainter::begin:Paint_device_returned_engine_%3D%3D_0_(Known_Issue) // http://www.developer.nokia.com/Community/Wiki/QPainter::begin:Paint_device_returned_engine_%3D%3D_0_(Known_Issue)
if ((type == QtDebugMsg) && msg.contains("QPainter::begin") && msg.contains("Paint device returned engine")) if ((type == QtDebugMsg) && msg.contains(QStringLiteral("QPainter::begin"))
&& msg.contains(QStringLiteral("Paint device returned engine")))
{ {
type = QtWarningMsg; type = QtWarningMsg;
} }
@ -123,8 +124,8 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// This qWarning about "Cowardly refusing to send clipboard message to hung application..." // This qWarning about "Cowardly refusing to send clipboard message to hung application..."
// is something that can easily happen if you are debugging and the application is paused. // is something that can easily happen if you are debugging and the application is paused.
// As it is so common, not worth popping up a dialog. // As it is so common, not worth popping up a dialog.
if ((type == QtWarningMsg) && QString(msg).contains("QClipboard::event") if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QClipboard::event"))
&& QString(msg).contains("Cowardly refusing")) && msg.contains(QStringLiteral("Cowardly refusing")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }

17
src/app/valentina/core/vapplication.cpp
View File

@ -75,14 +75,14 @@ Q_DECL_CONSTEXPR auto DAYS_TO_KEEP_LOGS = 3;
inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{ {
// Why on earth didn't Qt want to make failed signal/slot connections qWarning? // Why on earth didn't Qt want to make failed signal/slot connections qWarning?
if ((type == QtDebugMsg) && msg.contains("::connect")) if ((type == QtDebugMsg) && msg.contains(QStringLiteral("::connect")))
{ {
type = QtWarningMsg; type = QtWarningMsg;
} }
#if !defined(V_NO_ASSERT) #if !defined(V_NO_ASSERT)
// I have decided to hide this annoing message for release builds. // I have decided to hide this annoing message for release builds.
if ((type == QtWarningMsg) && msg.contains("setGeometry: Unable to set geometry")) if ((type == QtWarningMsg) && msg.contains(QStringLiteral("setGeometry: Unable to set geometry")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
@ -93,7 +93,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// Try hide very annoying, Qt related, warnings in Mac OS X // Try hide very annoying, Qt related, warnings in Mac OS X
// QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton) // QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton)
// https://bugreports.qt.io/browse/QTBUG-42846 // https://bugreports.qt.io/browse/QTBUG-42846
if ((type == QtWarningMsg) && msg.contains("QNSView")) if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QNSView")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
@ -102,7 +102,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// Hide Qt bug 'Assertion when reading an icns file' // Hide Qt bug 'Assertion when reading an icns file'
// https://bugreports.qt.io/browse/QTBUG-45537 // https://bugreports.qt.io/browse/QTBUG-45537
// Remove after Qt fix will be released // Remove after Qt fix will be released
if ((type == QtWarningMsg) && msg.contains("QICNSHandler::read()")) if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QICNSHandler::read()")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
@ -111,7 +111,8 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// this is another one that doesn't make sense as just a debug message. pretty serious // this is another one that doesn't make sense as just a debug message. pretty serious
// sign of a problem // sign of a problem
// http://www.developer.nokia.com/Community/Wiki/QPainter::begin:Paint_device_returned_engine_%3D%3D_0_(Known_Issue) // http://www.developer.nokia.com/Community/Wiki/QPainter::begin:Paint_device_returned_engine_%3D%3D_0_(Known_Issue)
if ((type == QtDebugMsg) && msg.contains("QPainter::begin") && msg.contains("Paint device returned engine")) if ((type == QtDebugMsg) && msg.contains(QStringLiteral("QPainter::begin"))
&& msg.contains(QStringLiteral("Paint device returned engine")))
{ {
type = QtWarningMsg; type = QtWarningMsg;
} }
@ -119,8 +120,8 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
// This qWarning about "Cowardly refusing to send clipboard message to hung application..." // This qWarning about "Cowardly refusing to send clipboard message to hung application..."
// is something that can easily happen if you are debugging and the application is paused. // is something that can easily happen if you are debugging and the application is paused.
// As it is so common, not worth popping up a dialog. // As it is so common, not worth popping up a dialog.
if ((type == QtWarningMsg) && QString(msg).contains("QClipboard::event") if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QClipboard::event"))
&& QString(msg).contains("Cowardly refusing")) && msg.contains(QStringLiteral("Cowardly refusing")))
{ {
type = QtDebugMsg; type = QtDebugMsg;
} }
@ -132,7 +133,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con
const bool isGuiThread = instance && (QThread::currentThread() == instance->thread()); const bool isGuiThread = instance && (QThread::currentThread() == instance->thread());
{ {
QString debugdate = "[" + QDateTime::currentDateTime().toString("yyyy.MM.dd hh:mm:ss"); QString debugdate = "[" + QDateTime::currentDateTime().toString(QStringLiteral("yyyy.MM.dd hh:mm:ss"));
switch (type) switch (type)
{ {