Compile

10 files changed, 24 insertions, 22 deletions

diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index 21e79daa1b..d271800629 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -113,7 +113,7 @@ void MercurialSubmitHighlighter::highlightBlock(const QString &text)
 
 
 MercurialCommitWidget::MercurialCommitWidget(QWidget *parent) :
-        Core::Utils::SubmitEditorWidget(parent),
+        Utils::SubmitEditorWidget(parent),
         mercurialCommitPanel(new QWidget)
 {
     mercurialCommitPanelUi.setupUi(mercurialCommitPanel);
diff --git a/src/plugins/mercurial/mercurialcommitwidget.h b/src/plugins/mercurial/mercurialcommitwidget.h
index 50cb9858c9..c5e3337e26 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.h
+++ b/src/plugins/mercurial/mercurialcommitwidget.h
@@ -41,7 +41,7 @@ namespace Internal {
   Some extra fields have been added to the standard SubmitEditorWidget,
   to help to conform to the commit style that is used by both git and Mercurial*/
 
-class MercurialCommitWidget : public Core::Utils::SubmitEditorWidget
+class MercurialCommitWidget : public Utils::SubmitEditorWidget
 {
 
 public:
diff --git a/src/plugins/mercurial/mercurialjobrunner.cpp b/src/plugins/mercurial/mercurialjobrunner.cpp
index 6c37352fb1..cade0da5bb 100644
--- a/src/plugins/mercurial/mercurialjobrunner.cpp
+++ b/src/plugins/mercurial/mercurialjobrunner.cpp
@@ -39,6 +39,7 @@
 #include <QtCore/QTime>
 #include <QtCore/QString>
 #include <QtCore/QSettings>
+#include <QtCore/QDebug>
 
 using namespace Mercurial::Internal;
 using namespace Mercurial;
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 527a623fab..2eab45a569 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -51,6 +51,7 @@
 
 
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/project.h>
 #include <utils/parameteraction.h>
 
 #include <vcsbase/basevcseditorfactory.h>
@@ -245,33 +246,33 @@ void MercurialPlugin::createFileActions(QList<int> &context)
 {
     Core::Command *command;
 
-    annotateFile = new Core::Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
+    annotateFile = new Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(annotateFile, Constants::ANNOTATE, context);
     command->setAttribute(Core::Command::CA_UpdateText);
     connect(annotateFile, SIGNAL(triggered()), this, SLOT(annotateCurrentFile()));
     mercurialContainer->addAction(command);
 
-    diffFile = new Core::Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
+    diffFile = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(diffFile, Constants::DIFF, context);
     command->setAttribute(Core::Command::CA_UpdateText);
     command->setDefaultKeySequence(QKeySequence(tr(Constants::MENUKEY) + tr(Constants::MODIFIER) + "D"));
     connect(diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
     mercurialContainer->addAction(command);
 
-    logFile = new Core::Utils::ParameterAction(tr("Log Current File"), tr("Log \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
+    logFile = new Utils::ParameterAction(tr("Log Current File"), tr("Log \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(logFile, Constants::LOG, context);
     command->setAttribute(Core::Command::CA_UpdateText);
     command->setDefaultKeySequence(QKeySequence(tr(Constants::MENUKEY) + tr(Constants::MODIFIER) + "L"));
     connect(logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile()));
     mercurialContainer->addAction(command);
 
-    revertFile = new Core::Utils::ParameterAction(tr("Revert Current File"), tr("Revert \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
+    revertFile = new Utils::ParameterAction(tr("Revert Current File"), tr("Revert \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(revertFile, Constants::REVERT, context);
     command->setAttribute(Core::Command::CA_UpdateText);
     connect(revertFile, SIGNAL(triggered()), this, SLOT(revertCurrentFile()));
     mercurialContainer->addAction(command);
 
-    statusFile = new Core::Utils::ParameterAction(tr("Status Current File"), tr("Status \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
+    statusFile = new Utils::ParameterAction(tr("Status Current File"), tr("Status \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(statusFile, Constants::STATUS, context);
     command->setAttribute(Core::Command::CA_UpdateText);
     command->setDefaultKeySequence(QKeySequence(tr(Constants::MENUKEY) + tr(Constants::MODIFIER) + "S"));
diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h
index 0f21212b09..c3cc9108d5 100644
--- a/src/plugins/mercurial/mercurialplugin.h
+++ b/src/plugins/mercurial/mercurialplugin.h
@@ -49,11 +49,11 @@ class ICore;
 class IVersionControl;
 class IEditorFactory;
 class IEditor;
+} // namespace Core
 
 namespace Utils {
 class ParameterAction;
 } //namespace Utils
-} // namespace Core
 
 namespace ProjectExplorer {
 class ProjectExplorerPlugin;
@@ -166,12 +166,12 @@ private:
     QTemporaryFile *changeLog;
 
     //Menu Items (file actions)
-    Core::Utils::ParameterAction *annotateFile;
-    Core::Utils::ParameterAction *diffFile;
-    Core::Utils::ParameterAction *logFile;
-    Core::Utils::ParameterAction *renameFile;
-    Core::Utils::ParameterAction *revertFile;
-    Core::Utils::ParameterAction *statusFile;
+    Utils::ParameterAction *annotateFile;
+    Utils::ParameterAction *diffFile;
+    Utils::ParameterAction *logFile;
+    Utils::ParameterAction *renameFile;
+    Utils::ParameterAction *revertFile;
+    Utils::ParameterAction *statusFile;
 
     //submit editor actions
     QAction *editorCommit;
diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp
index 8b48e1a8c8..f3f1d55b6b 100644
--- a/src/plugins/mercurial/optionspage.cpp
+++ b/src/plugins/mercurial/optionspage.cpp
@@ -41,7 +41,7 @@ OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
         QWidget(parent)
 {
     m_ui.setupUi(this);
-    m_ui.commandChooser->setExpectedKind(Core::Utils::PathChooser::Command);
+    m_ui.commandChooser->setExpectedKind(Utils::PathChooser::Command);
     m_ui.commandChooser->setPromptDialogTitle(tr("Mercurial Command"));
 }
 
diff --git a/src/plugins/mercurial/optionspage.ui b/src/plugins/mercurial/optionspage.ui
index 7c149f283a..591aa03e7c 100644
--- a/src/plugins/mercurial/optionspage.ui
+++ b/src/plugins/mercurial/optionspage.ui
@@ -29,7 +29,7 @@
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="Core::Utils::PathChooser" name="commandChooser" native="true"/>
+        <widget class="Utils::PathChooser" name="commandChooser" native="true"/>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="showLogEntriesLabel">
@@ -115,7 +115,7 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::PathChooser</class>
+   <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>
diff --git a/src/plugins/mercurial/srcdestdialog.cpp b/src/plugins/mercurial/srcdestdialog.cpp
index b78c9d0d4e..00eff60561 100644
--- a/src/plugins/mercurial/srcdestdialog.cpp
+++ b/src/plugins/mercurial/srcdestdialog.cpp
@@ -38,7 +38,7 @@ SrcDestDialog::SrcDestDialog(QWidget *parent) :
     m_ui(new Ui::SrcDestDialog)
 {
     m_ui->setupUi(this);
-    m_ui->localPathChooser->setExpectedKind(Core::Utils::PathChooser::Directory);
+    m_ui->localPathChooser->setExpectedKind(Utils::PathChooser::Directory);
 }
 
 SrcDestDialog::~SrcDestDialog()
@@ -46,7 +46,7 @@ SrcDestDialog::~SrcDestDialog()
     delete m_ui;
 }
 
-void SrcDestDialog::setPathChooserKind(Core::Utils::PathChooser::Kind kind)
+void SrcDestDialog::setPathChooserKind(Utils::PathChooser::Kind kind)
 {
     m_ui->localPathChooser->setExpectedKind(kind);
 }
diff --git a/src/plugins/mercurial/srcdestdialog.h b/src/plugins/mercurial/srcdestdialog.h
index d0d0080eba..4dda41eccb 100644
--- a/src/plugins/mercurial/srcdestdialog.h
+++ b/src/plugins/mercurial/srcdestdialog.h
@@ -47,7 +47,7 @@ public:
 
     SrcDestDialog(QWidget *parent = 0);
     ~SrcDestDialog();
-    void setPathChooserKind(Core::Utils::PathChooser::Kind kind);
+    void setPathChooserKind(Utils::PathChooser::Kind kind);
     QString getRepositoryString();
 
 protected:
diff --git a/src/plugins/mercurial/srcdestdialog.ui b/src/plugins/mercurial/srcdestdialog.ui
index 9677363ee9..b72790bf37 100644
--- a/src/plugins/mercurial/srcdestdialog.ui
+++ b/src/plugins/mercurial/srcdestdialog.ui
@@ -44,7 +44,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="Core::Utils::PathChooser" name="localPathChooser" native="true">
+      <widget class="Utils::PathChooser" name="localPathChooser" native="true">
        <property name="enabled">
         <bool>false</bool>
        </property>
@@ -76,7 +76,7 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::PathChooser</class>
+   <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>