diff options
Diffstat (limited to 'src')
48 files changed, 83 insertions, 106 deletions
diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp index c5cdedc3c..ac22ea7f1 100644 --- a/src/codecs/tqtextcodec.cpp +++ b/src/codecs/tqtextcodec.cpp @@ -69,7 +69,7 @@ #include "tqfile.h" #include "tqstrlist.h" #include "tqstring.h" -#include "../tools/qlocale_p.h" +#include "../tools/tqlocale_p.h" #if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(TQ_WS_X11) # include "tqfontcodecs_p.h" diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h index eb5e065a1..dc32aa390 100644 --- a/src/dialogs/ntqprogressdialog.h +++ b/src/dialogs/ntqprogressdialog.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqdialog.h" -#include "ntqlabel.h" // ### remove or keep for users' convenience? +#include "tqlabel.h" // ### remove or keep for users' convenience? #include "ntqprogressbar.h" // ### remove or keep for users' convenience? #endif // QT_H diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index 46844a568..9f1f624a9 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -49,7 +49,7 @@ #include "tqwidgetlist.h" #include "ntqlayout.h" #include "tqsizegrip.h" -#include "ntqwhatsthis.h" +#include "tqwhatsthis.h" #include "tqpopupmenu.h" #include "ntqcursor.h" #if defined(QT_ACCESSIBILITY_SUPPORT) diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index 116712ec1..5d21cf717 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -45,7 +45,7 @@ #include "ntqapplication.h" #include "ntqcheckbox.h" #include "tqdict.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqlayout.h" #include "ntqmessagebox.h" #include "ntqpushbutton.h" diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp index 084039c7a..6e8e7627c 100644 --- a/src/dialogs/qinputdialog.cpp +++ b/src/dialogs/qinputdialog.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_INPUTDIALOG #include "ntqlayout.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqlineedit.h" #include "ntqpushbutton.h" #include "ntqspinbox.h" diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index e0bbae0cf..a80a26886 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_MESSAGEBOX #include "ntqaccel.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqpushbutton.h" #include "tqimage.h" #include "ntqapplication.h" diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index 42efc6e81..0fc6f6935 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -47,7 +47,7 @@ #include "tqtextstream.h" #include "ntqcombobox.h" #include "ntqframe.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqlineedit.h" #include "ntqpushbutton.h" #include "tqprinter.h" diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp index 3f8371ea7..6669a4e7a 100644 --- a/src/dialogs/qwizard.cpp +++ b/src/dialogs/qwizard.cpp @@ -45,7 +45,7 @@ #include "ntqlayout.h" #include "ntqpushbutton.h" #include "ntqcursor.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "tqwidgetstack.h" #include "ntqapplication.h" #include "tqptrlist.h" diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp index f90f8df2e..19e08c61a 100644 --- a/src/dialogs/tqcolordialog.cpp +++ b/src/dialogs/tqcolordialog.cpp @@ -44,7 +44,7 @@ #include "tqpainter.h" #include "ntqlayout.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqpushbutton.h" #include "ntqlineedit.h" #include "tqimage.h" diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp index 194d7478a..5ed1ff6be 100644 --- a/src/dialogs/tqfiledialog.cpp +++ b/src/dialogs/tqfiledialog.cpp @@ -68,7 +68,7 @@ #include "ntqguardedptr.h" #include "ntqhbox.h" #include "ntqheader.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqlayout.h" #include "ntqlibrary.h" #include "ntqlineedit.h" diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp index 8e7999a2b..c9b5daef0 100644 --- a/src/dialogs/tqfontdialog.cpp +++ b/src/dialogs/tqfontdialog.cpp @@ -52,7 +52,7 @@ #include "ntqlayout.h" #include "ntqvgroupbox.h" #include "ntqhgroupbox.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqapplication.h" #include "tqfontdatabase.h" #include "tqstyle.h" 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 diff --git a/src/moc/moc.pro b/src/moc/moc.pro index dabdef560..e1b56f668 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -28,7 +28,7 @@ SOURCES = ../tools/tqbuffer.cpp \ ../tools/tqiodevice.cpp \ ../tools/tqregexp.cpp \ ../tools/tqstring.cpp \ - ../tools/qlocale.cpp \ + ../tools/tqlocale.cpp \ ../tools/qunicodetables.cpp \ ../tools/tqstringlist.cpp \ ../tools/tqtextstream.cpp \ diff --git a/src/sql/tqeditorfactory.cpp b/src/sql/tqeditorfactory.cpp index 7893a1355..00f625b55 100644 --- a/src/sql/tqeditorfactory.cpp +++ b/src/sql/tqeditorfactory.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqcleanuphandler.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqlineedit.h" #include "ntqspinbox.h" #include "ntqcombobox.h" diff --git a/src/sql/tqsqleditorfactory.cpp b/src/sql/tqsqleditorfactory.cpp index 6be4a2d36..cf4944ae4 100644 --- a/src/sql/tqsqleditorfactory.cpp +++ b/src/sql/tqsqleditorfactory.cpp @@ -44,7 +44,7 @@ #include "tqsqlfield.h" #include "ntqcleanuphandler.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqlineedit.h" #include "ntqspinbox.h" #include "ntqcombobox.h" diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/qinterlacestyle.cpp index 5322c68ba..43917bd27 100644 --- a/src/styles/qinterlacestyle.cpp +++ b/src/styles/qinterlacestyle.cpp @@ -49,7 +49,7 @@ #include "ntqdrawutil.h" // for now #include "tqpalette.h" // for now #include "tqwidget.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqpushbutton.h" #include "tqwidget.h" #include "ntqrangecontrol.h" diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp index 1a9fff5e9..27437724f 100644 --- a/src/styles/qwindowsstyle.cpp +++ b/src/styles/qwindowsstyle.cpp @@ -48,7 +48,7 @@ #include "ntqdrawutil.h" // for now #include "tqpixmap.h" // for now #include "tqwidget.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "tqimage.h" #include "ntqpushbutton.h" #include "ntqcombobox.h" diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt index 323f38109..89917cbec 100644 --- a/src/tools/qfeatures.txt +++ b/src/tools/qfeatures.txt @@ -591,7 +591,7 @@ SeeAlso: ??? Feature: LABEL Section: Widgets Requires: FRAME -Name: QLabel +Name: TQLabel SeeAlso: ??? Feature: TOOLBAR diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp index ff5fd5c74..5e9f38a8a 100644 --- a/src/tools/qglobal.cpp +++ b/src/tools/qglobal.cpp @@ -862,7 +862,7 @@ TQtMsgHandler qInstallMsgHandler( TQtMsgHandler h ) /* Dijkstra's bisection algorithm to find the square root as an integer. Deliberately not exported as part of the TQt API, but used in - qsimplerichtext.cpp + tqsimplerichtext.cpp */ unsigned int qt_int_sqrt( unsigned int n ) { diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index c4cced519..5eb816580 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -34,8 +34,8 @@ tools { $$TOOLS_H/tqiodevice.h \ $$TOOLS_H/ntqlibrary.h \ $$TOOLS_P/qlibrary_p.h \ - $$TOOLS_H/ntqlocale.h \ - $$TOOLS_P/qlocale_p.h \ + $$TOOLS_H/tqlocale.h \ + $$TOOLS_P/tqlocale_p.h \ $$TOOLS_H/tqptrlist.h \ $$TOOLS_H/tqmap.h \ $$TOOLS_H/tqmutex.h \ @@ -126,7 +126,7 @@ tools { $$TOOLS_CPP/qgvector.cpp \ $$TOOLS_CPP/tqiodevice.cpp \ $$TOOLS_CPP/qlibrary.cpp \ - $$TOOLS_CPP/qlocale.cpp \ + $$TOOLS_CPP/tqlocale.cpp \ $$TOOLS_CPP/tqmap.cpp \ $$TOOLS_CPP/tqmutexpool.cpp \ $$TOOLS_CPP/tqptrcollection.cpp \ @@ -143,7 +143,7 @@ tools { irix-cc* { CXXFLAGS_PRELINK = $$QMAKE_CXXFLAGS CXXFLAGS_PRELINK -= -O2 - QMAKE_PRE_LINK = $(CXX) -c $$CXXFLAGS_PRELINK -O1 $(INCPATH) -o $(OBJECTS_DIR)/qlocale.o tools/qlocale.cpp + QMAKE_PRE_LINK = $(CXX) -c $$CXXFLAGS_PRELINK -O1 $(INCPATH) -o $(OBJECTS_DIR)/tqlocale.o tools/tqlocale.cpp } } diff --git a/src/tools/qlocale.cpp b/src/tools/tqlocale.cpp index fc02f8ef2..57ddcfb3f 100644 --- a/src/tools/qlocale.cpp +++ b/src/tools/tqlocale.cpp @@ -43,8 +43,8 @@ #include <math.h> #include <stdlib.h> -#include "ntqlocale.h" -#include "qlocale_p.h" +#include "tqlocale.h" +#include "tqlocale_p.h" #include "ntqnamespace.h" #ifdef QT_QLOCALE_USES_FCVT diff --git a/src/tools/ntqlocale.h b/src/tools/tqlocale.h index d3a578d1c..d3a578d1c 100644 --- a/src/tools/ntqlocale.h +++ b/src/tools/tqlocale.h diff --git a/src/tools/qlocale_p.h b/src/tools/tqlocale_p.h index 8d562d22c..8d562d22c 100644 --- a/src/tools/qlocale_p.h +++ b/src/tools/tqlocale_p.h diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp index 58a377cd7..546069d48 100644 --- a/src/tools/tqstring.cpp +++ b/src/tools/tqstring.cpp @@ -56,8 +56,8 @@ #ifndef TQT_NO_TEXTCODEC #include "tqtextcodec.h" #endif -#include "ntqlocale.h" -#include "qlocale_p.h" +#include "tqlocale.h" +#include "tqlocale_p.h" #include "qunicodetables_p.h" #include <limits.h> diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 75570cc09..d37c43539 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -59,7 +59,7 @@ #include "tqstringlist.h" #include "ntqguardedptr.h" #include "tqstyle.h" -#include "ntqwhatsthis.h" +#include "tqwhatsthis.h" #include "../kernel/qinternal_p.h" #include "private/tqtextlayout_p.h" #include "tqvaluevector.h" diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri index 38ef25ca9..876cc428c 100644 --- a/src/widgets/qt_widgets.pri +++ b/src/widgets/qt_widgets.pri @@ -21,7 +21,7 @@ widgets { $$WIDGETS_H/ntqhgroupbox.h \ $$WIDGETS_H/ntqhbox.h \ $$WIDGETS_H/tqiconview.h \ - $$WIDGETS_H/ntqlabel.h \ + $$WIDGETS_H/tqlabel.h \ $$WIDGETS_H/ntqlcdnumber.h \ $$WIDGETS_H/ntqlineedit.h \ $$WIDGETS_H/ntqlistbox.h \ @@ -43,8 +43,8 @@ widgets { $$WIDGETS_H/ntqsplitter.h \ $$WIDGETS_H/tqstatusbar.h \ $$WIDGETS_H/ntqtabbar.h \ - $$WIDGETS_H/ntqsyntaxhighlighter.h \ - $$WIDGETS_P/qsyntaxhighlighter_p.h \ + $$WIDGETS_H/tqsyntaxhighlighter.h \ + $$WIDGETS_P/tqsyntaxhighlighter_p.h \ $$WIDGETS_H/ntqtabwidget.h \ $$WIDGETS_P/qtitlebar_p.h \ $$WIDGETS_H/tqtoolbar.h \ @@ -55,7 +55,7 @@ widgets { $$WIDGETS_H/ntqvbox.h \ $$WIDGETS_H/ntqvbuttongroup.h \ $$WIDGETS_H/ntqvgroupbox.h \ - $$WIDGETS_H/ntqwhatsthis.h \ + $$WIDGETS_H/tqwhatsthis.h \ $$WIDGETS_H/tqwidgetstack.h \ $$WIDGETS_H/tqaction.h \ $$WIDGETS_H/tqdatetimeedit.h \ @@ -83,7 +83,7 @@ widgets { $$WIDGETS_CPP/qhgroupbox.cpp \ $$WIDGETS_CPP/qhbox.cpp \ $$WIDGETS_CPP/tqiconview.cpp \ - $$WIDGETS_CPP/qlabel.cpp \ + $$WIDGETS_CPP/tqlabel.cpp \ $$WIDGETS_CPP/qlcdnumber.cpp \ $$WIDGETS_CPP/qlineedit.cpp \ $$WIDGETS_CPP/qlistbox.cpp \ @@ -105,7 +105,7 @@ widgets { $$WIDGETS_CPP/qspinwidget.cpp \ $$WIDGETS_CPP/qsplitter.cpp \ $$WIDGETS_CPP/tqstatusbar.cpp \ - $$WIDGETS_CPP/qsyntaxhighlighter.cpp \ + $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \ $$WIDGETS_CPP/qtabbar.cpp \ $$WIDGETS_CPP/qtabwidget.cpp \ $$WIDGETS_CPP/qtitlebar.cpp \ @@ -117,7 +117,7 @@ widgets { $$WIDGETS_CPP/qvbox.cpp \ $$WIDGETS_CPP/qvbuttongroup.cpp \ $$WIDGETS_CPP/qvgroupbox.cpp \ - $$WIDGETS_CPP/qwhatsthis.cpp \ + $$WIDGETS_CPP/tqwhatsthis.cpp \ $$WIDGETS_CPP/tqwidgetstack.cpp \ $$WIDGETS_CPP/tqaction.cpp \ $$WIDGETS_CPP/tqdatetimeedit.cpp \ @@ -133,9 +133,9 @@ wince-* { SOURCES += $$WIDGETS_CPP/ce/qcemainwindow.cpp HEADERS += $$WIDGETS_H/ce/qcemainwindow.h - SOURCES -= $$WIDGETS_CPP/qsyntaxhighlighter.cpp \ + SOURCES -= $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \ $$WIDGETS_CPP/qsplashscreen.cpp - HEADERS -= $$WIDGETS_H/ntqsyntaxhighlighter.h \ + HEADERS -= $$WIDGETS_H/tqsyntaxhighlighter.h \ $$WIDGETS_H/ntqsplashscreen.h } diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h index b933658dd..ae9fd6b15 100644 --- a/src/widgets/qtitlebar_p.h +++ b/src/widgets/qtitlebar_p.h @@ -57,7 +57,7 @@ #ifndef QT_H #include "ntqbutton.h" -#include "ntqlabel.h" +#include "tqlabel.h" #endif // QT_H #if !defined(TQT_NO_TITLEBAR) diff --git a/src/widgets/tqaction.cpp b/src/widgets/tqaction.cpp index 6bf1a50f8..31d308420 100644 --- a/src/widgets/tqaction.cpp +++ b/src/widgets/tqaction.cpp @@ -47,7 +47,7 @@ #include "tqtoolbutton.h" #include "ntqcombobox.h" #include "tqtooltip.h" -#include "ntqwhatsthis.h" +#include "tqwhatsthis.h" #include "tqstatusbar.h" #include "tqobjectlist.h" diff --git a/src/widgets/qlabel.cpp b/src/widgets/tqlabel.cpp index 7f2c5cbae..7f9d858bb 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/tqlabel.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "ntqlabel.h" +#include "tqlabel.h" #ifndef TQT_NO_LABEL #include "tqpainter.h" #include "ntqdrawutil.h" @@ -48,7 +48,7 @@ #include "tqbitmap.h" #include "tqpicture.h" #include "ntqapplication.h" -#include "ntqsimplerichtext.h" +#include "tqsimplerichtext.h" #include "tqstylesheet.h" #include "tqstyle.h" @@ -67,7 +67,7 @@ public: /*! - \class TQLabel ntqlabel.h + \class TQLabel tqlabel.h \brief The TQLabel widget provides a text or image display. \ingroup basic @@ -128,7 +128,7 @@ public: buddy (the TQLineEdit) when the user presses Alt+P. You can also use the setBuddy() function to accomplish the same thing. - <img src=qlabel-m.png> <img src=qlabel-w.png> + <img src=tqlabel-m.png> <img src=tqlabel-w.png> \sa TQLineEdit, TQTextEdit, TQPixmap, TQMovie, \link guibooks.html#fowler GUI Design Handbook: Label\endlink @@ -258,7 +258,7 @@ void TQLabel::init() The label resizes itself if auto-resizing is enabled. - Note that Qlabel is well-suited to display small rich text + Note that TQLabel is well-suited to display small rich text documents, i.e. those small documents that get their document specific settings (font, text color, link color) from the label's palette and font properties. For large documents, use TQTextEdit diff --git a/src/widgets/ntqlabel.h b/src/widgets/tqlabel.h index f8d728807..f8d728807 100644 --- a/src/widgets/ntqlabel.h +++ b/src/widgets/tqlabel.h diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp index 071a330ff..7b66839db 100644 --- a/src/widgets/tqmainwindow.cpp +++ b/src/widgets/tqmainwindow.cpp @@ -57,7 +57,7 @@ #include "ntqscrollview.h" #include "tqtooltip.h" #include "tqdatetime.h" -#include "ntqwhatsthis.h" +#include "tqwhatsthis.h" #include "tqbitmap.h" #include "ntqdockarea.h" #include "tqstringlist.h" diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp index 09961bf03..26aa7f9cc 100644 --- a/src/widgets/tqpopupmenu.cpp +++ b/src/widgets/tqpopupmenu.cpp @@ -48,7 +48,7 @@ #include "tqpixmap.h" #include "tqpixmapcache.h" #include "tqtimer.h" -#include "ntqwhatsthis.h" +#include "tqwhatsthis.h" #include "tqobjectlist.h" #include "ntqguardedptr.h" #include "qeffects_p.h" @@ -124,7 +124,7 @@ static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) { static bool preventAnimation = FALSE; #ifndef TQT_NO_WHATSTHIS -extern void qWhatsThisBDH(); +extern void tqWhatsThisBDH(); static TQMenuItem* whatsThisItem = 0; #endif @@ -816,7 +816,7 @@ void TQPopupMenu::hideAllPopups() #ifndef TQT_NO_WHATSTHIS if (whatsThisItem) { - qWhatsThisBDH(); + tqWhatsThisBDH(); whatsThisItem = 0; } #endif @@ -2570,7 +2570,7 @@ void TQPopupMenu::setActiveItem( int i ) hilitSig( mi->id() ); #ifndef TQT_NO_WHATSTHIS if (whatsThisItem && whatsThisItem != mi) { - qWhatsThisBDH(); + tqWhatsThisBDH(); } whatsThisItem = mi; #endif diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/tqsyntaxhighlighter.cpp index d9fececf1..223f7930c 100644 --- a/src/widgets/qsyntaxhighlighter.cpp +++ b/src/widgets/tqsyntaxhighlighter.cpp @@ -38,8 +38,8 @@ ** **********************************************************************/ -#include "ntqsyntaxhighlighter.h" -#include "private/qsyntaxhighlighter_p.h" +#include "tqsyntaxhighlighter.h" +#include "private/tqsyntaxhighlighter_p.h" #ifndef TQT_NO_SYNTAXHIGHLIGHTER #include "../kernel/qrichtext_p.h" @@ -47,7 +47,7 @@ #include "tqtimer.h" /*! - \class TQSyntaxHighlighter ntqsyntaxhighlighter.h + \class TQSyntaxHighlighter tqsyntaxhighlighter.h \brief The TQSyntaxHighlighter class is a base class for implementing TQTextEdit syntax highlighters. diff --git a/src/widgets/ntqsyntaxhighlighter.h b/src/widgets/tqsyntaxhighlighter.h index 81556553e..81556553e 100644 --- a/src/widgets/ntqsyntaxhighlighter.h +++ b/src/widgets/tqsyntaxhighlighter.h diff --git a/src/widgets/qsyntaxhighlighter_p.h b/src/widgets/tqsyntaxhighlighter_p.h index 156cc9321..c4d7deabf 100644 --- a/src/widgets/qsyntaxhighlighter_p.h +++ b/src/widgets/tqsyntaxhighlighter_p.h @@ -42,7 +42,7 @@ #define TQSYNTAXHIGHLIGHTER_P_H #ifndef TQT_NO_SYNTAXHIGHLIGHTER -#include "ntqsyntaxhighlighter.h" +#include "tqsyntaxhighlighter.h" #include "private/qrichtext_p.h" class TQSyntaxHighlighterPrivate diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp index fd4bced0a..1409a20ff 100644 --- a/src/widgets/tqtextbrowser.cpp +++ b/src/widgets/tqtextbrowser.cpp @@ -54,7 +54,7 @@ #include "tqbitmap.h" #include "tqtimer.h" #include "tqimage.h" -#include "ntqsimplerichtext.h" +#include "tqsimplerichtext.h" #include "tqdragobject.h" #include "tqurl.h" #include "ntqcursor.h" diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp index a0887cb5d..9ef0752a7 100644 --- a/src/widgets/tqtextedit.cpp +++ b/src/widgets/tqtextedit.cpp @@ -75,7 +75,7 @@ #include "ntqmetaobject.h" #include "tqtextbrowser.h" #include <private/qucom_p.h> -#include "private/qsyntaxhighlighter_p.h" +#include "private/tqsyntaxhighlighter_p.h" #include <ntqguardedptr.h> #ifndef TQT_NO_ACCEL diff --git a/src/widgets/tqtooltip.cpp b/src/widgets/tqtooltip.cpp index 6a048f5e1..7a9166452 100644 --- a/src/widgets/tqtooltip.cpp +++ b/src/widgets/tqtooltip.cpp @@ -38,7 +38,7 @@ #include "tqtooltip.h" #ifndef TQT_NO_TOOLTIP -#include "ntqlabel.h" +#include "tqlabel.h" #include "tqptrdict.h" #include "ntqapplication.h" #include "ntqguardedptr.h" diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/tqwhatsthis.cpp index 65df04e7b..1328c49ea 100644 --- a/src/widgets/qwhatsthis.cpp +++ b/src/widgets/tqwhatsthis.cpp @@ -36,7 +36,7 @@ ** **********************************************************************/ -#include "ntqwhatsthis.h" +#include "tqwhatsthis.h" #ifndef TQT_NO_WHATSTHIS #include "ntqapplication.h" #include "tqpaintdevicemetrics.h" @@ -49,7 +49,7 @@ #include "ntqcursor.h" #include "tqbitmap.h" #include "tqtooltip.h" -#include "ntqsimplerichtext.h" +#include "tqsimplerichtext.h" #include "tqstylesheet.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "ntqaccessible.h" @@ -62,7 +62,7 @@ #endif /*! - \class TQWhatsThis ntqwhatsthis.h + \class TQWhatsThis tqwhatsthis.h \brief The TQWhatsThis class provides a simple description of any widget, i.e. answering the question "What's this?". @@ -233,7 +233,7 @@ const int vMargin = 8; const int hMargin = 12; // Lets TQPopupMenu destroy the TQWhatsThat. -void qWhatsThisBDH() +void tqWhatsThisBDH() { if ( wt && wt->whatsThat ) wt->whatsThat->hide(); @@ -479,7 +479,7 @@ void TQWhatsThisButton::mouseReleased() } } -static void qWhatsThisPrivateCleanup() +static void tqWhatsThisPrivateCleanup() { if( wt ) { delete wt; @@ -617,7 +617,7 @@ void TQWhatsThisPrivate::setUpWhatsThis() // It is necessary to use a post routine, because // the destructor deletes pixmaps and other stuff that // needs a working X connection under X11. - tqAddPostRoutine( qWhatsThisPrivateCleanup ); + tqAddPostRoutine( tqWhatsThisPrivateCleanup ); } } @@ -997,5 +997,5 @@ void TQWhatsThis::setFont( const TQFont &font ) TQApplication::setFont( font, TRUE, "TQWhatsThat" ); } -#include "qwhatsthis.moc" +#include "tqwhatsthis.moc" #endif diff --git a/src/widgets/ntqwhatsthis.h b/src/widgets/tqwhatsthis.h index 66b4b3c90..66b4b3c90 100644 --- a/src/widgets/ntqwhatsthis.h +++ b/src/widgets/tqwhatsthis.h diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp index bf4fe9de0..72319497b 100644 --- a/src/workspace/tqworkspace.cpp +++ b/src/workspace/tqworkspace.cpp @@ -45,7 +45,7 @@ #include "tqobjectlist.h" #include "ntqlayout.h" #include "tqtoolbutton.h" -#include "ntqlabel.h" +#include "tqlabel.h" #include "ntqvbox.h" #include "ntqaccel.h" #include "ntqcursor.h" |