forked from qt-creator/qt-creator
		
	Make C++ code style configurable.
Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b Done-with: Jarek Kobus Task-number: QTCREATORBUG-2670 Task-number: QTCREATORBUG-4310 Task-number: QTCREATORBUG-2763 Task-number: QTCREATORBUG-3623 Task-number: QTCREATORBUG-567 Reviewed-on: http://codereview.qt.nokia.com/74 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
		@@ -333,12 +333,12 @@ CppFileSettingsPage::~CppFileSettingsPage()
 | 
			
		||||
 | 
			
		||||
QString CppFileSettingsPage::id() const
 | 
			
		||||
{
 | 
			
		||||
    return QLatin1String(Constants::CPP_SETTINGS_ID);
 | 
			
		||||
    return QLatin1String(Constants::CPP_FILE_SETTINGS_ID);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString CppFileSettingsPage::displayName() const
 | 
			
		||||
{
 | 
			
		||||
    return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_NAME);
 | 
			
		||||
    return QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString CppFileSettingsPage::category() const
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user