DiffEditor: Make UnifiedDiffEditorWidget internal

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

View File

@@ -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;

View File

@@ -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

View File

@@ -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