cppcheck

(bzr r10686)

11 files changed, 15 insertions, 15 deletions

diff --git a/src/extension/dxf2svg/entities.cpp b/src/extension/dxf2svg/entities.cpp
index d0d33503e..c94df06f3 100644
--- a/src/extension/dxf2svg/entities.cpp
+++ b/src/extension/dxf2svg/entities.cpp
@@ -398,8 +398,8 @@ lwpolyline::lwpolyline( std::vector< dxfpair > section ){
 	}
 	
 	// Now put on the last data that was found 
-	if (others.size() > 0 ){
-		sections.push_back( others );
+	if (!others.empty()){
+		sections.push_back(others);
 	}
 	
 	reset_extents();
diff --git a/src/extension/dxf2svg/read_dxf.cpp b/src/extension/dxf2svg/read_dxf.cpp
index ecda343c6..1a4eefbc9 100644
--- a/src/extension/dxf2svg/read_dxf.cpp
+++ b/src/extension/dxf2svg/read_dxf.cpp
@@ -261,7 +261,7 @@ std::vector< std::vector< dxfpair > > separate_parts( std::vector< dxfpair > sec
 		}
 	}
 	// Because putting the data on outer depends on find a GC=0 the last bit of data may be left behind so it inner has data in it put it on outer
-	if ( inner.size() > 0 ){
+	if (!inner.empty()){
 		outer.push_back( inner );
 		inner.clear();
 	}
diff --git a/src/extension/dxf2svg/tables2svg_info.cpp b/src/extension/dxf2svg/tables2svg_info.cpp
index 3b27a9c38..c59060306 100644
--- a/src/extension/dxf2svg/tables2svg_info.cpp
+++ b/src/extension/dxf2svg/tables2svg_info.cpp
@@ -22,7 +22,7 @@ char* pattern2dasharray(ltype info, int precision, double scaling, char* out){
 	char *out_ptr;
 	
 	
-	if (pattern.size() > 0){
+	if (!pattern.empty()){
 		strcat(out," stroke-dasharray=\"");	
 		for(int i = 0; i < pattern.size()-1;i++){
 			strcat(out,gcvt(scaling*sqrt(pow(pattern[i],2)),precision,temp) );
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index 87638045c..472a11807 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -450,7 +450,7 @@ PrintEmfWin32::flush_fill()
 unsigned int
 PrintEmfWin32::bind(Inkscape::Extension::Print * /*mod*/, Geom::Affine const &transform, float /*opacity*/)
 {   
-    if (m_tr_stack.size()) {
+    if (!m_tr_stack.empty()) {
         Geom::Affine tr_top = m_tr_stack.top();
         m_tr_stack.push(transform * tr_top);
     } else {
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index aa7073320..7646946fd 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -311,7 +311,7 @@ bool JavaFXOutput::doGradient(SPGradient *grad, const String &id)
         out("    function %s(): LinearGradient {\n",  jfxid.c_str());
         out("        LinearGradient {\n");
         std::vector<SPGradientStop> stops = g->vector.stops;
-        if (stops.size() > 0)
+        if (!stops.empty())
             {
             out("            stops:\n");
             out("                [\n");
@@ -341,7 +341,7 @@ bool JavaFXOutput::doGradient(SPGradient *grad, const String &id)
         out("            focusY: %s\n",  DSTR(g->fy.value));
         out("            radius: %s\n",  DSTR(g->r.value ));
         std::vector<SPGradientStop> stops = g->vector.stops;
-        if (stops.size() > 0)
+        if (!stops.empty())
             {
             out("            stops:\n");
             out("            [\n");
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index 49304de96..72df53377 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -166,7 +166,7 @@ PrintLatex::finish (Inkscape::Extension::Print *mod)
 unsigned int
 PrintLatex::bind(Inkscape::Extension::Print *mod, Geom::Affine const &transform, float opacity)
 {
-    if (m_tr_stack.size()) {
+    if (!m_tr_stack.empty()) {
         Geom::Affine tr_top = m_tr_stack.top();
         m_tr_stack.push(transform * tr_top);
     } else {
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index 0da048a17..6244512a4 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -652,7 +652,7 @@ LaTeXTextRenderer::transform()
 void
 LaTeXTextRenderer::push_transform(Geom::Affine const &tr)
 {
-    if(_transform_stack.size()){
+    if(!_transform_stack.empty()){
         Geom::Affine tr_top = _transform_stack.top();
         _transform_stack.push(tr * tr_top);
     } else {
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 93cfa4c71..0103e523b 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -1365,7 +1365,7 @@ void SvgBuilder::addChar(GfxState *state, double x, double y,
 
     bool is_space = ( uLen == 1 && u[0] == 32 );
     // Skip beginning space
-    if ( is_space && _glyphs.size() < 1 ) {
+    if ( is_space && _glyphs.empty()) {
         Geom::Point delta(dx, dy);
          _text_position += delta;
          return;
@@ -1405,7 +1405,7 @@ void SvgBuilder::addChar(GfxState *state, double x, double y,
     }
 
     // Copy current style if it has changed since the previous glyph
-    if (_invalidated_style || _glyphs.size() == 0 ) {
+    if (_invalidated_style || _glyphs.empty()) {
         new_glyph.style_changed = true;
         int render_mode = state->getRender();
         // Set style
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index ecdc049e2..bb00de619 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -490,7 +490,7 @@ bool PovOutput::doTree(SPDocument *doc)
         return false;
 
     //## Let's make a union of all of the Shapes
-    if (povShapes.size()>0)
+    if (!povShapes.empty())
         {
         String id = "AllShapes";
         char *pfx = (char *)id.c_str();
diff --git a/src/rubberband.cpp b/src/rubberband.cpp
index a59664092..00f87cf8e 100644
--- a/src/rubberband.cpp
+++ b/src/rubberband.cpp
@@ -85,7 +85,7 @@ void Inkscape::Rubberband::move(Geom::Point const &p)
     // we want the points to be at most 0.5 screen pixels apart,
     // so that we don't lose anything small;
     // if they are farther apart, we interpolate more points
-    if (_points.size() > 0 && Geom::L2(next-_points.back()) > 0.5) {
+    if (!_points.empty() && Geom::L2(next-_points.back()) > 0.5) {
         Geom::Point prev = _points.back();
         int subdiv = 2 * (int) round(Geom::L2(next-prev) + 0.5);
         for (int i = 1; i <= subdiv; i ++) {
diff --git a/src/unicoderange.cpp b/src/unicoderange.cpp
index 688969207..dcf461214 100644
--- a/src/unicoderange.cpp
+++ b/src/unicoderange.cpp
@@ -116,9 +116,9 @@ Glib::ustring UnicodeRange::attribute_string(){
 
 gunichar UnicodeRange::sample_glyph(){
 	//This could be better
-	if (unichars.size())
+	if (!unichars.empty())
 		return unichars[0];
-	if (range.size())
+	if (!range.empty())
 		return hex2int(range[0].start);
 	return (gunichar) ' ';
 }