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
......@@ -34,9 +34,7 @@
#include <QDialog>
namespace Utils {
class PathChooser;
}
namespace Utils { class PathChooser; }
QT_BEGIN_NAMESPACE
class QDialogButtonBox;
......
......@@ -36,9 +36,7 @@
namespace Debugger {
namespace Internal {
namespace Ui {
class SymbolPathsDialog;
}
namespace Ui { class SymbolPathsDialog; }
class SymbolPathsDialog : public QDialog
{
......
......@@ -39,9 +39,7 @@ class FormClassWizardGenerationParameters;
namespace Internal {
namespace Ui {
class FormClassWizardPage;
}
namespace Ui { class FormClassWizardPage; }
class FormClassWizardPage : public QWizardPage
......
......@@ -30,9 +30,7 @@
#ifndef EDITORDATA_H
#define EDITORDATA_H
namespace SharedTools {
class WidgetHost;
}
namespace SharedTools { class WidgetHost; }
namespace Designer {
class FormWindowEditor;
......
......@@ -38,12 +38,8 @@ QT_BEGIN_NAMESPACE
class QDesignerFormWindowInterface;
QT_END_NAMESPACE
namespace SharedTools {
class WidgetHost;
}
namespace Core {
class IEditor;
}
namespace SharedTools { class WidgetHost; }
namespace Core { class IEditor; }
namespace Designer {
class FormWindowEditor;
......
......@@ -54,9 +54,7 @@ class QToolBar;
#if QT_VERSION >= 0x050000
class QDesignerFormWindowManagerInterface;
#else
namespace qdesigner_internal {
class QDesignerFormWindowManager;
}
namespace qdesigner_internal { class QDesignerFormWindowManager; }
#endif
QT_END_NAMESPACE
......
......@@ -38,15 +38,11 @@ QT_BEGIN_NAMESPACE
class QDesignerFormWindowInterface;
QT_END_NAMESPACE
namespace TextEditor {
class PlainTextEditor;
}
namespace TextEditor { class PlainTextEditor; }
namespace Designer {
namespace Internal {
class DesignerXmlEditorWidget;
}
namespace Internal { class DesignerXmlEditorWidget; }
struct FormWindowEditorPrivate;
// IEditor that is used for the QDesignerFormWindowInterface
......
......@@ -32,9 +32,7 @@
#include <utils/wizard.h>
namespace Utils {
class FileWizardPage;
}
namespace Utils { class FileWizardPage; }
namespace Designer {
namespace Internal {
......
......@@ -37,9 +37,7 @@ QT_BEGIN_NAMESPACE
#if QT_VERSION >= 0x050000
class QDesignerFormWindowInterface;
#else
namespace qdesigner_internal {
class FormWindowBase;
}
namespace qdesigner_internal { class FormWindowBase; }
#endif
QT_END_NAMESPACE
......
......@@ -39,9 +39,7 @@ class QTreeView;
class QLineEdit;
QT_END_NAMESPACE
namespace ProjectExplorer {
class SelectableFilesModel;
}
namespace ProjectExplorer { class SelectableFilesModel; }
namespace GenericProjectManager {
namespace Internal {
......
......@@ -36,9 +36,7 @@
#include <QHash>
#include <QSet>
namespace Core {
class IDocument;
}
namespace Core { class IDocument; }
namespace GenericProjectManager {
namespace Internal {
......
......@@ -36,9 +36,7 @@ namespace Git {
namespace Internal {
namespace Ui {
class BranchAddDialog;
}
namespace Ui { class BranchAddDialog; }
class BranchAddDialog : public QDialog
{
......
......@@ -35,9 +35,7 @@
namespace Git {
namespace Internal {
namespace Ui {
class BranchCheckoutDialog;
}
namespace Ui { class BranchCheckoutDialog; }
class BranchCheckoutDialog : public QDialog
{
......
......@@ -39,9 +39,7 @@ QT_END_NAMESPACE
namespace Git {
namespace Internal {
namespace Ui {
class BranchDialog;
}
namespace Ui { class BranchDialog; }
class BranchAddDialog;
class BranchModel;
......
......@@ -34,9 +34,7 @@
#include <QSharedPointer>
namespace VcsBase {
class Command;
}
namespace VcsBase { class Command; }
namespace Git {
......
......@@ -33,9 +33,7 @@
#include <QComboBox>
namespace Git {
namespace Internal {
class GitClient;
}
namespace Internal { class GitClient; }
}
namespace Gerrit {
......
......@@ -42,9 +42,7 @@ class QSpinBox;
class QCheckBox;
QT_END_NAMESPACE
namespace Utils {
class PathChooser;
}
namespace Utils { class PathChooser; }
namespace Gerrit {
namespace Internal {
......
......@@ -35,17 +35,13 @@
#include <QDate>
namespace Git {
namespace Internal {
class GitClient;
}
namespace Internal { class GitClient; }
}
namespace Gerrit {
namespace Internal {
namespace Ui {
class GerritPushDialog;
}
namespace Ui { class GerritPushDialog; }
class GerritPushDialog : public QDialog
{
......
......@@ -47,9 +47,7 @@ class QDebug;
class QProcessEnvironment;
QT_END_NAMESPACE
namespace Core {
class ICore;
}
namespace Core { class ICore; }
namespace VcsBase {
class Command;
......@@ -62,9 +60,7 @@ namespace Utils {
struct SynchronousProcessResponse;
}
namespace DiffEditor {
class DiffEditor;
}
namespace DiffEditor { class DiffEditor; }
namespace Git {
namespace Internal {
......
......@@ -32,9 +32,7 @@
#include <texteditor/syntaxhighlighter.h>
namespace TextEditor {
class FontSettings;
}
namespace TextEditor { class FontSettings; }
namespace Git {
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