Use VcsBaseClient::diff instead of cvs's one

The second step in cleaning a mess in VCS

Change-Id: I3eb360825480c74242110b0da9f90b39fc4c767f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

1 files changed, 12 insertions, 26 deletions

diff --git a/src/plugins/cvs/cvssettings.h b/src/plugins/cvs/cvssettings.h
index 4eb01fafca..25ff1cfb6a 100644
--- a/src/plugins/cvs/cvssettings.h
+++ b/src/plugins/cvs/cvssettings.h
@@ -30,44 +30,30 @@
 #ifndef CVSSETTINGS_H
 #define CVSSETTINGS_H
 
-#include <QStringList>
-
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
+#include <vcsbase/vcsbaseclientsettings.h>
 
 namespace Cvs {
 namespace Internal {
 
-struct CvsSettings
+class CvsSettings : public VcsBase::VcsBaseClientSettings
 {
-    CvsSettings();
+public:
+    static const QLatin1String cvsRootKey;
+    static const QLatin1String diffOptionsKey;
+    static const QLatin1String describeByCommitIdKey;
+    static const QLatin1String diffIgnoreWhiteSpaceKey;
+    static const QLatin1String diffIgnoreBlankLinesKey;
 
-    void fromSettings(QSettings *);
-    void toSettings(QSettings *) const;
+    CvsSettings();
 
-    int timeOutMS() const { return timeOutS * 1000;  }
-    int longTimeOutMS() const { return timeOutS * 10000; }
+    int timeOutMs() const;
 
-    // Add common options to the command line
     QStringList addOptions(const QStringList &args) const;
 
-    bool equals(const CvsSettings &s) const;
-
-    QString cvsCommand;
-    QString cvsBinaryPath;
-    QString cvsRoot;
-    QString cvsDiffOptions;
-    int timeOutS;
-    bool promptToSubmit;
-    bool describeByCommitId;
+protected:
+    void readLegacySettings(const QSettings *settings);
 };
 
-inline bool operator==(const CvsSettings &p1, const CvsSettings &p2)
-    { return p1.equals(p2); }
-inline bool operator!=(const CvsSettings &p1, const CvsSettings &p2)
-    { return !p1.equals(p2); }
-
 } // namespace Internal
 } // namespace Cvs