Rename namespace DIFFEditor to DiffEditor.

Change-Id: Ia87098de61f38530806e1cf87b69d0bfc66e250c
Reviewed-by: hjk <hjk121@nokiamail.com>

src/plugins/diffeditor/diffeditorconstants.h

@@ -30,7 +30,7 @@
 #ifndef DIFFEDITORCONSTANTS_H
 #define DIFFEDITORCONSTANTS_H
 
-namespace DIFFEditor {
+namespace DiffEditor {
 namespace Constants {
 
 const char DIFF_EDITOR_ID[] = "Diff Editor";
@@ -39,6 +39,6 @@ const char DIFF_EDITOR_MIMETYPE[] = "text/x-patch";
 const char G_TOOLS_DIFF[] = "QtCreator.Group.Tools.Options";
 
 } // namespace Constants
-} // namespace DIFFEditor
+} // namespace DiffEditor
 
 #endif // DIFFEDITORCONSTANTS_H

src/plugins/diffeditor/diffeditorplugin.cpp

@@ -46,8 +46,8 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 
-using namespace DIFFEditor;
+namespace DiffEditor {
-using namespace DIFFEditor::Internal;
+namespace Internal {
 
 ///////////////////////////////// DiffEditor //////////////////////////////////
 
@@ -349,5 +349,7 @@ QString DiffEditorPlugin::getFileContents(const QString &fileName, QTextCodec *c
     return QString();
 }
 
+} // namespace Internal
+} // namespace DiffEditor
 
-Q_EXPORT_PLUGIN(DiffEditorPlugin)
+Q_EXPORT_PLUGIN(DiffEditor::Internal::DiffEditorPlugin)

src/plugins/diffeditor/diffeditorplugin.h

@@ -42,7 +42,7 @@
 #include <QAction>
 #include <QToolBar>
 
-namespace DIFFEditor {
+namespace DiffEditor {
 class DiffEditorWidget;
 
 namespace Internal {
@@ -153,6 +153,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace DIFFEditor
+} // namespace DiffEditor
 
 #endif // DIFFEDITORPLUGIN_H

src/plugins/diffeditor/diffeditorwidget.cpp

@@ -49,7 +49,7 @@
 
 using namespace TextEditor;
 
-namespace DIFFEditor {
+namespace DiffEditor {
 
 //////////////////////
 
@@ -1022,6 +1022,6 @@ void DiffEditorWidget::rightSliderChanged()
 
 
 
-} // namespace DIFFEditor
+} // namespace DiffEditor
 
 #include "diffeditorwidget.moc"

src/plugins/diffeditor/diffeditorwidget.h

@@ -49,7 +49,7 @@ QT_END_NAMESPACE
 
 
 
-namespace DIFFEditor {
+namespace DiffEditor {
 
 class DiffViewEditorWidget;
 
@@ -154,6 +154,6 @@ private:
     int m_rightSafePosHack;
 };
 
-} // namespace DIFFEditor
+} // namespace DiffEditor
 
 #endif // DIFFEDITORWIDGET_H

src/plugins/diffeditor/differ.cpp

@@ -33,7 +33,7 @@
 #include <QStringList>
 #include <QMap>
 
-namespace DIFFEditor {
+namespace DiffEditor {
 
 Diff::Diff() :
     command(Diff::Equal)
@@ -496,4 +496,4 @@ int Differ::commonSuffix(const QString &text1, const QString &text2) const
     return i;
 }
 
-} // namespace DIFFEditor
+} // namespace DiffEditor

src/plugins/diffeditor/differ.h

@@ -38,7 +38,7 @@ template <class K, class T>
 class QMap;
 QT_END_NAMESPACE
 
-namespace DIFFEditor {
+namespace DiffEditor {
 
 class DIFFEDITOR_EXPORT Diff
 {
@@ -93,6 +93,6 @@ private:
     DiffMode m_currentDiffMode;
 };
 
-} // namespace DIFFEditor
+} // namespace DiffEditor
 
 #endif // DIFF_H