summaryrefslogtreecommitdiff
path: root/src/plugins/regexp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/regexp')
-rw-r--r--src/plugins/regexp/regexpplugin.cpp22
-rw-r--r--src/plugins/regexp/regexpplugin.h7
2 files changed, 12 insertions, 17 deletions
diff --git a/src/plugins/regexp/regexpplugin.cpp b/src/plugins/regexp/regexpplugin.cpp
index 86a4ca0a7c..af1bc8f242 100644
--- a/src/plugins/regexp/regexpplugin.cpp
+++ b/src/plugins/regexp/regexpplugin.cpp
@@ -32,14 +32,15 @@
***************************************************************************/
#include "regexpplugin.h"
-#include "settings.h"
+
#include "regexpwindow.h"
+#include "settings.h"
#include <coreplugin/baseview.h>
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
using namespace RegExp::Internal;
@@ -49,25 +50,24 @@ RegExpPlugin::RegExpPlugin()
RegExpPlugin::~RegExpPlugin()
{
- if (m_regexpWindow) {
- m_regexpWindow->settings().toQSettings(m_core->settings());
- }
+ if (m_regexpWindow)
+ m_regexpWindow->settings().toQSettings(Core::ICore::instance()->settings());
}
void RegExpPlugin::extensionsInitialized()
{
}
-
-bool RegExpPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
+bool RegExpPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
- Q_UNUSED(error_message)
- m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
+ Q_UNUSED(arguments);
+ Q_UNUSED(errorMessage)
+ Core::ICore *core = Core::ICore::instance();
m_regexpWindow = new RegExpWindow;
Settings settings;
- settings.fromQSettings(m_core->settings());
+ settings.fromQSettings(core->settings());
m_regexpWindow->setSettings(settings);
- const int plugId = m_core->uniqueIDManager()->uniqueIdentifier(QLatin1String("RegExpPlugin"));
+ const int plugId = core->uniqueIDManager()->uniqueIdentifier(QLatin1String("RegExpPlugin"));
addAutoReleasedObject(new Core::BaseView("TextEditor.RegExpWindow",
m_regexpWindow,
QList<int>() << plugId,
diff --git a/src/plugins/regexp/regexpplugin.h b/src/plugins/regexp/regexpplugin.h
index c944d37bc1..aa10295370 100644
--- a/src/plugins/regexp/regexpplugin.h
+++ b/src/plugins/regexp/regexpplugin.h
@@ -39,10 +39,6 @@
#include <QtCore/QObject>
#include <QtCore/QPointer>
-namespace Core {
-class ICore;
-}
-
namespace RegExp {
namespace Internal {
@@ -56,11 +52,10 @@ public:
RegExpPlugin();
virtual ~RegExpPlugin();
- bool initialize(const QStringList &arguments, QString *error_message);
+ bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
private:
- Core::ICore *m_core;
QPointer<RegExpWindow> m_regexpWindow;
};