Commit 0581219a authored by hjk's avatar hjk
Browse files

pluginhowto: compile fix

parent c450abfe
......@@ -57,20 +57,15 @@ DoNothingPlugin::DoNothingPlugin()
// Do nothing
}
DoNothingPlugin::~DoNothingPlugin()
{
// Do notning
}
void DoNothingPlugin::extensionsInitialized()
{
// Do nothing
}
bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
bool DoNothingPlugin::initialize(const QStringList &args, QString *errorMessage)
{
Q_UNUSED(args);
Q_UNUSED(errMsg);
Q_UNUSED(errorMessage);
// Fetch the action manager
Core::ActionManager *am = Core::ICore::instance()->actionManager();
......@@ -82,11 +77,11 @@ bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
// Create a command for "DoNothing".
QAction *action = new QAction(tr("DoNothing"),this);
Core::Command *cmd = am->registerAction(action,
QLatin1String("DoNothingPlugin.DoNothing"),
Core::Context(Core::Constants::C_GLOBAL));
"DoNothingPlugin.DoNothing", Core::Context(Core::Constants::C_GLOBAL));
// Add DoNothing menu to the menubar
am->actionContainer(Core::Constants::M_TOOLS)->addMenu(ac, Core::Constants::G_DEFAULT_THREE);
am->actionContainer(Core::Constants::M_TOOLS)
->addMenu(ac, Core::Constants::G_DEFAULT_THREE);
// Add the "DoNothing" action to the DoNothing menu
ac->addAction(cmd);
......
......@@ -47,7 +47,7 @@ class DoNothingPlugin : public ExtensionSystem::IPlugin
public:
DoNothingPlugin();
~DoNothingPlugin();
void extensionsInitialized();
bool initialize(const QStringList &arguments, QString *errorString);
ShutdownFlag shutdown();
......
......@@ -37,6 +37,7 @@
****************************************************************************/
#include "donothingplugin.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
......@@ -44,11 +45,11 @@
#include <coreplugin/icore.h>
#include <coreplugin/icontext.h>
#include <QKeySequence>
#include <QStringList>
#include <QMessageBox>
#include <QAction>
#include <QKeySequence>
#include <QMenu>
#include <QMessageBox>
#include <QStringList>
#include <QtPlugin>
DoNothingPlugin::DoNothingPlugin()
......@@ -56,20 +57,15 @@ DoNothingPlugin::DoNothingPlugin()
// Do nothing
}
DoNothingPlugin::~DoNothingPlugin()
{
// Do notning
}
void DoNothingPlugin::extensionsInitialized()
{
// Do nothing
}
bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
bool DoNothingPlugin::initialize(const QStringList &args, QString *errorMessage)
{
Q_UNUSED(args);
Q_UNUSED(errMsg);
Q_UNUSED(errorMessage);
// Fetch the action manager
Core::ActionManager *am = Core::ICore::instance()->actionManager();
......@@ -77,8 +73,7 @@ bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
// Create a command for "DoNothing".
QAction *action = new QAction(tr("DoNothing"),this);
Core::Command *cmd = am->registerAction(action,
QLatin1String("DoNothingPlugin.DoNothing"),
Core::Context(Core::Constants::C_GLOBAL));
"DoNothingPlugin.DoNothing", Core::Context(Core::Constants::C_GLOBAL));
// Add the "DoNothing" action to the tools menu
am->actionContainer(Core::Constants::M_TOOLS)->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
......
......@@ -47,7 +47,7 @@ class DoNothingPlugin : public ExtensionSystem::IPlugin
public:
DoNothingPlugin();
~DoNothingPlugin();
void extensionsInitialized();
bool initialize(const QStringList &arguments, QString *errorString);
ShutdownFlag shutdown();
......
......@@ -37,6 +37,7 @@
****************************************************************************/
#include "donothingplugin.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
......@@ -44,11 +45,11 @@
#include <coreplugin/icore.h>
#include <coreplugin/icontext.h>
#include <QKeySequence>
#include <QStringList>
#include <QMessageBox>
#include <QAction>
#include <QKeySequence>
#include <QMenu>
#include <QMessageBox>
#include <QStringList>
#include <QtPlugin>
DoNothingPlugin::DoNothingPlugin()
......@@ -56,20 +57,15 @@ DoNothingPlugin::DoNothingPlugin()
// Do nothing
}
DoNothingPlugin::~DoNothingPlugin()
{
// Do notning
}
void DoNothingPlugin::extensionsInitialized()
{
// Do nothing
}
bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
bool DoNothingPlugin::initialize(const QStringList &args, QString *errorMessage)
{
Q_UNUSED(args);
Q_UNUSED(errMsg);
Q_UNUSED(errorMessage);
// Fetch the action manager
Core::ActionManager *am = Core::ICore::instance()->actionManager();
......@@ -77,8 +73,7 @@ bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
// Create a command for "DoNothing".
QAction *action = new QAction(tr("DoNothing"),this);
Core::Command* cmd = am->registerAction(action,
QLatin1String("DoNothingPlugin.DoNothing"),
Core::Context(Core::Constants::C_GLOBAL));
"DoNothingPlugin.DoNothing", Core::Context(Core::Constants::C_GLOBAL));
// Add the "DoNothing" action to the tools menu
am->actionContainer(Core::Constants::M_TOOLS)->addAction(cmd);
......
......@@ -47,7 +47,7 @@ class DoNothingPlugin : public ExtensionSystem::IPlugin
public:
DoNothingPlugin();
~DoNothingPlugin();
void extensionsInitialized();
bool initialize(const QStringList &arguments, QString *errorString);
ShutdownFlag shutdown();
......
......@@ -57,20 +57,15 @@ DoNothingPlugin::DoNothingPlugin()
// Do nothing
}
DoNothingPlugin::~DoNothingPlugin()
{
// Do notning
}
void DoNothingPlugin::extensionsInitialized()
{
// Do nothing
}
bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
bool DoNothingPlugin::initialize(const QStringList &args, QString *errorMessage)
{
Q_UNUSED(args);
Q_UNUSED(errMsg);
Q_UNUSED(errorMessage);
// Fetch the action manager
Core::ActionManager *am = Core::ICore::instance()->actionManager();
......@@ -78,11 +73,11 @@ bool DoNothingPlugin::initialize(const QStringList &args, QString *errMsg)
// Create a command for "DoNothing".
QAction *action = new QAction(tr("DoNothing"),this);
Core::Command *cmd = am->registerAction(action,
QLatin1String("DoNothingPlugin.DoNothing"),
Core::Context(Core::Constants::C_GLOBAL));
"DoNothingPlugin.DoNothing", Core::Context(Core::Constants::C_GLOBAL));
// Add the "DoNothing" action to the tools menu
am->actionContainer(Core::Constants::M_TOOLS)->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
am->actionContainer(Core::Constants::M_TOOLS)
->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
// Connect the action
connect(action, SIGNAL(triggered(bool)), this, SLOT(performAction()));
......
......@@ -47,7 +47,7 @@ class DoNothingPlugin : public ExtensionSystem::IPlugin
public:
DoNothingPlugin();
~DoNothingPlugin();
void extensionsInitialized();
bool initialize(const QStringList &arguments, QString *errorString);
ShutdownFlag shutdown();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment