Changeset 561 for trunk/src/opengl/util/generator.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/util/generator.cpp (modified) (7 diffs)

trunk/src/opengl/util/generator.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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 version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -49 +49 @@
 
 #include <QtDebug>
+#include <cstdlib>
 
 QT_BEGIN_NAMESPACE
 
 QT_USE_NAMESPACE
+
+#define TAB "    "
 
 typedef QPair<QString, QString> QStringPair;
@@ -117 +120 @@
 
         if (lineStream.atEnd()) {
-            qDebug() << "Error in file" << confFile << "(" << enumerator << ")";
+            qDebug() << "Error in file" << confFile << '(' << enumerator << ')';
             exit(0);
         }
@@ -243 +246 @@
 }
 
+void writeVariablesEnum(QTextStream &out, const char *name, const QSet<QString> &s)
+{
+    out << "enum " << name << " {";
+    QSet<QString>::const_iterator it = s.begin();
+    if (it != s.end()) {
+        out << "\n" TAB "VAR_" << it->toUpper();
+        for (++it; it != s.end(); ++it)
+            out << ",\n" TAB "VAR_" << it->toUpper();
+    }
+    out << "\n};\n\n";
+}
+
+void writeTypesEnum(QTextStream &out, const char *name, const QList<QStringPair> &s)
+{
+    out << "enum " << name << " {";
+    QList<QStringPair>::const_iterator it = s.begin();
+    if (it != s.end()) {
+        out << "\n" TAB << it->first;
+        for (++it; it != s.end(); ++it)
+            out << ",\n" TAB << it->first;
+    }
+    out << "\n};\n\n";
+}
+
 void writeIncludeFile(const QSet<QString> &variables,
                       const QList<QStringPair> &brushes,
@@ -257 +284 @@
     QTextStream out(&includeFile);
 
-    QLatin1String tab("    ");
-
-    out << "#ifndef FRAGMENTPROGRAMS_H\n"
-        << "#define FRAGMENTPROGRAMS_H\n\n";
-
-    out << "enum FragmentVariable {\n";
-    foreach (QString str, variables)
-        out << tab << "VAR_" << str.toUpper() << ",\n";
-    out << "};\n\n";
-
-    out << "enum FragmentBrushType {\n";
-    foreach (QStringPair brush, brushes)
-        out << tab << brush.first << ",\n";
-    out << "};\n\n";
-
-    out << "enum FragmentCompositionModeType {\n";
-    foreach (QStringPair mode, compositionModes)
-        out << tab << mode.first << ",\n";
-    out << "};\n\n";
-
-    out << "enum FragmentMaskType {\n";
-    foreach (QStringPair mask, masks)
-        out << tab << mask.first << ",\n";
-    out << "};\n\n";
+    QLatin1String tab(TAB);
+
+    out << "/****************************************************************************\n"
+           "**\n"
+           "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+           "** All rights reserved.\n"
+           "** Contact: Nokia Corporation (qt-info@nokia.com)\n"
+           "**\n"
+           "** This file is part of the QtOpenGL module of the Qt Toolkit.\n"
+           "**\n"
+           "** $QT_BEGIN_LICENSE:LGPL$\n"
+           "** Commercial Usage\n"
+           "** Licensees holding valid Qt Commercial licenses may use this file in\n"
+           "** accordance with the Qt Commercial License Agreement provided with the\n"
+           "** Software or, alternatively, in accordance with the terms contained in\n"
+           "** a written agreement between you and Nokia.\n"
+           "**\n"
+           "** GNU Lesser General Public License Usage\n"
+           "** Alternatively, this file may be used under the terms of the GNU Lesser\n"
+           "** General Public License version 2.1 as published by the Free Software\n"
+           "** Foundation and appearing in the file LICENSE.LGPL included in the\n"
+           "** packaging of this file.  Please review the following information to\n"
+           "** ensure the GNU Lesser General Public License version 2.1 requirements\n"
+           "** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
+           "**\n"
+           "** In addition, as a special exception, Nokia gives you certain additional\n"
+           "** rights.  These rights are described in the Nokia Qt LGPL Exception\n"
+           "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n"
+           "**\n"
+           "** GNU General Public License Usage\n"
+           "** Alternatively, this file may be used under the terms of the GNU\n"
+           "** General Public License version 3.0 as published by the Free Software\n"
+           "** Foundation and appearing in the file LICENSE.GPL included in the\n"
+           "** packaging of this file.  Please review the following information to\n"
+           "** ensure the GNU General Public License version 3.0 requirements will be\n"
+           "** met: http://www.gnu.org/copyleft/gpl.html.\n"
+           "**\n"
+           "** If you have questions regarding the use of this file, please contact\n"
+           "** Nokia at qt-info@nokia.com.\n"
+           "** $QT_END_LICENSE$\n"
+           "**\n"
+           "****************************************************************************/\n"
+           "\n"
+           "#ifndef FRAGMENTPROGRAMS_P_H\n"
+           "#define FRAGMENTPROGRAMS_P_H\n"
+           "\n"
+           "//\n"
+           "//  W A R N I N G\n"
+           "//  -------------\n"
+           "//\n"
+           "// This file is not part of the Qt API.  It exists purely as an\n"
+           "// implementation detail.  This header file may change from version to\n"
+           "// version without notice, or even be removed.\n"
+           "//\n"
+           "// We mean it.\n"
+           "//\n"
+           "\n";
+
+    writeVariablesEnum(out, "FragmentVariable", variables);
+    writeTypesEnum(out, "FragmentBrushType", brushes);
+    writeTypesEnum(out, "FragmentCompositionModeType", compositionModes);
+    writeTypesEnum(out, "FragmentMaskType", masks);
 
     out << "static const unsigned int num_fragment_variables = " << variables.size() << ";\n\n";