diff options
| author | hjk <hjk121@nokiamail.com> | 2013-09-05 01:52:17 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-09-05 12:51:00 +0200 |
| commit | 527046acc212691b20be60d450c249d8d7dcbe12 (patch) | |
| tree | 5d4e4f2e5d4359a2da95ecec20e8f3c59513b239 /src/plugins/qmljstools | |
| parent | aadb6f16af94a2baff9d13772e9ddce33faa7650 (diff) | |
MessageManager: General cleanup.
Apply 'static' pattern, rename 'printToOutputPane' to 'write'
Change-Id: I6f31f1a8c914661e2a2182c0b6256b41ead28de7
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qmljstools/qmljsplugindumper.cpp | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 2deef581827..a0bdef083c6 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -313,11 +313,10 @@ void ModelManager::loadQmlTypeDescriptions(const QString &resourcePath) CppQmlTypesLoader::defaultLibraryObjects.unite( CppQmlTypesLoader::loadQmlTypes(qmlTypesFiles, &errors, &warnings)); - MessageManager *messageManager = MessageManager::instance(); foreach (const QString &error, errors) - messageManager->printToOutputPane(error, MessageManager::Flash); + MessageManager::write(error, MessageManager::Flash); foreach (const QString &warning, warnings) - messageManager->printToOutputPane(warning, MessageManager::Flash); + MessageManager::write(warning, MessageManager::Flash); } ModelManagerInterface::WorkingCopy ModelManager::workingCopy() const diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index f4e88cf84be..33565307673 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.cpp +++ b/src/plugins/qmljstools/qmljsplugindumper.cpp @@ -253,8 +253,7 @@ static QString qmldumpFailedMessage(const QString &libraryPath, const QString &e static void printParseWarnings(const QString &libraryPath, const QString &warning) { - Core::MessageManager *messageManager = Core::MessageManager::instance(); - messageManager->printToOutputPane( + Core::MessageManager::write( PluginDumper::tr("Warnings while parsing qmltypes information of %1:\n" "%2").arg(libraryPath, warning), Core::MessageManager::Flash); @@ -314,9 +313,8 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode) LibraryInfo libraryInfo = snapshot.libraryInfo(libraryPath); if (exitCode != 0) { - Core::MessageManager *messageManager = Core::MessageManager::instance(); const QString errorMessages = qmlPluginDumpErrorMessage(process); - messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages), + Core::MessageManager::write(qmldumpErrorMessage(libraryPath, errorMessages), Core::MessageManager::Flash); libraryInfo.setPluginTypeInfoStatus(LibraryInfo::DumpError, qmldumpFailedMessage(libraryPath, errorMessages)); } @@ -356,9 +354,8 @@ void PluginDumper::qmlPluginTypeDumpError(QProcess::ProcessError) if (libraryPath.isEmpty()) return; - Core::MessageManager *messageManager = Core::MessageManager::instance(); const QString errorMessages = qmlPluginDumpErrorMessage(process); - messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages), + Core::MessageManager::write(qmldumpErrorMessage(libraryPath, errorMessages), Core::MessageManager::Flash); if (!libraryPath.isEmpty()) { const Snapshot snapshot = m_modelManager->snapshot(); |