Mercurial: Use explicit namespace in cpp files

Change-Id: Ic6aaa88dfdc33966e0e8007a9420461811ae48c2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

9 files changed, 47 insertions, 12 deletions

diff --git a/src/plugins/mercurial/annotationhighlighter.cpp b/src/plugins/mercurial/annotationhighlighter.cpp
index 90652cc77b..bcf1f60c88 100644
--- a/src/plugins/mercurial/annotationhighlighter.cpp
+++ b/src/plugins/mercurial/annotationhighlighter.cpp
@@ -31,8 +31,8 @@
 #include "annotationhighlighter.h"
 #include "constants.h"
 
-using namespace Mercurial::Internal;
-using namespace Mercurial;
+namespace Mercurial {
+namespace Internal  {
 
 MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const ChangeNumbers &changeNumbers,
                                                                QTextDocument *document)
@@ -47,3 +47,6 @@ QString MercurialAnnotationHighlighter::changeNumber(const QString &block) const
         return changeset.cap(1);
     return QString();
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/authenticationdialog.cpp b/src/plugins/mercurial/authenticationdialog.cpp
index 38d5830c17..680d0fc0c4 100644
--- a/src/plugins/mercurial/authenticationdialog.cpp
+++ b/src/plugins/mercurial/authenticationdialog.cpp
@@ -31,7 +31,8 @@
 #include "authenticationdialog.h"
 #include "ui_authenticationdialog.h"
 
-using namespace Mercurial::Internal;
+namespace Mercurial {
+namespace Internal  {
 
 AuthenticationDialog::AuthenticationDialog(const QString &username, const QString &password, QWidget *parent) :
     QDialog(parent),
@@ -61,3 +62,6 @@ QString AuthenticationDialog::getPassword()
 {
     return ui->password->text();
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/clonewizardpage.cpp b/src/plugins/mercurial/clonewizardpage.cpp
index b214e65450..0e351f969b 100644
--- a/src/plugins/mercurial/clonewizardpage.cpp
+++ b/src/plugins/mercurial/clonewizardpage.cpp
@@ -30,7 +30,8 @@
 
 #include "clonewizardpage.h"
 
-using namespace Mercurial::Internal;
+namespace Mercurial {
+namespace Internal  {
 
 CloneWizardPage::CloneWizardPage(QWidget *parent)
         : VcsBase::BaseCheckoutWizardPage(parent)
@@ -53,3 +54,6 @@ QString CloneWizardPage::directoryFromRepository(const QString &repository) cons
     // Take the basename or the repository url.
     return repo.mid(repo.lastIndexOf(slash) + 1);
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp
index 0f15bed33c..bf74226dec 100644
--- a/src/plugins/mercurial/commiteditor.cpp
+++ b/src/plugins/mercurial/commiteditor.cpp
@@ -37,9 +37,11 @@
 #include <QDebug>
 #include <QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED
 
-using namespace Mercurial::Internal;
 using namespace VcsBase;
 
+namespace Mercurial {
+namespace Internal  {
+
 CommitEditor::CommitEditor(const VcsBaseSubmitEditorParameters *parameters)
         : VcsBaseSubmitEditor(parameters, new MercurialCommitWidget),
         fileModel(0)
@@ -96,3 +98,6 @@ QString CommitEditor::repoRoot()
 {
     return commitWidget()->repoRoot();
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp
index 3bcb65ebd9..e1d2c2438a 100644
--- a/src/plugins/mercurial/mercurialcontrol.cpp
+++ b/src/plugins/mercurial/mercurialcontrol.cpp
@@ -41,7 +41,8 @@
 #include <QStringList>
 #include <QDir>
 
-using namespace Mercurial::Internal;
+namespace Mercurial {
+namespace Internal {
 
 class MercurialTopicCache : public Core::IVersionControl::TopicCache
 {
@@ -199,3 +200,6 @@ void MercurialControl::emitConfigurationChanged()
 {
     emit configurationChanged();
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp
index 0acccc9c3d..e5d76ee60f 100644
--- a/src/plugins/mercurial/mercurialeditor.cpp
+++ b/src/plugins/mercurial/mercurialeditor.cpp
@@ -44,8 +44,8 @@
 #include <QFileInfo>
 #include <QDebug>
 
-using namespace Mercurial::Internal;
-using namespace Mercurial;
+namespace Mercurial {
+namespace Internal  {
 
 MercurialEditorWidget::MercurialEditorWidget() :
         exactIdentifier12(QLatin1String(Constants::CHANGEIDEXACT12)),
@@ -109,3 +109,6 @@ QStringList MercurialEditorWidget::annotationPreviousVersions(const QString &rev
     // Retrieve parent revisions
     return MercurialPlugin::client()->parentRevisionsSync(workingDirectory, fi.fileName(), revision);
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp
index 44ab389811..672c2c0586 100644
--- a/src/plugins/mercurial/optionspage.cpp
+++ b/src/plugins/mercurial/optionspage.cpp
@@ -38,8 +38,8 @@
 
 #include <QTextStream>
 
-using namespace Mercurial::Internal;
-using namespace Mercurial;
+namespace Mercurial {
+namespace Internal  {
 
 OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
         QWidget(parent)
@@ -101,3 +101,6 @@ void OptionsPage::finish()
 {
     delete optionsPageWidget;
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/revertdialog.cpp b/src/plugins/mercurial/revertdialog.cpp
index 7edd20150c..bfb93f324a 100644
--- a/src/plugins/mercurial/revertdialog.cpp
+++ b/src/plugins/mercurial/revertdialog.cpp
@@ -30,7 +30,8 @@
 
 #include "revertdialog.h"
 
-using namespace Mercurial::Internal;
+namespace Mercurial {
+namespace Internal  {
 
 RevertDialog::RevertDialog(QWidget *parent) :
     QDialog(parent),
@@ -48,3 +49,6 @@ QString RevertDialog::revision() const
 {
     return m_ui->revisionLineEdit->text();
 }
+
+} // namespace Internal
+} // namespace Mercurial
diff --git a/src/plugins/mercurial/srcdestdialog.cpp b/src/plugins/mercurial/srcdestdialog.cpp
index fa49c791e4..56cea035c6 100644
--- a/src/plugins/mercurial/srcdestdialog.cpp
+++ b/src/plugins/mercurial/srcdestdialog.cpp
@@ -37,7 +37,9 @@
 #include <QUrl>
 
 using namespace VcsBase;
-using namespace Mercurial::Internal;
+
+namespace Mercurial {
+namespace Internal  {
 
 SrcDestDialog::SrcDestDialog(Direction dir, QWidget *parent) :
     QDialog(parent),
@@ -118,3 +120,6 @@ QUrl SrcDestDialog::getRepoUrl() const
         url = settings.value(QLatin1String("paths/default")).toUrl();
     return url;
 }
+
+} // namespace Internal
+} // namespace Mercurial