Remove redundant std::move

milasudril · Mar 24, 2021 · adcb3f4 · adcb3f4
1 parent 2edeae4
commit adcb3f4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/alice b/alice
diff --git a/engine/engine.cpp b/engine/engine.cpp
@@ -10,7 +10,7 @@ static String client_name(const String& str)
 	{
 	auto ret=str;
 	ret.append(".anja");
-	return std::move(ret);
+	return ret;
 	}
 
 namespace

diff --git a/sessiondata/optionstring.cpp b/sessiondata/optionstring.cpp
@@ -12,7 +12,7 @@ String Anja::stringFromOptions(unsigned int option_bits
 	String ret;
 
 	if(*option_names==nullptr)
-		{return std::move(ret);}
+		{return ret;}
 
 	auto mask=0x1u;
 
@@ -28,7 +28,7 @@ String Anja::stringFromOptions(unsigned int option_bits
 		++option_names;
 		mask<<=1;
 		}
-	return std::move(ret);
+	return ret;
 	}
 
 unsigned int Anja::optionsFromString(const char* string

diff --git a/sessiondata/session.cpp b/sessiondata/session.cpp
@@ -38,7 +38,7 @@ static ArrayDynamicShort<ColorRGBA> color_presets_load(const char* ptr)
 			{
 			case '\0':
 				ret.append(colorFromString(buffer.begin()));
-				return std::move(ret);
+				return ret;
 			case '|':
 				ret.append(colorFromString(buffer.begin()));
 				buffer.clear();
@@ -49,7 +49,7 @@ static ArrayDynamicShort<ColorRGBA> color_presets_load(const char* ptr)
 
 		++ptr;
 		}
-	return std::move(ret);
+	return ret;
 	}
 
 template<class Range>
@@ -62,7 +62,7 @@ static String string_from_color_presets(const Range& r)
 		});
 	ret.append(ColorString(*(r.end()-1)).begin());
 
-	return std::move(ret);
+	return ret;
 	}
 
 
@@ -180,7 +180,7 @@ ArraySimple<String> Session::channelLabels() const
 		ret[k]=x.label();
 		++k;
 		});
-	return std::move(ret);
+	return ret;
 	}
 
 ArraySimple<ColorRGBA> Session::channelColors() const
@@ -192,7 +192,7 @@ ArraySimple<ColorRGBA> Session::channelColors() const
 		ret[k]=x.color();
 		++k;
 		});
-	return std::move(ret);
+	return ret;
 	}
 
 

diff --git a/ui/waveformeditor.cpp b/ui/waveformeditor.cpp
@@ -161,7 +161,7 @@ ArraySimple<float> WaveformEditor::mean_square(const float* begin,const float* e
 	m_progress_null.reset(new Dialog<ProgressBar,DialogNull>(m_box,"Anja: Computing signal levels"));
 	ms.compute(begin,vals_ms.begin(),end - begin,*this);
 	m_progress_null.reset();
-	return std::move(vals_ms);
+	return vals_ms;
 	}
 
 static ArraySimple<float> decimate(const ArraySimple<float>& src,double dt)
@@ -175,7 +175,7 @@ static ArraySimple<float> decimate(const ArraySimple<float>& src,double dt)
 		val=src[pos];
 		++k;
 		});
-	return std::move(ret);
+	return ret;
 	}
 
 static void plot_append(const float* begin,const float* end,double dt,XYPlot& plot)
@@ -206,15 +206,15 @@ ArraySimple<float> WaveformEditor::filename_update(const WaveformProxy& waveform
 			{return std::max(powerToDb(x),-145.0f);});
 
 		plot_append(ms.begin(),ms.end(),0.5e-3,plot.curvesRemove());
-		return std::move(ms);
+		return ms;
 		}
 	else
 		{
 		ArraySimple<float> ret(2);
 		ret[0]=-145.0f;
 		ret[1]=-145.0f;
 		plot.curvesRemove();
-		return std::move(ret);
+		return ret;
 		}
 	}