Commit f012bf44 authored by hjk's avatar hjk Committed by hjk

compile fix with namespaces

Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 4ba95878
...@@ -37,23 +37,12 @@ ...@@ -37,23 +37,12 @@
#include <QtGui/QDialog> #include <QtGui/QDialog>
QT_BEGIN_NAMESPACE namespace Utils { class SshConnectionParameters; }
namespace Analyzer { namespace Analyzer {
namespace Internal {
namespace Ui {
class StartRemoteDialog;
} // namespace Ui
} // namespace Internal
} // namespace Analyzer
QT_END_NAMESPACE
namespace Utils { namespace Internal { namespace Ui { class StartRemoteDialog; } }
class SshConnectionParameters;
}
namespace Analyzer {
class ANALYZER_EXPORT StartRemoteDialog : public QDialog class ANALYZER_EXPORT StartRemoteDialog : public QDialog
{ {
......
...@@ -41,13 +41,6 @@ QT_BEGIN_NAMESPACE ...@@ -41,13 +41,6 @@ QT_BEGIN_NAMESPACE
class QLineEdit; class QLineEdit;
class QTreeWidget; class QTreeWidget;
class QTreeWidgetItem; class QTreeWidgetItem;
namespace Core {
namespace Internal {
namespace Ui {
class CommandMappings;
} // namespace Ui
} // namespace Internal
} // namespace Core
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Core { namespace Core {
...@@ -56,6 +49,8 @@ class Command; ...@@ -56,6 +49,8 @@ class Command;
namespace Internal { namespace Internal {
namespace Ui { class CommandMappings; }
class ActionManagerPrivate; class ActionManagerPrivate;
class MainWindow; class MainWindow;
......
...@@ -43,23 +43,14 @@ class QLineEdit; ...@@ -43,23 +43,14 @@ class QLineEdit;
class QTextEdit; class QTextEdit;
class QPlainTextEdit; class QPlainTextEdit;
class QListWidgetItem; class QListWidgetItem;
namespace Core {
namespace Internal {
namespace Ui {
class VariableChooser;
} // namespace Ui
} // namespace Internal
} // namespace Core
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Utils { namespace Utils { class IconButton; }
class IconButton;
} // namespace Utils
namespace Core { namespace Core {
namespace Internal { namespace Ui { class VariableChooser; } }
class CORE_EXPORT VariableChooser : public QWidget class CORE_EXPORT VariableChooser : public QWidget
{ {
Q_OBJECT Q_OBJECT
...@@ -90,4 +81,5 @@ private: ...@@ -90,4 +81,5 @@ private:
}; };
} // namespace Core } // namespace Core
#endif // VARIABLECHOOSER_H #endif // VARIABLECHOOSER_H
...@@ -36,18 +36,10 @@ ...@@ -36,18 +36,10 @@
#include <texteditor/completionsettings.h> #include <texteditor/completionsettings.h>
#include <texteditor/texteditoroptionspage.h> #include <texteditor/texteditoroptionspage.h>
QT_BEGIN_NAMESPACE
namespace CppTools { namespace CppTools {
namespace Internal { namespace Internal {
namespace Ui {
class CompletionSettingsPage;
} // namespace Ui
} // namespace Internal
} // namespace CppTools
QT_END_NAMESPACE
namespace CppTools { namespace Ui { class CompletionSettingsPage; }
namespace Internal {
// TODO: Move this class to the text editor plugin // TODO: Move this class to the text editor plugin
......
...@@ -88,11 +88,10 @@ public: ...@@ -88,11 +88,10 @@ public:
void fromMap(const QString &prefix, const QVariantMap &map); void fromMap(const QString &prefix, const QVariantMap &map);
bool equals(const CppCodeStyleSettings &rhs) const; 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 } // namespace CppTools
Q_DECLARE_METATYPE(CppTools::CppCodeStyleSettings) Q_DECLARE_METATYPE(CppTools::CppCodeStyleSettings)
......
...@@ -34,27 +34,20 @@ ...@@ -34,27 +34,20 @@
#define CPPSETTINGSPAGE_H #define CPPSETTINGSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include <QtGui/QWidget> #include <QtGui/QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace CppTools {
namespace Internal {
namespace Ui {
class CppFileSettingsPage;
} // namespace Ui
} // namespace Internal
} // namespace CppTools
class QSettings; class QSettings;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace CppTools { namespace CppTools {
namespace Internal { namespace Internal {
namespace Ui { class CppFileSettingsPage; }
struct CppFileSettings struct CppFileSettings
{ {
CppFileSettings(); CppFileSettings();
...@@ -73,11 +66,10 @@ struct CppFileSettings ...@@ -73,11 +66,10 @@ struct CppFileSettings
static QString licenseTemplate(const QString &file = QString(), const QString &className = QString()); static QString licenseTemplate(const QString &file = QString(), const QString &className = QString());
bool equals(const CppFileSettings &rhs) const; 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 class CppFileSettingsWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
...@@ -98,7 +90,7 @@ private: ...@@ -98,7 +90,7 @@ private:
inline QString licenseTemplatePath() const; inline QString licenseTemplatePath() const;
inline void setLicenseTemplatePath(const QString &); inline void setLicenseTemplatePath(const QString &);
Internal::Ui::CppFileSettingsPage *m_ui; Ui::CppFileSettingsPage *m_ui;
}; };
class CppFileSettingsPage : public Core::IOptionsPage class CppFileSettingsPage : public Core::IOptionsPage
......
...@@ -39,14 +39,17 @@ ...@@ -39,14 +39,17 @@
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QModelIndex; class QModelIndex;
class QPushButton; class QPushButton;
class QLineEdit; class QLineEdit;
class QDialogButtonBox; class QDialogButtonBox;
QT_END_NAMESPACE
namespace ProjectExplorer { class Abi; }
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
namespace Ui { namespace Ui {
class AttachCoreDialog; class AttachCoreDialog;
class AttachExternalDialog; class AttachExternalDialog;
...@@ -55,17 +58,6 @@ class StartRemoteDialog; ...@@ -55,17 +58,6 @@ class StartRemoteDialog;
class AttachToQmlPortDialog; class AttachToQmlPortDialog;
class StartRemoteEngineDialog; class StartRemoteEngineDialog;
} // namespace Ui } // namespace Ui
} // namespace Internal
} // namespace Debugger
QT_END_NAMESPACE
namespace ProjectExplorer {
class Abi;
}
namespace Debugger {
namespace Internal {
class ProcessListFilterModel; class ProcessListFilterModel;
......
...@@ -36,17 +36,7 @@ ...@@ -36,17 +36,7 @@
#include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/abstractprocessstep.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QListWidgetItem; class QListWidgetItem;
namespace GenericProjectManager {
namespace Internal {
namespace Ui {
class GenericMakeStep;
} // namespace Ui
} // namespace Internal
} // namespace GenericProjectManager
QT_END_NAMESPACE QT_END_NAMESPACE
namespace GenericProjectManager { namespace GenericProjectManager {
...@@ -55,10 +45,12 @@ namespace Internal { ...@@ -55,10 +45,12 @@ namespace Internal {
class GenericBuildConfiguration; class GenericBuildConfiguration;
class GenericMakeStepConfigWidget; class GenericMakeStepConfigWidget;
class GenericMakeStepFactory; class GenericMakeStepFactory;
namespace Ui { class GenericMakeStep; }
class GenericMakeStep : public ProjectExplorer::AbstractProcessStep class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
{ {
Q_OBJECT Q_OBJECT
friend class GenericMakeStepConfigWidget; // TODO remove again? friend class GenericMakeStepConfigWidget; // TODO remove again?
friend class GenericMakeStepFactory; friend class GenericMakeStepFactory;
......
...@@ -61,6 +61,7 @@ class ToolChain; ...@@ -61,6 +61,7 @@ class ToolChain;
namespace GenericProjectManager { namespace GenericProjectManager {
namespace Internal { namespace Internal {
class GenericBuildConfiguration; class GenericBuildConfiguration;
class GenericProject; class GenericProject;
class GenericTarget; class GenericTarget;
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include <QtGui/QAction> #include <QtGui/QAction>
namespace ProjectExplorer { namespace ProjectExplorer {
class Project; class Project;
class Node; class Node;
} }
namespace GenericProjectManager { namespace GenericProjectManager {
...@@ -48,7 +48,7 @@ namespace Internal { ...@@ -48,7 +48,7 @@ namespace Internal {
class ProjectFilesFactory; class ProjectFilesFactory;
class GenericProjectPlugin: public ExtensionSystem::IPlugin class GenericProjectPlugin : public ExtensionSystem::IPlugin
{ {
Q_OBJECT Q_OBJECT
......
...@@ -35,18 +35,6 @@ ...@@ -35,18 +35,6 @@
#include <projectexplorer/deployconfiguration.h> #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 { namespace RemoteLinux {
class DeployableFilesPerProFile; class DeployableFilesPerProFile;
class RemoteLinuxDeployConfigurationWidget; class RemoteLinuxDeployConfigurationWidget;
...@@ -54,7 +42,10 @@ class RemoteLinuxDeployConfigurationWidget; ...@@ -54,7 +42,10 @@ class RemoteLinuxDeployConfigurationWidget;
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
class Qt4MaemoDeployConfiguration; class Qt4MaemoDeployConfiguration;
namespace Ui { class MaemoDeployConfigurationWidget; }
class MaemoDeployConfigurationWidget : public ProjectExplorer::DeployConfigurationWidget class MaemoDeployConfigurationWidget : public ProjectExplorer::DeployConfigurationWidget
{ {
......
...@@ -34,25 +34,16 @@ ...@@ -34,25 +34,16 @@
#include <projectexplorer/buildstep.h> #include <projectexplorer/buildstep.h>
QT_BEGIN_NAMESPACE
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
namespace Ui {
class MaemoPackageCreationWidget;
} // namespace Ui
} // namespace Internal
} // namespace Madde
QT_END_NAMESPACE
namespace Madde { namespace Ui { class MaemoPackageCreationWidget; }
namespace Internal {
class AbstractMaemoPackageCreationStep; class AbstractMaemoPackageCreationStep;
class MaemoPackageCreationWidget : public ProjectExplorer::BuildStepConfigWidget class MaemoPackageCreationWidget : public ProjectExplorer::BuildStepConfigWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
MaemoPackageCreationWidget(AbstractMaemoPackageCreationStep *step); MaemoPackageCreationWidget(AbstractMaemoPackageCreationStep *step);
~MaemoPackageCreationWidget(); ~MaemoPackageCreationWidget();
......
...@@ -29,28 +29,21 @@ ...@@ -29,28 +29,21 @@
** Nokia at qt-info@nokia.com. ** Nokia at qt-info@nokia.com.
** **
**************************************************************************/ **************************************************************************/
#ifndef MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H #ifndef MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H
#define MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H #define MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H
#include <QtCore/QList> #include <QtCore/QList>
#include <QtGui/QWizardPage> #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 ProjectExplorer { class Project; }
namespace Qt4ProjectManager { class Qt4BuildConfiguration; } namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
class MaemoPublisherFremantleFree; class MaemoPublisherFremantleFree;
namespace Ui { class MaemoPublishingWizardPageFremantleFree; }
class MaemoPublishingBuildSettingsPageFremantleFree : public QWizardPage class MaemoPublishingBuildSettingsPageFremantleFree : public QWizardPage
{ {
......
...@@ -35,18 +35,10 @@ ...@@ -35,18 +35,10 @@
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtGui/QDialog> #include <QtGui/QDialog>
QT_BEGIN_NAMESPACE
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
namespace Ui {
class MaemoPublishingFileSelectionDialog;
} // namespace Ui
} // namespace Internal
} // namespace Madde
QT_END_NAMESPACE
namespace Madde { namespace Ui { class MaemoPublishingFileSelectionDialog; }
namespace Internal {
class MaemoPublishingFileSelectionDialog : public QDialog class MaemoPublishingFileSelectionDialog : public QDialog
{ {
......
...@@ -29,26 +29,17 @@ ...@@ -29,26 +29,17 @@
** Nokia at qt-info@nokia.com. ** Nokia at qt-info@nokia.com.
** **
**************************************************************************/ **************************************************************************/
#ifndef MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H #ifndef MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H
#define MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H #define MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H
#include "maemopublisherfremantlefree.h" #include "maemopublisherfremantlefree.h"
#include <QtGui/QWizardPage> #include <QtGui/QWizardPage>
QT_BEGIN_NAMESPACE
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
namespace Ui {
class MaemoPublishingResultPageFremantleFree;
} // namespace Ui
} // namespace Internal
} // namespace Madde
QT_END_NAMESPACE namespace Ui { class MaemoPublishingResultPageFremantleFree; }
namespace Madde {
namespace Internal {
class MaemoPublishingResultPageFremantleFree : public QWizardPage class MaemoPublishingResultPageFremantleFree : public QWizardPage
{ {
......
...@@ -29,24 +29,17 @@ ...@@ -29,24 +29,17 @@
** Nokia at qt-info@nokia.com. ** Nokia at qt-info@nokia.com.
** **
**************************************************************************/ **************************************************************************/
#ifndef MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H #ifndef MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H
#define MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H #define MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H
#include <QtGui/QWizardPage> #include <QtGui/QWizardPage>
QT_BEGIN_NAMESPACE
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
namespace Ui {
class MaemoPublishingUploadSettingsPageFremantleFree;
} // namespace Ui
} // namespace Internal
} // namespace Madde
QT_END_NAMESPACE
namespace Madde {
namespace Internal {
class MaemoPublisherFremantleFree; class MaemoPublisherFremantleFree;
namespace Ui { class MaemoPublishingUploadSettingsPageFremantleFree; }
class MaemoPublishingUploadSettingsPageFremantleFree : public QWizardPage class MaemoPublishingUploadSettingsPageFremantleFree : public QWizardPage
{ {
......
...@@ -34,20 +34,10 @@ ...@@ -34,20 +34,10 @@
#include <QtGui/QWidget> #include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
namespace Ui {
class MaemoQemuSettingsWidget;
} // namespace Ui
} // namespace Internal
} // namespace Madde
QT_END_NAMESPACE namespace Ui { class MaemoQemuSettingsWidget; }
namespace Madde {
namespace Internal {
class MaemoQemuSettingsWidget : public QWidget class MaemoQemuSettingsWidget : public QWidget
{ {
......
...@@ -35,20 +35,10 @@ ...@@ -35,20 +35,10 @@
#include <QtGui/QDialog> #include <QtGui/QDialog>
QT_BEGIN_NAMESPACE
namespace QmlJSEditor { namespace QmlJSEditor {
namespace Internal { namespace Internal {
namespace Ui {
class ComponentNameDialog;
} // namespace Ui
} // namespace Internal
} // namespace QmlJSEditor
QT_END_NAMESPACE namespace Ui { class ComponentNameDialog; }
namespace QmlJSEditor {
namespace Internal {
class ComponentNameDialog : public QDialog class ComponentNameDialog : public QDialog
{ {
......
...@@ -39,18 +39,6 @@ ...@@ -39,18 +39,6 @@
#include <projectexplorer/buildstep.h>