diff --git a/src/plugins/diffeditor/diffeditorcontroller.cpp b/src/plugins/diffeditor/diffeditorcontroller.cpp index df10cf1f335..0e6ce2cd58a 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.cpp +++ b/src/plugins/diffeditor/diffeditorcontroller.cpp @@ -44,13 +44,13 @@ namespace DiffEditor { DiffEditorController::DiffEditorController(QObject *parent) : QObject(parent), + m_reloader(0), + m_contextLinesNumber(3), m_diffFileIndex(-1), m_chunkIndex(-1), m_descriptionEnabled(false), - m_contextLinesNumber(3), m_contextLinesNumberEnabled(true), - m_ignoreWhitespace(true), - m_reloader(0) + m_ignoreWhitespace(true) { QSettings *s = Core::ICore::settings(); s->beginGroup(QLatin1String(settingsGroupC)); diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h index 43f65a86a12..d7245a3a3cc 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.h +++ b/src/plugins/diffeditor/diffeditorcontroller.h @@ -102,15 +102,15 @@ private: QString m_clearMessage; QList m_diffFiles; - int m_diffFileIndex; - int m_chunkIndex; QString m_workingDirectory; QString m_description; - bool m_descriptionEnabled; + DiffEditorReloader *m_reloader; int m_contextLinesNumber; + int m_diffFileIndex; + int m_chunkIndex; + bool m_descriptionEnabled; bool m_contextLinesNumberEnabled; bool m_ignoreWhitespace; - DiffEditorReloader *m_reloader; }; } // namespace DiffEditor