summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/ntqabstractlayout.h2
-rw-r--r--src/kernel/ntqapplication.h4
-rw-r--r--src/kernel/ntqdragobject.h2
-rw-r--r--src/kernel/ntqfont.h4
-rw-r--r--src/kernel/ntqfontdatabase.h8
-rw-r--r--src/kernel/ntqfontmetrics.h2
-rw-r--r--src/kernel/ntqnamespace.h10
-rw-r--r--src/kernel/ntqobject.h8
-rw-r--r--src/kernel/ntqobjectdefs.h2
-rw-r--r--src/kernel/ntqpalette.h4
-rw-r--r--src/kernel/ntqsignal.h2
-rw-r--r--src/kernel/ntqsizepolicy.h2
-rw-r--r--src/kernel/ntqsound.h2
-rw-r--r--src/kernel/ntqstyle.h2
-rw-r--r--src/kernel/ntqthread.h6
-rw-r--r--src/kernel/ntqtranslator.h8
-rw-r--r--src/kernel/ntqwidget.h4
-rw-r--r--src/kernel/qapplication.cpp6
-rw-r--r--src/kernel/qfont.cpp2
-rw-r--r--src/kernel/qlayout.cpp2
-rw-r--r--src/kernel/qsignal.cpp2
-rw-r--r--src/kernel/qstyle.cpp2
-rw-r--r--src/kernel/qt_pch.h4
-rw-r--r--src/kernel/qthread.cpp2
-rw-r--r--src/kernel/qtranslator.cpp20
25 files changed, 56 insertions, 56 deletions
diff --git a/src/kernel/ntqabstractlayout.h b/src/kernel/ntqabstractlayout.h
index 88a0eeff9..9d7697629 100644
--- a/src/kernel/ntqabstractlayout.h
+++ b/src/kernel/ntqabstractlayout.h
@@ -46,7 +46,7 @@
*/
#ifndef QT_H
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
#include "ntqlayout.h"
#endif
#endif // QT_H
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index f50606130..9ae120f2b 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -174,7 +174,7 @@ public:
static void beep();
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
# ifndef QT_NO_TEXTCODEC
void setDefaultCodec( TQTextCodec * );
TQTextCodec* defaultCodec() const;
@@ -539,7 +539,7 @@ inline TQSize TQApplication::globalStrut()
return app_strut;
}
-#ifdef QT_NO_TRANSLATION
+#ifdef TQT_NO_TRANSLATION
// Simple versions
inline TQString TQApplication::translate( const char *, const char *sourceText,
const char *, Encoding encoding ) const
diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h
index a960d9788..fbcca3abb 100644
--- a/src/kernel/ntqdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -216,7 +216,7 @@ private:
#endif
};
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
typedef TQUriDrag TQUrlDrag;
#endif
diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h
index 0d205410e..b3a0911fc 100644
--- a/src/kernel/ntqfont.h
+++ b/src/kernel/ntqfont.h
@@ -301,12 +301,12 @@ public:
TQString lastResortFamily() const;
TQString lastResortFont() const;
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
static TQFont defaultFont();
static void setDefaultFont( const TQFont & );
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
TQFont resolve( const TQFont & ) const;
diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h
index 482e36634..bc686cabc 100644
--- a/src/kernel/ntqfontdatabase.h
+++ b/src/kernel/ntqfontdatabase.h
@@ -97,7 +97,7 @@ public:
#endif
// For source compatibility with < 3.0
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
TQStringList families(bool) const;
TQStringList styles( const TQString &, const TQString & ) const;
@@ -115,7 +115,7 @@ public:
bool bold( const TQString &, const TQString &, const TQString & ) const;
int weight( const TQString &, const TQString &, const TQString & ) const;
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
private:
#if defined(Q_WS_X11) || defined(Q_WS_WIN)
@@ -136,7 +136,7 @@ private:
};
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
inline TQStringList TQFontDatabase::families( bool ) const
{
@@ -220,7 +220,7 @@ inline int TQFontDatabase::weight( const TQString &family,
return weight(family, style);
}
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
#endif // QT_NO_FONTDATABASE
diff --git a/src/kernel/ntqfontmetrics.h b/src/kernel/ntqfontmetrics.h
index 7c8c7b610..99bdbe0d1 100644
--- a/src/kernel/ntqfontmetrics.h
+++ b/src/kernel/ntqfontmetrics.h
@@ -79,7 +79,7 @@ public:
int width( const TQString &, int len = -1 ) const;
int width( TQChar ) const;
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
int width( char c ) const { return width( (TQChar) c ); }
#endif
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 0d3d1b5e4..ef772989a 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -250,7 +250,7 @@ public:
WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC,
#endif
WNoAutoErase = WRepaintNoErase | WResizeNoErase
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
,
WNorthWestGravity = WStaticContents,
WType_Modal = WType_Dialog | WShowModal,
@@ -303,7 +303,7 @@ public:
OpaqueMode
};
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
// documented in qpainter.cpp
enum PaintUnit { // paint unit
PixelUnit,
@@ -316,10 +316,10 @@ public:
#endif
// documented in qstyle.cpp
-#ifdef QT_NO_COMPAT
+#ifdef TQT_NO_COMPAT
enum GUIStyle {
WindowsStyle = 1, // ### TQt 4.0: either remove the obsolete enums or clean up compat vs.
- MotifStyle = 4, // ### QT_NO_COMPAT by reordering or combination into one enum.
+ MotifStyle = 4, // ### TQT_NO_COMPAT by reordering or combination into one enum.
GtkStyle = 6 // Gtk compability mode
};
#else
@@ -933,7 +933,7 @@ public:
DockRight,
DockLeft,
DockMinimized
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
,
Unmanaged = DockUnmanaged,
TornOff = DockTornOff,
diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h
index c81dc9d31..d7e3a17a3 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/ntqobject.h
@@ -150,12 +150,12 @@ public:
virtual bool setProperty( const char *name, const TQVariant& value );
virtual TQVariant property( const char *name ) const;
#endif // QT_NO_PROPERTIES
-#ifdef QT_NO_TRANSLATION
+#ifdef TQT_NO_TRANSLATION
static TQString tr( const char *sourceText, const char * = 0);
#ifndef QT_NO_TEXTCODEC
static TQString trUtf8( const char *sourceText, const char * = 0);
#endif
-#endif //QT_NO_TRANSLATION
+#endif //TQT_NO_TRANSLATION
#ifndef QT_NO_USERDATA
static uint registerUserData();
@@ -272,7 +272,7 @@ inline bool TQObject::disconnect( const TQObject *receiver, const char *member )
}
-#ifdef QT_NO_TRANSLATION
+#ifdef TQT_NO_TRANSLATION
inline TQString TQObject::tr( const char *sourceText, const char * ) {
return TQString::fromLatin1( sourceText );
}
@@ -281,7 +281,7 @@ inline TQString TQObject::trUtf8( const char *sourceText, const char * ) {
return TQString::fromUtf8( sourceText );
}
#endif
-#endif //QT_NO_TRANSLATION
+#endif //TQT_NO_TRANSLATION
#define Q_DEFINED_QOBJECT
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index a8dce0707..43cd84cfb 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -46,7 +46,7 @@
#endif // QT_H
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
# ifndef QT_NO_TEXTCODEC
// full set of tr functions
# define TQT_TR_FUNCTIONS \
diff --git a/src/kernel/ntqpalette.h b/src/kernel/ntqpalette.h
index b3b155f25..9bffe41bf 100644
--- a/src/kernel/ntqpalette.h
+++ b/src/kernel/ntqpalette.h
@@ -137,14 +137,14 @@ public:
const TQColorGroup &active() const { return data->active; }
const TQColorGroup &disabled() const { return data->disabled; }
const TQColorGroup &inactive() const { return data->inactive; }
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
const TQColorGroup &normal() const { return active(); }
#endif
void setActive( const TQColorGroup & );
void setDisabled( const TQColorGroup & );
void setInactive( const TQColorGroup & );
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
void setNormal( const TQColorGroup & cg ) { setActive(cg); }
#endif
diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h
index 281b2278a..8d14385ac 100644
--- a/src/kernel/ntqsignal.h
+++ b/src/kernel/ntqsignal.h
@@ -60,7 +60,7 @@ public:
void activate();
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
bool isBlocked() const { return TQObject::signalsBlocked(); }
void block( bool b ) { TQObject::blockSignals( b ); }
#ifndef QT_NO_VARIANT
diff --git a/src/kernel/ntqsizepolicy.h b/src/kernel/ntqsizepolicy.h
index ef13db7c4..3fc4dd2fb 100644
--- a/src/kernel/ntqsizepolicy.h
+++ b/src/kernel/ntqsizepolicy.h
@@ -64,7 +64,7 @@ public:
enum ExpandData { NoDirection = 0,
Horizontally = 1,
Vertically = 2,
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
Horizontal = Horizontally,
Vertical = Vertically,
#endif
diff --git a/src/kernel/ntqsound.h b/src/kernel/ntqsound.h
index c7998f349..5c6a41b06 100644
--- a/src/kernel/ntqsound.h
+++ b/src/kernel/ntqsound.h
@@ -66,7 +66,7 @@ public:
?
*/
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
static bool available() { return isAvailable(); }
#endif
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index f19485523..51bf61b1b 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -1199,7 +1199,7 @@ public:
// Old 2.x TQStyle API
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
int defaultFrameWidth() const;
void tabbarMetrics( const TQWidget* t, int& hf, int& vf, int& ov ) const;
TQSize scrollBarExtent() const;
diff --git a/src/kernel/ntqthread.h b/src/kernel/ntqthread.h
index a38a2dfa1..edf45f89c 100644
--- a/src/kernel/ntqthread.h
+++ b/src/kernel/ntqthread.h
@@ -45,11 +45,11 @@
#ifndef QT_H
#include "ntqwindowdefs.h"
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
#include "ntqmutex.h"
#include "ntqsemaphore.h"
#include "ntqwaitcondition.h"
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
#endif // QT_H
#include <limits.h>
@@ -61,7 +61,7 @@ class Q_EXPORT TQThread : public TQt
public:
static TQt::HANDLE currentThread();
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
static void postEvent( TQObject *,TQEvent * );
#endif
diff --git a/src/kernel/ntqtranslator.h b/src/kernel/ntqtranslator.h
index bbbda7eed..5d6709db8 100644
--- a/src/kernel/ntqtranslator.h
+++ b/src/kernel/ntqtranslator.h
@@ -47,7 +47,7 @@
#include "ntqvaluelist.h"
#endif // QT_H
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
class TQTranslatorPrivate;
@@ -109,7 +109,7 @@ public:
TQTranslator( TQObject * parent = 0, const char * name = 0 );
~TQTranslator();
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
TQString find( const char *context, const char *sourceText, const char * comment = 0 ) const {
return findMessage( context, sourceText, comment ).translation();
}
@@ -128,7 +128,7 @@ public:
void clear();
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
enum SaveMode { Everything, Stripped };
bool save( const TQString & filename, SaveMode mode = Everything );
@@ -162,6 +162,6 @@ private:
TQTranslatorPrivate * d;
};
-#endif // QT_NO_TRANSLATION
+#endif // TQT_NO_TRANSLATION
#endif
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index bac3d6bc9..2dbb6701d 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -356,7 +356,7 @@ public slots:
virtual void hide();
void setShown( bool show );
void setHidden( bool hide );
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
void iconify() { showMinimized(); }
#endif
virtual void showMinimized();
@@ -414,7 +414,7 @@ public:
bool showIt=FALSE );
void reparent( TQWidget *parent, const TQPoint &,
bool showIt=FALSE );
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
void recreate( TQWidget *parent, WFlags f, const TQPoint & p,
bool showIt=FALSE ) { reparent(parent,f,p,showIt); }
#endif
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 4ee67cd4d..146659572 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -1210,7 +1210,7 @@ TQApplication::~TQApplication()
delete app_cursor;
app_cursor = 0;
#endif
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
delete translators;
#endif
@@ -3161,7 +3161,7 @@ TQt::WindowsVersion TQApplication::winVersion()
}
#endif
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
bool qt_detectRTLLanguage()
{
@@ -3192,7 +3192,7 @@ void TQApplication::installTranslator( TQTranslator * mf )
translators->prepend( mf );
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
if ( mf->isEmpty() )
return;
#endif
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index a49dd3493..856db67dc 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -1343,7 +1343,7 @@ TQFont TQFont::resolve( const TQFont &other ) const
return font;
}
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
/*! \obsolete
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index dfcf450dd..8a992e632 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -1399,7 +1399,7 @@ void TQGridLayout::setColStretch( int col, int stretch )
}
#if TQT_VERSION >= 0x040000
-#error "Make add{Row,Col}Spacing() inline QT_NO_COMPAT functions defined in terms of set{Row,Col}Spacing()"
+#error "Make add{Row,Col}Spacing() inline TQT_NO_COMPAT functions defined in terms of set{Row,Col}Spacing()"
#endif
/*!
diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp
index acc74829f..8d91f0e6f 100644
--- a/src/kernel/qsignal.cpp
+++ b/src/kernel/qsignal.cpp
@@ -241,7 +241,7 @@ TQVariant TQSignal::value() const
\internal
*/
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
/*! \obsolete */
void TQSignal::setParameter( int value )
{
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 4204c9941..7a90fec1d 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -2806,7 +2806,7 @@ TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOp
\obsolete
*/
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
int TQStyle::defaultFrameWidth() const
{
TQStyleControlElementData ceData;
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index e80d7bd6f..cdde3e790 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -16,7 +16,7 @@
#if defined __cplusplus
# if defined(__GNUC__)
-# ifndef QT_NO_STL
+# ifndef TQT_NO_STL
# include <ios>
# undef _GLIBCPP_FULLY_COMPLIANT_HEADERS // Makes qlocale.cpp compile
# endif
@@ -44,7 +44,7 @@
#include <limits.h>
#include <stdlib.h>
#if defined(__GNUC__)
-# ifndef QT_NO_STL
+# ifndef TQT_NO_STL
# define _GLIBCPP_FULLY_COMPLIANT_HEADERS
# endif
#endif
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index d6cd01f6e..f3f416096 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -256,7 +256,7 @@ bool TQThread::threadPostedEventsDisabled() const
\sa wait()
*/
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
/*! \obsolete
Use TQApplication::postEvent() instead.
*/
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 884c81977..9e429b789 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -54,7 +54,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
#include "ntqtranslator.h"
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
#include "ntqfileinfo.h"
#include "ntqwidgetlist.h"
@@ -192,7 +192,7 @@ public:
TQTranslatorPrivate() :
unmapPointer( 0 ), unmapLength( 0 ),
messageArray( 0 ), offsetArray( 0 ), contextArray( 0 )
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
, messages( 0 )
#endif
{ }
@@ -207,7 +207,7 @@ public:
TQByteArray * offsetArray;
TQByteArray * contextArray;
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
TQMap<TQTranslatorMessage, void *> * messages;
#endif
#ifdef Q_WS_WIN
@@ -602,7 +602,7 @@ bool TQTranslator::do_load( const uchar *data, int len )
return ok;
}
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
/*!
Saves this message file to \a filename, overwriting the previous
@@ -685,7 +685,7 @@ void TQTranslator::clear()
delete d->contextArray;
d->contextArray = 0;
}
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
delete d->messages;
d->messages = 0;
#endif
@@ -705,7 +705,7 @@ void TQTranslator::clear()
}
}
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
/*!
Converts this message file to the compact format used to store
@@ -973,7 +973,7 @@ TQTranslatorMessage TQTranslator::findMessage( const char* context,
if ( comment == 0 )
comment = "";
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
if ( d->messages ) {
TQMap<TQTranslatorMessage, void *>::ConstIterator it;
@@ -1078,14 +1078,14 @@ bool TQTranslator::isEmpty() const
{
return !( d->unmapPointer || d->unmapLength || d->messageArray ||
d->offsetArray || d->contextArray
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
|| (d->messages && d->messages->count())
#endif
);
}
-#ifndef QT_NO_TRANSLATION_BUILDER
+#ifndef TQT_NO_TRANSLATION_BUILDER
/*!
Returns a list of the messages in the translator. This function is
@@ -1475,4 +1475,4 @@ bool TQTranslatorMessage::operator<( const TQTranslatorMessage& m ) const
otherwise returns FALSE.
*/
-#endif // QT_NO_TRANSLATION
+#endif // TQT_NO_TRANSLATION
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 16:23:59 +0000