suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace const char* with QString in removeItemFromListWidget

Browse Source
This commit is contained in:
wmayer 2016-10-21 13:48:45 +02:00
parent e178501c4f
commit 6fef24f676
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
View File

@ -222,7 +222,7 @@ void TaskLinearPatternParameters::onSelectionChanged(const Gui::SelectionChanges
if (selectionMode == addFeature) if (selectionMode == addFeature)
ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName));
else else
removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName));
exitSelectionMode(); exitSelectionMode();
} else { } else {

2
src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
View File

@ -181,7 +181,7 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg
if (selectionMode == addFeature) if (selectionMode == addFeature)
ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName));
else else
removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName));
exitSelectionMode(); exitSelectionMode();
} else { } else {
if ( selectionMode == reference) { if ( selectionMode == reference) {

2
src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
View File

@ -153,7 +153,7 @@ void TaskMultiTransformParameters::onSelectionChanged(const Gui::SelectionChange
if (selectionMode == addFeature) if (selectionMode == addFeature)
ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName));
else else
removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName));
exitSelectionMode(); exitSelectionMode();
} }
} }

16
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@ -135,10 +135,13 @@ void TaskPolarPatternParameters::setupUI()
std::vector<App::DocumentObject*> originals = pcPolarPattern->Originals.getValues(); std::vector<App::DocumentObject*> originals = pcPolarPattern->Originals.getValues();
// Fill data into dialog elements // Fill data into dialog elements
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); ++i) for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); ++i) {
{ const App::DocumentObject* obj = *i;
if ((*i) != NULL) if (obj != NULL) {
ui->listWidgetFeatures->addItem(QString::fromLatin1((*i)->getNameInDocument())); 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 (msg.Type == Gui::SelectionChanges::AddSelection) {
if (originalSelected(msg)) { if (originalSelected(msg)) {
QString objectName = QString::fromLatin1(msg.pObjectName);
if (selectionMode == addFeature) if (selectionMode == addFeature)
ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); ui->listWidgetFeatures->addItem(objectName);
else else
removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); removeItemFromListWidget(ui->listWidgetFeatures, objectName);
exitSelectionMode(); exitSelectionMode();
} else { } else {
if (selectionMode == reference) { if (selectionMode == reference) {

2
src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
View File

@ -151,7 +151,7 @@ void TaskScaledParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
if (selectionMode == addFeature) if (selectionMode == addFeature)
ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName));
else else
removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); removeItemFromListWidget(ui->listWidgetFeatures, QString::fromLatin1(msg.pObjectName));
exitSelectionMode(); exitSelectionMode();
} }
} }

4
src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
View File

@ -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<QListWidgetItem*> items = widget->findItems(QString::fromLatin1(itemstr), Qt::MatchExactly); QList<QListWidgetItem*> items = widget->findItems(itemstr, Qt::MatchExactly);
if (!items.empty()) { if (!items.empty()) {
for (QList<QListWidgetItem*>::const_iterator i = items.begin(); i != items.end(); i++) { for (QList<QListWidgetItem*>::const_iterator i = items.begin(); i != items.end(); i++) {
QListWidgetItem* it = widget->takeItem(widget->row(*i)); QListWidgetItem* it = widget->takeItem(widget->row(*i));

2
src/Mod/PartDesign/Gui/TaskTransformedParameters.h
View File

@ -187,7 +187,7 @@ protected:
virtual void changeEvent(QEvent *e) = 0; virtual void changeEvent(QEvent *e) = 0;
virtual void onSelectionChanged(const Gui::SelectionChanges& msg) = 0; virtual void onSelectionChanged(const Gui::SelectionChanges& msg) = 0;
virtual void clearButtons()=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 fillAxisCombo(ComboLinks &combolinks, Part::Part2DObject *sketch);
void fillPlanesCombo(ComboLinks &combolinks, Part::Part2DObject *sketch); void fillPlanesCombo(ComboLinks &combolinks, Part::Part2DObject *sketch);