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

TextEditor: Rename slotCodeStyleRemoved and make it private

Browse Source 
Change-Id: I70f3ef86faa3c7c4e55bdd524c6a17cdb13c8fc1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-12-18 10:30:00 +02:00
committed by Orgad Shaneh
parent 9d3b2f0998
commit 0f8a3abb8b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,12 +152,12 @@ void ICodeStylePreferences::setDelegatingPool(CodeStylePool *pool)
setCurrentDelegate(0); setCurrentDelegate(0);
if (d->m_pool) { if (d->m_pool) {
disconnect(d->m_pool, &CodeStylePool::codeStyleRemoved, disconnect(d->m_pool, &CodeStylePool::codeStyleRemoved,
this, &ICodeStylePreferences::slotCodeStyleRemoved); this, &ICodeStylePreferences::codeStyleRemoved);
} }
d->m_pool = pool; d->m_pool = pool;
if (d->m_pool) { if (d->m_pool) {
connect(d->m_pool, &CodeStylePool::codeStyleRemoved, connect(d->m_pool, &CodeStylePool::codeStyleRemoved,
this, &ICodeStylePreferences::slotCodeStyleRemoved); this, &ICodeStylePreferences::codeStyleRemoved);
} }
} }
@@ -246,7 +246,7 @@ void ICodeStylePreferences::fromMap(const QString &prefix, const QVariantMap &ma
} }
} }
void ICodeStylePreferences::slotCodeStyleRemoved(ICodeStylePreferences *preferences) void ICodeStylePreferences::codeStyleRemoved(ICodeStylePreferences *preferences)
{ {
if (currentDelegate() == preferences) { if (currentDelegate() == preferences) {
CodeStylePool *pool = delegatingPool(); CodeStylePool *pool = delegatingPool();

3
src/plugins/texteditor/icodestylepreferences.h
View File

@@ -103,9 +103,10 @@ signals:
protected: protected:
virtual QString settingsSuffix() const = 0; virtual QString settingsSuffix() const = 0;
void slotCodeStyleRemoved(ICodeStylePreferences *preferences);
private: private:
void codeStyleRemoved(ICodeStylePreferences *preferences);
Internal::ICodeStylePreferencesPrivate *d; Internal::ICodeStylePreferencesPrivate *d;
}; };