From c8441462c9795134bb3e669464680d146d0a2dd4 Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Tue, 27 Apr 2010 17:26:32 +0200
Subject: [PATCH] Renaming...
---
src/plugins/genericeditor/context.cpp | 4 +-
src/plugins/genericeditor/context.h | 4 +-
src/plugins/genericeditor/dynamicrule.cpp | 6 +-
src/plugins/genericeditor/dynamicrule.h | 4 +-
.../{genericeditor.cpp => editor.cpp} | 33 +++--
.../{genericeditor.h => editor.h} | 14 +-
...riceditorfactory.cpp => editorfactory.cpp} | 30 ++---
...genericeditorfactory.h => editorfactory.h} | 14 +-
src/plugins/genericeditor/genericeditor.pro | 12 +-
src/plugins/genericeditor/genericeditor.qrc | 1 -
.../genericeditor/genericeditorconstants.h | 10 +-
.../genericeditor/genericeditorplugin.cpp | 34 ++---
.../genericeditor/genericeditorplugin.h | 4 +-
.../genericeditor/highlightdefinition.cpp | 2 +-
.../genericeditor/highlightdefinition.h | 4 +-
.../highlightdefinitionhandler.cpp | 2 +-
.../highlightdefinitionhandler.h | 4 +-
src/plugins/genericeditor/highlighter.cpp | 2 +-
src/plugins/genericeditor/highlighter.h | 4 +-
.../genericeditor/highlighterexception.h | 4 +-
.../genericeditor/includerulesinstruction.cpp | 2 +-
.../genericeditor/includerulesinstruction.h | 4 +-
src/plugins/genericeditor/itemdata.cpp | 2 +-
src/plugins/genericeditor/itemdata.h | 4 +-
src/plugins/genericeditor/keywordlist.cpp | 2 +-
src/plugins/genericeditor/keywordlist.h | 4 +-
.../languagespecificfactories.cpp | 120 +++++++++---------
.../genericeditor/languagespecificfactories.h | 62 ++++-----
src/plugins/genericeditor/progressdata.cpp | 2 +-
src/plugins/genericeditor/progressdata.h | 4 +-
src/plugins/genericeditor/reuse.h | 4 +-
src/plugins/genericeditor/rule.cpp | 2 +-
src/plugins/genericeditor/rule.h | 4 +-
src/plugins/genericeditor/specificrules.cpp | 2 +-
src/plugins/genericeditor/specificrules.h | 4 +-
35 files changed, 206 insertions(+), 208 deletions(-)
rename src/plugins/genericeditor/{genericeditor.cpp => editor.cpp} (72%)
rename src/plugins/genericeditor/{genericeditor.h => editor.h} (85%)
rename src/plugins/genericeditor/{genericeditorfactory.cpp => editorfactory.cpp} (67%)
rename src/plugins/genericeditor/{genericeditorfactory.h => editorfactory.h} (88%)
diff --git a/src/plugins/genericeditor/context.cpp b/src/plugins/genericeditor/context.cpp
index 0ef788d3767..75ad3b50402 100644
--- a/src/plugins/genericeditor/context.cpp
+++ b/src/plugins/genericeditor/context.cpp
@@ -33,7 +33,7 @@
#include "dynamicrule.h"
#include "highlightdefinition.h"
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
Context::Context() : m_fallthrough(false), m_dynamic(false)
@@ -128,7 +128,7 @@ bool Context::isDynamic() const
void Context::updateDynamicRules(const QStringList &captures) const
{
- Highlight::Internal::updateDynamicRules(m_rules, captures);
+ GenericEditor::Internal::updateDynamicRules(m_rules, captures);
}
void Context::addRule(const QSharedPointer<Rule> &rule)
diff --git a/src/plugins/genericeditor/context.h b/src/plugins/genericeditor/context.h
index 28dbcbe802a..aa9db961b92 100644
--- a/src/plugins/genericeditor/context.h
+++ b/src/plugins/genericeditor/context.h
@@ -36,7 +36,7 @@
#include <QtCore/QList>
#include <QtCore/QSharedPointer>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class Rule;
@@ -105,6 +105,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // CONTEXT_H
diff --git a/src/plugins/genericeditor/dynamicrule.cpp b/src/plugins/genericeditor/dynamicrule.cpp
index 887bb0c169e..1bb06354947 100644
--- a/src/plugins/genericeditor/dynamicrule.cpp
+++ b/src/plugins/genericeditor/dynamicrule.cpp
@@ -30,7 +30,7 @@
#include "dynamicrule.h"
#include "reuse.h"
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
DynamicRule::DynamicRule() : m_active(false)
@@ -51,7 +51,7 @@ void DynamicRule::replaceExpressions(const QStringList &captures)
updateDynamicRules(childs(), captures);
}
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
void updateDynamicRules(const QList<QSharedPointer<Rule> > &rules, const QStringList &captures)
@@ -64,4 +64,4 @@ void updateDynamicRules(const QList<QSharedPointer<Rule> > &rules, const QString
}
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
diff --git a/src/plugins/genericeditor/dynamicrule.h b/src/plugins/genericeditor/dynamicrule.h
index 17650e2c742..1fdeb1ff0b1 100644
--- a/src/plugins/genericeditor/dynamicrule.h
+++ b/src/plugins/genericeditor/dynamicrule.h
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
class QStringList;
QT_END_NAMESPACE
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class DynamicRule : public Rule
@@ -59,6 +59,6 @@ private:
void updateDynamicRules(const QList<QSharedPointer<Rule> > &rules, const QStringList &captures);
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // DYNAMICRULE_H
diff --git a/src/plugins/genericeditor/genericeditor.cpp b/src/plugins/genericeditor/editor.cpp
similarity index 72%
rename from src/plugins/genericeditor/genericeditor.cpp
rename to src/plugins/genericeditor/editor.cpp
index e442e4aa880..18a13c79039 100644
--- a/src/plugins/genericeditor/genericeditor.cpp
+++ b/src/plugins/genericeditor/editor.cpp
@@ -27,8 +27,8 @@
**
**************************************************************************/
-#include "genericeditor.h"
-#include "generichighlighterconstants.h"
+#include "editor.h"
+#include "genericeditorconstants.h"
#include "genericeditorplugin.h"
#include "highlightdefinition.h"
#include "highlighter.h"
@@ -43,37 +43,37 @@
#include <QtCore/QSharedPointer>
#include <QtCore/QFileInfo>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
-GenericEditorEditable::GenericEditorEditable(GenericEditor *editor) :
+EditorEditable::EditorEditable(Editor *editor) :
TextEditor::BaseTextEditorEditable(editor)
{
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
- m_context << uidm->uniqueIdentifier(Highlight::Constants::GENERIC_EDITOR);
+ m_context << uidm->uniqueIdentifier(GenericEditor::Constants::GENERIC_EDITOR);
m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
}
-QString GenericEditorEditable::id() const
-{ return QLatin1String(Highlight::Constants::GENERIC_EDITOR); }
+QString EditorEditable::id() const
+{ return QLatin1String(GenericEditor::Constants::GENERIC_EDITOR); }
-QList<int> GenericEditorEditable::context() const
+QList<int> EditorEditable::context() const
{ return m_context; }
-bool GenericEditorEditable::isTemporary() const
+bool EditorEditable::isTemporary() const
{ return false; }
-bool GenericEditorEditable::duplicateSupported() const
+bool EditorEditable::duplicateSupported() const
{ return true; }
-Core::IEditor *GenericEditorEditable::duplicate(QWidget *parent)
+Core::IEditor *EditorEditable::duplicate(QWidget *parent)
{
- GenericEditor *newEditor = new GenericEditor(editor()->mimeType(), parent);
+ Editor *newEditor = new Editor(editor()->mimeType(), parent);
newEditor->duplicateFrom(editor());
return newEditor->editableInterface();
}
-bool GenericEditorEditable::open(const QString &fileName)
+bool EditorEditable::open(const QString &fileName)
{
if (TextEditor::BaseTextEditorEditable::open(fileName)) {
editor()->setMimeType(
@@ -83,8 +83,7 @@ bool GenericEditorEditable::open(const QString &fileName)
return false;
}
-GenericEditor::GenericEditor(const QString &definitionId, QWidget *parent) :
- TextEditor::BaseTextEditor(parent)
+Editor::Editor(const QString &definitionId, QWidget *parent) : TextEditor::BaseTextEditor(parent)
{
try {
QSharedPointer<HighlightDefinition> definition =
@@ -95,8 +94,8 @@ GenericEditor::GenericEditor(const QString &definitionId, QWidget *parent) :
}
}
-TextEditor::BaseTextEditorEditable *GenericEditor::createEditableInterface()
+TextEditor::BaseTextEditorEditable *Editor::createEditableInterface()
{
- GenericEditorEditable *editable = new GenericEditorEditable(this);
+ EditorEditable *editable = new EditorEditable(this);
return editable;
}
diff --git a/src/plugins/genericeditor/genericeditor.h b/src/plugins/genericeditor/editor.h
similarity index 85%
rename from src/plugins/genericeditor/genericeditor.h
rename to src/plugins/genericeditor/editor.h
index 37e798f4751..1947d2a5a72 100644
--- a/src/plugins/genericeditor/genericeditor.h
+++ b/src/plugins/genericeditor/editor.h
@@ -38,17 +38,17 @@ QT_BEGIN_NAMESPACE
class QString;
QT_END_NAMESPACE
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
-class GenericEditor;
+class Editor;
-class GenericEditorEditable : public TextEditor::BaseTextEditorEditable
+class EditorEditable : public TextEditor::BaseTextEditorEditable
{
Q_OBJECT
public:
- GenericEditorEditable(GenericEditor *editor);
+ EditorEditable(Editor *editor);
protected:
virtual QString id() const;
@@ -62,18 +62,18 @@ private:
QList<int> m_context;
};
-class GenericEditor : public TextEditor::BaseTextEditor
+class Editor : public TextEditor::BaseTextEditor
{
Q_OBJECT
public:
- GenericEditor(const QString &definitionId, QWidget *parent = 0);
+ Editor(const QString &definitionId, QWidget *parent = 0);
protected:
virtual TextEditor::BaseTextEditorEditable *createEditableInterface();
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // GENERICEDITOR_H
diff --git a/src/plugins/genericeditor/genericeditorfactory.cpp b/src/plugins/genericeditor/editorfactory.cpp
similarity index 67%
rename from src/plugins/genericeditor/genericeditorfactory.cpp
rename to src/plugins/genericeditor/editorfactory.cpp
index c9c576ee854..be64519e7ba 100644
--- a/src/plugins/genericeditor/genericeditorfactory.cpp
+++ b/src/plugins/genericeditor/editorfactory.cpp
@@ -27,46 +27,46 @@
**
**************************************************************************/
-#include "genericeditorfactory.h"
-#include "generichighlighterconstants.h"
-#include "genericeditor.h"
+#include "editorfactory.h"
+#include "genericeditorconstants.h"
+#include "editor.h"
#include <coreplugin/editormanager/editormanager.h>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
-GenericEditorFactory::GenericEditorFactory(QObject *parent) :
+EditorFactory::EditorFactory(QObject *parent) :
Core::IEditorFactory(parent)
{}
-GenericEditorFactory::~GenericEditorFactory()
+EditorFactory::~EditorFactory()
{}
-Core::IEditor *GenericEditorFactory::createEditor(QWidget *parent)
+Core::IEditor *EditorFactory::createEditor(QWidget *parent)
{
- GenericEditor *genericEditor = createGenericEditor(parent);
+ Editor *genericEditor = createGenericEditor(parent);
return genericEditor->editableInterface();
}
-QString GenericEditorFactory::id() const
+QString EditorFactory::id() const
{
- return QLatin1String(Highlight::Constants::GENERIC_EDITOR);
+ return QLatin1String(GenericEditor::Constants::GENERIC_EDITOR);
}
-QStringList GenericEditorFactory::mimeTypes() const
+QStringList EditorFactory::mimeTypes() const
{ return m_mimeTypes; }
-QString GenericEditorFactory::displayName() const
+QString EditorFactory::displayName() const
{
- return tr(Highlight::Constants::GENERIC_EDITOR_DISPLAY_NAME);
+ return tr(GenericEditor::Constants::GENERIC_EDITOR_DISPLAY_NAME);
}
-Core::IFile *GenericEditorFactory::open(const QString &fileName)
+Core::IFile *EditorFactory::open(const QString &fileName)
{
Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id());
return iface ? iface->file() : 0;
}
-void GenericEditorFactory::addMimeType(const QString &mimeType)
+void EditorFactory::addMimeType(const QString &mimeType)
{ m_mimeTypes.append(mimeType); }
diff --git a/src/plugins/genericeditor/genericeditorfactory.h b/src/plugins/genericeditor/editorfactory.h
similarity index 88%
rename from src/plugins/genericeditor/genericeditorfactory.h
rename to src/plugins/genericeditor/editorfactory.h
index c3d91c803eb..8eb42cab5b4 100644
--- a/src/plugins/genericeditor/genericeditorfactory.h
+++ b/src/plugins/genericeditor/editorfactory.h
@@ -34,18 +34,18 @@
#include <QtCore/QStringList>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
-class GenericEditor;
+class Editor;
-class GenericEditorFactory : public Core::IEditorFactory
+class EditorFactory : public Core::IEditorFactory
{
Q_OBJECT
public:
- GenericEditorFactory(QObject *parent = 0);
- virtual ~GenericEditorFactory();
+ EditorFactory(QObject *parent = 0);
+ virtual ~EditorFactory();
// Currently there are language specific factores which configure the correct highlighter.
// Would it be a good idea if the createEditor method also received the mime type? This would
@@ -60,12 +60,12 @@ protected:
void addMimeType(const QString &mimeType);
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent) = 0;
+ virtual Editor *createGenericEditor(QWidget *parent) = 0;
QStringList m_mimeTypes;
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // GENERICEDITORFACTORY_H
diff --git a/src/plugins/genericeditor/genericeditor.pro b/src/plugins/genericeditor/genericeditor.pro
index 65ee07b5bce..69bec2850db 100644
--- a/src/plugins/genericeditor/genericeditor.pro
+++ b/src/plugins/genericeditor/genericeditor.pro
@@ -8,8 +8,6 @@ CONFIG += help
HEADERS += \
genericeditorplugin.h \
progressdata.h \
- genericeditorfactory.h \
- genericeditor.h \
languagespecificfactories.h \
specificrules.h \
rule.h \
@@ -23,13 +21,13 @@ HEADERS += \
highlightdefinition.h \
dynamicrule.h \
context.h \
- genericeditorconstants.h
+ genericeditorconstants.h \
+ editor.h \
+ editorfactory.h
SOURCES += \
genericeditorplugin.cpp \
progressdata.cpp \
- genericeditorfactory.cpp \
- genericeditor.cpp \
languagespecificfactories.cpp \
specificrules.cpp \
rule.cpp \
@@ -40,7 +38,9 @@ SOURCES += \
highlightdefinitionhandler.cpp \
highlightdefinition.cpp \
dynamicrule.cpp \
- context.cpp
+ context.cpp \
+ editor.cpp \
+ editorfactory.cpp
OTHER_FILES += GenericEditor.pluginspec GenericEditor.mimetypes.xml
diff --git a/src/plugins/genericeditor/genericeditor.qrc b/src/plugins/genericeditor/genericeditor.qrc
index 4ecc6a1a5ed..5a57609ba0a 100644
--- a/src/plugins/genericeditor/genericeditor.qrc
+++ b/src/plugins/genericeditor/genericeditor.qrc
@@ -7,7 +7,6 @@
<file>XML/java.xml</file>
<file>XML/javadoc.xml</file>
<file>XML/javascript.xml</file>
- <file>XML/language.dtd</file>
<file>XML/objectivec.xml</file>
<file>XML/perl.xml</file>
<file>XML/php.xml</file>
diff --git a/src/plugins/genericeditor/genericeditorconstants.h b/src/plugins/genericeditor/genericeditorconstants.h
index e898f2d83b3..6109d4cc0a7 100644
--- a/src/plugins/genericeditor/genericeditorconstants.h
+++ b/src/plugins/genericeditor/genericeditorconstants.h
@@ -27,12 +27,12 @@
**
**************************************************************************/
-#ifndef GENERICHIGHLIGHTERCONSTANTS_H
-#define GENERICHIGHLIGHTERCONSTANTS_H
+#ifndef GENERICEDITORCONSTANTS_H
+#define GENERICEDITORCONSTANTS_H
#include <QtCore/QtGlobal>
-namespace Highlight {
+namespace GenericEditor {
namespace Constants {
const char * const GENERIC_EDITOR = "GenericEditorPlugin.GenericEditor";
@@ -57,6 +57,6 @@ const char * const SQL_MIMETYPE = "text/x-sql";
const char * const TCL_MIMETYPE = "application/x-tcl";
} // namespace Constants
-} // namespace Highlight
+} // namespace GenericEditor
-#endif // GENERICHIGHLIGHTERCONSTANTS_H
+#endif // GENERICEDITORCONSTANTS_H
diff --git a/src/plugins/genericeditor/genericeditorplugin.cpp b/src/plugins/genericeditor/genericeditorplugin.cpp
index a75979ae1e2..ad2d72cf099 100644
--- a/src/plugins/genericeditor/genericeditorplugin.cpp
+++ b/src/plugins/genericeditor/genericeditorplugin.cpp
@@ -45,7 +45,7 @@
#include <QtXml/QXmlSimpleReader>
#include <QtXml/QXmlInputSource>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
const QLatin1String GenericEditorPlugin::kAlertDefinitionId(":/genericeditor/XML/alert.xml");
@@ -80,22 +80,22 @@ GenericEditorPlugin::GenericEditorPlugin()
//Todo
- m_idByMimeType.insert(Highlight::Constants::C_HEADER_MIMETYPE, kCDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::C_SOURCE_MIMETYPE, kCDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::CPP_HEADER_MIMETYPE, kCppDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::CPP_SOURCE_MIMETYPE, kCppDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::CSS_MIMETYPE, kCssDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::FORTRAN_MIMETYPE, kFortranDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::HTML_MIMETYPE, kHtmlDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::JAVA_MIMETYPE, kJavaDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::JAVASCRIPT_MIMETYPE, kJavascriptDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::OBJECTIVEC_MIMETYPE, kObjectiveCDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::PERL_MIMETYPE, kPerlDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::PHP_MIMETYPE, kPhpDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::PYTHON_MIMETYPE, kPythonDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::RUBY_MIMETYPE, kRubyDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::SQL_MIMETYPE, kSqlDefinitionId);
- m_idByMimeType.insert(Highlight::Constants::TCL_MIMETYPE, kTclDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::C_HEADER_MIMETYPE, kCDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::C_SOURCE_MIMETYPE, kCDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::CPP_HEADER_MIMETYPE, kCppDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::CPP_SOURCE_MIMETYPE, kCppDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::CSS_MIMETYPE, kCssDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::FORTRAN_MIMETYPE, kFortranDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::HTML_MIMETYPE, kHtmlDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::JAVA_MIMETYPE, kJavaDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::JAVASCRIPT_MIMETYPE, kJavascriptDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::OBJECTIVEC_MIMETYPE, kObjectiveCDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::PERL_MIMETYPE, kPerlDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::PHP_MIMETYPE, kPhpDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::PYTHON_MIMETYPE, kPythonDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::RUBY_MIMETYPE, kRubyDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::SQL_MIMETYPE, kSqlDefinitionId);
+ m_idByMimeType.insert(GenericEditor::Constants::TCL_MIMETYPE, kTclDefinitionId);
m_idByName.insert(QLatin1String("alerts"), kAlertDefinitionId);
m_idByName.insert(QLatin1String("c"), kCDefinitionId);
diff --git a/src/plugins/genericeditor/genericeditorplugin.h b/src/plugins/genericeditor/genericeditorplugin.h
index 12fceb5bcba..8e32e5cf809 100644
--- a/src/plugins/genericeditor/genericeditorplugin.h
+++ b/src/plugins/genericeditor/genericeditorplugin.h
@@ -38,7 +38,7 @@
#include <QtCore/QSet>
#include <QtCore/QSharedPointer>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class HighlightDefinition;
@@ -96,6 +96,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // GENERICEDITORPLUGIN_H
diff --git a/src/plugins/genericeditor/highlightdefinition.cpp b/src/plugins/genericeditor/highlightdefinition.cpp
index fe808354c8d..f489e926f22 100644
--- a/src/plugins/genericeditor/highlightdefinition.cpp
+++ b/src/plugins/genericeditor/highlightdefinition.cpp
@@ -36,7 +36,7 @@
#include <QLatin1String>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
HighlightDefinition::HighlightDefinition() :
diff --git a/src/plugins/genericeditor/highlightdefinition.h b/src/plugins/genericeditor/highlightdefinition.h
index 5c7c9c45d11..e3247ac9ef5 100644
--- a/src/plugins/genericeditor/highlightdefinition.h
+++ b/src/plugins/genericeditor/highlightdefinition.h
@@ -34,7 +34,7 @@
#include <QtCore/QHash>
#include <QtCore/QSharedPointer>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class KeywordList;
@@ -126,6 +126,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // HIGHLIGHTDEFINITION_H
diff --git a/src/plugins/genericeditor/highlightdefinitionhandler.cpp b/src/plugins/genericeditor/highlightdefinitionhandler.cpp
index f562b39b9a4..6179ca5b5c5 100644
--- a/src/plugins/genericeditor/highlightdefinitionhandler.cpp
+++ b/src/plugins/genericeditor/highlightdefinitionhandler.cpp
@@ -39,7 +39,7 @@
#include <QLatin1String>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
namespace {
diff --git a/src/plugins/genericeditor/highlightdefinitionhandler.h b/src/plugins/genericeditor/highlightdefinitionhandler.h
index 7f9b32a3130..150b2627b90 100644
--- a/src/plugins/genericeditor/highlightdefinitionhandler.h
+++ b/src/plugins/genericeditor/highlightdefinitionhandler.h
@@ -37,7 +37,7 @@
#include <QtXml/QXmlDefaultHandler>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class KeywordList;
@@ -102,6 +102,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // HIGHLIGHTDEFINITIONHANDLER_H
diff --git a/src/plugins/genericeditor/highlighter.cpp b/src/plugins/genericeditor/highlighter.cpp
index 6c715d2cca5..fc3784103db 100644
--- a/src/plugins/genericeditor/highlighter.cpp
+++ b/src/plugins/genericeditor/highlighter.cpp
@@ -37,7 +37,7 @@
#include <QtCore/QStringList>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
namespace {
diff --git a/src/plugins/genericeditor/highlighter.h b/src/plugins/genericeditor/highlighter.h
index de736538d15..44018dbb5f7 100644
--- a/src/plugins/genericeditor/highlighter.h
+++ b/src/plugins/genericeditor/highlighter.h
@@ -39,7 +39,7 @@
#include <texteditor/basetexteditor.h>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class Rule;
@@ -139,6 +139,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // HIGHLIGHTER_H
diff --git a/src/plugins/genericeditor/highlighterexception.h b/src/plugins/genericeditor/highlighterexception.h
index 6e45c96e06a..c25f34795bc 100644
--- a/src/plugins/genericeditor/highlighterexception.h
+++ b/src/plugins/genericeditor/highlighterexception.h
@@ -30,12 +30,12 @@
#ifndef HIGHLIGHTEREXCEPTION_H
#define HIGHLIGHTEREXCEPTION_H
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class HighlighterException {};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // HIGHLIGHTEREXCEPTION_H
diff --git a/src/plugins/genericeditor/includerulesinstruction.cpp b/src/plugins/genericeditor/includerulesinstruction.cpp
index 7db35c06d26..85c99e02627 100644
--- a/src/plugins/genericeditor/includerulesinstruction.cpp
+++ b/src/plugins/genericeditor/includerulesinstruction.cpp
@@ -30,7 +30,7 @@
#include "includerulesinstruction.h"
#include "reuse.h"
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
IncludeRulesInstruction::IncludeRulesInstruction(const QString &context,
diff --git a/src/plugins/genericeditor/includerulesinstruction.h b/src/plugins/genericeditor/includerulesinstruction.h
index 00472a13784..66823d737f5 100644
--- a/src/plugins/genericeditor/includerulesinstruction.h
+++ b/src/plugins/genericeditor/includerulesinstruction.h
@@ -32,7 +32,7 @@
#include <QtCore/QString>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class IncludeRulesInstruction
@@ -51,6 +51,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // INCLUDERULESINSTRUCTION_H
diff --git a/src/plugins/genericeditor/itemdata.cpp b/src/plugins/genericeditor/itemdata.cpp
index 74e5ca7dbc6..62ed36f01c1 100644
--- a/src/plugins/genericeditor/itemdata.cpp
+++ b/src/plugins/genericeditor/itemdata.cpp
@@ -30,7 +30,7 @@
#include "itemdata.h"
#include "reuse.h"
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
namespace {
diff --git a/src/plugins/genericeditor/itemdata.h b/src/plugins/genericeditor/itemdata.h
index ffb1b0353e0..67a968a4bcf 100644
--- a/src/plugins/genericeditor/itemdata.h
+++ b/src/plugins/genericeditor/itemdata.h
@@ -36,7 +36,7 @@
#include <QtGui/QFont>
#include <QtGui/QTextCharFormat>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class ItemData
@@ -64,6 +64,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // ITEMDATA_H
diff --git a/src/plugins/genericeditor/keywordlist.cpp b/src/plugins/genericeditor/keywordlist.cpp
index 41de091323f..70ef6ac614b 100644
--- a/src/plugins/genericeditor/keywordlist.cpp
+++ b/src/plugins/genericeditor/keywordlist.cpp
@@ -29,7 +29,7 @@
#include "keywordlist.h"
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
void KeywordList::addKeyword(const QString &keyword)
diff --git a/src/plugins/genericeditor/keywordlist.h b/src/plugins/genericeditor/keywordlist.h
index 1c072e0e609..c76a7311beb 100644
--- a/src/plugins/genericeditor/keywordlist.h
+++ b/src/plugins/genericeditor/keywordlist.h
@@ -33,7 +33,7 @@
#include <QtCore/QString>
#include <QtCore/QSet>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class KeywordList
@@ -48,6 +48,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // KEYWORDLIST_H
diff --git a/src/plugins/genericeditor/languagespecificfactories.cpp b/src/plugins/genericeditor/languagespecificfactories.cpp
index 6710afe95ca..026ea290a60 100644
--- a/src/plugins/genericeditor/languagespecificfactories.cpp
+++ b/src/plugins/genericeditor/languagespecificfactories.cpp
@@ -29,115 +29,115 @@
#include "languagespecificfactories.h"
#include "genericeditorconstants.h"
-#include "genericeditor.h"
+#include "editor.h"
#include "genericeditorplugin.h"
#include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
// C
-CFactory::CFactory(QObject *parent) : GenericEditorFactory(parent)
+CFactory::CFactory(QObject *parent) : EditorFactory(parent)
{
- addMimeType(QLatin1String(Highlight::Constants::C_HEADER_MIMETYPE));
- addMimeType(QLatin1String(Highlight::Constants::C_SOURCE_MIMETYPE));
+ addMimeType(QLatin1String(GenericEditor::Constants::C_HEADER_MIMETYPE));
+ addMimeType(QLatin1String(GenericEditor::Constants::C_SOURCE_MIMETYPE));
}
-GenericEditor *CFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kCDefinitionId, parent); }
+Editor *CFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kCDefinitionId, parent); }
// C++
-CppFactory::CppFactory(QObject *parent) : GenericEditorFactory(parent)
+CppFactory::CppFactory(QObject *parent) : EditorFactory(parent)
{
- addMimeType(QLatin1String(Highlight::Constants::CPP_HEADER_MIMETYPE));
- addMimeType(QLatin1String(Highlight::Constants::CPP_SOURCE_MIMETYPE));
+ addMimeType(QLatin1String(GenericEditor::Constants::CPP_HEADER_MIMETYPE));
+ addMimeType(QLatin1String(GenericEditor::Constants::CPP_SOURCE_MIMETYPE));
}
-GenericEditor *CppFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kCppDefinitionId, parent); }
+Editor *CppFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kCppDefinitionId, parent); }
// Css
-CssFactory::CssFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::CSS_MIMETYPE)); }
+CssFactory::CssFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::CSS_MIMETYPE)); }
-GenericEditor *CssFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kCssDefinitionId, parent); }
+Editor *CssFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kCssDefinitionId, parent); }
// Fortran
-FortranFactory::FortranFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::FORTRAN_MIMETYPE)); }
+FortranFactory::FortranFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::FORTRAN_MIMETYPE)); }
-GenericEditor *FortranFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kFortranDefinitionId, parent); }
+Editor *FortranFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kFortranDefinitionId, parent); }
// Html
-HtmlFactory::HtmlFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::HTML_MIMETYPE)); }
+HtmlFactory::HtmlFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::HTML_MIMETYPE)); }
-GenericEditor *HtmlFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kHtmlDefinitionId, parent); }
+Editor *HtmlFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kHtmlDefinitionId, parent); }
// Java
-JavaFactory::JavaFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::JAVA_MIMETYPE)); }
+JavaFactory::JavaFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::JAVA_MIMETYPE)); }
-GenericEditor *JavaFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kJavaDefinitionId, parent); }
+Editor *JavaFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kJavaDefinitionId, parent); }
// Javascript
-JavascriptFactory::JavascriptFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::JAVASCRIPT_MIMETYPE)); }
+JavascriptFactory::JavascriptFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::JAVASCRIPT_MIMETYPE)); }
-GenericEditor *JavascriptFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kJavascriptDefinitionId, parent); }
+Editor *JavascriptFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kJavascriptDefinitionId, parent); }
// ObjectiveC
-ObjectiveCFactory::ObjectiveCFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::OBJECTIVEC_MIMETYPE)); }
+ObjectiveCFactory::ObjectiveCFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::OBJECTIVEC_MIMETYPE)); }
-GenericEditor *ObjectiveCFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kObjectiveCDefinitionId, parent); }
+Editor *ObjectiveCFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kObjectiveCDefinitionId, parent); }
// Perl
-PerlFactory::PerlFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::PERL_MIMETYPE)); }
+PerlFactory::PerlFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::PERL_MIMETYPE)); }
-GenericEditor *PerlFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kPerlDefinitionId, parent); }
+Editor *PerlFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kPerlDefinitionId, parent); }
// Php
-PhpFactory::PhpFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::PHP_MIMETYPE)); }
+PhpFactory::PhpFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::PHP_MIMETYPE)); }
-GenericEditor *PhpFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kPhpDefinitionId, parent); }
+Editor *PhpFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kPhpDefinitionId, parent); }
// Python
-PythonFactory::PythonFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::PYTHON_MIMETYPE)); }
+PythonFactory::PythonFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::PYTHON_MIMETYPE)); }
-GenericEditor *PythonFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kPythonDefinitionId, parent); }
+Editor *PythonFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kPythonDefinitionId, parent); }
// Ruby
-RubyFactory::RubyFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::RUBY_MIMETYPE)); }
+RubyFactory::RubyFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::RUBY_MIMETYPE)); }
-GenericEditor *RubyFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kRubyDefinitionId, parent); }
+Editor *RubyFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kRubyDefinitionId, parent); }
// SQL
-SqlFactory::SqlFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::SQL_MIMETYPE)); }
+SqlFactory::SqlFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::SQL_MIMETYPE)); }
-GenericEditor *SqlFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kSqlDefinitionId, parent); }
+Editor *SqlFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kSqlDefinitionId, parent); }
// Tcl
-TclFactory::TclFactory(QObject *parent) : GenericEditorFactory(parent)
-{ addMimeType(QLatin1String(Highlight::Constants::TCL_MIMETYPE)); }
+TclFactory::TclFactory(QObject *parent) : EditorFactory(parent)
+{ addMimeType(QLatin1String(GenericEditor::Constants::TCL_MIMETYPE)); }
-GenericEditor *TclFactory::createGenericEditor(QWidget *parent)
-{ return new GenericEditor(GenericEditorPlugin::kTclDefinitionId, parent); }
+Editor *TclFactory::createGenericEditor(QWidget *parent)
+{ return new Editor(GenericEditorPlugin::kTclDefinitionId, parent); }
diff --git a/src/plugins/genericeditor/languagespecificfactories.h b/src/plugins/genericeditor/languagespecificfactories.h
index ed27458d13f..792bb7f1b96 100644
--- a/src/plugins/genericeditor/languagespecificfactories.h
+++ b/src/plugins/genericeditor/languagespecificfactories.h
@@ -30,12 +30,12 @@
#ifndef LANGUAGESPECIFICFACTORIES_H
#define LANGUAGESPECIFICFACTORIES_H
-#include "genericeditorfactory.h"
+#include "editorfactory.h"
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
-class CFactory : public GenericEditorFactory
+class CFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -43,10 +43,10 @@ public:
virtual ~CFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class CppFactory : public GenericEditorFactory
+class CppFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -54,10 +54,10 @@ public:
virtual ~CppFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class CssFactory : public GenericEditorFactory
+class CssFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -65,10 +65,10 @@ public:
virtual ~CssFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class FortranFactory : public GenericEditorFactory
+class FortranFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -76,10 +76,10 @@ public:
virtual ~FortranFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class HtmlFactory : public GenericEditorFactory
+class HtmlFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -87,10 +87,10 @@ public:
virtual ~HtmlFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class JavaFactory : public GenericEditorFactory
+class JavaFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -98,10 +98,10 @@ public:
virtual ~JavaFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class JavascriptFactory : public GenericEditorFactory
+class JavascriptFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -109,10 +109,10 @@ public:
virtual ~JavascriptFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class ObjectiveCFactory : public GenericEditorFactory
+class ObjectiveCFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -120,10 +120,10 @@ public:
virtual ~ObjectiveCFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class PerlFactory : public GenericEditorFactory
+class PerlFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -131,10 +131,10 @@ public:
virtual ~PerlFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class PhpFactory : public GenericEditorFactory
+class PhpFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -142,10 +142,10 @@ public:
virtual ~PhpFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class PythonFactory : public GenericEditorFactory
+class PythonFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -153,10 +153,10 @@ public:
virtual ~PythonFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class RubyFactory : public GenericEditorFactory
+class RubyFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -164,10 +164,10 @@ public:
virtual ~RubyFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class SqlFactory : public GenericEditorFactory
+class SqlFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -175,10 +175,10 @@ public:
virtual ~SqlFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
-class TclFactory : public GenericEditorFactory
+class TclFactory : public EditorFactory
{
Q_OBJECT
public:
@@ -186,10 +186,10 @@ public:
virtual ~TclFactory() {}
private:
- virtual GenericEditor *createGenericEditor(QWidget *parent);
+ virtual Editor *createGenericEditor(QWidget *parent);
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // LANGUAGESPECIFICFACTORIES_H
diff --git a/src/plugins/genericeditor/progressdata.cpp b/src/plugins/genericeditor/progressdata.cpp
index 47696b04382..f751454bfbc 100644
--- a/src/plugins/genericeditor/progressdata.cpp
+++ b/src/plugins/genericeditor/progressdata.cpp
@@ -31,7 +31,7 @@
#include <QtCore/QtGlobal>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
ProgressData::ProgressData() :
diff --git a/src/plugins/genericeditor/progressdata.h b/src/plugins/genericeditor/progressdata.h
index d3df90acce1..6d3d35e95b5 100644
--- a/src/plugins/genericeditor/progressdata.h
+++ b/src/plugins/genericeditor/progressdata.h
@@ -32,7 +32,7 @@
#include <QtCore/QStringList>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class ProgressData
@@ -67,6 +67,6 @@ private:
};
} // namespace Internal
-} // namespace Highgliht
+} // namespace GenericEditor
#endif // PROGRESSDATA_H
diff --git a/src/plugins/genericeditor/reuse.h b/src/plugins/genericeditor/reuse.h
index 3bcf39af352..f6c66f4a10a 100644
--- a/src/plugins/genericeditor/reuse.h
+++ b/src/plugins/genericeditor/reuse.h
@@ -35,7 +35,7 @@
#include <QtCore/QLatin1String>
#include <QtCore/QChar>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
inline bool toBool(const QString &s)
@@ -86,6 +86,6 @@ inline void setStartCharacter(QChar &c, const QString &character)
}
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // REUSE_H
diff --git a/src/plugins/genericeditor/rule.cpp b/src/plugins/genericeditor/rule.cpp
index 31100a1547b..7c09818571e 100644
--- a/src/plugins/genericeditor/rule.cpp
+++ b/src/plugins/genericeditor/rule.cpp
@@ -37,7 +37,7 @@
#include <functional>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
const QLatin1Char Rule::kBackSlash('\\');
diff --git a/src/plugins/genericeditor/rule.h b/src/plugins/genericeditor/rule.h
index d5c58b821d1..c27d5b09026 100644
--- a/src/plugins/genericeditor/rule.h
+++ b/src/plugins/genericeditor/rule.h
@@ -34,7 +34,7 @@
#include <QtCore/QList>
#include <QtCore/QSharedPointer>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class ProgressData;
@@ -155,6 +155,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // RULE_H
diff --git a/src/plugins/genericeditor/specificrules.cpp b/src/plugins/genericeditor/specificrules.cpp
index 18678ae3fe3..41def9aa25a 100644
--- a/src/plugins/genericeditor/specificrules.cpp
+++ b/src/plugins/genericeditor/specificrules.cpp
@@ -35,7 +35,7 @@
#include <QLatin1Char>
-using namespace Highlight;
+using namespace GenericEditor;
using namespace Internal;
namespace {
diff --git a/src/plugins/genericeditor/specificrules.h b/src/plugins/genericeditor/specificrules.h
index eb27a78c77a..108f88a4073 100644
--- a/src/plugins/genericeditor/specificrules.h
+++ b/src/plugins/genericeditor/specificrules.h
@@ -38,7 +38,7 @@
#include <QtCore/QRegExp>
#include <QtCore/QSharedPointer>
-namespace Highlight {
+namespace GenericEditor {
namespace Internal {
class KeywordList;
@@ -283,6 +283,6 @@ private:
};
} // namespace Internal
-} // namespace Highlight
+} // namespace GenericEditor
#endif // SPECIFICRULES_H
--
GitLab