diff -r 000000000000 -r 1918ee327afb util/normalize/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util/normalize/main.cpp	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the utils 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.
+**
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qcoreapplication.h>
+#include <qdiriterator.h>
+#include <qfile.h>
+#include <qmetaobject.h>
+#include <qstring.h>
+#include <qtextstream.h>
+
+#include <qdebug.h>
+
+#include <limits.h>
+#include <stdio.h>
+
+static bool printFilename = true;
+static bool modify = false;
+
+QString signature(const QString &line, int pos)
+{
+    int start = pos;
+    // find first open parentheses
+    while (start < line.length() && line.at(start) != QLatin1Char('('))
+        ++start;
+    int i = ++start;
+    int par = 1;
+    // find matching closing parentheses
+    while (i < line.length() && par > 0) {
+        if (line.at(i) == QLatin1Char('('))
+            ++par;
+        else if (line.at(i) == QLatin1Char(')'))
+            --par;
+        ++i;
+    }
+    if (par == 0)
+        return line.mid(start, i - start - 1);
+    return QString();
+}
+
+bool checkSignature(const QString &fileName, QString &line, const char *sig)
+{
+    static QStringList fileList;
+
+    int idx = -1;
+    bool found = false;
+    while ((idx = line.indexOf(sig, ++idx)) != -1) {
+        const QByteArray sl(signature(line, idx).toLocal8Bit());
+        QByteArray nsl(QMetaObject::normalizedSignature(sl.constData()));
+        if (sl != nsl) {
+            found = true;
+            if (printFilename && !fileList.contains(fileName)) {
+                fileList.prepend(fileName);
+                printf("%s\n", fileName.toLocal8Bit().constData());
+            }
+            if (modify)
+                line.replace(sl, nsl);
+            //qDebug("expected '%s', got '%s'", nsl.data(), sl.data());
+        }
+    }
+    return found;
+}
+
+void writeChanges(const QString &fileName, const QStringList &lines)
+{
+    QFile file(fileName);
+    if (!file.open(QIODevice::WriteOnly)) {
+        qDebug("unable to open file '%s' for writing (%s)", fileName.toLocal8Bit().constData(), file.errorString().toLocal8Bit().constData());
+        return;
+    }
+    QTextStream stream(&file);
+    for (int i = 0; i < lines.count(); ++i)
+        stream << lines.at(i);
+    file.close();
+}
+
+void check(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qDebug("unable to open file: '%s' (%s)", fileName.toLocal8Bit().constData(), file.errorString().toLocal8Bit().constData());
+        return;
+    }
+    QStringList lines;
+    bool found = false;
+    while (true) {
+        QByteArray bline = file.readLine(16384);
+        if (bline.isEmpty())
+            break;
+        QString line = QString::fromLocal8Bit(bline);
+        Q_ASSERT_X(line.endsWith("\n"), "check()", fileName.toLocal8Bit().constData());
+        found |= checkSignature(fileName, line, "SLOT");
+        found |= checkSignature(fileName, line, "SIGNAL");
+        if (modify)
+            lines << line;
+    }
+    file.close();
+
+    if (found && modify) {
+        printf("Modifying file: '%s'\n", fileName.toLocal8Bit().constData());
+        writeChanges(fileName, lines);
+    }
+}
+
+void traverse(const QString &path)
+{
+    QDirIterator dirIterator(path, QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::NoSymLinks);
+
+    while (dirIterator.hasNext()) {
+        QString filePath = dirIterator.next();
+        if (filePath.endsWith(".cpp"))
+            check(filePath);
+        else if (QFileInfo(filePath).isDir())
+            traverse(filePath); // recurse
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    if (app.argc() < 2 || (app.argc() == 2 && (app.argv()[1][0] == '-'))) {
+        printf("usage: normalize [--modify] <path>\n");
+        printf("  <path> can be a single file or a directory (default: look for *.cpp recursively)");
+        printf("  Outputs all filenames that contain non-normalized SIGNALs and SLOTs\n");
+        printf("  with --modify: fix all occurences of non-normalized SIGNALs and SLOTs\n");
+        return 1;
+    }
+
+    QString path;
+    if (qstrcmp(app.argv()[1], "--modify") == 0) {
+        printFilename = false;
+        modify = true;
+        path = app.argv()[2];
+    } else {
+        path = app.argv()[1];
+    }
+
+    if (path.startsWith("-")) {
+        qWarning("unknown parameter: %s", path.toLocal8Bit().constData());
+        return 1;
+    }
+
+    QFileInfo fi(path);
+    if (fi.isFile()) {
+        check(path);
+    } else if (fi.isDir()) {
+        if (!path.endsWith("/"))
+            path.append("/");
+        traverse(path);
+    } else {
+        qWarning("Don't know what to do with '%s'", path.toLocal8Bit().constData());
+        return 1;
+    }
+
+    return 0;
+}