Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

doc/example/textfinder/main.cpp

@@ -26,13 +26,15 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <QtGui/QApplication>
+
 #include "textfinder.h"
 
+#include <QtGui/QApplication>
+
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(textfinder);

doc/example/textfinder/textfinder.cpp

@@ -26,14 +26,16 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <QtGui/QMessageBox>
+
+#include "textfinder.h"
+
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
-#include "textfinder.h"
+#include <QtGui/QMessageBox>
 
 TextFinder::TextFinder(QWidget *parent, Qt::WFlags flags)
     : QWidget(parent, flags)

doc/example/textfinder/textfinder.h

@@ -26,16 +26,18 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef TEXTFINDER_H
 #define TEXTFINDER_H
 
-#include <QtGui/QWidget>
 #include "ui_textfinder.h"
 
+#include <QtGui/QWidget>
+
 class QPushButton;
 class QTextEdit;
 class QLineEdit;

doc/qtcreator.qdoc

@@ -788,31 +788,31 @@
     \table
         \row
             \i \bold{Note:}
-            \i  Gdb, and therefore Qt Creator's debugger works for optimized builds
+
-    on Linux and Mac OS X. However, optimization may lead to re-ordering of
+            \i  Gdb, and therefore Qt Creator's debugger works for optimized
-    instructions or sometimes even complete removal of some local variables.
+                builds on Linux and Mac OS X. However, optimization may lead
-    In this case, the \gui{Locals and Watchers} view may show unexpected data.
+                to re-ordering of instructions or sometimes even complete
+                removal of some local variables. In this case, the
+                \gui{Locals and Watchers} view may show unexpected data.
+
+            \i  The debug information provided by gcc does not include enough
+                information about the time when a variable is initialized.
+                Qt Creator therefore can not tell whether the contents of a
+                local variable contains "real data", or "initial noise". If a
+                QObject appears uninitialized, its value will be reported as
+                "out of scope". However, not all uninitialized objects can be
+                recognized as such.
     \endtable
 
-    \note 
 
-    \bold{Note:} The debug information provided by gcc does not include 
+    The \gui{Locals and Watchers} view also provides access to the most
-    enough information about the time at which a variable is initialized.
+    powerful feature of the debugger: comprehensive display of data belonging
-    Qt Creator therefore can not tell whether the contents of a local
+    to Qt's basic objects. To enable this feature, select \gui{Use Custom
-    variable contains "real data", or "initial noise". If an QObject
+    Display for Qt Objects} from the \gui Debug menu.The
-    appears uninitialized, its value will be reported as "out of scope".
+    \gui{Locals and Watchers} view will be re-organized to provide a high-level
-    Not all uninitialized objects can be recognized as such, though.
+    view of the objects. For example, in case of QObject, instead of displaying
-
+    a pointer to some private data structure, you will see a list of children,
-    The \gui{Locals and Watchers View} also gives accesst to the most powerful
+    signals and slots.
-    feature of the Qt Creator Debugger: The comprehensive display of data
-    of objects of some of Qt's basic classes.
-
-    To start using that feature, select \gui{Debug} and \gui{Use Custom
-    Display for Qt Objects}. The \gui{Locals and Watchers View} will
-    be re-organized to give a more high-level view of the objects
-    in question. So instead of displaying a pointer to some private
-    data structure in case of QObject, a list of children, signals
-    and slots will be shown. 
 
     Similarily, instead of showing a bunch of pointers and ints,
     a QHash or QMap will display its contents in an orderly fashion,

installer/installer.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

installer/qinstaller.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

installer/qinstaller.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

installer/qinstallergui.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

installer/qinstallergui.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

shared/cpaster/cgi.cpp

@@ -26,17 +26,18 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cgi.h"
 
 #include <QByteArray>
 
-// -------------------------------------------------------------------------------------------------
 
 const char *cgi_chars = "0123456789abcdef"; // RFC 1738 suggests lower-case to be optimal
+
 QString CGI::encodeURL(const QString &rawText)
 {
     QByteArray utf = rawText.toUtf8();
@@ -424,5 +425,3 @@ QString CGI::encodeHTML(const QString &rawText, int conversionFlags)
     return enc;
 }
 
-// -------------------------------------------------------------------------------------------------
-

shared/cpaster/cgi.h

@@ -26,12 +26,14 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef _CGI_H_
+
-#define _CGI_H_
+#ifndef CGI_H
+#define CGI_H
+
 #include <QString>
 
 class CGI
@@ -54,5 +56,4 @@ private:
     inline QChar hexToChar(const QString &hx);
 };
 
-#endif // _CGI_H_
+#endif // CGI_H
-

shared/cpaster/fetcher.cpp

@@ -26,10 +26,11 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "fetcher.h"
 #include "cgi.h"
 
@@ -44,7 +45,7 @@ Fetcher::Fetcher(const QString &host)
     m_status = 0;
     m_hadError = false;
     connect(this, SIGNAL(requestFinished(int,bool)), SLOT(gotRequestFinished(int,bool)));
-    connect(this, SIGNAL(readyRead(const QHttpResponseHeader &)), SLOT(gotReadyRead(const QHttpResponseHeader &)));
+    connect(this, SIGNAL(readyRead(QHttpResponseHeader)), SLOT(gotReadyRead(QHttpResponseHeader)));
 }
 
 int Fetcher::fetch(const QString &url)

shared/cpaster/fetcher.h

@@ -26,16 +26,16 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FETCHER_H
 #define FETCHER_H
 
 #include <QHttp>
 #include <QHttpResponseHeader>
-
 #include <QString>
 
 class Fetcher : public QHttp

shared/cpaster/poster.cpp

@@ -26,10 +26,11 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "poster.h"
 #include "cgi.h"
 
@@ -43,7 +44,7 @@ Poster::Poster(const QString &host)
     m_status = 0;
     m_hadError = false;
     connect(this, SIGNAL(requestFinished(int,bool)), SLOT(gotRequestFinished(int,bool)));
-    connect(this, SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)), SLOT(gotResponseHeaderReceived(const QHttpResponseHeader &)));
+    connect(this, SIGNAL(responseHeaderReceived(QHttpResponseHeader)), SLOT(gotResponseHeaderReceived(QHttpResponseHeader)));
 }
 
 void Poster::post(const QString &description, const QString &comment,

shared/cpaster/poster.h

@@ -26,16 +26,16 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef POSTER_H
 #define POSTER_H
 
 #include <QHttp>
 #include <QHttpResponseHeader>
-
 #include <QString>
 
 class Poster : public QHttp

shared/cpaster/splitter.cpp

@@ -26,11 +26,13 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "splitter.h"
+
 #include <QRegExp>
 
 FileDataList splitDiffToFiles(const QByteArray &data)

shared/cpaster/splitter.h

@@ -26,16 +26,17 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SPLITTER_H
 #define SPLITTER_H
 
-#include <QString>
 #include <QByteArray>
 #include <QList>
+#include <QString>
 
 struct FileData
 {

shared/cpaster/view.cpp

@@ -26,10 +26,11 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "view.h"
 
 #include <QFontMetrics>
@@ -38,7 +39,6 @@
 #include <QPushButton>
 #include <QSettings>
 
-// -------------------------------------------------------------------------------------------------
 class ColumnIndicatorTextEdit : public QTextEdit
 {
 public:

shared/cpaster/view.h

@@ -26,10 +26,11 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef VIEW_H
 #define VIEW_H
 
@@ -63,4 +64,3 @@ private:
 };
 
 #endif // VIEW_H
-

shared/cplusplus/AST.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/AST.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/ASTVisitor.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/ASTVisitor.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/ASTfwd.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Array.cpp

@@ -26,28 +26,9 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
 
 #include "Array.h"

shared/cplusplus/Array.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CPlusPlusForwardDeclarations.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckDeclaration.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckDeclaration.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckDeclarator.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckDeclarator.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckExpression.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckExpression.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckName.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckName.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckSpecifier.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckSpecifier.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckStatement.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CheckStatement.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Control.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Control.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CoreTypes.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/CoreTypes.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/DiagnosticClient.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/DiagnosticClient.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/FullySpecifiedType.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/FullySpecifiedType.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Keywords.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Lexer.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Lexer.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/LiteralTable.cpp

@@ -26,28 +26,9 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
 
 #include "LiteralTable.h"

shared/cplusplus/LiteralTable.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Literals.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Literals.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/MemoryPool.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/MemoryPool.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Name.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Name.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/NameVisitor.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/NameVisitor.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Names.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Names.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Parser.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Parser.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Scope.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Scope.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Semantic.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Semantic.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/SemanticCheck.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/SemanticCheck.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Symbol.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Symbol.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/SymbolVisitor.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/SymbolVisitor.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Symbols.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Symbols.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Token.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Token.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/TranslationUnit.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/TranslationUnit.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Type.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/Type.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/TypeVisitor.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/cplusplus/TypeVisitor.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 // Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>

shared/designerintegrationv2/formresizer.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 #include "formresizer.h"

shared/designerintegrationv2/formresizer.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 #ifndef FORMRESIZER_H

shared/designerintegrationv2/sizehandlerect.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 #include "sizehandlerect.h"

shared/designerintegrationv2/sizehandlerect.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 #ifndef SIZEHANDLERECT_H

shared/designerintegrationv2/widgethost.cpp

@@ -26,10 +26,11 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "widgethost.h"
 #include "formresizer.h"
 #include "widgethostconstants.h"

shared/designerintegrationv2/widgethost.h

@@ -26,10 +26,11 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef WIDGETHOST_H
 #define WIDGETHOST_H
 
@@ -80,4 +81,3 @@ private:
 } // namespace SharedTools
 
 #endif // WIDGETHOST_H
-

shared/designerintegrationv2/widgethostconstants.h

@@ -26,10 +26,11 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef WIDGETHOST_CONSTANTS_H
 #define WIDGETHOST_CONSTANTS_H
 

shared/help/bookmarkmanager.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

shared/help/bookmarkmanager.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

shared/help/contentwindow.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

shared/help/contentwindow.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 
@@ -75,4 +75,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif
+#endif // CONTENTWINDOW_H

shared/help/filternamedialog.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 
@@ -45,7 +45,7 @@ FilterNameDialog::FilterNameDialog(QWidget *parent)
         SIGNAL(clicked()), this, SLOT(accept()));
     connect(m_ui.buttonBox->button(QDialogButtonBox::Cancel),
         SIGNAL(clicked()), this, SLOT(reject()));
-    connect(m_ui.lineEdit, SIGNAL(textChanged(const QString&)),
+    connect(m_ui.lineEdit, SIGNAL(textChanged(QString)),
         this, SLOT(updateOkButton()));
     m_ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
 

shared/help/filternamedialog.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

shared/help/helpviewer.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
 
 class HelpNetworkReply : public QNetworkReply
 {
@@ -214,8 +214,8 @@ HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
     connect(pageAction(QWebPage::Copy), SIGNAL(changed()), this, SLOT(actionChanged()));
     connect(pageAction(QWebPage::Back), SIGNAL(changed()), this, SLOT(actionChanged()));
     connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this, SLOT(actionChanged()));
-    connect(page(), SIGNAL(linkHovered(const QString &, const QString &, const QString &)), this, SIGNAL(highlighted(const QString &)));
+    connect(page(), SIGNAL(linkHovered(QString, QString, QString)), this, SIGNAL(highlighted(QString)));
-    connect(this, SIGNAL(urlChanged(const QUrl &)), this, SIGNAL(sourceChanged(const QUrl &)));
+    connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl)));
 }
 
 void HelpViewer::setSource(const QUrl &url)

shared/help/helpviewer.h

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 
@@ -39,7 +39,7 @@
 #include <QtGui/QTextBrowser>
 #include <QtGui/QAction>
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
 #include <QWebView>
 #endif
 
@@ -54,7 +54,7 @@ class QKeyEvent;
 class QMouseEvent;
 class QContextMenuEvent;
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
 
 class HelpViewer : public QWebView
 {

shared/help/indexwindow.cpp

@@ -26,8 +26,8 @@
 ** http://www.gnu.org/copyleft/gpl.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
+** rights. These rights are described in the Nokia Qt GPL Exception
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
+** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 
@@ -60,8 +60,8 @@ IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
 
     m_searchLineEdit = new QLineEdit();
     l->setBuddy(m_searchLineEdit);
-    connect(m_searchLineEdit, SIGNAL(textChanged(const QString&)),
+    connect(m_searchLineEdit, SIGNAL(textChanged(QString)),
-        this, SLOT(filterIndices(const QString&)));
+        this, SLOT(filterIndices(QString)));
     m_searchLineEdit->installEventFilter(this);
     layout->setMargin(4);
     layout->addWidget(m_searchLineEdit);
@@ -72,11 +72,10 @@ IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
         this, SLOT(disableSearchLineEdit()));
     connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()),
         this, SLOT(enableSearchLineEdit()));
-    connect(m_indexWidget, SIGNAL(linkActivated(const QUrl&, const QString&)),
+    connect(m_indexWidget, SIGNAL(linkActivated(QUrl, QString)),
-        this, SIGNAL(linkActivated(const QUrl&)));
+        this, SIGNAL(linkActivated(QUrl)));
-    connect(m_indexWidget, SIGNAL(linksActivated(const QMap<QString, QUrl>&,
+    connect(m_indexWidget, SIGNAL(linksActivated(QMap<QString, QUrl>, QString)),
-        const QString&)), this, SIGNAL(linksActivated(const QMap<QString, QUrl>&,
+        this, SIGNAL(linksActivated(QMap<QString, QUrl>, QString)));
-        const QString&)));
     connect(m_searchLineEdit, SIGNAL(returnPressed()),
         m_indexWidget, SLOT(activateCurrentItem()));
     layout->addWidget(m_indexWidget);