Commit 499d7219 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Mercurial: Use explicit namespace in cpp files



Change-Id: Ic6aaa88dfdc33966e0e8007a9420461811ae48c2
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 4161e7f9
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment