summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kernel/ntqapplication.h4
-rw-r--r--src/kernel/ntqinputcontext.h2
-rw-r--r--src/kernel/ntqnamespace.h6
-rw-r--r--src/kernel/ntqt.h8
-rw-r--r--src/kernel/qapplication.cpp6
-rw-r--r--src/kernel/qapplication_x11.cpp2
-rw-r--r--src/kernel/qdnd_x11.cpp4
-rw-r--r--src/kernel/qt_kernel.pri38
-rw-r--r--src/kernel/tqclipboard_x11.cpp2
-rw-r--r--src/kernel/tqdesktopwidget.h (renamed from src/kernel/ntqdesktopwidget.h)0
-rw-r--r--src/kernel/tqdesktopwidget_x11.cpp (renamed from src/kernel/qdesktopwidget_x11.cpp)2
-rw-r--r--src/kernel/tqevent.cpp (renamed from src/kernel/qevent.cpp)42
-rw-r--r--src/kernel/tqevent.h (renamed from src/kernel/ntqevent.h)0
-rw-r--r--src/kernel/tqeventloop.cpp (renamed from src/kernel/qeventloop.cpp)4
-rw-r--r--src/kernel/tqeventloop.h (renamed from src/kernel/ntqeventloop.h)2
-rw-r--r--src/kernel/tqeventloop_glib_p.h (renamed from src/kernel/qeventloop_glib_p.h)6
-rw-r--r--src/kernel/tqeventloop_p.h (renamed from src/kernel/qeventloop_p.h)2
-rw-r--r--src/kernel/tqeventloop_unix.cpp (renamed from src/kernel/qeventloop_unix.cpp)4
-rw-r--r--src/kernel/tqeventloop_unix_glib.cpp (renamed from src/kernel/qeventloop_unix_glib.cpp)8
-rw-r--r--src/kernel/tqeventloop_x11.cpp (renamed from src/kernel/qeventloop_x11.cpp)6
-rw-r--r--src/kernel/tqeventloop_x11_glib.cpp (renamed from src/kernel/qeventloop_x11_glib.cpp)20
-rw-r--r--src/kernel/tqfontengine_x11.cpp41
-rw-r--r--src/kernel/tqobject.h2
-rw-r--r--src/kernel/tqsocketnotifier.cpp4
-rw-r--r--src/kernel/tqthread.cpp2
-rw-r--r--src/kernel/tqtranslator.cpp (renamed from src/kernel/qtranslator.cpp)2
-rw-r--r--src/kernel/tqtranslator.h (renamed from src/kernel/ntqtranslator.h)0
-rw-r--r--src/kernel/tqwidget.cpp4
-rw-r--r--src/table/qtable.cpp2
-rw-r--r--src/widgets/qdockwindow.cpp2
-rw-r--r--src/widgets/tqiconview.cpp2
-rw-r--r--src/widgets/tqtextedit.cpp2
-rw-r--r--src/widgets/tqtoolbox.cpp2
33 files changed, 128 insertions, 105 deletions
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index fc4448089..0e884583e 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -42,10 +42,10 @@
#define TQAPPLICATION_H
#ifndef QT_H
-#include "ntqdesktopwidget.h"
+#include "tqdesktopwidget.h"
#include "tqasciidict.h"
#include "tqpalette.h"
-#include "ntqtranslator.h"
+#include "tqtranslator.h"
#include "tqstrlist.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index 2486fc3a9..0ab8e728a 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -41,7 +41,7 @@
#ifndef QT_H
#include "tqobject.h"
#include "ntqglobal.h"
-#include "ntqevent.h"
+#include "tqevent.h"
#include "tqstring.h"
#include "tqptrlist.h"
#endif
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index b056c8363..4557114db 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -72,7 +72,7 @@ public:
static const TQColor & darkMagenta;
static const TQColor & darkYellow;
- // documented in qevent.cpp
+ // documented in tqevent.cpp
enum ButtonState { // mouse/keyboard state values
NoButton = 0x0000,
LeftButton = 0x0001,
@@ -342,7 +342,7 @@ public:
Identical
};
- // documented in qevent.cpp
+ // documented in tqevent.cpp
enum Modifier { // accelerator modifiers
META = 0x00100000,
SHIFT = 0x00200000,
@@ -354,7 +354,7 @@ public:
ASCII_ACCEL = UNICODE_ACCEL // 1.x compat
};
- // documented in qevent.cpp
+ // documented in tqevent.cpp
enum Key {
Key_Escape = 0x1000, // misc keys
Key_Tab = 0x1001,
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 5d9f7d4bc..11305209b 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -54,7 +54,7 @@
#include "tqpaintdevice.h"
#include "tqfontmetrics.h"
#include "tqdict.h"
-#include "ntqevent.h"
+#include "tqevent.h"
#include "tqhostaddress.h"
#include "tqstringlist.h"
#include "tqcolor.h"
@@ -101,7 +101,7 @@
#include <ntqhbuttongroup.h>
#include <ntqhgroupbox.h>
#include "tqsocketnotifier.h"
-#include <ntqeventloop.h>
+#include <tqeventloop.h>
#include <tqhttp.h>
#include <tqaction.h>
#include "tqbuffer.h"
@@ -219,7 +219,7 @@
#include <tqstatusbar.h>
#include <tqmenubar.h>
#include <tqcanvas.h>
-#include "ntqtranslator.h"
+#include "tqtranslator.h"
#include <tqstrvec.h>
#include <ntqinterlacestyle.h>
#include <tqstylefactory.h>
@@ -242,7 +242,7 @@
#include <tqmainwindow.h>
#include <tqtoolbox.h>
#include <tqtooltip.h>
-#include "ntqdesktopwidget.h"
+#include "tqdesktopwidget.h"
#include <tqtsciicodec.h>
#include "tqurl.h"
#include "tqurloperator.h"
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index d37efef76..a44d10389 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -40,15 +40,15 @@
#include "tqobjectlist.h"
#include "ntqapplication.h"
-#include "ntqeventloop.h"
-#include "qeventloop_p.h"
+#include "tqeventloop.h"
+#include "tqeventloop_p.h"
#include "tqwidget.h"
#include "tqwidgetlist.h"
#include "tqwidgetintdict.h"
#include "tqptrdict.h"
#include "ntqcleanuphandler.h"
-#include "ntqtranslator.h"
+#include "tqtranslator.h"
#include "tqtextcodec.h"
#include "tqsessionmanager.h"
#include "tqdragobject.h"
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index aa6fd907b..18a0eb7f0 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -310,7 +310,7 @@ Atom qt_net_wm_sync_request = 0;
// client leader window
Window qt_x11_wm_client_leader = 0;
-// function to update the workarea of the screen - in qdesktopwidget_x11.cpp
+// function to update the workarea of the screen - in tqdesktopwidget_x11.cpp
extern void qt_desktopwidget_update_workarea();
// current focus model
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index accf14209..5194ee878 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -1484,7 +1484,7 @@ bool qt_xdnd_handle_badwindow()
/*!
- \class TQDragMoveEvent ntqevent.h
+ \class TQDragMoveEvent tqevent.h
\ingroup events
\ingroup draganddrop
\brief The TQDragMoveEvent class provides an event which is sent while a drag and drop is in progress.
@@ -1658,7 +1658,7 @@ bool qt_dnd_enable( TQWidget* w, bool on )
/*!
- \class TQDropEvent ntqevent.h
+ \class TQDropEvent tqevent.h
\ingroup events
\ingroup draganddrop
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index c97ca4618..64424b6d6 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -16,14 +16,14 @@ kernel {
$$KERNEL_P/tqcolor_p.h \
$$KERNEL_H/ntqconnection.h \
$$KERNEL_H/ntqcursor.h \
- $$KERNEL_H/ntqdesktopwidget.h \
+ $$KERNEL_H/tqdesktopwidget.h \
$$KERNEL_H/tqdragobject.h \
$$KERNEL_H/ntqdrawutil.h \
$$KERNEL_H/tqdropsite.h \
- $$KERNEL_H/ntqevent.h \
- $$KERNEL_H/ntqeventloop.h \
- $$KERNEL_P/qeventloop_p.h \
- $$KERNEL_P/qeventloop_glib_p.h \
+ $$KERNEL_H/tqevent.h \
+ $$KERNEL_H/tqeventloop.h \
+ $$KERNEL_P/tqeventloop_p.h \
+ $$KERNEL_P/tqeventloop_glib_p.h \
$$KERNEL_H/ntqfocusdata.h \
$$KERNEL_H/tqfont.h \
$$KERNEL_P/tqfontdata_p.h \
@@ -39,7 +39,7 @@ kernel {
$$KERNEL_H/ntqkeysequence.h \
$$KERNEL_H/ntqlayout.h \
$$KERNEL_P/qlayoutengine_p.h \
- $$KERNEL_H/ntqtranslator.h \
+ $$KERNEL_H/tqtranslator.h \
$$KERNEL_H/ntqmetaobject.h \
$$KERNEL_H/tqmime.h \
$$KERNEL_H/tqmovie.h \
@@ -107,16 +107,16 @@ kernel {
}
glibmainloop {
- HEADERS+=$$KERNEL_P/qeventloop_glib_p.h
+ HEADERS+=$$KERNEL_P/tqeventloop_glib_p.h
}
win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \
$$KERNEL_CPP/tqclipboard_win.cpp \
$$KERNEL_CPP/tqcolor_win.cpp \
$$KERNEL_CPP/qcursor_win.cpp \
- $$KERNEL_CPP/qdesktopwidget_win.cpp \
+ $$KERNEL_CPP/tqdesktopwidget_win.cpp \
$$KERNEL_CPP/qdnd_win.cpp \
- $$KERNEL_CPP/qeventloop_win.cpp \
+ $$KERNEL_CPP/tqeventloop_win.cpp \
$$KERNEL_CPP/tqfont_win.cpp \
$$KERNEL_CPP/qinputcontext_win.cpp \
$$KERNEL_CPP/tqmime_win.cpp \
@@ -138,7 +138,7 @@ kernel {
$$KERNEL_CPP/tqcolor_x11.cpp \
$$KERNEL_CPP/qcursor_x11.cpp \
$$KERNEL_CPP/qdnd_x11.cpp \
- $$KERNEL_CPP/qdesktopwidget_x11.cpp \
+ $$KERNEL_CPP/tqdesktopwidget_x11.cpp \
$$KERNEL_CPP/tqfont_x11.cpp \
$$KERNEL_CPP/qinputcontext.cpp \
$$KERNEL_CPP/qinputcontext_x11.cpp \
@@ -152,9 +152,9 @@ kernel {
$$KERNEL_CPP/tqwidgetcreate_x11.cpp \
$$KERNEL_CPP/tqfontengine_x11.cpp
glibmainloop {
- SOURCES += $$KERNEL_CPP/qeventloop_x11_glib.cpp
+ SOURCES += $$KERNEL_CPP/tqeventloop_x11_glib.cpp
} else {
- SOURCES += $$KERNEL_CPP/qeventloop_x11.cpp
+ SOURCES += $$KERNEL_CPP/tqeventloop_x11.cpp
}
}
@@ -169,14 +169,14 @@ kernel {
$$KERNEL_CPP/qcursor_mac.cpp \
$$KERNEL_CPP/tqmime_mac.cpp \
$$KERNEL_CPP/qdnd_mac.cpp \
- $$KERNEL_CPP/qdesktopwidget_mac.cpp \
+ $$KERNEL_CPP/tqdesktopwidget_mac.cpp \
$$KERNEL_CPP/tqpixmap_mac.cpp \
$$KERNEL_CPP/tqprinter_mac.cpp \
$$KERNEL_CPP/tqpaintdevice_mac.cpp \
$$KERNEL_CPP/tqpainter_mac.cpp \
$$KERNEL_CPP/tqregion_mac.cpp \
$$KERNEL_CPP/tqwidget_mac.cpp \
- $$KERNEL_CPP/qeventloop_mac.cpp \
+ $$KERNEL_CPP/tqeventloop_mac.cpp \
$$KERNEL_CPP/tqfont_mac.cpp \
$$KERNEL_CPP/tqfontengine_mac.cpp
DEFINES += QMAC_ONE_PIXEL_LOCK
@@ -184,9 +184,9 @@ kernel {
SOURCES += $$KERNEL_CPP/tqprinter_unix.cpp \
$$KERNEL_CPP/qpsprinter.cpp
glibmainloop {
- SOURCES += $$KERNEL_CPP/qeventloop_unix_glib.cpp
+ SOURCES += $$KERNEL_CPP/tqeventloop_unix_glib.cpp
} else {
- SOURCES += $$KERNEL_CPP/qeventloop_unix.cpp
+ SOURCES += $$KERNEL_CPP/tqeventloop_unix.cpp
}
}
@@ -208,8 +208,8 @@ kernel {
$$KERNEL_CPP/tqdragobject.cpp \
$$KERNEL_CPP/qdrawutil.cpp \
$$KERNEL_CPP/tqdropsite.cpp \
- $$KERNEL_CPP/qevent.cpp \
- $$KERNEL_CPP/qeventloop.cpp \
+ $$KERNEL_CPP/tqevent.cpp \
+ $$KERNEL_CPP/tqeventloop.cpp \
$$KERNEL_CPP/qfocusdata.cpp \
$$KERNEL_CPP/tqfont.cpp \
$$KERNEL_CPP/tqfontdatabase.cpp \
@@ -220,7 +220,7 @@ kernel {
$$KERNEL_CPP/qkeysequence.cpp \
$$KERNEL_CPP/qlayout.cpp \
$$KERNEL_CPP/qlayoutengine.cpp \
- $$KERNEL_CPP/qtranslator.cpp \
+ $$KERNEL_CPP/tqtranslator.cpp \
$$KERNEL_CPP/qmetaobject.cpp \
$$KERNEL_CPP/tqmime.cpp \
$$KERNEL_CPP/tqmovie.cpp \
diff --git a/src/kernel/tqclipboard_x11.cpp b/src/kernel/tqclipboard_x11.cpp
index 5c78b7ee5..e20708f54 100644
--- a/src/kernel/tqclipboard_x11.cpp
+++ b/src/kernel/tqclipboard_x11.cpp
@@ -65,7 +65,7 @@
#ifndef TQT_NO_CLIPBOARD
#include "ntqapplication.h"
-#include "ntqeventloop.h"
+#include "tqeventloop.h"
#include "tqbitmap.h"
#include "tqdatetime.h"
#include "tqdragobject.h"
diff --git a/src/kernel/ntqdesktopwidget.h b/src/kernel/tqdesktopwidget.h
index 201267708..201267708 100644
--- a/src/kernel/ntqdesktopwidget.h
+++ b/src/kernel/tqdesktopwidget.h
diff --git a/src/kernel/qdesktopwidget_x11.cpp b/src/kernel/tqdesktopwidget_x11.cpp
index db3763530..5adc611bc 100644
--- a/src/kernel/qdesktopwidget_x11.cpp
+++ b/src/kernel/tqdesktopwidget_x11.cpp
@@ -36,7 +36,7 @@
**
**********************************************************************/
-#include "ntqdesktopwidget.h"
+#include "tqdesktopwidget.h"
#include "ntqapplication.h"
#include "tqobjectlist.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qevent.cpp b/src/kernel/tqevent.cpp
index 36f59c53f..5f4894e92 100644
--- a/src/kernel/qevent.cpp
+++ b/src/kernel/tqevent.cpp
@@ -38,13 +38,13 @@
**
**********************************************************************/
-#include "ntqevent.h"
+#include "tqevent.h"
#include "ntqcursor.h"
#include "ntqapplication.h"
/*!
- \class TQEvent ntqevent.h
+ \class TQEvent tqevent.h
\brief The TQEvent class is the base class of all
event classes. Event objects contain event parameters.
@@ -213,7 +213,7 @@
/*!
- \class TQTimerEvent ntqevent.h
+ \class TQTimerEvent tqevent.h
\brief The TQTimerEvent class contains parameters that describe a
timer event.
@@ -248,7 +248,7 @@
/*!
- \class TQMouseEvent ntqevent.h
+ \class TQMouseEvent tqevent.h
\ingroup events
\brief The TQMouseEvent class contains parameters that describe a mouse event.
@@ -483,7 +483,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const
/*!
- \class TQWheelEvent ntqevent.h
+ \class TQWheelEvent tqevent.h
\brief The TQWheelEvent class contains parameters that describe a wheel event.
\ingroup events
@@ -683,7 +683,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio
*/
/*!
- \class TQKeyEvent ntqevent.h
+ \class TQKeyEvent tqevent.h
\brief The TQKeyEvent class contains describes a key event.
\ingroup events
@@ -1160,7 +1160,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const
/*!
- \class TQFocusEvent ntqevent.h
+ \class TQFocusEvent tqevent.h
\brief The TQFocusEvent class contains event parameters for widget focus
events.
@@ -1264,7 +1264,7 @@ void TQFocusEvent::resetReason()
/*!
- \class TQPaintEvent ntqevent.h
+ \class TQPaintEvent tqevent.h
\brief The TQPaintEvent class contains event parameters for paint events.
\ingroup events
@@ -1336,7 +1336,7 @@ void TQFocusEvent::resetReason()
*/
/*!
- \class TQMoveEvent ntqevent.h
+ \class TQMoveEvent tqevent.h
\brief The TQMoveEvent class contains event parameters for move events.
\ingroup events
@@ -1371,7 +1371,7 @@ void TQFocusEvent::resetReason()
/*!
- \class TQResizeEvent ntqevent.h
+ \class TQResizeEvent tqevent.h
\brief The TQResizeEvent class contains event parameters for resize events.
\ingroup events
@@ -1405,7 +1405,7 @@ void TQFocusEvent::resetReason()
/*!
- \class TQCloseEvent ntqevent.h
+ \class TQCloseEvent tqevent.h
\brief The TQCloseEvent class contains parameters that describe a close event.
\ingroup events
@@ -1507,7 +1507,7 @@ void TQFocusEvent::resetReason()
*/
/*!
- \class TQIconDragEvent ntqevent.h
+ \class TQIconDragEvent tqevent.h
\brief The TQIconDragEvent class signals that a main icon drag has begun.
\ingroup events
@@ -1562,7 +1562,7 @@ void TQFocusEvent::resetReason()
*/
/*!
- \class TQContextMenuEvent ntqevent.h
+ \class TQContextMenuEvent tqevent.h
\brief The TQContextMenuEvent class contains parameters that describe a context menu event.
\ingroup events
@@ -1774,7 +1774,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
/*!
- \class TQIMEvent ntqevent.h
+ \class TQIMEvent tqevent.h
\brief The TQIMEvent class provides parameters for input method events.
\ingroup events
@@ -1913,7 +1913,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
*/
/*!
- \class TQTabletEvent ntqevent.h
+ \class TQTabletEvent tqevent.h
\brief The TQTabletEvent class contains parameters that describe a Tablet
event.
@@ -2156,7 +2156,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
*/
/*!
- \class TQChildEvent ntqevent.h
+ \class TQChildEvent tqevent.h
\brief The TQChildEvent class contains event parameters for child object
events.
@@ -2210,7 +2210,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
/*!
- \class TQCustomEvent ntqevent.h
+ \class TQCustomEvent tqevent.h
\brief The TQCustomEvent class provides support for custom events.
\ingroup events
@@ -2463,7 +2463,7 @@ TQCustomEvent::TQCustomEvent( int type )
/*!
- \class TQDragEnterEvent ntqevent.h
+ \class TQDragEnterEvent tqevent.h
\brief The TQDragEnterEvent class provides an event which is sent to the widget when a drag and drop first drags onto the widget.
\ingroup events
@@ -2487,7 +2487,7 @@ TQCustomEvent::TQCustomEvent( int type )
*/
/*!
- \class TQDragLeaveEvent ntqevent.h
+ \class TQDragLeaveEvent tqevent.h
\brief The TQDragLeaveEvent class provides an event which is sent to the widget when a drag and drop leaves the widget.
\ingroup events
@@ -2510,7 +2510,7 @@ TQCustomEvent::TQCustomEvent( int type )
*/
/*!
- \class TQHideEvent ntqevent.h
+ \class TQHideEvent tqevent.h
\brief The TQHideEvent class provides an event which is sent after a widget is hidden.
\ingroup events
@@ -2535,7 +2535,7 @@ TQCustomEvent::TQCustomEvent( int type )
*/
/*!
- \class TQShowEvent ntqevent.h
+ \class TQShowEvent tqevent.h
\brief The TQShowEvent class provides an event which is sent when a widget is shown.
\ingroup events
diff --git a/src/kernel/ntqevent.h b/src/kernel/tqevent.h
index f05fc2c94..f05fc2c94 100644
--- a/src/kernel/ntqevent.h
+++ b/src/kernel/tqevent.h
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/tqeventloop.cpp
index ce0f2bc82..4cbd98994 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/tqeventloop.cpp
@@ -36,8 +36,8 @@
**
**********************************************************************/
-#include "qeventloop_p.h" // includes qplatformdefs.h
-#include "ntqeventloop.h"
+#include "tqeventloop_p.h" // includes qplatformdefs.h
+#include "tqeventloop.h"
#include "ntqapplication.h"
#include "tqdatetime.h"
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/tqeventloop.h
index 75741a597..32848a53c 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/tqeventloop.h
@@ -56,7 +56,7 @@ class TQSocketNotifier;
class TQTimer;
#ifdef TQ_WS_MAC
struct timeval; //stdc struct
-struct TimerInfo; //internal structure (qeventloop_mac.cpp)
+struct TimerInfo; //internal structure (tqeventloop_mac.cpp)
#endif
#if defined(TQT_THREAD_SUPPORT)
diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/tqeventloop_glib_p.h
index cc7a3874e..b9a75241a 100644
--- a/src/kernel/qeventloop_glib_p.h
+++ b/src/kernel/tqeventloop_glib_p.h
@@ -1,11 +1,11 @@
/**
** TQt->glib main event loop integration by Norbert Frese 2005
-** code based on qeventloop_p.h 3.3.5
+** code based on tqeventloop_p.h 3.3.5
**
*/
/****************************************************************************
-** $Id: qt/qeventloop_glib_p.h
+** $Id: qt/tqeventloop_glib_p.h
**
** Definition of TQEventLoop class
**
@@ -54,7 +54,7 @@
# undef raise
#endif
-#include "ntqeventloop.h"
+#include "tqeventloop.h"
#include "ntqwindowdefs.h"
class TQSocketNotifier;
diff --git a/src/kernel/qeventloop_p.h b/src/kernel/tqeventloop_p.h
index 8ab5f954f..f28cf1214 100644
--- a/src/kernel/qeventloop_p.h
+++ b/src/kernel/tqeventloop_p.h
@@ -50,7 +50,7 @@
//
#if defined(QT_USE_GLIBMAINLOOP)
-#include "qeventloop_glib_p.h" // use a different header file!!!
+#include "tqeventloop_glib_p.h" // use a different header file!!!
#else
#ifndef QT_H
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/tqeventloop_unix.cpp
index 2f71b4c05..8ab816426 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/tqeventloop_unix.cpp
@@ -36,8 +36,8 @@
**
**********************************************************************/
-#include "qeventloop_p.h" // includes qplatformdefs.h
-#include "ntqeventloop.h"
+#include "tqeventloop_p.h" // includes qplatformdefs.h
+#include "tqeventloop.h"
#include "ntqapplication.h"
#include "tqbitarray.h"
#include "tqmutex.h"
diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/tqeventloop_unix_glib.cpp
index 11cb9ad94..200c9245d 100644
--- a/src/kernel/qeventloop_unix_glib.cpp
+++ b/src/kernel/tqeventloop_unix_glib.cpp
@@ -1,11 +1,11 @@
/**
** TQt->glib main event loop integration by Norbert Frese 2005
-** code based on qeventloop_unix.cpp 3.3.5
+** code based on tqeventloop_unix.cpp 3.3.5
**
*/
/****************************************************************************
-** $Id: qt/qeventloop_unix_glib.cpp
+** $Id: qt/tqeventloop_unix_glib.cpp
**
** Implementation of TQEventLoop class
**
@@ -36,8 +36,8 @@
**********************************************************************/
-#include "qeventloop_glib_p.h" // includes qplatformdefs.h
-#include "ntqeventloop.h"
+#include "tqeventloop_glib_p.h" // includes qplatformdefs.h
+#include "tqeventloop.h"
#include "ntqapplication.h"
#include "tqbitarray.h"
#include "tqmutex.h"
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/tqeventloop_x11.cpp
index db0bb4e71..b90ce7456 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/tqeventloop_x11.cpp
@@ -36,8 +36,8 @@
**
**********************************************************************/
-#include "qeventloop_p.h" // includes qplatformdefs.h
-#include "ntqeventloop.h"
+#include "tqeventloop_p.h" // includes qplatformdefs.h
+#include "tqeventloop.h"
#include "ntqapplication.h"
#include "tqbitarray.h"
#include "tqcolor_p.h"
@@ -62,7 +62,7 @@ static const int XKeyRelease = KeyRelease;
// from qapplication.cpp
extern bool tqt_is_gui_used;
-// from qeventloop_unix.cpp
+// from tqeventloop_unix.cpp
extern timeval *qt_wait_timer();
extern void cleanupTimers();
diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/tqeventloop_x11_glib.cpp
index ff64cb93c..f16fa1017 100644
--- a/src/kernel/qeventloop_x11_glib.cpp
+++ b/src/kernel/tqeventloop_x11_glib.cpp
@@ -1,11 +1,11 @@
/**
** TQt->glib main event loop integration by Norbert Frese 2005
-** code based on qeventloop_x11.cpp 3.3.5
+** code based on tqeventloop_x11.cpp 3.3.5
**
*/
/****************************************************************************
-** $Id: qt/qeventloop_x11_glib.cpp
+** $Id: qt/tqeventloop_x11_glib.cpp
**
** Implementation of TQEventLoop class
**
@@ -39,8 +39,8 @@
**
**********************************************************************/
-#include "qeventloop_glib_p.h" // includes qplatformdefs.h
-#include "ntqeventloop.h"
+#include "tqeventloop_glib_p.h" // includes qplatformdefs.h
+#include "tqeventloop.h"
#include "ntqapplication.h"
#include "tqbitarray.h"
#include "tqcolor_p.h"
@@ -62,7 +62,7 @@
typedef struct {
GSource source;
- TQEventLoop * qeventLoop;
+ TQEventLoop * tqeventLoop;
} TQtGSource;
static gboolean qt_gsource_prepare ( GSource *source, gint *timeout );
@@ -83,7 +83,7 @@ static GSourceFuncs qt_gsource_funcs = {
static gboolean qt_gsource_prepare ( GSource *source, gint *timeout )
{
TQtGSource * qtGSource = (TQtGSource*) source;
- TQEventLoop* candidateEventLoop = qtGSource->qeventLoop;
+ TQEventLoop* candidateEventLoop = qtGSource->tqeventLoop;
TQEventLoop* activeThreadEventLoop = TQApplication::eventLoop();
if (candidateEventLoop == activeThreadEventLoop) {
@@ -98,7 +98,7 @@ static gboolean qt_gsource_prepare ( GSource *source, gint *timeout )
static gboolean qt_gsource_check ( GSource *source )
{
TQtGSource * qtGSource = (TQtGSource*) source;
- TQEventLoop* candidateEventLoop = qtGSource->qeventLoop;
+ TQEventLoop* candidateEventLoop = qtGSource->tqeventLoop;
TQEventLoop* activeThreadEventLoop = TQApplication::eventLoop();
if (candidateEventLoop == activeThreadEventLoop) {
@@ -116,7 +116,7 @@ static gboolean qt_gsource_dispatch ( GSource *source, GSourceFunc callback, gpo
Q_UNUSED(user_data);
TQtGSource * qtGSource = (TQtGSource*) source;
- TQEventLoop* candidateEventLoop = qtGSource->qeventLoop;
+ TQEventLoop* candidateEventLoop = qtGSource->tqeventLoop;
TQEventLoop* activeThreadEventLoop = TQApplication::eventLoop();
if (candidateEventLoop == activeThreadEventLoop) {
@@ -143,7 +143,7 @@ static const int XKeyRelease = KeyRelease;
// from qapplication.cpp
extern bool tqt_is_gui_used;
-// from qeventloop_unix.cpp
+// from tqeventloop_unix.cpp
extern timeval *qt_wait_timer();
extern void cleanupTimers();
@@ -219,7 +219,7 @@ void TQEventLoop::init()
// new GSource
TQtGSource * qtGSource = (TQtGSource*) g_source_new(&qt_gsource_funcs, sizeof(TQtGSource));
g_source_set_can_recurse ((GSource*)qtGSource, TRUE);
- qtGSource->qeventLoop = this;
+ qtGSource->tqeventLoop = this;
// init main loop and attach gsource
#ifdef DEBUG_QT_GLIBMAINLOOP
diff --git a/src/kernel/tqfontengine_x11.cpp b/src/kernel/tqfontengine_x11.cpp
index 6363aac97..8002c42df 100644
--- a/src/kernel/tqfontengine_x11.cpp
+++ b/src/kernel/tqfontengine_x11.cpp
@@ -2264,6 +2264,8 @@ 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,
@@ -2351,6 +2353,7 @@ 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 },
@@ -2370,13 +2373,26 @@ static const OTScripts ot_scripts [] = {
{ FT_MAKE_TAG( 'D', 'F', 'L', 'T' ), 0 },
// Braille,
{ FT_MAKE_TAG( 'b', 'r', 'a', 'i' ), 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 },
+
+// 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 }
};
TQOpenType::TQOpenType(TQFontEngineXft *fe)
@@ -2435,7 +2451,10 @@ TQOpenType::~TQOpenType()
bool TQOpenType::checkScript(unsigned int script)
{
- assert(script < TQFont::NScripts);
+ if (script >= TQFont::NScripts || script >= sizeof(ot_scripts) / sizeof(OTScripts))
+ {
+ return false;
+ }
uint tag = ot_scripts[script].tag;
int requirements = ot_scripts[script].flags;
@@ -2477,7 +2496,11 @@ void TQOpenType::selectScript(unsigned int script, const Features *features)
if (current_script == script)
return;
- assert(script < TQFont::NScripts);
+ if (script >= TQFont::NScripts || script >= sizeof(ot_scripts) / sizeof(OTScripts))
+ {
+ return;
+ }
+
// find script in our list of supported scripts.
uint tag = ot_scripts[script].tag;
diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h
index cc67ba551..3ee1c6c19 100644
--- a/src/kernel/tqobject.h
+++ b/src/kernel/tqobject.h
@@ -45,7 +45,7 @@
#include "tqobjectdefs.h"
#include "ntqwindowdefs.h"
#include "tqstring.h"
-#include "ntqevent.h"
+#include "tqevent.h"
#include "tqmutex.h"
#include "ntqnamespace.h"
#endif // QT_H
diff --git a/src/kernel/tqsocketnotifier.cpp b/src/kernel/tqsocketnotifier.cpp
index 1a6390893..b350403a5 100644
--- a/src/kernel/tqsocketnotifier.cpp
+++ b/src/kernel/tqsocketnotifier.cpp
@@ -40,8 +40,8 @@
#include "tqsocketnotifier.h"
#include "ntqapplication.h"
-#include "ntqevent.h"
-#include "ntqeventloop.h"
+#include "tqevent.h"
+#include "tqeventloop.h"
#include "qplatformdefs.h"
#if defined(Q_OS_UNIX)
diff --git a/src/kernel/tqthread.cpp b/src/kernel/tqthread.cpp
index 27b2071ea..560577589 100644
--- a/src/kernel/tqthread.cpp
+++ b/src/kernel/tqthread.cpp
@@ -41,7 +41,7 @@
#include "qplatformdefs.h"
#include "tqthread.h"
-#include "ntqeventloop.h"
+#include "tqeventloop.h"
#include <private/tqthreadinstance_p.h>
#ifndef QT_H
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/tqtranslator.cpp
index cda1735ae..f67c6d363 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/tqtranslator.cpp
@@ -52,7 +52,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
# undef truncate
#endif
-#include "ntqtranslator.h"
+#include "tqtranslator.h"
#ifndef TQT_NO_TRANSLATION
diff --git a/src/kernel/ntqtranslator.h b/src/kernel/tqtranslator.h
index 39f9faa36..39f9faa36 100644
--- a/src/kernel/ntqtranslator.h
+++ b/src/kernel/tqtranslator.h
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 65f97e615..6892af3b7 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -410,7 +410,7 @@
\endlist
There are also some rather obscure events. They are listed in
- \c ntqevent.h and you need to reimplement event() to handle them.
+ \c tqevent.h and you need to reimplement event() to handle them.
The default implementation of event() handles Tab and Shift+Tab
(to move the keyboard focus), and passes on most other events to
one of the more specialized handlers above.
@@ -6051,7 +6051,7 @@ const TQPixmap *TQWidget::backgroundPixmap() const { return erasePixmap(); }
void TQWidget::setBackgroundPixmap( const TQPixmap &pm ) { setErasePixmap( pm ); }
-// documentation in qdesktopwidget_win.cpp
+// documentation in tqdesktopwidget_win.cpp
void TQDesktopWidget::insertChild( TQObject *obj )
{
if ( obj->isWidgetType() )
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 25f906776..ef4cffc19 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -58,7 +58,7 @@
#include <ntqcombobox.h>
#include <ntqcheckbox.h>
#include <tqdragobject.h>
-#include <ntqevent.h>
+#include <tqevent.h>
#include <ntqlistbox.h>
#include <tqstyle.h>
#include <tqdatatable.h>
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index c7f6af826..4d0d41141 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -41,7 +41,7 @@
#include "ntqdockwindow.h"
#ifndef TQT_NO_MAINWINDOW
-#include "ntqdesktopwidget.h"
+#include "tqdesktopwidget.h"
#include "ntqdockarea.h"
#include "tqwidgetresizehandler_p.h"
#include "qtitlebar_p.h"
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 703912df9..6febcfe30 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -50,7 +50,7 @@
#include "tqfontmetrics.h"
#include "tqpainter.h"
-#include "ntqevent.h"
+#include "tqevent.h"
#include "tqpalette.h"
#include "tqmime.h"
#include "tqimage.h"
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 9ef0752a7..ed03eba64 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -56,7 +56,7 @@
#include "tqcolor.h"
#include "tqstyle.h"
#include "tqsize.h"
-#include "ntqevent.h"
+#include "tqevent.h"
#include "tqtimer.h"
#include "ntqapplication.h"
#include "ntqlistbox.h"
diff --git a/src/widgets/tqtoolbox.cpp b/src/widgets/tqtoolbox.cpp
index 17580a0e7..7b515b0a7 100644
--- a/src/widgets/tqtoolbox.cpp
+++ b/src/widgets/tqtoolbox.cpp
@@ -53,7 +53,7 @@
#include <ntqlayout.h>
#include <tqvaluelist.h>
#include <tqtooltip.h>
-#include <ntqeventloop.h>
+#include <tqeventloop.h>
#include <tqdatetime.h>
class TQToolBoxButton : public TQButton
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-14 01:50:13 +0000