Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kmymoney

ChangeLog.original

@@ -219,7 +219,7 @@ yet).
   Added first steps to create account balancing.
   Changed from for to category and changed all relevant code.
   Started to make the tabbed input box work.
-  File format is well fucked up.
+  File format is well messed up.
   Tried to get the file format working again.
   Removed the option to set the sort type and removed all respective code.
   Added calendar-0.12 into the source tree rather than create my own DateValidator.

doc/en/kmymoney2.1

@@ -217,7 +217,7 @@ and is a network path to the session manager socket.
 Path to the home directory for the current user. 
 .IP TDEHOME
 The KDE per-user setting directory. Default if not specified is
-.I $HOME/.kde
+.I $HOME/.trinity
 .lf 50 ../info/kmymoney2.kmymoney2.1
 .SH AUTHOR
 .B KMyMoney

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 numOccurs() const { return (var(NUMOCC));};
-  TQString remOccurs() const { return (var(RETQMOCC));};
+  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<GncRecurrence> m_vpRecurrence; // gnc handles multiple occurrences

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:
 

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:
         /**