summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/ntqglobal.h27
-rw-r--r--src/tools/qcom_p.h2
-rw-r--r--src/tools/qcriticalsection_p.h2
-rw-r--r--src/tools/qdatetime.cpp14
-rw-r--r--src/tools/qdir.cpp2
-rw-r--r--src/tools/qfile.cpp2
-rw-r--r--src/tools/qfiledefs_p.h2
-rw-r--r--src/tools/qfileinfo.cpp8
-rw-r--r--src/tools/qgarray.cpp2
-rw-r--r--src/tools/qlibrary.cpp6
-rw-r--r--src/tools/qlibrary_p.h2
-rw-r--r--src/tools/qlocale.cpp2
-rw-r--r--src/tools/qsettings.cpp62
-rw-r--r--src/tools/qsettings_p.h2
-rw-r--r--src/tools/qstring.cpp26
-rw-r--r--src/tools/qunicodetables_p.h2
16 files changed, 87 insertions, 76 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index f249b7050..edd27d431 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -552,7 +552,7 @@
/*
- The window system, must be one of: (Q_WS_x)
+ The window system, must be one of: (TQ_WS_x)
MACX - Mac OS X
MAC9 - Mac OS 9
@@ -565,39 +565,50 @@
#if defined(Q_OS_MAC9)
# define Q_WS_MAC9
+# define TQ_WS_MAC9
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
+# define TQ_WS_WIN16
# error "TQt requires Win32 and does not work with Windows 3.x"
#elif defined(_WIN32_X11_)
# define Q_WS_X11
+# define TQ_WS_X11
#elif defined(Q_OS_WIN32)
# define Q_WS_WIN32
+# define TQ_WS_WIN32
# if defined(Q_OS_WIN64)
# define Q_WS_WIN64
+# define TQ_WS_WIN64
# endif
#elif defined(Q_OS_OS2)
# define Q_WS_PM
+# define TQ_WS_PM
# error "TQt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX)
# if defined(TQWS)
# define Q_WS_QWS
+# define TQ_WS_QWS
# define TQT_NO_QWS_IM
# elif defined(Q_OS_MACX)
# define Q_WS_MACX
+# define TQ_WS_MACX
# else
# define Q_WS_X11
+# define TQ_WS_X11
# endif
#endif
#if defined(Q_OS_MAC) && !defined(TQMAC_PASCAL)
# define TQMAC_PASCAL
#endif
-#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32)
# define Q_WS_WIN
+# define TQ_WS_WIN
#endif
-#if (defined(Q_WS_MAC9) || defined(Q_WS_MACX)) && !defined(Q_WS_QWS) && !defined(Q_WS_X11)
+#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !defined(TQ_WS_X11)
# define Q_WS_MAC
+# define TQ_WS_MAC
#endif
@@ -802,7 +813,7 @@ class TQString;
# define TQT_NO_SQL
#endif
-#if defined(Q_WS_MAC9)
+#if defined(TQ_WS_MAC9)
//No need for menu merging
# ifndef TQMAC_QMENUBAR_NO_MERGE
# define TQMAC_QMENUBAR_NO_MERGE
@@ -815,7 +826,7 @@ class TQString;
# define TQMAC_QMENUBAR_NO_EVENT
# endif
#endif
-#if defined(Q_WS_MACX) //for no nobody uses quartz, just putting in first level hooks
+#if defined(TQ_WS_MACX) //for no nobody uses quartz, just putting in first level hooks
# ifndef TQMAC_NO_QUARTZ
# define TQMAC_NO_QUARTZ
# endif
@@ -824,7 +835,7 @@ class TQString;
# endif
#endif
-#if !defined(Q_WS_QWS) && !defined(TQT_NO_COP)
+#if !defined(TQ_WS_QWS) && !defined(TQT_NO_COP)
# define TQT_NO_COP
#endif
@@ -891,7 +902,7 @@ class TQString;
// Some platform specific stuff
//
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
extern TQ_EXPORT bool qt_winunicode;
#endif
@@ -905,7 +916,7 @@ TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian );
TQ_EXPORT bool tqSharedBuild();
#if defined(Q_OS_MAC)
int qMacVersion();
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
TQ_EXPORT int qWinVersion();
#if defined(UNICODE)
#define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi }
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index ab390e7fa..e11d63f27 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -311,7 +311,7 @@ public: \
return iface;
#endif // Q_CREATE_INSTANCE
-# ifdef Q_WS_WIN
+# ifdef TQ_WS_WIN
# ifdef Q_CC_BOR
# define Q_EXPORT_COMPONENT() \
Q_UCM_VERIFICATION_DATA \
diff --git a/src/tools/qcriticalsection_p.h b/src/tools/qcriticalsection_p.h
index 6fda0f3a4..330e141e1 100644
--- a/src/tools/qcriticalsection_p.h
+++ b/src/tools/qcriticalsection_p.h
@@ -56,7 +56,7 @@
#if defined(TQT_THREAD_SUPPORT)
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
/*
TQCriticalSection
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index e30f3e75c..51f0e51de 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -517,7 +517,7 @@ TQString TQDate::shortMonthName( int month )
month = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -563,7 +563,7 @@ TQString TQDate::longMonthName( int month )
month = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -617,7 +617,7 @@ TQString TQDate::shortDayName( int weekday )
weekday = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -665,7 +665,7 @@ TQString TQDate::longDayName( int weekday )
weekday = 1;
}
#endif
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
char buffer[255];
tm tt;
memset( &tt, 0, sizeof( tm ) );
@@ -731,7 +731,7 @@ TQString TQDate::toString( TQt::DateFormat f ) const
switch ( f ) {
case TQt::LocalDate:
{
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
tm tt;
memset( &tt, 0, sizeof( tm ) );
char buf[255];
@@ -1397,7 +1397,7 @@ TQString TQTime::toString( TQt::DateFormat f ) const
switch ( f ) {
case TQt::LocalDate:
{
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
tm tt;
memset( &tt, 0, sizeof( tm ) );
char buf[255];
@@ -2112,7 +2112,7 @@ TQString TQDateTime::toString( TQt::DateFormat f ) const
}
#ifndef TQT_NO_TEXTDATE
else if ( f == TQt::TextDate ) {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
TQString buf = d.shortDayName( d.dayOfWeek() );
buf += ' ';
buf += d.shortMonthName( d.month() );
diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp
index 5b0c4c674..9c22ff39f 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/qdir.cpp
@@ -1097,7 +1097,7 @@ char TQDir::separator()
{
#if defined(Q_OS_UNIX)
return '/';
-#elif defined (Q_FS_FAT) || defined(Q_WS_WIN)
+#elif defined (Q_FS_FAT) || defined(TQ_WS_WIN)
return '\\';
#elif defined (Q_OS_MAC)
return ':';
diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp
index cf9b1a5c7..709d175bb 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/qfile.cpp
@@ -625,7 +625,7 @@ void TQFile::setEncodingFunction( EncoderFn f )
static
TQString locale_decoder( const TQCString &localFileName )
{
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
return TQString::fromLocal8Bit(localFileName);
#else
extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp
diff --git a/src/tools/qfiledefs_p.h b/src/tools/qfiledefs_p.h
index 52b4c7d51..62d55583f 100644
--- a/src/tools/qfiledefs_p.h
+++ b/src/tools/qfiledefs_p.h
@@ -56,7 +56,7 @@
// Be sure to include qplatformdefs.h first!
struct TQFileInfoCache
{
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
QT_STATBUF st;
#else
struct stat st;
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index 466e62cc4..9ef1462cd 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -497,7 +497,7 @@ TQDir TQFileInfo::dir( bool absPath ) const
bool TQFileInfo::isReadable() const
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
return qt_file_access( fn, R_OK ) && permission( ReadUser );
#else
return qt_file_access( fn, R_OK );
@@ -512,7 +512,7 @@ bool TQFileInfo::isReadable() const
bool TQFileInfo::isWritable() const
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
return qt_file_access( fn, W_OK ) && permission( WriteUser );
#else
return qt_file_access( fn, W_OK );
@@ -527,7 +527,7 @@ bool TQFileInfo::isWritable() const
bool TQFileInfo::isExecutable() const
{
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#if defined(_MSC_VER) && _MSC_VER >= 1400
return permission( ExeUser );
#else
@@ -538,7 +538,7 @@ bool TQFileInfo::isExecutable() const
#endif
}
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
bool TQFileInfo::isHidden() const
{
return fileName()[ 0 ] == TQChar( '.' );
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index a69be13d9..ff1f7b08b 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -42,7 +42,7 @@
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
# include "qplatformdefs.h"
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
// needed for bsearch on some platforms
# include "qt_windows.h"
#endif
diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp
index 2181f7fc5..2773f066c 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
@@ -56,7 +56,7 @@
# endif
#endif
-#if (defined(Q_WS_WIN) && !defined(QT_MAKEDLL)) \
+#if (defined(TQ_WS_WIN) && !defined(QT_MAKEDLL)) \
|| (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL)) \
|| (defined(Q_OS_IRIX) && defined(Q_CC_GNU))
#define TQT_NO_LIBRARY_UNLOAD
@@ -192,7 +192,7 @@ TQLibrary::~TQLibrary()
with \c MY_EXPORT defined as
\code
- #ifdef Q_WS_WIN
+ #ifdef TQ_WS_WIN
# define MY_EXPORT __declspec(dllexport)
#else
# define MY_EXPORT
@@ -398,7 +398,7 @@ TQString TQLibrary::library() const
TQString filename = libfile;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( filename.findRev( '.' ) <= filename.findRev( '/' ) )
filename += ".dll";
#else
diff --git a/src/tools/qlibrary_p.h b/src/tools/qlibrary_p.h
index c494f16a3..0a687b1ca 100644
--- a/src/tools/qlibrary_p.h
+++ b/src/tools/qlibrary_p.h
@@ -66,7 +66,7 @@ class TQLibraryPrivate
public:
TQLibraryPrivate( TQLibrary *lib );
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
HINSTANCE pHnd;
#else
void *pHnd;
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 1da01c74c..0714dbb88 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -1858,7 +1858,7 @@ const char* TQLocalePrivate::systemLocaleName()
lang = mac_ret;
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( !lang.isEmpty() ) {
long id = 0;
bool ok = false;
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index fa44ff054..6ac18bcc7 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -339,7 +339,7 @@ void TQSettingsHeading::read(const TQString &filename)
if (! TQFileInfo(filename).exists())
return;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
HANDLE lockfd = openlock( filename, Q_LOCKREAD );
#endif
@@ -362,7 +362,7 @@ void TQSettingsHeading::read(const TQString &filename)
file.close();
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
closelock( lockfd );
#endif
}
@@ -446,7 +446,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
}
}
-#ifdef Q_WS_WIN // for homedirpath reading from registry
+#ifdef TQ_WS_WIN // for homedirpath reading from registry
#include "qt_windows.h"
#include "ntqlibrary.h"
@@ -462,7 +462,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
: groupDirty( TRUE ), modified(FALSE), globalScope(TRUE)
{
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( format != TQSettings::Ini )
return;
#else
@@ -483,7 +483,7 @@ TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
TQString appSettings(home);
TQString defPath;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#ifdef Q_OS_TEMP
TCHAR path[MAX_PATH];
SHGetSpecialFolderPath( 0, path, CSIDL_APPDATA, FALSE );
@@ -809,14 +809,14 @@ static TQString groupKey( const TQString &group, const TQString &key )
*/
void TQSettings::insertSearchPath( System s, const TQString &path)
{
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd ) {
d->sysInsertSearchPath( s, path );
return;
}
#endif
-#if !defined(Q_WS_WIN)
+#if !defined(TQ_WS_WIN)
if ( s == Windows )
return;
#endif
@@ -832,7 +832,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
return;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd && s != Unix ) {
#else
if ( s != Unix ) {
@@ -844,7 +844,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
}
TQString realPath = path;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
TQString defPath = d->globalScope ? d->searchPaths.first() : d->searchPaths.last();
realPath = defPath + path;
#endif
@@ -872,13 +872,13 @@ void TQSettings::removeSearchPath( System s, const TQString &path)
return;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if ( d->sysd ) {
d->sysRemoveSearchPath( s, path );
return;
}
#endif
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd && s != Unix ) {
#else
if ( s != Unix ) {
@@ -907,7 +907,7 @@ TQSettings::TQSettings()
d = new TQSettingsPrivate( Native );
TQ_CHECK_PTR(d);
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
d->sysd = 0;
d->sysInit();
#endif
@@ -927,7 +927,7 @@ TQSettings::TQSettings( Format format )
d = new TQSettingsPrivate( format );
TQ_CHECK_PTR(d);
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
d->sysd = 0;
if ( format == Native )
d->sysInit();
@@ -945,7 +945,7 @@ TQSettings::~TQSettings()
{
sync();
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
d->sysClear();
#endif
@@ -960,7 +960,7 @@ TQSettings::~TQSettings()
*/
bool TQSettings::sync()
{
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysSync();
#endif
@@ -992,7 +992,7 @@ bool TQSettings::sync()
if ((fi.exists() && fi.isFile() && fi.isWritable()) ||
(! fi.exists() && di.isDir()
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
&& di.isWritable()
#else
&& ((qWinVersion()&TQt::WV_NT_based) > TQt::WV_2000 || di.isWritable())
@@ -1015,7 +1015,7 @@ bool TQSettings::sync()
continue;
}
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
HANDLE lockfd = openlock( filename, Q_LOCKWRITE );
#endif
@@ -1089,7 +1089,7 @@ bool TQSettings::sync()
// remove temporary file
file.remove();
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
closelock( lockfd );
#endif
}
@@ -1127,7 +1127,7 @@ bool TQSettings::readBoolEntry(const TQString &key, bool def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadBoolEntry( grp_key, def, ok );
#endif
@@ -1179,7 +1179,7 @@ double TQSettings::readDoubleEntry(const TQString &key, double def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadDoubleEntry( grp_key, def, ok );
#endif
@@ -1224,7 +1224,7 @@ int TQSettings::readNumEntry(const TQString &key, int def, bool *ok )
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadNumEntry( grp_key, def, ok );
#endif
@@ -1270,7 +1270,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o
return def;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysReadEntry( grp_key, def, ok );
#endif
@@ -1349,7 +1349,7 @@ bool TQSettings::writeEntry(const TQString &key, bool value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1380,7 +1380,7 @@ bool TQSettings::writeEntry(const TQString &key, double value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1410,7 +1410,7 @@ bool TQSettings::writeEntry(const TQString &key, int value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1463,7 +1463,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQString &value)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysWriteEntry( grp_key, value );
#endif
@@ -1526,7 +1526,7 @@ bool TQSettings::removeEntry(const TQString &key)
return FALSE;
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysRemoveEntry( grp_key );
#endif
@@ -1606,7 +1606,7 @@ TQStringList TQSettings::entryList(const TQString &key) const
return TQStringList();
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysEntryList( grp_key );
#endif
@@ -1714,7 +1714,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const
return TQStringList();
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return d->sysSubkeyList( grp_key );
#endif
@@ -1809,7 +1809,7 @@ TQDateTime TQSettings::lastModificationTime( const TQString &key )
return TQDateTime();
}
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
if ( d->sysd )
return TQDateTime();
#endif
@@ -2038,7 +2038,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope
TQString actualSearchPath;
int lastDot = domain.findRev( '.' );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product;
insertSearchPath( Windows, actualSearchPath );
#elif !defined(TQWS) && defined(Q_OS_MAC)
diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h
index 7ea1ac8de..6dcd1a037 100644
--- a/src/tools/qsettings_p.h
+++ b/src/tools/qsettings_p.h
@@ -108,7 +108,7 @@ public:
bool modified :1;
bool globalScope :1;
-#if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
// system dependent implementations to use the
// system specific setting database (ie. registry on Windows)
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 01d90c1f7..938ff3130 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -68,7 +68,7 @@
#ifndef Q_OS_TEMP
#include <locale.h>
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
#if defined(Q_OS_LINUX)
@@ -6261,23 +6261,23 @@ TQCString TQString::local8Bit() const
*d->cString = TQCString(latin1());
return *d->cString;
#else
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQTextCodec* codec = TQTextCodec::codecForLocale();
*d->cString = codec ? codec->fromUnicode(*this) : TQCString(latin1());
return *d->cString;
#endif
-#if defined( Q_WS_MACX )
+#if defined( TQ_WS_MACX )
return utf8();
#endif
-#if defined( Q_WS_MAC9 )
+#if defined( TQ_WS_MAC9 )
*d->cString = TQCString(latin1()); //I'm evil..
return *d->cString;
#endif
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
*d->cString = isNull() ? TQCString("") : qt_winTQString2MB( *this );
return *d->cString;
#endif
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
return utf8(); // ### if there is any 8 bit format supported?
#endif
#endif
@@ -6307,7 +6307,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
if ( !local8Bit )
return TQString::null;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQTextCodec* codec = TQTextCodec::codecForLocale();
if ( len < 0 )
len = strlen( local8Bit );
@@ -6315,18 +6315,18 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
? codec->toUnicode( local8Bit, len )
: fromLatin1( local8Bit, len );
#endif
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
return fromUtf8(local8Bit,len);
#endif
// Should this be OS_WIN32?
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
if ( len >= 0 ) {
TQCString s(local8Bit,len+1);
return qt_winMB2TQString(s);
}
return qt_winMB2TQString( local8Bit );
#endif
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
return fromUtf8(local8Bit,len);
#endif
#endif // TQT_NO_TEXTCODEC
@@ -6757,7 +6757,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
if ( isEmpty() || s.isEmpty() )
return compare( s );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
int res;
QT_WA( {
const TCHAR* s1 = (TCHAR*)ucs2();
@@ -6777,7 +6777,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
default:
return 0;
}
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
int delta = 0;
#if !defined(TQT_NO_TEXTCODEC)
TQTextCodec *codec = TQTextCodec::codecForLocale();
@@ -6787,7 +6787,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
#endif
delta = ucstrcmp(*this, s);
return delta;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
// declared in <string.h>
int delta = strcoll( local8Bit(), s.local8Bit() );
if ( delta == 0 )
diff --git a/src/tools/qunicodetables_p.h b/src/tools/qunicodetables_p.h
index 8d8936428..ab6d2e1c5 100644
--- a/src/tools/qunicodetables_p.h
+++ b/src/tools/qunicodetables_p.h
@@ -248,7 +248,7 @@ inline int scriptForChar( ushort uc )
return script;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#define SCRIPT_FOR_CHAR( script, c ) \
do { \
unsigned short _uc = (c).unicode(); \
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-12 08:35:51 +0000