feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Codestyle cleanup in preprocessor widget.

Browse Source 
Change-Id: Iaefdd7b795f35a6fb46cad7f7317939a6637b73a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
David Schulz
2013-10-11 09:43:17 +02:00
parent 3fe32bcf73
commit edc86b2a27
2 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/cppeditor/cpppreprocessoradditionwidget.cpp
View File

@@ -32,9 +32,9 @@
#include "cppsnippetprovider.h" #include "cppsnippetprovider.h"
#include "utils/tooltip/tipcontents.h" #include <utils/tooltip/tipcontents.h>
#include "utils/tooltip/tooltip.h" #include <utils/tooltip/tooltip.h>
#include "projectexplorer/project.h" #include <projectexplorer/project.h>
#include <QDebug> #include <QDebug>
@@ -66,31 +66,31 @@ PreProcessorAdditionPopUp *PreProcessorAdditionPopUp::instance()
void PreProcessorAdditionPopUp::show(QWidget *parent, void PreProcessorAdditionPopUp::show(QWidget *parent,
const QList<CppTools::ProjectPart::Ptr> &projectParts) const QList<CppTools::ProjectPart::Ptr> &projectParts)
{ {
widget = new PreProcessorAdditionWidget(); m_widget = new PreProcessorAdditionWidget();
originalPartAdditions.clear(); m_originalPartAdditions.clear();
foreach (CppTools::ProjectPart::Ptr projectPart, projectParts) { foreach (CppTools::ProjectPart::Ptr projectPart, projectParts) {
ProjectPartAddition addition; ProjectPartAddition addition;
addition.projectPart = projectPart; addition.projectPart = projectPart;
widget->ui->projectComboBox->addItem(projectPart->displayName); m_widget->ui->projectComboBox->addItem(projectPart->displayName);
addition.additionalDefines = projectPart->project addition.additionalDefines = projectPart->project
->additionalCppDefines().value(projectPart->projectFile).toByteArray(); ->additionalCppDefines().value(projectPart->projectFile).toByteArray();
originalPartAdditions << addition; m_originalPartAdditions << addition;
} }
partAdditions = originalPartAdditions; m_partAdditions = m_originalPartAdditions;
widget->ui->additionalEdit->setPlainText(QLatin1String( m_widget->ui->additionalEdit->setPlainText(QLatin1String(
partAdditions[widget->ui->projectComboBox->currentIndex()].additionalDefines)); m_partAdditions[m_widget->ui->projectComboBox->currentIndex()].additionalDefines));
QPoint pos = parent->mapToGlobal(parent->rect().topRight()); QPoint pos = parent->mapToGlobal(parent->rect().topRight());
pos.setX(pos.x() - widget->width()); pos.setX(pos.x() - m_widget->width());
showInternal(pos, Utils::WidgetContent(widget, true), parent, QRect()); showInternal(pos, Utils::WidgetContent(m_widget, true), parent, QRect());
connect(widget->ui->additionalEdit, SIGNAL(textChanged()), SLOT(textChanged())); connect(m_widget->ui->additionalEdit, SIGNAL(textChanged()), SLOT(textChanged()));
connect(widget->ui->projectComboBox, SIGNAL(currentIndexChanged(int)), connect(m_widget->ui->projectComboBox, SIGNAL(currentIndexChanged(int)),
SLOT(projectChanged(int))); SLOT(projectChanged(int)));
connect(widget, SIGNAL(finished()), SLOT(finish())); connect(m_widget, SIGNAL(finished()), SLOT(finish()));
connect(widget->ui->buttonBox, SIGNAL(accepted()), SLOT(apply())); connect(m_widget->ui->buttonBox, SIGNAL(accepted()), SLOT(apply()));
connect(widget->ui->buttonBox, SIGNAL(rejected()), SLOT(cancel())); connect(m_widget->ui->buttonBox, SIGNAL(rejected()), SLOT(cancel()));
} }
bool PreProcessorAdditionPopUp::eventFilter(QObject *o, QEvent *event) bool PreProcessorAdditionPopUp::eventFilter(QObject *o, QEvent *event)
@@ -99,7 +99,7 @@ bool PreProcessorAdditionPopUp::eventFilter(QObject *o, QEvent *event)
switch (event->type()) { switch (event->type()) {
case QEvent::Leave: case QEvent::Leave:
// This event would hide the ToolTip because the view isn't a child of the WidgetContent // This event would hide the ToolTip because the view isn't a child of the WidgetContent
if (widget->ui->projectComboBox->view() == qApp->focusWidget()) if (m_widget->ui->projectComboBox->view() == qApp->focusWidget())
return false; return false;
break; break;
case QEvent::KeyPress: case QEvent::KeyPress:
@@ -116,7 +116,7 @@ bool PreProcessorAdditionPopUp::eventFilter(QObject *o, QEvent *event)
case QEvent::MouseButtonDblClick: case QEvent::MouseButtonDblClick:
case QEvent::Wheel: case QEvent::Wheel:
// This event would hide the ToolTip because the viewport isn't a child of the WidgetContent // This event would hide the ToolTip because the viewport isn't a child of the WidgetContent
if (o == widget->ui->projectComboBox->view()->viewport()) if (o == m_widget->ui->projectComboBox->view()->viewport())
return false; return false;
break; break;
default: default:
@@ -127,15 +127,15 @@ bool PreProcessorAdditionPopUp::eventFilter(QObject *o, QEvent *event)
void PreProcessorAdditionPopUp::textChanged() void PreProcessorAdditionPopUp::textChanged()
{ {
partAdditions[widget->ui->projectComboBox->currentIndex()].additionalDefines m_partAdditions[m_widget->ui->projectComboBox->currentIndex()].additionalDefines
= widget->ui->additionalEdit->toPlainText().toLatin1(); = m_widget->ui->additionalEdit->toPlainText().toLatin1();
} }
void PreProcessorAdditionPopUp::finish() void PreProcessorAdditionPopUp::finish()
{ {
widget->disconnect(this); m_widget->disconnect(this);
foreach (ProjectPartAddition partAddition, originalPartAdditions) { foreach (ProjectPartAddition partAddition, m_originalPartAdditions) {
QVariantMap settings = partAddition.projectPart->project->additionalCppDefines(); QVariantMap settings = partAddition.projectPart->project->additionalCppDefines();
if (!settings[partAddition.projectPart->projectFile].toString().isEmpty() if (!settings[partAddition.projectPart->projectFile].toString().isEmpty()
&& !partAddition.additionalDefines.isEmpty()) { && !partAddition.additionalDefines.isEmpty()) {
@@ -143,26 +143,28 @@ void PreProcessorAdditionPopUp::finish()
partAddition.projectPart->project->setAdditionalCppDefines(settings); partAddition.projectPart->project->setAdditionalCppDefines(settings);
} }
} }
emit finished(originalPartAdditions[widget->ui->projectComboBox->currentIndex()].additionalDefines); emit finished(m_originalPartAdditions.value(m_widget->ui->projectComboBox->currentIndex())
.additionalDefines);
} }
void PreProcessorAdditionPopUp::projectChanged(int index) void PreProcessorAdditionPopUp::projectChanged(int index)
{ {
widget->ui->additionalEdit->setPlainText(QLatin1String(partAdditions[index].additionalDefines)); m_widget->ui->additionalEdit->setPlainText(
QLatin1String(m_partAdditions[index].additionalDefines));
} }
void PreProcessorAdditionPopUp::apply() void PreProcessorAdditionPopUp::apply()
{ {
originalPartAdditions = partAdditions; m_originalPartAdditions = m_partAdditions;
hideTipImmediately(); hideTipImmediately();
} }
void PreProcessorAdditionPopUp::cancel() void PreProcessorAdditionPopUp::cancel()
{ {
partAdditions = originalPartAdditions; m_partAdditions = m_originalPartAdditions;
hideTipImmediately(); hideTipImmediately();
} }
PreProcessorAdditionPopUp::PreProcessorAdditionPopUp() PreProcessorAdditionPopUp::PreProcessorAdditionPopUp()
: widget(0) : m_widget(0)
{} {}

6
src/plugins/cppeditor/cpppreprocessoradditionwidget.h
View File

@@ -84,9 +84,9 @@ private:
QByteArray additionalDefines; QByteArray additionalDefines;
}; };
PreProcessorAdditionWidget* widget; PreProcessorAdditionWidget* m_widget;
QList<ProjectPartAddition> originalPartAdditions; QList<ProjectPartAddition> m_originalPartAdditions;
QList<ProjectPartAddition> partAdditions; QList<ProjectPartAddition> m_partAdditions;
}; };