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

TextEditor: Modernize

Browse Source 
override, auto, nullptr, member initializers.

Change-Id: I04c6ebb683849568973bd7782fb5a3279267141e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 01:16:01 +03:00
committed by Orgad Shaneh
parent 439bc225e1
commit 41dee83bec
63 changed files with 261 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/texteditor/icodestylepreferences.cpp
View File

@@ -40,18 +40,12 @@ namespace Internal {
class ICodeStylePreferencesPrivate
{
public:
ICodeStylePreferencesPrivate()
: m_pool(0),
m_currentDelegate(0),
m_readOnly(false)
{}
CodeStylePool *m_pool;
ICodeStylePreferences *m_currentDelegate;
CodeStylePool *m_pool = nullptr;
ICodeStylePreferences *m_currentDelegate = nullptr;
TabSettings m_tabSettings;
QByteArray m_id;
QString m_displayName;
bool m_readOnly;
bool m_readOnly = false;
};
}
@@ -128,7 +122,7 @@ QVariant ICodeStylePreferences::currentValue() const
ICodeStylePreferences *ICodeStylePreferences::currentPreferences() const
{
ICodeStylePreferences *prefs = (ICodeStylePreferences *)this;
auto prefs = (ICodeStylePreferences *)this;
while (prefs->currentDelegate())
prefs = prefs->currentDelegate();
return prefs;
@@ -144,7 +138,7 @@ void ICodeStylePreferences::setDelegatingPool(CodeStylePool *pool)
if (pool == d->m_pool)
return;
setCurrentDelegate(0);
setCurrentDelegate(nullptr);
if (d->m_pool) {
disconnect(d->m_pool, &CodeStylePool::codeStyleRemoved,
this, &ICodeStylePreferences::codeStyleRemoved);
@@ -247,7 +241,7 @@ void ICodeStylePreferences::codeStyleRemoved(ICodeStylePreferences *preferences)
CodeStylePool *pool = delegatingPool();
QList<ICodeStylePreferences *> codeStyles = pool->codeStyles();
const int idx = codeStyles.indexOf(preferences);
ICodeStylePreferences *newCurrentPreferences = 0;
ICodeStylePreferences *newCurrentPreferences = nullptr;
int i = idx + 1;
// go forward
while (i < codeStyles.count()) {