From 7ed1576083ceb7a6587796c63510d0fe027a9aac Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 11 Feb 2014 21:55:42 +0200 Subject: [PATCH] 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 --- src/libs/extensionsystem/plugindetailsview.h | 4 +--- src/libs/extensionsystem/pluginerrorview.h | 4 +--- src/libs/extensionsystem/pluginmanager.h | 4 +--- src/libs/qmleditorwidgets/contextpanetextwidget.h | 8 ++------ src/libs/qmleditorwidgets/contextpanewidget.h | 4 +--- src/libs/qmleditorwidgets/contextpanewidgetimage.h | 4 +--- .../qmleditorwidgets/contextpanewidgetrectangle.h | 8 ++------ .../qmleditorwidgets/easingpane/easingcontextpane.h | 8 ++------ src/libs/qmljs/qmljsbundle.h | 4 +--- src/libs/qmljs/qmljsicontextpane.h | 4 +--- src/libs/qmljs/qmljsimportdependencies.h | 4 +--- src/libs/qmljs/qmljsmodelmanagerinterface.h | 4 +--- src/libs/qmljs/qmljsscopebuilder.h | 4 +--- src/libs/ssh/sshconnection.h | 4 +--- src/libs/ssh/sshremoteprocessrunner.h | 4 +--- src/libs/utils/environmentmodel.h | 4 +--- src/libs/utils/portlist.h | 4 +--- src/libs/utils/tcpportsgatherer.h | 4 +--- src/libs/utils/tooltip/tips.h | 4 +--- src/plugins/analyzerbase/analyzerutils.h | 4 +--- src/plugins/analyzerbase/ianalyzertool.h | 4 +--- .../autotoolsbuildsettingswidget.h | 4 +--- .../autotoolsopenprojectwizard.h | 4 +--- .../autotoolsprojectmanager/autotoolsproject.h | 4 +--- .../autotoolsprojectmanager/autotoolsprojectnode.h | 4 +--- .../baremetal/baremetaldeviceconfigurationwidget.h | 4 +--- .../baremetal/baremetaldeviceconfigurationwizard.h | 4 +--- .../baremetal/baremetalrunconfigurationwidget.h | 4 +--- src/plugins/bazaar/bazaarplugin.h | 8 ++------ src/plugins/bazaar/cloneoptionspanel.h | 4 +--- src/plugins/bazaar/commiteditor.h | 4 +--- src/plugins/bazaar/pullorpushdialog.h | 4 +--- src/plugins/bazaar/uncommitdialog.h | 4 +--- src/plugins/bineditor/bineditor.h | 8 ++------ src/plugins/bookmarks/bookmarksplugin.h | 8 ++------ src/plugins/clangcodemodel/indexer.h | 4 +--- src/plugins/clearcase/checkoutdialog.h | 4 +--- src/plugins/clearcase/versionselector.h | 4 +--- .../cmakeprojectmanager/cmakebuildconfiguration.h | 4 +--- src/plugins/cmakeprojectmanager/cmakeeditor.h | 4 +--- .../cmakeprojectmanager/cmakeopenprojectwizard.h | 4 +--- .../cmakeprojectmanager/cmakeprojectmanager.h | 4 +--- src/plugins/cmakeprojectmanager/makestep.h | 4 +--- src/plugins/coreplugin/designmode.h | 4 +--- src/plugins/coreplugin/dialogs/addtovcsdialog.h | 4 +--- src/plugins/coreplugin/dialogs/externaltoolconfig.h | 4 +--- src/plugins/coreplugin/dialogs/newdialog.h | 4 +--- src/plugins/coreplugin/externaltool.h | 4 +--- src/plugins/coreplugin/generalsettings.h | 4 +--- src/plugins/coreplugin/locator/locatorwidget.h | 4 +--- src/plugins/coreplugin/navigationsubwidget.h | 4 +--- src/plugins/coreplugin/navigationwidget.h | 4 +--- src/plugins/coreplugin/outputpane.h | 4 +--- src/plugins/coreplugin/removefiledialog.h | 4 +--- src/plugins/coreplugin/settingsdatabase.h | 4 +--- src/plugins/coreplugin/sidebar.h | 4 +--- src/plugins/coreplugin/textdocument.h | 4 +--- src/plugins/coreplugin/variablemanager.h | 4 +--- src/plugins/cpaster/protocol.h | 4 +--- src/plugins/cppeditor/cppclasswizard.h | 6 +----- src/plugins/cppeditor/cppeditorplugin.h | 4 +--- src/plugins/cppeditor/cpphoverhandler.h | 8 ++------ src/plugins/cppeditor/cppincludehierarchy.h | 4 +--- src/plugins/cppeditor/cppincludehierarchymodel.h | 4 +--- src/plugins/cppeditor/cpptypehierarchy.h | 4 +--- src/plugins/cpptools/completionsettingspage.h | 4 +--- src/plugins/cpptools/cppcodeformatter.h | 4 +--- src/plugins/cpptools/cppcodestylesettingspage.h | 4 +--- src/plugins/cpptools/cppcompletionassistprovider.h | 4 +--- src/plugins/cpptools/cpphighlightingsupport.h | 4 +--- src/plugins/cpptools/cpptoolstestcase.h | 4 +--- src/plugins/debugger/cdb/cdbengine.h | 4 +--- src/plugins/debugger/cdb/cdboptionspage.h | 4 +--- src/plugins/debugger/debuggercore.h | 12 +++--------- src/plugins/debugger/debuggerrunner.h | 4 +--- src/plugins/debugger/debuggertooltipmanager.h | 4 +--- src/plugins/debugger/memoryagent.h | 8 ++------ src/plugins/debugger/qml/qmlengine.h | 4 +--- src/plugins/debugger/qml/qmlinspectoradapter.h | 4 +--- src/plugins/debugger/qml/qmllivetextpreview.h | 8 ++------ .../debugger/shared/cdbsymbolpathlisteditor.h | 4 +--- src/plugins/debugger/shared/symbolpathsdialog.h | 4 +--- src/plugins/designer/cpp/formclasswizardpage.h | 4 +--- src/plugins/designer/editordata.h | 4 +--- src/plugins/designer/editorwidget.h | 8 ++------ src/plugins/designer/formeditorw.h | 4 +--- src/plugins/designer/formwindoweditor.h | 8 ++------ src/plugins/designer/formwizarddialog.h | 4 +--- src/plugins/designer/resourcehandler.h | 4 +--- .../genericprojectmanager/filesselectionwizardpage.h | 4 +--- .../genericprojectmanager/genericprojectnodes.h | 4 +--- src/plugins/git/branchadddialog.h | 4 +--- src/plugins/git/branchcheckoutdialog.h | 4 +--- src/plugins/git/branchdialog.h | 4 +--- src/plugins/git/clonewizardpage.h | 4 +--- src/plugins/git/gerrit/branchcombobox.h | 4 +--- src/plugins/git/gerrit/gerritoptionspage.h | 4 +--- src/plugins/git/gerrit/gerritpushdialog.h | 8 ++------ src/plugins/git/gitclient.h | 8 ++------ src/plugins/git/githighlighters.h | 4 +--- src/plugins/git/gitorious/gitorioushostwidget.h | 4 +--- src/plugins/git/gitorious/gitoriousprojectwidget.h | 4 +--- .../git/gitorious/gitoriousprojectwizardpage.h | 4 +--- .../git/gitorious/gitoriousrepositorywizardpage.h | 4 +--- src/plugins/git/gitplugin.h | 8 ++------ src/plugins/git/gitsubmiteditor.h | 4 +--- src/plugins/git/stashdialog.h | 4 +--- src/plugins/glsleditor/glslcompletionassist.h | 8 ++------ src/plugins/glsleditor/glslhoverhandler.h | 8 ++------ src/plugins/help/helpplugin.h | 4 +--- src/plugins/ios/iossimulator.h | 4 +--- src/plugins/ios/iostoolhandler.h | 4 +--- src/plugins/macros/findmacrohandler.h | 4 +--- src/plugins/macros/macrooptionswidget.h | 4 +--- src/plugins/macros/savedialog.h | 4 +--- src/plugins/macros/texteditormacrohandler.h | 8 ++------ src/plugins/mercurial/commiteditor.h | 4 +--- src/plugins/perforce/perforceplugin.h | 4 +--- src/plugins/perforce/perforcesubmiteditor.h | 4 +--- src/plugins/projectexplorer/abiwidget.h | 4 +--- src/plugins/projectexplorer/abstractprocessstep.h | 4 +--- src/plugins/projectexplorer/applicationlauncher.h | 4 +--- .../projectexplorer/baseprojectwizarddialog.h | 4 +--- src/plugins/projectexplorer/buildstepspage.h | 8 ++------ src/plugins/projectexplorer/cesdkhandler.h | 4 +--- .../projectexplorer/customwizard/customwizard.h | 4 +--- .../projectexplorer/customwizard/customwizardpage.h | 4 +--- .../customwizard/customwizardscriptgenerator.h | 4 +--- .../devicesupport/desktopdeviceconfigurationwidget.h | 4 +--- src/plugins/projectexplorer/doubletabwidget.h | 4 +--- src/plugins/projectexplorer/environmentitemswidget.h | 4 +--- src/plugins/projectexplorer/gcctoolchainfactories.h | 4 +--- src/plugins/projectexplorer/processparameters.h | 4 +--- src/plugins/projectexplorer/projectnodes.h | 4 +--- src/plugins/projectexplorer/projectwizardpage.h | 4 +--- src/plugins/projectexplorer/settingsaccessor.h | 4 +--- src/plugins/projectexplorer/targetsettingswidget.h | 4 +--- src/plugins/projectexplorer/toolchain.h | 4 +--- src/plugins/qbsprojectmanager/qbsrunconfiguration.h | 4 +--- src/plugins/qmakeprojectmanager/addlibrarywizard.h | 4 +--- .../customwidgetpluginwizardpage.h | 4 +--- .../customwidgetwidgetswizardpage.h | 4 +--- .../customwidgetwizard/plugingenerator.h | 4 +--- src/plugins/qmakeprojectmanager/externaleditors.h | 4 +--- .../qmakeprojectmanager/librarydetailscontroller.h | 4 +--- .../qmakeprojectmanager/profilehoverhandler.h | 8 ++------ src/plugins/qmakeprojectmanager/qmakenodes.h | 4 +--- .../qmakeprojectmanager/qmakeprojectconfigwidget.h | 8 ++------ src/plugins/qmakeprojectmanager/wizards/filespage.h | 4 +--- .../qmakeprojectmanager/wizards/testwizardpage.h | 4 +--- .../components/formeditor/formeditorview.h | 4 +--- .../qmldesigner/components/formeditor/toolbox.h | 4 +--- .../components/stateseditor/stateseditorwidget.h | 4 +--- .../designercore/filemanager/qmlwarningdialog.h | 4 +--- .../designercore/include/basetexteditmodifier.h | 4 +--- src/plugins/qmldesigner/designercore/include/model.h | 4 +--- .../qmldesigner/designercore/include/nodeproperty.h | 4 +--- .../designercore/include/plaintexteditmodifier.h | 4 +--- .../qmldesigner/designercore/include/stylemanager.h | 4 +--- .../designercore/include/variantproperty.h | 4 +--- .../qmldesigner/designercore/include/viewmanager.h | 4 +--- src/plugins/qmldesigner/documentmanager.h | 4 +--- src/plugins/qmljseditor/qmljscompletionassist.h | 4 +--- src/plugins/qmljseditor/qmljseditor.h | 8 ++------ src/plugins/qmljseditor/qmljseditorplugin.h | 12 +++--------- src/plugins/qmljseditor/qmljshoverhandler.h | 8 ++------ src/plugins/qmljseditor/qmljsoutline.h | 8 ++------ src/plugins/qmljseditor/qmljssemantichighlighter.h | 12 +++--------- src/plugins/qmljseditor/quicktoolbar.h | 8 ++------ src/plugins/qmljstools/qmlconsolemanager.h | 8 ++------ src/plugins/qmljstools/qmlconsolepane.h | 4 +--- src/plugins/qmljstools/qmljscodestylesettingspage.h | 4 +--- src/plugins/qmljstools/qmljsmodelmanager.h | 12 +++--------- src/plugins/qmljstools/qmljsplugindumper.h | 4 +--- src/plugins/qmljstools/qmljsqtstylecodeformatter.h | 4 +--- src/plugins/qmljstools/qmljsrefactoringchanges.h | 4 +--- src/plugins/qmlprofiler/qmlprofilertraceview.h | 4 +--- .../qmlprojectmanager/fileformat/filefilteritems.h | 4 +--- src/plugins/qmlprojectmanager/qmlapplicationwizard.h | 4 +--- src/plugins/qmlprojectmanager/qmlprojectnodes.h | 4 +--- .../qmlprojectmanager/qmlprojectrunconfiguration.h | 4 +--- src/plugins/qnx/bardescriptoreditor.h | 4 +--- .../qnx/bardescriptoreditorabstractpanelwidget.h | 4 +--- src/plugins/qnx/bardescriptoreditorassetswidget.h | 4 +--- .../qnx/bardescriptoreditorauthorinformationwidget.h | 4 +--- .../qnx/bardescriptoreditorentrypointwidget.h | 4 +--- .../qnx/bardescriptoreditorenvironmentwidget.h | 4 +--- src/plugins/qnx/bardescriptoreditorgeneralwidget.h | 4 +--- .../bardescriptoreditorpackageinformationwidget.h | 4 +--- .../qnx/bardescriptoreditorpermissionswidget.h | 4 +--- src/plugins/qnx/bardescriptoreditorwidget.h | 8 ++------ src/plugins/qnx/blackberryabstractdeploystep.h | 4 +--- src/plugins/qnx/blackberryapplicationrunner.h | 4 +--- .../blackberrycheckdevicestatusstepconfigwidget.h | 4 +--- src/plugins/qnx/blackberryconfiguration.h | 8 ++------ .../qnx/blackberrycreatepackagestepconfigwidget.h | 4 +--- src/plugins/qnx/blackberrydeployconfiguration.h | 4 +--- .../qnx/blackberrydeployconfigurationfactory.h | 4 +--- .../qnx/blackberrydeployconfigurationwidget.h | 4 +--- src/plugins/qnx/blackberrydeployinformation.h | 4 +--- src/plugins/qnx/blackberrydeviceconfiguration.h | 4 +--- .../qnx/blackberrydeviceconfigurationwidget.h | 4 +--- .../qnx/blackberrydeviceconfigurationwizardpages.h | 4 +--- src/plugins/qnx/blackberrylogprocessrunner.h | 4 +--- src/plugins/qnx/blackberryrunconfiguration.h | 4 +--- src/plugins/qnx/blackberryrunconfigurationwidget.h | 4 +--- src/plugins/qnx/blackberryruncontrol.h | 4 +--- src/plugins/qnx/blackberryruncontrolfactory.h | 4 +--- src/plugins/qnx/blackberrysetupwizard.h | 4 +--- src/plugins/qnx/blackberrysetupwizardpages.h | 4 +--- src/plugins/qnx/blackberrysigningpasswordsdialog.h | 4 +--- src/plugins/qnx/blackberrysshkeysgenerator.h | 4 +--- .../qnx/cascadesimport/cascadesimportwizard.h | 4 +--- src/plugins/qnx/cascadesimport/fileconverter.h | 4 +--- src/plugins/qnx/qnxbaseqtconfigwidget.h | 4 +--- src/plugins/qnx/qnxdevicetester.h | 4 +--- src/plugins/qnx/slog2inforunner.h | 4 +--- src/plugins/qtsupport/baseqtversion.h | 8 ++------ src/plugins/qtsupport/profilereader.h | 4 +--- src/plugins/qtsupport/qmldumptool.h | 4 +--- src/plugins/qtsupport/qtoptionspage.h | 4 +--- src/plugins/qtsupport/qtoutputformatter.h | 4 +--- src/plugins/qtsupport/qtversionmanager.h | 4 +--- .../remotelinux/abstractremotelinuxdeploystep.h | 4 +--- .../abstractuploadandinstallpackageservice.h | 4 +--- src/plugins/remotelinux/genericdirectuploadstep.h | 4 +--- .../genericlinuxdeviceconfigurationwidget.h | 4 +--- .../genericlinuxdeviceconfigurationwizard.h | 4 +--- src/plugins/remotelinux/linuxdevicetester.h | 4 +--- src/plugins/remotelinux/publickeydeploymentdialog.h | 4 +--- .../remotelinuxcustomcommanddeployservice.h | 4 +--- .../remotelinuxdeployconfigurationwidget.h | 4 +--- .../remotelinux/remotelinuxpackageinstaller.h | 4 +--- .../remotelinux/remotelinuxrunconfigurationwidget.h | 4 +--- src/plugins/remotelinux/sshkeydeployer.h | 8 ++------ .../remotelinux/uploadandinstalltarpackagestep.h | 4 +--- .../resourceeditor/qrceditor/test/mainwindow.h | 4 +--- src/plugins/subversion/subversionplugin.h | 8 ++------ src/plugins/tasklist/taskfile.h | 4 +--- src/plugins/texteditor/basefilefind.h | 4 +--- src/plugins/texteditor/basehoverhandler.h | 4 +--- src/plugins/texteditor/basetextmark.h | 4 +--- src/plugins/texteditor/codeassist/iassistinterface.h | 4 +--- src/plugins/texteditor/codestylepool.h | 4 +--- src/plugins/texteditor/colorschemeedit.h | 4 +--- src/plugins/texteditor/fontsettingspage.h | 4 +--- .../generichighlighter/highlighterexception.h | 6 +----- .../generichighlighter/highlightersettingspage.h | 4 +--- src/plugins/texteditor/highlighterutils.h | 4 +--- src/plugins/texteditor/icodestylepreferences.h | 4 +--- src/plugins/texteditor/ioutlinewidget.h | 4 +--- src/plugins/texteditor/itexteditor.h | 4 +--- src/plugins/texteditor/linenumberfilter.h | 4 +--- src/plugins/texteditor/outlinefactory.h | 4 +--- src/plugins/texteditor/plaintexteditor.h | 4 +--- .../texteditor/simplecodestylepreferenceswidget.h | 4 +--- src/plugins/texteditor/texteditorplugin.h | 4 +--- src/plugins/todo/keyworddialog.h | 4 +--- src/plugins/todo/optionsdialog.h | 4 +--- src/plugins/valgrind/callgrindtextmark.h | 4 +--- src/plugins/valgrind/callgrindvisualisation.h | 4 +--- src/plugins/valgrind/valgrindconfigwidget.h | 4 +--- src/plugins/vcsbase/basecheckoutwizard.h | 4 +--- src/plugins/vcsbase/basecheckoutwizardpage.h | 4 +--- src/plugins/vcsbase/basevcseditorfactory.h | 4 +--- src/shared/designerintegrationv2/widgethost.h | 4 +--- src/tools/qtcreatorcrashhandler/crashhandlerdialog.h | 4 +--- .../screenshotcropper/screenshotcropperwindow.h | 4 +--- 268 files changed, 306 insertions(+), 922 deletions(-) diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h index 2109748dd6f..2ea95340143 100644 --- a/src/libs/extensionsystem/plugindetailsview.h +++ b/src/libs/extensionsystem/plugindetailsview.h @@ -39,9 +39,7 @@ namespace ExtensionSystem { class PluginSpec; namespace Internal { -namespace Ui { - class PluginDetailsView; -} // namespace Ui +namespace Ui { class PluginDetailsView; } } // namespace Internal diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h index 6fd3b003ce2..19d7401bc12 100644 --- a/src/libs/extensionsystem/pluginerrorview.h +++ b/src/libs/extensionsystem/pluginerrorview.h @@ -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 diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index 1a199e53e34..f40722e087d 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -46,9 +46,7 @@ class PluginCollection; class IPlugin; class PluginSpec; -namespace Internal { -class PluginManagerPrivate; -} +namespace Internal { class PluginManagerPrivate; } class EXTENSIONSYSTEM_EXPORT PluginManager : public QObject { diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h index 9b00717267c..b3f7ea85e9d 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.h +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h @@ -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 { diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h index 5f6d0f190b2..f711add01d3 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.h +++ b/src/libs/qmleditorwidgets/contextpanewidget.h @@ -41,9 +41,7 @@ class QGraphicsDropShadowEffect; class QGraphicsOpacityEffect; QT_END_NAMESPACE -namespace QmlJS { - class PropertyReader; -} +namespace QmlJS { class PropertyReader; } namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h index 136c6f2a2f4..84eff648240 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h @@ -46,9 +46,7 @@ class QLabel; class QSlider; QT_END_NAMESPACE -namespace QmlJS { - class PropertyReader; -} +namespace QmlJS { class PropertyReader; } namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h index baa71fdd59f..ad8ded0ceec 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h @@ -34,14 +34,10 @@ #include QT_BEGIN_NAMESPACE -namespace Ui { - class ContextPaneWidgetRectangle; -} +namespace Ui { class ContextPaneWidgetRectangle; } QT_END_NAMESPACE -namespace QmlJS { - class PropertyReader; -} +namespace QmlJS { class PropertyReader; } namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h index 68e3f5ffffb..ff3d30bab4e 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h @@ -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; diff --git a/src/libs/qmljs/qmljsbundle.h b/src/libs/qmljs/qmljsbundle.h index a348bde0a5d..3026c66ffd8 100644 --- a/src/libs/qmljs/qmljsbundle.h +++ b/src/libs/qmljs/qmljsbundle.h @@ -39,9 +39,7 @@ QT_FORWARD_DECLARE_CLASS(QTextStream) -namespace Utils { -class JsonObjectValue; -} +namespace Utils { class JsonObjectValue; } namespace QmlJS { diff --git a/src/libs/qmljs/qmljsicontextpane.h b/src/libs/qmljs/qmljsicontextpane.h index 3a71bd889ed..8f9cd7271ad 100644 --- a/src/libs/qmljs/qmljsicontextpane.h +++ b/src/libs/qmljs/qmljsicontextpane.h @@ -37,9 +37,7 @@ #include #include -namespace TextEditor { -class BaseTextEditor; -} //TextEditor +namespace TextEditor { class BaseTextEditor; } namespace QmlJS { diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h index 3894fa230e5..c77b42dfd05 100644 --- a/src/libs/qmljs/qmljsimportdependencies.h +++ b/src/libs/qmljs/qmljsimportdependencies.h @@ -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 diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index 988ac539d6f..7d225f33a65 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -41,9 +41,7 @@ #include #include -namespace ProjectExplorer { - class Project; -} +namespace ProjectExplorer { class Project; } namespace QmlJS { diff --git a/src/libs/qmljs/qmljsscopebuilder.h b/src/libs/qmljs/qmljsscopebuilder.h index ad95ce79579..0e8f8563288 100644 --- a/src/libs/qmljs/qmljsscopebuilder.h +++ b/src/libs/qmljs/qmljsscopebuilder.h @@ -44,9 +44,7 @@ class ObjectValue; class Value; class ScopeChain; -namespace AST { - class Node; -} +namespace AST { class Node; } class QMLJS_EXPORT ScopeBuilder { diff --git a/src/libs/ssh/sshconnection.h b/src/libs/ssh/sshconnection.h index 1a3f3d169f3..c5aeb73444c 100644 --- a/src/libs/ssh/sshconnection.h +++ b/src/libs/ssh/sshconnection.h @@ -46,9 +46,7 @@ class SftpChannel; class SshDirectTcpIpTunnel; class SshRemoteProcess; -namespace Internal { -class SshConnectionPrivate; -} // namespace Internal +namespace Internal { class SshConnectionPrivate; } enum SshConnectionOption { SshIgnoreDefaultProxy = 0x1, diff --git a/src/libs/ssh/sshremoteprocessrunner.h b/src/libs/ssh/sshremoteprocessrunner.h index 8ac3522b5ff..34b974a0cd2 100644 --- a/src/libs/ssh/sshremoteprocessrunner.h +++ b/src/libs/ssh/sshremoteprocessrunner.h @@ -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 { diff --git a/src/libs/utils/environmentmodel.h b/src/libs/utils/environmentmodel.h index 9ddcfba182e..340b2c90098 100644 --- a/src/libs/utils/environmentmodel.h +++ b/src/libs/utils/environmentmodel.h @@ -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 { diff --git a/src/libs/utils/portlist.h b/src/libs/utils/portlist.h index 89edf4c5909..74004a8a9ff 100644 --- a/src/libs/utils/portlist.h +++ b/src/libs/utils/portlist.h @@ -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 { diff --git a/src/libs/utils/tcpportsgatherer.h b/src/libs/utils/tcpportsgatherer.h index a268e77f712..e9b02e8e1eb 100644 --- a/src/libs/utils/tcpportsgatherer.h +++ b/src/libs/utils/tcpportsgatherer.h @@ -35,9 +35,7 @@ #include namespace Utils { -namespace Internal { -class TcpPortsGathererPrivate; -} +namespace Internal { class TcpPortsGathererPrivate; } class QTCREATOR_UTILS_EXPORT TcpPortsGatherer { diff --git a/src/libs/utils/tooltip/tips.h b/src/libs/utils/tooltip/tips.h index 13ada7c3ebd..84c776a65e9 100644 --- a/src/libs/utils/tooltip/tips.h +++ b/src/libs/utils/tooltip/tips.h @@ -36,9 +36,7 @@ QT_FORWARD_DECLARE_CLASS(QVBoxLayout) -namespace Utils { -class TipContent; -} +namespace Utils { class TipContent; } #ifndef Q_MOC_RUN namespace Utils { diff --git a/src/plugins/analyzerbase/analyzerutils.h b/src/plugins/analyzerbase/analyzerutils.h index 555e681aa78..5422cec5da6 100644 --- a/src/plugins/analyzerbase/analyzerutils.h +++ b/src/plugins/analyzerbase/analyzerutils.h @@ -36,9 +36,7 @@ QT_BEGIN_NAMESPACE class QWidget; QT_END_NAMESPACE -namespace CPlusPlus { -class Symbol; -} +namespace CPlusPlus { class Symbol; } namespace AnalyzerUtils { diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h index 41fef32d39a..7b37eb419ee 100644 --- a/src/plugins/analyzerbase/ianalyzertool.h +++ b/src/plugins/analyzerbase/ianalyzertool.h @@ -40,9 +40,7 @@ #include #include -namespace ProjectExplorer { -class RunConfiguration; -} +namespace ProjectExplorer { class RunConfiguration; } namespace Analyzer { diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h index d2cff3523e4..be5fdb56999 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h @@ -38,9 +38,7 @@ QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE -namespace Utils { -class PathChooser; -} +namespace Utils { class PathChooser; } namespace AutotoolsProjectManager { namespace Internal { diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h index b9f14b98a55..c999670ee2c 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h @@ -34,9 +34,7 @@ #include -namespace Utils { -class PathChooser; -} +namespace Utils { class PathChooser; } namespace AutotoolsProjectManager { namespace Internal { diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index 2ba726f6ef6..21b996e2aad 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -38,9 +38,7 @@ QT_FORWARD_DECLARE_CLASS(QDir) -namespace Utils { -class FileSystemWatcher; -} +namespace Utils { class FileSystemWatcher; } namespace ProjectExplorer { class Node; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h index f31d3ac98f3..82564ec115d 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h @@ -34,9 +34,7 @@ #include -namespace Core { -class IDocument; -} +namespace Core { class IDocument; } namespace AutotoolsProjectManager { namespace Internal { diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h index bfbd0097d54..e56808dbfd5 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h @@ -34,9 +34,7 @@ namespace BareMetal { -namespace Ui { -class BareMetalDeviceConfigurationWidget; -} +namespace Ui { class BareMetalDeviceConfigurationWidget; } class BareMetalDeviceConfigurationWidget : public ProjectExplorer::IDeviceWidget diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h index 1f9b5e7c476..c1c7ab77726 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h @@ -34,9 +34,7 @@ #include namespace BareMetal { -namespace Internal { - class BareMetalDeviceConfigrationWizardPrivate; -} // namespace Internal +namespace Internal { class BareMetalDeviceConfigrationWizardPrivate; } class BareMetalDeviceConfigurationWizard : public Utils::Wizard { diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.h b/src/plugins/baremetal/baremetalrunconfigurationwidget.h index 964e380e133..16e930a0132 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationwidget.h +++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.h @@ -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 { diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h index 7a2ee3c1814..f5f5b1d53d6 100644 --- a/src/plugins/bazaar/bazaarplugin.h +++ b/src/plugins/bazaar/bazaarplugin.h @@ -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 { diff --git a/src/plugins/bazaar/cloneoptionspanel.h b/src/plugins/bazaar/cloneoptionspanel.h index 65feb0af898..121a591d7aa 100644 --- a/src/plugins/bazaar/cloneoptionspanel.h +++ b/src/plugins/bazaar/cloneoptionspanel.h @@ -34,9 +34,7 @@ namespace Bazaar { namespace Internal { -namespace Ui { -class CloneOptionsPanel; -} +namespace Ui { class CloneOptionsPanel; } class CloneOptionsPanel : public QWidget { diff --git a/src/plugins/bazaar/commiteditor.h b/src/plugins/bazaar/commiteditor.h index 4ecf8783588..d6879d68af0 100644 --- a/src/plugins/bazaar/commiteditor.h +++ b/src/plugins/bazaar/commiteditor.h @@ -32,9 +32,7 @@ #include #include -namespace VcsBase { -class SubmitFileModel; -} +namespace VcsBase { class SubmitFileModel; } namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h index 88e48a5c747..74a6edb3dd5 100644 --- a/src/plugins/bazaar/pullorpushdialog.h +++ b/src/plugins/bazaar/pullorpushdialog.h @@ -34,9 +34,7 @@ namespace Bazaar { namespace Internal { -namespace Ui { -class PullOrPushDialog; -} +namespace Ui { class PullOrPushDialog; } class PullOrPushDialog : public QDialog { diff --git a/src/plugins/bazaar/uncommitdialog.h b/src/plugins/bazaar/uncommitdialog.h index 865f1b02a1c..dd50bec2fc3 100644 --- a/src/plugins/bazaar/uncommitdialog.h +++ b/src/plugins/bazaar/uncommitdialog.h @@ -34,9 +34,7 @@ namespace Bazaar { namespace Internal { -namespace Ui { -class UnCommitDialog; -} +namespace Ui { class UnCommitDialog; } class UnCommitDialog : public QDialog { diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h index 8672d8cfc3d..a3f661dc3c7 100644 --- a/src/plugins/bineditor/bineditor.h +++ b/src/plugins/bineditor/bineditor.h @@ -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 { diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h index aa821126f06..bfc42a30198 100644 --- a/src/plugins/bookmarks/bookmarksplugin.h +++ b/src/plugins/bookmarks/bookmarksplugin.h @@ -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 { diff --git a/src/plugins/clangcodemodel/indexer.h b/src/plugins/clangcodemodel/indexer.h index e40afaaca91..9b6e8c1297b 100644 --- a/src/plugins/clangcodemodel/indexer.h +++ b/src/plugins/clangcodemodel/indexer.h @@ -44,9 +44,7 @@ namespace ClangCodeModel { -namespace Internal { -class ClangSymbolSearcher; -} // namespace Internal +namespace Internal { class ClangSymbolSearcher; } class IndexerPrivate; diff --git a/src/plugins/clearcase/checkoutdialog.h b/src/plugins/clearcase/checkoutdialog.h index 364138fa5fb..d66bda85b9a 100644 --- a/src/plugins/clearcase/checkoutdialog.h +++ b/src/plugins/clearcase/checkoutdialog.h @@ -36,9 +36,7 @@ namespace ClearCase { namespace Internal { -namespace Ui { - class CheckOutDialog; -} +namespace Ui { class CheckOutDialog; } class ActivitySelector; diff --git a/src/plugins/clearcase/versionselector.h b/src/plugins/clearcase/versionselector.h index cc94c7ff650..8374a187e4b 100644 --- a/src/plugins/clearcase/versionselector.h +++ b/src/plugins/clearcase/versionselector.h @@ -40,9 +40,7 @@ QT_END_NAMESPACE namespace ClearCase { namespace Internal { -namespace Ui { - class VersionSelector; -} +namespace Ui { class VersionSelector; } class VersionSelector : public QDialog { diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h index 01034b57fac..54cffa43108 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h @@ -33,9 +33,7 @@ #include #include -namespace ProjectExplorer { -class ToolChain; -} +namespace ProjectExplorer { class ToolChain; } namespace CMakeProjectManager { class CMakeBuildInfo; diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h index dffc1e95d8c..035a10bcac9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.h +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h @@ -36,9 +36,7 @@ #include -namespace TextEditor { -class FontSettings; -} +namespace TextEditor { class FontSettings; } namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index 745a0855fcd..c79a462bb2f 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -50,9 +50,7 @@ class FancyLineEdit; class PathChooser; } -namespace ProjectExplorer { -class Kit; -} +namespace ProjectExplorer { class Kit; } namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index ae7e59b5d3c..0b3509b5205 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -52,9 +52,7 @@ QT_FORWARD_DECLARE_CLASS(QLabel) -namespace Utils { -class QtcProcess; -} +namespace Utils { class QtcProcess; } namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h index 85f714b4fdd..980fbab70a8 100644 --- a/src/plugins/cmakeprojectmanager/makestep.h +++ b/src/plugins/cmakeprojectmanager/makestep.h @@ -38,9 +38,7 @@ class QListWidget; class QListWidgetItem; QT_END_NAMESPACE -namespace ProjectExplorer { -class ToolChain; -} +namespace ProjectExplorer { class ToolChain; } namespace CMakeProjectManager { namespace Internal { diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h index d691586863b..72a8f2d9b4c 100644 --- a/src/plugins/coreplugin/designmode.h +++ b/src/plugins/coreplugin/designmode.h @@ -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 diff --git a/src/plugins/coreplugin/dialogs/addtovcsdialog.h b/src/plugins/coreplugin/dialogs/addtovcsdialog.h index dd40d03cd34..a66cb5b5efa 100644 --- a/src/plugins/coreplugin/dialogs/addtovcsdialog.h +++ b/src/plugins/coreplugin/dialogs/addtovcsdialog.h @@ -35,9 +35,7 @@ namespace Core { namespace Internal { -namespace Ui { -class AddToVcsDialog; -} +namespace Ui { class AddToVcsDialog; } class AddToVcsDialog : public QDialog { diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h index 959707a1196..04951535dfc 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h @@ -38,9 +38,7 @@ namespace Core { namespace Internal { -namespace Ui { - class ExternalToolConfig; -} +namespace Ui { class ExternalToolConfig; } class ExternalToolModel : public QAbstractItemModel { diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h index 9d1a68b73d2..362ee60a67c 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.h +++ b/src/plugins/coreplugin/dialogs/newdialog.h @@ -50,9 +50,7 @@ namespace Core { namespace Internal { -namespace Ui { - class NewDialog; -} +namespace Ui { class NewDialog; } class NewDialog : public QDialog { diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h index 6d32c033820..b47b85c5a01 100644 --- a/src/plugins/coreplugin/externaltool.h +++ b/src/plugins/coreplugin/externaltool.h @@ -37,9 +37,7 @@ #include #include -namespace Utils { -class QtcProcess; -} +namespace Utils { class QtcProcess; } namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index d51a7a8ecdc..dd3186df2b4 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -40,9 +40,7 @@ QT_END_NAMESPACE namespace Core { namespace Internal { -namespace Ui { - class GeneralSettings; -} +namespace Ui { class GeneralSettings; } class GeneralSettings : public IOptionsPage { diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h index 2b599dd5a3f..491d5a112f0 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.h +++ b/src/plugins/coreplugin/locator/locatorwidget.h @@ -42,9 +42,7 @@ class QMenu; class QTreeView; QT_END_NAMESPACE -namespace Utils { - class FilterLineEdit; -} +namespace Utils { class FilterLineEdit; } namespace Core { namespace Internal { diff --git a/src/plugins/coreplugin/navigationsubwidget.h b/src/plugins/coreplugin/navigationsubwidget.h index 13fd9083e21..ee4c5b61a8e 100644 --- a/src/plugins/coreplugin/navigationsubwidget.h +++ b/src/plugins/coreplugin/navigationsubwidget.h @@ -38,9 +38,7 @@ QT_BEGIN_NAMESPACE class QToolButton; QT_END_NAMESPACE -namespace Utils { -class StyledBar; -} +namespace Utils { class StyledBar; } namespace Core { class INavigationWidgetFactory; diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index b3dda6e1241..70bed61f7b6 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -48,9 +48,7 @@ class IMode; class Command; class NavigationWidget; struct NavigationWidgetPrivate; -namespace Internal { -class NavigationSubWidget; -} +namespace Internal { class NavigationSubWidget; } class CORE_EXPORT NavigationWidgetPlaceHolder : public QWidget { diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h index 270915016a4..e7c3d4e455d 100644 --- a/src/plugins/coreplugin/outputpane.h +++ b/src/plugins/coreplugin/outputpane.h @@ -42,9 +42,7 @@ namespace Core { class IMode; -namespace Internal { -class OutputPaneManager; -} +namespace Internal { class OutputPaneManager; } struct OutputPanePlaceHolderPrivate; class CORE_EXPORT OutputPanePlaceHolder : public QWidget diff --git a/src/plugins/coreplugin/removefiledialog.h b/src/plugins/coreplugin/removefiledialog.h index 9ff4f166725..d256ac45160 100644 --- a/src/plugins/coreplugin/removefiledialog.h +++ b/src/plugins/coreplugin/removefiledialog.h @@ -36,9 +36,7 @@ namespace Core { -namespace Ui { -class RemoveFileDialog; -} +namespace Ui { class RemoveFileDialog; } class CORE_EXPORT RemoveFileDialog : public QDialog { diff --git a/src/plugins/coreplugin/settingsdatabase.h b/src/plugins/coreplugin/settingsdatabase.h index b122cf08d49..71c81adf650 100644 --- a/src/plugins/coreplugin/settingsdatabase.h +++ b/src/plugins/coreplugin/settingsdatabase.h @@ -39,9 +39,7 @@ namespace Core { -namespace Internal { -class SettingsDatabasePrivate; -} +namespace Internal { class SettingsDatabasePrivate; } class CORE_EXPORT SettingsDatabase : public QObject { diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h index 13368d2b0c1..a6415f50252 100644 --- a/src/plugins/coreplugin/sidebar.h +++ b/src/plugins/coreplugin/sidebar.h @@ -46,9 +46,7 @@ namespace Core { class Command; struct SideBarPrivate; -namespace Internal { -class SideBarWidget; -} // namespace Internal +namespace Internal { class SideBarWidget; } /* * An item in the sidebar. Has a widget that is displayed in the sidebar and diff --git a/src/plugins/coreplugin/textdocument.h b/src/plugins/coreplugin/textdocument.h index 2cbbe7f19a0..dd4791e9c33 100644 --- a/src/plugins/coreplugin/textdocument.h +++ b/src/plugins/coreplugin/textdocument.h @@ -36,9 +36,7 @@ namespace Core { -namespace Internal { -class TextDocumentPrivate; -} +namespace Internal { class TextDocumentPrivate; } class CORE_EXPORT TextDocument : public IDocument { diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h index 137b2fded01..4612bd8f4f3 100644 --- a/src/plugins/coreplugin/variablemanager.h +++ b/src/plugins/coreplugin/variablemanager.h @@ -37,9 +37,7 @@ QT_FORWARD_DECLARE_CLASS(QFileInfo) -namespace Utils { -class AbstractMacroExpander; -} +namespace Utils { class AbstractMacroExpander; } namespace Core { diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h index ec5ffdb7ffe..ca4679e4f4f 100644 --- a/src/plugins/cpaster/protocol.h +++ b/src/plugins/cpaster/protocol.h @@ -40,9 +40,7 @@ class QNetworkReply; class QWidget; QT_END_NAMESPACE -namespace Core { -class IOptionsPage; -} +namespace Core { class IOptionsPage; } namespace CodePaster { diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h index ca7a6f80104..e18fc4fdf92 100644 --- a/src/plugins/cppeditor/cppclasswizard.h +++ b/src/plugins/cppeditor/cppclasswizard.h @@ -36,11 +36,7 @@ #include -namespace Utils { - -class NewClassWidget; - -} // namespace Utils +namespace Utils { class NewClassWidget; } namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h index 998c6ca9526..3a510fa6708 100644 --- a/src/plugins/cppeditor/cppeditorplugin.h +++ b/src/plugins/cppeditor/cppeditorplugin.h @@ -37,9 +37,7 @@ #include #include -namespace TextEditor { -class ITextEditor; -} // namespace TextEditor +namespace TextEditor { class ITextEditor; } namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cpphoverhandler.h b/src/plugins/cppeditor/cpphoverhandler.h index ecf2c4049c4..b931f88a581 100644 --- a/src/plugins/cppeditor/cpphoverhandler.h +++ b/src/plugins/cppeditor/cpphoverhandler.h @@ -34,13 +34,9 @@ #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } -namespace TextEditor { -class ITextEditor; -} +namespace TextEditor { class ITextEditor; } namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cppincludehierarchy.h b/src/plugins/cppeditor/cppincludehierarchy.h index 118dcaca60a..21d515067f5 100644 --- a/src/plugins/cppeditor/cppincludehierarchy.h +++ b/src/plugins/cppeditor/cppincludehierarchy.h @@ -43,9 +43,7 @@ class QModelIndex; class QLabel; QT_END_NAMESPACE -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace Utils { class AnnotatedItemDelegate; diff --git a/src/plugins/cppeditor/cppincludehierarchymodel.h b/src/plugins/cppeditor/cppincludehierarchymodel.h index 434cf06846a..387c17c27f2 100644 --- a/src/plugins/cppeditor/cppincludehierarchymodel.h +++ b/src/plugins/cppeditor/cppincludehierarchymodel.h @@ -41,9 +41,7 @@ enum ItemRole { } // Anonymous -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h index 3c41c416a88..456575c336c 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.h +++ b/src/plugins/cppeditor/cpptypehierarchy.h @@ -45,9 +45,7 @@ template class QVector; template class QList; QT_END_NAMESPACE -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace Utils { class NavigationTreeView; diff --git a/src/plugins/cpptools/completionsettingspage.h b/src/plugins/cpptools/completionsettingspage.h index 83fa49cec8c..b5322e73017 100644 --- a/src/plugins/cpptools/completionsettingspage.h +++ b/src/plugins/cpptools/completionsettingspage.h @@ -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 diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h index 18736e31450..a19e688e58d 100644 --- a/src/plugins/cpptools/cppcodeformatter.h +++ b/src/plugins/cpptools/cppcodeformatter.h @@ -48,9 +48,7 @@ class QTextBlock; QT_END_NAMESPACE namespace CppTools { -namespace Internal { -class CppCodeFormatterData; -} +namespace Internal { class CppCodeFormatterData; } class CPPTOOLS_EXPORT CodeFormatter { diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h index c9719bed483..667abffdd0c 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.h +++ b/src/plugins/cpptools/cppcodestylesettingspage.h @@ -53,9 +53,7 @@ class CppCodeStylePreferences; namespace Internal { -namespace Ui { -class CppCodeStyleSettingsPage; -} +namespace Ui { class CppCodeStyleSettingsPage; } class CppCodeStylePreferencesWidget : public QWidget { diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h index 3f131f135ec..0546332ff12 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.h +++ b/src/plugins/cpptools/cppcompletionassistprovider.h @@ -39,9 +39,7 @@ QT_BEGIN_NAMESPACE class QTextDocument; QT_END_NAMESPACE -namespace ProjectExplorer { -class Project; -} +namespace ProjectExplorer { class Project; } namespace TextEditor { class BaseTextEditor; diff --git a/src/plugins/cpptools/cpphighlightingsupport.h b/src/plugins/cpptools/cpphighlightingsupport.h index 757c3b04df0..7272289a79d 100644 --- a/src/plugins/cpptools/cpphighlightingsupport.h +++ b/src/plugins/cpptools/cpphighlightingsupport.h @@ -38,9 +38,7 @@ #include -namespace TextEditor { -class ITextEditor; -} +namespace TextEditor { class ITextEditor; } namespace CppTools { diff --git a/src/plugins/cpptools/cpptoolstestcase.h b/src/plugins/cpptools/cpptoolstestcase.h index b8d3f4d5eef..7fac75f5e3f 100644 --- a/src/plugins/cpptools/cpptoolstestcase.h +++ b/src/plugins/cpptools/cpptoolstestcase.h @@ -41,9 +41,7 @@ namespace CPlusPlus { class Document; class Snapshot; } -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace CppTools { namespace Tests { diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 00303343858..ff790032e5f 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -40,9 +40,7 @@ #include #include -namespace Utils { -class ConsoleProcess; -} +namespace Utils { class ConsoleProcess; } namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h index f8fd0bcc351..a804dc59f97 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.h +++ b/src/plugins/debugger/cdb/cdboptionspage.h @@ -43,9 +43,7 @@ QT_BEGIN_NAMESPACE class QCheckBox; QT_END_NAMESPACE -namespace Utils { - class PathListEditor; -} +namespace Utils { class PathListEditor; } namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h index 304d3173237..3be5cb2851b 100644 --- a/src/plugins/debugger/debuggercore.h +++ b/src/plugins/debugger/debuggercore.h @@ -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 { diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h index f6a66487c2a..64622a095ac 100644 --- a/src/plugins/debugger/debuggerrunner.h +++ b/src/plugins/debugger/debuggerrunner.h @@ -35,9 +35,7 @@ #include -namespace Utils { -class Environment; -} +namespace Utils { class Environment; } namespace Debugger { class DebuggerEngine; diff --git a/src/plugins/debugger/debuggertooltipmanager.h b/src/plugins/debugger/debuggertooltipmanager.h index 3ee5bbb9d4a..81b22171ece 100644 --- a/src/plugins/debugger/debuggertooltipmanager.h +++ b/src/plugins/debugger/debuggertooltipmanager.h @@ -52,9 +52,7 @@ class IEditor; class IMode; } -namespace TextEditor { -class ITextEditor; -} +namespace TextEditor { class ITextEditor; } namespace Debugger { class DebuggerEngine; diff --git a/src/plugins/debugger/memoryagent.h b/src/plugins/debugger/memoryagent.h index 3328e61172a..ba9c644edd3 100644 --- a/src/plugins/debugger/memoryagent.h +++ b/src/plugins/debugger/memoryagent.h @@ -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 { diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 3d2641669a7..fc86d2af5c1 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -42,9 +42,7 @@ #include -namespace Core { -class IDocument; -} +namespace Core { class IDocument; } namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h index 96d8dd6537f..5bc04bf67d2 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.h +++ b/src/plugins/debugger/qml/qmlinspectoradapter.h @@ -36,9 +36,7 @@ #include #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace QmlDebug { class BaseEngineDebugClient; diff --git a/src/plugins/debugger/qml/qmllivetextpreview.h b/src/plugins/debugger/qml/qmllivetextpreview.h index e2cefed4154..783a6585784 100644 --- a/src/plugins/debugger/qml/qmllivetextpreview.h +++ b/src/plugins/debugger/qml/qmllivetextpreview.h @@ -33,13 +33,9 @@ #include #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } -namespace QmlJS { -class ModelManagerInterface; -} +namespace QmlJS { class ModelManagerInterface; } namespace Debugger { namespace Internal { diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h index f80a803397e..b09e47d2f51 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h @@ -34,9 +34,7 @@ #include -namespace Utils { - class PathChooser; -} +namespace Utils { class PathChooser; } QT_BEGIN_NAMESPACE class QDialogButtonBox; diff --git a/src/plugins/debugger/shared/symbolpathsdialog.h b/src/plugins/debugger/shared/symbolpathsdialog.h index c4d82468bb6..5d8e064be18 100644 --- a/src/plugins/debugger/shared/symbolpathsdialog.h +++ b/src/plugins/debugger/shared/symbolpathsdialog.h @@ -36,9 +36,7 @@ namespace Debugger { namespace Internal { -namespace Ui { -class SymbolPathsDialog; -} +namespace Ui { class SymbolPathsDialog; } class SymbolPathsDialog : public QDialog { diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index 776549a6b63..cb27d6531c5 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -39,9 +39,7 @@ class FormClassWizardGenerationParameters; namespace Internal { -namespace Ui { -class FormClassWizardPage; -} +namespace Ui { class FormClassWizardPage; } class FormClassWizardPage : public QWizardPage diff --git a/src/plugins/designer/editordata.h b/src/plugins/designer/editordata.h index c13ec63dd93..c1c73616652 100644 --- a/src/plugins/designer/editordata.h +++ b/src/plugins/designer/editordata.h @@ -30,9 +30,7 @@ #ifndef EDITORDATA_H #define EDITORDATA_H -namespace SharedTools { - class WidgetHost; -} +namespace SharedTools { class WidgetHost; } namespace Designer { class FormWindowEditor; diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h index ea554e83fde..5c938c932e9 100644 --- a/src/plugins/designer/editorwidget.h +++ b/src/plugins/designer/editorwidget.h @@ -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; diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index c476e1c7ce8..92f8a4cfd9c 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -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 diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h index 7f84e71be01..8c7275786ad 100644 --- a/src/plugins/designer/formwindoweditor.h +++ b/src/plugins/designer/formwindoweditor.h @@ -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 diff --git a/src/plugins/designer/formwizarddialog.h b/src/plugins/designer/formwizarddialog.h index 98c8e6a8c1e..3652d5afdf7 100644 --- a/src/plugins/designer/formwizarddialog.h +++ b/src/plugins/designer/formwizarddialog.h @@ -32,9 +32,7 @@ #include -namespace Utils { - class FileWizardPage; -} +namespace Utils { class FileWizardPage; } namespace Designer { namespace Internal { diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h index 12ad8a30f09..c6d74efe015 100644 --- a/src/plugins/designer/resourcehandler.h +++ b/src/plugins/designer/resourcehandler.h @@ -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 diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.h b/src/plugins/genericprojectmanager/filesselectionwizardpage.h index 142707875cd..e75d7af5270 100644 --- a/src/plugins/genericprojectmanager/filesselectionwizardpage.h +++ b/src/plugins/genericprojectmanager/filesselectionwizardpage.h @@ -39,9 +39,7 @@ class QTreeView; class QLineEdit; QT_END_NAMESPACE -namespace ProjectExplorer { - class SelectableFilesModel; -} +namespace ProjectExplorer { class SelectableFilesModel; } namespace GenericProjectManager { namespace Internal { diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h index e64c5bd1abd..9dc6c32bf87 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.h +++ b/src/plugins/genericprojectmanager/genericprojectnodes.h @@ -36,9 +36,7 @@ #include #include -namespace Core { -class IDocument; -} +namespace Core { class IDocument; } namespace GenericProjectManager { namespace Internal { diff --git a/src/plugins/git/branchadddialog.h b/src/plugins/git/branchadddialog.h index 56d750e92d1..893c89063eb 100644 --- a/src/plugins/git/branchadddialog.h +++ b/src/plugins/git/branchadddialog.h @@ -36,9 +36,7 @@ namespace Git { namespace Internal { -namespace Ui { - class BranchAddDialog; -} +namespace Ui { class BranchAddDialog; } class BranchAddDialog : public QDialog { diff --git a/src/plugins/git/branchcheckoutdialog.h b/src/plugins/git/branchcheckoutdialog.h index c36d19c6ce9..ba9466ae28c 100644 --- a/src/plugins/git/branchcheckoutdialog.h +++ b/src/plugins/git/branchcheckoutdialog.h @@ -35,9 +35,7 @@ namespace Git { namespace Internal { -namespace Ui { - class BranchCheckoutDialog; -} +namespace Ui { class BranchCheckoutDialog; } class BranchCheckoutDialog : public QDialog { diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h index f80188db1d7..841f16150f0 100644 --- a/src/plugins/git/branchdialog.h +++ b/src/plugins/git/branchdialog.h @@ -39,9 +39,7 @@ QT_END_NAMESPACE namespace Git { namespace Internal { -namespace Ui { -class BranchDialog; -} +namespace Ui { class BranchDialog; } class BranchAddDialog; class BranchModel; diff --git a/src/plugins/git/clonewizardpage.h b/src/plugins/git/clonewizardpage.h index fc59b264f96..526ee1f24db 100644 --- a/src/plugins/git/clonewizardpage.h +++ b/src/plugins/git/clonewizardpage.h @@ -34,9 +34,7 @@ #include -namespace VcsBase { - class Command; -} +namespace VcsBase { class Command; } namespace Git { diff --git a/src/plugins/git/gerrit/branchcombobox.h b/src/plugins/git/gerrit/branchcombobox.h index 207bc4b5464..31bc0ebf10e 100644 --- a/src/plugins/git/gerrit/branchcombobox.h +++ b/src/plugins/git/gerrit/branchcombobox.h @@ -33,9 +33,7 @@ #include namespace Git { -namespace Internal { -class GitClient; -} +namespace Internal { class GitClient; } } namespace Gerrit { diff --git a/src/plugins/git/gerrit/gerritoptionspage.h b/src/plugins/git/gerrit/gerritoptionspage.h index 91eedde18b9..e03829d1277 100644 --- a/src/plugins/git/gerrit/gerritoptionspage.h +++ b/src/plugins/git/gerrit/gerritoptionspage.h @@ -42,9 +42,7 @@ class QSpinBox; class QCheckBox; QT_END_NAMESPACE -namespace Utils { -class PathChooser; -} +namespace Utils { class PathChooser; } namespace Gerrit { namespace Internal { diff --git a/src/plugins/git/gerrit/gerritpushdialog.h b/src/plugins/git/gerrit/gerritpushdialog.h index 27fd99f0407..e21bddd4848 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.h +++ b/src/plugins/git/gerrit/gerritpushdialog.h @@ -35,17 +35,13 @@ #include 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 { diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index ad3877b0c88..61dcbb2931e 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -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 { diff --git a/src/plugins/git/githighlighters.h b/src/plugins/git/githighlighters.h index e269e97bb63..de77e975af4 100644 --- a/src/plugins/git/githighlighters.h +++ b/src/plugins/git/githighlighters.h @@ -32,9 +32,7 @@ #include -namespace TextEditor { -class FontSettings; -} +namespace TextEditor { class FontSettings; } namespace Git { namespace Internal { diff --git a/src/plugins/git/gitorious/gitorioushostwidget.h b/src/plugins/git/gitorious/gitorioushostwidget.h index 1fcb0f9f976..6137c1fc4e1 100644 --- a/src/plugins/git/gitorious/gitorioushostwidget.h +++ b/src/plugins/git/gitorious/gitorioushostwidget.h @@ -44,9 +44,7 @@ QT_END_NAMESPACE namespace Gitorious { namespace Internal { -namespace Ui { - class GitoriousHostWidget; -} +namespace Ui { class GitoriousHostWidget; } /* A page listing gitorious hosts with browse/add options. isValid() and the * related change signals are provided for use within a QWizardPage. diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.h b/src/plugins/git/gitorious/gitoriousprojectwidget.h index 55c8c7d69f8..65b0f54bb95 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwidget.h +++ b/src/plugins/git/gitorious/gitoriousprojectwidget.h @@ -46,9 +46,7 @@ namespace Internal { class GitoriousHostWizardPage; struct GitoriousProject; -namespace Ui { - class GitoriousProjectWidget; -} +namespace Ui { class GitoriousProjectWidget; } /* Let the user select a project from a host. Displays name and description * with tooltip and info button that opens URLs contained in the description. diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h index 338fd434b6a..7b3829ba9ec 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h +++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h @@ -44,9 +44,7 @@ class GitoriousHostWizardPage; struct GitoriousProject; class GitoriousProjectWidget; -namespace Ui { - class GitoriousProjectWizardPage; -} +namespace Ui { class GitoriousProjectWizardPage; } /* GitoriousProjectWizardPage: Let the user select a project via * GitoriousProjectWidget. As switching back and forth hosts (repopulating diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h index ce1272b5f0b..d88b9c3594f 100644 --- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h +++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h @@ -45,9 +45,7 @@ namespace Internal { class GitoriousProjectWizardPage; -namespace Ui { - class GitoriousRepositoryWizardPage; -} +namespace Ui { class GitoriousRepositoryWizardPage; } // A wizard page listing Gitorious repositories in a tree, by repository type. diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index 27e3292630f..307f6a7a5bd 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -54,13 +54,9 @@ class Context; class ActionManager; class ActionContainer; } -namespace Utils { -class ParameterAction; -} +namespace Utils { class ParameterAction; } namespace Gerrit { -namespace Internal { -class GerritPlugin; -} +namespace Internal { class GerritPlugin; } } namespace Git { namespace Internal { diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index e7aec33c10b..629ae4fcbc0 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -36,9 +36,7 @@ #include -namespace VcsBase { - class SubmitFileModel; -} +namespace VcsBase { class SubmitFileModel; } namespace Git { namespace Internal { diff --git a/src/plugins/git/stashdialog.h b/src/plugins/git/stashdialog.h index d169d785e5e..39735d86e88 100644 --- a/src/plugins/git/stashdialog.h +++ b/src/plugins/git/stashdialog.h @@ -41,9 +41,7 @@ QT_END_NAMESPACE namespace Git { namespace Internal { -namespace Ui { - class StashDialog; -} +namespace Ui { class StashDialog; } class StashModel; /* StashDialog: Non-modal dialog that manages the list of stashes diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h index 879307e8184..29dddf90e24 100644 --- a/src/plugins/glsleditor/glslcompletionassist.h +++ b/src/plugins/glsleditor/glslcompletionassist.h @@ -40,13 +40,9 @@ #include #include -namespace GLSL { -class Function; -} +namespace GLSL { class Function; } -namespace TextEditor { -class BasicProposalItem; -} +namespace TextEditor { class BasicProposalItem; } namespace GLSLEditor { namespace Internal { diff --git a/src/plugins/glsleditor/glslhoverhandler.h b/src/plugins/glsleditor/glslhoverhandler.h index 58ce5fd5bd5..843d2417c39 100644 --- a/src/plugins/glsleditor/glslhoverhandler.h +++ b/src/plugins/glsleditor/glslhoverhandler.h @@ -34,13 +34,9 @@ #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } -namespace TextEditor { -class ITextEditor; -} +namespace TextEditor { class ITextEditor; } namespace GLSLEditor { namespace Internal { diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h index 1e03dfe9a24..55bf18c7390 100644 --- a/src/plugins/help/helpplugin.h +++ b/src/plugins/help/helpplugin.h @@ -49,9 +49,7 @@ class SideBar; class SideBarItem; } // Core -namespace Utils { -class StyledBar; -} // Utils +namespace Utils { class StyledBar; } namespace Help { namespace Internal { diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h index fbd464fb8ff..e34125461bb 100644 --- a/src/plugins/ios/iossimulator.h +++ b/src/plugins/ios/iossimulator.h @@ -35,9 +35,7 @@ #include -namespace ProjectExplorer { -class Kit; -} +namespace ProjectExplorer { class Kit; } namespace Ios { namespace Internal { class IosConfigurations; diff --git a/src/plugins/ios/iostoolhandler.h b/src/plugins/ios/iostoolhandler.h index 749565a55eb..e8f4210a7f5 100644 --- a/src/plugins/ios/iostoolhandler.h +++ b/src/plugins/ios/iostoolhandler.h @@ -38,9 +38,7 @@ namespace Ios { -namespace Internal { -class IosToolHandlerPrivate; -} +namespace Internal { class IosToolHandlerPrivate; } class IosToolHandler : public QObject { diff --git a/src/plugins/macros/findmacrohandler.h b/src/plugins/macros/findmacrohandler.h index 33a68e5766d..420a92a9030 100644 --- a/src/plugins/macros/findmacrohandler.h +++ b/src/plugins/macros/findmacrohandler.h @@ -34,9 +34,7 @@ #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace Macros { namespace Internal { diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h index ed75a15d16a..ee68a832d30 100644 --- a/src/plugins/macros/macrooptionswidget.h +++ b/src/plugins/macros/macrooptionswidget.h @@ -45,9 +45,7 @@ namespace Internal { class MacroSettings; -namespace Ui { - class MacroOptionsWidget; -} +namespace Ui { class MacroOptionsWidget; } class MacroOptionsWidget : public QWidget { Q_OBJECT diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h index a6e5a7fa572..fbf96861df7 100644 --- a/src/plugins/macros/savedialog.h +++ b/src/plugins/macros/savedialog.h @@ -35,9 +35,7 @@ namespace Macros { namespace Internal { -namespace Ui { - class SaveDialog; -} +namespace Ui { class SaveDialog; } class SaveDialog : public QDialog { diff --git a/src/plugins/macros/texteditormacrohandler.h b/src/plugins/macros/texteditormacrohandler.h index f747a14dd21..ec37106a56a 100644 --- a/src/plugins/macros/texteditormacrohandler.h +++ b/src/plugins/macros/texteditormacrohandler.h @@ -32,13 +32,9 @@ #include "imacrohandler.h" -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } -namespace TextEditor { -class ITextEditor; -} +namespace TextEditor { class ITextEditor; } namespace Macros { namespace Internal { diff --git a/src/plugins/mercurial/commiteditor.h b/src/plugins/mercurial/commiteditor.h index d657c11506e..a756986dba8 100644 --- a/src/plugins/mercurial/commiteditor.h +++ b/src/plugins/mercurial/commiteditor.h @@ -35,9 +35,7 @@ #include -namespace VcsBase { -class SubmitFileModel; -} +namespace VcsBase { class SubmitFileModel; } namespace Mercurial { namespace Internal { diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h index 9b6b48ca4de..347131de6c6 100644 --- a/src/plugins/perforce/perforceplugin.h +++ b/src/plugins/perforce/perforceplugin.h @@ -53,9 +53,7 @@ namespace Utils { class TempFileSaver; } -namespace Core { - class CommandLocator; -} +namespace Core { class CommandLocator; } namespace Perforce { namespace Internal { diff --git a/src/plugins/perforce/perforcesubmiteditor.h b/src/plugins/perforce/perforcesubmiteditor.h index 129114d889b..70821dde777 100644 --- a/src/plugins/perforce/perforcesubmiteditor.h +++ b/src/plugins/perforce/perforcesubmiteditor.h @@ -35,9 +35,7 @@ #include #include -namespace VcsBase { - class SubmitFileModel; -} +namespace VcsBase { class SubmitFileModel; } namespace Perforce { namespace Internal { diff --git a/src/plugins/projectexplorer/abiwidget.h b/src/plugins/projectexplorer/abiwidget.h index 55d5a0934fe..e86bf63f893 100644 --- a/src/plugins/projectexplorer/abiwidget.h +++ b/src/plugins/projectexplorer/abiwidget.h @@ -37,9 +37,7 @@ namespace ProjectExplorer { class Abi; -namespace Internal { -class AbiWidgetPrivate; -} // namespace +namespace Internal { class AbiWidgetPrivate; } // -------------------------------------------------------------------------- // AbiWidget: diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index aa9d0ebfd0f..25db1d6982c 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -41,9 +41,7 @@ class QEventLoop; class QTimer; QT_END_NAMESPACE -namespace Utils { -class QtcProcess; -} +namespace Utils { class QtcProcess; } namespace ProjectExplorer { class IOutputParser; diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index ad737c3ba75..b3677ebb472 100644 --- a/src/plugins/projectexplorer/applicationlauncher.h +++ b/src/plugins/projectexplorer/applicationlauncher.h @@ -36,9 +36,7 @@ #include -namespace Utils { -class Environment; -} +namespace Utils { class Environment; } namespace ProjectExplorer { struct ApplicationLauncherPrivate; diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h index 4b630b81f94..ec729f2d17d 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.h +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h @@ -34,9 +34,7 @@ #include #include -namespace Utils { - class ProjectIntroPage; -} +namespace Utils { class ProjectIntroPage; } namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/buildstepspage.h b/src/plugins/projectexplorer/buildstepspage.h index 8f1ea27771b..c995f1eee4d 100644 --- a/src/plugins/projectexplorer/buildstepspage.h +++ b/src/plugins/projectexplorer/buildstepspage.h @@ -43,9 +43,7 @@ class QSignalMapper; class QGraphicsOpacityEffect; QT_END_NAMESPACE -namespace Utils { -class DetailsWidget; -} +namespace Utils { class DetailsWidget; } namespace ProjectExplorer { @@ -146,9 +144,7 @@ private: int m_leftMargin; }; -namespace Ui { - class BuildStepsPage; -} +namespace Ui { class BuildStepsPage; } class BuildStepsPage : public NamedWidget { diff --git a/src/plugins/projectexplorer/cesdkhandler.h b/src/plugins/projectexplorer/cesdkhandler.h index d5e295b7984..1764370ad41 100644 --- a/src/plugins/projectexplorer/cesdkhandler.h +++ b/src/plugins/projectexplorer/cesdkhandler.h @@ -34,9 +34,7 @@ #include -namespace Utils { -class Environment; -} +namespace Utils { class Environment; } namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h index 948c22aadfc..6119c7c5c29 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.h +++ b/src/plugins/projectexplorer/customwizard/customwizard.h @@ -42,9 +42,7 @@ QT_BEGIN_NAMESPACE class QDir; QT_END_NAMESPACE -namespace Utils { - class Wizard; -} +namespace Utils { class Wizard; } namespace ProjectExplorer { class CustomWizard; diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.h b/src/plugins/projectexplorer/customwizard/customwizardpage.h index e3538c560df..ee6f2b35c53 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.h +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.h @@ -42,9 +42,7 @@ class QTextEdit; class QLabel; QT_END_NAMESPACE -namespace Utils { - class PathChooser; -} +namespace Utils { class PathChooser; } namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h index bc12cd0c1c9..656807eb3df 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h @@ -33,9 +33,7 @@ #include #include -namespace Core { -class GeneratedFile; -} +namespace Core { class GeneratedFile; } namespace ProjectExplorer { namespace Internal { diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h index 2c54e519d24..abb14f79462 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h @@ -33,9 +33,7 @@ #include "idevicewidget.h" namespace ProjectExplorer { -namespace Ui { -class DesktopDeviceConfigurationWidget; -} +namespace Ui { class DesktopDeviceConfigurationWidget; } class DesktopDeviceConfigurationWidget : public IDeviceWidget { diff --git a/src/plugins/projectexplorer/doubletabwidget.h b/src/plugins/projectexplorer/doubletabwidget.h index 99cd8bfb9c8..1c88b8d2551 100644 --- a/src/plugins/projectexplorer/doubletabwidget.h +++ b/src/plugins/projectexplorer/doubletabwidget.h @@ -37,9 +37,7 @@ namespace ProjectExplorer { namespace Internal { -namespace Ui { - class DoubleTabWidget; -} +namespace Ui { class DoubleTabWidget; } class DoubleTabWidget : public QWidget { diff --git a/src/plugins/projectexplorer/environmentitemswidget.h b/src/plugins/projectexplorer/environmentitemswidget.h index c38e24f21dd..8b34cf7b7eb 100644 --- a/src/plugins/projectexplorer/environmentitemswidget.h +++ b/src/plugins/projectexplorer/environmentitemswidget.h @@ -32,9 +32,7 @@ #include -namespace Utils { -class EnvironmentItem; -} +namespace Utils { class EnvironmentItem; } namespace ProjectExplorer { class EnvironmentItemsWidgetPrivate; diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h index 0d1302ab2e3..c5c07a68436 100644 --- a/src/plugins/projectexplorer/gcctoolchainfactories.h +++ b/src/plugins/projectexplorer/gcctoolchainfactories.h @@ -41,9 +41,7 @@ QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE -namespace Utils { -class PathChooser; -} +namespace Utils { class PathChooser; } namespace ProjectExplorer { class GccToolChain; diff --git a/src/plugins/projectexplorer/processparameters.h b/src/plugins/projectexplorer/processparameters.h index 19e64e82af8..0e9810de0c2 100644 --- a/src/plugins/projectexplorer/processparameters.h +++ b/src/plugins/projectexplorer/processparameters.h @@ -34,9 +34,7 @@ #include -namespace Utils { -class AbstractMacroExpander; -} +namespace Utils { class AbstractMacroExpander; } namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index c351fdebf79..a32b8a449bb 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -41,9 +41,7 @@ QT_BEGIN_NAMESPACE class QFileInfo; QT_END_NAMESPACE -namespace Core { - class MimeDatabase; -} +namespace Core { class MimeDatabase; } namespace ProjectExplorer { class RunConfiguration; diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h index 7bc4b8709f9..eb4b96413c5 100644 --- a/src/plugins/projectexplorer/projectwizardpage.h +++ b/src/plugins/projectexplorer/projectwizardpage.h @@ -35,9 +35,7 @@ namespace ProjectExplorer { namespace Internal { -namespace Ui { -class WizardPage; -} +namespace Ui { class WizardPage; } // Documentation inside. class ProjectWizardPage : public QWizardPage diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h index 016b829142a..df9d76d5dcc 100644 --- a/src/plugins/projectexplorer/settingsaccessor.h +++ b/src/plugins/projectexplorer/settingsaccessor.h @@ -40,9 +40,7 @@ namespace ProjectExplorer { class Project; -namespace Internal { -class UserFileVersionHandler; -} +namespace Internal { class UserFileVersionHandler; } class SettingsAccessor { diff --git a/src/plugins/projectexplorer/targetsettingswidget.h b/src/plugins/projectexplorer/targetsettingswidget.h index f22b537daf2..3129244d18d 100644 --- a/src/plugins/projectexplorer/targetsettingswidget.h +++ b/src/plugins/projectexplorer/targetsettingswidget.h @@ -42,9 +42,7 @@ class Target; class Kit; namespace Internal { -namespace Ui { - class TargetSettingsWidget; -} +namespace Ui { class TargetSettingsWidget; } class TargetSettingsWidget : public QWidget { diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index fe8a752eefb..4ab13a57361 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -44,9 +44,7 @@ class FileName; namespace ProjectExplorer { -namespace Internal { -class ToolChainPrivate; -} +namespace Internal { class ToolChainPrivate; } class Abi; class HeaderPath; diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h index b96fd6981e8..44104a041ba 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h @@ -43,9 +43,7 @@ class QRadioButton; class QComboBox; QT_END_NAMESPACE -namespace qbs { -class InstallOptions; -} +namespace qbs { class InstallOptions; } namespace Utils { class PathChooser; diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.h b/src/plugins/qmakeprojectmanager/addlibrarywizard.h index 741487572c0..542aaff3938 100644 --- a/src/plugins/qmakeprojectmanager/addlibrarywizard.h +++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.h @@ -48,9 +48,7 @@ class LibraryTypePage; class DetailsPage; class SummaryPage; -namespace Ui { - class LibraryDetailsWidget; -} +namespace Ui { class LibraryDetailsWidget; } class AddLibraryWizard : public Utils::Wizard { diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h index 144c96e9054..f92af63094e 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h @@ -41,9 +41,7 @@ namespace Internal { struct PluginOptions; class CustomWidgetWidgetsWizardPage; -namespace Ui { - class CustomWidgetPluginWizardPage; -} +namespace Ui { class CustomWidgetPluginWizardPage; } class CustomWidgetPluginWizardPage : public QWizardPage { diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h index 245fb596859..b820da8aa0e 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h @@ -46,9 +46,7 @@ namespace Internal { class ClassDefinition; struct PluginOptions; -namespace Ui { - class CustomWidgetWidgetsWizardPage; -} +namespace Ui { class CustomWidgetWidgetsWizardPage; } class CustomWidgetWidgetsWizardPage : public QWizardPage { diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h index df72ce8a365..69427d30bd3 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h @@ -39,9 +39,7 @@ QT_BEGIN_NAMESPACE class QWidget; QT_END_NAMESPACE -namespace Core { - class GeneratedFile; -} +namespace Core { class GeneratedFile; } namespace QmakeProjectManager { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/externaleditors.h b/src/plugins/qmakeprojectmanager/externaleditors.h index f0dccaf5785..91c072d9702 100644 --- a/src/plugins/qmakeprojectmanager/externaleditors.h +++ b/src/plugins/qmakeprojectmanager/externaleditors.h @@ -42,9 +42,7 @@ class QTcpSocket; class QSignalMapper; QT_END_NAMESPACE -namespace QtSupport { -class BaseQtVersion; -} +namespace QtSupport { class BaseQtVersion; } namespace QmakeProjectManager { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h index 07006c16f03..2732e01a6b4 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h @@ -36,9 +36,7 @@ namespace QmakeProjectManager { class QmakeProFileNode; namespace Internal { -namespace Ui { - class LibraryDetailsWidget; -} +namespace Ui { class LibraryDetailsWidget; } class LibraryDetailsController : public QObject { diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.h b/src/plugins/qmakeprojectmanager/profilehoverhandler.h index 8cc4f5ac888..77e05e66adf 100644 --- a/src/plugins/qmakeprojectmanager/profilehoverhandler.h +++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.h @@ -39,13 +39,9 @@ QT_BEGIN_NAMESPACE class QUrl; QT_END_NAMESPACE -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } -namespace TextEditor { -class ITextEditor; -} +namespace TextEditor { class ITextEditor; } namespace QmakeProjectManager { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index a7a91ac0094..6856d7d60a4 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -49,9 +49,7 @@ QT_END_NAMESPACE namespace Utils { class FileName; } -namespace Core { -class ICore; -} +namespace Core { class ICore; } namespace QtSupport { class BaseQtVersion; diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h index c8ae2102330..4f71e705012 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h @@ -36,18 +36,14 @@ QT_BEGIN_NAMESPACE class QAbstractButton; QT_END_NAMESPACE -namespace Utils { - class DetailsWidget; -} +namespace Utils { class DetailsWidget; } namespace QmakeProjectManager { class QmakeBuildConfiguration; class QmakeProFileNode; namespace Internal { -namespace Ui { -class QmakeProjectConfigWidget; -} +namespace Ui { class QmakeProjectConfigWidget; } class QmakeProjectConfigWidget : public ProjectExplorer::NamedWidget { diff --git a/src/plugins/qmakeprojectmanager/wizards/filespage.h b/src/plugins/qmakeprojectmanager/wizards/filespage.h index 79312ac0490..89b35836c8c 100644 --- a/src/plugins/qmakeprojectmanager/wizards/filespage.h +++ b/src/plugins/qmakeprojectmanager/wizards/filespage.h @@ -36,9 +36,7 @@ QT_BEGIN_NAMESPACE class QLabel; QT_END_NAMESPACE -namespace Utils { -class NewClassWidget; -} // namespace Utils +namespace Utils { class NewClassWidget; } namespace QmakeProjectManager { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h b/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h index aa876262ffc..6fbc164d391 100644 --- a/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h +++ b/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h @@ -35,9 +35,7 @@ namespace QmakeProjectManager { namespace Internal { -namespace Ui { - class TestWizardPage; -} +namespace Ui { class TestWizardPage; } struct TestWizardParameters; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index f1fd43de3a4..97710f8ce9d 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -37,9 +37,7 @@ class QGraphicsScene; class QGraphicsSceneMouseEvent; QT_END_NAMESPACE -namespace Utils { -class CrumblePath; -} +namespace Utils { class CrumblePath; } namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.h b/src/plugins/qmldesigner/components/formeditor/toolbox.h index e8be00880b5..c9de075b300 100644 --- a/src/plugins/qmldesigner/components/formeditor/toolbox.h +++ b/src/plugins/qmldesigner/components/formeditor/toolbox.h @@ -36,9 +36,7 @@ QT_BEGIN_NAMESPACE class QToolBar; QT_END_NAMESPACE -namespace Utils { -class CrumblePath; -} +namespace Utils { class CrumblePath; } namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h index 530885dee69..de0bc6f761c 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h @@ -44,9 +44,7 @@ class StatesEditorModel; class StatesEditorView; class NodeInstanceView; -namespace Internal { -class StatesEditorImageProvider; -} +namespace Internal { class StatesEditorImageProvider; } class StatesEditorWidget : public QWidget { diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h index 61cbaa2c7b0..022db9962a7 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h @@ -4,9 +4,7 @@ #include QT_BEGIN_NAMESPACE -namespace Ui { - class QmlWarningDialog; -} +namespace Ui { class QmlWarningDialog; } QT_END_NAMESPACE namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h index a526f7da752..4b8e95cb7f9 100644 --- a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h @@ -38,9 +38,7 @@ #include -namespace QmlJS { -class Snapshot; -} // namespace QmlJS +namespace QmlJS { class Snapshot; } namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index 76efc8584b6..44cdc1aa87a 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -42,9 +42,7 @@ QT_END_NAMESPACE namespace QmlDesigner { -namespace Internal { - class ModelPrivate; -} +namespace Internal { class ModelPrivate; } class AnchorLine; class ModelNode; diff --git a/src/plugins/qmldesigner/designercore/include/nodeproperty.h b/src/plugins/qmldesigner/designercore/include/nodeproperty.h index 9c9f5b150ee..fbc82833647 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeproperty.h @@ -35,9 +35,7 @@ namespace QmlDesigner { -namespace Internal { - class ModelPrivate; -} +namespace Internal { class ModelPrivate; } class QMLDESIGNERCORE_EXPORT NodeProperty : public NodeAbstractProperty { diff --git a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h index 6c117af1e8a..0648dea9b67 100644 --- a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h @@ -38,9 +38,7 @@ class QIODevice; class QPlainTextEdit; QT_END_NAMESPACE -namespace Utils { - class ChangeSet; -} +namespace Utils { class ChangeSet; } namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/include/stylemanager.h b/src/plugins/qmldesigner/designercore/include/stylemanager.h index dccdac377b3..b876017fe2f 100644 --- a/src/plugins/qmldesigner/designercore/include/stylemanager.h +++ b/src/plugins/qmldesigner/designercore/include/stylemanager.h @@ -37,9 +37,7 @@ namespace QmlDesigner { -namespace Internal { -class StyleManagerGuard; -} +namespace Internal { class StyleManagerGuard; } class CORESHARED_EXPORT StyleManager { public: diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h index 592556e0d34..e1a0413abfc 100644 --- a/src/plugins/qmldesigner/designercore/include/variantproperty.h +++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h @@ -42,9 +42,7 @@ namespace QmlDesigner { class AbstractView; -namespace Internal { - class ModelPrivate; -} +namespace Internal { class ModelPrivate; } class QMLDESIGNERCORE_EXPORT VariantProperty : public AbstractProperty { diff --git a/src/plugins/qmldesigner/designercore/include/viewmanager.h b/src/plugins/qmldesigner/designercore/include/viewmanager.h index 6046fe92d27..b333b5f9118 100644 --- a/src/plugins/qmldesigner/designercore/include/viewmanager.h +++ b/src/plugins/qmldesigner/designercore/include/viewmanager.h @@ -41,9 +41,7 @@ class AbstractCustomTool; class DesignerActionManager; class NodeInstanceView; -namespace Internal { - class DesignModeWidget; -} +namespace Internal { class DesignModeWidget; } class ViewManagerData; diff --git a/src/plugins/qmldesigner/documentmanager.h b/src/plugins/qmldesigner/documentmanager.h index 388d764cb50..b7d80e7a69e 100644 --- a/src/plugins/qmldesigner/documentmanager.h +++ b/src/plugins/qmldesigner/documentmanager.h @@ -36,9 +36,7 @@ #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace QmlDesigner { 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 #include -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 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 -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 -namespace TextEditor { -class BaseTextEditor; -} +namespace TextEditor { class BaseTextEditor; } -namespace QmlEditorWidgets { -class ContextPaneWidget; -} +namespace QmlEditorWidgets { class ContextPaneWidget; } namespace QmlJSEditor { diff --git a/src/plugins/qmljstools/qmlconsolemanager.h b/src/plugins/qmljstools/qmlconsolemanager.h index cd751953271..99fa207a3b6 100644 --- a/src/plugins/qmljstools/qmlconsolemanager.h +++ b/src/plugins/qmljstools/qmlconsolemanager.h @@ -36,14 +36,10 @@ #include -namespace QmlJS { -class IScriptEvaluator; -} +namespace QmlJS { class IScriptEvaluator; } namespace QmlJSTools { -namespace Internal { -class QmlConsoleModel; -} +namespace Internal { class QmlConsoleModel; } class QmlConsoleManagerPrivate; class QMLJSTOOLS_EXPORT QmlConsoleManager : public QmlJS::ConsoleManagerInterface diff --git a/src/plugins/qmljstools/qmlconsolepane.h b/src/plugins/qmljstools/qmlconsolepane.h index 938369839df..04954308929 100644 --- a/src/plugins/qmljstools/qmlconsolepane.h +++ b/src/plugins/qmljstools/qmlconsolepane.h @@ -37,9 +37,7 @@ class QToolButton; class QLabel; QT_END_NAMESPACE -namespace Utils { -class SavedAction; -} +namespace Utils { class SavedAction; } namespace QmlJSTools { diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.h b/src/plugins/qmljstools/qmljscodestylesettingspage.h index cf6782f50b5..9025b37d41a 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.h +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.h @@ -48,9 +48,7 @@ namespace TextEditor { namespace QmlJSTools { namespace Internal { -namespace Ui { -class QmlJSCodeStyleSettingsPage; -} +namespace Ui { class QmlJSCodeStyleSettingsPage; } class QmlJSCodeStylePreferencesWidget : public QWidget { diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h index dce09555041..ac60ea106ca 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.h +++ b/src/plugins/qmljstools/qmljsmodelmanager.h @@ -46,17 +46,11 @@ QT_FORWARD_DECLARE_CLASS(QTimer) QT_FORWARD_DECLARE_CLASS(QLocale) -namespace Core { -class MimeType; -} +namespace Core { class MimeType; } -namespace CPlusPlus { -class CppModelManagerInterface; -} +namespace CPlusPlus { class CppModelManagerInterface; } -namespace QmlJS { -class QrcParser; -} +namespace QmlJS { class QrcParser; } namespace QmlJSTools { diff --git a/src/plugins/qmljstools/qmljsplugindumper.h b/src/plugins/qmljstools/qmljsplugindumper.h index 65c1da9481f..a1567b7ab3e 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.h +++ b/src/plugins/qmljstools/qmljsplugindumper.h @@ -40,9 +40,7 @@ QT_BEGIN_NAMESPACE class QDir; QT_END_NAMESPACE -namespace Utils { -class FileSystemWatcher; -} +namespace Utils { class FileSystemWatcher; } namespace QmlJSTools { namespace Internal { diff --git a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h index 5b98b88cb74..87df015ae01 100644 --- a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h +++ b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h @@ -35,9 +35,7 @@ #include #include -namespace TextEditor { - class TabSettings; -} +namespace TextEditor { class TabSettings; } namespace QmlJSTools { diff --git a/src/plugins/qmljstools/qmljsrefactoringchanges.h b/src/plugins/qmljstools/qmljsrefactoringchanges.h index 906c57f75ae..966417f79f0 100644 --- a/src/plugins/qmljstools/qmljsrefactoringchanges.h +++ b/src/plugins/qmljstools/qmljsrefactoringchanges.h @@ -36,9 +36,7 @@ #include -namespace QmlJS { -class ModelManagerInterface; -} // namespace QmlJS +namespace QmlJS { class ModelManagerInterface; } namespace QmlJSTools { diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.h b/src/plugins/qmlprofiler/qmlprofilertraceview.h index 3cdd38577e9..f1b16894f8c 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.h +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.h @@ -33,9 +33,7 @@ #include #include -namespace Analyzer { -class IAnalyzerTool; -} +namespace Analyzer { class IAnalyzerTool; } namespace QmlProfiler { diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h index 98941a944bc..f6eeb623bf6 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h @@ -38,9 +38,7 @@ QT_FORWARD_DECLARE_CLASS(QDir) -namespace Utils { -class FileSystemWatcher; -} +namespace Utils { class FileSystemWatcher; } namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h index f2c8d440671..835c4d4e38e 100644 --- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h +++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h @@ -33,9 +33,7 @@ #include #include -namespace ExtensionSystem { -class IPlugin; -} // namespace ExtensionSystem +namespace ExtensionSystem { class IPlugin; } namespace QmlProjectManager { namespace Internal { diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h index d35e8fed8fb..6dedae8a96f 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h @@ -35,9 +35,7 @@ #include #include -namespace Core { -class IDocument; -} +namespace Core { class IDocument; } namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index 7968e59c499..f2530d3221a 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -38,9 +38,7 @@ QT_FORWARD_DECLARE_CLASS(QStringListModel) -namespace Core { - class IEditor; -} +namespace Core { class IEditor; } namespace QtSupport { class BaseQtVersion; } diff --git a/src/plugins/qnx/bardescriptoreditor.h b/src/plugins/qnx/bardescriptoreditor.h index ce235885e20..2327680a963 100644 --- a/src/plugins/qnx/bardescriptoreditor.h +++ b/src/plugins/qnx/bardescriptoreditor.h @@ -39,9 +39,7 @@ class QActionGroup; class QToolBar; QT_END_NAMESPACE -namespace Utils { -class LineColumnLabel; -} +namespace Utils { class LineColumnLabel; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h b/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h index d45075de031..f028f885fd1 100644 --- a/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h +++ b/src/plugins/qnx/bardescriptoreditorabstractpanelwidget.h @@ -36,9 +36,7 @@ #include "bardescriptordocument.h" -namespace Utils { -class PathChooser; -} +namespace Utils { class PathChooser; } QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/qnx/bardescriptoreditorassetswidget.h b/src/plugins/qnx/bardescriptoreditorassetswidget.h index c03293c6535..fb18822309a 100644 --- a/src/plugins/qnx/bardescriptoreditorassetswidget.h +++ b/src/plugins/qnx/bardescriptoreditorassetswidget.h @@ -42,9 +42,7 @@ QT_END_NAMESPACE namespace Qnx { namespace Internal { -namespace Ui { -class BarDescriptorEditorAssetsWidget; -} +namespace Ui { class BarDescriptorEditorAssetsWidget; } class BarDescriptorAsset; diff --git a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h index 2bc2def1f7d..c919c83c3f8 100644 --- a/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h +++ b/src/plugins/qnx/bardescriptoreditorauthorinformationwidget.h @@ -37,9 +37,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BarDescriptorEditorAuthorInformationWidget; -} +namespace Ui { class BarDescriptorEditorAuthorInformationWidget; } class BarDescriptorEditorAuthorInformationWidget : public BarDescriptorEditorAbstractPanelWidget { diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h index e0bb894eefd..820b8d1d340 100644 --- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h +++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h @@ -45,9 +45,7 @@ QT_END_NAMESPACE namespace Qnx { namespace Internal { -namespace Ui { -class BarDescriptorEditorEntryPointWidget; -} +namespace Ui { class BarDescriptorEditorEntryPointWidget; } class BarDescriptorEditorEntryPointWidget : public BarDescriptorEditorAbstractPanelWidget { diff --git a/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h b/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h index 36d3ca4f39a..841d8a7aa1a 100644 --- a/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h +++ b/src/plugins/qnx/bardescriptoreditorenvironmentwidget.h @@ -39,9 +39,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BarDescriptorEditorEnvironmentWidget; -} +namespace Ui { class BarDescriptorEditorEnvironmentWidget; } class BarDescriptorEditorEnvironmentWidget : public BarDescriptorEditorAbstractPanelWidget { diff --git a/src/plugins/qnx/bardescriptoreditorgeneralwidget.h b/src/plugins/qnx/bardescriptoreditorgeneralwidget.h index 1941ca469eb..401d9bdea92 100644 --- a/src/plugins/qnx/bardescriptoreditorgeneralwidget.h +++ b/src/plugins/qnx/bardescriptoreditorgeneralwidget.h @@ -37,9 +37,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BarDescriptorEditorGeneralWidget; -} +namespace Ui { class BarDescriptorEditorGeneralWidget; } class BarDescriptorEditorGeneralWidget : public BarDescriptorEditorAbstractPanelWidget { diff --git a/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h b/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h index 6a46496405b..7a5e023cf7e 100644 --- a/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h +++ b/src/plugins/qnx/bardescriptoreditorpackageinformationwidget.h @@ -37,9 +37,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BarDescriptorEditorPackageInformationWidget; -} +namespace Ui { class BarDescriptorEditorPackageInformationWidget; } class BarDescriptorEditorPackageInformationWidget : public BarDescriptorEditorAbstractPanelWidget { diff --git a/src/plugins/qnx/bardescriptoreditorpermissionswidget.h b/src/plugins/qnx/bardescriptoreditorpermissionswidget.h index 5ee81abdb12..a01e3657094 100644 --- a/src/plugins/qnx/bardescriptoreditorpermissionswidget.h +++ b/src/plugins/qnx/bardescriptoreditorpermissionswidget.h @@ -39,9 +39,7 @@ namespace Internal { class BarDescriptorPermissionsModel; -namespace Ui { -class BarDescriptorEditorPermissionsWidget; -} +namespace Ui { class BarDescriptorEditorPermissionsWidget; } class BarDescriptorEditorPermissionsWidget : public BarDescriptorEditorAbstractPanelWidget { diff --git a/src/plugins/qnx/bardescriptoreditorwidget.h b/src/plugins/qnx/bardescriptoreditorwidget.h index 1c67cb11cda..4532a255a5c 100644 --- a/src/plugins/qnx/bardescriptoreditorwidget.h +++ b/src/plugins/qnx/bardescriptoreditorwidget.h @@ -36,13 +36,9 @@ #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } -namespace ProjectExplorer { -class PanelsWidget; -} +namespace ProjectExplorer { class PanelsWidget; } namespace TextEditor { class PlainTextEditorWidget; diff --git a/src/plugins/qnx/blackberryabstractdeploystep.h b/src/plugins/qnx/blackberryabstractdeploystep.h index 67a8c38afa6..c4f3a7bdc8a 100644 --- a/src/plugins/qnx/blackberryabstractdeploystep.h +++ b/src/plugins/qnx/blackberryabstractdeploystep.h @@ -43,9 +43,7 @@ QT_BEGIN_NAMESPACE class QEventLoop; QT_END_NAMESPACE -namespace Utils { -class QtcProcess; -} +namespace Utils { class QtcProcess; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberryapplicationrunner.h b/src/plugins/qnx/blackberryapplicationrunner.h index 7654263a858..6d3251cb521 100644 --- a/src/plugins/qnx/blackberryapplicationrunner.h +++ b/src/plugins/qnx/blackberryapplicationrunner.h @@ -44,9 +44,7 @@ #include #include -namespace QSsh { -class SshRemoteProcessRunner; -} +namespace QSsh { class SshRemoteProcessRunner; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h b/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h index 791f8575df2..a218bf876d6 100644 --- a/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h +++ b/src/plugins/qnx/blackberrycheckdevicestatusstepconfigwidget.h @@ -37,9 +37,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BlackBerryCheckDeviceStatusStepConfigWidget; -} +namespace Ui { class BlackBerryCheckDeviceStatusStepConfigWidget; } class BlackBerryCheckDeviceStatusStep; class BlackBerryCheckDeviceStatusStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget diff --git a/src/plugins/qnx/blackberryconfiguration.h b/src/plugins/qnx/blackberryconfiguration.h index 9f5b30ba808..b5df8ebbaea 100644 --- a/src/plugins/qnx/blackberryconfiguration.h +++ b/src/plugins/qnx/blackberryconfiguration.h @@ -45,12 +45,8 @@ #include #include -namespace QtSupport { -class BaseQtVersion; -} -namespace Debugger { -class DebuggerItem; -} +namespace QtSupport { class BaseQtVersion; } +namespace Debugger { class DebuggerItem; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h index ff183e51a40..e7d3a74da3a 100644 --- a/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h +++ b/src/plugins/qnx/blackberrycreatepackagestepconfigwidget.h @@ -37,9 +37,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BlackBerryCreatePackageStepConfigWidget; -} +namespace Ui { class BlackBerryCreatePackageStepConfigWidget; } class BlackBerryCreatePackageStep; diff --git a/src/plugins/qnx/blackberrydeployconfiguration.h b/src/plugins/qnx/blackberrydeployconfiguration.h index 377acbbb162..7ad8f414af5 100644 --- a/src/plugins/qnx/blackberrydeployconfiguration.h +++ b/src/plugins/qnx/blackberrydeployconfiguration.h @@ -36,9 +36,7 @@ #include "blackberrydeviceconfiguration.h" -namespace ProjectExplorer { -class Target; -} +namespace ProjectExplorer { class Target; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrydeployconfigurationfactory.h b/src/plugins/qnx/blackberrydeployconfigurationfactory.h index 55bbcdccb8f..42b335e6dc2 100644 --- a/src/plugins/qnx/blackberrydeployconfigurationfactory.h +++ b/src/plugins/qnx/blackberrydeployconfigurationfactory.h @@ -34,9 +34,7 @@ #include -namespace ProjectExplorer { -class Target; -} +namespace ProjectExplorer { class Target; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.h b/src/plugins/qnx/blackberrydeployconfigurationwidget.h index bbb39a0e1c5..654c4f8112e 100644 --- a/src/plugins/qnx/blackberrydeployconfigurationwidget.h +++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.h @@ -38,9 +38,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BlackBerryDeployConfigurationWidget; -} +namespace Ui { class BlackBerryDeployConfigurationWidget; } class BlackBerryDeployConfiguration; diff --git a/src/plugins/qnx/blackberrydeployinformation.h b/src/plugins/qnx/blackberrydeployinformation.h index 48373bd511e..c387bf123d3 100644 --- a/src/plugins/qnx/blackberrydeployinformation.h +++ b/src/plugins/qnx/blackberrydeployinformation.h @@ -33,9 +33,7 @@ #include -namespace ProjectExplorer { -class Target; -} +namespace ProjectExplorer { class Target; } namespace QmakeProjectManager { class QmakeProFileNode; diff --git a/src/plugins/qnx/blackberrydeviceconfiguration.h b/src/plugins/qnx/blackberrydeviceconfiguration.h index d5d57dab8eb..8e79bedbc0b 100644 --- a/src/plugins/qnx/blackberrydeviceconfiguration.h +++ b/src/plugins/qnx/blackberrydeviceconfiguration.h @@ -34,9 +34,7 @@ #include -namespace ProjectExplorer { -class Kit; -} +namespace ProjectExplorer { class Kit; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h index 8a75153cd63..72f461db6ee 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h +++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h @@ -47,9 +47,7 @@ namespace Internal { class BlackBerryDebugTokenUploader; class BlackBerrySigningUtils; -namespace Ui { -class BlackBerryDeviceConfigurationWidget; -} +namespace Ui { class BlackBerryDeviceConfigurationWidget; } class BlackBerryDeviceConfigurationWidget : public ProjectExplorer::IDeviceWidget { diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h index 50b58eced18..a0254a7c400 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.h @@ -39,9 +39,7 @@ #include #include -namespace QSsh { -class SshKeyGenerator; -} +namespace QSsh { class SshKeyGenerator; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrylogprocessrunner.h b/src/plugins/qnx/blackberrylogprocessrunner.h index 5d50ab3d1d3..0275cda06b2 100644 --- a/src/plugins/qnx/blackberrylogprocessrunner.h +++ b/src/plugins/qnx/blackberrylogprocessrunner.h @@ -38,9 +38,7 @@ #include -namespace ProjectExplorer { -class SshDeviceProcess; -} +namespace ProjectExplorer { class SshDeviceProcess; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberryrunconfiguration.h b/src/plugins/qnx/blackberryrunconfiguration.h index f1d7a379691..9c30cc08e8f 100644 --- a/src/plugins/qnx/blackberryrunconfiguration.h +++ b/src/plugins/qnx/blackberryrunconfiguration.h @@ -34,9 +34,7 @@ #include -namespace ProjectExplorer { -class Target; -} +namespace ProjectExplorer { class Target; } namespace QmakeProjectManager { class QmakeBuildConfiguration; diff --git a/src/plugins/qnx/blackberryrunconfigurationwidget.h b/src/plugins/qnx/blackberryrunconfigurationwidget.h index 2b28a7b0c78..bcecddcb256 100644 --- a/src/plugins/qnx/blackberryrunconfigurationwidget.h +++ b/src/plugins/qnx/blackberryrunconfigurationwidget.h @@ -37,9 +37,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BlackBerryRunConfigurationWidget; -} +namespace Ui { class BlackBerryRunConfigurationWidget; } class BlackBerryRunConfiguration; diff --git a/src/plugins/qnx/blackberryruncontrol.h b/src/plugins/qnx/blackberryruncontrol.h index 766a103f6df..c1278bc058a 100644 --- a/src/plugins/qnx/blackberryruncontrol.h +++ b/src/plugins/qnx/blackberryruncontrol.h @@ -34,9 +34,7 @@ #include -namespace QmakeProjectManager { -class QmakeBuildConfiguration; -} +namespace QmakeProjectManager { class QmakeBuildConfiguration; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberryruncontrolfactory.h b/src/plugins/qnx/blackberryruncontrolfactory.h index e9e8f49ccee..6c66d6e1de3 100644 --- a/src/plugins/qnx/blackberryruncontrolfactory.h +++ b/src/plugins/qnx/blackberryruncontrolfactory.h @@ -36,9 +36,7 @@ #include -namespace RemoteLinux { -class RemoteLinuxRunConfiguration; -} +namespace RemoteLinux { class RemoteLinuxRunConfiguration; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrysetupwizard.h b/src/plugins/qnx/blackberrysetupwizard.h index aa4d50f72b2..ff973614881 100644 --- a/src/plugins/qnx/blackberrysetupwizard.h +++ b/src/plugins/qnx/blackberrysetupwizard.h @@ -38,9 +38,7 @@ #include #include -namespace QSsh { -class SshKeyGenerator; -} +namespace QSsh { class SshKeyGenerator; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrysetupwizardpages.h b/src/plugins/qnx/blackberrysetupwizardpages.h index c1d8eb1dd8f..ae0065f436e 100644 --- a/src/plugins/qnx/blackberrysetupwizardpages.h +++ b/src/plugins/qnx/blackberrysetupwizardpages.h @@ -34,9 +34,7 @@ #include -namespace Utils { -class PathChooser; -} +namespace Utils { class PathChooser; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/blackberrysigningpasswordsdialog.h b/src/plugins/qnx/blackberrysigningpasswordsdialog.h index 8279b4d0217..1fb38c43062 100644 --- a/src/plugins/qnx/blackberrysigningpasswordsdialog.h +++ b/src/plugins/qnx/blackberrysigningpasswordsdialog.h @@ -37,9 +37,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class BlackBerrySigningPasswordsDialog; -} +namespace Ui { class BlackBerrySigningPasswordsDialog; } class BlackBerrySigningPasswordsDialog : public QDialog { diff --git a/src/plugins/qnx/blackberrysshkeysgenerator.h b/src/plugins/qnx/blackberrysshkeysgenerator.h index 6422f63973b..58bea9c9579 100644 --- a/src/plugins/qnx/blackberrysshkeysgenerator.h +++ b/src/plugins/qnx/blackberrysshkeysgenerator.h @@ -33,9 +33,7 @@ #include -namespace QSsh { -class SshKeyGenerator; -} +namespace QSsh { class SshKeyGenerator; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h index 8e0facc8e06..a8e3461eabb 100644 --- a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h +++ b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h @@ -35,9 +35,7 @@ #include #include -namespace Utils { - class ProjectIntroPage; -} +namespace Utils { class ProjectIntroPage; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/cascadesimport/fileconverter.h b/src/plugins/qnx/cascadesimport/fileconverter.h index 7b3b7e818ec..3b236a43956 100644 --- a/src/plugins/qnx/cascadesimport/fileconverter.h +++ b/src/plugins/qnx/cascadesimport/fileconverter.h @@ -35,9 +35,7 @@ #include #include -namespace Core { -class GeneratedFile; -} +namespace Core { class GeneratedFile; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/qnxbaseqtconfigwidget.h b/src/plugins/qnx/qnxbaseqtconfigwidget.h index eb70735416b..d13ef85c27e 100644 --- a/src/plugins/qnx/qnxbaseqtconfigwidget.h +++ b/src/plugins/qnx/qnxbaseqtconfigwidget.h @@ -36,9 +36,7 @@ namespace Qnx { namespace Internal { -namespace Ui { -class QnxBaseQtConfigWidget; -} +namespace Ui { class QnxBaseQtConfigWidget; } class QnxAbstractQtVersion; diff --git a/src/plugins/qnx/qnxdevicetester.h b/src/plugins/qnx/qnxdevicetester.h index b75d49cfca0..5c6313c233e 100644 --- a/src/plugins/qnx/qnxdevicetester.h +++ b/src/plugins/qnx/qnxdevicetester.h @@ -36,9 +36,7 @@ #include -namespace QSsh { -class SshRemoteProcessRunner; -} +namespace QSsh { class SshRemoteProcessRunner; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qnx/slog2inforunner.h b/src/plugins/qnx/slog2inforunner.h index 5f66966b3a9..4ed332bbbbc 100644 --- a/src/plugins/qnx/slog2inforunner.h +++ b/src/plugins/qnx/slog2inforunner.h @@ -40,9 +40,7 @@ #include #include -namespace ProjectExplorer { -class SshDeviceProcess; -} +namespace ProjectExplorer { class SshDeviceProcess; } namespace Qnx { namespace Internal { diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 431ccef2734..c06afa46811 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -39,13 +39,9 @@ #include #include -namespace Utils { -class Environment; -} // namespace Utils +namespace Utils { class Environment; } -namespace Core { -class FeatureSet; -} // namespace Core +namespace Core { class FeatureSet; } namespace ProjectExplorer { class IOutputParser; diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h index 8c6a13b2fa8..11ef7c2424c 100644 --- a/src/plugins/qtsupport/profilereader.h +++ b/src/plugins/qtsupport/profilereader.h @@ -40,9 +40,7 @@ #include namespace QtSupport { -namespace Internal { -class QtSupportPlugin; -} +namespace Internal { class QtSupportPlugin; } class QTSUPPORT_EXPORT ProMessageHandler : public QObject, public QMakeHandler { diff --git a/src/plugins/qtsupport/qmldumptool.h b/src/plugins/qtsupport/qmldumptool.h index a6a4ff2f551..83a0fdf24ec 100644 --- a/src/plugins/qtsupport/qmldumptool.h +++ b/src/plugins/qtsupport/qmldumptool.h @@ -34,9 +34,7 @@ #include -namespace Utils { - class Environment; -} +namespace Utils { class Environment; } namespace ProjectExplorer { class Project; diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h index 9fc0454d613..2e762da58d2 100644 --- a/src/plugins/qtsupport/qtoptionspage.h +++ b/src/plugins/qtsupport/qtoptionspage.h @@ -43,9 +43,7 @@ class QTextBrowser; class QUrl; QT_END_NAMESPACE -namespace ProjectExplorer { -class ToolChain; -} +namespace ProjectExplorer { class ToolChain; } namespace QtSupport { diff --git a/src/plugins/qtsupport/qtoutputformatter.h b/src/plugins/qtsupport/qtoutputformatter.h index e2b88cdd5fd..4bdd606e267 100644 --- a/src/plugins/qtsupport/qtoutputformatter.h +++ b/src/plugins/qtsupport/qtoutputformatter.h @@ -40,9 +40,7 @@ QT_FORWARD_DECLARE_CLASS(QTextCursor) -namespace ProjectExplorer { -class Project; -} // namespace ProjectExplorer +namespace ProjectExplorer { class Project; } namespace QtSupport { diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h index 7ba82c2767d..923937a6246 100644 --- a/src/plugins/qtsupport/qtversionmanager.h +++ b/src/plugins/qtsupport/qtversionmanager.h @@ -44,9 +44,7 @@ class PersistentSettingsWriter; namespace ProjectExplorer { class KitInformation; } namespace QtSupport { -namespace Internal { -class QtOptionsPage; -} +namespace Internal { class QtOptionsPage; } struct QMakeAssignment { diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index 9cb88a89d01..732555c3157 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -39,9 +39,7 @@ namespace RemoteLinux { class AbstractRemoteLinuxDeployService; class RemoteLinuxDeployConfiguration; -namespace Internal { -class AbstractRemoteLinuxDeployStepPrivate; -} +namespace Internal { class AbstractRemoteLinuxDeployStepPrivate; } class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer::BuildStep { diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h index 70ac3242e01..74b889552e2 100644 --- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h +++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h @@ -35,9 +35,7 @@ namespace RemoteLinux { class AbstractRemoteLinuxPackageInstaller; -namespace Internal { -class AbstractUploadAndInstallPackageServicePrivate; -} +namespace Internal { class AbstractUploadAndInstallPackageServicePrivate; } class REMOTELINUX_EXPORT AbstractUploadAndInstallPackageService : public AbstractRemoteLinuxDeployService { diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h index 1bb02691371..b5df95efecd 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.h +++ b/src/plugins/remotelinux/genericdirectuploadstep.h @@ -34,9 +34,7 @@ #include "remotelinux_export.h" namespace RemoteLinux { -namespace Internal { -class GenericDirectUploadStepPrivate; -} +namespace Internal { class GenericDirectUploadStepPrivate; } class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDeployStep { diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h index f81aef377e4..16a9f7ddbde 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h @@ -36,9 +36,7 @@ namespace RemoteLinux { -namespace Ui { -class GenericLinuxDeviceConfigurationWidget; -} +namespace Ui { class GenericLinuxDeviceConfigurationWidget; } class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWidget : public ProjectExplorer::IDeviceWidget diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h index 8c8ab50815e..278baea7ce2 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h @@ -35,9 +35,7 @@ #include namespace RemoteLinux { -namespace Internal { -class GenericLinuxDeviceConfigurationWizardPrivate; -} // namespace Internal +namespace Internal { class GenericLinuxDeviceConfigurationWizardPrivate; } class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWizard : public Utils::Wizard { diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h index 2d01074f1e1..00cae135f4b 100644 --- a/src/plugins/remotelinux/linuxdevicetester.h +++ b/src/plugins/remotelinux/linuxdevicetester.h @@ -40,9 +40,7 @@ namespace ProjectExplorer { class DeviceUsedPortsGatherer; } namespace RemoteLinux { -namespace Internal { -class GenericLinuxDeviceTesterPrivate; -} +namespace Internal { class GenericLinuxDeviceTesterPrivate; } class REMOTELINUX_EXPORT GenericLinuxDeviceTester : public ProjectExplorer::DeviceTester { diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h index 89194e54eba..bdc7fb0cbe9 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.h +++ b/src/plugins/remotelinux/publickeydeploymentdialog.h @@ -36,9 +36,7 @@ #include namespace RemoteLinux { -namespace Internal { -class PublicKeyDeploymentDialogPrivate; -} // namespace Internal +namespace Internal { class PublicKeyDeploymentDialogPrivate; } class REMOTELINUX_EXPORT PublicKeyDeploymentDialog : public QProgressDialog { diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h index 814fd231d08..d5ef63e5bee 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h @@ -32,9 +32,7 @@ #include "abstractremotelinuxdeployservice.h" namespace RemoteLinux { -namespace Internal { -class RemoteLinuxCustomCommandDeployservicePrivate; -} // namespace Internal +namespace Internal { class RemoteLinuxCustomCommandDeployservicePrivate; } class REMOTELINUX_EXPORT RemoteLinuxCustomCommandDeployService : public AbstractRemoteLinuxDeployService diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h index 13933b338cf..d6853c83963 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h @@ -36,9 +36,7 @@ namespace RemoteLinux { class RemoteLinuxDeployConfiguration; -namespace Internal { -class RemoteLinuxDeployConfigurationWidgetPrivate; -} // namespace Internal +namespace Internal { class RemoteLinuxDeployConfigurationWidgetPrivate; } class REMOTELINUX_EXPORT RemoteLinuxDeployConfigurationWidget : public ProjectExplorer::NamedWidget diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h index ca4e5f1ece1..6afe9bf7bd0 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h @@ -36,9 +36,7 @@ namespace RemoteLinux { -namespace Internal { -class AbstractRemoteLinuxPackageInstallerPrivate; -} // namespace Internal +namespace Internal { class AbstractRemoteLinuxPackageInstallerPrivate; } class REMOTELINUX_EXPORT AbstractRemoteLinuxPackageInstaller : public QObject { diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h index 2056e157a36..35fdceeff30 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h @@ -41,9 +41,7 @@ QT_END_NAMESPACE namespace RemoteLinux { class RemoteLinuxRunConfiguration; -namespace Internal { -class RemoteLinuxRunConfigurationWidgetPrivate; -} // namespace Internal +namespace Internal { class RemoteLinuxRunConfigurationWidgetPrivate; } class REMOTELINUX_EXPORT RemoteLinuxRunConfigurationWidget : public QWidget { diff --git a/src/plugins/remotelinux/sshkeydeployer.h b/src/plugins/remotelinux/sshkeydeployer.h index d269fb7c4bc..9080f8e169e 100644 --- a/src/plugins/remotelinux/sshkeydeployer.h +++ b/src/plugins/remotelinux/sshkeydeployer.h @@ -33,14 +33,10 @@ #include -namespace QSsh { -class SshConnectionParameters; -} +namespace QSsh { class SshConnectionParameters; } namespace RemoteLinux { -namespace Internal { -class SshKeyDeployerPrivate; -} +namespace Internal { class SshKeyDeployerPrivate; } class REMOTELINUX_EXPORT SshKeyDeployer : public QObject { diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h index c30722d9010..dd37785ea09 100644 --- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h +++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h @@ -35,9 +35,7 @@ namespace RemoteLinux { class AbstractRemoteLinuxPackageInstaller; -namespace Internal { -class UploadAndInstallTarPackageServicePrivate; -} +namespace Internal { class UploadAndInstallTarPackageServicePrivate; } class REMOTELINUX_EXPORT UploadAndInstallTarPackageService : public AbstractUploadAndInstallPackageService { diff --git a/src/plugins/resourceeditor/qrceditor/test/mainwindow.h b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h index 699cfd563be..78179b0da51 100644 --- a/src/plugins/resourceeditor/qrceditor/test/mainwindow.h +++ b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h @@ -32,9 +32,7 @@ #include -namespace SharedTools { - class QrcEditor; -} +namespace SharedTools { class QrcEditor; } class MainWindow : public QMainWindow { diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h index 14e818156d8..117a7e1099c 100644 --- a/src/plugins/subversion/subversionplugin.h +++ b/src/plugins/subversion/subversionplugin.h @@ -46,13 +46,9 @@ namespace Core { class IVersionControl; class IEditor; } -namespace Utils { - class ParameterAction; -} +namespace Utils { class ParameterAction; } -namespace VcsBase { - class VcsBaseSubmitEditor; -} +namespace VcsBase { class VcsBaseSubmitEditor; } namespace Subversion { namespace Internal { diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h index d65920ed84c..60f012dca62 100644 --- a/src/plugins/tasklist/taskfile.h +++ b/src/plugins/tasklist/taskfile.h @@ -32,9 +32,7 @@ #include -namespace ProjectExplorer { -class Project; -} // namespace ProjectExplorer +namespace ProjectExplorer { class Project; } namespace TaskList { namespace Internal { diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index f7f14662d52..c3d8e7dc81c 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -48,9 +48,7 @@ class IFindSupport; } // namespace Core namespace TextEditor { -namespace Internal { -class BaseFileFindPrivate; -} // namespace Internal +namespace Internal { class BaseFileFindPrivate; } class TEXTEDITOR_EXPORT BaseFileFind : public Core::IFindFilter { diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h index 427a20711ec..ea6c7815682 100644 --- a/src/plugins/texteditor/basehoverhandler.h +++ b/src/plugins/texteditor/basehoverhandler.h @@ -40,9 +40,7 @@ QT_BEGIN_NAMESPACE class QPoint; QT_END_NAMESPACE -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace TextEditor { diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h index 3f3f65aaf52..849092ce78d 100644 --- a/src/plugins/texteditor/basetextmark.h +++ b/src/plugins/texteditor/basetextmark.h @@ -34,9 +34,7 @@ #include "itextmark.h" namespace TextEditor { -namespace Internal { -class BaseTextMarkRegistry; -} +namespace Internal { class BaseTextMarkRegistry; } class ITextMarkable; diff --git a/src/plugins/texteditor/codeassist/iassistinterface.h b/src/plugins/texteditor/codeassist/iassistinterface.h index 51c501f0b80..7debebe4bf0 100644 --- a/src/plugins/texteditor/codeassist/iassistinterface.h +++ b/src/plugins/texteditor/codeassist/iassistinterface.h @@ -41,9 +41,7 @@ class QTextDocument; class QThread; QT_END_NAMESPACE -namespace Core { -class IDocument; -} +namespace Core { class IDocument; } namespace TextEditor { diff --git a/src/plugins/texteditor/codestylepool.h b/src/plugins/texteditor/codestylepool.h index b449163d75c..631d5f9f318 100644 --- a/src/plugins/texteditor/codestylepool.h +++ b/src/plugins/texteditor/codestylepool.h @@ -42,9 +42,7 @@ class ICodeStylePreferences; class ICodeStylePreferencesFactory; class TabSettings; -namespace Internal { -class CodeStylePoolPrivate; -} +namespace Internal { class CodeStylePoolPrivate; } class TEXTEDITOR_EXPORT CodeStylePool : public QObject { diff --git a/src/plugins/texteditor/colorschemeedit.h b/src/plugins/texteditor/colorschemeedit.h index fd7000d1ee3..d5cfe14a12c 100644 --- a/src/plugins/texteditor/colorschemeedit.h +++ b/src/plugins/texteditor/colorschemeedit.h @@ -42,9 +42,7 @@ QT_END_NAMESPACE namespace TextEditor { namespace Internal { -namespace Ui { -class ColorSchemeEdit; -} +namespace Ui { class ColorSchemeEdit; } class FormatsModel; diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index 0466ad8bf80..c0e82fd295e 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -46,9 +46,7 @@ QT_END_NAMESPACE namespace TextEditor { -namespace Internal { -class FontSettingsPagePrivate; -} // namespace Internal +namespace Internal { class FontSettingsPagePrivate; } // GUI description of a format consisting of id (settings key) // and displayName to be displayed diff --git a/src/plugins/texteditor/generichighlighter/highlighterexception.h b/src/plugins/texteditor/generichighlighter/highlighterexception.h index c674dd7c0af..85054e80197 100644 --- a/src/plugins/texteditor/generichighlighter/highlighterexception.h +++ b/src/plugins/texteditor/generichighlighter/highlighterexception.h @@ -31,11 +31,7 @@ #define HIGHLIGHTEREXCEPTION_H namespace TextEditor { -namespace Internal { - -class HighlighterException {}; - -} // namespace Internal +namespace Internal { class HighlighterException {}; } } // namespace TextEditor #endif // HIGHLIGHTEREXCEPTION_H diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h index 69d1372f538..a7081c6bc9e 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h @@ -38,9 +38,7 @@ QT_END_NAMESPACE namespace TextEditor { -namespace Internal { -class HighlightDefinitionMetaData; -} +namespace Internal { class HighlightDefinitionMetaData; } class HighlighterSettings; diff --git a/src/plugins/texteditor/highlighterutils.h b/src/plugins/texteditor/highlighterutils.h index ead98544038..627c45d6131 100644 --- a/src/plugins/texteditor/highlighterutils.h +++ b/src/plugins/texteditor/highlighterutils.h @@ -37,9 +37,7 @@ * but due to a very hackish test of that generic highlighter, * there functions must be outside. */ -namespace Core { -class MimeType; -} +namespace Core { class MimeType; } namespace TextEditor { diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h index ca19586018d..42ca853f469 100644 --- a/src/plugins/texteditor/icodestylepreferences.h +++ b/src/plugins/texteditor/icodestylepreferences.h @@ -41,9 +41,7 @@ QT_END_NAMESPACE namespace TextEditor { -namespace Internal { -class ICodeStylePreferencesPrivate; -} +namespace Internal { class ICodeStylePreferencesPrivate; } class TabSettings; class CodeStylePool; diff --git a/src/plugins/texteditor/ioutlinewidget.h b/src/plugins/texteditor/ioutlinewidget.h index e6f27da1063..077637caedf 100644 --- a/src/plugins/texteditor/ioutlinewidget.h +++ b/src/plugins/texteditor/ioutlinewidget.h @@ -33,9 +33,7 @@ #include #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace TextEditor { diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h index 594efad15db..96f7e03b3ed 100644 --- a/src/plugins/texteditor/itexteditor.h +++ b/src/plugins/texteditor/itexteditor.h @@ -50,9 +50,7 @@ class QRect; class QTextBlock; QT_END_NAMESPACE -namespace Utils { - class CommentDefinition; -} +namespace Utils { class CommentDefinition; } namespace TextEditor { diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index a4eb8b2c77b..3806d18f336 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -36,9 +36,7 @@ #include #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/outlinefactory.h b/src/plugins/texteditor/outlinefactory.h index de2b9ddd87c..ea001520b39 100644 --- a/src/plugins/texteditor/outlinefactory.h +++ b/src/plugins/texteditor/outlinefactory.h @@ -35,9 +35,7 @@ #include #include -namespace Core { -class IEditor; -} +namespace Core { class IEditor; } namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h index ca620afd91b..dd2604a36ec 100644 --- a/src/plugins/texteditor/plaintexteditor.h +++ b/src/plugins/texteditor/plaintexteditor.h @@ -34,9 +34,7 @@ #include -namespace Core { -class MimeType; -} +namespace Core { class MimeType; } namespace TextEditor { diff --git a/src/plugins/texteditor/simplecodestylepreferenceswidget.h b/src/plugins/texteditor/simplecodestylepreferenceswidget.h index 992b242b343..33f014de09d 100644 --- a/src/plugins/texteditor/simplecodestylepreferenceswidget.h +++ b/src/plugins/texteditor/simplecodestylepreferenceswidget.h @@ -40,9 +40,7 @@ class TabSettings; class TabSettingsWidget; class ICodeStylePreferences; -namespace Ui { - class TabPreferencesWidget; -} +namespace Ui { class TabPreferencesWidget; } class TEXTEDITOR_EXPORT SimpleCodeStylePreferencesWidget : public QWidget { diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h index 3fd323b156f..24930a17ee8 100644 --- a/src/plugins/texteditor/texteditorplugin.h +++ b/src/plugins/texteditor/texteditorplugin.h @@ -32,9 +32,7 @@ #include -namespace Core { -class SearchResultWindow; -} +namespace Core { class SearchResultWindow; } namespace TextEditor { diff --git a/src/plugins/todo/keyworddialog.h b/src/plugins/todo/keyworddialog.h index a644661086a..9aaea056cb7 100644 --- a/src/plugins/todo/keyworddialog.h +++ b/src/plugins/todo/keyworddialog.h @@ -37,9 +37,7 @@ namespace Todo { namespace Internal { -namespace Ui { - class KeywordDialog; -} +namespace Ui { class KeywordDialog; } class Keyword; diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h index d271f71ed10..57171fa7340 100644 --- a/src/plugins/todo/optionsdialog.h +++ b/src/plugins/todo/optionsdialog.h @@ -40,9 +40,7 @@ QT_END_NAMESPACE namespace Todo { namespace Internal { -namespace Ui { - class OptionsDialog; -} +namespace Ui { class OptionsDialog; } class Settings; class Keyword; diff --git a/src/plugins/valgrind/callgrindtextmark.h b/src/plugins/valgrind/callgrindtextmark.h index 0107bebee4f..14f2467a9ce 100644 --- a/src/plugins/valgrind/callgrindtextmark.h +++ b/src/plugins/valgrind/callgrindtextmark.h @@ -36,9 +36,7 @@ namespace Valgrind { -namespace Callgrind { -class Function; -} +namespace Callgrind { class Function; } namespace Internal { diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h index d501a6cd454..b53e4917847 100644 --- a/src/plugins/valgrind/callgrindvisualisation.h +++ b/src/plugins/valgrind/callgrindvisualisation.h @@ -38,9 +38,7 @@ class QModelIndex; QT_END_NAMESPACE namespace Valgrind { -namespace Callgrind { -class Function; -} +namespace Callgrind { class Function; } } namespace Valgrind { diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h index c897dd21e74..f20e433464d 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.h +++ b/src/plugins/valgrind/valgrindconfigwidget.h @@ -40,9 +40,7 @@ QT_END_NAMESPACE namespace Valgrind { namespace Internal { -namespace Ui { -class ValgrindConfigWidget; -} +namespace Ui { class ValgrindConfigWidget; } class ValgrindBaseSettings; diff --git a/src/plugins/vcsbase/basecheckoutwizard.h b/src/plugins/vcsbase/basecheckoutwizard.h index 600199a5aa0..00ad9474a17 100644 --- a/src/plugins/vcsbase/basecheckoutwizard.h +++ b/src/plugins/vcsbase/basecheckoutwizard.h @@ -41,9 +41,7 @@ class QWizardPage; QT_END_NAMESPACE namespace VcsBase { -namespace Internal { -class BaseCheckoutWizardPrivate; -} +namespace Internal { class BaseCheckoutWizardPrivate; } class Command; diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.h b/src/plugins/vcsbase/basecheckoutwizardpage.h index bb4ca62c8e4..ae44d94729d 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.h +++ b/src/plugins/vcsbase/basecheckoutwizardpage.h @@ -39,9 +39,7 @@ namespace VcsBase { namespace Internal { class BaseCheckoutWizardPagePrivate; -namespace Ui { -class BaseCheckoutWizardPage; -} // namespace Ui +namespace Ui { class BaseCheckoutWizardPage; } } // namespace Internal diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h index d239b85e562..7bc9e30eff7 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.h +++ b/src/plugins/vcsbase/basevcseditorfactory.h @@ -36,9 +36,7 @@ #include namespace VcsBase { -namespace Internal { -class BaseVcsEditorFactoryPrivate; -} // namespace Internal +namespace Internal { class BaseVcsEditorFactoryPrivate; } class VCSBASE_EXPORT BaseVcsEditorFactory : public Core::IEditorFactory { diff --git a/src/shared/designerintegrationv2/widgethost.h b/src/shared/designerintegrationv2/widgethost.h index 863d0ba0610..f4a6657f869 100644 --- a/src/shared/designerintegrationv2/widgethost.h +++ b/src/shared/designerintegrationv2/widgethost.h @@ -36,9 +36,7 @@ QT_FORWARD_DECLARE_CLASS(QDesignerFormWindowInterface) namespace SharedTools { -namespace Internal { - class FormResizer; -} +namespace Internal { class FormResizer; } /* A scroll area that embeds a Designer form window */ diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h index 216473fb6a3..532de85b9d0 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h @@ -34,9 +34,7 @@ QT_BEGIN_NAMESPACE class QString; -namespace Ui { -class CrashHandlerDialog; -} +namespace Ui { class CrashHandlerDialog; } QT_END_NAMESPACE class CrashHandler; diff --git a/src/tools/screenshotcropper/screenshotcropperwindow.h b/src/tools/screenshotcropper/screenshotcropperwindow.h index aa842e88746..e361f461677 100644 --- a/src/tools/screenshotcropper/screenshotcropperwindow.h +++ b/src/tools/screenshotcropper/screenshotcropperwindow.h @@ -35,9 +35,7 @@ using namespace QtSupport::Internal; -namespace Ui { -class ScreenShotCropperWindow; -} +namespace Ui { class ScreenShotCropperWindow; } class ScreenShotCropperWindow : public QMainWindow {