feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Make SideBySideDiffEditorWidget internal

Browse Source 
Change-Id: I794282d23dc13525fbc9ad327cfa8dce2c28fbca
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 14:55:56 +01:00
parent a96a62c941
commit 1cc01fa18d
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/diffeditor/diffeditor.h
View File

@@ -53,9 +53,8 @@ class DescriptionEditorWidget;
class DiffEditorDocument; class DiffEditorDocument;
class DiffEditorGuiController; class DiffEditorGuiController;
class UnifiedDiffEditorWidget; class UnifiedDiffEditorWidget;
} // namespace Internal
class SideBySideDiffEditorWidget; class SideBySideDiffEditorWidget;
} // namespace Internal
class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
{ {
@@ -101,7 +100,7 @@ private:
QSharedPointer<Internal::DiffEditorDocument> m_document; QSharedPointer<Internal::DiffEditorDocument> m_document;
Internal::DescriptionEditorWidget *m_descriptionWidget; Internal::DescriptionEditorWidget *m_descriptionWidget;
QStackedWidget *m_stackedWidget; QStackedWidget *m_stackedWidget;
SideBySideDiffEditorWidget *m_sideBySideEditor; Internal::SideBySideDiffEditorWidget *m_sideBySideEditor;
Internal::UnifiedDiffEditorWidget *m_unifiedEditor; Internal::UnifiedDiffEditorWidget *m_unifiedEditor;
QWidget *m_currentEditor; QWidget *m_currentEditor;
Internal::DiffEditorGuiController *m_guiController; Internal::DiffEditorGuiController *m_guiController;

4
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -71,8 +71,7 @@ using namespace TextEditor;
using namespace Utils; using namespace Utils;
namespace DiffEditor { namespace DiffEditor {
namespace Internal {
using namespace Internal;
//////////////////////// ////////////////////////
/* /*
@@ -1582,6 +1581,7 @@ void SideBySideDiffEditorWidget::synchronizeFoldings(SideDiffEditorWidget *sourc
} }
#endif #endif
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor
#include "sidebysidediffeditorwidget.moc" #include "sidebysidediffeditorwidget.moc"

13
src/plugins/diffeditor/sidebysidediffeditorwidget.h
View File

@@ -31,7 +31,6 @@
#ifndef SIDEBYSIDEDIFFEDITORWIDGET_H #ifndef SIDEBYSIDEDIFFEDITORWIDGET_H
#define SIDEBYSIDEDIFFEDITORWIDGET_H #define SIDEBYSIDEDIFFEDITORWIDGET_H
#include "diffeditor_global.h"
#include "differ.h" #include "differ.h"
#include "diffeditorcontroller.h" #include "diffeditorcontroller.h"
#include <QWidget> #include <QWidget>
@@ -47,12 +46,15 @@ QT_END_NAMESPACE
namespace DiffEditor { namespace DiffEditor {
namespace Internal { class DiffEditorGuiController; }
class SideDiffEditorWidget;
class ChunkData; class ChunkData;
class FileData; class FileData;
class DIFFEDITOR_EXPORT SideBySideDiffEditorWidget : public QWidget namespace Internal {
class SideDiffEditorWidget;
class DiffEditorGuiController;
class SideBySideDiffEditorWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
@@ -96,7 +98,7 @@ private:
int lineNumber, int columnNumber); int lineNumber, int columnNumber);
void patch(bool revert); void patch(bool revert);
Internal::DiffEditorGuiController *m_guiController; DiffEditorGuiController *m_guiController;
DiffEditorController *m_controller; DiffEditorController *m_controller;
SideDiffEditorWidget *m_leftEditor; SideDiffEditorWidget *m_leftEditor;
SideDiffEditorWidget *m_rightEditor; SideDiffEditorWidget *m_rightEditor;
@@ -118,6 +120,7 @@ private:
QTextCharFormat m_rightCharFormat; QTextCharFormat m_rightCharFormat;
}; };
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor
#endif // SIDEBYSIDEDIFFEDITORWIDGET_H #endif // SIDEBYSIDEDIFFEDITORWIDGET_H