summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/ntqnamespace.h2
-rw-r--r--src/kernel/ntqt.h18
-rw-r--r--src/kernel/qapplication.cpp2
-rw-r--r--src/kernel/qapplication_x11.cpp2
-rw-r--r--src/kernel/qclipboard_x11.cpp2
-rw-r--r--src/kernel/qdragobject.cpp2
-rw-r--r--src/kernel/qfont.cpp2
-rw-r--r--src/kernel/qfont_x11.cpp4
-rw-r--r--src/kernel/qfontengine_p.h4
-rw-r--r--src/kernel/qfontengine_x11.cpp4
-rw-r--r--src/kernel/qpainter.cpp2
-rw-r--r--src/kernel/qpainter_x11.cpp8
-rw-r--r--src/kernel/qpsprinter.cpp6
-rw-r--r--src/kernel/qpsprinter_p.h2
-rw-r--r--src/kernel/qrichtext.cpp4
-rw-r--r--src/kernel/qrichtext_p.h2
-rw-r--r--src/kernel/qscriptengine.cpp2
-rw-r--r--src/kernel/qscriptengine_p.h2
-rw-r--r--src/kernel/qscriptengine_x11.cpp2
-rw-r--r--src/kernel/qt_kernel.pri8
-rw-r--r--src/kernel/tqimage.cpp2
-rw-r--r--src/kernel/tqtextengine.cpp (renamed from src/kernel/qtextengine.cpp)8
-rw-r--r--src/kernel/tqtextengine_p.h (renamed from src/kernel/qtextengine_p.h)0
-rw-r--r--src/kernel/tqtextengine_unix.cpp (renamed from src/kernel/qtextengine_unix.cpp)0
-rw-r--r--src/kernel/tqtextlayout.cpp (renamed from src/kernel/qtextlayout.cpp)4
-rw-r--r--src/kernel/tqtextlayout_p.h (renamed from src/kernel/qtextlayout_p.h)0
-rw-r--r--src/kernel/tqwidget_x11.cpp4
27 files changed, 49 insertions, 49 deletions
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 8bdc0a374..03c58309c 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -920,7 +920,7 @@ public:
LogText
};
- // Documented in qtextedit.cpp
+ // Documented in tqtextedit.cpp
enum AnchorAttribute {
AnchorName,
AnchorHref
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 876d07c1f..3e62736f3 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -36,7 +36,7 @@
#include "tqpair.h"
#include "ntqpoint.h"
#include <stdio.h>
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
#include "ntqfontinfo.h"
#include "ntqsizepolicy.h"
#include "ntqtl.h"
@@ -65,7 +65,7 @@
#include "ntqpalette.h"
#include "tqwidget.h"
#include "ntqjpunicode.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "ntqpixmap.h"
#include <ntqtabbar.h>
#include "ntqiconset.h"
@@ -224,18 +224,18 @@
#include <ntqinterlacestyle.h>
#include <ntqstylefactory.h>
#include <ntqstyleplugin.h>
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
#include <ntqsyntaxhighlighter.h>
#include <ntqtabdialog.h>
#include "tqsqleditorfactory.h"
#include <ntqtabwidget.h>
-#include <ntqtextbrowser.h>
+#include <tqtextbrowser.h>
#include <ntqbig5codec.h>
-#include <ntqtextcodecfactory.h>
-#include <ntqtextcodecplugin.h>
+#include <tqtextcodecfactory.h>
+#include <tqtextcodecplugin.h>
#include <ntqmultilineedit.h>
#include "ntqtoolbar.h"
-#include <ntqtextview.h>
+#include <tqtextview.h>
#include "ntqwaitcondition.h"
#include <ntqasyncio.h>
#include <ntqfontdatabase.h>
@@ -295,7 +295,7 @@
#include "private/qrichtext_p.h"
#include "private/qsvgdevice_p.h"
#include "private/qfontcodecs_p.h"
-#include "private/qtextcodecinterface_p.h"
+#include "private/tqtextcodecinterface_p.h"
#include "private/qpsprinter_p.h"
#include "private/qtitlebar_p.h"
#include "private/qucom_p.h"
@@ -325,7 +325,7 @@
#endif
#ifdef TQ_WS_QWS
-#include <private/qtextengine_p.h>
+#include <private/tqtextengine_p.h>
#include "qfontmanager_qws.h"
#include <qfontfactorybdf_qws.h>
#include <qgfxvoodoodefs_qws.h>
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index e5b28642b..baf5ba495 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -49,7 +49,7 @@
#include "ntqcleanuphandler.h"
#include "ntqtranslator.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "ntqsessionmanager.h"
#include "ntqdragobject.h"
#include "ntqclipboard.h"
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 57c55feba..0cfd812c2 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -74,7 +74,7 @@
#include "ntqpainter.h"
#include "ntqpixmapcache.h"
#include "ntqdatetime.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "ntqdatastream.h"
#include "ntqbuffer.h"
#include "ntqsocketnotifier.h"
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 51fbc63ab..7776cf606 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -70,7 +70,7 @@
#include "ntqdatetime.h"
#include "ntqdragobject.h"
#include "ntqbuffer.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "tqvaluelist.h"
#include "tqmap.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index 5e6a0dab9..9854c33a3 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -46,7 +46,7 @@
#ifndef TQT_NO_MIME
#include "ntqdragobject.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "ntqapplication.h"
#include "ntqpoint.h"
#include "tqwidget.h"
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index b442a3253..387f75dfe 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -59,7 +59,7 @@
#include "qfontdata_p.h"
#include "qfontengine_p.h"
#include "qpainter_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
// #define TQFONTCACHE_DEBUG
#ifdef TQFONTCACHE_DEBUG
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 3cd207c65..07c3fe2c6 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -52,13 +52,13 @@
#include "ntqfontmetrics.h"
#include "ntqpaintdevice.h"
#include "ntqpaintdevicemetrics.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include <private/qfontcodecs_p.h>
#include <private/qunicodetables_p.h>
#include "qfontdata_p.h"
#include "qfontengine_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 17aa618b6..9e3c31261 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -46,7 +46,7 @@
#include "tqptrdict.h"
#endif
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
class TQPaintDevice;
@@ -475,7 +475,7 @@ class TQTextEngine;
#ifndef TQT_NO_XFTFREETYPE
#include "qscriptengine_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
#include <ft2build.h>
#include FT_FREETYPE_H
#include "ftxopen.h"
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 5cf756265..54bedb33e 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -42,7 +42,7 @@
#include <tqwidget.h>
#include <ntqcstring.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
#include "ntqbitmap.h"
#include "ntqfontdatabase.h"
@@ -54,7 +54,7 @@
#include "qt_x11_p.h"
#include "ntqfont.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
#include <private/qunicodetables_p.h>
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 3f91a8023..82840cc27 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -56,7 +56,7 @@
#endif
#include <string.h>
-#include "qtextlayout_p.h"
+#include "tqtextlayout_p.h"
#include "qfontengine_p.h"
#ifndef TQT_NO_TRANSFORMATIONS
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index a4f71fc00..0e72d64da 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -45,15 +45,15 @@
#include "tqwidget.h"
#include "ntqbitmap.h"
#include "ntqpixmapcache.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "ntqpaintdevicemetrics.h"
#include "qt_x11_p.h"
-#include "qtextlayout_p.h"
+#include "tqtextlayout_p.h"
#include "qfontdata_p.h"
#include "qfontengine_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
#include <math.h>
@@ -435,7 +435,7 @@ static void init_gc_cache()
// #define GC_CACHE_STAT
#if defined(GC_CACHE_STAT)
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
#include "ntqbuffer.h"
static int g_numhits = 0;
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 6974fdf6c..22acd9832 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -67,7 +67,7 @@
#include "ntqfile.h"
#include "ntqbuffer.h"
#include "ntqintdict.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "ntqsettings.h"
#include "tqmap.h"
#include "ntqfontdatabase.h"
@@ -98,8 +98,8 @@
#if defined( TQ_WS_X11 ) || defined (TQ_WS_QWS)
#include "qfontdata_p.h"
#include "qfontengine_p.h"
-#include "qtextlayout_p.h"
-#include "qtextengine_p.h"
+#include "tqtextlayout_p.h"
+#include "tqtextengine_p.h"
extern bool tqt_has_xft;
#endif
diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h
index 6b96a965d..47939b1db 100644
--- a/src/kernel/qpsprinter_p.h
+++ b/src/kernel/qpsprinter_p.h
@@ -59,7 +59,7 @@
#ifndef QT_H
#include "ntqprinter.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
#endif // QT_H
#ifndef TQT_NO_PRINTER
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 484553d3e..cd4c31055 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -45,7 +45,7 @@
#include "tqstringlist.h"
#include "ntqfont.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
#include "ntqfile.h"
#include "ntqapplication.h"
#include "tqmap.h"
@@ -62,7 +62,7 @@
#include "tqptrdict.h"
#include "ntqstyle.h"
#include "ntqcleanuphandler.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
#include <private/qunicodetables_p.h>
#include <stdlib.h>
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 52762c6b4..58fed9826 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -118,7 +118,7 @@ public:
enum Type { Regular=0, Custom=1, Anchor=2, CustomAnchor=3 };
TQChar c;
- // this is the same struct as in qtextengine_p.h. Don't change!
+ // this is the same struct as in tqtextengine_p.h. Don't change!
uchar softBreak :1; // Potential linebreak point
uchar whiteSpace :1; // A unicode whitespace character, except NBSP, ZWNBSP
uchar charStop :1; // Valid cursor position (for left/right arrow)
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 08cac102f..5e18dad56 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -40,7 +40,7 @@
#include "ntqrect.h"
#include "ntqfont.h"
#include <private/qunicodetables_p.h>
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
#include "qfontengine_p.h"
#include <stdlib.h>
diff --git a/src/kernel/qscriptengine_p.h b/src/kernel/qscriptengine_p.h
index 1c5d55370..77dd87b96 100644
--- a/src/kernel/qscriptengine_p.h
+++ b/src/kernel/qscriptengine_p.h
@@ -48,7 +48,7 @@
// We mean it.
//
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
class TQString;
struct TQCharAttributes;
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 97ae6828b..6c1190fb3 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -1899,7 +1899,7 @@ static void indic_attributes(int script, const TQString &text, int from, int len
//
// --------------------------------------------------------------------------------------------------------------------------------------------
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
#include <ntqlibrary.h>
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index cf370058b..5f20c7111 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -94,9 +94,9 @@ kernel {
$$KERNEL_H/ntqgplugin.h \
$$KERNEL_H/ntqsimplerichtext.h \
$$KERNEL_CPP/qscriptengine_p.h \
- $$KERNEL_CPP/qtextengine_p.h \
+ $$KERNEL_CPP/tqtextengine_p.h \
$$KERNEL_CPP/qfontengine_p.h \
- $$KERNEL_CPP/qtextlayout_p.h
+ $$KERNEL_CPP/tqtextlayout_p.h
inputmethod {
unix:x11 {
@@ -264,8 +264,8 @@ kernel {
$$KERNEL_CPP/qgplugin.cpp \
$$KERNEL_CPP/qsimplerichtext.cpp \
$$KERNEL_CPP/qscriptengine.cpp \
- $$KERNEL_CPP/qtextlayout.cpp \
- $$KERNEL_CPP/qtextengine.cpp
+ $$KERNEL_CPP/tqtextlayout.cpp \
+ $$KERNEL_CPP/tqtextengine.cpp
unix:HEADERS += $$KERNEL_P/qpsprinter_p.h \
$$KERNEL_H/ntqfontdatabase.h
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 7a454818e..d31168c70 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -42,7 +42,7 @@
#include "ntqregexp.h"
#include "ntqfile.h"
#include "ntqdatastream.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
#include "ntqbuffer.h"
#include "tqptrlist.h"
#include "ntqasyncimageio.h"
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/tqtextengine.cpp
index e1a806f52..b66fb7d95 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/tqtextengine.cpp
@@ -36,7 +36,7 @@
**
**********************************************************************/
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
#include "qscriptengine_p.h"
#include <ntqfont.h>
@@ -876,11 +876,11 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes
}
#if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS )
-# include "qtextengine_unix.cpp"
+# include "tqtextengine_unix.cpp"
#elif defined( TQ_WS_WIN )
-# include "qtextengine_win.cpp"
+# include "tqtextengine_win.cpp"
#elif defined( TQ_WS_MAC )
-# include "qtextengine_mac.cpp"
+# include "tqtextengine_mac.cpp"
#endif
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/tqtextengine_p.h
index 774302a07..774302a07 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/tqtextengine_p.h
diff --git a/src/kernel/qtextengine_unix.cpp b/src/kernel/tqtextengine_unix.cpp
index 0d5e3b920..0d5e3b920 100644
--- a/src/kernel/qtextengine_unix.cpp
+++ b/src/kernel/tqtextengine_unix.cpp
diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/tqtextlayout.cpp
index 777e61ad7..41be6076a 100644
--- a/src/kernel/qtextlayout.cpp
+++ b/src/kernel/tqtextlayout.cpp
@@ -36,8 +36,8 @@
**
**********************************************************************/
-#include "qtextlayout_p.h"
-#include "qtextengine_p.h"
+#include "tqtextlayout_p.h"
+#include "tqtextengine_p.h"
#include <ntqfont.h>
#include <ntqapplication.h>
diff --git a/src/kernel/qtextlayout_p.h b/src/kernel/tqtextlayout_p.h
index 64c7f64db..64c7f64db 100644
--- a/src/kernel/qtextlayout_p.h
+++ b/src/kernel/tqtextlayout_p.h
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index ff33dddbf..78d1e850e 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -47,7 +47,7 @@
#include "tqimage.h"
#include "tqobjectlist.h"
#include "ntqlayout.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
#include "ntqdatetime.h"
#include "ntqcursor.h"
#include "qt_x11_p.h"
@@ -3055,7 +3055,7 @@ void TQWidget::destroyInputContext()
/*!
This function is called when text widgets need to be neutral state to
- execute text operations properly. See qlineedit.cpp and qtextedit.cpp as
+ execute text operations properly. See qlineedit.cpp and tqtextedit.cpp as
example.
Ordinary reset that along with changing focus to another widget,