diff options
author | Qt by Nokia <qt-info@nokia.com> | 2011-04-27 12:05:43 +0200 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:43 +0200 |
commit | b2055218d0af35556f9a607cc3103ec3a2f020a2 (patch) | |
tree | 3acff19180334e1a6f014ece9f85ba0849fb8bcc /util | |
download | qtrepotools-b2055218d0af35556f9a607cc3103ec3a2f020a2.tar.gz |
Initial import from the monolithic Qt.
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
Diffstat (limited to 'util')
-rw-r--r-- | util/fixnonlatin1/fixnonlatin1.pro | 9 | ||||
-rw-r--r-- | util/fixnonlatin1/main.cpp | 102 | ||||
-rw-r--r-- | util/normalize/README | 16 | ||||
-rw-r--r-- | util/normalize/main.cpp | 193 | ||||
-rw-r--r-- | util/normalize/normalize.pro | 9 |
5 files changed, 329 insertions, 0 deletions
diff --git a/util/fixnonlatin1/fixnonlatin1.pro b/util/fixnonlatin1/fixnonlatin1.pro new file mode 100644 index 0000000..bfc5e7d --- /dev/null +++ b/util/fixnonlatin1/fixnonlatin1.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET += +DEPENDPATH += . +INCLUDEPATH += . + +# Input +SOURCES += main.cpp + +QT = core diff --git a/util/fixnonlatin1/main.cpp b/util/fixnonlatin1/main.cpp new file mode 100644 index 0000000..8d5eaa7 --- /dev/null +++ b/util/fixnonlatin1/main.cpp @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2011 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 <QtCore/QtCore> + +// Scans files for characters >127 and replaces them with the \nnn octal representation + +int main(int argc, char *argv[]) +{ + if (argc <= 1) + qFatal("Usage: %s FILES", argc ? argv[0] : "fixnonlatin1"); + for (int i = 1; i < argc; ++i) { + + QString fileName = QString::fromLocal8Bit(argv[i]); + if ( fileName.endsWith(".gif") + || fileName.endsWith(".jpg") + || fileName.endsWith(".tif") + || fileName.endsWith(".tiff") + || fileName.endsWith(".png") + || fileName.endsWith(".mng") + || fileName.endsWith(".ico") + || fileName.endsWith(".zip") + || fileName.endsWith(".gz") + || fileName.endsWith(".qpf") + || fileName.endsWith(".ttf") + || fileName.endsWith(".pfb") + || fileName.endsWith(".exe") + || fileName.endsWith(".nib") + || fileName.endsWith(".o") + ) + continue; + + QFile file(fileName); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + qFatal("Cannot open '%s': %s", argv[i], qPrintable(file.errorString())); + + QByteArray ba = file.readAll(); + bool mod = false; + for (int j = 0; j < ba.count(); ++j) { + uchar c = ba.at(j); + if (c > 127) { + ba[j] = '\\'; + ba.insert(j + 1, QByteArray::number(c, 8).rightJustified(3, '0', true)); + j += 3; + mod = true; + } + } + file.close(); + + if (!mod) + continue; + + qWarning("found non-latin1 characters in '%s'", argv[i]); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + qWarning("Cannot open '%s' for writing: %s", argv[i], qPrintable(file.errorString())); + continue; + } + if (file.write(ba) < 0) + qFatal("Error while writing into '%s': %s", argv[i], qPrintable(file.errorString())); + file.close(); + } + + return 0; +} + diff --git a/util/normalize/README b/util/normalize/README new file mode 100644 index 0000000..55c9210 --- /dev/null +++ b/util/normalize/README @@ -0,0 +1,16 @@ +This tool greps through files for SIGNAL() or SLOT() macros and pipes the signals/slots +through QMetaObject::normalizedSignature(). + +Rationale: In connect statements, you'll get a micro-speed update when passing in normalized +signatures for signals and slots. + +Run it without any arguments to see the command line parameters. + +Typical usage on Qt: + +# find all files with non-normalized signal/slot connections and p4 edit them +normalize $QTDIR/src | xargs p4 edit +# replace all non-normalized signal/slots +normalize --modify $QTDIR/src +# p4 diff to see that everything is OK then submit :) +p4 submit $QTDIR/src/... diff --git a/util/normalize/main.cpp b/util/normalize/main.cpp new file mode 100644 index 0000000..1983533 --- /dev/null +++ b/util/normalize/main.cpp @@ -0,0 +1,193 @@ +/**************************************************************************** +** +** Copyright (C) 2011 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 occurrences 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; +} diff --git a/util/normalize/normalize.pro b/util/normalize/normalize.pro new file mode 100644 index 0000000..cff3f05 --- /dev/null +++ b/util/normalize/normalize.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +CONFIG -= moc + +# Input +SOURCES += main.cpp + +QT = core +CONFIG += warn_on console +mac:CONFIG -= app_bundle |