From 00836be5e1a556dd32f49e065aa7c5dd55f17c91 Mon Sep 17 00:00:00 2001 From: Bruno Van de Velde Date: Mon, 7 May 2018 22:51:52 +0200 Subject: [PATCH] Fixed some warnings --- examples/many_different_widgets/ManyDifferentWidgets.cpp | 2 +- examples/scalable_login_screen/ScalableLoginScreen.cpp | 2 +- gui-builder/include/ComboBoxProperties.hpp | 2 +- gui-builder/include/ListBoxProperties.hpp | 2 +- gui-builder/include/SpinButtonProperties.hpp | 6 +++--- gui-builder/src/Form.cpp | 2 +- gui-builder/src/GuiBuilder.cpp | 4 ++-- src/TGUI/Text.cpp | 2 +- src/TGUI/Widgets/EditBox.cpp | 2 +- src/TGUI/Widgets/Knob.cpp | 4 ++-- src/TGUI/Widgets/ProgressBar.cpp | 2 +- src/TGUI/Widgets/TextBox.cpp | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/many_different_widgets/ManyDifferentWidgets.cpp b/examples/many_different_widgets/ManyDifferentWidgets.cpp index c8fcf171..0a5f5ca9 100644 --- a/examples/many_different_widgets/ManyDifferentWidgets.cpp +++ b/examples/many_different_widgets/ManyDifferentWidgets.cpp @@ -51,7 +51,7 @@ int main() auto menu = tgui::MenuBar::create(); menu->setRenderer(theme.getRenderer("MenuBar")); - menu->setSize((float)window.getSize().x, 22.f); + menu->setSize(static_cast(window.getSize().x), 22.f); menu->addMenu("File"); menu->addMenuItem("Load"); menu->addMenuItem("Save"); diff --git a/examples/scalable_login_screen/ScalableLoginScreen.cpp b/examples/scalable_login_screen/ScalableLoginScreen.cpp index b96ec644..ad82b606 100644 --- a/examples/scalable_login_screen/ScalableLoginScreen.cpp +++ b/examples/scalable_login_screen/ScalableLoginScreen.cpp @@ -97,7 +97,7 @@ int main() // When the window is resized, the view is changed else if (event.type == sf::Event::Resized) { - window.setView(sf::View(sf::FloatRect(0, 0, (float)event.size.width, (float)event.size.height))); + window.setView(sf::View(sf::FloatRect(0.f, 0.f, static_cast(event.size.width), static_cast(event.size.height)))); gui.setView(window.getView()); } diff --git a/gui-builder/include/ComboBoxProperties.hpp b/gui-builder/include/ComboBoxProperties.hpp index bb1041f4..8286946e 100644 --- a/gui-builder/include/ComboBoxProperties.hpp +++ b/gui-builder/include/ComboBoxProperties.hpp @@ -45,7 +45,7 @@ struct ComboBoxProperties : WidgetProperties comboBox->addItem(item); } else if (property == "SelectedItemIndex") - comboBox->setSelectedItemByIndex(tgui::stoi(value)); + comboBox->setSelectedItemByIndex(static_cast(tgui::stoi(value))); else if (property == "TextSize") comboBox->setTextSize(static_cast(tgui::stoi(value))); else if (property == "MaximumItems") diff --git a/gui-builder/include/ListBoxProperties.hpp b/gui-builder/include/ListBoxProperties.hpp index 0d3ee9bb..75ca431e 100644 --- a/gui-builder/include/ListBoxProperties.hpp +++ b/gui-builder/include/ListBoxProperties.hpp @@ -45,7 +45,7 @@ struct ListBoxProperties : WidgetProperties listBox->addItem(item); } else if (property == "SelectedItemIndex") - listBox->setSelectedItemByIndex(tgui::stoi(value)); + listBox->setSelectedItemByIndex(static_cast(tgui::stoi(value))); else if (property == "ItemHeight") listBox->setItemHeight(static_cast(tgui::stoi(value))); else if (property == "TextSize") diff --git a/gui-builder/include/SpinButtonProperties.hpp b/gui-builder/include/SpinButtonProperties.hpp index 30a51576..1662989c 100644 --- a/gui-builder/include/SpinButtonProperties.hpp +++ b/gui-builder/include/SpinButtonProperties.hpp @@ -35,11 +35,11 @@ struct SpinButtonProperties : WidgetProperties { auto spinButton = std::dynamic_pointer_cast(widget); if (property == "Minimum") - spinButton->setMinimum(tgui::stoi(value)); + spinButton->setMinimum(tgui::stof(value)); else if (property == "Maximum") - spinButton->setMaximum(tgui::stoi(value)); + spinButton->setMaximum(tgui::stof(value)); else if (property == "Value") - spinButton->setValue(tgui::stoi(value)); + spinButton->setValue(tgui::stof(value)); else WidgetProperties::updateProperty(widget, property, value); } diff --git a/gui-builder/src/Form.cpp b/gui-builder/src/Form.cpp index b63d8576..82eb8f24 100644 --- a/gui-builder/src/Form.cpp +++ b/gui-builder/src/Form.cpp @@ -324,7 +324,7 @@ void Form::importLoadedWidgets(tgui::Container::Ptr parent) { const std::string potentialNumber = widgetNames[i].substring(6); if (std::all_of(potentialNumber.begin(), potentialNumber.end(), ::isdigit)) - m_idCounter = std::max(m_idCounter, tgui::stoi(potentialNumber)); + m_idCounter = std::max(m_idCounter, static_cast(tgui::stoi(potentialNumber))); } if (widgets[i]->isContainer()) diff --git a/gui-builder/src/GuiBuilder.cpp b/gui-builder/src/GuiBuilder.cpp index 218c926b..553cfaf4 100644 --- a/gui-builder/src/GuiBuilder.cpp +++ b/gui-builder/src/GuiBuilder.cpp @@ -286,7 +286,7 @@ void GuiBuilder::mainLoop() } else if (event.type == sf::Event::Resized) { - m_window.setView(sf::View({0, 0, (float)event.size.width, (float)event.size.height})); + m_window.setView(sf::View({0.f, 0.f, static_cast(event.size.width), static_cast(event.size.height)})); m_gui.setView(m_window.getView()); } else if (event.type == sf::Event::MouseButtonReleased) @@ -402,7 +402,7 @@ void GuiBuilder::closeForm(Form* form) } else if (event.type == sf::Event::Resized) { - m_window.setView(sf::View({0, 0, (float)event.size.width, (float)event.size.height})); + m_window.setView(sf::View({0.f, 0.f, static_cast(event.size.width), static_cast(event.size.height)})); m_gui.setView(m_window.getView()); } diff --git a/src/TGUI/Text.cpp b/src/TGUI/Text.cpp index 2df0d89c..f8462d81 100644 --- a/src/TGUI/Text.cpp +++ b/src/TGUI/Text.cpp @@ -205,7 +205,7 @@ namespace tgui const unsigned int textSize = m_text.getCharacterSize(); for (std::size_t i = 0; i < string.getSize(); ++i) { - const float kerning = static_cast(font->getKerning(prevChar, string[i], textSize)); + const float kerning = font->getKerning(prevChar, string[i], textSize); if (string[i] == '\n') { maxWidth = std::max(maxWidth, width); diff --git a/src/TGUI/Widgets/EditBox.cpp b/src/TGUI/Widgets/EditBox.cpp index 6e8fa1ba..f4f15a04 100644 --- a/src/TGUI/Widgets/EditBox.cpp +++ b/src/TGUI/Widgets/EditBox.cpp @@ -1237,7 +1237,7 @@ namespace tgui else charWidth = static_cast(m_fontCached.getGlyph(curChar, textSize, bold).advance); - const float kerning = static_cast(m_fontCached.getKerning(prevChar, curChar, textSize)); + const float kerning = m_fontCached.getKerning(prevChar, curChar, textSize); if (width + charWidth < posX) width += charWidth + kerning; else diff --git a/src/TGUI/Widgets/Knob.cpp b/src/TGUI/Widgets/Knob.cpp index c9b0e742..29895a68 100644 --- a/src/TGUI/Widgets/Knob.cpp +++ b/src/TGUI/Widgets/Knob.cpp @@ -408,7 +408,7 @@ namespace tgui if (compareFloats(m_angle, m_startRotation)) setValue(m_minimum); else - setValue(static_cast((((360.0 - m_angle) + m_startRotation) / allowedAngle * (m_maximum - m_minimum)) + m_minimum)); + setValue(static_cast((((360.0f - m_angle) + m_startRotation) / allowedAngle * (m_maximum - m_minimum)) + m_minimum)); } } else // counter-clockwise @@ -417,7 +417,7 @@ namespace tgui setValue(static_cast(((m_angle - m_startRotation) / allowedAngle * (m_maximum - m_minimum)) + m_minimum)); else { - setValue(static_cast(((m_angle + (360.0 - m_startRotation)) / allowedAngle * (m_maximum - m_minimum)) + m_minimum)); + setValue(static_cast(((m_angle + (360.0f - m_startRotation)) / allowedAngle * (m_maximum - m_minimum)) + m_minimum)); } } } diff --git a/src/TGUI/Widgets/ProgressBar.cpp b/src/TGUI/Widgets/ProgressBar.cpp index fca29eba..b824c66d 100644 --- a/src/TGUI/Widgets/ProgressBar.cpp +++ b/src/TGUI/Widgets/ProgressBar.cpp @@ -546,7 +546,7 @@ namespace tgui { Vector2f textTranslation = (getInnerSize() - m_textBack.getSize()) / 2.f; - if (Color(m_textBack.getColor()) == Color(m_textFront.getColor())) + if (m_textBack.getColor() == m_textFront.getColor()) { states.transform.translate(textTranslation); m_textBack.draw(target, states); diff --git a/src/TGUI/Widgets/TextBox.cpp b/src/TGUI/Widgets/TextBox.cpp index 85d06ff6..7a6c9989 100644 --- a/src/TGUI/Widgets/TextBox.cpp +++ b/src/TGUI/Widgets/TextBox.cpp @@ -1025,7 +1025,7 @@ namespace tgui else charWidth = static_cast(m_fontCached.getGlyph(curChar, getTextSize(), false).advance); - const float kerning = static_cast(m_fontCached.getKerning(prevChar, curChar, getTextSize())); + const float kerning = m_fontCached.getKerning(prevChar, curChar, getTextSize()); if (width + charWidth + kerning <= position.x) width += charWidth + kerning; else