Rename DiffEditorWidget -> SideBySideDiffEditorWidget

It's the preparation for the new UnifiedDiffEditorWidget

Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

src/plugins/diffeditor/diffeditor.cpp

@@ -28,9 +28,9 @@
 ****************************************************************************/
 
 #include "diffeditor.h"
-#include "diffeditordocument.h"
-#include "diffeditorwidget.h"
 #include "diffeditorconstants.h"
+#include "diffeditordocument.h"
+#include "sidebysidediffeditorwidget.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
@@ -48,7 +48,7 @@ namespace DiffEditor {
 
 ///////////////////////////////// DiffEditor //////////////////////////////////
 
-DiffEditor::DiffEditor(DiffEditorWidget *editorWidget)
+DiffEditor::DiffEditor(SideBySideDiffEditorWidget *editorWidget)
     : IEditor(0)
     , m_toolWidget(0)
     , m_document(new Internal::DiffEditorDocument(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE), this))

src/plugins/diffeditor/diffeditor.h

@@ -42,7 +42,7 @@ class QComboBox;
 QT_END_NAMESPACE
 
 namespace DiffEditor {
-class DiffEditorWidget;
+class SideBySideDiffEditorWidget;
 
 namespace Internal {
 class DiffEditorDocument;
@@ -52,7 +52,7 @@ class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
 {
     Q_OBJECT
 public:
-    explicit DiffEditor(DiffEditorWidget *editorWidget);
+    explicit DiffEditor(SideBySideDiffEditorWidget *editorWidget);
     virtual ~DiffEditor();
 
 public:
@@ -81,7 +81,7 @@ private:
     void updateEntryToolTip();
 
     Internal::DiffEditorDocument *m_document;
-    DiffEditorWidget *m_editorWidget;
+    SideBySideDiffEditorWidget *m_editorWidget;
     DiffEditorController *m_diffEditorController;
     QComboBox *m_entriesComboBox;
 };

src/plugins/diffeditor/diffeditor.pro

@@ -8,19 +8,19 @@ HEADERS += diffeditor_global.h \
         diffeditordocument.h \
         diffeditorfactory.h \
         diffeditorplugin.h \
-        diffeditorwidget.h \
         differ.h \
         diffshoweditor.h \
-        diffshoweditorfactory.h
+        diffshoweditorfactory.h \
+        sidebysidediffeditorwidget.h
 
 SOURCES += diffeditor.cpp \
         diffeditorcontroller.cpp \
         diffeditordocument.cpp \
         diffeditorfactory.cpp \
         diffeditorplugin.cpp \
-        diffeditorwidget.cpp \
         differ.cpp \
         diffshoweditor.cpp \
-        diffshoweditorfactory.cpp
+        diffshoweditorfactory.cpp \
+        sidebysidediffeditorwidget.cpp
 
 RESOURCES +=

src/plugins/diffeditor/diffeditor.qbs

@@ -23,14 +23,14 @@ QtcPlugin {
         "diffeditorfactory.h",
         "diffeditorplugin.cpp",
         "diffeditorplugin.h",
-        "diffeditorwidget.cpp",
-        "diffeditorwidget.h",
         "differ.cpp",
         "differ.h",
         "diffshoweditor.cpp",
         "diffshoweditor.h",
         "diffshoweditorfactory.cpp",
         "diffshoweditorfactory.h",
+        "sidebysidediffeditorwidget.cpp",
+        "sidebysidediffeditorwidget.h",
     ]
 }
 

src/plugins/diffeditor/diffeditorconstants.h

@@ -30,6 +30,8 @@
 #ifndef DIFFEDITORCONSTANTS_H
 #define DIFFEDITORCONSTANTS_H
 
+#include <QtGlobal>
+
 namespace DiffEditor {
 namespace Constants {
 

src/plugins/diffeditor/diffeditorfactory.cpp

@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-#include "diffeditorfactory.h"
 #include "diffeditor.h"
-#include "diffeditorwidget.h"
 #include "diffeditorconstants.h"
+#include "diffeditorfactory.h"
+#include "sidebysidediffeditorwidget.h"
 
 #include <QCoreApplication>
 
@@ -48,7 +48,7 @@ DiffEditorFactory::DiffEditorFactory(QObject *parent)
 
 Core::IEditor *DiffEditorFactory::createEditor()
 {
-    DiffEditorWidget *editorWidget = new DiffEditorWidget();
+    SideBySideDiffEditorWidget *editorWidget = new SideBySideDiffEditorWidget();
     DiffEditorController *editorController = new DiffEditorController(editorWidget);
     editorWidget->setDiffEditorController(editorController);
     DiffEditor *editor = new DiffEditor(editorWidget);

src/plugins/diffeditor/diffeditorplugin.cpp

@@ -31,9 +31,9 @@
 #include "diffeditor.h"
 #include "diffeditorconstants.h"
 #include "diffeditorfactory.h"
-#include "diffeditorwidget.h"
 #include "diffshoweditor.h"
 #include "diffshoweditorfactory.h"
+#include "sidebysidediffeditorwidget.h"
 
 #include <QFileDialog>
 #include <QTextCodec>
@@ -140,8 +140,7 @@ QString DiffEditorPlugin::getFileContents(const QString &fileName, QTextCodec *c
 
 void DiffEditor::Internal::DiffEditorPlugin::testAssemblyRows()
 {
-    DiffEditorWidget widget;
-    widget.testAssemblyRows();
+    SideBySideDiffEditorWidget::testAssemblyRows();
 }
 
 #endif // WITH_TESTS

src/plugins/diffeditor/diffshoweditor.cpp

@@ -29,7 +29,7 @@
 
 #include "diffshoweditor.h"
 #include "diffeditorconstants.h"
-#include "diffeditorwidget.h"
+#include "sidebysidediffeditorwidget.h"
 
 #include <QToolBar>
 #include <QToolButton>
@@ -107,7 +107,7 @@ void DiffShowEditorWidget::setDisplaySettings(const DisplaySettings &ds)
 
 } // namespace Internal
 
-DiffShowEditor::DiffShowEditor(DiffEditorWidget *editorWidget)
+DiffShowEditor::DiffShowEditor(SideBySideDiffEditorWidget *editorWidget)
     : DiffEditor(editorWidget)
 {
     document()->setDisplayName(QCoreApplication::translate("DiffShowEditor",

src/plugins/diffeditor/diffshoweditor.h

@@ -48,7 +48,7 @@ class DIFFEDITOR_EXPORT DiffShowEditor : public DiffEditor
 {
     Q_OBJECT
 public:
-    explicit DiffShowEditor(DiffEditorWidget *editorWidget);
+    explicit DiffShowEditor(SideBySideDiffEditorWidget *editorWidget);
     virtual ~DiffShowEditor();
 
 public:

src/plugins/diffeditor/diffshoweditorfactory.cpp

@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
+#include "diffeditorconstants.h"
 #include "diffshoweditorfactory.h"
 #include "diffshoweditor.h"
-#include "diffeditorwidget.h"
-#include "diffeditorconstants.h"
+#include "sidebysidediffeditorwidget.h"
 
 #include <QCoreApplication>
 
@@ -48,7 +48,7 @@ DiffShowEditorFactory::DiffShowEditorFactory(QObject *parent)
 
 Core::IEditor *DiffShowEditorFactory::createEditor()
 {
-    DiffEditorWidget *editorWidget = new DiffEditorWidget();
+    SideBySideDiffEditorWidget *editorWidget = new SideBySideDiffEditorWidget();
     DiffEditorController *editorController = new DiffEditorController(editorWidget);
     editorWidget->setDiffEditorController(editorController);
     DiffShowEditor *editor = new DiffShowEditor(editorWidget);

src/plugins/diffeditor/diffeditorwidget.h → src/plugins/diffeditor/sidebysidediffeditorwidget.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DIFFEDITORWIDGET_H
-#define DIFFEDITORWIDGET_H
+#ifndef SIDEBYSIDEDIFFEDITORWIDGET_H
+#define SIDEBYSIDEDIFFEDITORWIDGET_H
 
 #include "diffeditor_global.h"
 #include "differ.h"
@@ -52,17 +52,17 @@ QT_END_NAMESPACE
 
 namespace DiffEditor {
 
-class DiffViewEditorWidget;
+class SideDiffEditorWidget;
 class TextLineData;
 class ChunkData;
 class FileData;
 
-class DIFFEDITOR_EXPORT DiffEditorWidget : public QWidget
+class DIFFEDITOR_EXPORT SideBySideDiffEditorWidget : public QWidget
 {
     Q_OBJECT
 public:
-    DiffEditorWidget(QWidget *parent = 0);
-    ~DiffEditorWidget();
+    SideBySideDiffEditorWidget(QWidget *parent = 0);
+    ~SideBySideDiffEditorWidget();
 
     void setDiffEditorController(DiffEditorController *controller);
     DiffEditorController *diffEditorController() const;
@@ -70,7 +70,7 @@ public:
     QTextCodec *codec() const;
 
 #ifdef WITH_TESTS
-    void testAssemblyRows();
+    static void testAssemblyRows();
 #endif // WITH_TESTS
 
 private slots:
@@ -111,12 +111,12 @@ private:
     void colorDiff(const QList<FileData> &fileDataList);
     FileData calculateContextData(const ChunkData &originalData) const;
     void showDiff();
-    void synchronizeFoldings(DiffViewEditorWidget *source, DiffViewEditorWidget *destination);
+    void synchronizeFoldings(SideDiffEditorWidget *source, SideDiffEditorWidget *destination);
     void jumpToOriginalFile(const QString &fileName, int lineNumber, int columnNumber);
 
     DiffEditorController *m_controller;
-    DiffViewEditorWidget *m_leftEditor;
-    DiffViewEditorWidget *m_rightEditor;
+    SideDiffEditorWidget *m_leftEditor;
+    SideDiffEditorWidget *m_rightEditor;
     QSplitter *m_splitter;
 
     QList<DiffList> m_diffList; // list of original outputs from differ
@@ -136,4 +136,4 @@ private:
 
 } // namespace DiffEditor
 
-#endif // DIFFEDITORWIDGET_H
+#endif // SIDEBYSIDEDIFFEDITORWIDGET_H

src/plugins/git/gitclient.cpp

@@ -60,7 +60,6 @@
 #include <vcsbase/vcsbaseplugin.h>
 
 #include <diffeditor/diffeditor.h>
-#include <diffeditor/diffeditorwidget.h>
 #include <diffeditor/diffshoweditor.h>
 #include <diffeditor/diffeditorconstants.h>