diff options
Diffstat (limited to 'src/kernel')
43 files changed, 57 insertions, 57 deletions
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index 4696b290e..a475fb991 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -46,8 +46,8 @@ #include "ntqasciidict.h" #include "ntqpalette.h" #include "ntqtranslator.h" -#include "ntqstrlist.h" -#include "ntqstringlist.h" +#include "tqstrlist.h" +#include "tqstringlist.h" #endif // QT_H class TQSessionManager; diff --git a/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h index 5c32307ea..0fca55097 100644 --- a/src/kernel/ntqcolor.h +++ b/src/kernel/ntqcolor.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqwindowdefs.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H const TQRgb TQT_RGB_MASK = 0x00ffffff; // masks RGB values diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h index 5f6147409..af4a8a995 100644 --- a/src/kernel/ntqdragobject.h +++ b/src/kernel/ntqdragobject.h @@ -48,7 +48,7 @@ class TQImageDragData; #ifndef QT_H #include "tqobject.h" #include "tqimage.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqcolor.h" #endif // QT_H diff --git a/src/kernel/ntqdrawutil.h b/src/kernel/ntqdrawutil.h index fb6f70257..d8e2703d2 100644 --- a/src/kernel/ntqdrawutil.h +++ b/src/kernel/ntqdrawutil.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqnamespace.h" -#include "ntqstring.h" // char*->TQString conversion +#include "tqstring.h" // char*->TQString conversion #endif // QT_H class TQPainter; diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h index d2a45c981..08297a189 100644 --- a/src/kernel/ntqfont.h +++ b/src/kernel/ntqfont.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqwindowdefs.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index 1894c5598..06807d02c 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "ntqwindowdefs.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "ntqfont.h" #include "tqvaluelist.h" #endif // QT_H diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index f782c1f7c..2486fc3a9 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -42,7 +42,7 @@ #include "tqobject.h" #include "ntqglobal.h" #include "ntqevent.h" -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrlist.h" #endif diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/ntqkeysequence.h index 5036e69d3..e4800839d 100644 --- a/src/kernel/ntqkeysequence.h +++ b/src/kernel/ntqkeysequence.h @@ -44,7 +44,7 @@ #ifndef QT_H #ifndef QT_H #include "ntqnamespace.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #endif diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h index d4ed34e14..857b491c5 100644 --- a/src/kernel/ntqmetaobject.h +++ b/src/kernel/ntqmetaobject.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqconnection.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #endif // QT_H #ifndef Q_MOC_OUTPUT_REVISION diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h index c540c549b..8bdc0a374 100644 --- a/src/kernel/ntqnamespace.h +++ b/src/kernel/ntqnamespace.h @@ -988,7 +988,7 @@ public: typedef uint ComparisonFlags; - // Documented in qstring.cpp + // Documented in tqstring.cpp enum StringComparisonMode { CaseSensitive = 0x00001, // 0 0001 BeginsWith = 0x00002, // 0 0010 diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h index 3872ffb3c..f41d14c4d 100644 --- a/src/kernel/ntqnetworkprotocol.h +++ b/src/kernel/ntqnetworkprotocol.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqurlinfo.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqdict.h" #include "tqobject.h" #endif // QT_H diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h index e6e5e529b..340e5b7f9 100644 --- a/src/kernel/ntqpixmap.h +++ b/src/kernel/ntqpixmap.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "ntqpaintdevice.h" #include "ntqcolor.h" // char*->TQColor conversion -#include "ntqstring.h" // char*->TQString conversion +#include "tqstring.h" // char*->TQString conversion #include "ntqnamespace.h" #endif // QT_H diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h index f7175bb51..90070c115 100644 --- a/src/kernel/ntqprinter.h +++ b/src/kernel/ntqprinter.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "ntqpaintdevice.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_PRINTER diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h index e3e189af0..69dba4d6c 100644 --- a/src/kernel/ntqprocess.h +++ b/src/kernel/ntqprocess.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqobject.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqdir.h" #endif // QT_H diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h index 600b2950e..ae79dd30b 100644 --- a/src/kernel/ntqsessionmanager.h +++ b/src/kernel/ntqsessionmanager.h @@ -44,8 +44,8 @@ #ifndef QT_H #include "tqobject.h" #include "ntqwindowdefs.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_SESSIONMANAGER diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h index f4b11e650..0f19a3971 100644 --- a/src/kernel/ntqsimplerichtext.h +++ b/src/kernel/ntqsimplerichtext.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqnamespace.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqregion.h" #endif // QT_H diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h index dbf5fd6ef..1c12775cc 100644 --- a/src/kernel/ntqstylesheet.h +++ b/src/kernel/ntqstylesheet.h @@ -42,7 +42,7 @@ #define TQSTYLESHEET_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "tqvaluelist.h" #include "tqptrvector.h" #include "ntqdict.h" diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index a11383bb5..876d07c1f 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -25,7 +25,7 @@ #include "ntqgarray.h" #include "ntqmemarray.h" #include "ntqcstring.h" -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrlist.h" #include "ntqiodevice.h" #include "ntqkeysequence.h" @@ -45,7 +45,7 @@ #include "ntqbitarray.h" #include "ntqregion.h" #include "tqsql.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "tqvaluelist.h" #include "tqmap.h" #include "ntqdatetime.h" @@ -56,7 +56,7 @@ #include "ntqdict.h" #include "ntqevent.h" #include "ntqhostaddress.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqcolor.h" #include <tqdom.h> #include "tqobject.h" @@ -220,7 +220,7 @@ #include <ntqmenubar.h> #include <tqcanvas.h> #include "ntqtranslator.h" -#include <ntqstrvec.h> +#include <tqstrvec.h> #include <ntqinterlacestyle.h> #include <ntqstylefactory.h> #include <ntqstyleplugin.h> diff --git a/src/kernel/ntqurl.h b/src/kernel/ntqurl.h index c984788f5..741719d44 100644 --- a/src/kernel/ntqurl.h +++ b/src/kernel/ntqurl.h @@ -42,7 +42,7 @@ #define TQURL_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_URL diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/ntqurlinfo.h index 9a2f35a8c..b9fa36eae 100644 --- a/src/kernel/ntqurlinfo.h +++ b/src/kernel/ntqurlinfo.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqdatetime.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H class TQUrlOperator; diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h index f290b37f3..eedc6bb29 100644 --- a/src/kernel/ntqurloperator.h +++ b/src/kernel/ntqurloperator.h @@ -46,7 +46,7 @@ #include "ntqurl.h" #include "tqptrlist.h" #include "ntqnetworkprotocol.h" -#include "ntqstringlist.h" // TQString->TQStringList conversion +#include "tqstringlist.h" // TQString->TQStringList conversion #endif // QT_H #ifndef TQT_NO_NETWORKPROTOCOL diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h index 5e4801520..2a6eeec19 100644 --- a/src/kernel/ntqvariant.h +++ b/src/kernel/ntqvariant.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "tqmap.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "tqvaluelist.h" #endif // QT_H diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h index 17593a715..543df7d40 100644 --- a/src/kernel/ntqwindowdefs.h +++ b/src/kernel/ntqwindowdefs.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "tqobjectdefs.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqnamespace.h" #endif // QT_H diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index 44168a1fa..b442a3253 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -50,7 +50,7 @@ #include "ntqdatastream.h" #include "ntqapplication.h" #include "ntqcleanuphandler.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #ifdef TQ_WS_MAC #include "ntqpaintdevicemetrics.h" #endif diff --git a/src/kernel/qlock_p.h b/src/kernel/qlock_p.h index 5fb1526ca..53d0ddbf3 100644 --- a/src/kernel/qlock_p.h +++ b/src/kernel/qlock_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H class TQLockData; diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index 9b2b2a4ae..de6dc3403 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -41,7 +41,7 @@ #ifndef TQT_NO_MIME #include "tqmap.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqfileinfo.h" #include "ntqdir.h" #include "ntqdragobject.h" diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h index b7f6d68c4..0c75668a3 100644 --- a/src/kernel/qprinter_p.h +++ b/src/kernel/qprinter_p.h @@ -45,7 +45,7 @@ #ifndef QT_H #include <ntqprinter.h> #include <ntqshared.h> -#include <ntqstring.h> +#include <tqstring.h> #include <ntqsize.h> #endif // QT_H diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index d845f8c30..6974fdf6c 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -61,7 +61,7 @@ #include "ntqpaintdevicemetrics.h" #include "tqimage.h" #include "ntqdatetime.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqdict.h" #include "ntqmemarray.h" #include "ntqfile.h" diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index c5e4be5e3..484553d3e 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_RICHTEXT -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqfont.h" #include "ntqtextstream.h" #include "ntqfile.h" diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index 1d0c7627c..52762c6b4 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -54,13 +54,13 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrlist.h" #include "ntqrect.h" #include "ntqfontmetrics.h" #include "ntqintdict.h" #include "tqmap.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqfont.h" #include "ntqcolor.h" #include "ntqsize.h" diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index 19ca36e97..08cac102f 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -36,7 +36,7 @@ #include "qscriptengine_p.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqrect.h" #include "ntqfont.h" #include <private/qunicodetables_p.h> diff --git a/src/kernel/qsharedmemory_p.h b/src/kernel/qsharedmemory_p.h index 30cd171ee..949450930 100644 --- a/src/kernel/qsharedmemory_p.h +++ b/src/kernel/qsharedmemory_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #if !defined (QT_QWS_NO_SHM) diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h index 49f0cf73d..4041d1847 100644 --- a/src/kernel/qt_pch.h +++ b/src/kernel/qt_pch.h @@ -35,8 +35,8 @@ #include <ntqpixmap.h> #include <qplatformdefs.h> #include <tqptrlist.h> -#include <ntqstring.h> -#include <ntqstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <ntqstyle.h> #include <ntqtimer.h> #include <tqwidget.h> diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp index 48839b5c8..e1a806f52 100644 --- a/src/kernel/qtextengine.cpp +++ b/src/kernel/qtextengine.cpp @@ -42,7 +42,7 @@ #include <ntqfont.h> #include "qfontdata_p.h" #include "qfontengine_p.h" -#include <ntqstring.h> +#include <tqstring.h> #include <private/qunicodetables_p.h> #include <stdlib.h> diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h index 751cdf043..774302a07 100644 --- a/src/kernel/qtextengine_p.h +++ b/src/kernel/qtextengine_p.h @@ -39,7 +39,7 @@ #ifndef QT_H #include "ntqglobal.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqnamespace.h" #include <private/qfontdata_p.h> #endif // QT_H diff --git a/src/kernel/qtextlayout_p.h b/src/kernel/qtextlayout_p.h index b2430e055..64c7f64db 100644 --- a/src/kernel/qtextlayout_p.h +++ b/src/kernel/qtextlayout_p.h @@ -38,7 +38,7 @@ #define TQTEXTLAYOUT_P_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "ntqnamespace.h" #include "ntqrect.h" #endif // QT_H diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index 4cc41ae00..ce01453fe 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -59,7 +59,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #include "ntqfileinfo.h" #include "tqwidgetlist.h" #include "ntqintdict.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqapplication.h" #include "ntqfile.h" #include "ntqbuffer.h" diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp index 991dfcd35..3665062c1 100644 --- a/src/kernel/qvariant.cpp +++ b/src/kernel/qvariant.cpp @@ -42,7 +42,7 @@ #include "ntqvariant.h" #ifndef TQT_NO_VARIANT -#include "ntqstring.h" +#include "tqstring.h" #include "ntqcstring.h" #include "ntqfont.h" #include "ntqpixmap.h" diff --git a/src/kernel/tqimage.h b/src/kernel/tqimage.h index 32f20b23f..ae5b69ff1 100644 --- a/src/kernel/tqimage.h +++ b/src/kernel/tqimage.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "ntqpixmap.h" -#include "ntqstrlist.h" -#include "ntqstringlist.h" +#include "tqstrlist.h" +#include "tqstringlist.h" #endif // QT_H class TQImageDataMisc; // internal diff --git a/src/kernel/tqimageformatplugin.h b/src/kernel/tqimageformatplugin.h index 237817e9f..6940f18b6 100644 --- a/src/kernel/tqimageformatplugin.h +++ b/src/kernel/tqimageformatplugin.h @@ -41,7 +41,7 @@ #ifndef QT_H #include "ntqgplugin.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_IMAGEFORMATPLUGIN diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h index 0d63af0a3..2d72bfa25 100644 --- a/src/kernel/tqobject.h +++ b/src/kernel/tqobject.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "tqobjectdefs.h" #include "ntqwindowdefs.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqevent.h" #include "ntqmutex.h" #include "ntqnamespace.h" diff --git a/src/kernel/tqttdeintegration_x11_p.h b/src/kernel/tqttdeintegration_x11_p.h index fe8c23028..235af2453 100644 --- a/src/kernel/tqttdeintegration_x11_p.h +++ b/src/kernel/tqttdeintegration_x11_p.h @@ -4,7 +4,7 @@ #ifndef TQTDEINTEGRATION_H #define TQTDEINTEGRATION_H -#include <ntqstringlist.h> +#include <tqstringlist.h> class TQLibrary; class TQWidget; diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp index 8329bf7a8..ff33dddbf 100644 --- a/src/kernel/tqwidget_x11.cpp +++ b/src/kernel/tqwidget_x11.cpp @@ -1238,7 +1238,7 @@ void TQWidget::unsetCursor() } static XTextProperty* -qstring_to_xtp( const TQString& s ) +tqstring_to_xtp( const TQString& s ) { static XTextProperty tp = { 0, 0, 0, 0 }; static bool free_prop = TRUE; // we can't free tp.value in case it references @@ -1261,7 +1261,7 @@ qstring_to_xtp( const TQString& s ) tl, 1, XStdICCTextStyle, &tp ); #if defined(QT_DEBUG) if ( errCode < 0 ) - tqDebug( "qstring_to_xtp result code %d", errCode ); + tqDebug( "tqstring_to_xtp result code %d", errCode ); #endif } if ( !mapper || errCode < 0 ) { @@ -1292,7 +1292,7 @@ void TQWidget::setCaption( const TQString &caption ) return; topData()->caption = caption; - XSetWMName( x11Display(), winId(), qstring_to_xtp(caption) ); + XSetWMName( x11Display(), winId(), tqstring_to_xtp(caption) ); TQCString net_wm_name = caption.utf8(); XChangeProperty(x11Display(), winId(), qt_net_wm_name, qt_utf8_string, 8, @@ -1377,7 +1377,7 @@ void TQWidget::setIconText( const TQString &iconText ) return; topData()->iconText = iconText; - XSetWMIconName( x11Display(), winId(), qstring_to_xtp(iconText) ); + XSetWMIconName( x11Display(), winId(), tqstring_to_xtp(iconText) ); TQCString net_wm_icon_name = iconText.utf8(); XChangeProperty(x11Display(), winId(), qt_net_wm_icon_name, qt_utf8_string, 8, PropModeReplace, |