mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-03 06:04:31 +00:00
Code Issues Releases Wiki Activity

Use std::size_t for items count

Browse source
This commit is contained in:
elsid 2025-05-03 02:49:19 +02:00
parent 4e5e8e7889
commit bcfe06d85a
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
11 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,7 @@ namespace MWGui
mItemView->update(); mItemView->update();
} }
void CompanionWindow::dragItem(MyGUI::Widget* sender, int count) void CompanionWindow::dragItem(MyGUI::Widget* /*sender*/, std::size_t count)
{ {
mDragAndDrop->startDrag(mSelectedItem, mSortModel, mModel, mItemView, count); mDragAndDrop->startDrag(mSelectedItem, mSortModel, mModel, mItemView, count);
} }

2
apps/openmw/mwgui/companionwindow.hpp
View file

@ -55,7 +55,7 @@ namespace MWGui
void onItemSelected(int index); void onItemSelected(int index);
void onNameFilterChanged(MyGUI::EditBox* _sender); void onNameFilterChanged(MyGUI::EditBox* _sender);
void onBackgroundSelected(); void onBackgroundSelected();
void dragItem(MyGUI::Widget* sender, int count); void dragItem(MyGUI::Widget* sender, std::size_t count);
void onMessageBoxButtonClicked(int button); void onMessageBoxButtonClicked(int button);

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

@ -95,7 +95,7 @@ namespace MWGui
dragItem(nullptr, count); dragItem(nullptr, count);
} }
void ContainerWindow::dragItem(MyGUI::Widget* sender, int count) void ContainerWindow::dragItem(MyGUI::Widget* /*sender*/, std::size_t count)
{ {
if (!mModel) if (!mModel)
return; return;

2
apps/openmw/mwgui/container.hpp
View file

@ -60,7 +60,7 @@ namespace MWGui
void onItemSelected(int index); void onItemSelected(int index);
void onBackgroundSelected(); void onBackgroundSelected();
void dragItem(MyGUI::Widget* sender, int count); void dragItem(MyGUI::Widget*, std::size_t count);
void dropItem(); void dropItem();
void onCloseButtonClicked(MyGUI::Widget* _sender); void onCloseButtonClicked(MyGUI::Widget* _sender);
void onTakeAllButtonClicked(MyGUI::Widget* _sender); void onTakeAllButtonClicked(MyGUI::Widget* _sender);

6
apps/openmw/mwgui/countdialog.hpp
View file

@ -16,12 +16,10 @@ namespace MWGui
CountDialog(); CountDialog();
void openCountDialog(const std::string& item, const std::string& message, const int maxCount); void openCountDialog(const std::string& item, const std::string& message, const int maxCount);
typedef MyGUI::delegates::MultiDelegate<MyGUI::Widget*, int> EventHandle_WidgetInt;
/** Event : Ok button was clicked.\n /** Event : Ok button was clicked.\n
signature : void method(MyGUI::Widget* _sender, int _count)\n signature : void method(MyGUI::Widget* sender, std::size_t count)\n
*/ */
EventHandle_WidgetInt eventOkClicked; MyGUI::delegates::MultiDelegate<MyGUI::Widget*, std::size_t> eventOkClicked;
private: private:
MyGUI::ScrollBar* mSlider; MyGUI::ScrollBar* mSlider;

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

@ -27,7 +27,7 @@ namespace MWGui
} }
void DragAndDrop::startDrag( void DragAndDrop::startDrag(
int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count) int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, std::size_t count)
{ {
mItem = sourceModel->getItem(index); mItem = sourceModel->getItem(index);
mDraggedCount = count; mDraggedCount = count;

4
apps/openmw/mwgui/draganddrop.hpp
View file

@ -24,12 +24,12 @@ namespace MWGui
ItemView* mSourceView; ItemView* mSourceView;
SortFilterItemModel* mSourceSortModel; SortFilterItemModel* mSourceSortModel;
ItemStack mItem; ItemStack mItem;
int mDraggedCount; std::size_t mDraggedCount;
DragAndDrop(); DragAndDrop();
void startDrag( void startDrag(
int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count); int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, std::size_t count);
void drop(ItemModel* targetModel, ItemView* targetView); void drop(ItemModel* targetModel, ItemView* targetView);
void update(); void update();
void onFrame(); void onFrame();

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

@ -361,14 +361,14 @@ namespace MWGui
} }
} }
void InventoryWindow::dragItem(MyGUI::Widget* sender, int count) void InventoryWindow::dragItem(MyGUI::Widget* /*sender*/, std::size_t count)
{ {
ensureSelectedItemUnequipped(count); ensureSelectedItemUnequipped(count);
mDragAndDrop->startDrag(mSelectedItem, mSortModel, mTradeModel, mItemView, count); mDragAndDrop->startDrag(mSelectedItem, mSortModel, mTradeModel, mItemView, count);
notifyContentChanged(); notifyContentChanged();
} }
void InventoryWindow::sellItem(MyGUI::Widget* sender, int count) void InventoryWindow::sellItem(MyGUI::Widget* /*sender*/, std::size_t count)
{ {
ensureSelectedItemUnequipped(count); ensureSelectedItemUnequipped(count);
const ItemStack& item = mTradeModel->getItem(mSelectedItem); const ItemStack& item = mTradeModel->getItem(mSelectedItem);

4
apps/openmw/mwgui/inventorywindow.hpp
View file

@ -120,8 +120,8 @@ namespace MWGui
void onBackgroundSelected(); void onBackgroundSelected();
void sellItem(MyGUI::Widget* sender, int count); void sellItem(MyGUI::Widget* sender, std::size_t count);
void dragItem(MyGUI::Widget* sender, int count); void dragItem(MyGUI::Widget* sender, std::size_t count);
void onWindowResize(MyGUI::Window* _sender); void onWindowResize(MyGUI::Window* _sender);
void onFilterChanged(MyGUI::Widget* _sender); void onFilterChanged(MyGUI::Widget* _sender);

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

@ -292,7 +292,7 @@ namespace MWGui
} }
} }
void TradeWindow::sellItem(MyGUI::Widget* sender, int count) void TradeWindow::sellItem(MyGUI::Widget* /*sender*/, std::size_t count)
{ {
const ItemStack& item = mTradeModel->getItem(mItemToSell); const ItemStack& item = mTradeModel->getItem(mItemToSell);
const ESM::RefId& sound = item.mBase.getClass().getUpSoundId(item.mBase); const ESM::RefId& sound = item.mBase.getClass().getUpSoundId(item.mBase);

2
apps/openmw/mwgui/tradewindow.hpp
View file

@ -95,7 +95,7 @@ namespace MWGui
void updateOffer(); void updateOffer();
void onItemSelected(int index); void onItemSelected(int index);
void sellItem(MyGUI::Widget* sender, int count); void sellItem(MyGUI::Widget* sender, std::size_t count);
void borrowItem(int index, size_t count); void borrowItem(int index, size_t count);
void returnItem(int index, size_t count); void returnItem(int index, size_t count);