summaryrefslogtreecommitdiffstats
path: root/src/tools/uic
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/uic')
-rw-r--r--src/tools/uic/driver.cpp3
-rw-r--r--src/tools/uic/qclass_lib_map.h4
-rw-r--r--src/tools/uic/uic.cpp1
3 files changed, 1 insertions, 7 deletions
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index 5a9a862f14..ea1d4f21f3 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -43,7 +43,6 @@
#include "uic.h"
#include "ui4.h"
-#include <QtCore/QRegExp>
#include <QtCore/QFileInfo>
#include <QtCore/QDebug>
@@ -208,7 +207,7 @@ QString Driver::qtify(const QString &name)
return qname;
}
-static bool isAnsiCCharacter(const QChar& c)
+static bool isAnsiCCharacter(QChar c)
{
return (c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z'))
|| c.isDigit() || c == QLatin1Char('_');
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 11be47ce64..fb181e27f7 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -53,9 +53,6 @@ QT_CLASS_LIB(Qt, QtCore, qnamespace.h)
QT_CLASS_LIB(QInternal, QtCore, qnamespace.h)
QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h)
QT_CLASS_LIB(QtConfig, QtCore, qconfig.h)
-QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h)
-QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h)
-QT_CLASS_LIB(QAbstractFileEngineIterator, QtCore, qabstractfileengine.h)
QT_CLASS_LIB(QBuffer, QtCore, qbuffer.h)
QT_CLASS_LIB(QDataStream, QtCore, qdatastream.h)
QT_CLASS_LIB(QtDebug, QtCore, qdebug.h)
@@ -68,7 +65,6 @@ QT_CLASS_LIB(QFileInfo, QtCore, qfileinfo.h)
QT_CLASS_LIB(QFileInfoList, QtCore, qfileinfo.h)
QT_CLASS_LIB(QFileInfoListIterator, QtCore, qfileinfo.h)
QT_CLASS_LIB(QFileSystemWatcher, QtCore, qfilesystemwatcher.h)
-QT_CLASS_LIB(QFSFileEngine, QtCore, qfsfileengine.h)
QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h)
QT_CLASS_LIB(Q_PID, QtCore, qprocess.h)
QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h)
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 2de3352cfc..4ae04149e8 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -58,7 +58,6 @@
#include <QtCore/QXmlStreamReader>
#include <QtCore/QFileInfo>
-#include <QtCore/QRegExp>
#include <QtCore/QTextStream>
#include <QtCore/QDateTime>