summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xqtinterface/convert_qt_tqt14
-rw-r--r--qtinterface/interface_qt3/tqvfbhdr.h4
-rw-r--r--qtinterface/qt4/Qt/QtGui2
-rw-r--r--qtinterface/qt4/Qt/qfontdatabase.h2
-rw-r--r--qtinterface/qt4/Qt/qscreenvfb_qws.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/qtinterface/convert_qt_tqt1 b/qtinterface/convert_qt_tqt1
index 1b36f80..1b2883c 100755
--- a/qtinterface/convert_qt_tqt1
+++ b/qtinterface/convert_qt_tqt1
@@ -616,8 +616,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvbuttongroup\.h/\1tqvbutt
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvbuttongroup\.h/\1tqvbuttongroup\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvector\.h/\1tqvector\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvector\.h/\1tqvector\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvfbhdr\.h/\1tqvfbhdr\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvfbhdr\.h/\1tqvfbhdr\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)tqvfbhdr\.h/\1tqvfbhdr\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)tqvfbhdr\.h/\1tqvfbhdr\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvgroupbox\.h/\1tqvgroupbox\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvgroupbox\.h/\1tqvgroupbox\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qwaitcondition\.h/\1tqwaitcondition\.h/g' {} \;
diff --git a/qtinterface/interface_qt3/tqvfbhdr.h b/qtinterface/interface_qt3/tqvfbhdr.h
index bf10af4..8055a6f 100644
--- a/qtinterface/interface_qt3/tqvfbhdr.h
+++ b/qtinterface/interface_qt3/tqvfbhdr.h
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QVFBHDR class
// For Qt3, no changes are needed
-#include <qvfbhdr.h>
+#include <tqvfbhdr.h>
#endif // USE_QT3
@@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QVFBHDR class
// For Qt4, some changes are needed
-#include <Qt/qvfbhdr.h>
+#include <Qt/tqvfbhdr.h>
#endif // USE_QT4
diff --git a/qtinterface/qt4/Qt/QtGui b/qtinterface/qt4/Qt/QtGui
index 640382d..8b9448c 100644
--- a/qtinterface/qt4/Qt/QtGui
+++ b/qtinterface/qt4/Qt/QtGui
@@ -17,7 +17,7 @@
#include "qs60mainapplication.h"
#include "qs60mainappui.h"
#include "qs60maindocument.h"
-#include "qvfbhdr.h"
+#include "tqvfbhdr.h"
#include "qwsembedwidget.h"
#include "qabstractbutton.h"
#include "qabstractscrollarea.h"
diff --git a/qtinterface/qt4/Qt/qfontdatabase.h b/qtinterface/qt4/Qt/qfontdatabase.h
index 3bbbced..7b09f99 100644
--- a/qtinterface/qt4/Qt/qfontdatabase.h
+++ b/qtinterface/qt4/Qt/qfontdatabase.h
@@ -69,7 +69,7 @@ class Q_GUI_EXPORT QFontDatabase
Q_ENUMS(WritingSystem)
public:
// do not re-order or delete entries from this enum without updating the
- // QPF2 format and makeqpf!!
+ // QPF2 format and maketqpf!!
enum WritingSystem {
Any,
diff --git a/qtinterface/qt4/Qt/qscreenvfb_qws.h b/qtinterface/qt4/Qt/qscreenvfb_qws.h
index 09db7e0..f9a75e3 100644
--- a/qtinterface/qt4/Qt/qscreenvfb_qws.h
+++ b/qtinterface/qt4/Qt/qscreenvfb_qws.h
@@ -43,7 +43,7 @@
#define QSCREENVFB_QWS_H
#include <QtGui/qscreen_qws.h>
-#include <QtGui/qvfbhdr.h>
+#include <QtGui/tqvfbhdr.h>
QT_BEGIN_HEADER