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

git: Reuse more code from vcsbase

Browse Source 
Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24
Reviewed-on: http://codereview.qt-project.org/6071
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-10-05 10:35:24 +00:00
parent f6068c1ff9
commit 363b230abf
15 changed files with 359 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/git/gitsettings.h
View File

@@ -33,49 +33,38 @@
#ifndef GITSETTINGS_H
#define GITSETTINGS_H
#include <QtCore/QStringList>
#include <vcsbase/vcsbaseclientsettings.h>
QT_BEGIN_NAMESPACE
class QSettings;
QT_END_NAMESPACE
#include <QtCore/QStringList>
namespace Git {
namespace Internal {
// Todo: Add user name and password?
class GitSettings
class GitSettings : public VCSBase::VCSBaseClientSettings
{
public:
GitSettings();
void fromSettings(QSettings *);
void toSettings(QSettings *) const;
static const QLatin1String adoptPathKey;
static const QLatin1String pathKey;
static const QLatin1String pullRebaseKey;
static const QLatin1String omitAnnotationDateKey;
static const QLatin1String ignoreSpaceChangesInDiffKey;
static const QLatin1String ignoreSpaceChangesInBlameKey;
static const QLatin1String diffPatienceKey;
static const QLatin1String winSetHomeEnvironmentKey;
static const QLatin1String showPrettyFormatKey;
static const QLatin1String gitkOptionsKey;
/** Return the full path to the git executable */
QString gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const;
bool equals(const GitSettings &s) const;
GitSettings &operator = (const GitSettings &s);
bool adoptPath;
QString path;
int logCount;
int timeoutSeconds;
bool pullRebase;
bool promptToSubmit;
bool omitAnnotationDate;
bool ignoreSpaceChangesInDiff;
bool ignoreSpaceChangesInBlame;
bool diffPatience;
bool winSetHomeEnvironment;
int showPrettyFormat;
QString gitkOptions;
private:
mutable QString m_binaryPath;
};
inline bool operator==(const GitSettings &p1, const GitSettings &p2)
{ return p1.equals(p2); }
inline bool operator!=(const GitSettings &p1, const GitSettings &p2)
{ return !p1.equals(p2); }
} // namespace Internal
} // namespace Git