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

Core: Make IEditor::id a value member and adjust users

Browse Source 
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-02-24 15:03:25 +01:00
committed by Eike Ziller
parent 9035a9b77a
commit 6c6f47f86c
39 changed files with 44 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,11 @@ class DescriptionEditor : public BaseTextEditor
{
Q_OBJECT
public:
DescriptionEditor(BaseTextEditorWidget *editorWidget) : BaseTextEditor(editorWidget) {}
Core::Id id() const { return "DescriptionEditor"; }
DescriptionEditor(BaseTextEditorWidget *editorWidget)
: BaseTextEditor(editorWidget)
{
setId("DescriptionEditor");
}
};
class DescriptionEditorWidget : public BaseTextEditorWidget
@@ -147,6 +149,7 @@ DiffEditor::DiffEditor(DiffEditor *other)
void DiffEditor::ctor()
{
setId(Constants::DIFF_EDITOR_ID);
QSplitter *splitter = new Core::MiniSplitter(Qt::Vertical);
m_descriptionWidget = new Internal::DescriptionEditorWidget(splitter);
@@ -212,11 +215,6 @@ Core::IDocument *DiffEditor::document()
return m_document.data();
}
Core::Id DiffEditor::id() const
{
return Constants::DIFF_EDITOR_ID;
}
static QToolBar *createToolBar(const QWidget *someWidget)
{
// Create

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

@@ -67,7 +67,6 @@ public:
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
Core::IDocument *document();
Core::Id id() const;
QWidget *toolBar();

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

@@ -360,12 +360,11 @@ public:
SideDiffEditor(BaseTextEditorWidget *editorWidget)
: BaseTextEditor(editorWidget)
{
setId("SideDiffEditor");
connect(this, SIGNAL(tooltipRequested(TextEditor::ITextEditor*,QPoint,int)),
this, SLOT(slotTooltipRequested(TextEditor::ITextEditor*,QPoint,int)));
}
Core::Id id() const { return "SideDiffEditor"; }
private slots:
void slotTooltipRequested(TextEditor::ITextEditor *editor, const QPoint &globalPoint, int position);