feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use VcsBaseClient::diff instead of cvs's one

Browse Source 
The second step in cleaning a mess in VCS

Change-Id: I3eb360825480c74242110b0da9f90b39fc4c767f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Jarek Kobus
2013-10-15 20:03:22 +02:00
committed by Jarek Kobus
parent 0f4808a629
commit 72da839bbf
11 changed files with 347 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/cvs/cvssettings.h
View File

@@ -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
{
public:
static const QLatin1String cvsRootKey;
static const QLatin1String diffOptionsKey;
static const QLatin1String describeByCommitIdKey;
static const QLatin1String diffIgnoreWhiteSpaceKey;
static const QLatin1String diffIgnoreBlankLinesKey;
CvsSettings();
void fromSettings(QSettings *);
void toSettings(QSettings *) const;
int timeOutMs() const;
int timeOutMS() const { return timeOutS * 1000; }
int longTimeOutMS() const { return timeOutS * 10000; }
// 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