aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/diffeditor/diffeditor.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-01-30 14:59:41 +0100
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-02-16 17:15:04 +0000
commitf10fd0ef5e88ee3ff3ff2d311952c6c860e0bfba (patch)
tree1d14192196468882c839c858f9ec35a1f06ed681 /src/plugins/diffeditor/diffeditor.h
parent233da494b276dbb212031babec8be37e4afb35b0 (diff)
DiffEditor: Make DiffEditor internal
Change-Id: Ife1d3d1efa2b89e3eccadec26d7c22cf86620911 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r--src/plugins/diffeditor/diffeditor.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 6df2974bc2..c4c111d4f4 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -31,7 +31,6 @@
#ifndef DIFFEDITOR_H
#define DIFFEDITOR_H
-#include "diffeditor_global.h"
#include "diffeditorcontroller.h"
#include <coreplugin/editormanager/ieditor.h>
@@ -54,14 +53,13 @@ class DiffEditorDocument;
class DiffEditorGuiController;
class UnifiedDiffEditorWidget;
class SideBySideDiffEditorWidget;
-} // namespace Internal
-class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
+class DiffEditor : public Core::IEditor
{
Q_OBJECT
public:
- DiffEditor(const QSharedPointer<Internal::DiffEditorDocument> &doc);
+ DiffEditor(const QSharedPointer<DiffEditorDocument> &doc);
~DiffEditor();
public:
@@ -97,13 +95,13 @@ private:
QWidget *readCurrentDiffEditorSetting();
void writeCurrentDiffEditorSetting(QWidget *currentEditor);
- QSharedPointer<Internal::DiffEditorDocument> m_document;
- Internal::DescriptionEditorWidget *m_descriptionWidget;
+ QSharedPointer<DiffEditorDocument> m_document;
+ DescriptionEditorWidget *m_descriptionWidget;
QStackedWidget *m_stackedWidget;
- Internal::SideBySideDiffEditorWidget *m_sideBySideEditor;
- Internal::UnifiedDiffEditorWidget *m_unifiedEditor;
+ SideBySideDiffEditorWidget *m_sideBySideEditor;
+ UnifiedDiffEditorWidget *m_unifiedEditor;
QWidget *m_currentEditor;
- Internal::DiffEditorGuiController *m_guiController;
+ DiffEditorGuiController *m_guiController;
QToolBar *m_toolBar;
QComboBox *m_entriesComboBox;
QAction *m_whitespaceButtonAction;
@@ -114,6 +112,7 @@ private:
QToolButton *m_diffEditorSwitcher;
};
+} // namespace Internal
} // namespace DiffEditor
#endif // DIFFEDITOR_H