From fbbee00b9f4eb149af155edbe8c49b95a9863870 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 4 May 2009 15:44:39 +0200
Subject: [PATCH] Cleanup
---
.../duieditor/duieditoractionhandler.cpp | 43 +------------------
.../duieditor/duieditoractionhandler.h | 9 +---
src/plugins/duieditor/duieditorconstants.h | 1 -
src/plugins/duieditor/duieditorplugin.cpp | 12 ------
4 files changed, 2 insertions(+), 63 deletions(-)
diff --git a/src/plugins/duieditor/duieditoractionhandler.cpp b/src/plugins/duieditor/duieditoractionhandler.cpp
index 23e437faea4..92fe21857f5 100644
--- a/src/plugins/duieditor/duieditoractionhandler.cpp
+++ b/src/plugins/duieditor/duieditoractionhandler.cpp
@@ -40,61 +40,20 @@
#include <QtGui/QMainWindow>
#include <QtGui/QMessageBox>
-static QAction *actionFromId(const QString &id)
-{
- Core::Command *cmd = Core::ICore::instance()->actionManager()->command(id);
- if (!cmd)
- return 0;
- return cmd->action();
-}
-
namespace DuiEditor {
namespace Internal {
DuiEditorActionHandler::DuiEditorActionHandler()
: TextEditor::TextEditorActionHandler(QLatin1String(DuiEditor::Constants::C_DUIEDITOR),
- Format),
- m_runAction(0)
+ Format)
{
}
void DuiEditorActionHandler::createActions()
{
TextEditor::TextEditorActionHandler::createActions();
- m_runAction = actionFromId(QLatin1String(DuiEditor::Constants::RUN));
- connect(m_runAction, SIGNAL(triggered()), this, SLOT(run()));
}
-void DuiEditorActionHandler::run()
-{
- typedef Core::ScriptManager::Stack Stack;
- if (!currentEditor())
- return;
-
- const QString script = currentEditor()->toPlainText();
-
- // run
- Stack errorStack;
- QString errorMessage;
- if (Core::ICore::instance()->scriptManager()->runScript(script, &errorMessage, &errorStack))
- return;
-
- // try to find a suitable error line in the stack
- // ignoring 0 and other files (todo: open other files?)
- int errorLineNumber = 0;
- if (const int numFrames = errorStack.size()) {
- for (int f = 0; f < numFrames; f++) {
- if (errorStack[f].lineNumber && errorStack[f].fileName.isEmpty()) {
- errorLineNumber = errorStack[f].lineNumber;
- break;
- }
- }
- }
- if (errorLineNumber)
- currentEditor()->gotoLine(errorLineNumber);
- QMessageBox::critical(Core::ICore::instance()->mainWindow(), tr("Qt Script Error"), errorMessage);
-}
-
} // namespace Internal
} // namespace DuiEditor
diff --git a/src/plugins/duieditor/duieditoractionhandler.h b/src/plugins/duieditor/duieditoractionhandler.h
index 13300515f87..65dce9b2066 100644
--- a/src/plugins/duieditor/duieditoractionhandler.h
+++ b/src/plugins/duieditor/duieditoractionhandler.h
@@ -42,14 +42,7 @@ class DuiEditorActionHandler : public TextEditor::TextEditorActionHandler
public:
DuiEditorActionHandler();
-private:
- virtual void createActions();
-
-private slots:
- void run();
-
-private:
- QAction *m_runAction;
+ void createActions();
};
} // namespace Internal
diff --git a/src/plugins/duieditor/duieditorconstants.h b/src/plugins/duieditor/duieditorconstants.h
index 0c24f88854c..1b87c7d596b 100644
--- a/src/plugins/duieditor/duieditorconstants.h
+++ b/src/plugins/duieditor/duieditorconstants.h
@@ -34,7 +34,6 @@ namespace DuiEditor {
namespace Constants {
const char * const M_CONTEXT = "DUI Editor.ContextMenu";
-const char * const RUN = "DuiEditor.Run";
const char * const RUN_SEP = "DuiEditor.Run.Separator";
const char * const C_DUIEDITOR = "DUI Editor";
diff --git a/src/plugins/duieditor/duieditorplugin.cpp b/src/plugins/duieditor/duieditorplugin.cpp
index ac2b90347c6..99668926a28 100644
--- a/src/plugins/duieditor/duieditorplugin.cpp
+++ b/src/plugins/duieditor/duieditorplugin.cpp
@@ -146,18 +146,6 @@ void DuiEditorPlugin::initializeEditor(DuiEditor::Internal::ScriptEditor *editor
void DuiEditorPlugin::registerActions()
{
- Core::ActionManager *am = Core::ICore::instance()->actionManager();
- Core::ActionContainer *mcontext = am->createMenu(DuiEditor::Constants::M_CONTEXT);
-
- QAction *action = new QAction(this);
- action->setSeparator(true);
- Core::Command *cmd = am->registerAction(action, DuiEditor::Constants::RUN_SEP, m_scriptcontext);
- mcontext->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
-
- action = new QAction(tr("Run"), this);
- cmd = am->registerAction(action, DuiEditor::Constants::RUN, m_scriptcontext);
- cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+R")));
- mcontext->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
}
Q_EXPORT_PLUGIN(DuiEditorPlugin)
--
GitLab