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

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
......@@ -39,9 +39,7 @@ namespace ExtensionSystem {
class PluginSpec;
namespace Internal {
namespace Ui {
class PluginDetailsView;
} // namespace Ui
namespace Ui { class PluginDetailsView; }
} // namespace Internal
......
......@@ -38,9 +38,7 @@ namespace ExtensionSystem {
class PluginSpec;
namespace Internal {
namespace Ui {
class PluginErrorView;
} // namespace Ui
namespace Ui { class PluginErrorView; }
} // namespace Internal
class EXTENSIONSYSTEM_EXPORT PluginErrorView : public QWidget
......
......@@ -46,9 +46,7 @@ class PluginCollection;
class IPlugin;
class PluginSpec;
namespace Internal {
class PluginManagerPrivate;
}
namespace Internal { class PluginManagerPrivate; }
class EXTENSIONSYSTEM_EXPORT PluginManager : public QObject
{
......
......@@ -35,14 +35,10 @@
QT_BEGIN_NAMESPACE
class QVariant;
namespace Ui {
class ContextPaneTextWidget;
}
namespace Ui { class ContextPaneTextWidget; }
QT_END_NAMESPACE
namespace QmlJS {
class PropertyReader;
}
namespace QmlJS { class PropertyReader; }
namespace QmlEditorWidgets {
......
......@@ -41,9 +41,7 @@ class QGraphicsDropShadowEffect;
class QGraphicsOpacityEffect;
QT_END_NAMESPACE
namespace QmlJS {
class PropertyReader;
}
namespace QmlJS { class PropertyReader; }
namespace QmlEditorWidgets {
......
......@@ -46,9 +46,7 @@ class QLabel;
class QSlider;
QT_END_NAMESPACE
namespace QmlJS {
class PropertyReader;
}
namespace QmlJS { class PropertyReader; }
namespace QmlEditorWidgets {
......
......@@ -34,14 +34,10 @@
#include <QWidget>
QT_BEGIN_NAMESPACE
namespace Ui {
class ContextPaneWidgetRectangle;
}
namespace Ui { class ContextPaneWidgetRectangle; }
QT_END_NAMESPACE
namespace QmlJS {
class PropertyReader;
}
namespace QmlJS { class PropertyReader; }
namespace QmlEditorWidgets {
......
......@@ -36,14 +36,10 @@
QT_BEGIN_NAMESPACE
class QVariant;
namespace Ui {
class EasingContextPane;
}
namespace Ui { class EasingContextPane; }
QT_END_NAMESPACE
namespace QmlJS {
class PropertyReader;
}
namespace QmlJS { class PropertyReader; }
namespace QmlEditorWidgets {
class EasingSimulation;
......
......@@ -39,9 +39,7 @@
QT_FORWARD_DECLARE_CLASS(QTextStream)
namespace Utils {
class JsonObjectValue;
}
namespace Utils { class JsonObjectValue; }
namespace QmlJS {
......
......@@ -37,9 +37,7 @@
#include <qmljs/qmljsdocument.h>
#include <qmljs/parser/qmljsastfwd_p.h>
namespace TextEditor {
class BaseTextEditor;
} //TextEditor
namespace TextEditor { class BaseTextEditor; }
namespace QmlJS {
......
......@@ -50,9 +50,7 @@ QT_END_NAMESPACE
namespace QmlJS {
class ImportInfo;
namespace Internal {
class ImportDependenciesPrivate;
}
namespace Internal { class ImportDependenciesPrivate; }
class ImportDependencies;
// match strenght wrt to the selectors of a ViewerContext
......
......@@ -41,9 +41,7 @@
#include <QStringList>
#include <QPointer>
namespace ProjectExplorer {
class Project;
}
namespace ProjectExplorer { class Project; }
namespace QmlJS {
......
......@@ -44,9 +44,7 @@ class ObjectValue;
class Value;
class ScopeChain;
namespace AST {
class Node;
}
namespace AST { class Node; }
class QMLJS_EXPORT ScopeBuilder
{
......
......@@ -46,9 +46,7 @@ class SftpChannel;
class SshDirectTcpIpTunnel;
class SshRemoteProcess;
namespace Internal {
class SshConnectionPrivate;
} // namespace Internal
namespace Internal { class SshConnectionPrivate; }
enum SshConnectionOption {
SshIgnoreDefaultProxy = 0x1,
......
......@@ -34,9 +34,7 @@
#include "sshremoteprocess.h"
namespace QSsh {
namespace Internal {
class SshRemoteProcessRunnerPrivate;
} // namespace Internal
namespace Internal { class SshRemoteProcessRunnerPrivate; }
class QSSH_EXPORT SshRemoteProcessRunner : public QObject
{
......
......@@ -38,9 +38,7 @@ namespace Utils {
class Environment;
class EnvironmentItem;
namespace Internal {
class EnvironmentModelPrivate;
} // namespace Internal
namespace Internal { class EnvironmentModelPrivate; }
class QTCREATOR_UTILS_EXPORT EnvironmentModel : public QAbstractTableModel
{
......
......@@ -35,9 +35,7 @@
QT_FORWARD_DECLARE_CLASS(QString)
namespace Utils {
namespace Internal {
class PortListPrivate;
} // namespace Internal
namespace Internal { class PortListPrivate; }
class QTCREATOR_UTILS_EXPORT PortList
{
......
......@@ -35,9 +35,7 @@
#include <QAbstractSocket>
namespace Utils {
namespace Internal {
class TcpPortsGathererPrivate;
}
namespace Internal { class TcpPortsGathererPrivate; }
class QTCREATOR_UTILS_EXPORT TcpPortsGatherer
{
......
......@@ -36,9 +36,7 @@
QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
namespace Utils {
class TipContent;
}
namespace Utils { class TipContent; }
#ifndef Q_MOC_RUN
namespace Utils {
......
......@@ -36,9 +36,7 @@ QT_BEGIN_NAMESPACE
class QWidget;
QT_END_NAMESPACE
namespace CPlusPlus {
class Symbol;
}
namespace CPlusPlus { class Symbol; }
namespace AnalyzerUtils
{
......
......@@ -40,9 +40,7 @@
#include <QObject>
#include <QAction>
namespace ProjectExplorer {
class RunConfiguration;
}
namespace ProjectExplorer { class RunConfiguration; }
namespace Analyzer {
......
......@@ -38,9 +38,7 @@ QT_BEGIN_NAMESPACE
class QComboBox;
QT_END_NAMESPACE
namespace Utils {
class PathChooser;
}
namespace Utils { class PathChooser; }
namespace AutotoolsProjectManager {
namespace Internal {
......
......@@ -34,9 +34,7 @@
#include <utils/wizard.h>
namespace Utils {
class PathChooser;
}
namespace Utils { class PathChooser; }
namespace AutotoolsProjectManager {
namespace Internal {
......
......@@ -38,9 +38,7 @@
QT_FORWARD_DECLARE_CLASS(QDir)
namespace Utils {
class FileSystemWatcher;
}
namespace Utils { class FileSystemWatcher; }
namespace ProjectExplorer {
class Node;
......
......@@ -34,9 +34,7 @@
#include <projectexplorer/projectnodes.h>
namespace Core {
class IDocument;
}
namespace Core { class IDocument; }
namespace AutotoolsProjectManager {
namespace Internal {
......
......@@ -34,9 +34,7 @@
namespace BareMetal {
namespace Ui {
class BareMetalDeviceConfigurationWidget;
}
namespace Ui { class BareMetalDeviceConfigurationWidget; }
class BareMetalDeviceConfigurationWidget
: public ProjectExplorer::IDeviceWidget
......
......@@ -34,9 +34,7 @@
#include <utils/wizard.h>
namespace BareMetal {
namespace Internal {
class BareMetalDeviceConfigrationWizardPrivate;
} // namespace Internal
namespace Internal { class BareMetalDeviceConfigrationWizardPrivate; }
class BareMetalDeviceConfigurationWizard : public Utils::Wizard
{
......
......@@ -40,9 +40,7 @@ QT_END_NAMESPACE
namespace BareMetal {
class BareMetalRunConfiguration;
namespace Internal {
class BareMetalRunConfigurationWidgetPrivate;
} // namespace Internal
namespace Internal { class BareMetalRunConfigurationWidgetPrivate; }
class BareMetalRunConfigurationWidget : public QWidget
{
......
......@@ -49,13 +49,9 @@ class IEditorFactory;
class IEditor;
} // namespace Core
namespace Utils {
class ParameterAction;
} //namespace Utils
namespace Utils { class ParameterAction; }
namespace VcsBase {
class VcsBaseSubmitEditor;
}
namespace VcsBase { class VcsBaseSubmitEditor; }
namespace Bazaar {
namespace Internal {
......
......@@ -34,9 +34,7 @@
namespace Bazaar {
namespace Internal {
namespace Ui {
class CloneOptionsPanel;
}
namespace Ui { class CloneOptionsPanel; }
class CloneOptionsPanel : public QWidget
{
......
......@@ -32,9 +32,7 @@
#include <vcsbase/vcsbaseclient.h>
#include <vcsbase/vcsbasesubmiteditor.h>
namespace VcsBase {
class SubmitFileModel;
}
namespace VcsBase { class SubmitFileModel; }
namespace Bazaar {
namespace Internal {
......
......@@ -34,9 +34,7 @@
namespace Bazaar {
namespace Internal {
namespace Ui {
class PullOrPushDialog;
}
namespace Ui { class PullOrPushDialog; }
class PullOrPushDialog : public QDialog
{
......
......@@ -34,9 +34,7 @@
namespace Bazaar {
namespace Internal {
namespace Ui {
class UnCommitDialog;
}
namespace Ui { class UnCommitDialog; }
class UnCommitDialog : public QDialog
{
......
......@@ -45,13 +45,9 @@
QT_FORWARD_DECLARE_CLASS(QMenu)
QT_FORWARD_DECLARE_CLASS(QHelpEvent)
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace TextEditor {
class FontSettings;
}
namespace TextEditor { class FontSettings; }
namespace BINEditor {
......
......@@ -40,13 +40,9 @@ class QAction;
class QMenu;
QT_END_NAMESPACE
namespace Core {
class IEditor;
}
namespace Core { class IEditor; }
namespace TextEditor {
class ITextEditor;
}
namespace TextEditor { class ITextEditor; }
namespace Bookmarks {
namespace Internal {
......
......@@ -44,9 +44,7 @@
namespace ClangCodeModel {
namespace Internal {
class ClangSymbolSearcher;
} // namespace Internal
namespace Internal { class ClangSymbolSearcher; }
class IndexerPrivate;
......
......@@ -36,9 +36,7 @@
namespace ClearCase {
namespace Internal {
namespace Ui {
class CheckOutDialog;
}
namespace Ui { class CheckOutDialog; }
class ActivitySelector;
......
......@@ -40,9 +40,7 @@ QT_END_NAMESPACE
namespace ClearCase {
namespace Internal {
namespace Ui {
class VersionSelector;
}
namespace Ui { class VersionSelector; }
class VersionSelector : public QDialog
{
......
......@@ -33,9 +33,7 @@
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/abi.h>
namespace ProjectExplorer {
class ToolChain;
}
namespace ProjectExplorer { class ToolChain; }
namespace CMakeProjectManager {
class CMakeBuildInfo;
......
......@@ -36,9 +36,7 @@
#include <utils/uncommentselection.h>
namespace TextEditor {
class FontSettings;
}
namespace TextEditor { class FontSettings; }
namespace CMakeProjectManager {
namespace Internal {
......
......@@ -50,9 +50,7 @@ class FancyLineEdit;
class PathChooser;
}
namespace ProjectExplorer {
class Kit;
}
namespace ProjectExplorer { class Kit; }
namespace CMakeProjectManager {
namespace Internal {
......
......@@ -52,9 +52,7 @@
QT_FORWARD_DECLARE_CLASS(QLabel)
namespace Utils {
class QtcProcess;
}
namespace Utils { class QtcProcess; }
namespace CMakeProjectManager {
namespace Internal {
......
......@@ -38,9 +38,7 @@ class QListWidget;
class QListWidgetItem;
QT_END_NAMESPACE
namespace ProjectExplorer {
class ToolChain;
}
namespace ProjectExplorer { class ToolChain; }
namespace CMakeProjectManager {
namespace Internal {
......
......@@ -35,9 +35,7 @@
namespace Core {
class IEditor;
namespace Internal {
class DesignModeCoreListener;
} // namespace Internal
namespace Internal { class DesignModeCoreListener; }
/**
* A global mode for Design pane - used by Bauhaus (QML Designer) and
......
......@@ -35,9 +35,7 @@
namespace Core {
namespace Internal {
namespace Ui {
class AddToVcsDialog;
}
namespace Ui { class AddToVcsDialog; }
class AddToVcsDialog : public QDialog
{
......
......@@ -38,9 +38,7 @@
namespace Core {
namespace Internal {
namespace Ui {
class ExternalToolConfig;
}
namespace Ui { class ExternalToolConfig; }
class ExternalToolModel : public QAbstractItemModel
{
......