From 546ab197853d61d4e40393e968d3ff00f1e9f630 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sat, 19 Dec 2020 16:13:25 -0800 Subject: [PATCH] Cleanup. --- common/minifig.cpp | 6 ------ qt/lc_qminifigdialog.cpp | 11 ++++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/common/minifig.cpp b/common/minifig.cpp index 490c76ec..2ded6fb5 100644 --- a/common/minifig.cpp +++ b/common/minifig.cpp @@ -1,16 +1,10 @@ #include "lc_global.h" #include "minifig.h" #include "lc_colors.h" -#include -#include -#include "camera.h" #include "pieceinf.h" -#include "project.h" #include "lc_model.h" #include "lc_library.h" #include "lc_application.h" -#include "lc_context.h" -#include "lc_scene.h" #include "lc_file.h" #include "lc_profile.h" diff --git a/qt/lc_qminifigdialog.cpp b/qt/lc_qminifigdialog.cpp index 611fa23e..3ab8338d 100644 --- a/qt/lc_qminifigdialog.cpp +++ b/qt/lc_qminifigdialog.cpp @@ -58,7 +58,7 @@ lcQMinifigDialog::lcQMinifigDialog(QWidget* Parent) for (int ItemIndex = 0; ItemIndex < LC_MFW_NUMITEMS; ItemIndex++) { - std::vector& PartList = mMinifigWizard->mSettings[ItemIndex]; + const std::vector& PartList = mMinifigWizard->mSettings[ItemIndex]; QStringList ItemStrings; QVector Separators; @@ -81,10 +81,11 @@ lcQMinifigDialog::lcQMinifigDialog(QWidget* Parent) ItemCombo->setCurrentIndex(mMinifigWizard->GetSelectionIndex(ItemIndex)); ItemCombo->blockSignals(false); - lcQColorPicker *colorPicker = mColorPickers[ItemIndex]; - colorPicker->blockSignals(true); - colorPicker->setCurrentColor(mMinifigWizard->mMinifig.Colors[ItemIndex]); - colorPicker->blockSignals(false); + lcQColorPicker* ColorPicker = mColorPickers[ItemIndex]; + + ColorPicker->blockSignals(true); + ColorPicker->setCurrentColor(mMinifigWizard->mMinifig.Colors[ItemIndex]); + ColorPicker->blockSignals(false); } #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))