Commit 6d8237c5 authored by Matthias Möller's avatar Matthias Möller

size_t - unsigned conversion

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17260 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b35cd49e
...@@ -289,7 +289,7 @@ void MaterialPicker::slotMouseEvent(QMouseEvent* _event) { ...@@ -289,7 +289,7 @@ void MaterialPicker::slotMouseEvent(QMouseEvent* _event) {
materialInfo.key = Qt::Key_unknown; materialInfo.key = Qt::Key_unknown;
if (shortKeyRow_.size() < supportedKeys_) if (shortKeyRow_.size() < supportedKeys_)
{ {
materialInfo.key = Qt::Key_1+shortKeyRow_.size(); materialInfo.key = Qt::Key_1+(int)shortKeyRow_.size();
shortKeyRow_[materialInfo.key] = materialListWidget_->count(); shortKeyRow_[materialInfo.key] = materialListWidget_->count();
} }
...@@ -411,19 +411,19 @@ void MaterialPicker::slotKeyEvent(QKeyEvent* _event) ...@@ -411,19 +411,19 @@ void MaterialPicker::slotKeyEvent(QKeyEvent* _event)
if (shortKeyRow_.find(key) == shortKeyRow_.end()) if (shortKeyRow_.find(key) == shortKeyRow_.end())
return; return;
slotFillMaterialMode(); slotFillMaterialMode();
materialListWidget_->setCurrentRow(shortKeyRow_[key]); materialListWidget_->setCurrentRow((int)shortKeyRow_[key]);
} }
} }
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void MaterialPicker::changeHotKey(const int &_key) void MaterialPicker::changeHotKey(const int _key)
{ {
std::map<int,size_t>::iterator iter = shortKeyRow_.find(_key); std::map<int,size_t>::iterator iter = shortKeyRow_.find(_key);
if (iter != shortKeyRow_.end()) if (iter != shortKeyRow_.end())
{ {
//remove old key //remove old key
size_t oldIndex = iter->second; int oldIndex = (int)iter->second;
QListWidgetItem* oldItem = materialListWidget_->item(oldIndex); QListWidgetItem* oldItem = materialListWidget_->item(oldIndex);
//remove name //remove name
oldItem->setText( plainName(oldItem->text(),oldIndex) ); oldItem->setText( plainName(oldItem->text(),oldIndex) );
...@@ -433,7 +433,7 @@ void MaterialPicker::changeHotKey(const int &_key) ...@@ -433,7 +433,7 @@ void MaterialPicker::changeHotKey(const int &_key)
} }
//set the new item (save and hint) //set the new item (save and hint)
size_t newIndex = materialListWidget_->currentRow(); int newIndex = materialListWidget_->currentRow();
QListWidgetItem* newItem = materialListWidget_->item(newIndex); QListWidgetItem* newItem = materialListWidget_->item(newIndex);
materialList_[newIndex].key = _key; materialList_[newIndex].key = _key;
......
...@@ -169,7 +169,7 @@ private slots: ...@@ -169,7 +169,7 @@ private slots:
void createContextMenu(const QPoint& _point); void createContextMenu(const QPoint& _point);
/// change specified HotKey to current item /// change specified HotKey to current item
void changeHotKey(const int &_key); void changeHotKey(const int _key);
void slotMaterialProperties(); void slotMaterialProperties();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment