more style

Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-09-16 13:10:06 +02:00
committed by hjk
parent b3bb5d700e
commit dbe1653775
38 changed files with 616 additions and 616 deletions

View File

@@ -57,9 +57,9 @@ struct BehaviorSettingsWidgetPrivate
BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent)
: QWidget(parent)
, m_d(new BehaviorSettingsWidgetPrivate)
, d(new BehaviorSettingsWidgetPrivate)
{
m_d->m_ui.setupUi(this);
d->m_ui.setupUi(this);
QList<int> mibs = QTextCodec::availableMibs();
qSort(mibs);
@@ -74,48 +74,48 @@ BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent)
compoundName += QLatin1String(" / ");
compoundName += QString::fromLatin1(alias);
}
m_d->m_ui.encodingBox->addItem(compoundName);
m_d->m_codecs.append(codec);
d->m_ui.encodingBox->addItem(compoundName);
d->m_codecs.append(codec);
}
connect(m_d->m_ui.cleanWhitespace, SIGNAL(clicked(bool)),
connect(d->m_ui.cleanWhitespace, SIGNAL(clicked(bool)),
this, SLOT(slotStorageSettingsChanged()));
connect(m_d->m_ui.inEntireDocument, SIGNAL(clicked(bool)),
connect(d->m_ui.inEntireDocument, SIGNAL(clicked(bool)),
this, SLOT(slotStorageSettingsChanged()));
connect(m_d->m_ui.addFinalNewLine, SIGNAL(clicked(bool)),
connect(d->m_ui.addFinalNewLine, SIGNAL(clicked(bool)),
this, SLOT(slotStorageSettingsChanged()));
connect(m_d->m_ui.cleanIndentation, SIGNAL(clicked(bool)),
connect(d->m_ui.cleanIndentation, SIGNAL(clicked(bool)),
this, SLOT(slotStorageSettingsChanged()));
connect(m_d->m_ui.mouseNavigation, SIGNAL(clicked()),
connect(d->m_ui.mouseNavigation, SIGNAL(clicked()),
this, SLOT(slotBehaviorSettingsChanged()));
connect(m_d->m_ui.scrollWheelZooming, SIGNAL(clicked(bool)),
connect(d->m_ui.scrollWheelZooming, SIGNAL(clicked(bool)),
this, SLOT(slotBehaviorSettingsChanged()));
connect(m_d->m_ui.constrainTooltips, SIGNAL(clicked()),
connect(d->m_ui.constrainTooltips, SIGNAL(clicked()),
this, SLOT(slotBehaviorSettingsChanged()));
connect(m_d->m_ui.utf8BomBox, SIGNAL(currentIndexChanged(int)),
connect(d->m_ui.utf8BomBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(slotExtraEncodingChanged()));
connect(m_d->m_ui.encodingBox, SIGNAL(currentIndexChanged(int)),
connect(d->m_ui.encodingBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(slotEncodingBoxChanged(int)));
}
BehaviorSettingsWidget::~BehaviorSettingsWidget()
{
delete m_d;
delete d;
}
void BehaviorSettingsWidget::setActive(bool active)
{
m_d->m_ui.tabPreferencesWidget->setEnabled(active);
m_d->m_ui.groupBoxEncodings->setEnabled(active);
m_d->m_ui.groupBoxMouse->setEnabled(active);
m_d->m_ui.groupBoxStorageSettings->setEnabled(active);
d->m_ui.tabPreferencesWidget->setEnabled(active);
d->m_ui.groupBoxEncodings->setEnabled(active);
d->m_ui.groupBoxMouse->setEnabled(active);
d->m_ui.groupBoxStorageSettings->setEnabled(active);
}
void BehaviorSettingsWidget::setAssignedCodec(QTextCodec *codec)
{
for (int i = 0; i < m_d->m_codecs.size(); ++i) {
if (codec == m_d->m_codecs.at(i)) {
m_d->m_ui.encodingBox->setCurrentIndex(i);
for (int i = 0; i < d->m_codecs.size(); ++i) {
if (codec == d->m_codecs.at(i)) {
d->m_ui.encodingBox->setCurrentIndex(i);
break;
}
}
@@ -123,55 +123,55 @@ void BehaviorSettingsWidget::setAssignedCodec(QTextCodec *codec)
QTextCodec *BehaviorSettingsWidget::assignedCodec() const
{
return m_d->m_codecs.at(m_d->m_ui.encodingBox->currentIndex());
return d->m_codecs.at(d->m_ui.encodingBox->currentIndex());
}
void BehaviorSettingsWidget::setTabPreferences(TabPreferences *tabPreferences)
{
m_d->m_ui.tabPreferencesWidget->setTabPreferences(tabPreferences);
d->m_ui.tabPreferencesWidget->setTabPreferences(tabPreferences);
}
void BehaviorSettingsWidget::setAssignedStorageSettings(const StorageSettings &storageSettings)
{
m_d->m_ui.cleanWhitespace->setChecked(storageSettings.m_cleanWhitespace);
m_d->m_ui.inEntireDocument->setChecked(storageSettings.m_inEntireDocument);
m_d->m_ui.cleanIndentation->setChecked(storageSettings.m_cleanIndentation);
m_d->m_ui.addFinalNewLine->setChecked(storageSettings.m_addFinalNewLine);
d->m_ui.cleanWhitespace->setChecked(storageSettings.m_cleanWhitespace);
d->m_ui.inEntireDocument->setChecked(storageSettings.m_inEntireDocument);
d->m_ui.cleanIndentation->setChecked(storageSettings.m_cleanIndentation);
d->m_ui.addFinalNewLine->setChecked(storageSettings.m_addFinalNewLine);
}
void BehaviorSettingsWidget::assignedStorageSettings(StorageSettings *storageSettings) const
{
storageSettings->m_cleanWhitespace = m_d->m_ui.cleanWhitespace->isChecked();
storageSettings->m_inEntireDocument = m_d->m_ui.inEntireDocument->isChecked();
storageSettings->m_cleanIndentation = m_d->m_ui.cleanIndentation->isChecked();
storageSettings->m_addFinalNewLine = m_d->m_ui.addFinalNewLine->isChecked();
storageSettings->m_cleanWhitespace = d->m_ui.cleanWhitespace->isChecked();
storageSettings->m_inEntireDocument = d->m_ui.inEntireDocument->isChecked();
storageSettings->m_cleanIndentation = d->m_ui.cleanIndentation->isChecked();
storageSettings->m_addFinalNewLine = d->m_ui.addFinalNewLine->isChecked();
}
void BehaviorSettingsWidget::setAssignedBehaviorSettings(const BehaviorSettings &behaviorSettings)
{
m_d->m_ui.mouseNavigation->setChecked(behaviorSettings.m_mouseNavigation);
m_d->m_ui.scrollWheelZooming->setChecked(behaviorSettings.m_scrollWheelZooming);
m_d->m_ui.constrainTooltips->setChecked(behaviorSettings.m_constrainTooltips);
d->m_ui.mouseNavigation->setChecked(behaviorSettings.m_mouseNavigation);
d->m_ui.scrollWheelZooming->setChecked(behaviorSettings.m_scrollWheelZooming);
d->m_ui.constrainTooltips->setChecked(behaviorSettings.m_constrainTooltips);
}
void BehaviorSettingsWidget::assignedBehaviorSettings(BehaviorSettings *behaviorSettings) const
{
behaviorSettings->m_mouseNavigation = m_d->m_ui.mouseNavigation->isChecked();
behaviorSettings->m_scrollWheelZooming = m_d->m_ui.scrollWheelZooming->isChecked();
behaviorSettings->m_constrainTooltips = m_d->m_ui.constrainTooltips->isChecked();
behaviorSettings->m_mouseNavigation = d->m_ui.mouseNavigation->isChecked();
behaviorSettings->m_scrollWheelZooming = d->m_ui.scrollWheelZooming->isChecked();
behaviorSettings->m_constrainTooltips = d->m_ui.constrainTooltips->isChecked();
}
void BehaviorSettingsWidget::setAssignedExtraEncodingSettings(
const ExtraEncodingSettings &encodingSettings)
{
m_d->m_ui.utf8BomBox->setCurrentIndex(encodingSettings.m_utf8BomSetting);
d->m_ui.utf8BomBox->setCurrentIndex(encodingSettings.m_utf8BomSetting);
}
void BehaviorSettingsWidget::assignedExtraEncodingSettings(
ExtraEncodingSettings *encodingSettings) const
{
encodingSettings->m_utf8BomSetting =
(ExtraEncodingSettings::Utf8BomSetting)m_d->m_ui.utf8BomBox->currentIndex();
(ExtraEncodingSettings::Utf8BomSetting)d->m_ui.utf8BomBox->currentIndex();
}
QString BehaviorSettingsWidget::collectUiKeywords() const
@@ -179,26 +179,26 @@ QString BehaviorSettingsWidget::collectUiKeywords() const
static const QLatin1Char sep(' ');
QString keywords;
QTextStream(&keywords)
<< sep << m_d->m_ui.tabPreferencesWidget->searchKeywords()
<< sep << m_d->m_ui.cleanWhitespace->text()
<< sep << m_d->m_ui.inEntireDocument->text()
<< sep << m_d->m_ui.cleanIndentation->text()
<< sep << m_d->m_ui.addFinalNewLine->text()
<< sep << m_d->m_ui.encodingLabel->text()
<< sep << m_d->m_ui.utf8BomLabel->text()
<< sep << m_d->m_ui.mouseNavigation->text()
<< sep << m_d->m_ui.scrollWheelZooming->text()
<< sep << m_d->m_ui.constrainTooltips->text()
<< sep << m_d->m_ui.groupBoxStorageSettings->title()
<< sep << m_d->m_ui.groupBoxEncodings->title()
<< sep << m_d->m_ui.groupBoxMouse->title();
<< sep << d->m_ui.tabPreferencesWidget->searchKeywords()
<< sep << d->m_ui.cleanWhitespace->text()
<< sep << d->m_ui.inEntireDocument->text()
<< sep << d->m_ui.cleanIndentation->text()
<< sep << d->m_ui.addFinalNewLine->text()
<< sep << d->m_ui.encodingLabel->text()
<< sep << d->m_ui.utf8BomLabel->text()
<< sep << d->m_ui.mouseNavigation->text()
<< sep << d->m_ui.scrollWheelZooming->text()
<< sep << d->m_ui.constrainTooltips->text()
<< sep << d->m_ui.groupBoxStorageSettings->title()
<< sep << d->m_ui.groupBoxEncodings->title()
<< sep << d->m_ui.groupBoxMouse->title();
keywords.remove(QLatin1Char('&'));
return keywords;
}
void BehaviorSettingsWidget::setFallbacksVisible(bool on)
{
m_d->m_ui.tabPreferencesWidget->setFallbacksVisible(on);
d->m_ui.tabPreferencesWidget->setFallbacksVisible(on);
}
void BehaviorSettingsWidget::slotStorageSettingsChanged()
@@ -224,7 +224,7 @@ void BehaviorSettingsWidget::slotExtraEncodingChanged()
void BehaviorSettingsWidget::slotEncodingBoxChanged(int index)
{
emit textCodecChanged(m_d->m_codecs.at(index));
emit textCodecChanged(d->m_codecs.at(index));
}
} // TextEditor