feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use new, more evocative MessageManager API

Browse Source 
At various places where semantics doesn't change.

Change-Id: Ib4d4a5c9f067e109126c6de88257f9e198a71447
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-12-15 10:13:13 +01:00
parent c898047880
commit eaefcbd8f0
14 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/autotestplugin.cpp
View File

@@ -381,7 +381,7 @@ void AutotestPluginPrivate::onRunUnderCursorTriggered(TestRunMode mode)
filteredItems.size() == 1 ? filteredItems : testsItems, mode);
if (testsToRun.isEmpty()) {
MessageManager::write(tr("Selected test was not found (%1).").arg(text), MessageManager::Flash);
MessageManager::writeFlashing(tr("Selected test was not found (%1).").arg(text));
return;
}

2
src/plugins/clangcodemodel/clangbackendcommunicator.cpp
View File

@@ -444,7 +444,7 @@ void BackendCommunicator::logError(const QString &text)
{
const QString textWithTimestamp = QDateTime::currentDateTime().toString(Qt::ISODate)
+ ' ' + text;
Core::MessageManager::write(textWithTimestamp, Core::MessageManager::Flash);
Core::MessageManager::writeFlashing(textWithTimestamp);
qWarning("%s", qPrintable(textWithTimestamp));
}

2
src/plugins/clangcodemodel/clangcodemodelplugin.cpp
View File

@@ -149,7 +149,7 @@ void ClangCodeModelPlugin::createCompilationDBButton()
} else {
message = tr("Generating Clang compilation database failed: %1").arg(result.error);
}
Core::MessageManager::write(message, Core::MessageManager::Flash);
Core::MessageManager::writeFlashing(message);
m_generateCompilationDBAction->setEnabled(
isDBGenerationEnabled(ProjectExplorer::SessionManager::startupProject()));
});

8
src/plugins/coreplugin/messagemanager.cpp
View File

@@ -215,14 +215,6 @@ void MessageManager::writeDisrupting(const QStringList &messages)
writeDisrupting(messages.join('\n'));
}
/*!
\internal
*/
void MessageManager::writeMessages(const QStringList &messages, PrintToOutputPaneFlags flags)
{
write(messages.join('\n'), flags);
}
/*!
\internal
*/

2
src/plugins/coreplugin/messagemanager.h
View File

@@ -68,8 +68,6 @@ public:
static void writeFlashing(const QStringList &messages);
static void writeDisrupting(const QStringList &messages);
static void writeMessages(const QStringList &messages,
PrintToOutputPaneFlags flags = NoModeSwitch);
static void write(const QString &text, PrintToOutputPaneFlags flags = NoModeSwitch);
static void writeWithTime(const QString &text, PrintToOutputPaneFlags flags = NoModeSwitch);

2
src/plugins/cppcheck/cppcheckrunner.cpp
View File

@@ -206,7 +206,7 @@ void CppcheckRunner::handleFinished(int)
m_tool.finishParsing();
} else {
const QString message = tr("Cppcheck failed to start: \"%1\".").arg(currentCommand());
Core::MessageManager::write(message, Core::MessageManager::Silent);
Core::MessageManager::writeSilently(message);
}
m_currentFiles.clear();
m_process->close();

8
src/plugins/cppcheck/cppchecktool.cpp
View File

@@ -245,7 +245,7 @@ void CppcheckTool::startParsing()
{
if (m_options.showOutput) {
const QString message = tr("Cppcheck started: \"%1\".").arg(m_runner->currentCommand());
Core::MessageManager::write(message, Core::MessageManager::Silent);
Core::MessageManager::writeSilently(message);
}
m_progress = std::make_unique<QFutureInterface<void>>();
@@ -263,7 +263,7 @@ void CppcheckTool::parseOutputLine(const QString &line)
return;
if (m_options.showOutput)
Core::MessageManager::write(line, Core::MessageManager::Silent);
Core::MessageManager::writeSilently(line);
enum Matches { Percentage = 1 };
const QRegularExpressionMatch match = m_progressRegexp.match(line);
@@ -294,7 +294,7 @@ void CppcheckTool::parseErrorLine(const QString &line)
return;
if (m_options.showOutput)
Core::MessageManager::write(line, Core::MessageManager::Silent);
Core::MessageManager::writeSilently(line);
enum Matches { File = 1, Line, Severity, Id, Message };
const QRegularExpressionMatch match = m_messageRegexp.match(line);
@@ -319,7 +319,7 @@ void CppcheckTool::parseErrorLine(const QString &line)
void CppcheckTool::finishParsing()
{
if (m_options.showOutput)
Core::MessageManager::write(tr("Cppcheck finished."), Core::MessageManager::Silent);
Core::MessageManager::writeSilently(tr("Cppcheck finished."));
QTC_ASSERT(m_progress, return);
m_progress->reportFinished();

5
src/plugins/cpptools/cpptoolsreuse.cpp
View File

@@ -322,9 +322,8 @@ bool fileSizeExceedsLimit(const QFileInfo &fileInfo, int sizeLimitInMb)
"C++ Indexer: Skipping file \"%1\" because it is too big.")
.arg(absoluteFilePath);
QMetaObject::invokeMethod(Core::MessageManager::instance(), [msg]() {
Core::MessageManager::write(msg, Core::MessageManager::Silent);
});
QMetaObject::invokeMethod(Core::MessageManager::instance(),
[msg]() { Core::MessageManager::writeSilently(msg); });
return true;
}

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1379,7 +1379,7 @@ void DebuggerPluginPrivate::parseCommandLineArguments()
errorMessage = tr("Error evaluating command line arguments: %1")
.arg(errorMessage);
qWarning("%s\n", qPrintable(errorMessage));
MessageManager::write(errorMessage);
MessageManager::writeDisrupting(errorMessage);
}
if (!m_scheduledStarts.isEmpty())
QTimer::singleShot(0, this, &DebuggerPluginPrivate::runScheduled);

5
src/plugins/perfprofiler/perfdatareader.cpp
View File

@@ -133,9 +133,8 @@ PerfDataReader::PerfDataReader(QObject *parent) :
});
connect(&m_input, &QProcess::readyReadStandardOutput, this, &PerfDataReader::readFromDevice);
connect(&m_input, &QProcess::readyReadStandardError, this, [this](){
Core::MessageManager::write(QString::fromLocal8Bit(m_input.readAllStandardError()),
Core::MessageManager::Silent);
connect(&m_input, &QProcess::readyReadStandardError, this, [this]() {
Core::MessageManager::writeSilently(QString::fromLocal8Bit(m_input.readAllStandardError()));
});
setDevice(&m_input);

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -244,7 +244,7 @@ void ModelManager::loadDefaultQmlTypeDescriptions()
void ModelManager::writeMessageInternal(const QString &msg) const
{
MessageManager::write(msg, MessageManager::Flash);
MessageManager::writeFlashing(msg);
}
ModelManagerInterface::WorkingCopy ModelManager::workingCopyInternal() const

7
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -571,12 +571,7 @@ ProjectExplorer::RunControl *QmlProfilerTool::attachToWaitingApplication()
void QmlProfilerTool::logState(const QString &msg)
{
MessageManager::write(msg, MessageManager::Flash);
}
void QmlProfilerTool::logError(const QString &msg)
{
MessageManager::write(msg);
MessageManager::writeFlashing(msg);
}
void QmlProfilerTool::showErrorDialog(const QString &error)

1
src/plugins/qmlprofiler/qmlprofilertool.h
View File

@@ -63,7 +63,6 @@ public:
// display dialogs / log output
static void logState(const QString &msg);
static void logError(const QString &msg);
static void showNonmodalWarning(const QString &warningMsg);
QmlProfilerClientManager *clientManager();

2
src/plugins/qtsupport/profilereader.cpp
View File

@@ -45,7 +45,7 @@ ProMessageHandler::ProMessageHandler(bool verbose, bool exact)
ProMessageHandler::~ProMessageHandler()
{
if (!m_messages.isEmpty())
Core::MessageManager::writeMessages(m_messages, Core::MessageManager::Flash);
Core::MessageManager::writeFlashing(m_messages);
}