From eb4d64a86083947f31b7a25f1d468f4aa238f488 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Tue, 3 Sep 2013 15:40:05 +0200
Subject: [PATCH] Cvs: Remove some Cvs namespace usages
Change-Id: I73250f29ef9324d100202c855d78336935be7397
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/cvs/cvseditor.cpp | 2 +-
src/plugins/cvs/cvsplugin.cpp | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp
index 8446b8b63d4..d34dc18f863 100644
--- a/src/plugins/cvs/cvseditor.cpp
+++ b/src/plugins/cvs/cvseditor.cpp
@@ -87,7 +87,7 @@ QSet<QString> CvsEditor::annotationChanges() const
changes.insert(r.cap(1));
}
}
- if (Cvs::Constants::debug)
+ if (Constants::debug)
qDebug() << "CVSEditor::annotationChanges() returns #" << changes.size();
return changes;
}
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 4f996089be1..070ea7e088a 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -560,9 +560,9 @@ void CvsPlugin::cvsDiff(const QString &workingDir, const QStringList &files)
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;
const QString source = VcsBaseEditorWidget::getSource(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,
const QStringList &fileList)
{
- if (Cvs::Constants::debug)
+ if (Constants::debug)
qDebug() << Q_FUNC_INFO << messageFile << fileList;
QStringList args = QStringList(QLatin1String("commit"));
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
// a commit in order to emulate a "describe global change" functionality
// if desired.
- if (Cvs::Constants::debug)
+ if (Constants::debug)
qDebug() << Q_FUNC_INFO << file << changeNr;
// Number must be > 1
if (isFirstRevision(changeNr)) {
@@ -1269,7 +1269,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
const VcsBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
const Id id = params->id;
- if (Cvs::Constants::debug)
+ if (Constants::debug)
qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name()
<< "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
@@ -1356,7 +1356,7 @@ bool CvsPlugin::managesDirectory(const QString &directory, QString *topLevel /*
}
}
} while (false);
- if (Cvs::Constants::debug) {
+ if (Constants::debug) {
QDebug nsp = qDebug().nospace();
nsp << "CVSPlugin::managesDirectory" << directory << manages;
if (topLevel)
--
GitLab