diff options
author | Kai Blaschke <kai.blaschke@kb-dev.net> | 2024-02-19 16:55:19 +0100 |
---|---|---|
committer | Kai Blaschke <kai.blaschke@kb-dev.net> | 2024-02-19 16:55:19 +0100 |
commit | 431a9c00a56cf4c603be1cf5f773b193621d8150 (patch) | |
tree | 95843aeea9fb6dc18279ee05ff6961f40b19798f /source/windowing | |
parent | 30e1871d3f44629e00a1f66d8164e3e62c7f889f (diff) |
Fixed a huge amount of Clang warnings
On Linux and macOS, using Clang to compile OpenStarbound produces about 400 MB worth of warnings during the build, making the compiler output unreadable and slowing the build down considerably.
99% of the warnings were unqualified uses of std::move and std::forward, which are now all properly qualified.
Fixed a few other minor warnings about non-virtual destructors and some uses of std::move preventing copy elision on temporary objects.
Most remaining warnings are now unused parameters.
Diffstat (limited to 'source/windowing')
-rw-r--r-- | source/windowing/StarButtonWidget.cpp | 2 | ||||
-rw-r--r-- | source/windowing/StarCanvasWidget.cpp | 18 | ||||
-rw-r--r-- | source/windowing/StarGuiContext.cpp | 12 | ||||
-rw-r--r-- | source/windowing/StarImageWidget.cpp | 2 | ||||
-rw-r--r-- | source/windowing/StarKeyBindings.cpp | 2 | ||||
-rw-r--r-- | source/windowing/StarLabelWidget.cpp | 18 | ||||
-rw-r--r-- | source/windowing/StarListWidget.cpp | 2 | ||||
-rw-r--r-- | source/windowing/StarPane.cpp | 4 | ||||
-rw-r--r-- | source/windowing/StarPaneManager.cpp | 6 | ||||
-rw-r--r-- | source/windowing/StarRegisteredPaneManager.hpp | 2 | ||||
-rw-r--r-- | source/windowing/StarTabSet.cpp | 2 | ||||
-rw-r--r-- | source/windowing/StarWidgetLuaBindings.cpp | 4 |
12 files changed, 37 insertions, 37 deletions
diff --git a/source/windowing/StarButtonWidget.cpp b/source/windowing/StarButtonWidget.cpp index c052599..c19fb4b 100644 --- a/source/windowing/StarButtonWidget.cpp +++ b/source/windowing/StarButtonWidget.cpp @@ -195,7 +195,7 @@ void ButtonWidget::setButtonGroup(ButtonGroupPtr newGroup, int id) { if (m_buttonGroup) m_buttonGroup->removeButton(this); - m_buttonGroup = move(newGroup); + m_buttonGroup = std::move(newGroup); if (m_buttonGroup) { setCheckable(true); diff --git a/source/windowing/StarCanvasWidget.cpp b/source/windowing/StarCanvasWidget.cpp index 0c7ea82..16ec994 100644 --- a/source/windowing/StarCanvasWidget.cpp +++ b/source/windowing/StarCanvasWidget.cpp @@ -27,28 +27,28 @@ void CanvasWidget::clear() { } void CanvasWidget::drawImage(String texName, Vec2F const& position, float scale, Vec4B const& color) { - m_renderOps.append(make_tuple(move(texName), position, scale, color, false)); + m_renderOps.append(make_tuple(std::move(texName), position, scale, color, false)); } void CanvasWidget::drawImageCentered(String texName, Vec2F const& position, float scale, Vec4B const& color) { - m_renderOps.append(make_tuple(move(texName), position, scale, color, true)); + m_renderOps.append(make_tuple(std::move(texName), position, scale, color, true)); } void CanvasWidget::drawImageRect(String texName, RectF const& texCoords, RectF const& screenCoords, Vec4B const& color) { - m_renderOps.append(make_tuple(move(texName), texCoords, screenCoords, color)); + m_renderOps.append(make_tuple(std::move(texName), texCoords, screenCoords, color)); } void CanvasWidget::drawDrawable(Drawable drawable, Vec2F const& screenPos) { - m_renderOps.append(make_tuple(move(drawable), screenPos)); + m_renderOps.append(make_tuple(std::move(drawable), screenPos)); } void CanvasWidget::drawDrawables(List<Drawable> drawables, Vec2F const& screenPos) { for (auto& drawable : drawables) - drawDrawable(move(drawable), screenPos); + drawDrawable(std::move(drawable), screenPos); } void CanvasWidget::drawTiledImage(String texName, float textureScale, Vec2D const& offset, RectF const& screenCoords, Vec4B const& color) { - m_renderOps.append(make_tuple(move(texName), textureScale, offset, screenCoords, color)); + m_renderOps.append(make_tuple(std::move(texName), textureScale, offset, screenCoords, color)); } void CanvasWidget::drawLine(Vec2F const& begin, Vec2F const end, Vec4B const& color, float lineWidth) { @@ -68,7 +68,7 @@ void CanvasWidget::drawTriangles(List<tuple<Vec2F, Vec2F, Vec2F>> const& triangl } void CanvasWidget::drawText(String s, TextPositioning position, unsigned fontSize, Vec4B const& color, FontMode mode, float lineSpacing, String font, String processingDirectives) { - m_renderOps.append(make_tuple(move(s), move(position), fontSize, color, mode, lineSpacing, move(font), move(processingDirectives))); + m_renderOps.append(make_tuple(std::move(s), std::move(position), fontSize, color, mode, lineSpacing, std::move(font), std::move(processingDirectives))); } Vec2I CanvasWidget::mousePosition() const { @@ -174,10 +174,10 @@ void CanvasWidget::renderImageRect(Vec2F const& renderingOffset, String const& t void CanvasWidget::renderDrawable(Vec2F const& renderingOffset, Drawable drawable, Vec2F const& screenPos) { auto& context = GuiContext::singleton(); if (m_ignoreInterfaceScale) - context.drawDrawable(move(drawable), renderingOffset + screenPos, 1); + context.drawDrawable(std::move(drawable), renderingOffset + screenPos, 1); else { drawable.scale(context.interfaceScale()); - context.drawDrawable(move(drawable), renderingOffset * context.interfaceScale() + screenPos * context.interfaceScale(), 1); + context.drawDrawable(std::move(drawable), renderingOffset * context.interfaceScale() + screenPos * context.interfaceScale(), 1); } } diff --git a/source/windowing/StarGuiContext.cpp b/source/windowing/StarGuiContext.cpp index 028614a..d1be94a 100644 --- a/source/windowing/StarGuiContext.cpp +++ b/source/windowing/StarGuiContext.cpp @@ -26,8 +26,8 @@ GuiContext::GuiContext(MixerPtr mixer, ApplicationControllerPtr appController) { s_singleton = this; - m_mixer = move(mixer); - m_applicationController = move(appController); + m_mixer = std::move(mixer); + m_applicationController = std::move(appController); m_interfaceScale = 1; @@ -41,7 +41,7 @@ GuiContext::~GuiContext() { } void GuiContext::renderInit(RendererPtr renderer) { - m_renderer = move(renderer); + m_renderer = std::move(renderer); auto textureGroup = m_renderer->createTextureGroup(); m_textureCollection = make_shared<AssetTextureGroup>(textureGroup); m_drawablePainter = make_shared<DrawablePainter>(m_renderer, m_textureCollection); @@ -197,7 +197,7 @@ void GuiContext::drawTriangles(List<tuple<Vec2F, Vec2F, Vec2F>> const& triangles } void GuiContext::drawInterfaceDrawable(Drawable drawable, Vec2F const& screenPos, Vec4B const& color) { - drawDrawable(move(drawable), screenPos * interfaceScale(), (float)interfaceScale(), color); + drawDrawable(std::move(drawable), screenPos * interfaceScale(), (float)interfaceScale(), color); } void GuiContext::drawInterfaceLine(Vec2F const& begin, Vec2F const end, Vec4B const& color, float lineWidth) { @@ -428,7 +428,7 @@ void GuiContext::playAudio(String const& audioAsset, int loops, float volume, fl audioInstance->setVolume(volume); audioInstance->setPitchMultiplier(pitch); audioInstance->setLoops(loops); - m_mixer->play(move(audioInstance)); + m_mixer->play(std::move(audioInstance)); } String GuiContext::getClipboard() const { @@ -436,7 +436,7 @@ String GuiContext::getClipboard() const { } void GuiContext::setClipboard(String text) { - m_applicationController->setClipboard(move(text)); + m_applicationController->setClipboard(std::move(text)); } void GuiContext::cleanup() { diff --git a/source/windowing/StarImageWidget.cpp b/source/windowing/StarImageWidget.cpp index ef82c33..1a61b1e 100644 --- a/source/windowing/StarImageWidget.cpp +++ b/source/windowing/StarImageWidget.cpp @@ -48,7 +48,7 @@ String ImageWidget::image() const { } void ImageWidget::setDrawables(List<Drawable> drawables) { - m_baseDrawables = move(drawables); + m_baseDrawables = std::move(drawables); transformDrawables(); } diff --git a/source/windowing/StarKeyBindings.cpp b/source/windowing/StarKeyBindings.cpp index 969a766..d082a3e 100644 --- a/source/windowing/StarKeyBindings.cpp +++ b/source/windowing/StarKeyBindings.cpp @@ -163,7 +163,7 @@ KeyBindings::KeyBindings(Json const& json) { } } - m_actions = move(actions); + m_actions = std::move(actions); } catch (StarException const& e) { throw StarException(strf("Could not set keybindings from configuration. {}", outputException(e, false))); } diff --git a/source/windowing/StarLabelWidget.cpp b/source/windowing/StarLabelWidget.cpp index b55ecc1..35f8618 100644 --- a/source/windowing/StarLabelWidget.cpp +++ b/source/windowing/StarLabelWidget.cpp @@ -10,18 +10,18 @@ LabelWidget::LabelWidget(String text, VerticalAnchor const& vAnchor, Maybe<unsigned> wrapWidth, Maybe<float> lineSpacing) - : m_color(color), + : m_fontMode(FontMode::Normal), + m_color(color), m_hAnchor(hAnchor), m_vAnchor(vAnchor), - m_wrapWidth(move(wrapWidth)), - m_lineSpacing(move(lineSpacing)), - m_fontMode(FontMode::Normal) { + m_wrapWidth(std::move(wrapWidth)), + m_lineSpacing(std::move(lineSpacing)) { auto assets = Root::singleton().assets(); auto fontConfig = assets->json("/interface.config:font"); m_fontSize = fontConfig.getInt("baseSize"); m_processingDirectives = fontConfig.getString("defaultDirectives"); m_font = fontConfig.queryString("defaultFont", ""); - setText(move(text)); + setText(std::move(text)); } String const& LabelWidget::text() const { @@ -33,7 +33,7 @@ Maybe<unsigned> LabelWidget::getTextCharLimit() const { } void LabelWidget::setText(String newText) { - m_text = move(newText); + m_text = std::move(newText); updateTextRegion(); } @@ -47,7 +47,7 @@ void LabelWidget::setFontMode(FontMode fontMode) { } void LabelWidget::setColor(Color newColor) { - m_color = move(newColor); + m_color = std::move(newColor); } void LabelWidget::setAnchor(HorizontalAnchor hAnchor, VerticalAnchor vAnchor) { @@ -57,12 +57,12 @@ void LabelWidget::setAnchor(HorizontalAnchor hAnchor, VerticalAnchor vAnchor) { } void LabelWidget::setWrapWidth(Maybe<unsigned> wrapWidth) { - m_wrapWidth = move(wrapWidth); + m_wrapWidth = std::move(wrapWidth); updateTextRegion(); } void LabelWidget::setLineSpacing(Maybe<float> lineSpacing) { - m_lineSpacing = move(lineSpacing); + m_lineSpacing = std::move(lineSpacing); updateTextRegion(); } diff --git a/source/windowing/StarListWidget.cpp b/source/windowing/StarListWidget.cpp index c5ac35b..bb8161b 100644 --- a/source/windowing/StarListWidget.cpp +++ b/source/windowing/StarListWidget.cpp @@ -29,7 +29,7 @@ RectI ListWidget::relativeBoundRect() const { } void ListWidget::setCallback(WidgetCallbackFunc callback) { - m_callback = move(callback); + m_callback = std::move(callback); } bool ListWidget::sendEvent(InputEvent const& event) { diff --git a/source/windowing/StarPane.cpp b/source/windowing/StarPane.cpp index 39ad24c..b1a3daa 100644 --- a/source/windowing/StarPane.cpp +++ b/source/windowing/StarPane.cpp @@ -169,7 +169,7 @@ void Pane::setFocus(Widget const* focus) { if (m_focusWidget) m_focusWidget->blur(); if (auto c = childPtr(focus)) - m_focusWidget = move(c); + m_focusWidget = std::move(c); else throw GuiException("Cannot set focus on a widget which is not a child of this pane"); } @@ -366,7 +366,7 @@ LuaCallbacks Pane::makePaneCallbacks() { audioInstance->setLoops(loops.value(0)); auto& guiContext = GuiContext::singleton(); guiContext.playAudio(audioInstance); - m_playingSounds.append({audio, move(audioInstance)}); + m_playingSounds.append({audio, std::move(audioInstance)}); }); callbacks.registerCallback("stopAllSounds", [this](Maybe<String> const& audio) { diff --git a/source/windowing/StarPaneManager.cpp b/source/windowing/StarPaneManager.cpp index f44783c..4f4cee7 100644 --- a/source/windowing/StarPaneManager.cpp +++ b/source/windowing/StarPaneManager.cpp @@ -25,7 +25,7 @@ PaneManager::PaneManager() } void PaneManager::displayPane(PaneLayer paneLayer, PanePtr const& pane, DismissCallback onDismiss) { - if (!m_displayedPanes[paneLayer].insertFront(pane, move(onDismiss)).second) + if (!m_displayedPanes[paneLayer].insertFront(pane, std::move(onDismiss)).second) throw GuiException("Pane displayed twice in PaneManager::displayPane"); if (!pane->hasDisplayed() && pane->anchor() == PaneAnchor::None) @@ -274,8 +274,8 @@ void PaneManager::update(float dt) { if (m_tooltipShowTimer < 0 && !m_activeTooltip) { if (auto parentPane = getPaneAt(m_tooltipLastMousePos)) { if (auto tooltip = parentPane->createTooltip(m_tooltipLastMousePos)) { - m_activeTooltip = move(tooltip); - m_tooltipParentPane = move(parentPane); + m_activeTooltip = std::move(tooltip); + m_tooltipParentPane = std::move(parentPane); m_tooltipInitialPosition = m_tooltipLastMousePos; displayPane(PaneLayer::Tooltip, m_activeTooltip); diff --git a/source/windowing/StarRegisteredPaneManager.hpp b/source/windowing/StarRegisteredPaneManager.hpp index ebb158d..a33423a 100644 --- a/source/windowing/StarRegisteredPaneManager.hpp +++ b/source/windowing/StarRegisteredPaneManager.hpp @@ -66,7 +66,7 @@ shared_ptr<T> RegisteredPaneManager<KeyT>::maybeRegisteredPane(KeyT const& paneI template <typename KeyT> void RegisteredPaneManager<KeyT>::registerPane( KeyT paneId, PaneLayer paneLayer, PanePtr pane, DismissCallback onDismiss) { - if (!m_registeredPanes.insert(move(paneId), {move(paneLayer), move(pane), move(onDismiss)}).second) + if (!m_registeredPanes.insert(std::move(paneId), {std::move(paneLayer), std::move(pane), std::move(onDismiss)}).second) throw GuiException( strf("Registered pane with name '{}' registered a second time in RegisteredPaneManager::registerPane", outputAny(paneId))); diff --git a/source/windowing/StarTabSet.cpp b/source/windowing/StarTabSet.cpp index b968feb..a764cec 100644 --- a/source/windowing/StarTabSet.cpp +++ b/source/windowing/StarTabSet.cpp @@ -86,7 +86,7 @@ size_t TabSetWidget::selectedTab() const { } void TabSetWidget::setCallback(WidgetCallbackFunc callback) { - m_callback = move(callback); + m_callback = std::move(callback); } } diff --git a/source/windowing/StarWidgetLuaBindings.cpp b/source/windowing/StarWidgetLuaBindings.cpp index f69bd53..5b59d48 100644 --- a/source/windowing/StarWidgetLuaBindings.cpp +++ b/source/windowing/StarWidgetLuaBindings.cpp @@ -26,13 +26,13 @@ LuaMethods<CanvasWidgetPtr> LuaUserDataMethods<CanvasWidgetPtr>::make() { methods.registerMethodWithSignature<void, CanvasWidgetPtr>("clear", mem_fn(&CanvasWidget::clear)); methods.registerMethod("drawDrawable", [](CanvasWidgetPtr canvasWidget, Drawable drawable, Maybe<Vec2F> screenPos) { - canvasWidget->drawDrawable(move(drawable), screenPos.value(Vec2F())); + canvasWidget->drawDrawable(std::move(drawable), screenPos.value(Vec2F())); }); methods.registerMethod("drawDrawables", [](CanvasWidgetPtr canvasWidget, List<Drawable> drawables, Maybe<Vec2F> screenPos) { Vec2F pos = screenPos.value(Vec2F()); for (auto& drawable : drawables) - canvasWidget->drawDrawable(move(drawable), pos); + canvasWidget->drawDrawable(std::move(drawable), pos); }); methods.registerMethod("drawImage", |