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

Cvs: Remove some Cvs namespace usages

Browse Source 
Change-Id: I73250f29ef9324d100202c855d78336935be7397
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-09-03 15:40:05 +02:00
parent fa05b23a23
commit eb4d64a860
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ QSet<QString> CvsEditor::annotationChanges() const
changes.insert(r.cap(1)); changes.insert(r.cap(1));
} }
} }
if (Cvs::Constants::debug) if (Constants::debug)
qDebug() << "CVSEditor::annotationChanges() returns #" << changes.size(); qDebug() << "CVSEditor::annotationChanges() returns #" << changes.size();
return changes; return changes;
} }

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

@@ -560,9 +560,9 @@ void CvsPlugin::cvsDiff(const QString &workingDir, const QStringList &files)
cvsDiff(p); cvsDiff(p);
} }
void CvsPlugin::cvsDiff(const CvsDiffParameters &p) void CvsPlugin::cvsDiff(const Cvs::Internal::CvsDiffParameters &p)
{ {
if (Cvs::Constants::debug) if (Constants::debug)
qDebug() << Q_FUNC_INFO << p.files; qDebug() << Q_FUNC_INFO << p.files;
const QString source = VcsBaseEditorWidget::getSource(p.workingDir, p.files); const QString source = VcsBaseEditorWidget::getSource(p.workingDir, p.files);
QTextCodec *codec = VcsBaseEditorWidget::getCodec(p.workingDir, p.files); QTextCodec *codec = VcsBaseEditorWidget::getCodec(p.workingDir, p.files);
@@ -809,7 +809,7 @@ void CvsPlugin::startCommit(const QString &workingDir, const QString &file)
bool CvsPlugin::commit(const QString &messageFile, bool CvsPlugin::commit(const QString &messageFile,
const QStringList &fileList) const QStringList &fileList)
{ {
if (Cvs::Constants::debug) if (Constants::debug)
qDebug() << Q_FUNC_INFO << messageFile << fileList; qDebug() << Q_FUNC_INFO << messageFile << fileList;
QStringList args = QStringList(QLatin1String("commit")); QStringList args = QStringList(QLatin1String("commit"));
args << QLatin1String("-F") << messageFile; args << QLatin1String("-F") << messageFile;
@@ -1094,7 +1094,7 @@ bool CvsPlugin::describe(const QString &toplevel, const QString &file, const
// This function makes use of it to find all files related to // This function makes use of it to find all files related to
// a commit in order to emulate a "describe global change" functionality // a commit in order to emulate a "describe global change" functionality
// if desired. // if desired.
if (Cvs::Constants::debug) if (Constants::debug)
qDebug() << Q_FUNC_INFO << file << changeNr; qDebug() << Q_FUNC_INFO << file << changeNr;
// Number must be > 1 // Number must be > 1
if (isFirstRevision(changeNr)) { if (isFirstRevision(changeNr)) {
@@ -1269,7 +1269,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
const VcsBaseEditorParameters *params = findType(editorType); const VcsBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0); QTC_ASSERT(params, return 0);
const Id id = params->id; const Id id = params->id;
if (Cvs::Constants::debug) if (Constants::debug)
qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name() qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name()
<< "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); << "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title; QString s = title;
@@ -1356,7 +1356,7 @@ bool CvsPlugin::managesDirectory(const QString &directory, QString *topLevel /*
} }
} }
} while (false); } while (false);
if (Cvs::Constants::debug) { if (Constants::debug) {
QDebug nsp = qDebug().nospace(); QDebug nsp = qDebug().nospace();
nsp << "CVSPlugin::managesDirectory" << directory << manages; nsp << "CVSPlugin::managesDirectory" << directory << manages;
if (topLevel) if (topLevel)