9 files changed, 24 insertions, 17 deletions
diff --git a/src/plugins/resourceeditor/resourceeditorconstants.h b/src/plugins/resourceeditor/resourceeditorconstants.h
index 013f3322ca..739afefee7 100644
--- a/src/plugins/resourceeditor/resourceeditorconstants.h
+++ b/src/plugins/resourceeditor/resourceeditorconstants.h
@@ -30,15 +30,18 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEEDITOR_CONSTANTS_H
 #define RESOURCEEDITOR_CONSTANTS_H
 
 namespace ResourceEditor {
 namespace Constants {
+
 const char * const C_RESOURCEEDITOR = "Resource Editor";
 const char * const C_RESOURCEWINDOW = "Resourcewindow";
 const char * const C_RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
-}
-}
+
+} // namespace Constants
+} // namespace ResourceEditor
 
 #endif // RESOURCEEDITOR_CONSTANTS_H
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp
index f2ac8c6e18..a849bb0d20 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.cpp
+++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourceeditorfactory.h"
 #include "resourceeditorw.h"
 #include "resourceeditorplugin.h"
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h
index 14725cc87c..e9b50af098 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.h
+++ b/src/plugins/resourceeditor/resourceeditorfactory.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RRESOURCEEDITORFACTORY_H
 #define RRESOURCEEDITORFACTORY_H
 
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index f799a7cd73..43ad4ddd90 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourceeditorplugin.h"
 #include "resourceeditorw.h"
 #include "resourceeditorconstants.h"
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h
index 2de7431b43..94c7f6054c 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.h
+++ b/src/plugins/resourceeditor/resourceeditorplugin.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEEDITORPLUGIN_H
 #define RESOURCEEDITORPLUGIN_H
 
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 77afc7b901..7eefdcb772 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -30,12 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourceeditorw.h"
 #include "resourceeditorplugin.h"
 #include "resourceeditorconstants.h"
 
 #include <qrceditor.h>
 
+#include <coreplugin/icore.h>
+#include <utils/reloadpromptutils.h>
+
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
@@ -43,9 +47,6 @@
 #include <QtGui/QMainWindow>
 #include <QtGui/QHBoxLayout>
 
-#include <coreplugin/icore.h>
-#include <utils/reloadpromptutils.h>
-
 namespace ResourceEditor {
 namespace Internal {
 
@@ -267,5 +268,5 @@ void ResourceEditorW::onRedo()
         m_resourceEditor.data()->onRedo();
 }
 
-}
-}
+} // namespace Internal
+} // namespace ResourceEditor
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 603fe54def..ed21cde8a5 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEDITORW_H
 #define RESOURCEDITORW_H
 
@@ -140,4 +141,4 @@ public:
 } // namespace Internal
 } // namespace ResourceEditor
 
-#endif //RESOURCEDITORW_H
+#endif // RESOURCEDITORW_H
diff --git a/src/plugins/resourceeditor/resourcewizard.cpp b/src/plugins/resourceeditor/resourcewizard.cpp
index c492bdb497..838e1c079b 100644
--- a/src/plugins/resourceeditor/resourcewizard.cpp
+++ b/src/plugins/resourceeditor/resourcewizard.cpp
@@ -30,12 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "resourcewizard.h"
 #include "resourceeditorw.h"
 #include "resourceeditorconstants.h"
 
-namespace ResourceEditor {
-namespace Internal {
+using namespace ResourceEditor;
+using namespace ResourceEditor::Internal;
 
 ResourceWizard::ResourceWizard(const BaseFileWizardParameters &parameters, Core::ICore *core, QObject *parent) :
     Core::StandardFileWizard(parameters, core, parent)
@@ -43,9 +44,9 @@ ResourceWizard::ResourceWizard(const BaseFileWizardParameters &parameters, Core:
 }
 
 Core::GeneratedFiles
-        ResourceWizard::generateFilesFromPath(const QString &path,
-                                              const QString &name,
-                                              QString * /*errorMessage*/) const
+ResourceWizard::generateFilesFromPath(const QString &path,
+                                      const QString &name,
+                                      QString * /*errorMessage*/) const
 {
     const QString suffix = preferredSuffix(QLatin1String(Constants::C_RESOURCE_MIMETYPE));
     const QString fileName = Core::BaseFileWizard::buildFileName(path, name, suffix);
@@ -54,6 +55,3 @@ Core::GeneratedFiles
     file.setEditorKind(QLatin1String(Constants::C_RESOURCEEDITOR));
     return Core::GeneratedFiles() << file;
 }
-
-}
-}
diff --git a/src/plugins/resourceeditor/resourcewizard.h b/src/plugins/resourceeditor/resourcewizard.h
index 4a4e3593d9..5681f64051 100644
--- a/src/plugins/resourceeditor/resourcewizard.h
+++ b/src/plugins/resourceeditor/resourcewizard.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef RESOURCEWIZARD_H
 #define RESOURCEWIZARD_H
 
@@ -43,7 +44,6 @@ class ResourceWizard : public Core::StandardFileWizard
     Q_OBJECT
 
 public:
-
     typedef Core::BaseFileWizardParameters BaseFileWizardParameters;
     explicit ResourceWizard(const BaseFileWizardParameters &parameters, Core::ICore *core, QObject *parent);