krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Explicitely set the user data type to avoid const/non-const mismatch

Browse source
This commit is contained in:
scrawl 2017-03-13 02:47:52 +01:00
parent 5de5be77f3
commit a556475fae
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -122,7 +122,7 @@ namespace MWGui
if (!iter->isEmpty()) if (!iter->isEmpty())
{ {
mApparatus.at (index)->setUserString ("ToolTipType", "ItemPtr"); mApparatus.at (index)->setUserString ("ToolTipType", "ItemPtr");
mApparatus.at (index)->setUserData (*iter); mApparatus.at (index)->setUserData (MWWorld::Ptr(*iter));
} }
} }
@ -190,9 +190,9 @@ namespace MWGui
continue; continue;
ingredient->setUserString("ToolTipType", "ItemPtr"); ingredient->setUserString("ToolTipType", "ItemPtr");
ingredient->setUserData(item); ingredient->setUserData(MWWorld::Ptr(item));
ingredient->setCount(ingredient->getUserData<MWWorld::Ptr>()->getRefData().getCount()); ingredient->setCount(item.getRefData().getCount());
} }
mItemView->update(); mItemView->update();

4
apps/openmw/mwgui/enchantingdialog.cpp
View file

@ -79,7 +79,7 @@ namespace MWGui
{ {
mSoulBox->setItem(gem); mSoulBox->setItem(gem);
mSoulBox->setUserString ("ToolTipType", "ItemPtr"); mSoulBox->setUserString ("ToolTipType", "ItemPtr");
mSoulBox->setUserData(gem); mSoulBox->setUserData(MWWorld::Ptr(gem));
mEnchanting.setSoulGem(gem); mEnchanting.setSoulGem(gem);
} }
} }
@ -97,7 +97,7 @@ namespace MWGui
mName->setCaption(item.getClass().getName(item)); mName->setCaption(item.getClass().getName(item));
mItemBox->setItem(item); mItemBox->setItem(item);
mItemBox->setUserString ("ToolTipType", "ItemPtr"); mItemBox->setUserString ("ToolTipType", "ItemPtr");
mItemBox->setUserData(item); mItemBox->setUserData(MWWorld::Ptr(item));
mEnchanting.setOldItem(item); mEnchanting.setOldItem(item);
} }
} }

4
apps/openmw/mwgui/hud.cpp
View file

@ -417,7 +417,7 @@ namespace MWGui
mSpellStatus->setProgressPosition(chargePercent); mSpellStatus->setProgressPosition(chargePercent);
mSpellBox->setUserString("ToolTipType", "ItemPtr"); mSpellBox->setUserString("ToolTipType", "ItemPtr");
mSpellBox->setUserData(item); mSpellBox->setUserData(MWWorld::Ptr(item));
mSpellImage->setItem(item); mSpellImage->setItem(item);
} }
@ -435,7 +435,7 @@ namespace MWGui
mWeapBox->clearUserStrings(); mWeapBox->clearUserStrings();
mWeapBox->setUserString("ToolTipType", "ItemPtr"); mWeapBox->setUserString("ToolTipType", "ItemPtr");
mWeapBox->setUserData(item); mWeapBox->setUserData(MWWorld::Ptr(item));
mWeapStatus->setProgressRange(100); mWeapStatus->setProgressRange(100);
mWeapStatus->setProgressPosition(durabilityPercent); mWeapStatus->setProgressPosition(durabilityPercent);

2
apps/openmw/mwgui/itemchargeview.cpp
View file

@ -97,7 +97,7 @@ namespace MWGui
line.mIcon = mScrollView->createWidget<ItemWidget>("MW_ItemIconSmall", MyGUI::IntCoord(), MyGUI::Align::Default); line.mIcon = mScrollView->createWidget<ItemWidget>("MW_ItemIconSmall", MyGUI::IntCoord(), MyGUI::Align::Default);
line.mIcon->setItem(line.mItemPtr); line.mIcon->setItem(line.mItemPtr);
line.mIcon->setUserString("ToolTipType", "ItemPtr"); line.mIcon->setUserString("ToolTipType", "ItemPtr");
line.mIcon->setUserData(line.mItemPtr); line.mIcon->setUserData(MWWorld::Ptr(line.mItemPtr));
line.mIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemChargeView::onIconClicked); line.mIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemChargeView::onIconClicked);
line.mIcon->eventMouseWheel += MyGUI::newDelegate(this, &ItemChargeView::onMouseWheelMoved); line.mIcon->eventMouseWheel += MyGUI::newDelegate(this, &ItemChargeView::onMouseWheelMoved);

2
apps/openmw/mwgui/merchantrepair.cpp
View file

@ -86,7 +86,7 @@ void MerchantRepair::startRepair(const MWWorld::Ptr &actor)
currentY += 18; currentY += 18;
button->setUserString("Price", MyGUI::utility::toString(price)); button->setUserString("Price", MyGUI::utility::toString(price));
button->setUserData(*iter); button->setUserData(MWWorld::Ptr(*iter));
button->setCaptionWithReplacing(name); button->setCaptionWithReplacing(name);
button->setSize(button->getTextSize().width,18); button->setSize(button->getTextSize().width,18);
button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel); button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel);

6
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -185,7 +185,7 @@ namespace MWGui
button->setItem(item, ItemWidget::Barter); button->setItem(item, ItemWidget::Barter);
button->setUserString ("ToolTipType", "ItemPtr"); button->setUserString ("ToolTipType", "ItemPtr");
button->setUserData(item); button->setUserData(MWWorld::Ptr(item));
if (mItemSelectionDialog) if (mItemSelectionDialog)
mItemSelectionDialog->setVisible(false); mItemSelectionDialog->setVisible(false);
@ -209,7 +209,7 @@ namespace MWGui
button->setIcon(item); button->setIcon(item);
button->setUserString ("ToolTipType", "ItemPtr"); button->setUserString ("ToolTipType", "ItemPtr");
button->setUserData(item); button->setUserData(MWWorld::Ptr(item));
if (mMagicSelectionDialog) if (mMagicSelectionDialog)
mMagicSelectionDialog->setVisible(false); mMagicSelectionDialog->setVisible(false);
@ -278,7 +278,7 @@ namespace MWGui
if (Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), id)) if (Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), id))
{ {
item = *it; item = *it;
button->setUserData(item); button->setUserData(MWWorld::Ptr(item));
break; break;
} }
} }

2
apps/openmw/mwgui/recharge.cpp
View file

@ -68,7 +68,7 @@ void Recharge::start (const MWWorld::Ptr &item)
{ {
mGemIcon->setItem(item); mGemIcon->setItem(item);
mGemIcon->setUserString("ToolTipType", "ItemPtr"); mGemIcon->setUserString("ToolTipType", "ItemPtr");
mGemIcon->setUserData(item); mGemIcon->setUserData(MWWorld::Ptr(item));
updateView(); updateView();
} }

2
apps/openmw/mwgui/repair.cpp
View file

@ -66,7 +66,7 @@ void Repair::startRepairItem(const MWWorld::Ptr &item)
mToolIcon->setItem(item); mToolIcon->setItem(item);
mToolIcon->setUserString("ToolTipType", "ItemPtr"); mToolIcon->setUserString("ToolTipType", "ItemPtr");
mToolIcon->setUserData(item); mToolIcon->setUserData(MWWorld::Ptr(item));
updateRepairView(); updateRepairView();
} }

2
apps/openmw/mwgui/spellview.cpp
View file

@ -278,7 +278,7 @@ namespace MWGui
{ {
if (spell.mType == Spell::Type_EnchantedItem) if (spell.mType == Spell::Type_EnchantedItem)
{ {
widget->setUserData(spell.mItem); widget->setUserData(MWWorld::Ptr(spell.mItem));
widget->setUserString("ToolTipType", "ItemPtr"); widget->setUserString("ToolTipType", "ItemPtr");
} }
else else