aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mercurial/mercurialsettings.h
diff options
context:
space:
mode:
authorcerf <[email protected]>2011-06-10 15:27:57 +0000
committerTobias Hunger <[email protected]>2011-06-10 17:47:20 +0200
commit83566c3c3af2adfab23561983306a239f32c1e00 (patch)
tree48e6339f3217fcb792fc56d0a463f636c8413332 /src/plugins/mercurial/mercurialsettings.h
parent21c048363edb76d0b1f5a6057ff0c3228dbdf478 (diff)
vcsbase: simplify init of the diff editor in VCSBaseClient
Bazaar and Mercurial plugins are impacted, they benefit auto load/save of the diff settings Change-Id: I67327b231fd80eeb61bb859879f9eabdc56739e8 Merge-request: 345 Reviewed-by: Tobias Hunger <[email protected]> Reviewed-on: http://codereview.qt.nokia.com/463 Reviewed-by: Qt Sanity Bot <[email protected]>
Diffstat (limited to 'src/plugins/mercurial/mercurialsettings.h')
-rw-r--r--src/plugins/mercurial/mercurialsettings.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/mercurial/mercurialsettings.h b/src/plugins/mercurial/mercurialsettings.h
index 1a4a8dfcbc2..36ef096aa6f 100644
--- a/src/plugins/mercurial/mercurialsettings.h
+++ b/src/plugins/mercurial/mercurialsettings.h
@@ -43,6 +43,13 @@ class MercurialSettings : public VCSBase::VCSBaseClientSettings
public:
MercurialSettings();
MercurialSettings& operator=(const MercurialSettings& other);
+
+ virtual void writeSettings(QSettings *settings, const QString &group) const;
+ virtual void readSettings(const QSettings *settings, const QString &group);
+ virtual bool equals(const VCSBaseClientSettings &rhs) const;
+
+ bool diffIgnoreWhiteSpace;
+ bool diffIgnoreBlankLines;
};
} // namespace Internal