Rename namespace Core::Utils into Utils

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

72 files changed, 67 insertions, 176 deletions

diff --git a/src/libs/utils/abstractprocess.h b/src/libs/utils/abstractprocess.h
index c0373b64ee..3dcdee9617 100644
--- a/src/libs/utils/abstractprocess.h
+++ b/src/libs/utils/abstractprocess.h
@@ -34,7 +34,6 @@
 
 #include <QtCore/QStringList>
 
-namespace Core {
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT AbstractProcess
@@ -75,7 +74,6 @@ private:
 };
 
 } //namespace Utils
-} //namespace Core
 
 #endif // ABSTRACTPROCESS_H
 
diff --git a/src/libs/utils/abstractprocess_win.cpp b/src/libs/utils/abstractprocess_win.cpp
index 6f038988a4..70aa028e1c 100644
--- a/src/libs/utils/abstractprocess_win.cpp
+++ b/src/libs/utils/abstractprocess_win.cpp
@@ -31,7 +31,6 @@
 
 #include <windows.h>
 
-namespace Core {
 namespace Utils {  
 
 QStringList AbstractProcess::fixWinEnvironment(const QStringList &env)
@@ -114,4 +113,3 @@ QByteArray AbstractProcess::createWinEnvironment(const QStringList &env)
 }
 
 } //namespace Utils
-} //namespace Core
diff --git a/src/libs/utils/basevalidatinglineedit.cpp b/src/libs/utils/basevalidatinglineedit.cpp
index c648b59cc7..c70aa59e1f 100644
--- a/src/libs/utils/basevalidatinglineedit.cpp
+++ b/src/libs/utils/basevalidatinglineedit.cpp
@@ -33,7 +33,6 @@
 
 enum { debug = 0 };
 
-namespace Core {
 namespace Utils {
 
 struct BaseValidatingLineEditPrivate {
@@ -156,4 +155,3 @@ void BaseValidatingLineEdit::triggerChanged()
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h
index 34dddf367b..77031bbd96 100644
--- a/src/libs/utils/basevalidatinglineedit.h
+++ b/src/libs/utils/basevalidatinglineedit.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QLineEdit>
 
-namespace Core {
 namespace Utils {
 
 struct BaseValidatingLineEditPrivate;
@@ -98,6 +97,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // BASEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp
index d72bd9e6da..68c3065652 100644
--- a/src/libs/utils/checkablemessagebox.cpp
+++ b/src/libs/utils/checkablemessagebox.cpp
@@ -4,7 +4,6 @@
 #include <QtGui/QPushButton>
 #include <QtCore/QDebug>
 
-namespace Core {
 namespace Utils {
 
 struct CheckableMessageBoxPrivate {
@@ -147,4 +146,3 @@ QMessageBox::StandardButton CheckableMessageBox::dialogButtonBoxToMessageBoxButt
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/checkablemessagebox.h b/src/libs/utils/checkablemessagebox.h
index 4b57e25fa3..e14908b4b7 100644
--- a/src/libs/utils/checkablemessagebox.h
+++ b/src/libs/utils/checkablemessagebox.h
@@ -7,7 +7,6 @@
 #include <QtGui/QMessageBox>
 #include <QtGui/QDialog>
 
-namespace Core {
 namespace Utils {
 
 struct CheckableMessageBoxPrivate;
@@ -72,6 +71,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // CHECKABLEMESSAGEBOX_H
diff --git a/src/libs/utils/checkablemessagebox.ui b/src/libs/utils/checkablemessagebox.ui
index c5f6d7265b..7491a84916 100644
--- a/src/libs/utils/checkablemessagebox.ui
+++ b/src/libs/utils/checkablemessagebox.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Core::Utils::CheckableMessageBox</class>
- <widget class="QDialog" name="Core::Utils::CheckableMessageBox">
+ <class>Utils::CheckableMessageBox</class>
+ <widget class="QDialog" name="Utils::CheckableMessageBox">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -121,7 +121,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>Core::Utils::CheckableMessageBox</receiver>
+   <receiver>Utils::CheckableMessageBox</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -137,7 +137,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>Core::Utils::CheckableMessageBox</receiver>
+   <receiver>Utils::CheckableMessageBox</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp
index 324c5d4dd6..462e698b60 100644
--- a/src/libs/utils/classnamevalidatinglineedit.cpp
+++ b/src/libs/utils/classnamevalidatinglineedit.cpp
@@ -34,7 +34,6 @@
 #include <QtCore/QDebug>
 #include <QtCore/QRegExp>
 
-namespace Core {
 namespace Utils {
 
 struct ClassNameValidatingLineEditPrivate {
@@ -58,7 +57,7 @@ ClassNameValidatingLineEditPrivate:: ClassNameValidatingLineEditPrivate() :
 
 // --------------------- ClassNameValidatingLineEdit
 ClassNameValidatingLineEdit::ClassNameValidatingLineEdit(QWidget *parent) :
-    Core::Utils::BaseValidatingLineEdit(parent),
+    Utils::BaseValidatingLineEdit(parent),
     m_d(new ClassNameValidatingLineEditPrivate)
 {
 }
@@ -98,7 +97,7 @@ bool ClassNameValidatingLineEdit::validate(const QString &value, QString *errorM
 
 void ClassNameValidatingLineEdit::slotChanged(const QString &t)
 {
-    Core::Utils::BaseValidatingLineEdit::slotChanged(t);
+    Utils::BaseValidatingLineEdit::slotChanged(t);
     if (isValid()) {
         // Suggest file names, strip namespaces
         QString fileName = m_d->m_lowerCaseFileName ? t.toLower() : t;
@@ -148,4 +147,3 @@ void ClassNameValidatingLineEdit::setLowerCaseFileName(bool v)
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h
index 8e7ea31333..3c650906ed 100644
--- a/src/libs/utils/classnamevalidatinglineedit.h
+++ b/src/libs/utils/classnamevalidatinglineedit.h
@@ -33,7 +33,6 @@
 #include "utils_global.h"
 #include "basevalidatinglineedit.h"
 
-namespace Core {
 namespace Utils {
 
 struct ClassNameValidatingLineEditPrivate;
@@ -42,7 +41,7 @@ struct ClassNameValidatingLineEditPrivate;
  * to derive suggested file names from it. */
 
 class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit
-  : public Core::Utils::BaseValidatingLineEdit
+  : public Utils::BaseValidatingLineEdit
 {
     Q_DISABLE_COPY(ClassNameValidatingLineEdit)
     Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true)
@@ -76,6 +75,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // CLASSNAMEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp
index 8b2a2869b0..c0b1a64356 100644
--- a/src/libs/utils/codegeneration.cpp
+++ b/src/libs/utils/codegeneration.cpp
@@ -33,7 +33,6 @@
 #include <QtCore/QStringList>
 #include <QtCore/QFileInfo>
 
-namespace Core {
 namespace Utils {
 
 static QString toAlphaNum(const QString &s)
@@ -101,4 +100,3 @@ void writeClosingNameSpaces(const QStringList &l, const QString &indent,
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h
index c1e3f5ab74..5c8fc746ce 100644
--- a/src/libs/utils/codegeneration.h
+++ b/src/libs/utils/codegeneration.h
@@ -38,7 +38,6 @@ class QTextStream;
 class QStringList;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 QTCREATOR_UTILS_EXPORT QString headerGuard(const QString &file);
@@ -62,6 +61,5 @@ void writeClosingNameSpaces(const QStringList &namespaces,
                             QTextStream &str);
 
 } // namespace Utils
-} // namespace Core
 
 #endif // CODEGENERATION_H
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
index 0fa3a9b7d3..d89f9f86a5 100644
--- a/src/libs/utils/consoleprocess.cpp
+++ b/src/libs/utils/consoleprocess.cpp
@@ -29,7 +29,6 @@
 
 #include "consoleprocess.h"
 
-namespace Core {
 namespace Utils {
 
 QString ConsoleProcess::modeOption(Mode m)
@@ -83,4 +82,3 @@ QString ConsoleProcess::msgCannotExecute(const QString & p, const QString &why)
 }
 
 }
-}
diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h
index 18c684f258..d3d4ff58cd 100644
--- a/src/libs/utils/consoleprocess.h
+++ b/src/libs/utils/consoleprocess.h
@@ -51,7 +51,6 @@ class QSettings;
 class QTemporaryFile;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess
@@ -138,6 +137,5 @@ private:
 };
 
 } //namespace Utils
-} //namespace Core
 
 #endif
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index 36d8a94b71..5879ab4c9d 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <unistd.h>
 
-using namespace Core::Utils;
+using namespace Utils;
 
 ConsoleProcess::ConsoleProcess(QObject *parent)  :
     QObject(parent),
diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp
index 9fcf5c976a..437295d086 100644
--- a/src/libs/utils/consoleprocess_win.cpp
+++ b/src/libs/utils/consoleprocess_win.cpp
@@ -40,7 +40,7 @@
 
 #include <stdlib.h>
 
-using namespace Core::Utils;
+using namespace Utils;
 
 ConsoleProcess::ConsoleProcess(QObject *parent) :
     QObject(parent),
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index b7e8b770b8..3f6d74d175 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -39,7 +39,6 @@
 
 enum { margin = 6 };
 
-namespace Core {
 namespace Utils {
 
 static inline QString sideToStyleSheetString(FancyLineEdit::Side side)
@@ -311,4 +310,3 @@ QString FancyLineEdit::typedText() const
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h
index 4d6dfedff8..754fccbbeb 100644
--- a/src/libs/utils/fancylineedit.h
+++ b/src/libs/utils/fancylineedit.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QLineEdit>
 
-namespace Core {
 namespace Utils {
 
 class FancyLineEditPrivate;
@@ -107,6 +106,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // FANCYLINEEDIT_H
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index eadb7f2ae2..09d0583366 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -35,7 +35,7 @@
 #include <QtCore/QSettings>
 
 
-using namespace Core::Utils;
+using namespace Utils;
 
 FancyMainWindow::FancyMainWindow(QWidget *parent)
     : QMainWindow(parent),
diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h
index 6f4f866897..68420183e4 100644
--- a/src/libs/utils/fancymainwindow.h
+++ b/src/libs/utils/fancymainwindow.h
@@ -41,7 +41,6 @@ QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT FancyMainWindow : public QMainWindow
@@ -85,6 +84,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // FANCYMAINWINDOW_H
diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp
index 359ee7a4bb..70b064e9f4 100644
--- a/src/libs/utils/filenamevalidatinglineedit.cpp
+++ b/src/libs/utils/filenamevalidatinglineedit.cpp
@@ -33,7 +33,6 @@
 #include <QtCore/QRegExp>
 #include <QtCore/QDebug>
 
-namespace Core {
 namespace Utils {
 
 #define WINDOWS_DEVICES "CON|AUX|PRN|COM1|COM2|LPT1|LPT2|NUL"
@@ -133,4 +132,3 @@ bool  FileNameValidatingLineEdit::validate(const QString &value, QString *errorM
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h
index df5556f679..2648bb5301 100644
--- a/src/libs/utils/filenamevalidatinglineedit.h
+++ b/src/libs/utils/filenamevalidatinglineedit.h
@@ -32,7 +32,6 @@
 
 #include "basevalidatinglineedit.h"
 
-namespace Core {
 namespace Utils {
 
 /**
@@ -67,6 +66,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // FILENAMEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index a925e9069b..192fa34321 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -40,11 +40,11 @@
 
 #include <qtconcurrent/runextensions.h>
 
-using namespace Core::Utils;
+using namespace Utils;
 
 static inline QString msgCanceled(const QString &searchTerm, int numMatches, int numFilesSearched)
 {
-    return QCoreApplication::translate("Core::Utils::FileSearch",
+    return QCoreApplication::translate("Utils::FileSearch",
                                        "%1: canceled. %n occurrences found in %2 files.",
                                        0, QCoreApplication::CodecForTr, numMatches).
                                        arg(searchTerm).arg(numFilesSearched);
@@ -52,7 +52,7 @@ static inline QString msgCanceled(const QString &searchTerm, int numMatches, int
 
 static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched)
 {
-    return QCoreApplication::translate("Core::Utils::FileSearch",
+    return QCoreApplication::translate("Utils::FileSearch",
                                        "%1: %n occurrences found in %2 files.",
                                        0, QCoreApplication::CodecForTr, numMatches).
                                        arg(searchTerm).arg(numFilesSearched);
@@ -60,7 +60,7 @@ static inline QString msgFound(const QString &searchTerm, int numMatches, int nu
 
 static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched, int filesSize)
 {
-    return QCoreApplication::translate("Core::Utils::FileSearch",
+    return QCoreApplication::translate("Utils::FileSearch",
                                        "%1: %n occurrences found in %2 of %3 files.",
                                        0, QCoreApplication::CodecForTr, numMatches).
                                        arg(searchTerm).arg(numFilesSearched).arg(filesSize);
@@ -246,14 +246,14 @@ void runFileSearchRegExp(QFutureInterface<FileSearchResult> &future,
 } // namespace
 
 
-QFuture<FileSearchResult> Core::Utils::findInFiles(const QString &searchTerm, const QStringList &files,
+QFuture<FileSearchResult> Utils::findInFiles(const QString &searchTerm, const QStringList &files,
     QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap)
 {
     return QtConcurrent::run<FileSearchResult, QString, QStringList, QTextDocument::FindFlags, QMap<QString, QString> >
             (runFileSearch, searchTerm, files, flags, fileToContentsMap);
 }
 
-QFuture<FileSearchResult> Core::Utils::findInFilesRegExp(const QString &searchTerm, const QStringList &files,
+QFuture<FileSearchResult> Utils::findInFilesRegExp(const QString &searchTerm, const QStringList &files,
     QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap)
 {
     return QtConcurrent::run<FileSearchResult, QString, QStringList, QTextDocument::FindFlags, QMap<QString, QString> >
diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h
index 59dd7d6b4e..6609eb12c6 100644
--- a/src/libs/utils/filesearch.h
+++ b/src/libs/utils/filesearch.h
@@ -37,7 +37,6 @@
 #include <QtCore/QMap>
 #include <QtGui/QTextDocument>
 
-namespace Core {
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT FileSearchResult
@@ -62,6 +61,5 @@ QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString
     QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap = QMap<QString, QString>());
 
 } // namespace Utils
-} // namespace Core
 
 #endif // FILESEARCH_H
diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp
index 5c1003cf26..d1190b0d38 100644
--- a/src/libs/utils/filewizarddialog.cpp
+++ b/src/libs/utils/filewizarddialog.cpp
@@ -32,7 +32,6 @@
 
 #include <QtGui/QAbstractButton>
 
-namespace Core {
 namespace Utils {
 
 FileWizardDialog::FileWizardDialog(QWidget *parent) :
@@ -69,4 +68,3 @@ void FileWizardDialog::setName(const QString &name)
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h
index c4baf284d0..c408543bb4 100644
--- a/src/libs/utils/filewizarddialog.h
+++ b/src/libs/utils/filewizarddialog.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QWizard>
 
-namespace Core {
 namespace Utils {
 
 class FileWizardPage;
@@ -62,6 +61,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // FILEWIZARDDIALOG_H
diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp
index d2901d468f..06db5d5c28 100644
--- a/src/libs/utils/filewizardpage.cpp
+++ b/src/libs/utils/filewizardpage.cpp
@@ -30,7 +30,6 @@
 #include "filewizardpage.h"
 #include "ui_filewizardpage.h"
 
-namespace Core {
 namespace Utils {
 
 struct FileWizardPagePrivate
@@ -130,4 +129,3 @@ bool FileWizardPage::validateBaseName(const QString &name, QString *errorMessage
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index f2099c73dc..fd2ded147b 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QWizardPage>
 
-namespace Core {
 namespace Utils {
 
 struct FileWizardPagePrivate;
@@ -87,6 +86,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // FILEWIZARDPAGE_H
diff --git a/src/libs/utils/filewizardpage.ui b/src/libs/utils/filewizardpage.ui
index fea35b9c5b..2657a586bd 100644
--- a/src/libs/utils/filewizardpage.ui
+++ b/src/libs/utils/filewizardpage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Core::Utils::WizardPage</class>
- <widget class="QWizardPage" name="Core::Utils::WizardPage">
+ <class>Utils::WizardPage</class>
+ <widget class="QWizardPage" name="Utils::WizardPage">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -22,7 +22,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="Core::Utils::FileNameValidatingLineEdit" name="nameLineEdit"/>
+    <widget class="Utils::FileNameValidatingLineEdit" name="nameLineEdit"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="pathLabel">
@@ -32,19 +32,19 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="Core::Utils::PathChooser" name="pathChooser" native="true"/>
+    <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::PathChooser</class>
+   <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header>pathchooser.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Core::Utils::FileNameValidatingLineEdit</class>
+   <class>Utils::FileNameValidatingLineEdit</class>
    <extends>QLineEdit</extends>
    <header>filenamevalidatinglineedit.h</header>
   </customwidget>
diff --git a/src/libs/utils/linecolumnlabel.cpp b/src/libs/utils/linecolumnlabel.cpp
index b5b6d88f53..2f8756e40a 100644
--- a/src/libs/utils/linecolumnlabel.cpp
+++ b/src/libs/utils/linecolumnlabel.cpp
@@ -29,7 +29,6 @@
 
 #include "linecolumnlabel.h"
 
-namespace Core {
 namespace Utils {
 
 LineColumnLabel::LineColumnLabel(QWidget *parent)
@@ -62,4 +61,3 @@ void LineColumnLabel::setMaxText(const QString &maxText)
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h
index 335d74e36e..c3158daa3b 100644
--- a/src/libs/utils/linecolumnlabel.h
+++ b/src/libs/utils/linecolumnlabel.h
@@ -33,7 +33,6 @@
 #include "utils_global.h"
 #include <QtGui/QLabel>
 
-namespace Core {
 namespace Utils {
 
 /* A label suitable for displaying cursor positions, etc. with a fixed
@@ -61,6 +60,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // LINECOLUMNLABEL_H
diff --git a/src/libs/utils/listutils.h b/src/libs/utils/listutils.h
index b9475f2c63..23224ba459 100644
--- a/src/libs/utils/listutils.h
+++ b/src/libs/utils/listutils.h
@@ -32,7 +32,6 @@
 
 #include <QtCore/QList>
 
-namespace Core {
 namespace Utils {
 
 template <class T1, class T2>
@@ -46,6 +45,5 @@ QList<T1> qwConvertList(const QList<T2> &list)
 }
 
 } // namespace Utils
-} // namespace Core
 
 #endif // LISTUTILS_H
diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp
index 95af0d542f..42265a062e 100644
--- a/src/libs/utils/newclasswidget.cpp
+++ b/src/libs/utils/newclasswidget.cpp
@@ -41,7 +41,6 @@
 
 enum { debugNewClassWidget = 0 };
 
-namespace Core {
 namespace Utils {
 
 struct NewClassWidgetPrivate {
@@ -485,4 +484,3 @@ QStringList NewClassWidget::files() const
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h
index c762c247e0..52d03720a8 100644
--- a/src/libs/utils/newclasswidget.h
+++ b/src/libs/utils/newclasswidget.h
@@ -38,7 +38,6 @@ QT_BEGIN_NAMESPACE
 class QStringList;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 struct NewClassWidgetPrivate;
@@ -157,6 +156,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // NEWCLASSWIDGET_H
diff --git a/src/libs/utils/newclasswidget.ui b/src/libs/utils/newclasswidget.ui
index 4399a850a1..76a093a76f 100644
--- a/src/libs/utils/newclasswidget.ui
+++ b/src/libs/utils/newclasswidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Core::Utils::NewClassWidget</class>
- <widget class="QWidget" name="Core::Utils::NewClassWidget">
+ <class>Utils::NewClassWidget</class>
+ <widget class="QWidget" name="Utils::NewClassWidget">
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::ExpandingFieldsGrow</enum>
@@ -17,7 +17,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="Core::Utils::ClassNameValidatingLineEdit" name="classLineEdit"/>
+    <widget class="Utils::ClassNameValidatingLineEdit" name="classLineEdit"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="baseClassLabel">
@@ -76,7 +76,7 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="Core::Utils::FileNameValidatingLineEdit" name="headerFileLineEdit"/>
+    <widget class="Utils::FileNameValidatingLineEdit" name="headerFileLineEdit"/>
    </item>
    <item row="4" column="0">
     <widget class="QLabel" name="sourceLabel">
@@ -86,7 +86,7 @@
     </widget>
    </item>
    <item row="4" column="1">
-    <widget class="Core::Utils::FileNameValidatingLineEdit" name="sourceFileLineEdit"/>
+    <widget class="Utils::FileNameValidatingLineEdit" name="sourceFileLineEdit"/>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="generateFormLabel">
@@ -103,7 +103,7 @@
     </widget>
    </item>
    <item row="6" column="1">
-    <widget class="Core::Utils::FileNameValidatingLineEdit" name="formFileLineEdit"/>
+    <widget class="Utils::FileNameValidatingLineEdit" name="formFileLineEdit"/>
    </item>
    <item row="7" column="0">
     <widget class="QLabel" name="pathLabel">
@@ -113,7 +113,7 @@
     </widget>
    </item>
    <item row="7" column="1">
-    <widget class="Core::Utils::PathChooser" name="pathChooser" native="true"/>
+    <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
    </item>
    <item row="5" column="1">
     <widget class="QCheckBox" name="generateFormCheckBox">
@@ -126,18 +126,18 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::PathChooser</class>
+   <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header location="global">pathchooser.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Core::Utils::ClassNameValidatingLineEdit</class>
+   <class>Utils::ClassNameValidatingLineEdit</class>
    <extends>QLineEdit</extends>
    <header>classnamevalidatinglineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>Core::Utils::FileNameValidatingLineEdit</class>
+   <class>Utils::FileNameValidatingLineEdit</class>
    <extends>QLineEdit</extends>
    <header location="global">utils/filenamevalidatinglineedit.h</header>
   </customwidget>
diff --git a/src/libs/utils/parameteraction.cpp b/src/libs/utils/parameteraction.cpp
index 3653d1ca8f..1ab37e7085 100644
--- a/src/libs/utils/parameteraction.cpp
+++ b/src/libs/utils/parameteraction.cpp
@@ -1,6 +1,5 @@
 #include "parameteraction.h"
 
-namespace Core {
 namespace Utils {
 
 ParameterAction::ParameterAction(const QString &emptyText,
@@ -57,5 +56,3 @@ void ParameterAction::setParameter(const QString &p)
 }
 
 }
-}
-
diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/parameteraction.h
index 2f6444e43b..8f047d323b 100644
--- a/src/libs/utils/parameteraction.h
+++ b/src/libs/utils/parameteraction.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QAction>
 
-namespace Core {
 namespace Utils {
 
 /* ParameterAction: Intended for actions that act on a 'current',
@@ -80,6 +79,5 @@ private:
 };
 
 }
-}
 
 #endif // PARAMETERACTION_H
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index c0503c402b..c550ecbc39 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -44,14 +44,13 @@
 #include <QtGui/QToolButton>
 #include <QtGui/QPushButton>
 
-/*static*/ const char * const Core::Utils::PathChooser::browseButtonLabel =
+/*static*/ const char * const Utils::PathChooser::browseButtonLabel =
 #ifdef Q_WS_MAC
-                   QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Choose...");
+                   QT_TRANSLATE_NOOP("Utils::PathChooser", "Choose...");
 #else
-                   QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Browse...");
+                   QT_TRANSLATE_NOOP("Utils::PathChooser", "Browse...");
 #endif
 
-namespace Core {
 namespace Utils {
 
 // ------------------ PathValidatingLineEdit
@@ -324,4 +323,3 @@ QString PathChooser::makeDialogTitle(const QString &title)
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index 88b9215115..ee3e6eaf40 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -35,7 +35,6 @@
 #include <QtGui/QWidget>
 #include <QtGui/QAbstractButton>
 
-namespace Core {
 namespace Utils {
 
 struct PathChooserPrivate;
@@ -117,6 +116,6 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
+
 
 #endif // PATHCHOOSER_H
diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp
index ef315f9bf5..c0f498b8b2 100644
--- a/src/libs/utils/pathlisteditor.cpp
+++ b/src/libs/utils/pathlisteditor.cpp
@@ -46,7 +46,6 @@
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 
-namespace Core {
 namespace Utils {
 
 // ------------ PathListPlainTextEdit:
@@ -310,4 +309,3 @@ void PathListEditor::deletePathAtCursor()
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h
index 1613819e7a..bcab653002 100644
--- a/src/libs/utils/pathlisteditor.h
+++ b/src/libs/utils/pathlisteditor.h
@@ -39,7 +39,6 @@ QT_BEGIN_NAMESPACE
 class QAction;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 struct PathListEditorPrivate;
@@ -105,6 +104,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // PATHLISTEDITOR_H
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index ec26dacd20..da66bb6449 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -35,7 +35,6 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 
-namespace Core {
 namespace Utils {
 
 struct ProjectIntroPagePrivate
@@ -210,4 +209,3 @@ void ProjectIntroPage::hideStatusLabel()
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index ecc3354787..9e127ee646 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QWizardPage>
 
-namespace Core {
 namespace Utils {
 
 struct ProjectIntroPagePrivate;
@@ -101,6 +100,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // PROJECTINTROPAGE_H
diff --git a/src/libs/utils/projectintropage.ui b/src/libs/utils/projectintropage.ui
index 62efa2d9fe..b527a25420 100644
--- a/src/libs/utils/projectintropage.ui
+++ b/src/libs/utils/projectintropage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Core::Utils::ProjectIntroPage</class>
- <widget class="QWizardPage" name="Core::Utils::ProjectIntroPage">
+ <class>Utils::ProjectIntroPage</class>
+ <widget class="QWizardPage" name="Utils::ProjectIntroPage">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -59,7 +59,7 @@
          </widget>
         </item>
         <item row="0" column="1">
-         <widget class="Core::Utils::ProjectNameValidatingLineEdit" name="nameLineEdit"/>
+         <widget class="Utils::ProjectNameValidatingLineEdit" name="nameLineEdit"/>
         </item>
         <item row="1" column="0">
          <widget class="QLabel" name="pathLabel">
@@ -69,7 +69,7 @@
          </widget>
         </item>
         <item row="1" column="1">
-         <widget class="Core::Utils::PathChooser" name="pathChooser" native="true"/>
+         <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
         </item>
        </layout>
       </widget>
@@ -97,13 +97,13 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::PathChooser</class>
+   <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header>pathchooser.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Core::Utils::ProjectNameValidatingLineEdit</class>
+   <class>Utils::ProjectNameValidatingLineEdit</class>
    <extends>QLineEdit</extends>
    <header>projectnamevalidatinglineedit.h</header>
   </customwidget>
diff --git a/src/libs/utils/projectnamevalidatinglineedit.cpp b/src/libs/utils/projectnamevalidatinglineedit.cpp
index 693bc3e248..f4762a5ed9 100644
--- a/src/libs/utils/projectnamevalidatinglineedit.cpp
+++ b/src/libs/utils/projectnamevalidatinglineedit.cpp
@@ -30,7 +30,6 @@
 #include "projectnamevalidatinglineedit.h"
 #include "filenamevalidatinglineedit.h"
 
-namespace Core {
 namespace Utils {
 
 ProjectNameValidatingLineEdit::ProjectNameValidatingLineEdit(QWidget *parent)
@@ -60,4 +59,3 @@ bool ProjectNameValidatingLineEdit::validate(const QString &value, QString *erro
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/projectnamevalidatinglineedit.h b/src/libs/utils/projectnamevalidatinglineedit.h
index 5f1275999d..f8596dfad6 100644
--- a/src/libs/utils/projectnamevalidatinglineedit.h
+++ b/src/libs/utils/projectnamevalidatinglineedit.h
@@ -32,7 +32,6 @@
 
 #include "basevalidatinglineedit.h"
 
-namespace Core {
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
@@ -50,6 +49,5 @@ protected:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // PROJECTNAMEVALIDATINGLINEEDIT_H
diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp
index 0f32e61bc5..9ba39b0305 100644
--- a/src/libs/utils/qtcolorbutton.cpp
+++ b/src/libs/utils/qtcolorbutton.cpp
@@ -35,7 +35,6 @@
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QPainter>
 
-namespace Core {
 namespace Utils {
 
 class QtColorButtonPrivate
@@ -283,6 +282,5 @@ void QtColorButton::dropEvent(QDropEvent *event)
 #endif
 
 } // namespace Utils
-} // namespace Core
 
 #include "moc_qtcolorbutton.cpp"
diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h
index 67b0148b3f..f7c35c8761 100644
--- a/src/libs/utils/qtcolorbutton.h
+++ b/src/libs/utils/qtcolorbutton.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QToolButton>
 
-namespace Core {
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT QtColorButton : public QToolButton
@@ -76,6 +75,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // QTCOLORBUTTON_H
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index 7b00845a36..1d0015a5bf 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -33,27 +33,26 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 
-using namespace Core;
-using namespace Core::Utils;
+using namespace Utils;
 
-QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
-    Core::Utils::reloadPrompt(const QString &fileName, bool modified, QWidget *parent)
+QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer
+    Utils::reloadPrompt(const QString &fileName, bool modified, QWidget *parent)
 {
 
-    const QString title = QCoreApplication::translate("Core::Utils::reloadPrompt", "File Changed");
+    const QString title = QCoreApplication::translate("Utils::reloadPrompt", "File Changed");
     QString msg;
 
     if (modified)
-        msg = QCoreApplication::translate("Core::Utils::reloadPrompt",
+        msg = QCoreApplication::translate("Utils::reloadPrompt",
                                           "The unsaved file %1 has been changed outside Qt Creator. Do you want to reload it and discard your changes?").arg(QDir::toNativeSeparators(fileName));
     else
-        msg = QCoreApplication::translate("Core::Utils::reloadPrompt",
+        msg = QCoreApplication::translate("Utils::reloadPrompt",
                                           "The file %1 has changed outside Qt Creator. Do you want to reload it?").arg(QDir::toNativeSeparators(fileName));
     return reloadPrompt(title, msg, parent);
 }
 
-QTCREATOR_UTILS_EXPORT Core::Utils::ReloadPromptAnswer
-    Core::Utils::reloadPrompt(const QString &title, const QString &prompt, QWidget *parent)
+QTCREATOR_UTILS_EXPORT Utils::ReloadPromptAnswer
+    Utils::reloadPrompt(const QString &title, const QString &prompt, QWidget *parent)
 {
     switch (QMessageBox::question(parent, title, prompt,
                                   QMessageBox::Yes|QMessageBox::YesToAll|QMessageBox::No|QMessageBox::NoToAll,
diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h
index a35b55d8f7..04ae1bbb4c 100644
--- a/src/libs/utils/reloadpromptutils.h
+++ b/src/libs/utils/reloadpromptutils.h
@@ -37,7 +37,6 @@ class QString;
 class QWidget;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 enum ReloadPromptAnswer { ReloadCurrent, ReloadAll, ReloadSkipCurrent, ReloadNone };
@@ -46,6 +45,5 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &fileName,
 QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, QWidget *parent);
 
 } // namespace Utils
-} // namespace Core
 
 #endif // RELOADPROMPTUTILS_H
diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp
index bf406f0b23..e3833bebb6 100644
--- a/src/libs/utils/savedaction.cpp
+++ b/src/libs/utils/savedaction.cpp
@@ -44,7 +44,7 @@
 #include <QtGui/QSpinBox>
 
 
-using namespace Core::Utils;
+using namespace Utils;
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -54,7 +54,7 @@ using namespace Core::Utils;
 //////////////////////////////////////////////////////////////////////////
 
 /*!
-    \class Core::Utils::SavedAction
+    \class Utils::SavedAction
     
     \brief The SavedAction class is a helper class for actions with persistent
     state.
diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h
index 2e0857a721..4306a800bd 100644
--- a/src/libs/utils/savedaction.h
+++ b/src/libs/utils/savedaction.h
@@ -42,8 +42,6 @@ QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
-
-namespace Core {
 namespace Utils {
 
 enum ApplyMode { ImmediateApply, DeferedApply };
@@ -122,6 +120,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // SAVED_ACTION_H
diff --git a/src/libs/utils/settingsutils.cpp b/src/libs/utils/settingsutils.cpp
index 024c1c09fa..14727b3645 100644
--- a/src/libs/utils/settingsutils.cpp
+++ b/src/libs/utils/settingsutils.cpp
@@ -31,7 +31,6 @@
 
 #include <QtCore/QString>
 
-namespace Core {
 namespace Utils {
 
 QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category)
@@ -48,4 +47,3 @@ QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category)
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h
index bd7d835358..0e1aac3f45 100644
--- a/src/libs/utils/settingsutils.h
+++ b/src/libs/utils/settingsutils.h
@@ -32,7 +32,6 @@
 
 #include "utils_global.h"
 
-namespace Core {
 namespace Utils {
 
 // Create a usable settings key from a category,
@@ -40,6 +39,5 @@ namespace Utils {
 QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category);
 
 } // namespace Utils
-} // namespace Core
 
 #endif // SETTINGSTUTILS_H
diff --git a/src/libs/utils/styledbar.cpp b/src/libs/utils/styledbar.cpp
index 60eb639216..12b0b82826 100644
--- a/src/libs/utils/styledbar.cpp
+++ b/src/libs/utils/styledbar.cpp
@@ -37,7 +37,7 @@
 #include <QtGui/QStyle>
 #include <QtGui/QStyleOption>
 
-using namespace Core::Utils;
+using namespace Utils;
 
 StyledBar::StyledBar(QWidget *parent)
     : QWidget(parent)
diff --git a/src/libs/utils/styledbar.h b/src/libs/utils/styledbar.h
index 9171a3dbae..b79aa92be0 100644
--- a/src/libs/utils/styledbar.h
+++ b/src/libs/utils/styledbar.h
@@ -34,7 +34,6 @@
 
 #include <QtGui/QWidget>
 
-namespace Core {
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT StyledBar : public QWidget
@@ -56,6 +55,5 @@ protected:
 };
 
 } // Utils
-} // Core
 
 #endif // STYLEDBAR_H
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 0544bd2569..3087894c8d 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -52,6 +52,8 @@ static int range(float x, int min, int max)
 }
 */
 
+namespace Utils {
+
 QColor StyleHelper::mergedColors(const QColor &colorA, const QColor &colorB, int factor)
 {
     const int maxFactor = 100;
@@ -231,3 +233,5 @@ void StyleHelper::menuGradient(QPainter *painter, const QRect &spanRect, const Q
         QPixmapCache::insert(key, pixmap);
     }
 }
+
+} // namespace Utils
diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h
index b2be66f748..a314f2e4ae 100644
--- a/src/libs/utils/stylehelper.h
+++ b/src/libs/utils/stylehelper.h
@@ -42,6 +42,7 @@ QT_END_NAMESPACE
 
 // Helper class holding all custom color values
 
+namespace Utils {
 class QTCREATOR_UTILS_EXPORT StyleHelper
 {
 public:
@@ -74,4 +75,5 @@ private:
     static QColor m_baseColor;
 };
 
+} // namespace Utils
 #endif // STYLEHELPER_H
diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp
index 1bd1abc110..3433329d52 100644
--- a/src/libs/utils/submiteditorwidget.cpp
+++ b/src/libs/utils/submiteditorwidget.cpp
@@ -44,7 +44,6 @@
 enum { debug = 0 };
 enum { defaultLineWidth = 72 };
 
-namespace Core {
 namespace Utils {
 
 // QActionPushButton: A push button tied to an action
@@ -505,6 +504,5 @@ void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos)
 }
 
 } // namespace Utils
-} // namespace Core
 
 #include "submiteditorwidget.moc"
diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h
index 2559635b79..6ec7da52c0 100644
--- a/src/libs/utils/submiteditorwidget.h
+++ b/src/libs/utils/submiteditorwidget.h
@@ -44,7 +44,6 @@ class QModelIndex;
 class QLineEdit;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 class SubmitFieldWidget;
@@ -144,6 +143,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // SUBMITEDITORWIDGET_H
diff --git a/src/libs/utils/submiteditorwidget.ui b/src/libs/utils/submiteditorwidget.ui
index 7015a2c75b..957210e40a 100644
--- a/src/libs/utils/submiteditorwidget.ui
+++ b/src/libs/utils/submiteditorwidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Core::Utils::SubmitEditorWidget</class>
- <widget class="QWidget" name="Core::Utils::SubmitEditorWidget">
+ <class>Utils::SubmitEditorWidget</class>
+ <widget class="QWidget" name="Utils::SubmitEditorWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/libs/utils/submitfieldwidget.cpp b/src/libs/utils/submitfieldwidget.cpp
index d371595218..f1c271bc03 100644
--- a/src/libs/utils/submitfieldwidget.cpp
+++ b/src/libs/utils/submitfieldwidget.cpp
@@ -22,8 +22,7 @@ static void inline setComboBlocked(QComboBox *cb, int index)
     cb->blockSignals(blocked);
 }
 
-namespace Core {
-    namespace Utils {
+namespace Utils {
 
 // Field/Row entry
 struct FieldEntry {
@@ -341,4 +340,3 @@ void SubmitFieldWidget::slotBrowseButtonClicked()
 }
 
 }
-}
diff --git a/src/libs/utils/submitfieldwidget.h b/src/libs/utils/submitfieldwidget.h
index 08e834bfb4..870180790b 100644
--- a/src/libs/utils/submitfieldwidget.h
+++ b/src/libs/utils/submitfieldwidget.h
@@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE
 class QCompleter;
 QT_END_NAMESPACE
 
-namespace Core {
-    namespace Utils {
+namespace Utils {
 
 struct SubmitFieldWidgetPrivate;
 
@@ -66,6 +65,5 @@ private:
 };
 
 }
-}
 
 #endif // SUBMITFIELDWIDGET_H
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index 07fd6df975..9486caa5a0 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -44,7 +44,6 @@ enum { debug = 0 };
 
 enum { defaultMaxHangTimerCount = 10 };
 
-namespace Core {
 namespace Utils {
 
 // ----------- SynchronousProcessResponse
@@ -492,6 +491,4 @@ QChar SynchronousProcess::pathSeparator()
     return QLatin1Char(':');
 }
 
-
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h
index 31562a598a..86f45060cd 100644
--- a/src/libs/utils/synchronousprocess.h
+++ b/src/libs/utils/synchronousprocess.h
@@ -42,7 +42,6 @@ class QDebug;
 class QByteArray;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 struct SynchronousProcessPrivate;
@@ -146,6 +145,5 @@ private:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif
diff --git a/src/libs/utils/treewidgetcolumnstretcher.cpp b/src/libs/utils/treewidgetcolumnstretcher.cpp
index d33c04ac4e..a8e49d3e1d 100644
--- a/src/libs/utils/treewidgetcolumnstretcher.cpp
+++ b/src/libs/utils/treewidgetcolumnstretcher.cpp
@@ -2,7 +2,7 @@
 #include <QtGui/QTreeWidget>
 #include <QtGui/QHideEvent>
 #include <QtGui/QHeaderView>
-using namespace Core::Utils;
+using namespace Utils;
 
 TreeWidgetColumnStretcher::TreeWidgetColumnStretcher(QTreeWidget *treeWidget, int columnToStretch)
         : QObject(treeWidget->header()), m_columnToStretch(columnToStretch)
diff --git a/src/libs/utils/treewidgetcolumnstretcher.h b/src/libs/utils/treewidgetcolumnstretcher.h
index b40368a46c..f8f1668ff6 100644
--- a/src/libs/utils/treewidgetcolumnstretcher.h
+++ b/src/libs/utils/treewidgetcolumnstretcher.h
@@ -37,7 +37,6 @@ QT_BEGIN_NAMESPACE
 class QTreeWidget;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 /*
@@ -58,6 +57,5 @@ public:
 };
 
 } // namespace Utils
-} // namespace Core
 
 #endif // TREEWIDGETCOLUMNSTRETCHER_H
diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp
index 7cac84ce59..f59e56835e 100644
--- a/src/libs/utils/uncommentselection.cpp
+++ b/src/libs/utils/uncommentselection.cpp
@@ -33,7 +33,7 @@
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextDocument>
 
-void Core::Utils::unCommentSelection(QPlainTextEdit *edit)
+void Utils::unCommentSelection(QPlainTextEdit *edit)
 {
     QTextCursor cursor = edit->textCursor();
     QTextDocument *doc = cursor.document();
diff --git a/src/libs/utils/uncommentselection.h b/src/libs/utils/uncommentselection.h
index aff5a9eedf..4d7bb7a1cd 100644
--- a/src/libs/utils/uncommentselection.h
+++ b/src/libs/utils/uncommentselection.h
@@ -36,12 +36,10 @@ QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 QTCREATOR_UTILS_EXPORT void unCommentSelection(QPlainTextEdit *edit);
 
 } // end of namespace Utils
-} // end of namespace Core
 
 #endif // UNCOMMENTSELECTION_H
diff --git a/src/libs/utils/welcomemodetreewidget.cpp b/src/libs/utils/welcomemodetreewidget.cpp
index 3002e69202..1fd3b52a43 100644
--- a/src/libs/utils/welcomemodetreewidget.cpp
+++ b/src/libs/utils/welcomemodetreewidget.cpp
@@ -33,8 +33,7 @@
 #include <QtGui/QBoxLayout>
 #include <QtGui/QHeaderView>
 
-namespace Core {
-    namespace Utils {
+namespace Utils {
 
 void WelcomeModeLabel::setStyledText(const QString &text)
 {
@@ -115,4 +114,3 @@ void WelcomeModeTreeWidget::slotItemClicked(QTreeWidgetItem *item)
 }
 
 }
-}
diff --git a/src/libs/utils/welcomemodetreewidget.h b/src/libs/utils/welcomemodetreewidget.h
index 5b35ee651c..61ae5b6de8 100644
--- a/src/libs/utils/welcomemodetreewidget.h
+++ b/src/libs/utils/welcomemodetreewidget.h
@@ -35,8 +35,7 @@
 #include <QtGui/QTreeWidget>
 #include <QtGui/QLabel>
 
-namespace Core {
-  namespace Utils {
+namespace Utils {
 
 struct WelcomeModeTreeWidgetPrivate;
 struct WelcomeModeLabelPrivate;
@@ -77,6 +76,5 @@ private:
 };
 
 }
-}
 
 #endif // WELCOMEMODETREEWIDGET_H
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 2048f810d4..7815d553fb 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -32,7 +32,6 @@
 
 #include <QtCore/QString>
 
-namespace Core {
 namespace Utils {
 
 QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error)
@@ -53,4 +52,3 @@ QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error)
 }
 
 } // namespace Utils
-} // namespace Core
diff --git a/src/libs/utils/winutils.h b/src/libs/utils/winutils.h
index 770c7afda9..19b8986ce1 100644
--- a/src/libs/utils/winutils.h
+++ b/src/libs/utils/winutils.h
@@ -36,7 +36,6 @@ QT_BEGIN_NAMESPACE
 class QString;
 QT_END_NAMESPACE
 
-namespace Core {
 namespace Utils {
 
 // Helper to format a Windows error message, taking the
@@ -44,5 +43,4 @@ namespace Utils {
 QTCREATOR_UTILS_EXPORT QString winErrorMessage(unsigned long error);
 
 } // namespace Utils
-} // namespace Core
 #endif // WINUTILS_H