diff options
31 files changed, 90 insertions, 322 deletions
diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/analyzerbase/startremotedialog.h index 4c3f932b85..b3f92e7742 100644 --- a/src/plugins/analyzerbase/startremotedialog.h +++ b/src/plugins/analyzerbase/startremotedialog.h @@ -37,23 +37,12 @@ #include <QtGui/QDialog> -QT_BEGIN_NAMESPACE +namespace Utils { class SshConnectionParameters; } namespace Analyzer { -namespace Internal { -namespace Ui { -class StartRemoteDialog; -} // namespace Ui -} // namespace Internal -} // namespace Analyzer - -QT_END_NAMESPACE -namespace Utils { -class SshConnectionParameters; -} +namespace Internal { namespace Ui { class StartRemoteDialog; } } -namespace Analyzer { class ANALYZER_EXPORT StartRemoteDialog : public QDialog { diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index 217b5098d4..9bac557c6b 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -41,13 +41,6 @@ QT_BEGIN_NAMESPACE class QLineEdit; class QTreeWidget; class QTreeWidgetItem; -namespace Core { -namespace Internal { -namespace Ui { -class CommandMappings; -} // namespace Ui -} // namespace Internal -} // namespace Core QT_END_NAMESPACE namespace Core { @@ -56,6 +49,8 @@ class Command; namespace Internal { +namespace Ui { class CommandMappings; } + class ActionManagerPrivate; class MainWindow; diff --git a/src/plugins/coreplugin/variablechooser.h b/src/plugins/coreplugin/variablechooser.h index 5db5b05164..23905533a7 100644 --- a/src/plugins/coreplugin/variablechooser.h +++ b/src/plugins/coreplugin/variablechooser.h @@ -43,23 +43,14 @@ class QLineEdit; class QTextEdit; class QPlainTextEdit; class QListWidgetItem; - -namespace Core { -namespace Internal { -namespace Ui { -class VariableChooser; -} // namespace Ui -} // namespace Internal -} // namespace Core - QT_END_NAMESPACE -namespace Utils { -class IconButton; -} // namespace Utils +namespace Utils { class IconButton; } namespace Core { +namespace Internal { namespace Ui { class VariableChooser; } } + class CORE_EXPORT VariableChooser : public QWidget { Q_OBJECT @@ -90,4 +81,5 @@ private: }; } // namespace Core + #endif // VARIABLECHOOSER_H diff --git a/src/plugins/cpptools/completionsettingspage.h b/src/plugins/cpptools/completionsettingspage.h index d7cccaf9fb..627125a4c8 100644 --- a/src/plugins/cpptools/completionsettingspage.h +++ b/src/plugins/cpptools/completionsettingspage.h @@ -36,18 +36,10 @@ #include <texteditor/completionsettings.h> #include <texteditor/texteditoroptionspage.h> -QT_BEGIN_NAMESPACE namespace CppTools { namespace Internal { -namespace Ui { -class CompletionSettingsPage; -} // namespace Ui -} // namespace Internal -} // namespace CppTools -QT_END_NAMESPACE -namespace CppTools { -namespace Internal { +namespace Ui { class CompletionSettingsPage; } // TODO: Move this class to the text editor plugin diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h index f96d43a824..992b878490 100644 --- a/src/plugins/cpptools/cppcodestylesettings.h +++ b/src/plugins/cpptools/cppcodestylesettings.h @@ -88,11 +88,10 @@ public: void fromMap(const QString &prefix, const QVariantMap &map); bool equals(const CppCodeStyleSettings &rhs) const; + bool operator==(const CppCodeStyleSettings &s) const { return equals(s); } + bool operator!=(const CppCodeStyleSettings &s) const { return !equals(s); } }; -inline bool operator==(const CppCodeStyleSettings &s1, const CppCodeStyleSettings &s2) { return s1.equals(s2); } -inline bool operator!=(const CppCodeStyleSettings &s1, const CppCodeStyleSettings &s2) { return !s1.equals(s2); } - } // namespace CppTools Q_DECLARE_METATYPE(CppTools::CppCodeStyleSettings) diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h index d160777f21..94526e879d 100644 --- a/src/plugins/cpptools/cppfilesettingspage.h +++ b/src/plugins/cpptools/cppfilesettingspage.h @@ -34,27 +34,20 @@ #define CPPSETTINGSPAGE_H #include <coreplugin/dialogs/ioptionspage.h> + #include <QtCore/QPointer> #include <QtCore/QSharedPointer> #include <QtGui/QWidget> QT_BEGIN_NAMESPACE - -namespace CppTools { -namespace Internal { -namespace Ui { -class CppFileSettingsPage; -} // namespace Ui -} // namespace Internal -} // namespace CppTools - class QSettings; - QT_END_NAMESPACE namespace CppTools { namespace Internal { +namespace Ui { class CppFileSettingsPage; } + struct CppFileSettings { CppFileSettings(); @@ -73,11 +66,10 @@ struct CppFileSettings static QString licenseTemplate(const QString &file = QString(), const QString &className = QString()); bool equals(const CppFileSettings &rhs) const; + bool operator==(const CppFileSettings &s) const { return equals(s); } + bool operator!=(const CppFileSettings &s) const { return !equals(s); } }; -inline bool operator==(const CppFileSettings &s1, const CppFileSettings &s2) { return s1.equals(s2); } -inline bool operator!=(const CppFileSettings &s1, const CppFileSettings &s2) { return !s1.equals(s2); } - class CppFileSettingsWidget : public QWidget { Q_OBJECT @@ -98,7 +90,7 @@ private: inline QString licenseTemplatePath() const; inline void setLicenseTemplatePath(const QString &); - Internal::Ui::CppFileSettingsPage *m_ui; + Ui::CppFileSettingsPage *m_ui; }; class CppFileSettingsPage : public Core::IOptionsPage diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h index c8c726779a..cd7de0b1d8 100644 --- a/src/plugins/debugger/debuggerdialogs.h +++ b/src/plugins/debugger/debuggerdialogs.h @@ -39,14 +39,17 @@ #include <QtGui/QVBoxLayout> QT_BEGIN_NAMESPACE - class QModelIndex; class QPushButton; class QLineEdit; class QDialogButtonBox; +QT_END_NAMESPACE + +namespace ProjectExplorer { class Abi; } namespace Debugger { namespace Internal { + namespace Ui { class AttachCoreDialog; class AttachExternalDialog; @@ -55,17 +58,6 @@ class StartRemoteDialog; class AttachToQmlPortDialog; class StartRemoteEngineDialog; } // namespace Ui -} // namespace Internal -} // namespace Debugger - -QT_END_NAMESPACE - -namespace ProjectExplorer { -class Abi; -} - -namespace Debugger { -namespace Internal { class ProcessListFilterModel; diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index bcbfe40697..b3e0d4085b 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -36,17 +36,7 @@ #include <projectexplorer/abstractprocessstep.h> QT_BEGIN_NAMESPACE - class QListWidgetItem; - -namespace GenericProjectManager { -namespace Internal { -namespace Ui { -class GenericMakeStep; -} // namespace Ui -} // namespace Internal -} // namespace GenericProjectManager - QT_END_NAMESPACE namespace GenericProjectManager { @@ -55,10 +45,12 @@ namespace Internal { class GenericBuildConfiguration; class GenericMakeStepConfigWidget; class GenericMakeStepFactory; +namespace Ui { class GenericMakeStep; } class GenericMakeStep : public ProjectExplorer::AbstractProcessStep { Q_OBJECT + friend class GenericMakeStepConfigWidget; // TODO remove again? friend class GenericMakeStepFactory; diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index 636c20bd8e..0eb608cbc5 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -61,6 +61,7 @@ class ToolChain; namespace GenericProjectManager { namespace Internal { + class GenericBuildConfiguration; class GenericProject; class GenericTarget; diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.h b/src/plugins/genericprojectmanager/genericprojectplugin.h index b75cd03ed0..2dd0692ac3 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.h +++ b/src/plugins/genericprojectmanager/genericprojectplugin.h @@ -39,8 +39,8 @@ #include <QtGui/QAction> namespace ProjectExplorer { - class Project; - class Node; +class Project; +class Node; } namespace GenericProjectManager { @@ -48,7 +48,7 @@ namespace Internal { class ProjectFilesFactory; -class GenericProjectPlugin: public ExtensionSystem::IPlugin +class GenericProjectPlugin : public ExtensionSystem::IPlugin { Q_OBJECT diff --git a/src/plugins/madde/maemodeployconfigurationwidget.h b/src/plugins/madde/maemodeployconfigurationwidget.h index 0cae54b9e3..75e606e87c 100644 --- a/src/plugins/madde/maemodeployconfigurationwidget.h +++ b/src/plugins/madde/maemodeployconfigurationwidget.h @@ -35,18 +35,6 @@ #include <projectexplorer/deployconfiguration.h> -QT_BEGIN_NAMESPACE - -namespace Madde { -namespace Internal { -namespace Ui { -class MaemoDeployConfigurationWidget; -} // namespace Ui -} // namespace Internal -} // namespace Madde - -QT_END_NAMESPACE - namespace RemoteLinux { class DeployableFilesPerProFile; class RemoteLinuxDeployConfigurationWidget; @@ -54,7 +42,10 @@ class RemoteLinuxDeployConfigurationWidget; namespace Madde { namespace Internal { + class Qt4MaemoDeployConfiguration; +namespace Ui { class MaemoDeployConfigurationWidget; } + class MaemoDeployConfigurationWidget : public ProjectExplorer::DeployConfigurationWidget { diff --git a/src/plugins/madde/maemopackagecreationwidget.h b/src/plugins/madde/maemopackagecreationwidget.h index fde0d40e8c..d2c373dddd 100644 --- a/src/plugins/madde/maemopackagecreationwidget.h +++ b/src/plugins/madde/maemopackagecreationwidget.h @@ -34,25 +34,16 @@ #include <projectexplorer/buildstep.h> -QT_BEGIN_NAMESPACE - namespace Madde { namespace Internal { -namespace Ui { -class MaemoPackageCreationWidget; -} // namespace Ui -} // namespace Internal -} // namespace Madde - -QT_END_NAMESPACE -namespace Madde { -namespace Internal { +namespace Ui { class MaemoPackageCreationWidget; } class AbstractMaemoPackageCreationStep; class MaemoPackageCreationWidget : public ProjectExplorer::BuildStepConfigWidget { Q_OBJECT + public: MaemoPackageCreationWidget(AbstractMaemoPackageCreationStep *step); ~MaemoPackageCreationWidget(); diff --git a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h index 6b2295a156..93be0224a1 100644 --- a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h +++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h @@ -29,28 +29,21 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ + #ifndef MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H #define MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H #include <QtCore/QList> #include <QtGui/QWizardPage> -QT_BEGIN_NAMESPACE -namespace Madde { -namespace Internal { -namespace Ui { -class MaemoPublishingWizardPageFremantleFree; -} // namespace Ui -} // namespace Internal -} // namespace Madde -QT_END_NAMESPACE - namespace ProjectExplorer { class Project; } namespace Qt4ProjectManager { class Qt4BuildConfiguration; } namespace Madde { namespace Internal { + class MaemoPublisherFremantleFree; +namespace Ui { class MaemoPublishingWizardPageFremantleFree; } class MaemoPublishingBuildSettingsPageFremantleFree : public QWizardPage { diff --git a/src/plugins/madde/maemopublishingfileselectiondialog.h b/src/plugins/madde/maemopublishingfileselectiondialog.h index cd7df261ac..96d2f505a2 100644 --- a/src/plugins/madde/maemopublishingfileselectiondialog.h +++ b/src/plugins/madde/maemopublishingfileselectiondialog.h @@ -35,18 +35,10 @@ #include <QtCore/QStringList> #include <QtGui/QDialog> -QT_BEGIN_NAMESPACE namespace Madde { namespace Internal { -namespace Ui { -class MaemoPublishingFileSelectionDialog; -} // namespace Ui -} // namespace Internal -} // namespace Madde -QT_END_NAMESPACE -namespace Madde { -namespace Internal { +namespace Ui { class MaemoPublishingFileSelectionDialog; } class MaemoPublishingFileSelectionDialog : public QDialog { diff --git a/src/plugins/madde/maemopublishingresultpagefremantlefree.h b/src/plugins/madde/maemopublishingresultpagefremantlefree.h index c4c9753aae..1370abc5a8 100644 --- a/src/plugins/madde/maemopublishingresultpagefremantlefree.h +++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.h @@ -29,26 +29,17 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ + #ifndef MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H #define MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H #include "maemopublisherfremantlefree.h" #include <QtGui/QWizardPage> -QT_BEGIN_NAMESPACE - namespace Madde { namespace Internal { -namespace Ui { -class MaemoPublishingResultPageFremantleFree; -} // namespace Ui -} // namespace Internal -} // namespace Madde -QT_END_NAMESPACE - -namespace Madde { -namespace Internal { +namespace Ui { class MaemoPublishingResultPageFremantleFree; } class MaemoPublishingResultPageFremantleFree : public QWizardPage { diff --git a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h index c3c546b63f..b054a426c1 100644 --- a/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h +++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h @@ -29,24 +29,17 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ + #ifndef MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H #define MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H #include <QtGui/QWizardPage> -QT_BEGIN_NAMESPACE namespace Madde { namespace Internal { -namespace Ui { -class MaemoPublishingUploadSettingsPageFremantleFree; -} // namespace Ui -} // namespace Internal -} // namespace Madde -QT_END_NAMESPACE -namespace Madde { -namespace Internal { class MaemoPublisherFremantleFree; +namespace Ui { class MaemoPublishingUploadSettingsPageFremantleFree; } class MaemoPublishingUploadSettingsPageFremantleFree : public QWizardPage { diff --git a/src/plugins/madde/maemoqemusettingswidget.h b/src/plugins/madde/maemoqemusettingswidget.h index b54ec1d82d..a12bf1ee3f 100644 --- a/src/plugins/madde/maemoqemusettingswidget.h +++ b/src/plugins/madde/maemoqemusettingswidget.h @@ -34,20 +34,10 @@ #include <QtGui/QWidget> -QT_BEGIN_NAMESPACE - namespace Madde { namespace Internal { -namespace Ui { -class MaemoQemuSettingsWidget; -} // namespace Ui -} // namespace Internal -} // namespace Madde -QT_END_NAMESPACE - -namespace Madde { -namespace Internal { +namespace Ui { class MaemoQemuSettingsWidget; } class MaemoQemuSettingsWidget : public QWidget { diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.h b/src/plugins/qmljseditor/qmljscomponentnamedialog.h index 4ea91267da..b674968362 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.h +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.h @@ -35,20 +35,10 @@ #include <QtGui/QDialog> -QT_BEGIN_NAMESPACE - namespace QmlJSEditor { namespace Internal { -namespace Ui { - class ComponentNameDialog; -} // namespace Ui -} // namespace Internal -} // namespace QmlJSEditor -QT_END_NAMESPACE - -namespace QmlJSEditor { -namespace Internal { +namespace Ui { class ComponentNameDialog; } class ComponentNameDialog : public QDialog { diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h index 86d034130d..7cac6229c4 100644 --- a/src/plugins/qt4projectmanager/makestep.h +++ b/src/plugins/qt4projectmanager/makestep.h @@ -39,18 +39,6 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/task.h> -QT_BEGIN_NAMESPACE - -namespace Qt4ProjectManager { -namespace Internal { -namespace Ui { -class MakeStep; -} // namespace Ui -} // namespace Internal -} // namespace Qt4ProjectManager - -QT_END_NAMESPACE - namespace ProjectExplorer { class BuildStep; class GnuMakeParser; @@ -59,10 +47,13 @@ class Project; } namespace Qt4ProjectManager { + class Qt4BuildConfiguration; namespace Internal { +namespace Ui { class MakeStep; } + class MakeStepFactory : public ProjectExplorer::IBuildStepFactory { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 6ab8b831e9..131d2d3ece 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -38,18 +38,6 @@ #include <QtCore/QStringList> -QT_BEGIN_NAMESPACE - -namespace Qt4ProjectManager { -namespace Internal { -namespace Ui { -class QMakeStep; -} // namespace Ui -} // namespace Internal -} // namespace Qt4ProjectManager - -QT_END_NAMESPACE - namespace ProjectExplorer { class BuildStep; class IBuildStepFactory; @@ -62,6 +50,8 @@ class Qt4Project; namespace Internal { +namespace Ui { class QMakeStep; } + class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h index 7b5977e63a..b117085fdb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h @@ -35,18 +35,6 @@ #include <QtGui/QWizardPage> -QT_BEGIN_NAMESPACE - -namespace Qt4ProjectManager { -namespace Internal { -namespace Ui { -class S60PublishingBuildSettingsPageOvi; -} // namespace Ui -} // namespace Internal -} // namespace Qt4ProjectManager - -QT_END_NAMESPACE - namespace ProjectExplorer { class Project; class BuildConfiguration; @@ -55,13 +43,19 @@ class ToolChain; namespace Qt4ProjectManager { namespace Internal { + +namespace Ui { class S60PublishingBuildSettingsPageOvi; } + class S60PublisherOvi; + class S60PublishingBuildSettingsPageOvi : public QWizardPage { Q_OBJECT + public: - explicit S60PublishingBuildSettingsPageOvi(S60PublisherOvi *publisher, const ProjectExplorer::Project *project, QWidget *parent = 0); + explicit S60PublishingBuildSettingsPageOvi(S60PublisherOvi *publisher, + const ProjectExplorer::Project *project, QWidget *parent = 0); ~S60PublishingBuildSettingsPageOvi(); virtual bool isComplete() const; @@ -80,7 +74,7 @@ private: private: ProjectExplorer::BuildConfiguration *m_bc; ProjectExplorer::ToolChain *m_toolchain; - Ui::S60PublishingBuildSettingsPageOvi * m_ui; + Ui::S60PublishingBuildSettingsPageOvi *m_ui; S60PublisherOvi * const m_publisher; }; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h index 764315c298..95f0342ccb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h @@ -35,25 +35,17 @@ #include <QWizardPage> -QT_BEGIN_NAMESPACE - namespace Qt4ProjectManager { namespace Internal { -namespace Ui { -class S60PublishingResultsPageOvi; -} // namespace Ui -} // namespace Internal -} // namespace Qt4ProjectManager - -QT_END_NAMESPACE -namespace Qt4ProjectManager { -namespace Internal { class S60PublisherOvi; +namespace Ui { class S60PublishingResultsPageOvi; } + class S60PublishingResultsPageOvi : public QWizardPage { Q_OBJECT + public: explicit S60PublishingResultsPageOvi(S60PublisherOvi *publisher, QWidget *parent = 0); ~S60PublishingResultsPageOvi(); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h index a6362b6802..3da6ca4112 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h @@ -36,25 +36,18 @@ #include <QtGui/QWizardPage> QT_BEGIN_NAMESPACE - -namespace Qt4ProjectManager { -namespace Internal { -namespace Ui { -class S60PublishingSisSettingsPageOvi; -} // namespace Ui -} // namespace Internal -} // namespace Qt4ProjectManager - class QLabel; - QT_END_NAMESPACE namespace ProjectExplorer { class Project; } namespace Qt4ProjectManager { namespace Internal { + class S60PublisherOvi; +namespace Ui { class S60PublishingSisSettingsPageOvi; } + class S60PublishingSisSettingsPageOvi : public QWizardPage { Q_OBJECT @@ -75,7 +68,8 @@ private slots: void displayNameChanged(); private: - void reflectSettingState(bool settingState, QLabel *okLabel, QLabel *errorLabel, QLabel *errorReasonLabel, const QString &errorReason); + void reflectSettingState(bool settingState, QLabel *okLabel, + QLabel *errorLabel, QLabel *errorReasonLabel, const QString &errorReason); void showWarningsForUnenforcableChecks(); Ui::S60PublishingSisSettingsPageOvi *ui; diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h index 734e8ffd96..feef8a03a5 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h @@ -39,18 +39,8 @@ #include <QtGui/QWidget> QT_BEGIN_NAMESPACE - class QLineEdit; class QSignalMapper; - -namespace RemoteLinux { -namespace Internal { -namespace Ui { -class LinuxDeviceConfigurationsSettingsWidget; -} // namespace Ui -} // namespace Internal -} // namespace RemoteLinux - QT_END_NAMESPACE namespace RemoteLinux { @@ -59,6 +49,7 @@ class LinuxDeviceConfiguration; class LinuxDeviceConfigurations; namespace Internal { +namespace Ui { class LinuxDeviceConfigurationsSettingsWidget; } class NameValidator; class LinuxDeviceConfigurationsSettingsWidget : public QWidget diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h index 48067132e1..e598e36b8d 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h @@ -29,28 +29,18 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ + #ifndef LINUXDEVICEFACTORYSELECTIONDIALOG_H #define LINUXDEVICEFACTORYSELECTIONDIALOG_H #include <QtCore/QList> #include <QtGui/QDialog> -QT_BEGIN_NAMESPACE - -namespace RemoteLinux { -namespace Internal { -namespace Ui { -class LinuxDeviceFactorySelectionDialog; -} // namespace Ui -} // namespace Internal -} // namespace RemoteLinux - -QT_END_NAMESPACE - namespace RemoteLinux { class ILinuxDeviceConfigurationFactory; namespace Internal { +namespace Ui { class LinuxDeviceFactorySelectionDialog; } class LinuxDeviceFactorySelectionDialog : public QDialog { diff --git a/src/plugins/remotelinux/profilesupdatedialog.h b/src/plugins/remotelinux/profilesupdatedialog.h index 72248bb8cb..8e0ace5116 100644 --- a/src/plugins/remotelinux/profilesupdatedialog.h +++ b/src/plugins/remotelinux/profilesupdatedialog.h @@ -29,6 +29,7 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ + #ifndef PROFILESUPDATEDIALOG_H #define PROFILESUPDATEDIALOG_H @@ -37,22 +38,11 @@ #include <QtCore/QString> #include <QtGui/QDialog> -QT_BEGIN_NAMESPACE - -namespace RemoteLinux { -namespace Internal { -namespace Ui { -class ProFilesUpdateDialog; -} // namespace Ui -} // namespace Internal -} // namespace RemoteLinux - -QT_END_NAMESPACE - namespace RemoteLinux { class DeployableFilesPerProFile; namespace Internal { +namespace Ui { class ProFilesUpdateDialog; } class ProFilesUpdateDialog : public QDialog { diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h index 37bb33ea24..e07b40454b 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.h +++ b/src/plugins/texteditor/codestyleselectorwidget.h @@ -38,25 +38,17 @@ #include <QtGui/QWidget> QT_BEGIN_NAMESPACE - class QHBoxLayout; class QComboBox; class QLabel; class QCheckBox; class QPushButton; - -namespace TextEditor { -namespace Internal { -namespace Ui { -class CodeStyleSelectorWidget; -} // namespace Ui -} // namespace Internal -} // namespace TextEditor - QT_END_NAMESPACE namespace TextEditor { +namespace Internal { namespace Ui { class CodeStyleSelectorWidget; } } + class ICodeStylePreferences; class ICodeStylePreferencesFactory; @@ -70,8 +62,6 @@ public: void setCodeStyle(TextEditor::ICodeStylePreferences *codeStyle); QString searchKeywords() const; -signals: - private slots: void slotComboBoxActivated(int index); void slotCurrentDelegateChanged(TextEditor::ICodeStylePreferences *delegate); diff --git a/src/plugins/texteditor/tabsettingswidget.h b/src/plugins/texteditor/tabsettingswidget.h index 4194cfd052..a8d616fa17 100644 --- a/src/plugins/texteditor/tabsettingswidget.h +++ b/src/plugins/texteditor/tabsettingswidget.h @@ -35,22 +35,12 @@ #include "texteditor_global.h" -QT_BEGIN_NAMESPACE - -namespace TextEditor { -namespace Internal { -namespace Ui { -class TabSettingsWidget; -} // namespace Ui -} // namespace Internal -} // namespace TextEditor - -QT_END_NAMESPACE - #include <QtGui/QWidget> namespace TextEditor { +namespace Internal { namespace Ui { class TabSettingsWidget; } } + class TabSettings; class TEXTEDITOR_EXPORT TabSettingsWidget : public QWidget diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.h b/src/plugins/vcsbase/basecheckoutwizardpage.h index 79faa6cb68..b50dbcdd71 100644 --- a/src/plugins/vcsbase/basecheckoutwizardpage.h +++ b/src/plugins/vcsbase/basecheckoutwizardpage.h @@ -37,24 +37,22 @@ #include <QtGui/QWizardPage> -QT_BEGIN_NAMESPACE - namespace VCSBase { + namespace Internal { namespace Ui { class BaseCheckoutWizardPage; } // namespace Ui } // namespace Internal -} // namespace VCSBase -QT_END_NAMESPACE - -namespace VCSBase { struct BaseCheckoutWizardPagePrivate; -class VCSBASE_EXPORT BaseCheckoutWizardPage : public QWizardPage { +class VCSBASE_EXPORT BaseCheckoutWizardPage : public QWizardPage +{ Q_OBJECT - Q_PROPERTY(bool isBranchSelectorVisible READ isBranchSelectorVisible WRITE setBranchSelectorVisible) + Q_PROPERTY(bool isBranchSelectorVisible READ isBranchSelectorVisible + WRITE setBranchSelectorVisible) + public: BaseCheckoutWizardPage(QWidget *parent = 0); ~BaseCheckoutWizardPage(); @@ -85,21 +83,21 @@ protected: void setDirectoryVisible(bool v); void setBranchSelectorVisible(bool v); - /* Determine a checkout directory name from - * repository URL, that is, "protocol:/project" -> "project". */ + // Determine a checkout directory name from + // repository URL, that is, "protocol:/project" -> "project". virtual QString directoryFromRepository(const QString &r) const; - /* Return list of branches of that repository, defaults to empty. */ + // Return list of branches of that repository, defaults to empty. virtual QStringList branches(const QString &repository, int *current); - /* Add additional controls */ + // Add additional controls. void addLocalControl(QWidget *w); void addLocalControl(QString &description, QWidget *w); void addRepositoryControl(QWidget *w); void addRepositoryControl(QString &description, QWidget *w); - /* Override validity information */ + // Override validity information. virtual bool checkIsValid() const; private slots: diff --git a/src/plugins/vcsbase/commonsettingspage.h b/src/plugins/vcsbase/commonsettingspage.h index c13f556c3d..c4b729dc4d 100644 --- a/src/plugins/vcsbase/commonsettingspage.h +++ b/src/plugins/vcsbase/commonsettingspage.h @@ -40,20 +40,10 @@ #include <QtCore/QPointer> #include <QtGui/QWidget> -QT_BEGIN_NAMESPACE - namespace VCSBase { namespace Internal { -namespace Ui { -class CommonSettingsPage; -} // namespace Ui -} // namespace Internal -} // namespace VCSBase -QT_END_NAMESPACE - -namespace VCSBase { -namespace Internal { +namespace Ui { class CommonSettingsPage; } class CommonSettingsWidget : public QWidget { @@ -96,7 +86,7 @@ signals: private: void updateNickNames(); - CommonSettingsWidget* m_widget; + CommonSettingsWidget *m_widget; CommonVcsSettings m_settings; QString m_searchKeyWords; }; diff --git a/src/plugins/vcsbase/nicknamedialog.h b/src/plugins/vcsbase/nicknamedialog.h index 0f1dc9e6ae..9558fb1e5a 100644 --- a/src/plugins/vcsbase/nicknamedialog.h +++ b/src/plugins/vcsbase/nicknamedialog.h @@ -36,27 +36,21 @@ #include <QtGui/QDialog> QT_BEGIN_NAMESPACE - -namespace VCSBase { -namespace Internal { -namespace Ui { -class NickNameDialog; -} // namespace Ui -} // namespace Internal -} // namespace VCSBase - class QSortFilterProxyModel; class QStandardItemModel; class QModelIndex; class QPushButton; - QT_END_NAMESPACE namespace VCSBase { namespace Internal { -class NickNameDialog : public QDialog { +namespace Ui { class NickNameDialog; } + +class NickNameDialog : public QDialog +{ Q_OBJECT + public: explicit NickNameDialog(QStandardItemModel *model, QWidget *parent = 0); virtual ~NickNameDialog(); @@ -82,7 +76,6 @@ private: Ui::NickNameDialog *m_ui; QStandardItemModel *m_model; QSortFilterProxyModel *m_filterModel; - }; } // namespace Internal |