From d0725e31a4fd7a40e29fb689f71f8f6933d5a1f5 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 14 Jan 2009 12:00:22 +0100
Subject: [PATCH] remove "fat" BaseMode constructor
---
src/plugins/coreplugin/basemode.cpp | 32 -------------------
src/plugins/coreplugin/basemode.h | 6 ----
src/plugins/coreplugin/mainwindow.cpp | 11 ++++---
src/plugins/debugger/debuggerplugin.cpp | 8 +++--
src/plugins/help/helpmode.cpp | 13 ++++----
.../projectexplorer/projectexplorer.cpp | 11 ++++---
6 files changed, 24 insertions(+), 57 deletions(-)
diff --git a/src/plugins/coreplugin/basemode.cpp b/src/plugins/coreplugin/basemode.cpp
index c6cfa37726f..ea2d202fc24 100644
--- a/src/plugins/coreplugin/basemode.cpp
+++ b/src/plugins/coreplugin/basemode.cpp
@@ -82,38 +82,6 @@ BaseMode::BaseMode(QObject *parent):
{
}
-/*!
- \fn BaseMode::BaseMode(const QString &name,
- const char * uniqueModeName,
- const QIcon &icon,
- int priority,
- QWidget *widget,
- QObject *parent)
-
- Creates a mode with the given properties.
-
- \a name
- \a uniqueModeName
- \a icon
- \a priority
- \a widget
- \a parent
-*/
-BaseMode::BaseMode(const QString &name,
- const char * uniqueModeName,
- const QIcon &icon,
- int priority,
- QWidget *widget,
- QObject *parent):
- IMode(parent),
- m_name(name),
- m_icon(icon),
- m_priority(priority),
- m_widget(widget),
- m_uniqueModeName(uniqueModeName)
-{
-}
-
/*!
\fn BaseMode::~BaseMode()
*/
diff --git a/src/plugins/coreplugin/basemode.h b/src/plugins/coreplugin/basemode.h
index 81713d9c990..bca1f24347b 100644
--- a/src/plugins/coreplugin/basemode.h
+++ b/src/plugins/coreplugin/basemode.h
@@ -49,12 +49,6 @@ class CORE_EXPORT BaseMode
public:
BaseMode(QObject *parent = 0);
- BaseMode(const QString &name,
- const char * uniqueModeName,
- const QIcon &icon,
- int priority,
- QWidget *widget,
- QObject *parent = 0);
~BaseMode();
// IMode
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index b36535ed493..b268b8ea394 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -283,11 +283,12 @@ bool MainWindow::init(ExtensionSystem::PluginManager *pm, QString *)
outputModeWidget->setLayout(new QVBoxLayout);
outputModeWidget->layout()->setMargin(0);
outputModeWidget->layout()->setSpacing(0);
- m_outputMode = new BaseMode(tr("Output"),
- Constants::MODE_OUTPUT,
- QIcon(QLatin1String(":/fancyactionbar/images/mode_Output.png")),
- Constants::P_MODE_OUTPUT,
- outputModeWidget);
+ m_outputMode = new BaseMode;
+ m_outputMode->setName(tr("Output"));
+ m_outputMode->setUniqueModeName(Constants::MODE_OUTPUT);
+ m_outputMode->setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Output.png")));
+ m_outputMode->setPriority(Constants::P_MODE_OUTPUT);
+ m_outputMode->setWidget(outputModeWidget);
OutputPanePlaceHolder *oph = new OutputPanePlaceHolder(m_outputMode);
oph->setVisible(true);
oph->setCloseable(false);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index e1e0c82f217..b9e03bc855f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -163,10 +163,12 @@ public:
} // namespace Debugger
DebugMode::DebugMode(QObject *parent)
- : BaseMode(tr("Debug"), Constants::MODE_DEBUG,
- QIcon(":/fancyactionbar/images/mode_Debug.png"),
- Constants::P_MODE_DEBUG, 0, parent)
+ : BaseMode(parent)
{
+ setName(tr("Debug"));
+ setUniqueModeName(Constants::MODE_DEBUG);
+ setIcon(QIcon(":/fancyactionbar/images/mode_Debug.png"));
+ setPriority(Constants::P_MODE_DEBUG);
}
DebugMode::~DebugMode()
diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp
index 673b5f607d6..687a5f116e1 100644
--- a/src/plugins/help/helpmode.cpp
+++ b/src/plugins/help/helpmode.cpp
@@ -41,13 +41,14 @@
using namespace Help;
using namespace Help::Internal;
-HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent):
- BaseMode(tr("Help"),
- Constants::ID_MODE_HELP,
- QIcon((QLatin1String(":/fancyactionbar/images/mode_Reference.png"))),
- Constants::P_MODE_HELP, widget, parent),
- m_centralWidget(centralWidget)
+HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent)
+ : BaseMode(parent), m_centralWidget(centralWidget)
{
+ setName(tr("Help"));
+ setUniqueModeName(Constants::ID_MODE_HELP);
+ setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Reference.png")));
+ setPriority(Constants::P_MODE_HELP);
+ setWidget(widget);
m_centralWidget->layout()->setSpacing(0);
m_centralWidget->layout()->addWidget(new Core::FindToolBarPlaceHolder(this));
}
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 84d68ea502a..bffa3911010 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -181,11 +181,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList & /*arguments*/, QStrin
QList<int> pecontext;
pecontext << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_PROJECTEXPLORER);
- Core::BaseMode *mode = new Core::BaseMode(tr("Projects"),
- Constants::MODE_SESSION,
- QIcon(QLatin1String(":/fancyactionbar/images/mode_Project.png")),
- Constants::P_MODE_SESSION,
- m_proWindow);
+ Core::BaseMode *mode = new Core::BaseMode;
+ mode->setName(tr("Projects"));
+ mode->setUniqueModeName(Constants::MODE_SESSION);
+ mode->setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Project.png")));
+ mode->setPriority(Constants::P_MODE_SESSION);
+ mode->setWidget(m_proWindow);
mode->setContext(QList<int>() << pecontext);
addAutoReleasedObject(mode);
m_proWindow->layout()->addWidget(new Core::FindToolBarPlaceHolder(mode));
--
GitLab