From 1cc01fa18d48667de256e1d208f58d8b9c6be2b2 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 30 Jan 2015 14:55:56 +0100
Subject: [PATCH] DiffEditor: Make SideBySideDiffEditorWidget internal

Change-Id: I794282d23dc13525fbc9ad327cfa8dce2c28fbca
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/diffeditor/diffeditor.h                 |  5 ++---
 .../diffeditor/sidebysidediffeditorwidget.cpp       |  4 ++--
 src/plugins/diffeditor/sidebysidediffeditorwidget.h | 13 ++++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index e2a1b521735..6df2974bc21 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -53,9 +53,8 @@ class DescriptionEditorWidget;
 class DiffEditorDocument;
 class DiffEditorGuiController;
 class UnifiedDiffEditorWidget;
-} // namespace Internal
-
 class SideBySideDiffEditorWidget;
+} // namespace Internal
 
 class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
 {
@@ -101,7 +100,7 @@ private:
     QSharedPointer<Internal::DiffEditorDocument> m_document;
     Internal::DescriptionEditorWidget *m_descriptionWidget;
     QStackedWidget *m_stackedWidget;
-    SideBySideDiffEditorWidget *m_sideBySideEditor;
+    Internal::SideBySideDiffEditorWidget *m_sideBySideEditor;
     Internal::UnifiedDiffEditorWidget *m_unifiedEditor;
     QWidget *m_currentEditor;
     Internal::DiffEditorGuiController *m_guiController;
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 74804b348eb..c90982db6e3 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -71,8 +71,7 @@ using namespace TextEditor;
 using namespace Utils;
 
 namespace DiffEditor {
-
-using namespace Internal;
+namespace Internal {
 
 ////////////////////////
 /*
@@ -1582,6 +1581,7 @@ void SideBySideDiffEditorWidget::synchronizeFoldings(SideDiffEditorWidget *sourc
 }
 #endif
 
+} // namespace Internal
 } // namespace DiffEditor
 
 #include "sidebysidediffeditorwidget.moc"
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
index 6d5493f985e..bbf47ed8354 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h
@@ -31,7 +31,6 @@
 #ifndef SIDEBYSIDEDIFFEDITORWIDGET_H
 #define SIDEBYSIDEDIFFEDITORWIDGET_H
 
-#include "diffeditor_global.h"
 #include "differ.h"
 #include "diffeditorcontroller.h"
 #include <QWidget>
@@ -47,12 +46,15 @@ QT_END_NAMESPACE
 
 namespace DiffEditor {
 
-namespace Internal { class DiffEditorGuiController; }
-class SideDiffEditorWidget;
 class ChunkData;
 class FileData;
 
-class DIFFEDITOR_EXPORT SideBySideDiffEditorWidget : public QWidget
+namespace Internal {
+
+class SideDiffEditorWidget;
+class DiffEditorGuiController;
+
+class SideBySideDiffEditorWidget : public QWidget
 {
     Q_OBJECT
 public:
@@ -96,7 +98,7 @@ private:
                             int lineNumber, int columnNumber);
     void patch(bool revert);
 
-    Internal::DiffEditorGuiController *m_guiController;
+    DiffEditorGuiController *m_guiController;
     DiffEditorController *m_controller;
     SideDiffEditorWidget *m_leftEditor;
     SideDiffEditorWidget *m_rightEditor;
@@ -118,6 +120,7 @@ private:
     QTextCharFormat m_rightCharFormat;
 };
 
+} // namespace Internal
 } // namespace DiffEditor
 
 #endif // SIDEBYSIDEDIFFEDITORWIDGET_H