Clean up single namespace forward-declarations

Done using the following ruby script:

Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}

Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>

7 files changed, 15 insertions, 45 deletions

diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h
index 14b37dbdf54..abf3fb301fc 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.h
+++ b/src/plugins/qmljseditor/qmljscompletionassist.h
@@ -44,9 +44,7 @@
 #include <QVariant>
 #include <QIcon>
 
-namespace QmlJS {
-class Value;
-}
+namespace QmlJS { class Value; }
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 96bc6cecc54..2c520a38764 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -48,17 +48,13 @@ class QComboBox;
 class QTimer;
 QT_END_NAMESPACE
 
-namespace Core {
-class ICore;
-}
+namespace Core { class ICore; }
 
 namespace QmlJS {
     class ModelManagerInterface;
     class IContextPane;
     class LookupContext;
-namespace AST {
-    class UiObjectMember;
-}
+namespace AST { class UiObjectMember; }
 }
 
 /*!
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h
index 36e599327ff..ec5e9845f81 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.h
+++ b/src/plugins/qmljseditor/qmljseditorplugin.h
@@ -38,9 +38,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
-namespace Utils {
-class JsonSchemaManager;
-}
+namespace Utils { class JsonSchemaManager; }
 
 namespace Core {
 class Command;
@@ -49,13 +47,9 @@ class ActionManager;
 class IEditor;
 }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
-namespace QmlJS {
-    class ModelManagerInterface;
-}
+namespace QmlJS { class ModelManagerInterface; }
 
 namespace QmlJSEditor {
 
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h
index e2cbf635339..ced89f1c5bc 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.h
+++ b/src/plugins/qmljseditor/qmljshoverhandler.h
@@ -39,13 +39,9 @@ QT_BEGIN_NAMESPACE
 template <class> class QList;
 QT_END_NAMESPACE
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace TextEditor {
-class ITextEditor;
-}
+namespace TextEditor { class ITextEditor; }
 
 namespace QmlJS {
 class ScopeChain;
diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h
index a512fd455f8..668b697c728 100644
--- a/src/plugins/qmljseditor/qmljsoutline.h
+++ b/src/plugins/qmljseditor/qmljsoutline.h
@@ -36,13 +36,9 @@
 
 #include <QSortFilterProxyModel>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace QmlJS {
-class Editor;
-}
+namespace QmlJS { class Editor; }
 
 namespace QmlJSEditor {
 namespace Internal {
diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.h b/src/plugins/qmljseditor/qmljssemantichighlighter.h
index cd316a95c94..2dcf9f151fb 100644
--- a/src/plugins/qmljseditor/qmljssemantichighlighter.h
+++ b/src/plugins/qmljseditor/qmljssemantichighlighter.h
@@ -37,18 +37,12 @@
 
 namespace QmlJS {
 class ScopeChain;
-namespace AST {
-class SourceLocation;
-}
+namespace AST { class SourceLocation; }
 }
 
-namespace TextEditor {
-class FontSettings;
-}
+namespace TextEditor { class FontSettings; }
 
-namespace QmlJSTools {
-class SemanticInfo;
-}
+namespace QmlJSTools { class SemanticInfo; }
 
 namespace QmlJSEditor {
 
diff --git a/src/plugins/qmljseditor/quicktoolbar.h b/src/plugins/qmljseditor/quicktoolbar.h
index 78e0e0e0bc2..37a4f407ffe 100644
--- a/src/plugins/qmljseditor/quicktoolbar.h
+++ b/src/plugins/qmljseditor/quicktoolbar.h
@@ -34,13 +34,9 @@
 
 #include <QPointer>
 
-namespace TextEditor {
-class BaseTextEditor;
-}
+namespace TextEditor { class BaseTextEditor; }
 
-namespace QmlEditorWidgets {
-class ContextPaneWidget;
-}
+namespace QmlEditorWidgets { class ContextPaneWidget; }
 
 namespace QmlJSEditor {