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

Get rid of DiffEditor::editorWidget();

Browse Source 
Change-Id: I3078002359871dad74d4a07924d5beeaeb9f82ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2013-12-19 11:46:52 +01:00
committed by Jarek Kobus
parent 5ee3d2da97
commit 1d954b1b2a
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,11 @@ Core::Id DiffEditor::id() const
return Constants::DIFF_EDITOR_ID;
}
QTextCodec *DiffEditor::codec() const
{
return m_editorWidget->codec();
}
static QToolBar *createToolBar(const QWidget *someWidget)
{
// Create

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

@@ -63,7 +63,7 @@ public:
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
Core::IDocument *document();
Core::Id id() const;
DiffEditorWidget *editorWidget() const { return m_editorWidget; }
QTextCodec *codec() const;
QWidget *toolBar();

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

@@ -109,10 +109,10 @@ void DiffEditorPlugin::diff()
Core::EditorManager::activateEditor(editor);
DiffEditorWidget *editorWidget = editor->editorWidget();
QTextCodec *codec = editor->codec();
const QString text1 = getFileContents(fileName1, editorWidget->codec());
const QString text2 = getFileContents(fileName2, editorWidget->codec());
const QString text1 = getFileContents(fileName1, codec);
const QString text2 = getFileContents(fileName2, codec);
DiffEditorWidget::DiffFilesContents dfc;
dfc.leftFileInfo = fileName1;