Merge pull request #19 from kblaschke/fix-compiler-warnings

Fixed a huge amount of Clang warnings

1 files changed, 9 insertions, 9 deletions

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();
 }