From 0f8a3abb8b35d063e805ec99eecdf0b21ae19303 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 18 Dec 2015 10:30:00 +0200 Subject: [PATCH] TextEditor: Rename slotCodeStyleRemoved and make it private Change-Id: I70f3ef86faa3c7c4e55bdd524c6a17cdb13c8fc1 Reviewed-by: Tobias Hunger --- src/plugins/texteditor/icodestylepreferences.cpp | 6 +++--- src/plugins/texteditor/icodestylepreferences.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/texteditor/icodestylepreferences.cpp b/src/plugins/texteditor/icodestylepreferences.cpp index ed475cec939..db30d92ae52 100644 --- a/src/plugins/texteditor/icodestylepreferences.cpp +++ b/src/plugins/texteditor/icodestylepreferences.cpp @@ -152,12 +152,12 @@ void ICodeStylePreferences::setDelegatingPool(CodeStylePool *pool) setCurrentDelegate(0); if (d->m_pool) { disconnect(d->m_pool, &CodeStylePool::codeStyleRemoved, - this, &ICodeStylePreferences::slotCodeStyleRemoved); + this, &ICodeStylePreferences::codeStyleRemoved); } d->m_pool = pool; if (d->m_pool) { 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) { CodeStylePool *pool = delegatingPool(); diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h index c8cfebc845c..fa9a421cc7a 100644 --- a/src/plugins/texteditor/icodestylepreferences.h +++ b/src/plugins/texteditor/icodestylepreferences.h @@ -103,9 +103,10 @@ signals: protected: virtual QString settingsSuffix() const = 0; - void slotCodeStyleRemoved(ICodeStylePreferences *preferences); private: + void codeStyleRemoved(ICodeStylePreferences *preferences); + Internal::ICodeStylePreferencesPrivate *d; };