summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/tqfontengine_x11.cpp2
-rw-r--r--src/kernel/tqiconset.cpp2
-rw-r--r--src/kernel/tqiconset.h4
-rw-r--r--src/kernel/tqmetaobject.cpp4
-rw-r--r--src/kernel/tqobjectdefs.h2
-rw-r--r--src/kernel/tqpixmap.h4
-rw-r--r--src/kernel/tqrichtext.cpp3
-rw-r--r--src/kernel/tqrichtext_p.h2
-rw-r--r--src/kernel/tqscriptengine.cpp2
-rw-r--r--src/kernel/tqscriptengine_x11.cpp8
-rw-r--r--src/kernel/tqtranslator.cpp1
-rw-r--r--src/kernel/tqwidget.h2
12 files changed, 8 insertions, 28 deletions
diff --git a/src/kernel/tqfontengine_x11.cpp b/src/kernel/tqfontengine_x11.cpp
index 9276a5a93..1a7b95ebb 100644
--- a/src/kernel/tqfontengine_x11.cpp
+++ b/src/kernel/tqfontengine_x11.cpp
@@ -1705,7 +1705,7 @@ void TQFontEngineXft::draw( TQPainter *p, int x, int y, const TQTextEngine *engi
col.color.alpha = 0xffff;
col.pixel = pen.pixel();
#ifdef FONTENGINE_DEBUG
- tqDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"TRUE":"FALSE" );
+ tqDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"true":"false" );
p->save();
p->setBrush( TQt::white );
glyph_metrics_t ci = boundingBox( glyphs, advances, offsets, si->num_glyphs );
diff --git a/src/kernel/tqiconset.cpp b/src/kernel/tqiconset.cpp
index d22116207..71b71ffee 100644
--- a/src/kernel/tqiconset.cpp
+++ b/src/kernel/tqiconset.cpp
@@ -156,8 +156,6 @@ public:
delete factory;
factory = newFactory;
}
-
- TQ_DUMMY_COMPARISON_OPERATOR( TQIconSetPrivate )
};
TQIconSetIcon *TQIconSetPrivate::icon( const TQIconSet *iconSet,
diff --git a/src/kernel/tqiconset.h b/src/kernel/tqiconset.h
index 7caa24b74..798c4bbe5 100644
--- a/src/kernel/tqiconset.h
+++ b/src/kernel/tqiconset.h
@@ -89,10 +89,6 @@ public:
static void setIconSize( Size which, const TQSize& size );
static const TQSize& iconSize( Size which );
-#ifndef Q_QDOC
- TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet)
-#endif
-
private:
void normalize( Size& which, const TQSize& pixSize );
TQPixmap *createScaled( Size size, const TQPixmap *suppliedPix ) const;
diff --git a/src/kernel/tqmetaobject.cpp b/src/kernel/tqmetaobject.cpp
index 4464f716d..d2119851c 100644
--- a/src/kernel/tqmetaobject.cpp
+++ b/src/kernel/tqmetaobject.cpp
@@ -164,11 +164,7 @@ public:
Internal dictionary for fast access to class members
*****************************************************************************/
-#if defined(Q_CANNOT_DELETE_CONSTANT)
-typedef TQMetaData TQConstMetaData;
-#else
typedef const TQMetaData TQConstMetaData;
-#endif
class TQ_EXPORT TQMemberDict : public TQAsciiDict<TQConstMetaData>
{
diff --git a/src/kernel/tqobjectdefs.h b/src/kernel/tqobjectdefs.h
index 69d44d6bc..871ba47a3 100644
--- a/src/kernel/tqobjectdefs.h
+++ b/src/kernel/tqobjectdefs.h
@@ -169,6 +169,6 @@ TQ_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * );
TQ_EXPORT void *tqt_inheritedBy( TQMetaObject *super, const TQObject *cls );
template <typename T>
-TQ_INLINE_TEMPLATES T tqt_cast(const TQObject *object)
+T tqt_cast(const TQObject *object)
{ return (T)tqt_inheritedBy( ((T)0)->staticMetaObject(), object ); }
#endif // TQOBJECTDEFS_H
diff --git a/src/kernel/tqpixmap.h b/src/kernel/tqpixmap.h
index 0a89e98bf..4af4a451b 100644
--- a/src/kernel/tqpixmap.h
+++ b/src/kernel/tqpixmap.h
@@ -168,10 +168,6 @@ public:
void x11SetScreen( int screen );
#endif
-#ifndef Q_QDOC
- TQ_DUMMY_COMPARISON_OPERATOR(TQPixmap)
-#endif
-
protected:
TQPixmap( int w, int h, const uchar *data, bool isXbitmap );
int metric( int ) const;
diff --git a/src/kernel/tqrichtext.cpp b/src/kernel/tqrichtext.cpp
index eddb23761..a4a80e0dd 100644
--- a/src/kernel/tqrichtext.cpp
+++ b/src/kernel/tqrichtext.cpp
@@ -1567,8 +1567,6 @@ struct TQ_EXPORT TQTextDocumentTag {
liststyle = t.liststyle;
return *this;
}
-
- TQ_DUMMY_COMPARISON_OPERATOR(TQTextDocumentTag)
};
@@ -6584,7 +6582,6 @@ struct TQPixmapInt
TQPixmapInt() : ref( 0 ) {}
TQPixmap pm;
int ref;
- TQ_DUMMY_COMPARISON_OPERATOR(TQPixmapInt)
};
static TQMap<TQString, TQPixmapInt> *pixmap_map = 0;
diff --git a/src/kernel/tqrichtext_p.h b/src/kernel/tqrichtext_p.h
index 2d75c779b..d2219b562 100644
--- a/src/kernel/tqrichtext_p.h
+++ b/src/kernel/tqrichtext_p.h
@@ -760,7 +760,6 @@ struct TQ_EXPORT TQTextDocumentSelection
{
TQTextCursor startCursor, endCursor;
bool swapped;
- TQ_DUMMY_COMPARISON_OPERATOR(TQTextDocumentSelection)
};
#if defined(Q_TEMPLATEDLL)
@@ -1128,7 +1127,6 @@ struct TQ_EXPORT TQTextParagraphSelection
{
TQTextParagraphSelection() : start(0), end(0) { }
int start, end;
- TQ_DUMMY_COMPARISON_OPERATOR(TQTextParagraphSelection)
};
struct TQ_EXPORT TQTextLineStart
diff --git a/src/kernel/tqscriptengine.cpp b/src/kernel/tqscriptengine.cpp
index 963d2bb3b..e9431463c 100644
--- a/src/kernel/tqscriptengine.cpp
+++ b/src/kernel/tqscriptengine.cpp
@@ -98,7 +98,7 @@ private:
};
template <class T>
-TQ_INLINE_TEMPLATES TQVarLengthArray<T>::TQVarLengthArray(int asize)
+TQVarLengthArray<T>::TQVarLengthArray(int asize)
: s(asize) {
if (s > Prealloc) {
ptr = reinterpret_cast<T *>(malloc(s * sizeof(T)));
diff --git a/src/kernel/tqscriptengine_x11.cpp b/src/kernel/tqscriptengine_x11.cpp
index 7d997457c..6d5429cb0 100644
--- a/src/kernel/tqscriptengine_x11.cpp
+++ b/src/kernel/tqscriptengine_x11.cpp
@@ -1835,7 +1835,7 @@ static bool indic_shape(TQShaperItem *item)
bool invalid;
int send = indic_nextSyllableBoundary(item->script, *item->string, sstart, end, &invalid);
IDEBUG("syllable from %d, length %d, invalid=%s", sstart, send-sstart,
- invalid ? "TRUE" : "FALSE");
+ invalid ? "true" : "false");
syllable.from = sstart;
syllable.length = send-sstart;
syllable.glyphs = item->glyphs + first_glyph;
@@ -2151,7 +2151,7 @@ static bool tibetan_shape(TQShaperItem *item)
bool invalid;
int send = tibetan_nextSyllableBoundary(*(item->string), sstart, end, &invalid);
IDEBUG("syllable from %d, length %d, invalid=%s", sstart, send-sstart,
- invalid ? "TRUE" : "FALSE");
+ invalid ? "true" : "false");
syllable.from = sstart;
syllable.length = send-sstart;
syllable.glyphs = item->glyphs + first_glyph;
@@ -2781,7 +2781,7 @@ static bool khmer_shape(TQShaperItem *item)
bool invalid;
int send = khmer_nextSyllableBoundary(*item->string, sstart, end, &invalid);
KHDEBUG("syllable from %d, length %d, invalid=%s", sstart, send-sstart,
- invalid ? "TRUE" : "FALSE");
+ invalid ? "true" : "false");
syllable.from = sstart;
syllable.length = send-sstart;
syllable.glyphs = item->glyphs + first_glyph;
@@ -3288,7 +3288,7 @@ static bool myanmar_shape(TQShaperItem *item)
bool invalid;
int send = myanmar_nextSyllableBoundary(*item->string, sstart, end, &invalid);
MMDEBUG("syllable from %d, length %d, invalid=%s", sstart, send-sstart,
- invalid ? "TRUE" : "FALSE");
+ invalid ? "true" : "false");
syllable.from = sstart;
syllable.length = send-sstart;
syllable.glyphs = item->glyphs + first_glyph;
diff --git a/src/kernel/tqtranslator.cpp b/src/kernel/tqtranslator.cpp
index 59444c327..2d22dfff1 100644
--- a/src/kernel/tqtranslator.cpp
+++ b/src/kernel/tqtranslator.cpp
@@ -182,7 +182,6 @@ public:
bool operator<( const Offset&k ) const {
return ( h != k.h ) ? h < k.h : o < k.o;
}
- TQ_DUMMY_COMPARISON_OPERATOR(TQTranslatorPrivate::Offset)
uint h;
uint o;
};
diff --git a/src/kernel/tqwidget.h b/src/kernel/tqwidget.h
index ce26e00cb..c7a9733bb 100644
--- a/src/kernel/tqwidget.h
+++ b/src/kernel/tqwidget.h
@@ -139,7 +139,7 @@ class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice
TQ_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
public:
- Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 );
+ explicit TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 );
~TQWidget();
WId winId() const;
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-10 12:35:28 +0000