From ac70c168da11412304af77712254ddceeb7350a3 Mon Sep 17 00:00:00 2001 From: Lorenz Haas Date: Tue, 7 Jan 2014 20:38:32 +0100 Subject: [PATCH] Optimize usage of QPalette setPalette() does not replace the old one but rather adds the difference. Thus a previous copy of the palette is unnecessary. Change-Id: I5c06da456b76144efc4a984ccda13c7d2243a7bc Reviewed-by: Eike Ziller --- src/libs/qmleditorwidgets/customcolordialog.cpp | 4 ++-- src/plugins/coreplugin/fancytabwidget.cpp | 4 +--- src/plugins/coreplugin/find/searchresulttreeview.cpp | 2 +- src/plugins/coreplugin/find/searchresultwidget.cpp | 3 +-- src/plugins/coreplugin/infobar.cpp | 2 +- src/plugins/git/changeselectiondialog.cpp | 2 +- src/plugins/git/gerrit/gerritdialog.cpp | 2 +- src/plugins/projectexplorer/miniprojecttargetselector.cpp | 2 +- src/plugins/projectexplorer/projectwindow.cpp | 2 +- src/plugins/projectexplorer/targetsettingswidget.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilertool.cpp | 2 +- src/plugins/texteditor/basetexteditor.cpp | 2 +- src/plugins/texteditor/colorschemeedit.cpp | 2 +- src/plugins/vcsbase/checkoutprogresswizardpage.cpp | 4 ++-- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 2 +- 15 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp index 9f349ba2339..3160800983c 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.cpp +++ b/src/libs/qmleditorwidgets/customcolordialog.cpp @@ -144,7 +144,7 @@ CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent ) void CustomColorDialog::setupColor(const QColor &color) { - QPalette pal = m_beforeColorWidget->palette(); + QPalette pal; pal.setColor(QPalette::Background, color); m_beforeColorWidget->setPalette(pal); setColor(color); @@ -179,7 +179,7 @@ void CustomColorDialog::setupWidgets() m_gSpinBox->setValue(m_color.greenF()); m_bSpinBox->setValue(m_color.blueF()); m_colorBox->setColor(m_color); - QPalette pal = m_currentColorWidget->palette(); + QPalette pal; pal.setColor(QPalette::Background, m_color); m_currentColorWidget->setPalette(pal); m_blockUpdate = false; diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index 92619b775de..5a92249feb3 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -451,11 +451,9 @@ void FancyTabWidget::removeTab(int index) void FancyTabWidget::setBackgroundBrush(const QBrush &brush) { - QPalette pal = m_tabBar->palette(); + QPalette pal; pal.setBrush(QPalette::Mid, brush); m_tabBar->setPalette(pal); - pal = m_cornerWidgetContainer->palette(); - pal.setBrush(QPalette::Mid, brush); m_cornerWidgetContainer->setPalette(pal); } diff --git a/src/plugins/coreplugin/find/searchresulttreeview.cpp b/src/plugins/coreplugin/find/searchresulttreeview.cpp index d48efabd976..b900a2c14fd 100644 --- a/src/plugins/coreplugin/find/searchresulttreeview.cpp +++ b/src/plugins/coreplugin/find/searchresulttreeview.cpp @@ -62,7 +62,7 @@ void SearchResultTreeView::setTextEditorFont(const QFont &font, const SearchResu { m_model->setTextEditorFont(font, color); - QPalette p = palette(); + QPalette p; p.setColor(QPalette::Base, color.textBackground); setPalette(p); } diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp index 6539cebdadd..d84018c5668 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.cpp +++ b/src/plugins/coreplugin/find/searchresultwidget.cpp @@ -90,7 +90,7 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) : setLayout(layout); QFrame *topWidget = new QFrame; - QPalette pal = topWidget->palette(); + QPalette pal; pal.setColor(QPalette::Window, QColor(255, 255, 225)); pal.setColor(QPalette::WindowText, Qt::black); topWidget->setPalette(pal); @@ -103,7 +103,6 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) : layout->addWidget(topWidget); m_messageWidget = new QFrame; - pal.setColor(QPalette::Window, QColor(255, 255, 225)); pal.setColor(QPalette::WindowText, Qt::red); m_messageWidget->setPalette(pal); m_messageWidget->setFrameStyle(QFrame::Panel | QFrame::Raised); diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp index 40bb10fc52e..20a3bb27895 100644 --- a/src/plugins/coreplugin/infobar.cpp +++ b/src/plugins/coreplugin/infobar.cpp @@ -207,7 +207,7 @@ void InfoBarDisplay::update() foreach (const InfoBarEntry &info, m_infoBar->m_infoBarEntries) { QFrame *infoWidget = new QFrame; - QPalette pal = infoWidget->palette(); + QPalette pal; pal.setColor(QPalette::Window, QColor(255, 255, 225)); pal.setColor(QPalette::WindowText, Qt::black); diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index db2361b46a4..b56227316ad 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -177,7 +177,7 @@ void ChangeSelectionDialog::acceptShow() //! Set commit message in details void ChangeSelectionDialog::setDetails(int exitCode) { - QPalette palette = m_ui->changeNumberEdit->palette(); + QPalette palette; if (exitCode == 0) { m_ui->detailsText->setPlainText(QString::fromUtf8(m_process->readAllStandardOutput())); palette.setColor(QPalette::Text, Qt::black); diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp index 2cf712dc567..59b8dabaad9 100644 --- a/src/plugins/git/gerrit/gerritdialog.cpp +++ b/src/plugins/git/gerrit/gerritdialog.cpp @@ -68,7 +68,7 @@ QueryValidatingLineEdit::QueryValidatingLineEdit(QWidget *parent) void QueryValidatingLineEdit::setTextColor(const QColor &c) { - QPalette pal = palette(); + QPalette pal; pal.setColor(QPalette::Active, QPalette::Text, c); setPalette(pal); } diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 05af6163d53..51af5ce9301 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -648,7 +648,7 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi m_runConfiguration(0), m_hideOnRelease(false) { - QPalette p = palette(); + QPalette p; p.setColor(QPalette::Text, QColor(255, 255, 255, 160)); setPalette(p); setProperty("panelwidget", true); diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index ca33a005be4..60b5ee8e9cc 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -123,7 +123,7 @@ PanelsWidget::PanelsWidget(QWidget *parent) : m_root->setMaximumWidth(900); m_root->setContentsMargins(0, 0, 40, 0); - QPalette pal = m_root->palette(); + QPalette pal; QColor background = Utils::StyleHelper::mergedColors( palette().window().color(), Qt::white, 85); pal.setColor(QPalette::All, QPalette::Window, background.darker(102)); diff --git a/src/plugins/projectexplorer/targetsettingswidget.cpp b/src/plugins/projectexplorer/targetsettingswidget.cpp index e0cb60a8865..59abbea5cc9 100644 --- a/src/plugins/projectexplorer/targetsettingswidget.cpp +++ b/src/plugins/projectexplorer/targetsettingswidget.cpp @@ -69,7 +69,7 @@ TargetSettingsWidget::TargetSettingsWidget(QWidget *parent) : connect(m_targetSelector, SIGNAL(menuShown(int)), this, SIGNAL(menuShown(int))); - QPalette shadowPal = palette(); + QPalette shadowPal; QLinearGradient grad(0, 0, 0, 2); grad.setColorAt(0, QColor(0, 0, 0, 60)); grad.setColorAt(1, Qt::transparent); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 6248e246351..b5909de7c11 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -267,7 +267,7 @@ QWidget *QmlProfilerTool::createWidgets() layout->addWidget(d->m_clearButton); d->m_timeLabel = new QLabel(); - QPalette palette = d->m_timeLabel->palette(); + QPalette palette; palette.setColor(QPalette::WindowText, Qt::white); d->m_timeLabel->setPalette(palette); d->m_timeLabel->setIndent(10); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 78e48540915..b52966ab168 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -5394,7 +5394,7 @@ void BaseTextEditorWidget::applyFontSettings() updateTabStops(); // update tab stops, they depend on the font // Line numbers - QPalette ep = d->m_extraArea->palette(); + QPalette ep; ep.setColor(QPalette::Dark, lineNumberFormat.foreground().color()); ep.setColor(QPalette::Background, lineNumberFormat.background().style() != Qt::NoBrush ? lineNumberFormat.background().color() : background); diff --git a/src/plugins/texteditor/colorschemeedit.cpp b/src/plugins/texteditor/colorschemeedit.cpp index 7c113b37b63..2355133debc 100644 --- a/src/plugins/texteditor/colorschemeedit.cpp +++ b/src/plugins/texteditor/colorschemeedit.cpp @@ -329,7 +329,7 @@ void ColorSchemeEdit::checkCheckBoxes() void ColorSchemeEdit::setItemListBackground(const QColor &color) { - QPalette pal = m_ui->itemList->palette(); + QPalette pal; pal.setColor(QPalette::Base, color); m_ui->itemList->setPalette(pal); } diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp index f3fe049c2a6..b319e3f97bd 100644 --- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp +++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp @@ -99,7 +99,7 @@ void CheckoutProgressWizardPage::slotFinished(bool ok, int exitCode, const QVari m_state = Succeeded; QApplication::restoreOverrideCursor(); ui->statusLabel->setText(tr("Succeeded.")); - QPalette palette = ui->statusLabel->palette(); + QPalette palette; palette.setColor(QPalette::Active, QPalette::Text, Qt::green); ui->statusLabel->setPalette(palette); emit completeChanged(); @@ -111,7 +111,7 @@ void CheckoutProgressWizardPage::slotFinished(bool ok, int exitCode, const QVari m_state = Failed; QApplication::restoreOverrideCursor(); ui->statusLabel->setText(tr("Failed.")); - QPalette palette = ui->statusLabel->palette(); + QPalette palette; palette.setColor(QPalette::Active, QPalette::Text, Qt::red); ui->statusLabel->setPalette(palette); emit terminated(false); diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 3aafe9398fe..c79a1c4ebc9 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -191,7 +191,7 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa const QTextCharFormat tf = fs.toTextCharFormat(TextEditor::C_TEXT); descriptionEdit->setFont(tf.font()); const QTextCharFormat selectionFormat = fs.toTextCharFormat(TextEditor::C_SELECTION); - QPalette pal = descriptionEdit->palette(); + QPalette pal; pal.setColor(QPalette::Base, tf.background().color()); pal.setColor(QPalette::Text, tf.foreground().color()); pal.setColor(QPalette::Foreground, tf.foreground().color());