diff options
Diffstat (limited to 'src')
65 files changed, 82 insertions, 82 deletions
diff --git a/src/canvas/tqcanvas.h b/src/canvas/tqcanvas.h index 9bf3d729c..744f21f53 100644 --- a/src/canvas/tqcanvas.h +++ b/src/canvas/tqcanvas.h @@ -47,7 +47,7 @@ #include "ntqptrlist.h" #include "ntqbrush.h" #include "ntqpen.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqpointarray.h" #endif // QT_H diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index 69e56fd5b..6c83640fd 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -48,7 +48,7 @@ #include "ntqtextcodec.h" #ifndef TQT_NO_TEXTCODEC -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqtextcodecfactory.h" #include "ntqutfcodec.h" #include "ntqnamespace.h" diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 2b7ce1b0d..8812f2102 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -74,7 +74,7 @@ #include "ntqlineedit.h" #include "ntqlistbox.h" #include "ntqlistview.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqmessagebox.h" #include "ntqmime.h" #include "ntqnetworkprotocol.h" diff --git a/src/kernel/ntqevent.h b/src/kernel/ntqevent.h index ae344371e..91eeb38ed 100644 --- a/src/kernel/ntqevent.h +++ b/src/kernel/ntqevent.h @@ -46,7 +46,7 @@ #include "ntqregion.h" #include "ntqnamespace.h" #include "ntqmime.h" -#include "ntqpair.h" +#include "tqpair.h" #endif // QT_H class TQ_EXPORT TQEvent: public TQt // event base class diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index 0f2a913af..1894c5598 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -46,7 +46,7 @@ #include "ntqstring.h" #include "ntqstringlist.h" #include "ntqfont.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #endif // QT_H diff --git a/src/kernel/ntqmime.h b/src/kernel/ntqmime.h index 5b541510a..50ed27994 100644 --- a/src/kernel/ntqmime.h +++ b/src/kernel/ntqmime.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqwindowdefs.h" -#include "ntqmap.h" +#include "tqmap.h" #endif // QT_H #ifndef TQT_NO_MIME diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h index 2b397f946..d11548744 100644 --- a/src/kernel/ntqstylesheet.h +++ b/src/kernel/ntqstylesheet.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqstring.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqptrvector.h" #include "ntqdict.h" #include "tqobject.h" diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index d6671bee8..eef4df773 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -33,7 +33,7 @@ #include "ntqgdict.h" #include "ntqfont.h" #include "ntqdatastream.h" -#include "ntqpair.h" +#include "tqpair.h" #include "ntqpoint.h" #include <stdio.h> #include "ntqtextstream.h" @@ -46,8 +46,8 @@ #include "ntqregion.h" #include "tqsql.h" #include "ntqstrlist.h" -#include "ntqvaluelist.h" -#include "ntqmap.h" +#include "tqvaluelist.h" +#include "tqmap.h" #include "ntqdatetime.h" #include "ntqmime.h" #include "ntqasciidict.h" @@ -251,8 +251,8 @@ #include <ntquuid.h> #include <ntqvalidator.h> #include <ntqasyncimageio.h> -#include <ntqvaluestack.h> -#include <ntqvaluevector.h> +#include <tqvaluestack.h> +#include <tqvaluevector.h> #include <tqdatatable.h> #include <ntqvbox.h> #include <ntqvbuttongroup.h> diff --git a/src/kernel/ntqtranslator.h b/src/kernel/ntqtranslator.h index e255b81e1..39f9faa36 100644 --- a/src/kernel/ntqtranslator.h +++ b/src/kernel/ntqtranslator.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "tqobject.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #endif // QT_H #ifndef TQT_NO_TRANSLATION diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h index f0657b499..5e4801520 100644 --- a/src/kernel/ntqvariant.h +++ b/src/kernel/ntqvariant.h @@ -42,10 +42,10 @@ #define TQVARIANT_H #ifndef QT_H -#include "ntqmap.h" +#include "tqmap.h" #include "ntqstring.h" #include "ntqstringlist.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #endif // QT_H #ifndef TQT_NO_VARIANT diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 56ba9aefa..57c55feba 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -79,7 +79,7 @@ #include "ntqbuffer.h" #include "ntqsocketnotifier.h" #include "ntqsessionmanager.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqdict.h" #include "ntqguardedptr.h" #include "ntqclipboard.h" diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp index d0571fc5a..51fbc63ab 100644 --- a/src/kernel/qclipboard_x11.cpp +++ b/src/kernel/qclipboard_x11.cpp @@ -71,8 +71,8 @@ #include "ntqdragobject.h" #include "ntqbuffer.h" #include "ntqtextcodec.h" -#include "ntqvaluelist.h" -#include "ntqmap.h" +#include "tqvaluelist.h" +#include "tqmap.h" #include "qt_x11_p.h" #include "qapplication_p.h" diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h index e1fc58545..09fa32001 100644 --- a/src/kernel/qfontengine_p.h +++ b/src/kernel/qfontengine_p.h @@ -529,7 +529,7 @@ private: #elif defined( TQ_WS_MAC ) #include "qt_mac.h" -#include <ntqmap.h> +#include <tqmap.h> #include <ntqcache.h> class TQFontEngineMac : public TQFontEngine diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index ce95f1cb6..1097a5f80 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -49,7 +49,7 @@ #include "ntqpngio.h" #include "ntqmngio.h" #include "ntqjpegio.h" -#include "ntqmap.h" +#include "tqmap.h" #include <private/qpluginmanager_p.h> #include "qimageformatinterface_p.h" #include "ntqwmatrix.h" diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index 42a955911..8a8ac86b0 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -44,7 +44,7 @@ #include "ntqaccel.h" #include "ntqshared.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #ifndef TQT_NO_REGEXP # include "ntqregexp.h" #endif diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index e1dd27d68..9b2b2a4ae 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -40,7 +40,7 @@ #ifndef TQT_NO_MIME -#include "ntqmap.h" +#include "tqmap.h" #include "ntqstringlist.h" #include "ntqfileinfo.h" #include "ntqdir.h" diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp index 27b6dff44..b8ad2b55d 100644 --- a/src/kernel/qnetworkprotocol.cpp +++ b/src/kernel/qnetworkprotocol.cpp @@ -45,7 +45,7 @@ #include "ntqlocalfs.h" #include "ntqurloperator.h" #include "ntqtimer.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqptrqueue.h" //#define TQNETWORKPROTOCOL_DEBUG diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index d1678fa38..58a23dfcf 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -69,7 +69,7 @@ #include "ntqintdict.h" #include "ntqtextcodec.h" #include "ntqsettings.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqfontdatabase.h" #include "ntqregexp.h" #include "ntqbitmap.h" diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index ecc304071..a2ab4d0e0 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -48,7 +48,7 @@ #include "ntqtextstream.h" #include "ntqfile.h" #include "ntqapplication.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqfileinfo.h" #include "ntqstylesheet.h" #include "ntqmime.h" diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index 1915820fa..874e61557 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -59,13 +59,13 @@ #include "ntqrect.h" #include "ntqfontmetrics.h" #include "ntqintdict.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqstringlist.h" #include "ntqfont.h" #include "ntqcolor.h" #include "ntqsize.h" -#include "ntqvaluelist.h" -#include "ntqvaluestack.h" +#include "tqvaluelist.h" +#include "tqvaluestack.h" #include "tqobject.h" #include "ntqdict.h" #include "ntqpixmap.h" diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h index 5295f8134..3e5224ae6 100644 --- a/src/kernel/qt_pch.h +++ b/src/kernel/qt_pch.h @@ -21,7 +21,7 @@ # undef _GLIBCPP_FULLY_COMPLIANT_HEADERS // Makes qlocale.cpp compile # endif # endif -#include <ntqmap.h> // I must be first! +#include <tqmap.h> // I must be first! #include <private/qucomextra_p.h> // All moc genereated code has this include #include <ntqapplication.h> #include <ntqbitmap.h> diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index e3d1c5b98..4cc41ae00 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -64,7 +64,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #include "ntqfile.h" #include "ntqbuffer.h" #include "ntqdatastream.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqtl.h" #if defined(Q_OS_UNIX) diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp index ca508c48c..e5b84ca51 100644 --- a/src/kernel/qurloperator.cpp +++ b/src/kernel/qurloperator.cpp @@ -44,7 +44,7 @@ #include "ntqurlinfo.h" #include "ntqnetworkprotocol.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqdir.h" #include "ntqptrdict.h" #include "ntqguardedptr.h" diff --git a/src/moc/moc.pro b/src/moc/moc.pro index c8abcf0d7..6871d9d93 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -33,7 +33,7 @@ SOURCES = ../tools/qbuffer.cpp \ ../tools/qstringlist.cpp \ ../tools/qtextstream.cpp \ ../tools/qbitarray.cpp \ - ../tools/qmap.cpp \ + ../tools/tqmap.cpp \ ../tools/qgcache.cpp \ ../codecs/qtextcodec.cpp \ ../codecs/qutfcodec.cpp diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp index d08f10f24..54c21fcc1 100644 --- a/src/network/qhttp.cpp +++ b/src/network/qhttp.cpp @@ -44,7 +44,7 @@ #include "ntqsocket.h" #include "ntqtextstream.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqstring.h" #include "ntqstringlist.h" #include "ntqcstring.h" diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 51daa176b..dc8530f1e 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -42,7 +42,7 @@ #if defined(TQ_WS_X11) -#include "ntqmap.h" +#include "tqmap.h" #include "ntqpixmap.h" #include "ntqapplication.h" diff --git a/src/sql/drivers/cache/tqsqlcachedresult.h b/src/sql/drivers/cache/tqsqlcachedresult.h index f31c3853f..3542a1749 100644 --- a/src/sql/drivers/cache/tqsqlcachedresult.h +++ b/src/sql/drivers/cache/tqsqlcachedresult.h @@ -54,7 +54,7 @@ #include <ntqglobal.h> #include <ntqvariant.h> #include <ntqptrvector.h> -#include <ntqvaluevector.h> +#include <tqvaluevector.h> #include <tqsqlresult.h> #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/drivers/mysql/tqsql_mysql.cpp b/src/sql/drivers/mysql/tqsql_mysql.cpp index 3854a5bb3..d91720e80 100644 --- a/src/sql/drivers/mysql/tqsql_mysql.cpp +++ b/src/sql/drivers/mysql/tqsql_mysql.cpp @@ -42,7 +42,7 @@ #include <private/tqsqlextension_p.h> #include <ntqdatetime.h> -#include <ntqvaluevector.h> +#include <tqvaluevector.h> #include <tqsqlrecord.h> #define TQMYSQL_DRIVER_NAME "TQMYSQL3" diff --git a/src/sql/drivers/odbc/tqsql_odbc.h b/src/sql/drivers/odbc/tqsql_odbc.h index 3948b087a..f64d3e902 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.h +++ b/src/sql/drivers/odbc/tqsql_odbc.h @@ -41,7 +41,7 @@ #ifndef TQSQL_ODBC_H #define TQSQL_ODBC_H -#include <ntqmap.h> +#include <tqmap.h> #include <ntqstring.h> #include <tqsqldriver.h> #include <tqsqlfield.h> diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp index 61edda2c0..afa21ac86 100644 --- a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp +++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp @@ -15,7 +15,7 @@ #include "tqsql_sqlite3.h" #include <ntqdatetime.h> -#include <ntqvaluevector.h> +#include <tqvaluevector.h> #include <ntqregexp.h> #include <ntqfile.h> #include <sqlite3.h> diff --git a/src/sql/tqdatatable.cpp b/src/sql/tqdatatable.cpp index 9d8468c06..bb81ff6c1 100644 --- a/src/sql/tqdatatable.cpp +++ b/src/sql/tqdatatable.cpp @@ -49,7 +49,7 @@ #include "ntqlayout.h" #include "ntqpainter.h" #include "ntqpopupmenu.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "tqsqlmanager_p.h" #include "ntqdatetime.h" #include "ntqcursor.h" diff --git a/src/sql/tqsqldriver.h b/src/sql/tqsqldriver.h index 08a6f43de..ba865f099 100644 --- a/src/sql/tqsqldriver.h +++ b/src/sql/tqsqldriver.h @@ -50,7 +50,7 @@ #include "tqsqlfield.h" #include "tqsqlindex.h" #include "ntqstringlist.h" -#include "ntqmap.h" +#include "tqmap.h" #endif // QT_H #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/tqsqlextension_p.h b/src/sql/tqsqlextension_p.h index c4ea2850c..9989b3a31 100644 --- a/src/sql/tqsqlextension_p.h +++ b/src/sql/tqsqlextension_p.h @@ -54,8 +54,8 @@ // #ifndef QT_H -#include "ntqmap.h" -#include "ntqvaluevector.h" +#include "tqmap.h" +#include "tqvaluevector.h" #include "ntqstring.h" #include "ntqvariant.h" #include "tqsql.h" diff --git a/src/sql/tqsqlform.h b/src/sql/tqsqlform.h index 7771f7b70..cdd00b7cd 100644 --- a/src/sql/tqsqlform.h +++ b/src/sql/tqsqlform.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqobject.h" -#include "ntqmap.h" +#include "tqmap.h" #endif // QT_H #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/tqsqlpropertymap.cpp b/src/sql/tqsqlpropertymap.cpp index 67451029d..6e4f2d4cc 100644 --- a/src/sql/tqsqlpropertymap.cpp +++ b/src/sql/tqsqlpropertymap.cpp @@ -45,7 +45,7 @@ #include "tqwidget.h" #include "ntqcleanuphandler.h" #include "ntqmetaobject.h" -#include "ntqmap.h" +#include "tqmap.h" class TQSqlPropertyMapPrivate { diff --git a/src/sql/tqsqlquery.h b/src/sql/tqsqlquery.h index eea5eea72..39df825aa 100644 --- a/src/sql/tqsqlquery.h +++ b/src/sql/tqsqlquery.h @@ -45,7 +45,7 @@ #include "tqobject.h" #include "ntqstring.h" #include "ntqvariant.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "tqsqlerror.h" #include "tqsqlfield.h" #include "tqsql.h" diff --git a/src/sql/tqsqlrecord.cpp b/src/sql/tqsqlrecord.cpp index b12541f8b..e6c93b1eb 100644 --- a/src/sql/tqsqlrecord.cpp +++ b/src/sql/tqsqlrecord.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_SQL #include "ntqregexp.h" -#include "ntqvaluevector.h" +#include "tqvaluevector.h" #include "ntqshared.h" #include "ntqnamespace.h" diff --git a/src/tools/ntqstringlist.h b/src/tools/ntqstringlist.h index 7bda85877..219af2bf5 100644 --- a/src/tools/ntqstringlist.h +++ b/src/tools/ntqstringlist.h @@ -42,7 +42,7 @@ #define TQSTRINGLIST_H #ifndef QT_H -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqstring.h" #include "ntqstrlist.h" #endif // QT_H diff --git a/src/tools/qdir_p.h b/src/tools/qdir_p.h index 4538e5b26..91138abb5 100644 --- a/src/tools/qdir_p.h +++ b/src/tools/qdir_p.h @@ -56,7 +56,7 @@ #ifndef QT_H #include "ntqregexp.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #endif // QT_H extern TQValueList<TQRegExp> qt_makeFilterList( const TQString & ); diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp index 9dbe81d92..979297870 100644 --- a/src/tools/qglist.cpp +++ b/src/tools/qglist.cpp @@ -41,7 +41,7 @@ #include "ntqglist.h" #include "ntqgvector.h" #include "ntqdatastream.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #if defined(TQT_THREAD_SUPPORT) #include "ntqmutex.h" diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp index c1d6e15f0..dc72dad30 100644 --- a/src/tools/qgpluginmanager.cpp +++ b/src/tools/qgpluginmanager.cpp @@ -39,7 +39,7 @@ #include "qgpluginmanager_p.h" #ifndef TQT_NO_COMPONENT #include "qcomlibrary_p.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqdir.h" /* diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index 5c0fac766..19b983f75 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -47,7 +47,7 @@ #include "ntqcache.h" #include "ntqcleanuphandler.h" #include "ntqintdict.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqptrvector.h" #include "ntqstring.h" #include "ntqtl.h" diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp index 6ac18bcc7..ecaa3f7d6 100644 --- a/src/tools/qsettings.cpp +++ b/src/tools/qsettings.cpp @@ -60,7 +60,7 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode ) #include "ntqdir.h" #include "ntqfile.h" #include "ntqfileinfo.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqtextstream.h" #include "ntqregexp.h" #include <private/qsettings_p.h> diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h index 6dcd1a037..303466cd5 100644 --- a/src/tools/qsettings_p.h +++ b/src/tools/qsettings_p.h @@ -55,8 +55,8 @@ #ifndef QT_H #include "ntqstringlist.h" -#include "ntqmap.h" -#include "ntqvaluestack.h" +#include "tqmap.h" +#include "tqvaluestack.h" #endif // QT_H #ifndef TQT_NO_SETTINGS diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index 7153653b8..5026f3791 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -37,7 +37,7 @@ tools { $$TOOLS_H/ntqlocale.h \ $$TOOLS_P/qlocale_p.h \ $$TOOLS_H/ntqptrlist.h \ - $$TOOLS_H/ntqmap.h \ + $$TOOLS_H/tqmap.h \ $$TOOLS_H/ntqmutex.h \ $$TOOLS_P/qmutex_p.h \ $$TOOLS_P/qmutexpool_p.h \ @@ -60,9 +60,9 @@ tools { $$TOOLS_H/ntqthreadstorage.h\ $$TOOLS_P/qunicodetables_p.h \ $$TOOLS_H/ntqptrvector.h \ - $$TOOLS_H/ntqvaluelist.h \ - $$TOOLS_H/ntqvaluestack.h \ - $$TOOLS_H/ntqvaluevector.h \ + $$TOOLS_H/tqvaluelist.h \ + $$TOOLS_H/tqvaluestack.h \ + $$TOOLS_H/tqvaluevector.h \ $$TOOLS_H/ntqwaitcondition.h \ $$TOOLS_P/qcom_p.h \ $$TOOLS_P/qucom_p.h \ @@ -127,7 +127,7 @@ tools { $$TOOLS_CPP/qiodevice.cpp \ $$TOOLS_CPP/qlibrary.cpp \ $$TOOLS_CPP/qlocale.cpp \ - $$TOOLS_CPP/qmap.cpp \ + $$TOOLS_CPP/tqmap.cpp \ $$TOOLS_CPP/qmutexpool.cpp \ $$TOOLS_CPP/qptrcollection.cpp \ $$TOOLS_CPP/qregexp.cpp \ diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp index 1584aa817..244db1cea 100644 --- a/src/tools/qwinexport.cpp +++ b/src/tools/qwinexport.cpp @@ -20,12 +20,12 @@ #include <ntqdict.h> #include <ntqintdict.h> #include <ntqlibrary.h> -#include <ntqmap.h> +#include <tqmap.h> #include <ntqmemarray.h> #include <ntqptrlist.h> #include <ntqptrvector.h> #include <ntqstring.h> -#include <ntqvaluelist.h> -#include <ntqvaluevector.h> +#include <tqvaluelist.h> +#include <tqvaluevector.h> #include <ntqdockarea.h> #include <ntqdockwindow.h> diff --git a/src/tools/qmap.cpp b/src/tools/tqmap.cpp index 4c2884501..cbc874c63 100644 --- a/src/tools/qmap.cpp +++ b/src/tools/tqmap.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "ntqmap.h" +#include "tqmap.h" typedef TQMapNodeBase* NodePtr; typedef TQMapNodeBase Node; diff --git a/src/tools/ntqmap.h b/src/tools/tqmap.h index f1c41be96..97a21883a 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/tqmap.h @@ -45,8 +45,8 @@ #include "ntqglobal.h" #include "ntqshared.h" #include "ntqdatastream.h" -#include "ntqpair.h" -#include "ntqvaluelist.h" +#include "tqpair.h" +#include "tqvaluelist.h" #endif // QT_H #ifndef TQT_NO_STL diff --git a/src/tools/ntqpair.h b/src/tools/tqpair.h index cd1614685..cd1614685 100644 --- a/src/tools/ntqpair.h +++ b/src/tools/tqpair.h diff --git a/src/tools/ntqvaluelist.h b/src/tools/tqvaluelist.h index 4056290df..4056290df 100644 --- a/src/tools/ntqvaluelist.h +++ b/src/tools/tqvaluelist.h diff --git a/src/tools/ntqvaluestack.h b/src/tools/tqvaluestack.h index 1c1259fb1..5d76820de 100644 --- a/src/tools/ntqvaluestack.h +++ b/src/tools/tqvaluestack.h @@ -42,7 +42,7 @@ #define TQVALUESTACK_H #ifndef QT_H -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #endif // QT_H diff --git a/src/tools/ntqvaluevector.h b/src/tools/tqvaluevector.h index 90dc45e10..90dc45e10 100644 --- a/src/tools/ntqvaluevector.h +++ b/src/tools/tqvaluevector.h diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h index ee9201597..85dce12b5 100644 --- a/src/widgets/ntqdockarea.h +++ b/src/widgets/ntqdockarea.h @@ -46,7 +46,7 @@ #include "ntqptrlist.h" #include "ntqdockwindow.h" #include "ntqlayout.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqguardedptr.h" #include "ntqtextstream.h" #endif // QT_H diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h index 887b1b265..425b9718f 100644 --- a/src/widgets/ntqsplitter.h +++ b/src/widgets/ntqsplitter.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqframe.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #endif // QT_H #ifndef TQT_NO_SPLITTER diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h index 322fb4e00..f14e06ff8 100644 --- a/src/widgets/ntqtextedit.h +++ b/src/widgets/ntqtextedit.h @@ -45,7 +45,7 @@ #include "ntqscrollview.h" #include "ntqstylesheet.h" #include "ntqptrvector.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqptrlist.h" #endif // QT_H diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index 0084be77d..c8ebee765 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -48,7 +48,7 @@ #include "ntqapplication.h" #include "ntqpixmap.h" #include "ntqapplication.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqstring.h" #include "ntqstyle.h" diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp index 8f32fd61d..ed1f4064c 100644 --- a/src/widgets/qdialogbuttons.cpp +++ b/src/widgets/qdialogbuttons.cpp @@ -42,14 +42,14 @@ #include <ntqapplication.h> #include <ntqpushbutton.h> #include <ntqguardedptr.h> -#include <ntqmap.h> +#include <tqmap.h> #include <ntqvariant.h> #ifndef TQT_NO_DIALOG #include <ntqdialog.h> #endif // TQT_NO_DIALOG #include <ntqlayout.h> #include <ntqstyle.h> -#include <ntqmap.h> +#include <tqmap.h> struct TQDialogButtonsPrivate { diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp index 3693a036d..1f982a1de 100644 --- a/src/widgets/qdockarea.cpp +++ b/src/widgets/qdockarea.cpp @@ -47,7 +47,7 @@ #include "ntqapplication.h" #include "ntqpainter.h" #include "tqwidgetlist.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqmainwindow.h" //#define TQDOCKAREA_DEBUG diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 68048abcd..3fb88d21e 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -62,7 +62,7 @@ #include "ntqwhatsthis.h" #include "../kernel/qinternal_p.h" #include "private/qtextlayout_p.h" -#include "ntqvaluevector.h" +#include "tqvaluevector.h" #if defined(Q_OS_LINUX) #include <sys/mman.h> #endif diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index 970d8cdf4..3510c8290 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -47,7 +47,7 @@ #include "ntqintdict.h" #include "ntqapplication.h" #include "ntqptrlist.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqcursor.h" #include "ntqpainter.h" #include "ntqmenubar.h" diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp index 0cc40aa64..c9baa8144 100644 --- a/src/widgets/qtextbrowser.cpp +++ b/src/widgets/qtextbrowser.cpp @@ -46,7 +46,7 @@ #include "ntqlayout.h" #include "ntqpainter.h" -#include "ntqvaluestack.h" +#include "tqvaluestack.h" #include "stdio.h" #include "ntqfile.h" #include "ntqtextstream.h" diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index a04c78dbe..9b4eec8e3 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -51,7 +51,7 @@ #include <ntqapplication.h> #include <tqwidgetlist.h> #include <ntqlayout.h> -#include <ntqvaluelist.h> +#include <tqvaluelist.h> #include <ntqtooltip.h> #include <ntqeventloop.h> #include <ntqdatetime.h> diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp index 02fa7933f..ceeb8b6e6 100644 --- a/src/xml/qsvgdevice.cpp +++ b/src/xml/qsvgdevice.cpp @@ -43,9 +43,9 @@ #include "ntqpainter.h" #include "ntqpaintdevicemetrics.h" #include "ntqfile.h" -#include "ntqmap.h" +#include "tqmap.h" #include "ntqregexp.h" -#include "ntqvaluelist.h" +#include "tqvaluelist.h" #include "ntqtextstream.h" #include "ntqimage.h" #include "ntqpixmap.h" diff --git a/src/xml/tqxml.cpp b/src/xml/tqxml.cpp index 11d6ab169..a0d3f7f18 100644 --- a/src/xml/tqxml.cpp +++ b/src/xml/tqxml.cpp @@ -43,8 +43,8 @@ #include "ntqbuffer.h" #include "ntqregexp.h" #include "ntqptrstack.h" -#include "ntqmap.h" -#include "ntqvaluestack.h" +#include "tqmap.h" +#include "tqvaluestack.h" // needed for TQT_TRANSLATE_NOOP: #include "tqobject.h" diff --git a/src/xml/tqxml.h b/src/xml/tqxml.h index b2f86dc93..caff6f125 100644 --- a/src/xml/tqxml.h +++ b/src/xml/tqxml.h @@ -46,7 +46,7 @@ #include "ntqfile.h" #include "ntqstring.h" #include "ntqstringlist.h" -#include "ntqvaluevector.h" +#include "tqvaluevector.h" #endif // QT_H #if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML ) |