Rename namespace Core::Utils into Utils

Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.

14 files changed, 43 insertions, 49 deletions

diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h
index f11fa7c82d..937f9409a9 100644
--- a/src/plugins/projectexplorer/applicationlauncher.h
+++ b/src/plugins/projectexplorer/applicationlauncher.h
@@ -39,11 +39,9 @@
 #include <QtCore/QTextCodec>
 #endif
 
-namespace Core {
 namespace Utils {
 class ConsoleProcess;
 }
-}
 
 namespace ProjectExplorer {
 
@@ -92,7 +90,7 @@ private slots:
 
 private:
     QProcess *m_guiProcess;
-    Core::Utils::ConsoleProcess *m_consoleProcess;
+    Utils::ConsoleProcess *m_consoleProcess;
     Mode m_currentMode;
 
 #ifdef Q_OS_WIN
diff --git a/src/plugins/projectexplorer/applicationlauncher_win.cpp b/src/plugins/projectexplorer/applicationlauncher_win.cpp
index 7880465a2f..2647ad1507 100644
--- a/src/plugins/projectexplorer/applicationlauncher_win.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_win.cpp
@@ -35,7 +35,7 @@
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
-using namespace Core::Utils;
+using namespace Utils;
 
 ApplicationLauncher::ApplicationLauncher(QObject *parent)
     : QObject(parent)
diff --git a/src/plugins/projectexplorer/applicationlauncher_x11.cpp b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
index 87291dd252..f4a0bb018a 100644
--- a/src/plugins/projectexplorer/applicationlauncher_x11.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
@@ -35,7 +35,7 @@
 #include <QtCore/QTimer>
 
 using namespace ProjectExplorer;
-using namespace Core::Utils;
+using namespace Utils;
 
 ApplicationLauncher::ApplicationLauncher(QObject *parent)
     : QObject(parent)
diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp
index 9c6ab93799..edc3576b71 100644
--- a/src/plugins/projectexplorer/buildprogress.cpp
+++ b/src/plugins/projectexplorer/buildprogress.cpp
@@ -62,12 +62,12 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow)
 
     // ### TODO this setup should be done by style
     QFont f = this->font();
-    f.setPointSizeF(StyleHelper::sidebarFontSize());
+    f.setPointSizeF(Utils::StyleHelper::sidebarFontSize());
     f.setBold(true);
     m_errorLabel->setFont(f);
     m_warningLabel->setFont(f);
-    m_errorLabel->setPalette(StyleHelper::sidebarFontPalette(m_errorLabel->palette()));
-    m_warningLabel->setPalette(StyleHelper::sidebarFontPalette(m_warningLabel->palette()));
+    m_errorLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_errorLabel->palette()));
+    m_warningLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_warningLabel->palette()));
 
     m_errorIcon->setAlignment(Qt::AlignRight);
     m_warningIcon->setAlignment(Qt::AlignRight);
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 6755ccc835..4839443bae 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -53,11 +53,11 @@
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 
-class CustomDirectoryPathChooser : public Core::Utils::PathChooser
+class CustomDirectoryPathChooser : public Utils::PathChooser
 {
 public:
     CustomDirectoryPathChooser(QWidget *parent)
-        : Core::Utils::PathChooser(parent)
+        : Utils::PathChooser(parent)
     {
     }
     virtual bool validatePath(const QString &path, QString *errorMessage = 0)
@@ -78,8 +78,8 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
     m_userName = new QLineEdit(this);
     layout->addRow(tr("Name:"), m_userName);
 
-    m_executableChooser = new Core::Utils::PathChooser(this);
-    m_executableChooser->setExpectedKind(Core::Utils::PathChooser::Command);
+    m_executableChooser = new Utils::PathChooser(this);
+    m_executableChooser->setExpectedKind(Utils::PathChooser::Command);
     layout->addRow(tr("Executable:"), m_executableChooser);
 
     m_commandLineArgumentsLineEdit = new QLineEdit(this);
@@ -87,7 +87,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
     layout->addRow(tr("Arguments:"), m_commandLineArgumentsLineEdit);
 
     m_workingDirectory = new CustomDirectoryPathChooser(this);
-    m_workingDirectory->setExpectedKind(Core::Utils::PathChooser::Directory);
+    m_workingDirectory->setExpectedKind(Utils::PathChooser::Directory);
     layout->addRow(tr("Working Directory:"), m_workingDirectory);
 
     m_useTerminalCheck = new QCheckBox(tr("Run in &Terminal"), this);
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
index 2387f9ca72..46c871bd67 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
@@ -33,7 +33,6 @@
 #include "applicationrunconfiguration.h"
 #include <QtGui/QWidget>
 
-
 QT_BEGIN_NAMESPACE
 class QCheckBox;
 class QLineEdit;
@@ -44,12 +43,8 @@ QT_END_NAMESPACE
 
 namespace Utils {
 class DetailsWidget;
-}
-namespace Core {
-namespace Utils {
 class PathChooser;
 }
-}
 
 namespace ProjectExplorer {
 class EnvironmentWidget;
@@ -172,10 +167,10 @@ private slots:
 private:
     bool m_ignoreChange;
     CustomExecutableRunConfiguration *m_runConfiguration;
-    Core::Utils::PathChooser *m_executableChooser;
+    Utils::PathChooser *m_executableChooser;
     QLineEdit *m_userName;
     QLineEdit *m_commandLineArgumentsLineEdit;
-    Core::Utils::PathChooser *m_workingDirectory;
+    Utils::PathChooser *m_workingDirectory;
     QCheckBox *m_useTerminalCheck;
     ProjectExplorer::EnvironmentWidget *m_environmentWidget;
     QComboBox *m_baseEnvironmentComboBox;
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 53e5a0f407..163418b0db 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -139,7 +139,7 @@ void FolderNavigationWidget::setCurrentFile(const QString &filePath)
 
     QString dir = QFileInfo(filePath).path();
     if (dir.isEmpty())
-        dir = Core::Utils::PathChooser::homePath();
+        dir = Utils::PathChooser::homePath();
 
     QModelIndex dirIndex = m_dirModel->index(dir);
     QModelIndex fileIndex = m_dirModel->index(filePath);
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 7e1f5afb82..a4d46bdd27 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -132,7 +132,7 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step)
         : m_step(step)
 {
     m_ui.setupUi(this);
-    m_ui.command->setExpectedKind(Core::Utils::PathChooser::File);
+    m_ui.command->setExpectedKind(Utils::PathChooser::File);
     connect(m_ui.command, SIGNAL(changed(QString)),
             this, SLOT(commandLineEditTextEdited()));
     connect(m_ui.workingDirectory, SIGNAL(changed(QString)),
diff --git a/src/plugins/projectexplorer/processstep.ui b/src/plugins/projectexplorer/processstep.ui
index ed01c90aec..8d049ed363 100644
--- a/src/plugins/projectexplorer/processstep.ui
+++ b/src/plugins/projectexplorer/processstep.ui
@@ -43,7 +43,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="Core::Utils::PathChooser" name="command" native="true"/>
+    <widget class="Utils::PathChooser" name="command" native="true"/>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="workingDirecoryLabel">
@@ -53,7 +53,7 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="Core::Utils::PathChooser" name="workingDirectory" native="true"/>
+    <widget class="Utils::PathChooser" name="workingDirectory" native="true"/>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="commandArgumentsLabel">
@@ -69,7 +69,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/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index f5ba13661d..f1917bf594 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -126,16 +126,16 @@ struct ProjectExplorerPluginPrivate {
 #if 0
     QAction *m_loadAction;
 #endif
-    Core::Utils::ParameterAction *m_unloadAction;
+    Utils::ParameterAction *m_unloadAction;
     QAction *m_clearSession;
     QAction *m_buildProjectOnlyAction;
-    Core::Utils::ParameterAction *m_buildAction;
+    Utils::ParameterAction *m_buildAction;
     QAction *m_buildSessionAction;
     QAction *m_rebuildProjectOnlyAction;
-    Core::Utils::ParameterAction *m_rebuildAction;
+    Utils::ParameterAction *m_rebuildAction;
     QAction *m_rebuildSessionAction;
     QAction *m_cleanProjectOnlyAction;
-    Core::Utils::ParameterAction *m_cleanAction;
+    Utils::ParameterAction *m_cleanAction;
     QAction *m_cleanSessionAction;
     QAction *m_runAction;
     QAction *m_runActionContextMenu;
@@ -508,8 +508,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
         this, SLOT(updateRecentProjectMenu()));
 
     // unload action
-    d->m_unloadAction = new Core::Utils::ParameterAction(tr("Close Project"), tr("Close Project \"%1\""),
-                                                      Core::Utils::ParameterAction::EnabledWithParameter, this);
+    d->m_unloadAction = new Utils::ParameterAction(tr("Close Project"), tr("Close Project \"%1\""),
+                                                      Utils::ParameterAction::EnabledWithParameter, this);
     cmd = am->registerAction(d->m_unloadAction, Constants::UNLOAD, globalcontext);
     cmd->setAttribute(Core::Command::CA_UpdateText);
     cmd->setDefaultText(d->m_unloadAction->text());
@@ -569,8 +569,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD);
 
     // build action
-    d->m_buildAction = new Core::Utils::ParameterAction(tr("Build Project"), tr("Build Project \"%1\""),
-                                                     Core::Utils::ParameterAction::EnabledWithParameter, this);
+    d->m_buildAction = new Utils::ParameterAction(tr("Build Project"), tr("Build Project \"%1\""),
+                                                     Utils::ParameterAction::EnabledWithParameter, this);
     cmd = am->registerAction(d->m_buildAction, Constants::BUILD, globalcontext);
     cmd->setAttribute(Core::Command::CA_UpdateText);
     cmd->setDefaultText(d->m_buildAction->text());
@@ -579,8 +579,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mproject->addAction(cmd, Constants::G_PROJECT_BUILD);
 
     // rebuild action
-    d->m_rebuildAction = new Core::Utils::ParameterAction(tr("Rebuild Project"), tr("Rebuild Project \"%1\""),
-                                                       Core::Utils::ParameterAction::EnabledWithParameter, this);
+    d->m_rebuildAction = new Utils::ParameterAction(tr("Rebuild Project"), tr("Rebuild Project \"%1\""),
+                                                       Utils::ParameterAction::EnabledWithParameter, this);
     cmd = am->registerAction(d->m_rebuildAction, Constants::REBUILD, globalcontext);
     cmd->setAttribute(Core::Command::CA_UpdateText);
     cmd->setDefaultText(d->m_rebuildAction->text());
@@ -588,8 +588,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mproject->addAction(cmd, Constants::G_PROJECT_BUILD);
 
     // clean action
-    d->m_cleanAction = new Core::Utils::ParameterAction(tr("Clean Project"), tr("Clean Project \"%1\""),
-                                                     Core::Utils::ParameterAction::EnabledWithParameter, this);
+    d->m_cleanAction = new Utils::ParameterAction(tr("Clean Project"), tr("Clean Project \"%1\""),
+                                                     Utils::ParameterAction::EnabledWithParameter, this);
     cmd = am->registerAction(d->m_cleanAction, Constants::CLEAN, globalcontext);
     cmd->setAttribute(Core::Command::CA_UpdateText);
     cmd->setDefaultText(d->m_cleanAction->text());
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 4fe3b3d6f5..6066b9e69d 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -45,9 +45,10 @@ namespace Core {
 class IContext;
 class IMode;
 class IFileFactory;
-    namespace Utils {
-        class ParameterAction;
-    }
+}
+
+namespace Utils {
+class ParameterAction;
 }
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
index 38558d441b..cb94d9b53b 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
@@ -39,7 +39,7 @@
        <number>3</number>
       </property>
       <item row="0" column="0" colspan="3">
-       <widget class="Core::Utils::WelcomeModeLabel" name="recentSessionsTitleLabel">
+       <widget class="Utils::WelcomeModeLabel" name="recentSessionsTitleLabel">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
           <horstretch>0</horstretch>
@@ -52,7 +52,7 @@
        </widget>
       </item>
       <item row="1" column="0" colspan="3">
-       <widget class="Core::Utils::WelcomeModeTreeWidget" name="sessTreeWidget">
+       <widget class="Utils::WelcomeModeTreeWidget" name="sessTreeWidget">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -146,7 +146,7 @@
        <number>9</number>
       </property>
       <item row="0" column="0" colspan="3">
-       <widget class="Core::Utils::WelcomeModeLabel" name="projTitleLabel">
+       <widget class="Utils::WelcomeModeLabel" name="projTitleLabel">
         <property name="sizePolicy">
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
           <horstretch>0</horstretch>
@@ -159,7 +159,7 @@
        </widget>
       </item>
       <item row="1" column="0" colspan="3">
-       <widget class="Core::Utils::WelcomeModeTreeWidget" name="projTreeWidget">
+       <widget class="Utils::WelcomeModeTreeWidget" name="projTreeWidget">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -244,12 +244,12 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::WelcomeModeTreeWidget</class>
+   <class>Utils::WelcomeModeTreeWidget</class>
    <extends>QTreeWidget</extends>
    <header>utils/welcomemodetreewidget.h</header>
   </customwidget>
   <customwidget>
-   <class>Core::Utils::WelcomeModeLabel</class>
+   <class>Utils::WelcomeModeLabel</class>
    <extends>QLabel</extends>
    <header>utils/welcomemodetreewidget.h</header>
   </customwidget>
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index 1ee0522584..a3fe25fdd6 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -653,7 +653,7 @@ public:
     void paintEvent(QPaintEvent *e)
     {
         QPainter p(this);
-        p.fillRect(e->rect(), QBrush(StyleHelper::borderColor()));
+        p.fillRect(e->rect(), QBrush(Utils::StyleHelper::borderColor()));
     }
 };
 
@@ -704,7 +704,7 @@ ProjectWindow::ProjectWindow(QWidget *parent)
     QVBoxLayout *topLevelLayout = new QVBoxLayout(this);
     topLevelLayout->setMargin(0);
     topLevelLayout->setSpacing(0);
-    topLevelLayout->addWidget(new Core::Utils::StyledBar(this));
+    topLevelLayout->addWidget(new Utils::StyledBar(this));
 
     topLevelLayout->addWidget(m_panelsWidget);
 
diff --git a/src/plugins/projectexplorer/winguiprocess.h b/src/plugins/projectexplorer/winguiprocess.h
index c74f4f389c..460651ff12 100644
--- a/src/plugins/projectexplorer/winguiprocess.h
+++ b/src/plugins/projectexplorer/winguiprocess.h
@@ -37,7 +37,7 @@
 
 #include <windows.h>
 
-using namespace Core::Utils;
+using namespace Utils;
 
 namespace ProjectExplorer {
 namespace Internal {