Compile with clang when C++11 support is enabled

[profile/ivi/qtbase.git] / src / gui / text / qcssparser_p.h

diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 86bafc9..0dc4438 100644 (file)
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -1,34 +1,34 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
 **
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
 **
 **
 **
@@ -61,9 +61,11 @@
 #include <QtCore/QMultiHash>
 #include <QtGui/QFont>
 #include <QtGui/QPalette>
-#include <QtGui/QIcon>
 #include <QtCore/QSharedData>
 
+QT_BEGIN_NAMESPACE
+class QIcon;
+QT_END_NAMESPACE
 
 #ifndef QT_NO_CSSPARSER
 
@@ -416,7 +418,7 @@ struct BorderData {
 // 4. QVector<Declaration> - { prop1: value1; prop2: value2; }
 // 5. Declaration - prop1: value1;
 
-struct Q_AUTOTEST_EXPORT Declaration
+struct Q_GUI_EXPORT Declaration
 {
     struct DeclarationData : public QSharedData
     {
@@ -552,7 +554,7 @@ struct BasicSelector
     Relation relationToNext;
 };
 
-struct Q_AUTOTEST_EXPORT Selector
+struct Q_GUI_EXPORT Selector
 {
     QVector<BasicSelector> basicSelectors;
     int specificity() const;
@@ -565,7 +567,7 @@ struct MediaRule;
 struct PageRule;
 struct ImportRule;
 
-struct Q_AUTOTEST_EXPORT ValueExtractor
+struct Q_GUI_EXPORT ValueExtractor
 {
     ValueExtractor(const QVector<Declaration> &declarations, const QPalette & = QPalette());
 
@@ -633,7 +635,7 @@ enum StyleSheetOrigin {
     StyleSheetOrigin_Inline
 };
 
-struct StyleSheet
+struct Q_GUI_EXPORT StyleSheet
 {
     StyleSheet() : origin(StyleSheetOrigin_Unspecified), depth(0) { }
     QVector<StyleRule> styleRules;  //only contains rules that are not indexed
@@ -739,7 +741,7 @@ struct Q_GUI_EXPORT Symbol
     QString lexem() const;
 };
 
-class Q_AUTOTEST_EXPORT Scanner
+class Q_GUI_EXPORT Scanner
 {
 public:
     static QString preprocess(const QString &input, bool *hasEscapeSequences = 0);
@@ -822,7 +824,7 @@ public:
         return (index - 1) < symbols.count() ? symbols.at(index - 1).token : NONE;
     }
 
-    bool testTokenAndEndsWith(TokenType t, const QLatin1String &str);
+    bool testTokenAndEndsWith(TokenType t, QLatin1String str);
 
     inline bool recordError() { errorIndex = index; return false; }