BinEditor: Also camel-case the namespace

Follows the general pattern better

Change-Id: Icbd1f4ca83601c123873d9c0b362d56c13255b3e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

src/plugins/bineditor/bineditor.cpp

@@ -84,7 +84,7 @@ static QByteArray calculateHexPattern(const QByteArray &pattern)
     return result;
 }
 
-namespace BINEditor {
+namespace BinEditor {
 
 BinEditorWidget::BinEditorWidget(QWidget *parent)
     : QAbstractScrollArea(parent)
@@ -1617,4 +1617,4 @@ void BinEditorWidget::setMarkup(const QList<Markup> &markup)
     viewport()->update();
 }
 
-} // namespace BINEditor
+} // namespace BinEditor

src/plugins/bineditor/bineditor.h

@@ -49,14 +49,14 @@ namespace Core { class IEditor; }
 
 namespace TextEditor { class FontSettings; }
 
-namespace BINEditor {
+namespace BinEditor {
 
 class BinEditorWidget : public QAbstractScrollArea
 {
     Q_OBJECT
     Q_PROPERTY(bool modified READ isModified WRITE setModified DESIGNABLE false)
     Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE false)
-    Q_PROPERTY(QList<BINEditor::Markup> markup READ markup WRITE setMarkup DESIGNABLE false)
+    Q_PROPERTY(QList<BinEditor::Markup> markup READ markup WRITE setMarkup DESIGNABLE false)
     Q_PROPERTY(bool newWindowRequestAllowed READ newWindowRequestAllowed WRITE setNewWindowRequestAllowed DESIGNABLE false)
 
 public:
@@ -245,6 +245,6 @@ private:
     QList<Markup> m_markup;
 };
 
-} // namespace BINEditor
+} // namespace BinEditor
 
 #endif // BINEDITOR_H

src/plugins/bineditor/bineditorconstants.h

@@ -30,7 +30,7 @@
 #ifndef BINEDITORCONSTANTS_H
 #define BINEDITORCONSTANTS_H
 
-namespace BINEditor {
+namespace BinEditor {
 namespace Constants {
 
 const char C_BINEDITOR[] = "BinEditor.BinaryEditor";
@@ -38,6 +38,6 @@ const char C_BINEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "
 const char C_BINEDITOR_MIMETYPE[] = "application/octet-stream";
 
 } // namespace Constants
-} // namespace BINEditor
+} // namespace BinEditor
 
 #endif // BINEDITORCONSTANTS_H

src/plugins/bineditor/bineditorplugin.cpp

@@ -61,9 +61,33 @@
 #include <utils/qtcassert.h>
 
 using namespace Core;
-using namespace BINEditor;
-using namespace BINEditor::Internal;
 
+namespace BinEditor {
+
+///////////////////////////////// BinEditorWidgetFactory //////////////////////////////////
+
+/*!
+   \class BinEditor::BinEditorWidgetFactory
+   \brief The BinEditorWidgetFactory class offers a service registered with
+   PluginManager to create bin editor widgets for plugins
+   without direct linkage.
+
+   \sa ExtensionSystem::PluginManager::getObjectByClassName, ExtensionSystem::invoke
+*/
+
+class BinEditorWidgetFactory : public QObject
+{
+    Q_OBJECT
+public:
+    BinEditorWidgetFactory() {}
+
+    Q_INVOKABLE QWidget *createWidget(QWidget *parent)
+    {
+        return new BinEditorWidget(parent);
+    }
+};
+
+namespace Internal {
 
 class BinEditorFind : public Core::IFindSupport
 {
@@ -206,7 +230,7 @@ public:
         Core::IDocument(parent)
     {
         setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
-        setMimeType(QLatin1String(BINEditor::Constants::C_BINEDITOR_MIMETYPE));
+        setMimeType(QLatin1String(BinEditor::Constants::C_BINEDITOR_MIMETYPE));
         m_widget = parent;
         connect(m_widget, SIGNAL(dataRequested(quint64)),
             this, SLOT(provideData(quint64)));
@@ -341,7 +365,7 @@ public:
         m_widget = widget;
         m_file = new BinEditorDocument(m_widget);
         m_context.add(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
-        m_context.add(BINEditor::Constants::C_BINEDITOR);
+        m_context.add(Constants::C_BINEDITOR);
         m_addressEdit = new QLineEdit;
         QRegExpValidator * const addressValidator
             = new QRegExpValidator(QRegExp(QLatin1String("[0-9a-fA-F]{1,16}")),
@@ -419,25 +443,6 @@ Core::IEditor *BinEditorFactory::createEditor()
 }
 
 
-/*!
-   \class BINEditor::BinEditorWidgetFactory
-   \brief The BinEditorWidgetFactory class offers a service registered with
-   PluginManager to create bin editor widgets for plugins
-   without direct linkage.
-
-   \sa ExtensionSystem::PluginManager::getObjectByClassName, ExtensionSystem::invoke
-*/
-
-BinEditorWidgetFactory::BinEditorWidgetFactory(QObject *parent) :
-    QObject(parent)
-{
-}
-
-QWidget *BinEditorWidgetFactory::createWidget(QWidget *parent)
-{
-    return new BinEditorWidget(parent);
-}
-
 ///////////////////////////////// BinEditorPlugin //////////////////////////////////
 
 BinEditorPlugin::BinEditorPlugin() : m_factory(0)
@@ -551,7 +556,9 @@ void BinEditorPlugin::selectAllAction()
         m_currentEditor->selectAll();
 }
 
+} // namespace Internal
+} // namespace BinEditor
 
-Q_EXPORT_PLUGIN(BinEditorPlugin)
+Q_EXPORT_PLUGIN(BinEditor::Internal::BinEditorPlugin)
 
 #include "bineditorplugin.moc"

src/plugins/bineditor/bineditorplugin.h

@@ -39,18 +39,9 @@
 #include <QStringList>
 #include <QAction>
 
-namespace BINEditor {
+namespace BinEditor {
 class BinEditorWidget;
 
-class BinEditorWidgetFactory : public QObject
-{
-    Q_OBJECT
-public:
-    explicit BinEditorWidgetFactory(QObject *parent = 0);
-
-    Q_INVOKABLE QWidget *createWidget(QWidget *parent);
-};
-
 namespace Internal {
 class BinEditorFactory;
 
@@ -109,6 +100,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace BINEditor
+} // namespace BinEditor
 
 #endif // BINEDITORPLUGIN_H

src/plugins/bineditor/markup.cpp

@@ -30,7 +30,7 @@
 #include "markup.h"
 
 /*!
-    \class BINEditor::Markup
+    \class BinEditor::Markup
     \brief The Markup class defines the range of the binary editor.
 
     Used for displaying class layouts by the debugger.

src/plugins/bineditor/markup.h

@@ -35,7 +35,7 @@
 #include <QList>
 #include <QMetaType>
 
-namespace BINEditor {
+namespace BinEditor {
 
 class Markup
 {
@@ -49,8 +49,9 @@ public:
     QColor color;
     QString toolTip;
 };
-} // namespace BINEditor
 
-Q_DECLARE_METATYPE(QList<BINEditor::Markup>)
+} // namespace BinEditor
+
+Q_DECLARE_METATYPE(QList<BinEditor::Markup>)
 
 #endif // MARKUP_H

src/plugins/debugger/memoryagent.cpp

@@ -146,7 +146,7 @@ bool MemoryAgent::doCreateBinEditor(quint64 addr, unsigned flags,
     if (flags & DebuggerEngine::MemoryView) {
         // Ask BIN editor plugin for factory service and have it create a bin editor widget.
         QWidget *binEditor = 0;
-        if (QObject *factory = ExtensionSystem::PluginManager::getObjectByClassName(QLatin1String("BINEditor::BinEditorWidgetFactory")))
+        if (QObject *factory = ExtensionSystem::PluginManager::getObjectByClassName(QLatin1String("BinEditor::BinEditorWidgetFactory")))
             binEditor = ExtensionSystem::invoke<QWidget *>(factory, "createWidget", (QWidget *)0);
         if (!binEditor)
             return false;

src/plugins/debugger/memoryview.cpp

@@ -81,9 +81,9 @@ void MemoryView::setBinEditorNewWindowRequestAllowed(QWidget *w, bool a)
 void MemoryView::setBinEditorMarkup(QWidget *w, const QList<MemoryMarkup> &ml)
 {
     // Convert into bin editor markup and set.
-    QList<BINEditor::Markup> bml;
+    QList<BinEditor::Markup> bml;
     foreach (const MemoryMarkup &m, ml)
-        bml.push_back(BINEditor::Markup(m.address, m.length, m.color, m.toolTip));
+        bml.push_back(BinEditor::Markup(m.address, m.length, m.color, m.toolTip));
     w->setProperty("markup", qVariantFromValue(bml));
 }