diff --git a/kmymoney2/converter/mymoneygncreader.h b/kmymoney2/converter/mymoneygncreader.h index b34abf7..27cd06d 100644 --- a/kmymoney2/converter/mymoneygncreader.h +++ b/kmymoney2/converter/mymoneygncreader.h @@ -533,8 +533,8 @@ protected: TQString advCrDays() const { return (var(ADVCD));}; TQString advCrRemindDays() const { return (var(ADVRD));}; TQString instanceCount() const { return (var(INSTC));}; - TQString numOccurs() const { return (var(NUTQMOCC));}; - TQString remOccurs() const { return (var(RETQMOCC));}; + TQString numOccurs() const { return (var(NUMOCC));}; + TQString remOccurs() const { return (var(REMOCC));}; TQString templId() const { return (var(TEMPLID));}; TQDate startDate () const {TQDate x = TQDate(); return (m_vpStartDate == NULL ? x : m_vpStartDate->date());}; @@ -552,7 +552,7 @@ private: virtual void terminate(); // data elements enum ScheduleDataEls {NAME, ENABLED, AUTOC, AUTOCN, AUTOCD, ADVCD, ADVRD, INSTC, - NUTQMOCC, RETQMOCC, TEMPLID, END_Schedule_DELS }; + NUMOCC, REMOCC, TEMPLID, END_Schedule_DELS }; GncDate *m_vpStartDate, *m_vpLastDate, *m_vpEndDate; GncFreqSpec *m_vpFreqSpec; mutable TQPtrList m_vpRecurrence; // gnc handles multiple occurrences diff --git a/libkdchart/KDChartParams.h b/libkdchart/KDChartParams.h index 840ad12..5ccaa10 100644 --- a/libkdchart/KDChartParams.h +++ b/libkdchart/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/libkdchart/KDFrame.h b/libkdchart/KDFrame.h index 78de8ff..4d433dd 100644 --- a/libkdchart/KDFrame.h +++ b/libkdchart/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: /**