2012-10-02 09:12:39 +02:00
|
|
|
/****************************************************************************
|
2011-07-06 10:38:53 +02:00
|
|
|
**
|
2014-01-07 13:27:11 +01:00
|
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
2012-10-02 09:12:39 +02:00
|
|
|
** Contact: http://www.qt-project.org/legal
|
2011-07-06 10:38:53 +02:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** This file is part of Qt Creator.
|
2011-07-06 10:38:53 +02:00
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
** Commercial License Usage
|
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
|
** a written agreement between you and Digia. For licensing terms and
|
2014-10-01 13:21:18 +02:00
|
|
|
** conditions see http://www.qt.io/licensing. For further information
|
|
|
|
|
** use the contact form at http://www.qt.io/contact-us.
|
2011-07-06 10:38:53 +02:00
|
|
|
**
|
|
|
|
|
** GNU Lesser General Public License Usage
|
2012-10-02 09:12:39 +02:00
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
2014-10-01 13:21:18 +02:00
|
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
|
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
|
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
|
|
|
** following information to ensure the GNU Lesser General Public License
|
|
|
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
|
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
2012-10-02 09:12:39 +02:00
|
|
|
**
|
|
|
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
|
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
2011-07-06 10:38:53 +02:00
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
|
**
|
2012-10-02 09:12:39 +02:00
|
|
|
****************************************************************************/
|
2011-07-06 10:38:53 +02:00
|
|
|
|
2011-02-03 15:48:14 +01:00
|
|
|
#include "cppcodestylepreferences.h"
|
|
|
|
|
|
|
|
|
|
using namespace CppTools;
|
|
|
|
|
|
2012-11-22 10:29:58 +02:00
|
|
|
static const char settingsSuffixKey[] = "CodeStyleSettings";
|
2011-02-03 15:48:14 +01:00
|
|
|
|
2011-08-16 10:45:23 +02:00
|
|
|
CppCodeStylePreferences::CppCodeStylePreferences(QObject *parent) :
|
|
|
|
|
ICodeStylePreferences(parent)
|
2011-02-03 15:48:14 +01:00
|
|
|
{
|
|
|
|
|
connect(this, SIGNAL(currentValueChanged(QVariant)),
|
|
|
|
|
this, SLOT(slotCurrentValueChanged(QVariant)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QVariant CppCodeStylePreferences::value() const
|
|
|
|
|
{
|
|
|
|
|
QVariant v;
|
2011-08-16 10:45:23 +02:00
|
|
|
v.setValue(codeStyleSettings());
|
2011-02-03 15:48:14 +01:00
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CppCodeStylePreferences::setValue(const QVariant &data)
|
|
|
|
|
{
|
|
|
|
|
if (!data.canConvert<CppCodeStyleSettings>())
|
|
|
|
|
return;
|
|
|
|
|
|
2011-08-16 10:45:23 +02:00
|
|
|
setCodeStyleSettings(data.value<CppCodeStyleSettings>());
|
2011-02-03 15:48:14 +01:00
|
|
|
}
|
|
|
|
|
|
2011-08-16 10:45:23 +02:00
|
|
|
CppCodeStyleSettings CppCodeStylePreferences::codeStyleSettings() const
|
2011-02-03 15:48:14 +01:00
|
|
|
{
|
|
|
|
|
return m_data;
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-16 10:45:23 +02:00
|
|
|
void CppCodeStylePreferences::setCodeStyleSettings(const CppCodeStyleSettings &data)
|
2011-02-03 15:48:14 +01:00
|
|
|
{
|
|
|
|
|
if (m_data == data)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
m_data = data;
|
|
|
|
|
|
|
|
|
|
QVariant v;
|
|
|
|
|
v.setValue(data);
|
|
|
|
|
emit valueChanged(v);
|
2011-08-16 10:45:23 +02:00
|
|
|
emit codeStyleSettingsChanged(m_data);
|
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 03:32:53 +02:00
|
|
|
if (!currentDelegate())
|
2011-02-03 15:48:14 +01:00
|
|
|
emit currentValueChanged(v);
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-16 10:45:23 +02:00
|
|
|
CppCodeStyleSettings CppCodeStylePreferences::currentCodeStyleSettings() const
|
2011-02-03 15:48:14 +01:00
|
|
|
{
|
|
|
|
|
QVariant v = currentValue();
|
|
|
|
|
if (!v.canConvert<CppCodeStyleSettings>()) {
|
|
|
|
|
// warning
|
|
|
|
|
return CppCodeStyleSettings();
|
|
|
|
|
}
|
|
|
|
|
return v.value<CppCodeStyleSettings>();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CppCodeStylePreferences::slotCurrentValueChanged(const QVariant &value)
|
|
|
|
|
{
|
|
|
|
|
if (!value.canConvert<CppCodeStyleSettings>())
|
|
|
|
|
return;
|
|
|
|
|
|
2011-08-16 10:45:23 +02:00
|
|
|
emit currentCodeStyleSettingsChanged(value.value<CppCodeStyleSettings>());
|
2011-02-03 15:48:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString CppCodeStylePreferences::settingsSuffix() const
|
|
|
|
|
{
|
2012-11-21 22:36:47 +02:00
|
|
|
return QLatin1String(settingsSuffixKey);
|
2011-02-03 15:48:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CppCodeStylePreferences::toMap(const QString &prefix, QVariantMap *map) const
|
|
|
|
|
{
|
2011-08-16 10:45:23 +02:00
|
|
|
ICodeStylePreferences::toMap(prefix, map);
|
|
|
|
|
if (currentDelegate())
|
|
|
|
|
return;
|
|
|
|
|
|
2011-02-03 15:48:14 +01:00
|
|
|
m_data.toMap(prefix, map);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CppCodeStylePreferences::fromMap(const QString &prefix, const QVariantMap &map)
|
|
|
|
|
{
|
2011-08-16 10:45:23 +02:00
|
|
|
ICodeStylePreferences::fromMap(prefix, map);
|
|
|
|
|
if (currentDelegate())
|
|
|
|
|
return;
|
|
|
|
|
|
2011-02-03 15:48:14 +01:00
|
|
|
m_data.fromMap(prefix, map);
|
|
|
|
|
}
|
|
|
|
|
|