Fix some compiler warnings

variar · Mar 15, 2016 · 26adf4b · 26adf4b
1 parent a79e227
commit 26adf4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/crawlerwidget.cpp b/src/crawlerwidget.cpp
@@ -910,7 +910,8 @@ void CrawlerWidget::updateEncoding()
     static const char* latin1_encoding = "iso-8859-1";
     static const char* utf8_encoding   = "utf-8";
 
-    const char* encoding;
+    const char* encoding = latin1_encoding;
+    encoding_text_ = tr( "Displayed as ISO-8859-1" );
 
     switch ( encodingSetting_ ) {
         case ENCODING_AUTO:
@@ -935,9 +936,9 @@ void CrawlerWidget::updateEncoding()
             break;
         case ENCODING_ISO_8859_1:
         default:
-            encoding = latin1_encoding;
-            encoding_text_ = tr( "Displayed as ISO-8859-1" );
             break;
+
+
     }
 
     logData_->setDisplayEncoding( encoding );

diff --git a/src/marks.h b/src/marks.h
@@ -60,8 +60,8 @@ class Marks {
     qint64 getLineMarkedByIndex( int index ) const
     { return marks_[index].lineNumber(); }
     // Return the total number of marks
-    int size() const
-    { return marks_.size(); }
+    uint32_t size() const
+    { return static_cast<uint32_t>(marks_.size()); }
     // Completely clear the marks list.
     void clear();