From 6fef24f6769f707cb4424c77b51766ef0ce2d5d0 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 21 Oct 2016 13:48:45 +0200 Subject: [PATCH] replace const char* with QString in removeItemFromListWidget --- .../Gui/TaskLinearPatternParameters.cpp | 2 +- .../PartDesign/Gui/TaskMirroredParameters.cpp | 2 +- .../Gui/TaskMultiTransformParameters.cpp | 2 +- .../Gui/TaskPolarPatternParameters.cpp | 16 ++++++++++------ src/Mod/PartDesign/Gui/TaskScaledParameters.cpp | 2 +- .../PartDesign/Gui/TaskTransformedParameters.cpp | 4 ++-- .../PartDesign/Gui/TaskTransformedParameters.h | 2 +- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index 9eeb09e5f..e65c6688e 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -222,7 +222,7 @@ void TaskLinearPatternParameters::onSelectionChanged(const Gui::SelectionChanges if (selectionMode == addFeature) ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else - removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); + removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName)); exitSelectionMode(); } else { diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp index 33a4f8885..006692cfb 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp @@ -181,7 +181,7 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg if (selectionMode == addFeature) ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else - removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); + removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName)); exitSelectionMode(); } else { if ( selectionMode == reference) { diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 41854fb82..049a29da5 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -153,7 +153,7 @@ void TaskMultiTransformParameters::onSelectionChanged(const Gui::SelectionChange if (selectionMode == addFeature) ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else - removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); + removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName)); exitSelectionMode(); } } diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp index 19f7d68ba..075211759 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp @@ -135,10 +135,13 @@ void TaskPolarPatternParameters::setupUI() std::vector originals = pcPolarPattern->Originals.getValues(); // Fill data into dialog elements - for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) - { - if ((*i) != NULL) - ui->listWidgetFeatures->addItem(QString::fromLatin1((*i)->getNameInDocument())); + for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { + const App::DocumentObject* obj = *i; + if (obj != NULL) { + QListWidgetItem* item = new QListWidgetItem(); + item->setText(QString::fromLatin1(obj->getNameInDocument())); + ui->listWidgetFeatures->addItem(item); + } } // --------------------- @@ -219,10 +222,11 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges& if (msg.Type == Gui::SelectionChanges::AddSelection) { if (originalSelected(msg)) { + QString objectName = QString::fromLatin1(msg.pObjectName); if (selectionMode == addFeature) - ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); + ui->listWidgetFeatures->addItem(objectName); else - removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); + removeItemFromListWidget(ui->listWidgetFeatures, objectName); exitSelectionMode(); } else { if (selectionMode == reference) { diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp index c8c2f3961..3ec1e610b 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp @@ -151,7 +151,7 @@ void TaskScaledParameters::onSelectionChanged(const Gui::SelectionChanges& msg) if (selectionMode == addFeature) ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else - removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); + removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName)); exitSelectionMode(); } } diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index cd3373837..913926a2d 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -162,9 +162,9 @@ void TaskTransformedParameters::onButtonRemoveFeature(bool checked) } } -void TaskTransformedParameters::removeItemFromListWidget(QListWidget* widget, const char* itemstr) +void TaskTransformedParameters::removeItemFromListWidget(QListWidget* widget, const QString& itemstr) { - QList items = widget->findItems(QString::fromLatin1(itemstr), Qt::MatchExactly); + QList items = widget->findItems(itemstr, Qt::MatchExactly); if (!items.empty()) { for (QList::const_iterator i = items.begin(); i != items.end(); i++) { QListWidgetItem* it = widget->takeItem(widget->row(*i)); diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index ba417290d..569539fff 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -187,7 +187,7 @@ protected: virtual void changeEvent(QEvent *e) = 0; virtual void onSelectionChanged(const Gui::SelectionChanges& msg) = 0; virtual void clearButtons()=0; - static void removeItemFromListWidget(QListWidget* widget, const char* itemstr); + static void removeItemFromListWidget(QListWidget* widget, const QString& itemstr); void fillAxisCombo(ComboLinks &combolinks, Part::Part2DObject *sketch); void fillPlanesCombo(ComboLinks &combolinks, Part::Part2DObject *sketch);