summaryrefslogtreecommitdiffstats
path: root/qtinterface
diff options
context:
space:
mode:
Diffstat (limited to 'qtinterface')
-rw-r--r--qtinterface/interface_tqt3/tqcstring.cpp4
-rw-r--r--qtinterface/interface_tqt3/tqiodevice.h6
-rw-r--r--qtinterface/interface_tqt3/tqmap.h4
-rw-r--r--qtinterface/interface_tqt3/tqmetaobject.cpp4
-rw-r--r--qtinterface/interface_tqt3/tqpaintdevice.cpp4
-rw-r--r--qtinterface/interface_tqt3/tqpair.h2
-rw-r--r--qtinterface/interface_tqt3/tqstringlist.cpp8
-rw-r--r--qtinterface/interface_tqt3/tqstringlist.h12
-rw-r--r--qtinterface/interface_tqt3/tqstrlist.h2
-rw-r--r--qtinterface/interface_tqt3/tqtextcodec.cpp4
-rw-r--r--qtinterface/interface_tqt3/tqtl.h4
-rw-r--r--qtinterface/interface_tqt3/tqvaluelist.h6
12 files changed, 30 insertions, 30 deletions
diff --git a/qtinterface/interface_tqt3/tqcstring.cpp b/qtinterface/interface_tqt3/tqcstring.cpp
index 23f8ede..25e0536 100644
--- a/qtinterface/interface_tqt3/tqcstring.cpp
+++ b/qtinterface/interface_tqt3/tqcstring.cpp
@@ -27,7 +27,7 @@ Boston, MA 02110-1301, USA.
QByteArray::operator QByteArray *() const
{ return (QByteArray*)(d->data); }
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
int Q3CString::contains( const QRegExp &rx ) const
{
@@ -44,7 +44,7 @@ Q3CString &Q3CString::replace( const QRegExp &rx, const char *str )
return *this;
}
-#endif //QT_NO_REGEXP
+#endif //TQT_NO_REGEXP
QByteArray QByteArray::copy() const {
QByteArray copy(*this);
diff --git a/qtinterface/interface_tqt3/tqiodevice.h b/qtinterface/interface_tqt3/tqiodevice.h
index 63e5521..d662f71 100644
--- a/qtinterface/interface_tqt3/tqiodevice.h
+++ b/qtinterface/interface_tqt3/tqiodevice.h
@@ -39,14 +39,14 @@ Boston, MA 02110-1301, USA.
// Reimplement the QIODevice class
// For Qt4, no changes are needed
-#define QT_NO_QOBJECT
+#define TQT_NO_QOBJECT
#include <tqt4/Qt/ntqiodevice.h>
-#undef QT_NO_QOBJECT
+#undef TQT_NO_QOBJECT
// class TQIODevice : public QIODevice {
// public:
// TQIODevice();
-// #ifndef QT_NO_QOBJECT
+// #ifndef TQT_NO_QOBJECT
// explicit TQIODevice(QObject *parent);
// #endif
//
diff --git a/qtinterface/interface_tqt3/tqmap.h b/qtinterface/interface_tqt3/tqmap.h
index eb8a1ae..2dadc93 100644
--- a/qtinterface/interface_tqt3/tqmap.h
+++ b/qtinterface/interface_tqt3/tqmap.h
@@ -603,7 +603,7 @@ Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeB
#ifdef QT_CHECK_RANGE
-# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
+# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) qWarning( "TQMap: Warning invalid element" )
# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
# else
@@ -901,7 +901,7 @@ void TQMap<Key,T>::detachInternal()
}
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
template<class Key, class T>
QDataStream& operator>>( QDataStream& s, TQMap<Key,T>& m ) {
m.clear();
diff --git a/qtinterface/interface_tqt3/tqmetaobject.cpp b/qtinterface/interface_tqt3/tqmetaobject.cpp
index a76aeb0..021d6e9 100644
--- a/qtinterface/interface_tqt3/tqmetaobject.cpp
+++ b/qtinterface/interface_tqt3/tqmetaobject.cpp
@@ -197,7 +197,7 @@ int QMetaObject::findSignal( const char* n, bool super ) const
return -1;
}
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
/*!
Returns the number of properties for this class.
@@ -293,7 +293,7 @@ int QMetaObject::findProperty( const char *name, bool super ) const
return indexOfProperty( name );
}
-#endif // QT_NO_PROPERTIES
+#endif // TQT_NO_PROPERTIES
bool QMetaProperty::writable() const
{
diff --git a/qtinterface/interface_tqt3/tqpaintdevice.cpp b/qtinterface/interface_tqt3/tqpaintdevice.cpp
index 768fe12..457d37d 100644
--- a/qtinterface/interface_tqt3/tqpaintdevice.cpp
+++ b/qtinterface/interface_tqt3/tqpaintdevice.cpp
@@ -53,11 +53,11 @@ Boston, MA 02110-1301, USA.
*/
Qt::HANDLE QPaintDevice::x11RenderHandle() const
{
-// #ifndef QT_NO_XFTFREETYPE
+// #ifndef TQT_NO_XFTFREETYPE
// return rendhd ? XftDrawPicture( (XftDraw *) rendhd ) : 0;
// #else
return 0;
-// #endif // QT_NO_XFTFREETYPE
+// #endif // TQT_NO_XFTFREETYPE
}
static GC* app_gc_tmp = 0; // temporary GC
diff --git a/qtinterface/interface_tqt3/tqpair.h b/qtinterface/interface_tqt3/tqpair.h
index 09f8961..dd511ec 100644
--- a/qtinterface/interface_tqt3/tqpair.h
+++ b/qtinterface/interface_tqt3/tqpair.h
@@ -120,7 +120,7 @@ TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
return TQPair<T1, T2>( x, y );
}
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
template <class T1, class T2>
inline QDataStream& operator>>( QDataStream& s, TQPair<T1, T2>& p )
{
diff --git a/qtinterface/interface_tqt3/tqstringlist.cpp b/qtinterface/interface_tqt3/tqstringlist.cpp
index 99bc910..9fa4d7b 100644
--- a/qtinterface/interface_tqt3/tqstringlist.cpp
+++ b/qtinterface/interface_tqt3/tqstringlist.cpp
@@ -61,7 +61,7 @@ TQStringList TQStringList::split( const QString &sep, const QString &str,
return lst;
}
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
TQStringList TQStringList::split( const QRegExp &sep, const QString &str,
bool allowEmptyEntries )
{
@@ -105,7 +105,7 @@ TQStringList TQStringList::grep( const QString &str, bool cs ) const
}
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
TQStringList TQStringList::grep( const QRegExp &rx ) const
{
TQStringList res;
@@ -128,7 +128,7 @@ TQStringList& TQStringList::gres( const QString &before, const QString &after,
return *this;
}
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
TQStringList& TQStringList::gres( const QRegExp &rx, const QString &after )
{
TQStringList::Iterator it = begin();
@@ -154,7 +154,7 @@ QString TQStringList::join( const QString &sep ) const
return res;
}
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
QDataStream &operator>>( QDataStream & s, TQStringList& l )
{
return s >> (TQValueList<QString>&)l;
diff --git a/qtinterface/interface_tqt3/tqstringlist.h b/qtinterface/interface_tqt3/tqstringlist.h
index 7492994..a9f0cde 100644
--- a/qtinterface/interface_tqt3/tqstringlist.h
+++ b/qtinterface/interface_tqt3/tqstringlist.h
@@ -83,7 +83,7 @@ Boston, MA 02110-1301, USA.
**
**********************************************************************/
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
class QRegExp;
template <class T> class QDeepCopy;
@@ -101,7 +101,7 @@ public:
TQStringList( const TQStringList& l ) : TQValueList<QString>(l) { }
TQStringList( const TQValueList<QString>& l ) : TQValueList<QString>(l) { }
TQStringList( const QString& i ) { append(i); }
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
TQStringList( const char* i ) { append(i); }
#endif
@@ -132,19 +132,19 @@ public:
static TQStringList split( const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
static TQStringList split( const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE );
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
static TQStringList split( const QRegExp &sep, const QString &str, bool allowEmptyEntries = FALSE );
#endif
QString join( const QString &sep ) const;
TQStringList grep( const QString &str, bool cs = TRUE ) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
TQStringList grep( const QRegExp &expr ) const;
#endif
TQStringList& gres( const QString &before, const QString &after,
bool cs = TRUE );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
TQStringList& gres( const QRegExp &expr, const QString &after );
#endif
@@ -153,7 +153,7 @@ protected:
friend class QDeepCopy< TQStringList >;
};
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
class QDataStream;
extern QDataStream &operator>>( QDataStream &, TQStringList& );
extern QDataStream &operator<<( QDataStream &, const TQStringList& );
diff --git a/qtinterface/interface_tqt3/tqstrlist.h b/qtinterface/interface_tqt3/tqstrlist.h
index 41a26e0..269a3e3 100644
--- a/qtinterface/interface_tqt3/tqstrlist.h
+++ b/qtinterface/interface_tqt3/tqstrlist.h
@@ -153,7 +153,7 @@ private:
void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
(const char*)s2); }
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
QDataStream &read( QDataStream &s, Q3PtrCollection::Item &d )
{ s >> (char *&)d; return s; }
QDataStream &write( QDataStream &s, Q3PtrCollection::Item d ) const
diff --git a/qtinterface/interface_tqt3/tqtextcodec.cpp b/qtinterface/interface_tqt3/tqtextcodec.cpp
index fa30505..ddc9518 100644
--- a/qtinterface/interface_tqt3/tqtextcodec.cpp
+++ b/qtinterface/interface_tqt3/tqtextcodec.cpp
@@ -412,7 +412,7 @@ QString QTextCodecFromIODDecoder::convertToUnicode(const char* chars, int len, i
return result;
}
-#ifndef QT_NO_CODECS
+#ifndef TQT_NO_CODECS
// Cannot use <pre> or \code
/*!
Reads a POSIX2 charmap definition from \a iod.
@@ -510,6 +510,6 @@ int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
return 0;
}
-#endif //QT_NO_CODECS
+#endif //TQT_NO_CODECS
#endif // USE_QT4
diff --git a/qtinterface/interface_tqt3/tqtl.h b/qtinterface/interface_tqt3/tqtl.h
index 4ac4cd6..c05e563 100644
--- a/qtinterface/interface_tqt3/tqtl.h
+++ b/qtinterface/interface_tqt3/tqtl.h
@@ -80,7 +80,7 @@ Boston, MA 02110-1301, USA.
**
**********************************************************************/
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
template <class T>
class TQTextOStreamIterator
{
@@ -102,7 +102,7 @@ public:
TQTextOStreamIterator<T>& operator++() { return *this; }
TQTextOStreamIterator<T>& operator++(int) { return *this; }
};
-#endif //QT_NO_TEXTSTREAM
+#endif //TQT_NO_TEXTSTREAM
template <class InputIterator, class OutputIterator>
inline OutputIterator tqCopy( InputIterator _begin, InputIterator _end,
diff --git a/qtinterface/interface_tqt3/tqvaluelist.h b/qtinterface/interface_tqt3/tqvaluelist.h
index 73474c6..6237fde 100644
--- a/qtinterface/interface_tqt3/tqvaluelist.h
+++ b/qtinterface/interface_tqt3/tqvaluelist.h
@@ -422,7 +422,7 @@ void TQValueListPrivate<T>::clear()
}
#ifdef QT_CHECK_RANGE
-# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
+# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
# define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) qWarning( "TQValueList: Warning invalid element" )
# define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() );
# else
@@ -684,7 +684,7 @@ void TQValueList<T>::detachInternal()
sh->deref(); sh = new TQValueListPrivate<T>( *sh );
}
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
template <class T>
QDataStream& operator>>( QDataStream& s, TQValueList<T>& l )
{
@@ -711,7 +711,7 @@ QDataStream& operator<<( QDataStream& s, const TQValueList<T>& l )
s << *it;
return s;
}
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
/****************************************************************************/
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 02:48:43 +0000