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

DiffEditor: Make UnifiedDiffEditorWidget internal

Browse Source 
Change-Id: I4c65190be212ed43cd0150d6f33a944e8accd73d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 14:51:44 +01:00
parent 2a01738ffb
commit a96a62c941
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,10 +52,10 @@ namespace Internal {
class DescriptionEditorWidget; class DescriptionEditorWidget;
class DiffEditorDocument; class DiffEditorDocument;
class DiffEditorGuiController; class DiffEditorGuiController;
class UnifiedDiffEditorWidget;
} // namespace Internal } // namespace Internal
class SideBySideDiffEditorWidget; class SideBySideDiffEditorWidget;
class UnifiedDiffEditorWidget;
class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
{ {
@@ -102,7 +102,7 @@ private:
Internal::DescriptionEditorWidget *m_descriptionWidget; Internal::DescriptionEditorWidget *m_descriptionWidget;
QStackedWidget *m_stackedWidget; QStackedWidget *m_stackedWidget;
SideBySideDiffEditorWidget *m_sideBySideEditor; SideBySideDiffEditorWidget *m_sideBySideEditor;
UnifiedDiffEditorWidget *m_unifiedEditor; Internal::UnifiedDiffEditorWidget *m_unifiedEditor;
QWidget *m_currentEditor; QWidget *m_currentEditor;
Internal::DiffEditorGuiController *m_guiController; Internal::DiffEditorGuiController *m_guiController;
QToolBar *m_toolBar; QToolBar *m_toolBar;

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

@@ -69,8 +69,7 @@ using namespace Core;
using namespace TextEditor; using namespace TextEditor;
namespace DiffEditor { namespace DiffEditor {
namespace Internal {
using namespace Internal;
UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent) UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent)
: SelectableTextEditorWidget("DiffEditor.UnifiedDiffEditor", parent) : SelectableTextEditorWidget("DiffEditor.UnifiedDiffEditor", parent)
@@ -809,4 +808,5 @@ void UnifiedDiffEditorWidget::setCurrentDiffFileIndex(int diffFileIndex)
m_ignoreCurrentIndexChange = oldIgnore; m_ignoreCurrentIndexChange = oldIgnore;
} }
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor

7
src/plugins/diffeditor/unifieddiffeditorwidget.h
View File

@@ -31,7 +31,6 @@
#ifndef UNIFIEDDIFFEDITORWIDGET_H #ifndef UNIFIEDDIFFEDITORWIDGET_H
#define UNIFIEDDIFFEDITORWIDGET_H #define UNIFIEDDIFFEDITORWIDGET_H
#include "diffeditor_global.h"
#include "differ.h" #include "differ.h"
#include "diffeditorcontroller.h" #include "diffeditorcontroller.h"
#include "selectabletexteditorwidget.h" #include "selectabletexteditorwidget.h"
@@ -53,8 +52,9 @@ namespace Internal { class DiffEditorGuiController; }
class ChunkData; class ChunkData;
class FileData; class FileData;
class DIFFEDITOR_EXPORT UnifiedDiffEditorWidget namespace Internal {
: public SelectableTextEditorWidget
class UnifiedDiffEditorWidget : public SelectableTextEditorWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
@@ -143,6 +143,7 @@ private:
QByteArray m_state; QByteArray m_state;
}; };
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor
#endif // UNIFIEDDIFFEDITORWIDGET_H #endif // UNIFIEDDIFFEDITORWIDGET_H