use QT_BEGIN_NAMESPACE instead of QT_FORWARD_DECLARE_CLASS

Less confusing to the highlighter.

Change-Id: I1c5f232da42b18d43f6c14b5907eb8feb48de2b4
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-07-17 16:37:01 +02:00
parent 441c652ce5
commit b44e0e1a23
5 changed files with 28 additions and 16 deletions

View File

@@ -37,11 +37,13 @@
#include <QMap> #include <QMap>
#include <QStringList> #include <QStringList>
QT_FORWARD_DECLARE_CLASS(QAction) QT_BEGIN_NAMESPACE
QT_FORWARD_DECLARE_CLASS(QComboBox) class QAction;
QT_FORWARD_DECLARE_CLASS(QMenu) class QComboBox;
QT_FORWARD_DECLARE_CLASS(QToolButton) class QMenu;
QT_FORWARD_DECLARE_CLASS(QUrl) class QToolButton;
class QUrl;
QT_END_NAMESPACE
namespace Core { namespace Core {
class IMode; class IMode;

View File

@@ -38,10 +38,12 @@
#include <QWidget> #include <QWidget>
QT_FORWARD_DECLARE_CLASS(QHelpSearchEngine) QT_BEGIN_NAMESPACE
QT_FORWARD_DECLARE_CLASS(QHelpSearchResultWidget) class QHelpSearchEngine;
QT_FORWARD_DECLARE_CLASS(QMouseEvent) class QHelpSearchResultWidget;
QT_FORWARD_DECLARE_CLASS(QUrl) class QMouseEvent;
class QUrl;
QT_END_NAMESPACE
namespace Help { namespace Help {
namespace Internal { namespace Internal {

View File

@@ -36,8 +36,10 @@
#include <QIcon> #include <QIcon>
#include <QXmlStreamReader> #include <QXmlStreamReader>
QT_FORWARD_DECLARE_CLASS(QIODevice) QT_BEGIN_NAMESPACE
QT_FORWARD_DECLARE_CLASS(QStandardItem) class QIODevice;
class QStandardItem;
QT_END_NAMESPACE
class BookmarkModel; class BookmarkModel;

View File

@@ -35,8 +35,10 @@
#include "profileconfigwidget.h" #include "profileconfigwidget.h"
QT_FORWARD_DECLARE_CLASS(QComboBox) QT_BEGIN_NAMESPACE
QT_FORWARD_DECLARE_CLASS(QPushButton) class QComboBox;
class QPushButton;
QT_END_NAMESPACE
namespace Utils { class PathChooser; } namespace Utils { class PathChooser; }

View File

@@ -39,8 +39,10 @@
#include <QObject> #include <QObject>
#include <QVariantMap> #include <QVariantMap>
QT_FORWARD_DECLARE_CLASS(QSettings) QT_BEGIN_NAMESPACE
QT_FORWARD_DECLARE_CLASS(ProFileEvaluator) class QSettings;
class ProFileEvaluator;
QT_END_NAMESPACE
namespace QtSupport { namespace QtSupport {
@@ -49,6 +51,7 @@ class BaseQtVersion;
class QTSUPPORT_EXPORT QtVersionFactory : public QObject class QTSUPPORT_EXPORT QtVersionFactory : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit QtVersionFactory(QObject *parent = 0); explicit QtVersionFactory(QObject *parent = 0);
~QtVersionFactory(); ~QtVersionFactory();
@@ -66,5 +69,6 @@ public:
static BaseQtVersion *createQtVersionFromLegacySettings(const Utils::FileName &qmakePath, int id, QSettings *s); static BaseQtVersion *createQtVersionFromLegacySettings(const Utils::FileName &qmakePath, int id, QSettings *s);
}; };
} } // namespace QtSupport
#endif // QTVERSIONFACTORY_H #endif // QTVERSIONFACTORY_H