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

cvs: polish style

Browse Source 
Change-Id: Ica92448617e46223f99a5009e4a7493b83d4cda9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
hjk
2012-01-07 16:55:09 +01:00
parent 745c58befa
commit 7986fbd08d
33 changed files with 572 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cvs/annotationhighlighter.cpp
View File

@@ -32,17 +32,17 @@
#include "annotationhighlighter.h"
using namespace CVS;
using namespace CVS::Internal;
using namespace Cvs;
using namespace Cvs::Internal;
CVSAnnotationHighlighter::CVSAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document) :
CvsAnnotationHighlighter::CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document) :
VcsBase::BaseAnnotationHighlighter(changeNumbers, document),
m_blank(QLatin1Char(' '))
{
}
QString CVSAnnotationHighlighter::changeNumber(const QString &block) const
QString CvsAnnotationHighlighter::changeNumber(const QString &block) const
{
const int pos = block.indexOf(m_blank);
return pos > 1 ? block.left(pos) : QString();

13
src/plugins/cvs/annotationhighlighter.h
View File

@@ -35,24 +35,25 @@
#include <vcsbase/baseannotationhighlighter.h>
namespace CVS {
namespace Cvs {
namespace Internal {
// Annotation highlighter for cvs triggering on 'changenumber '
class CVSAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
class CvsAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{
Q_OBJECT
public:
explicit CVSAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document = 0);
explicit CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document = 0);
private:
virtual QString changeNumber(const QString &block) const;
QString changeNumber(const QString &block) const;
const QChar m_blank;
};
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // ANNOTATIONHIGHLIGHTER_H

8
src/plugins/cvs/checkoutwizard.cpp
View File

@@ -42,7 +42,7 @@
#include <QtGui/QIcon>
namespace CVS {
namespace Cvs {
namespace Internal {
CheckoutWizard::CheckoutWizard(QObject *parent) :
@@ -69,7 +69,7 @@ QString CheckoutWizard::displayName() const
QList<QWizardPage*> CheckoutWizard::createParameterPages(const QString &path)
{
QList<QWizardPage*> rc;
const Core::IVersionControl *vc = CVSPlugin::instance()->versionControl();
const Core::IVersionControl *vc = CvsPlugin::instance()->versionControl();
if (!vc->isConfigured())
rc.append(new VcsBase::VcsConfigurationPage(vc));
CheckoutWizardPage *cwp = new CheckoutWizardPage;
@@ -85,7 +85,7 @@ QSharedPointer<VcsBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QLi
// CVS does not allow for checking out into a different directory.
const CheckoutWizardPage *cwp = qobject_cast<const CheckoutWizardPage *>(parameterPages.front());
QTC_ASSERT(cwp, return QSharedPointer<VcsBase::AbstractCheckoutJob>())
const CVSSettings settings = CVSPlugin::instance()->settings();
const CvsSettings settings = CvsPlugin::instance()->settings();
const QString binary = settings.cvsCommand;
QStringList args;
const QString repository = cwp->repository();
@@ -99,4 +99,4 @@ QSharedPointer<VcsBase::AbstractCheckoutJob> CheckoutWizard::createJob(const QLi
}
} // namespace Internal
} // namespace CVS
} // namespace Cvs

16
src/plugins/cvs/checkoutwizard.h
View File

@@ -35,7 +35,7 @@
#include <vcsbase/basecheckoutwizard.h>
namespace CVS {
namespace Cvs {
namespace Internal {
class CheckoutWizard : public VcsBase::BaseCheckoutWizard
@@ -45,18 +45,18 @@ public:
explicit CheckoutWizard(QObject *parent = 0);
// IWizard
virtual QIcon icon() const;
virtual QString description() const;
virtual QString displayName() const;
QIcon icon() const;
QString description() const;
QString displayName() const;
protected:
// BaseCheckoutWizard
virtual QList<QWizardPage*> createParameterPages(const QString &path);
virtual QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> &parameterPage,
QString *checkoutPath);
QList<QWizardPage*> createParameterPages(const QString &path);
QSharedPointer<VcsBase::AbstractCheckoutJob> createJob(const QList<QWizardPage*> &parameterPage,
QString *checkoutPath);
};
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // CHECKOUTWIZARD_H

4
src/plugins/cvs/checkoutwizardpage.cpp
View File

@@ -32,7 +32,7 @@
#include "checkoutwizardpage.h"
namespace CVS {
namespace Cvs {
namespace Internal {
CheckoutWizardPage::CheckoutWizardPage(QWidget *parent) :
@@ -46,4 +46,4 @@ CheckoutWizardPage::CheckoutWizardPage(QWidget *parent) :
}
} // namespace Internal
} // namespace CVS
} // namespace Cvs

9
src/plugins/cvs/checkoutwizardpage.h
View File

@@ -35,15 +35,18 @@
#include <vcsbase/basecheckoutwizardpage.h>
namespace CVS {
namespace Cvs {
namespace Internal {
class CheckoutWizardPage : public VcsBase::BaseCheckoutWizardPage {
class CheckoutWizardPage : public VcsBase::BaseCheckoutWizardPage
{
Q_OBJECT
public:
CheckoutWizardPage(QWidget *parent = 0);
};
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // CHECKOUTWIZARDPAGE_H

4
src/plugins/cvs/cvsconstants.h
View File

@@ -33,7 +33,7 @@
#ifndef CVS_CONSTANTS_H
#define CVS_CONSTANTS_H
namespace CVS {
namespace Cvs {
namespace Constants {
const char CVS_SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.cvs.submit";
@@ -45,6 +45,6 @@ const char DIFF_SELECTED[] = "CVS.DiffSelectedFilesInLog";
enum { debug = 0 };
} // namespace Constants
} // namespace CVS
} // namespace Cvs
#endif // CVS_CONSTANTS_H

46
src/plugins/cvs/cvscontrol.cpp
View File

@@ -38,25 +38,25 @@
#include <QtCore/QFileInfo>
using namespace CVS;
using namespace CVS::Internal;
using namespace Cvs;
using namespace Cvs::Internal;
CVSControl::CVSControl(CVSPlugin *plugin) :
CvsControl::CvsControl(CvsPlugin *plugin) :
m_plugin(plugin)
{
}
QString CVSControl::displayName() const
QString CvsControl::displayName() const
{
return QLatin1String("cvs");
}
Core::Id CVSControl::id() const
Core::Id CvsControl::id() const
{
return VcsBase::Constants::VCS_ID_CVS;
}
bool CVSControl::isConfigured() const
bool CvsControl::isConfigured() const
{
const QString binary = m_plugin->settings().cvsCommand;
if (binary.isEmpty())
@@ -65,7 +65,7 @@ bool CVSControl::isConfigured() const
return fi.exists() && fi.isFile() && fi.isExecutable();
}
bool CVSControl::supportsOperation(Operation operation) const
bool CvsControl::supportsOperation(Operation operation) const
{
bool rc = isConfigured();
switch (operation) {
@@ -85,88 +85,88 @@ bool CVSControl::supportsOperation(Operation operation) const
return rc;
}
bool CVSControl::vcsOpen(const QString &fileName)
bool CvsControl::vcsOpen(const QString &fileName)
{
const QFileInfo fi(fileName);
return m_plugin->edit(fi.absolutePath(), QStringList(fi.fileName()));
}
bool CVSControl::vcsAdd(const QString &fileName)
bool CvsControl::vcsAdd(const QString &fileName)
{
const QFileInfo fi(fileName);
return m_plugin->vcsAdd(fi.absolutePath(), fi.fileName());
}
bool CVSControl::vcsDelete(const QString &fileName)
bool CvsControl::vcsDelete(const QString &fileName)
{
const QFileInfo fi(fileName);
return m_plugin->vcsDelete(fi.absolutePath(), fi.fileName());
}
bool CVSControl::vcsMove(const QString &from, const QString &to)
bool CvsControl::vcsMove(const QString &from, const QString &to)
{
Q_UNUSED(from);
Q_UNUSED(to);
return false;
}
bool CVSControl::vcsCreateRepository(const QString &)
bool CvsControl::vcsCreateRepository(const QString &)
{
return false;
}
QString CVSControl::vcsGetRepositoryURL(const QString &)
QString CvsControl::vcsGetRepositoryURL(const QString &)
{
return QString();
}
bool CVSControl::vcsCheckout(const QString &, const QByteArray &)
bool CvsControl::vcsCheckout(const QString &, const QByteArray &)
{
return false;
}
QString CVSControl::vcsCreateSnapshot(const QString &)
QString CvsControl::vcsCreateSnapshot(const QString &)
{
return QString();
}
QStringList CVSControl::vcsSnapshots(const QString &)
QStringList CvsControl::vcsSnapshots(const QString &)
{
return QStringList();
}
bool CVSControl::vcsRestoreSnapshot(const QString &, const QString &)
bool CvsControl::vcsRestoreSnapshot(const QString &, const QString &)
{
return false;
}
bool CVSControl::vcsRemoveSnapshot(const QString &, const QString &)
bool CvsControl::vcsRemoveSnapshot(const QString &, const QString &)
{
return false;
}
bool CVSControl::vcsAnnotate(const QString &file, int line)
bool CvsControl::vcsAnnotate(const QString &file, int line)
{
m_plugin->vcsAnnotate(file, QString(), line);
return true;
}
bool CVSControl::managesDirectory(const QString &directory, QString *topLevel) const
bool CvsControl::managesDirectory(const QString &directory, QString *topLevel) const
{
return m_plugin->managesDirectory(directory, topLevel);
}
void CVSControl::emitRepositoryChanged(const QString &s)
void CvsControl::emitRepositoryChanged(const QString &s)
{
emit repositoryChanged(s);
}
void CVSControl::emitFilesChanged(const QStringList &l)
void CvsControl::emitFilesChanged(const QStringList &l)
{
emit filesChanged(l);
}
void CVSControl::emitConfigurationChanged()
void CvsControl::emitConfigurationChanged()
{
emit configurationChanged();
}

12
src/plugins/cvs/cvscontrol.h
View File

@@ -35,18 +35,18 @@
#include <coreplugin/iversioncontrol.h>
namespace CVS {
namespace Cvs {
namespace Internal {
class CVSPlugin;
class CvsPlugin;
// Just a proxy for CVSPlugin
class CVSControl : public Core::IVersionControl
class CvsControl : public Core::IVersionControl
{
Q_OBJECT
public:
explicit CVSControl(CVSPlugin *plugin);
explicit CvsControl(CvsPlugin *plugin);
QString displayName() const;
Core::Id id() const;
@@ -72,10 +72,10 @@ public:
void emitConfigurationChanged();
private:
CVSPlugin *m_plugin;
CvsPlugin *m_plugin;
};
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // CVSCONTROL_H

20
src/plugins/cvs/cvseditor.cpp
View File

@@ -43,14 +43,14 @@
#include <QtGui/QTextCursor>
#include <QtGui/QTextBlock>
namespace CVS {
namespace Cvs {
namespace Internal {
// Match a CVS revision ("1.1.1.1")
#define CVS_REVISION_PATTERN "[\\d\\.]+"
#define CVS_REVISION_AT_START_PATTERN "^(" CVS_REVISION_PATTERN ") "
CVSEditor::CVSEditor(const VcsBase::VcsBaseEditorParameters *type,
CvsEditor::CvsEditor(const VcsBase::VcsBaseEditorParameters *type,
QWidget *parent) :
VcsBase::VcsBaseEditorWidget(type, parent),
m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN".*$")),
@@ -61,7 +61,7 @@ CVSEditor::CVSEditor(const VcsBase::VcsBaseEditorParameters *type,
setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\""));
}
QSet<QString> CVSEditor::annotationChanges() const
QSet<QString> CvsEditor::annotationChanges() const
{
QSet<QString> changes;
const QString txt = toPlainText();
@@ -80,12 +80,12 @@ QSet<QString> CVSEditor::annotationChanges() const
changes.insert(r.cap(1));
}
}
if (CVS::Constants::debug)
if (Cvs::Constants::debug)
qDebug() << "CVSEditor::annotationChanges() returns #" << changes.size();
return changes;
}
QString CVSEditor::changeUnderCursor(const QTextCursor &c) const
QString CvsEditor::changeUnderCursor(const QTextCursor &c) const
{
// Try to match "1.1" strictly:
// 1) Annotation: Check for a revision number at the beginning of the line.
@@ -124,19 +124,19 @@ cvs diff -d -u -r1.1 -r1.2:
\endcode
*/
VcsBase::DiffHighlighter *CVSEditor::createDiffHighlighter() const
VcsBase::DiffHighlighter *CvsEditor::createDiffHighlighter() const
{
const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*1\\.[\\d\\.]+$"));
QTC_CHECK(filePattern.isValid());
return new VcsBase::DiffHighlighter(filePattern);
}
VcsBase::BaseAnnotationHighlighter *CVSEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
VcsBase::BaseAnnotationHighlighter *CvsEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
{
return new CVSAnnotationHighlighter(changes);
return new CvsAnnotationHighlighter(changes);
}
QString CVSEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const
QString CvsEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const
{
// "+++ mainwindow.cpp<\t>13 Jul 2009 13:50:15 -0000 1.1"
// Go back chunks
@@ -154,7 +154,7 @@ QString CVSEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) cons
return QString();
}
QStringList CVSEditor::annotationPreviousVersions(const QString &revision) const
QStringList CvsEditor::annotationPreviousVersions(const QString &revision) const
{
if (isFirstRevision(revision))
return QStringList();

20
src/plugins/cvs/cvseditor.h
View File

@@ -37,24 +37,24 @@
#include <QtCore/QRegExp>
namespace CVS {
namespace Cvs {
namespace Internal {
class CVSEditor : public VcsBase::VcsBaseEditorWidget
class CvsEditor : public VcsBase::VcsBaseEditorWidget
{
Q_OBJECT
public:
explicit CVSEditor(const VcsBase::VcsBaseEditorParameters *type,
explicit CvsEditor(const VcsBase::VcsBaseEditorParameters *type,
QWidget *parent);
private:
virtual QSet<QString> annotationChanges() const;
virtual QString changeUnderCursor(const QTextCursor &) const;
virtual VcsBase::DiffHighlighter *createDiffHighlighter() const;
virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const;
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
virtual QStringList annotationPreviousVersions(const QString &revision) const;
QSet<QString> annotationChanges() const;
QString changeUnderCursor(const QTextCursor &) const;
VcsBase::DiffHighlighter *createDiffHighlighter() const;
VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const;
QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const;
QStringList annotationPreviousVersions(const QString &revision) const;
const QRegExp m_revisionAnnotationPattern;
const QRegExp m_revisionLogPattern;
@@ -62,6 +62,6 @@ private:
};
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // CVSEDITOR_H

563
src/plugins/cvs/cvsplugin.cpp
View File

File diff suppressed because it is too large Load Diff

65
src/plugins/cvs/cvsplugin.h
View File

@@ -45,32 +45,25 @@ class QTextCodec;
QT_END_NAMESPACE
namespace Core {
class IEditorFactory;
class IVersionControl;
class IEditorFactory;
class IVersionControl;
}
namespace Utils {
class ParameterAction;
}
namespace Utils { class ParameterAction; }
namespace VcsBase { class VcsBaseSubmitEditor; }
namespace Locator { class CommandLocator; }
namespace VcsBase {
class VcsBaseSubmitEditor;
}
namespace Locator {
class CommandLocator;
}
namespace CVS {
namespace Cvs {
namespace Internal {
struct CvsDiffParameters;
class CVSSubmitEditor;
class CVSControl;
struct CVSResponse
struct CvsDiffParameters;
class CvsSubmitEditor;
class CvsControl;
struct CvsResponse
{
enum Result { Ok, NonNullExitCode, OtherError };
CVSResponse() : result(Ok) {}
CvsResponse() : result(Ok) {}
Result result;
QString stdOut;
@@ -78,22 +71,22 @@ struct CVSResponse
QString message;
};
class CVSPlugin : public VcsBase::VcsBasePlugin
class CvsPlugin : public VcsBase::VcsBasePlugin
{
Q_OBJECT
public:
CVSPlugin();
~CVSPlugin();
CvsPlugin();
~CvsPlugin();
virtual bool initialize(const QStringList &arguments, QString *errorMessage);
void cvsDiff(const QString &workingDir, const QStringList &files);
CVSSubmitEditor *openCVSSubmitEditor(const QString &fileName);
CvsSubmitEditor *openCVSSubmitEditor(const QString &fileName);
CVSSettings settings() const;
void setSettings(const CVSSettings &s);
CvsSettings settings() const;
void setSettings(const CvsSettings &s);
// IVersionControl
bool vcsAdd(const QString &workingDir, const QString &fileName);
@@ -102,7 +95,7 @@ public:
// cvs 'edit' is used to implement 'open' (cvsnt).
bool edit(const QString &topLevel, const QStringList &files);
static CVSPlugin *instance();
static CvsPlugin *instance();
public slots:
void vcsAnnotate(const QString &file, const QString &revision /* = QString() */, int lineNumber);
@@ -131,7 +124,7 @@ private slots:
void editCurrentFile();
void uneditCurrentFile();
void uneditCurrentRepository();
void cvsDiff(const CVS::Internal::CvsDiffParameters &p);
void cvsDiff(const Cvs::Internal::CvsDiffParameters &p);
protected:
virtual void updateActions(VcsBase::VcsBasePlugin::ActionState);
@@ -139,11 +132,11 @@ protected:
private:
bool isCommitEditorOpen() const;
Core::IEditor * showOutputInEditor(const QString& title, const QString &output,
int editorType, const QString &source,
QTextCodec *codec);
Core::IEditor *showOutputInEditor(const QString& title, const QString &output,
int editorType, const QString &source,
QTextCodec *codec);
CVSResponse runCVS(const QString &workingDirectory,
CvsResponse runCvs(const QString &workingDirectory,
const QStringList &arguments,
int timeOut,
unsigned flags, QTextCodec *outputCodec = 0);
@@ -152,7 +145,7 @@ private:
const QString &revision = QString(), int lineNumber= -1);
bool describe(const QString &source, const QString &changeNr, QString *errorMessage);
bool describe(const QString &toplevel, const QString &source, const QString &changeNr, QString *errorMessage);
bool describe(const QString &repository, QList<CVS_LogEntry> entries, QString *errorMessage);
bool describe(const QString &repository, QList<CvsLogEntry> entries, QString *errorMessage);
void filelog(const QString &workingDir,
const QStringList &files = QStringList(),
bool enableAnnotationContextMenu = false);
@@ -166,9 +159,9 @@ private:
void startCommit(const QString &workingDir, const QStringList &files = QStringList());
bool commit(const QString &messageFile, const QStringList &subVersionFileList);
void cleanCommitMessageFile();
inline CVSControl *cvsVersionControl() const;
inline CvsControl *cvsVersionControl() const;
CVSSettings m_settings;
CvsSettings m_settings;
QString m_commitMessageFileName;
QString m_commitRepository;
@@ -202,10 +195,10 @@ private:
QAction *m_menuAction;
bool m_submitActionTriggered;
static CVSPlugin *m_cvsPluginInstance;
static CvsPlugin *m_cvsPluginInstance;
};
} // namespace CVS
} // namespace Cvs
} // namespace Internal
#endif // CVSPLUGIN_H

14
src/plugins/cvs/cvssettings.cpp
View File

@@ -56,10 +56,10 @@ static QString defaultCommand()
return rc;
}
namespace CVS {
namespace Cvs {
namespace Internal {
CVSSettings::CVSSettings() :
CvsSettings::CvsSettings() :
cvsCommand(defaultCommand()),
cvsDiffOptions(QLatin1String(defaultDiffOptions)),
timeOutS(defaultTimeOutS),
@@ -68,7 +68,7 @@ CVSSettings::CVSSettings() :
{
}
void CVSSettings::fromSettings(QSettings *settings)
void CvsSettings::fromSettings(QSettings *settings)
{
settings->beginGroup(QLatin1String(groupC));
cvsCommand = settings->value(QLatin1String(commandKeyC), defaultCommand()).toString();
@@ -80,7 +80,7 @@ void CVSSettings::fromSettings(QSettings *settings)
settings->endGroup();
}
void CVSSettings::toSettings(QSettings *settings) const
void CvsSettings::toSettings(QSettings *settings) const
{
settings->beginGroup(QLatin1String(groupC));
settings->setValue(QLatin1String(commandKeyC), cvsCommand);
@@ -92,7 +92,7 @@ void CVSSettings::toSettings(QSettings *settings) const
settings->endGroup();
}
bool CVSSettings::equals(const CVSSettings &s) const
bool CvsSettings::equals(const CvsSettings &s) const
{
return promptToSubmit == s.promptToSubmit
&& describeByCommitId == s.describeByCommitId
@@ -102,7 +102,7 @@ bool CVSSettings::equals(const CVSSettings &s) const
&& cvsDiffOptions == s.cvsDiffOptions;
}
QStringList CVSSettings::addOptions(const QStringList &args) const
QStringList CvsSettings::addOptions(const QStringList &args) const
{
if (cvsRoot.isEmpty())
return args;
@@ -115,4 +115,4 @@ QStringList CVSSettings::addOptions(const QStringList &args) const
}
} // namespace Internal
} // namespace CVS
} // namespace Cvs

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

@@ -39,23 +39,23 @@ QT_BEGIN_NAMESPACE
class QSettings;
QT_END_NAMESPACE
namespace CVS {
namespace Cvs {
namespace Internal {
struct CVSSettings
struct CvsSettings
{
CVSSettings();
CvsSettings();
void fromSettings(QSettings *);
void toSettings(QSettings *) const;
inline int timeOutMS() const { return timeOutS * 1000; }
inline int longTimeOutMS() const { return timeOutS * 10000; }
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;
bool equals(const CvsSettings &s) const;
QString cvsCommand;
QString cvsRoot;
@@ -65,12 +65,12 @@ struct CVSSettings
bool describeByCommitId;
};
inline bool operator==(const CVSSettings &p1, const CVSSettings &p2)
inline bool operator==(const CvsSettings &p1, const CvsSettings &p2)
{ return p1.equals(p2); }
inline bool operator!=(const CVSSettings &p1, const CVSSettings &p2)
inline bool operator!=(const CvsSettings &p1, const CvsSettings &p2)
{ return !p1.equals(p2); }
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // CVSSETTINGS_H

17
src/plugins/cvs/cvssubmiteditor.cpp
View File

@@ -36,18 +36,19 @@
#include <utils/submiteditorwidget.h>
#include <vcsbase/submitfilemodel.h>
using namespace CVS::Internal;
using namespace Cvs::Internal;
using namespace VcsBase;
CVSSubmitEditor::CVSSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters,
QWidget *parentWidget) :
VcsBase::VcsBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget)),
CvsSubmitEditor::CvsSubmitEditor(const VcsBaseSubmitEditorParameters *parameters,
QWidget *parentWidget) :
VcsBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget)),
m_msgAdded(tr("Added")),
m_msgRemoved(tr("Removed")),
m_msgModified(tr("Modified"))
{
}
QString CVSSubmitEditor::stateName(State st) const
QString CvsSubmitEditor::stateName(State st) const
{
switch (st) {
case LocallyAdded:
@@ -60,10 +61,10 @@ QString CVSSubmitEditor::stateName(State st) const
return QString();
}
void CVSSubmitEditor::setStateList(const QList<StateFilePair> &statusOutput)
void CvsSubmitEditor::setStateList(const StateFilePairs &statusOutput)
{
typedef QList<StateFilePair>::const_iterator ConstIterator;
VcsBase::SubmitFileModel *model = new VcsBase::SubmitFileModel(this);
typedef StateFilePairs::const_iterator ConstIterator;
SubmitFileModel *model = new SubmitFileModel(this);
const ConstIterator cend = statusOutput.constEnd();
for (ConstIterator it = statusOutput.constBegin(); it != cend; ++it)

15
src/plugins/cvs/cvssubmiteditor.h
View File

@@ -38,30 +38,33 @@
#include <vcsbase/vcsbasesubmiteditor.h>
namespace CVS {
namespace Cvs {
namespace Internal {
class CVSSubmitEditor : public VcsBase::VcsBaseSubmitEditor
class CvsSubmitEditor : public VcsBase::VcsBaseSubmitEditor
{
Q_OBJECT
public:
enum State { LocallyAdded, LocallyModified, LocallyRemoved };
// A list of state indicators and file names.
typedef QPair<State, QString> StateFilePair;
typedef QList<StateFilePair> StateFilePairs;
explicit CVSSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters,
explicit CvsSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters,
QWidget *parentWidget = 0);
void setStateList(const QList<StateFilePair> &statusOutput);
void setStateList(const StateFilePairs &statusOutput);
private:
inline QString stateName(State st) const;
QString stateName(State st) const;
const QString m_msgAdded;
const QString m_msgRemoved;
const QString m_msgModified;
};
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // CVSSUBMITEDITOR_H

38
src/plugins/cvs/cvsutils.cpp
View File

@@ -36,24 +36,24 @@
#include <QtCore/QRegExp>
#include <QtCore/QStringList>
namespace CVS {
namespace Cvs {
namespace Internal {
CVS_Revision::CVS_Revision(const QString &rev) :
CvsRevision::CvsRevision(const QString &rev) :
revision(rev)
{
}
CVS_LogEntry::CVS_LogEntry(const QString &f) :
CvsLogEntry::CvsLogEntry(const QString &f) :
file(f)
{
}
QDebug operator<<(QDebug d, const CVS_LogEntry &e)
QDebug operator<<(QDebug d, const CvsLogEntry &e)
{
QDebug nospace = d.nospace();
nospace << "File: " << e.file << e.revisions.size() << '\n';
foreach(const CVS_Revision &r, e.revisions)
foreach(const CvsRevision &r, e.revisions)
nospace << " " << r.revision << ' ' << r.date << ' ' << r.commitId << '\n';
return d;
}
@@ -74,13 +74,13 @@ revision 1.1
=============================================================================
\endcode */
QList<CVS_LogEntry> parseLogEntries(const QString &o,
const QString &directory,
const QString filterCommitId)
QList<CvsLogEntry> parseLogEntries(const QString &o,
const QString &directory,
const QString filterCommitId)
{
enum ParseState { FileState, RevisionState, StatusLineState };
QList<CVS_LogEntry> rc;
QList<CvsLogEntry> rc;
const QStringList lines = o.split(QString(QLatin1Char('\n')), QString::SkipEmptyParts);
ParseState state = FileState;
@@ -104,13 +104,13 @@ QList<CVS_LogEntry> parseLogEntries(const QString &o,
if (!file.isEmpty())
file += slash;
file += line.mid(workingFilePrefix.size()).trimmed();
rc.push_back(CVS_LogEntry(file));
rc.push_back(CvsLogEntry(file));
state = RevisionState;
}
break;
case RevisionState:
if (revisionPattern.exactMatch(line)) {
rc.back().revisions.push_back(CVS_Revision(revisionPattern.cap(1)));
rc.back().revisions.push_back(CvsRevision(revisionPattern.cap(1)));
state = StatusLineState;
} else {
if (line == fileSeparator)
@@ -132,7 +132,7 @@ QList<CVS_LogEntry> parseLogEntries(const QString &o,
}
// Purge out files with no matching commits
if (!filterCommitId.isEmpty()) {
for (QList<CVS_LogEntry>::iterator it = rc.begin(); it != rc.end(); ) {
for (QList<CvsLogEntry>::iterator it = rc.begin(); it != rc.end(); ) {
if (it->revisions.empty()) {
it = rc.erase(it);
} else {
@@ -176,16 +176,16 @@ QString fixDiffOutput(QString d)
// stdout/stderr need to be merged to catch directories.
// Parse out status keywords, return state enum or -1
inline int stateFromKeyword(const QString &s)
static int stateFromKeyword(const QString &s)
{
if (s == QLatin1String("Up-to-date"))
return -1;
if (s == QLatin1String("Locally Modified"))
return CVSSubmitEditor::LocallyModified;
return CvsSubmitEditor::LocallyModified;
if (s == QLatin1String("Locally Added"))
return CVSSubmitEditor::LocallyAdded;
return CvsSubmitEditor::LocallyAdded;
if (s == QLatin1String("Locally Removed"))
return CVSSubmitEditor::LocallyRemoved;
return CvsSubmitEditor::LocallyRemoved;
return -1;
}
@@ -216,9 +216,9 @@ StateList parseStatusOutput(const QString &directory, const QString &output)
continue;
// Concatenate file name, Correct "no file <foo>"
QString fileName = l.mid(fileKeyword.size(), statusPos - fileKeyword.size()).trimmed();
if (state == CVSSubmitEditor::LocallyRemoved && fileName.startsWith(noFileKeyword))
if (state == CvsSubmitEditor::LocallyRemoved && fileName.startsWith(noFileKeyword))
fileName.remove(0, noFileKeyword.size());
changeSet.push_back(CVSSubmitEditor::StateFilePair(static_cast<CVSSubmitEditor::State>(state), path + fileName));
changeSet.push_back(CvsSubmitEditor::StateFilePair(static_cast<CvsSubmitEditor::State>(state), path + fileName));
continue;
}
// Examining a new subdirectory
@@ -254,4 +254,4 @@ bool isFirstRevision(const QString &r)
}
} // namespace Internal
} // namespace CVS
} // namespace Cvs

24
src/plugins/cvs/cvsutils.h
View File

@@ -42,15 +42,15 @@ QT_BEGIN_NAMESPACE
class QDebug;
QT_END_NAMESPACE
namespace CVS {
namespace Cvs {
namespace Internal {
// Utilities to parse output of a CVS log.
// A revision of a file.
struct CVS_Revision
struct CvsRevision
{
CVS_Revision(const QString &rev);
CvsRevision(const QString &rev);
QString revision;
QString date; // ISO-Format (YYYY-MM-DD)
@@ -58,21 +58,21 @@ struct CVS_Revision
};
// A log entry consisting of the file and its revisions.
struct CVS_LogEntry
struct CvsLogEntry
{
CVS_LogEntry(const QString &file);
CvsLogEntry(const QString &file);
QString file;
QList<CVS_Revision> revisions;
QList<CvsRevision> revisions;
};
QDebug operator<<(QDebug d, const CVS_LogEntry &);
QDebug operator<<(QDebug d, const CvsLogEntry &);
// Parse. Pass on a directory to obtain full paths when
// running from the repository directory.
QList<CVS_LogEntry> parseLogEntries(const QString &output,
const QString &directory = QString(),
const QString filterCommitId = QString());
QList<CvsLogEntry> parseLogEntries(const QString &output,
const QString &directory = QString(),
const QString filterCommitId = QString());
// Tortoise CVS outputs unknown files with question marks in
// the diff output on stdout ('? foo'); remove
@@ -80,7 +80,7 @@ QString fixDiffOutput(QString d);
// Parse the status output of CVS (stdout/stderr merged
// to catch directories).
typedef QList<CVSSubmitEditor::StateFilePair> StateList;
typedef CvsSubmitEditor::StateFilePairs StateList;
StateList parseStatusOutput(const QString &directory, const QString &output);
// Revision number utilities: Decrement version number "1.2" -> "1.1"
@@ -89,6 +89,6 @@ QString previousRevision(const QString &rev);
bool isFirstRevision(const QString &r);
} // namespace Internal
} // namespace CVS
} // namespace Cvs
#endif // CVSUTILS_H

16
src/plugins/cvs/settingspage.cpp
View File

@@ -43,7 +43,7 @@
#include <QtCore/QTextStream>
#include <QtGui/QFileDialog>
using namespace CVS::Internal;
using namespace Cvs::Internal;
using namespace Utils;
SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
@@ -54,9 +54,9 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command"));
}
CVSSettings SettingsPageWidget::settings() const
CvsSettings SettingsPageWidget::settings() const
{
CVSSettings rc;
CvsSettings rc;
rc.cvsCommand = m_ui.commandPathChooser->path();
rc.cvsRoot = m_ui.rootLineEdit->text();
rc.cvsDiffOptions = m_ui.diffOptionsLineEdit->text();
@@ -66,7 +66,7 @@ CVSSettings SettingsPageWidget::settings() const
return rc;
}
void SettingsPageWidget::setSettings(const CVSSettings &s)
void SettingsPageWidget::setSettings(const CvsSettings &s)
{
m_ui.commandPathChooser->setPath(s.cvsCommand);
m_ui.rootLineEdit->setText(s.cvsRoot);
@@ -94,10 +94,6 @@ QString SettingsPageWidget::searchKeywords() const
return rc;
}
SettingsPage::SettingsPage()
{
}
QString SettingsPage::id() const
{
return QLatin1String(VcsBase::Constants::VCS_ID_CVS);
@@ -111,7 +107,7 @@ QString SettingsPage::displayName() const
QWidget *SettingsPage::createPage(QWidget *parent)
{
m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(CVSPlugin::instance()->settings());
m_widget->setSettings(CvsPlugin::instance()->settings());
if (m_searchKeywords.isEmpty())
m_searchKeywords = m_widget->searchKeywords();
return m_widget;
@@ -119,7 +115,7 @@ QWidget *SettingsPage::createPage(QWidget *parent)
void SettingsPage::apply()
{
CVSPlugin::instance()->setSettings(m_widget->settings());
CvsPlugin::instance()->setSettings(m_widget->settings());
}
bool SettingsPage::matches(const QString &s) const

18
src/plugins/cvs/settingspage.h
View File

@@ -45,10 +45,10 @@ QT_BEGIN_NAMESPACE
class QSettings;
QT_END_NAMESPACE
namespace CVS {
namespace Cvs {
namespace Internal {
struct CVSSettings;
struct CvsSettings;
class SettingsPageWidget : public QWidget
{
@@ -57,8 +57,8 @@ class SettingsPageWidget : public QWidget
public:
explicit SettingsPageWidget(QWidget *parent = 0);
CVSSettings settings() const;
void setSettings(const CVSSettings &);
CvsSettings settings() const;
void setSettings(const CvsSettings &);
QString searchKeywords() const;
@@ -72,22 +72,22 @@ class SettingsPage : public VcsBase::VcsBaseOptionsPage
Q_OBJECT
public:
SettingsPage();
SettingsPage() {}
QString id() const;
QString displayName() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish() { }
virtual bool matches(const QString &) const;
void finish() {}
bool matches(const QString &) const;
private:
QString m_searchKeywords;
SettingsPageWidget* m_widget;
SettingsPageWidget *m_widget;
};
} // namespace CVS
} // namespace Cvs
} // namespace Internal
#endif // SETTINGSPAGE_H