summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-07 12:06:59 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-07 12:06:59 -0600
commitb5d2c451feb9945e629b8db986eff61d6bd7db7c (patch)
tree6ba6e62e45543d7faa38f3d31b2a6978d88bda11
parent18c973f45bc8b9d1742fd143839078d44e5695f8 (diff)
parent2be50e6b133dcbd4cf518bfd330584b3897108e9 (diff)
downloadkmymoney-b5d2c451feb9945e629b8db986eff61d6bd7db7c.tar.gz
kmymoney-b5d2c451feb9945e629b8db986eff61d6bd7db7c.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kmymoney
-rw-r--r--ChangeLog.original2
-rw-r--r--doc/en/kmymoney2.12
-rw-r--r--kmymoney2/converter/mymoneygncreader.h6
-rw-r--r--libkdchart/KDChartParams.h4
-rw-r--r--libkdchart/KDFrame.h4
5 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog.original b/ChangeLog.original
index 933e010..af2d7b8 100644
--- a/ChangeLog.original
+++ b/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.
diff --git a/doc/en/kmymoney2.1 b/doc/en/kmymoney2.1
index 002526f..3805596 100644
--- a/doc/en/kmymoney2.1
+++ b/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
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<GncRecurrence> m_vpRecurrence; // gnc handles multiple occurrences
diff --git a/libkdchart/KDChartParams.h b/libkdchart/KDChartParams.h
index bc7f26d..1407d3e 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 24528fd..72fa5d7 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:
/**