From 4053ac0c104b00f2de7d28592faafb0f4827ba6e Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 9 Dec 2009 10:51:18 +0100
Subject: [PATCH] Throw some unused things from "ViewManager" away.
---
src/plugins/coreplugin/mainwindow.cpp | 1 -
src/plugins/coreplugin/statusbarwidget.h | 2 +-
src/plugins/coreplugin/viewmanager.cpp | 14 +++-----------
src/plugins/coreplugin/viewmanager.h | 3 ---
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index e61b9cd389a..85db4f271d5 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -1161,7 +1161,6 @@ void MainWindow::writeSettings()
m_settings->endGroup();
m_fileManager->saveRecentFiles();
- m_viewManager->saveSettings(m_settings);
m_actionManager->saveSettings(m_settings);
m_editorManager->saveSettings();
m_navigationWidget->saveSettings(m_settings);
diff --git a/src/plugins/coreplugin/statusbarwidget.h b/src/plugins/coreplugin/statusbarwidget.h
index dea5c09a0b6..fc6ea33df23 100644
--- a/src/plugins/coreplugin/statusbarwidget.h
+++ b/src/plugins/coreplugin/statusbarwidget.h
@@ -41,7 +41,7 @@ class CORE_EXPORT StatusBarWidget : public IContext
Q_OBJECT
public:
- enum StatusBarPosition { First=0, Second=1, Third=2 };
+ enum StatusBarPosition { First=0, Second=1, Third=2, Last=Third };
StatusBarWidget(QObject *parent = 0);
~StatusBarWidget();
diff --git a/src/plugins/coreplugin/viewmanager.cpp b/src/plugins/coreplugin/viewmanager.cpp
index 0b3eea0fb6c..bf253e44054 100644
--- a/src/plugins/coreplugin/viewmanager.cpp
+++ b/src/plugins/coreplugin/viewmanager.cpp
@@ -51,7 +51,7 @@ ViewManager::ViewManager(MainWindow *mainWnd)
: QObject(mainWnd),
m_mainWnd(mainWnd)
{
- for (int i = 0; i < 3; ++i) {
+ for (int i = 0; i <= StatusBarWidget::Last; ++i) {
QWidget *w = new QWidget();
m_mainWnd->statusBar()->insertPermanentWidget(i, w);
w->setLayout(new QHBoxLayout);
@@ -59,8 +59,8 @@ ViewManager::ViewManager(MainWindow *mainWnd)
w->layout()->setMargin(0);
m_statusBarWidgets.append(w);
}
- QLabel *l = new QLabel();
- m_mainWnd->statusBar()->insertPermanentWidget(3, l, 1);
+ m_mainWnd->statusBar()->insertPermanentWidget(StatusBarWidget::Last+1,
+ new QLabel(), 1);
}
ViewManager::~ViewManager()
@@ -85,7 +85,6 @@ void ViewManager::objectAdded(QObject *obj)
viewWidget = view->widget();
m_statusBarWidgets.at(view->position())->layout()->addWidget(viewWidget);
- m_viewMap.insert(view, viewWidget);
m_mainWnd->addContextObject(view);
}
@@ -99,11 +98,4 @@ void ViewManager::aboutToRemoveObject(QObject *obj)
void ViewManager::extensionsInitalized()
{
- QSettings *settings = m_mainWnd->settings();
- m_mainWnd->restoreState(settings->value(QLatin1String("ViewGroup_Default"), QByteArray()).toByteArray());
-}
-
-void ViewManager::saveSettings(QSettings *settings)
-{
- settings->setValue(QLatin1String("ViewGroup_Default"), m_mainWnd->saveState());
}
diff --git a/src/plugins/coreplugin/viewmanager.h b/src/plugins/coreplugin/viewmanager.h
index 26bf701e4a7..f78f9ecfeb8 100644
--- a/src/plugins/coreplugin/viewmanager.h
+++ b/src/plugins/coreplugin/viewmanager.h
@@ -60,15 +60,12 @@ public:
void init();
void extensionsInitalized();
- void saveSettings(QSettings *settings);
private slots:
void objectAdded(QObject *obj);
void aboutToRemoveObject(QObject *obj);
private:
- QMap<Core::StatusBarWidget *, QWidget *> m_viewMap;
-
MainWindow *m_mainWnd;
QList<QWidget *> m_statusBarWidgets;
};
--
GitLab