From a96a62c941da5a771280e0a869626349fd9bd521 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 30 Jan 2015 14:51:44 +0100
Subject: [PATCH] DiffEditor: Make UnifiedDiffEditorWidget internal

Change-Id: I4c65190be212ed43cd0150d6f33a944e8accd73d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/diffeditor/diffeditor.h                | 4 ++--
 src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 4 ++--
 src/plugins/diffeditor/unifieddiffeditorwidget.h   | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index e9582efcd68..e2a1b521735 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -52,10 +52,10 @@ namespace Internal {
 class DescriptionEditorWidget;
 class DiffEditorDocument;
 class DiffEditorGuiController;
+class UnifiedDiffEditorWidget;
 } // namespace Internal
 
 class SideBySideDiffEditorWidget;
-class UnifiedDiffEditorWidget;
 
 class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
 {
@@ -102,7 +102,7 @@ private:
     Internal::DescriptionEditorWidget *m_descriptionWidget;
     QStackedWidget *m_stackedWidget;
     SideBySideDiffEditorWidget *m_sideBySideEditor;
-    UnifiedDiffEditorWidget *m_unifiedEditor;
+    Internal::UnifiedDiffEditorWidget *m_unifiedEditor;
     QWidget *m_currentEditor;
     Internal::DiffEditorGuiController *m_guiController;
     QToolBar *m_toolBar;
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
index 89a57447194..eb2ab3cdad9 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
@@ -69,8 +69,7 @@ using namespace Core;
 using namespace TextEditor;
 
 namespace DiffEditor {
-
-using namespace Internal;
+namespace Internal {
 
 UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent)
     : SelectableTextEditorWidget("DiffEditor.UnifiedDiffEditor", parent)
@@ -809,4 +808,5 @@ void UnifiedDiffEditorWidget::setCurrentDiffFileIndex(int diffFileIndex)
     m_ignoreCurrentIndexChange = oldIgnore;
 }
 
+} // namespace Internal
 } // namespace DiffEditor
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.h b/src/plugins/diffeditor/unifieddiffeditorwidget.h
index 13fe0ede933..6e50f354192 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.h
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.h
@@ -31,7 +31,6 @@
 #ifndef UNIFIEDDIFFEDITORWIDGET_H
 #define UNIFIEDDIFFEDITORWIDGET_H
 
-#include "diffeditor_global.h"
 #include "differ.h"
 #include "diffeditorcontroller.h"
 #include "selectabletexteditorwidget.h"
@@ -53,8 +52,9 @@ namespace Internal { class DiffEditorGuiController; }
 class ChunkData;
 class FileData;
 
-class DIFFEDITOR_EXPORT UnifiedDiffEditorWidget
-        : public SelectableTextEditorWidget
+namespace Internal {
+
+class UnifiedDiffEditorWidget : public SelectableTextEditorWidget
 {
     Q_OBJECT
 public:
@@ -143,6 +143,7 @@ private:
     QByteArray m_state;
 };
 
+} // namespace Internal
 } // namespace DiffEditor
 
 #endif // UNIFIEDDIFFEDITORWIDGET_H