8 files changed, 20 insertions, 43 deletions
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 51eb62b33..5d9f7d4bc 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -116,7 +116,7 @@
 #include <tqeucjpcodec.h>
 #include <ntqkeycode.h>
 #include <ntqaccel.h>
-#include "ntqlabel.h"
+#include "tqlabel.h"
 #include "ntqlayout.h"
 #include <ntqlcdnumber.h>
 #include <ntqlibrary.h>
@@ -188,7 +188,7 @@
 #include "tqtimer.h"
 #include <tqsignalmapper.h>
 #include <tqsignalslotimp.h>
-#include <ntqsimplerichtext.h>
+#include <tqsimplerichtext.h>
 #include "tqwmatrix.h"
 #include <tqsizegrip.h>
 #include <ntqabstractlayout.h>
@@ -225,7 +225,7 @@
 #include <tqstylefactory.h>
 #include <tqstyleplugin.h>
 #include "tqtextedit.h"
-#include <ntqsyntaxhighlighter.h>
+#include <tqsyntaxhighlighter.h>
 #include <ntqtabdialog.h>
 #include "tqsqleditorfactory.h"
 #include <ntqtabwidget.h>
@@ -258,7 +258,7 @@
 #include <ntqvbuttongroup.h>
 #include <ntqvgroupbox.h>
 #include <tqthread.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <ntqapplication.h>
 #include <tqwidgetintdict.h>
 #include <ntqfocusdata.h>
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index b11c6b427..fabd7dcf4 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -46,7 +46,7 @@
 #include "ntqapplication.h"
 #include "tqwidget.h"
 #include "tqptrlist.h"
-#include "ntqwhatsthis.h"
+#include "tqwhatsthis.h"
 #include "ntqguardedptr.h"
 #include "tqstatusbar.h"
 #include "ntqdockwindow.h"
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index fbe329e98..aa6fd907b 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -83,7 +83,7 @@
 #include "tqdict.h"
 #include "ntqguardedptr.h"
 #include "tqclipboard.h"
-#include "ntqwhatsthis.h" // ######## dependency
+#include "tqwhatsthis.h" // ######## dependency
 #include "tqsettings.h"
 #include "tqstylefactory.h"
 #include "tqfileinfo.h"
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index c56afb6b2..c97ca4618 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -92,7 +92,7 @@ kernel {
 		  $$KERNEL_P/qrichtext_p.h \
 		  $$KERNEL_P/qinternal_p.h \
 		  $$KERNEL_H/ntqgplugin.h \
-		  $$KERNEL_H/ntqsimplerichtext.h \
+		  $$KERNEL_H/tqsimplerichtext.h \
 		  $$KERNEL_CPP/qscriptengine_p.h \
 		  $$KERNEL_CPP/tqtextengine_p.h \
 		  $$KERNEL_CPP/tqfontengine_p.h \
@@ -261,7 +261,7 @@ kernel {
 		  $$KERNEL_CPP/qinternal.cpp \
 		  $$KERNEL_CPP/qrichtext_p.cpp \
 		  $$KERNEL_CPP/qgplugin.cpp \
-		  $$KERNEL_CPP/qsimplerichtext.cpp \
+		  $$KERNEL_CPP/tqsimplerichtext.cpp \
 		  $$KERNEL_CPP/qscriptengine.cpp \
 		  $$KERNEL_CPP/tqtextlayout.cpp \
 		  $$KERNEL_CPP/tqtextengine.cpp
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 54ca333f9..908254769 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -18,7 +18,7 @@
 #  if defined(__GNUC__)
 #    ifndef TQT_NO_STL
 #      include <ios>
-#      undef _GLIBCPP_FULLY_COMPLIANT_HEADERS  // Makes qlocale.cpp compile
+#      undef _GLIBCPP_FULLY_COMPLIANT_HEADERS  // Makes tqlocale.cpp compile
 #    endif
 #  endif
 #include <tqmap.h>		    // I must be first!
diff --git a/src/kernel/tqfontengine_x11.cpp b/src/kernel/tqfontengine_x11.cpp
index 8002c42df..6363aac97 100644
--- a/src/kernel/tqfontengine_x11.cpp
+++ b/src/kernel/tqfontengine_x11.cpp
@@ -2264,8 +2264,6 @@ struct OTScripts {
     int flags;
 };
 
-// Refer to https://learn.microsoft.com/en-us/typography/opentype/spec/scripttags
-// for OpenType language tags definition
 static const OTScripts ot_scripts [] = {
 // 	// European Alphabetic Scripts
 // 	Latin,
@@ -2353,7 +2351,6 @@ static const OTScripts ot_scripts [] = {
     { FT_MAKE_TAG( 'c', 'a', 'n', 's' ), 0 },
 // 	Mongolian,
     { FT_MAKE_TAG( 'm', 'o', 'n', 'g' ), 0 },
-
 // 	// Symbols
 // 	CurrencySymbols,
     { FT_MAKE_TAG( 'D', 'F', 'L', 'T' ), 0 },
@@ -2373,26 +2370,13 @@ static const OTScripts ot_scripts [] = {
     { FT_MAKE_TAG( 'D', 'F', 'L', 'T' ), 0 },
 // 	Braille,
     { FT_MAKE_TAG( 'b', 'r', 'a', 'i' ), 0 },
-
-// 	Unicode
-    { FT_MAKE_TAG( 'D', 'F', 'L', 'T' ), 0 },
-
-// 	Tagalog,
-    { FT_MAKE_TAG( 't', 'g', 'l', 'g' ), 0 },
-// 	Hanunoo,
-    { FT_MAKE_TAG( 'h', 'a', 'n', 'o' ), 0 },
-// 	Buhid,
-    { FT_MAKE_TAG( 'b', 'u', 'h', 'd' ), 0 },
-// 	Tagbanwa,
-    { FT_MAKE_TAG( 't', 'a', 'g', 'b' ), 0 },
-
-// 	KatakanaHalfWidth, -- can't find it, use Katakana code
-    { FT_MAKE_TAG( 'k', 'a', 'n', 'a' ), 0 },
-
-// 	Limbu,
-    { FT_MAKE_TAG( 'l', 'i', 'm', 'b' ), 0 },
-// 	TaiLe,
-    { FT_MAKE_TAG( 't', 'a', 'l', 'e' ), 0 }
+//                Unicode, should be used
+    { FT_MAKE_TAG( 'D', 'F', 'L', 'T' ), 0 }
+    // ### where are these?
+// 	{ FT_MAKE_TAG( 'b', 'y', 'z', 'm' ), 0 },
+//     { FT_MAKE_TAG( 'D', 'F', 'L', 'T' ), 0 },
+    // ### Hangul Jamo
+//     { FT_MAKE_TAG( 'j', 'a', 'm', 'o' ), 0 },
 };
 
 TQOpenType::TQOpenType(TQFontEngineXft *fe)
@@ -2451,10 +2435,7 @@ TQOpenType::~TQOpenType()
 
 bool TQOpenType::checkScript(unsigned int script)
 {
-    if (script >= TQFont::NScripts || script >= sizeof(ot_scripts) / sizeof(OTScripts))
-    {
-      return false;
-    }
+    assert(script < TQFont::NScripts);
 
     uint tag = ot_scripts[script].tag;
     int requirements = ot_scripts[script].flags;
@@ -2496,11 +2477,7 @@ void TQOpenType::selectScript(unsigned int script, const Features *features)
     if (current_script == script)
         return;
 
-    if (script >= TQFont::NScripts || script >= sizeof(ot_scripts) / sizeof(OTScripts))
-    {
-        return;
-    }
-
+    assert(script < TQFont::NScripts);
     // find script in our list of supported scripts.
     uint tag = ot_scripts[script].tag;
 
diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/tqsimplerichtext.cpp
index a6e1271c4..2288a5692 100644
--- a/src/kernel/qsimplerichtext.cpp
+++ b/src/kernel/tqsimplerichtext.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsimplerichtext.h"
+#include "tqsimplerichtext.h"
 
 #ifndef TQT_NO_RICHTEXT
 #include "qrichtext_p.h"
@@ -76,7 +76,7 @@ void TQSimpleRichTextData::adjustSize(TQPainter *p) {
 }
 
 /*!
-    \class TQSimpleRichText ntqsimplerichtext.h
+    \class TQSimpleRichText tqsimplerichtext.h
     \brief The TQSimpleRichText class provides a small displayable piece of rich text.
 
     \ingroup text
diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/tqsimplerichtext.h
index 8d3d9ad8b..8d3d9ad8b 100644
--- a/src/kernel/ntqsimplerichtext.h
+++ b/src/kernel/tqsimplerichtext.h