forked from qt-creator/qt-creator
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:
@@ -37,11 +37,13 @@
|
||||
#include <QMap>
|
||||
#include <QStringList>
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QAction)
|
||||
QT_FORWARD_DECLARE_CLASS(QComboBox)
|
||||
QT_FORWARD_DECLARE_CLASS(QMenu)
|
||||
QT_FORWARD_DECLARE_CLASS(QToolButton)
|
||||
QT_FORWARD_DECLARE_CLASS(QUrl)
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QAction;
|
||||
class QComboBox;
|
||||
class QMenu;
|
||||
class QToolButton;
|
||||
class QUrl;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Core {
|
||||
class IMode;
|
||||
|
||||
@@ -38,10 +38,12 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QHelpSearchEngine)
|
||||
QT_FORWARD_DECLARE_CLASS(QHelpSearchResultWidget)
|
||||
QT_FORWARD_DECLARE_CLASS(QMouseEvent)
|
||||
QT_FORWARD_DECLARE_CLASS(QUrl)
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QHelpSearchEngine;
|
||||
class QHelpSearchResultWidget;
|
||||
class QMouseEvent;
|
||||
class QUrl;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Help {
|
||||
namespace Internal {
|
||||
|
||||
@@ -36,8 +36,10 @@
|
||||
#include <QIcon>
|
||||
#include <QXmlStreamReader>
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QIODevice)
|
||||
QT_FORWARD_DECLARE_CLASS(QStandardItem)
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QIODevice;
|
||||
class QStandardItem;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
class BookmarkModel;
|
||||
|
||||
|
||||
@@ -35,8 +35,10 @@
|
||||
|
||||
#include "profileconfigwidget.h"
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QComboBox)
|
||||
QT_FORWARD_DECLARE_CLASS(QPushButton)
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QComboBox;
|
||||
class QPushButton;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Utils { class PathChooser; }
|
||||
|
||||
|
||||
@@ -39,8 +39,10 @@
|
||||
#include <QObject>
|
||||
#include <QVariantMap>
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QSettings)
|
||||
QT_FORWARD_DECLARE_CLASS(ProFileEvaluator)
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QSettings;
|
||||
class ProFileEvaluator;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace QtSupport {
|
||||
|
||||
@@ -49,6 +51,7 @@ class BaseQtVersion;
|
||||
class QTSUPPORT_EXPORT QtVersionFactory : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit QtVersionFactory(QObject *parent = 0);
|
||||
~QtVersionFactory();
|
||||
@@ -66,5 +69,6 @@ public:
|
||||
static BaseQtVersion *createQtVersionFromLegacySettings(const Utils::FileName &qmakePath, int id, QSettings *s);
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace QtSupport
|
||||
|
||||
#endif // QTVERSIONFACTORY_H
|
||||
|
||||
Reference in New Issue
Block a user