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

DiffEditor: Make DiffEditor internal

Browse Source 
Change-Id: Ife1d3d1efa2b89e3eccadec26d7c22cf86620911
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 14:59:41 +01:00
parent 233da494b2
commit f10fd0ef5e
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -70,7 +70,6 @@ static const char useDiffEditorKeyC[] = "UseDiffEditor";
using namespace TextEditor; using namespace TextEditor;
namespace DiffEditor { namespace DiffEditor {
namespace Internal { namespace Internal {
class DescriptionEditorWidget : public TextEditorWidget class DescriptionEditorWidget : public TextEditorWidget
@@ -199,10 +198,6 @@ void DescriptionEditorWidget::handleCurrentContents()
emit requestBranchList(); emit requestBranchList();
} }
} // namespace Internal
using namespace Internal;
///////////////////////////////// DiffEditor ////////////////////////////////// ///////////////////////////////// DiffEditor //////////////////////////////////
DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc) DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
@@ -619,6 +614,7 @@ void DiffEditor::writeCurrentDiffEditorSetting(QWidget *currentEditor)
s->endGroup(); s->endGroup();
} }
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor
#include "diffeditor.moc" #include "diffeditor.moc"

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

@@ -31,7 +31,6 @@
#ifndef DIFFEDITOR_H #ifndef DIFFEDITOR_H
#define DIFFEDITOR_H #define DIFFEDITOR_H
#include "diffeditor_global.h"
#include "diffeditorcontroller.h" #include "diffeditorcontroller.h"
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
@@ -54,14 +53,13 @@ class DiffEditorDocument;
class DiffEditorGuiController; class DiffEditorGuiController;
class UnifiedDiffEditorWidget; class UnifiedDiffEditorWidget;
class SideBySideDiffEditorWidget; class SideBySideDiffEditorWidget;
} // namespace Internal
class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor class DiffEditor : public Core::IEditor
{ {
Q_OBJECT Q_OBJECT
public: public:
DiffEditor(const QSharedPointer<Internal::DiffEditorDocument> &doc); DiffEditor(const QSharedPointer<DiffEditorDocument> &doc);
~DiffEditor(); ~DiffEditor();
public: public:
@@ -97,13 +95,13 @@ private:
QWidget *readCurrentDiffEditorSetting(); QWidget *readCurrentDiffEditorSetting();
void writeCurrentDiffEditorSetting(QWidget *currentEditor); void writeCurrentDiffEditorSetting(QWidget *currentEditor);
QSharedPointer<Internal::DiffEditorDocument> m_document; QSharedPointer<DiffEditorDocument> m_document;
Internal::DescriptionEditorWidget *m_descriptionWidget; DescriptionEditorWidget *m_descriptionWidget;
QStackedWidget *m_stackedWidget; QStackedWidget *m_stackedWidget;
Internal::SideBySideDiffEditorWidget *m_sideBySideEditor; SideBySideDiffEditorWidget *m_sideBySideEditor;
Internal::UnifiedDiffEditorWidget *m_unifiedEditor; UnifiedDiffEditorWidget *m_unifiedEditor;
QWidget *m_currentEditor; QWidget *m_currentEditor;
Internal::DiffEditorGuiController *m_guiController; DiffEditorGuiController *m_guiController;
QToolBar *m_toolBar; QToolBar *m_toolBar;
QComboBox *m_entriesComboBox; QComboBox *m_entriesComboBox;
QAction *m_whitespaceButtonAction; QAction *m_whitespaceButtonAction;
@@ -114,6 +112,7 @@ private:
QToolButton *m_diffEditorSwitcher; QToolButton *m_diffEditorSwitcher;
}; };
} // namespace Internal
} // namespace DiffEditor } // namespace DiffEditor
#endif // DIFFEDITOR_H #endif // DIFFEDITOR_H

1
src/plugins/diffeditor/diffeditorfactory.cpp
View File

@@ -37,7 +37,6 @@
#include <QCoreApplication> #include <QCoreApplication>
namespace DiffEditor { namespace DiffEditor {
namespace Internal { namespace Internal {
DiffEditorFactory::DiffEditorFactory(QObject *parent) DiffEditorFactory::DiffEditorFactory(QObject *parent)