From b5520771b2756a2859daf5ac703d9120c04a64e9 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 17:20:10 -0500 Subject: [PATCH] Fix inadvertent tq changes. --- kchart/kdchart/KDChartParams.h | 4 ++-- kchart/kdchart/KDFrame.h | 4 ++-- lib/kotext/KoRichText.h | 20 ++++++++++---------- lib/kotext/KoTextDocument.h | 4 ++-- lib/kotext/KoTextFormat.h | 4 ++-- lib/kotext/KoTextParag.h | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h index 32afd1fc..a69a31ba 100644 --- a/kchart/kdchart/KDChartParams.h +++ b/kchart/kdchart/KDChartParams.h @@ -223,7 +223,7 @@ public slots: // PENDING(blackie) merge public slots into one section. public: -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN class KDCHART_EXPORT KDChartFrameSettings { // Q_OBJECT @@ -379,7 +379,7 @@ public: bool _addFrameHeightToLayout; }; -// TQMOC_SKIP_END +// MOC_SKIP_END public slots: diff --git a/kchart/kdchart/KDFrame.h b/kchart/kdchart/KDFrame.h index 584626bb..2db153ee 100644 --- a/kchart/kdchart/KDFrame.h +++ b/kchart/kdchart/KDFrame.h @@ -475,7 +475,7 @@ public slots: public: -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN /** \ifnot v200 \deprecated Feature scheduled for future release, at present not implemented. @@ -570,7 +570,7 @@ public: KDFrameProfile _profile; }; -// TQMOC_SKIP_END +// MOC_SKIP_END public slots: /** diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index 35bb8bd7..c6ebceeb 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -141,9 +141,9 @@ private: }; #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQMemArray; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif class KOTEXT_EXPORT KoTextString @@ -315,9 +315,9 @@ protected: }; #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQPtrList; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif class KoTextDocCommandHistory @@ -352,9 +352,9 @@ private: #include "KoTextCustomItem.h" #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQMap; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif #if 0 @@ -405,9 +405,9 @@ private: }; #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQPtrList; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif class KOTEXT_EXPORT KoTextFlow @@ -528,10 +528,10 @@ private: }; #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQPtrList; template class TQMap; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif class KoTextTable: public KoTextCustomItem diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index 234095a6..19b4e4d4 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -24,12 +24,12 @@ #include "KoRichText.h" #include #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQ_EXPORT TQMap; template class TQ_EXPORT TQMap; template class TQ_EXPORT TQMap; template class TQ_EXPORT TQPtrList; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif class KoStyleCollection; diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h index 4c155b91..66a6d2a9 100644 --- a/lib/kotext/KoTextFormat.h +++ b/lib/kotext/KoTextFormat.h @@ -395,9 +395,9 @@ private: }; #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQ_EXPORT TQDict; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif class KOTEXT_EXPORT KoTextFormatCollection diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index d8e0c29b..fd177e95 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -43,10 +43,10 @@ struct KoTextParagSelection }; #if defined(TQ_TEMPLATEDLL) -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN template class TQMap; template class TQMap; -// TQMOC_SKIP_END +// MOC_SKIP_END #endif class KOTEXT_EXPORT KoTextParag