Commit 7ed15760 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk
Browse files

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: default avatarhjk <hjk121@nokiamail.com>
parent 3f44590f
......@@ -37,9 +37,7 @@
#include <QtPlugin>
#include <QAction>
namespace TextEditor {
class ITextEditor;
} // namespace TextEditor
namespace TextEditor { class ITextEditor; }
namespace CppEditor {
namespace Internal {
......
......@@ -34,13 +34,9 @@
#include <QObject>
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace TextEditor {
class ITextEditor;
}
namespace TextEditor { class ITextEditor; }
namespace CppEditor {
namespace Internal {
......
......@@ -43,9 +43,7 @@ class QModelIndex;
class QLabel;
QT_END_NAMESPACE
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace Utils {
class AnnotatedItemDelegate;
......
......@@ -41,9 +41,7 @@ enum ItemRole {
} // Anonymous
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace CppEditor {
namespace Internal {
......
......@@ -45,9 +45,7 @@ template <class> class QVector;
template <class> class QList;
QT_END_NAMESPACE
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace Utils {
class NavigationTreeView;
......
......@@ -40,9 +40,7 @@
namespace CppTools {
namespace Internal {
namespace Ui {
class CompletionSettingsPage;
}
namespace Ui { class CompletionSettingsPage; }
// TODO: Move this class to the text editor plugin
......
......@@ -48,9 +48,7 @@ class QTextBlock;
QT_END_NAMESPACE
namespace CppTools {
namespace Internal {
class CppCodeFormatterData;
}
namespace Internal { class CppCodeFormatterData; }
class CPPTOOLS_EXPORT CodeFormatter
{
......
......@@ -53,9 +53,7 @@ class CppCodeStylePreferences;
namespace Internal {
namespace Ui {
class CppCodeStyleSettingsPage;
}
namespace Ui { class CppCodeStyleSettingsPage; }
class CppCodeStylePreferencesWidget : public QWidget
{
......
......@@ -39,9 +39,7 @@ QT_BEGIN_NAMESPACE
class QTextDocument;
QT_END_NAMESPACE
namespace ProjectExplorer {
class Project;
}
namespace ProjectExplorer { class Project; }
namespace TextEditor {
class BaseTextEditor;
......
......@@ -38,9 +38,7 @@
#include <QFuture>
namespace TextEditor {
class ITextEditor;
}
namespace TextEditor { class ITextEditor; }
namespace CppTools {
......
......@@ -41,9 +41,7 @@ namespace CPlusPlus {
class Document;
class Snapshot;
}
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace CppTools {
namespace Tests {
......
......@@ -40,9 +40,7 @@
#include <QVariant>
#include <QTime>
namespace Utils {
class ConsoleProcess;
}
namespace Utils { class ConsoleProcess; }
namespace Debugger {
namespace Internal {
......
......@@ -43,9 +43,7 @@ QT_BEGIN_NAMESPACE
class QCheckBox;
QT_END_NAMESPACE
namespace Utils {
class PathListEditor;
}
namespace Utils { class PathListEditor; }
namespace Debugger {
namespace Internal {
......
......@@ -43,17 +43,11 @@ class QMessageBox;
class QWidget;
QT_END_NAMESPACE
namespace CPlusPlus {
class Snapshot;
}
namespace CPlusPlus { class Snapshot; }
namespace Utils {
class SavedAction;
}
namespace Utils { class SavedAction; }
namespace ProjectExplorer {
class RunControl;
}
namespace ProjectExplorer { class RunControl; }
namespace Debugger {
......
......@@ -35,9 +35,7 @@
#include <projectexplorer/runconfiguration.h>
namespace Utils {
class Environment;
}
namespace Utils { class Environment; }
namespace Debugger {
class DebuggerEngine;
......
......@@ -52,9 +52,7 @@ class IEditor;
class IMode;
}
namespace TextEditor {
class ITextEditor;
}
namespace TextEditor { class ITextEditor; }
namespace Debugger {
class DebuggerEngine;
......
......@@ -38,13 +38,9 @@
QT_FORWARD_DECLARE_CLASS(QPoint)
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace ProjectExplorer {
class Abi;
}
namespace ProjectExplorer { class Abi; }
namespace Debugger {
......
......@@ -42,9 +42,7 @@
#include <QTextDocument>
namespace Core {
class IDocument;
}
namespace Core { class IDocument; }
namespace Debugger {
namespace Internal {
......
......@@ -36,9 +36,7 @@
#include <qmldebug/qmldebugclient.h>
#include <qmljs/qmljsdocument.h>
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace QmlDebug {
class BaseEngineDebugClient;
......
......@@ -33,13 +33,9 @@
#include <texteditor/basetexteditor.h>
#include <qmljs/qmljsdocument.h>
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace QmlJS {
class ModelManagerInterface;
}
namespace QmlJS { class ModelManagerInterface; }
namespace Debugger {
namespace Internal {
......
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