summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2010-02-19 14:13:38 +0100
committerdt <qtc-committer@nokia.com>2010-02-19 17:00:51 +0100
commit821d49414c9b916a68151f49aa761bd40257b663 (patch)
treeace1d12c3306ea7c4348ea660e04e00403a88dc8 /src/plugins
parent92cb4fca3f62a3427043dd1db316cd8e8e955fc0 (diff)
downloadqt-creator-821d49414c9b916a68151f49aa761bd40257b663.tar.gz
remove MessageManager::displayStatusMessage
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/coreplugin/messagemanager.cpp6
-rw-r--r--src/plugins/coreplugin/messagemanager.h1
-rw-r--r--src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp7
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectmanager.cpp1
-rw-r--r--src/plugins/qt4projectmanager/qt4projectmanager.cpp8
5 files changed, 0 insertions, 23 deletions
diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp
index 05ffdd65c7..31d3170958 100644
--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -68,12 +68,6 @@ void MessageManager::showOutputPane()
m_messageOutputWindow->popup(false);
}
-void MessageManager::displayStatusBarMessage(const QString & /*text*/, int /*ms*/)
-{
- // TODO: Currently broken, but no one really notices, so...
- //m_mainWindow->statusBar()->showMessage(text, ms);
-}
-
void MessageManager::printToOutputPane(const QString &text, bool bringToForeground)
{
if (!m_messageOutputWindow)
diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h
index 4191145cd8..ff4e5b6ae4 100644
--- a/src/plugins/coreplugin/messagemanager.h
+++ b/src/plugins/coreplugin/messagemanager.h
@@ -51,7 +51,6 @@ public:
static MessageManager *instance() { return m_instance; }
- void displayStatusBarMessage(const QString &text, int ms = 0);
void showOutputPane();
public slots:
diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
index 191e108437..7d5d7edf40 100644
--- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
+++ b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
@@ -109,13 +109,6 @@ MessageManagerPrototype::MessageManagerPrototype(QObject *parent) :
{
}
-void MessageManagerPrototype::displayStatusBarMessage(const QString &text, int ms)
-{
- MessageManager *mm = qscriptvalue_cast<MessageManager *>(thisObject());
- QTC_ASSERT(mm, return);
- mm->displayStatusBarMessage(text, ms);
-}
-
void MessageManagerPrototype::printToOutputPane(const QString &text, bool bringToForeground)
{
MessageManager *mm = qscriptvalue_cast<MessageManager *>(thisObject());
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
index 2fc768f195..8111cf5894 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
@@ -66,7 +66,6 @@ QString Manager::mimeType() const
ProjectExplorer::Project *Manager::openProject(const QString &fileName)
{
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
- messageManager->displayStatusBarMessage(tr("Loading project %1 ...").arg(fileName), 50000);
QFileInfo fileInfo(fileName);
ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index cd96099787..0f58ec839b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -181,7 +181,6 @@ QString Qt4Manager::mimeType() const
ProjectExplorer::Project* Qt4Manager::openProject(const QString &fileName)
{
Core::MessageManager *messageManager = Core::ICore::instance()->messageManager();
- messageManager->displayStatusBarMessage(tr("Loading project %1 ...").arg(fileName), 50000);
// TODO Make all file paths relative & remove this hack
// We convert the path to an absolute one here because qt4project.cpp
@@ -191,25 +190,18 @@ ProjectExplorer::Project* Qt4Manager::openProject(const QString &fileName)
if (canonicalFilePath.isEmpty()) {
messageManager->printToOutputPane(tr("Failed opening project '%1': Project file does not exist").arg(QDir::toNativeSeparators(canonicalFilePath)));
- messageManager->displayStatusBarMessage(tr("Failed opening project"), 5000);
return 0;
}
foreach (ProjectExplorer::Project *pi, projectExplorer()->session()->projects()) {
if (canonicalFilePath == pi->file()->fileName()) {
messageManager->printToOutputPane(tr("Failed opening project '%1': Project already open").arg(QDir::toNativeSeparators(canonicalFilePath)));
- messageManager->displayStatusBarMessage(tr("Failed opening project"), 5000);
return 0;
}
}
- messageManager->displayStatusBarMessage(tr("Opening %1 ...").arg(fileName));
- QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-
Qt4Project *pro = new Qt4Project(this, canonicalFilePath);
registerProject(pro);
-
- messageManager->displayStatusBarMessage(tr("Done opening project"), 5000);
return pro;
}