From e0f87bdaf04f0edbeb6f8149eb093310ba6f6e3a Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Sun, 4 Oct 2015 19:01:34 +0200
Subject: [PATCH] .travis.yml + some code improvements

---
 .travis.yml       | 21 ++++++++++++++++++++-
 build.sh          |  1 +
 src/fmenu.cpp     |  2 +-
 src/fmenuitem.cpp | 14 ++++++++------
 src/fterm.cpp     |  4 ++--
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 41949436..6029a13e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
-language: c++
+language: cpp
+
 compiler:
   - gcc
+
 install:
   - lsb_release -a
   - uname -a
@@ -14,6 +16,23 @@ install:
   - sudo make install
   - cd ..
   - rm -rf finalcut
+
+env:
+  global:
+   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+   #   via the "travis encrypt" command using the project repo's public key
+   - secure: "HzE/Yc8AWHTnZYFIfgKI9uFLlrKBw8L7cucRRYGzVyS1YGijjuchIeFxl4ahUCW6/pwvj4Wh9JUL1pOm+mB89XRSMSCGXN7gkFA73DB1Eq/oNdoDQbzKJeMYEP+WhPUuwTGClukRsjN48v35Nc2DJ4bGwasOjwOElZZKgNe/XrF7ok9eI1atcIl4BaxjnjNIyG9A1+MKhjUkT+FnPuqjXXz02RWD7E0IC94CK665LjdDZsnsRGf3sKBr1ZyI4uQmFmZ8W/7DxSsW1xkhtTOyY+QxQ8+CqSfiBgREwU2bPQuM/rAdAISvLk+1zMOja60B2YHTNreVi4Jj0FAQUKto9feC2QZTTrX+jv6NQEyH4XilMak9vBHKpCb6MFhHgDO4puXTur1OzGY1dtHQeQ72Ap2aAy0pPJruqeYzd9K80cSTDhqcOywt+dwja7lrPEVhqltKXFXSviLj6531to1PQBVi+Uw3uMbdo1twtkvW0SRgqq2h8OzD6SWsdI63nurQxK0qpGFnE2/N5pWxOHud6Me8G6ZBYeTRNKMrHroGoKrUr4CwgB80SKR0qj7Yga3HnJLkKwEUmRnK1gA2MD/td8IT4QAf10VI7J5P1rullZ7zK0eVnE+bHHgyd5XJkgspaXezYVPPh2hNLwREXztU3DfQgrzwjuQ4aBEGiYgcGMU="
+
+addons:
+  coverity_scan:
+    project:
+      name: "gansm/finalcut"
+      description: "Build submitted via Travis CI"
+    notification_email: guru.mail@muenster.de
+    build_command_prepend: "autoreconf -v --install --force && ./configure --prefix=/usr && make clean"
+    build_command:   "make -j10 && make check"
+    branch_pattern: coverity_scan
+
 script:
   - autoreconf -v --install --force && ./configure --prefix=/usr && make -j10 && make check
 
diff --git a/build.sh b/build.sh
index ea91abd5..4afa2088 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+#CXX="clang++"
 PREFIX="/usr"
 
 case "$1" in
diff --git a/src/fmenu.cpp b/src/fmenu.cpp
index a42bb542..2a4eb675 100644
--- a/src/fmenu.cpp
+++ b/src/fmenu.cpp
@@ -139,7 +139,7 @@ void FMenu::menu_dimension()
 
   while ( iter != end )
   {
-    (*iter)->setGeometry (item_X, item_Y, maxItemWidth, 1);
+    (*iter)->setGeometry (item_X, item_Y, int(maxItemWidth), 1);
     item_Y++;
 
     ++iter;
diff --git a/src/fmenuitem.cpp b/src/fmenuitem.cpp
index 6a86f60a..247814b6 100644
--- a/src/fmenuitem.cpp
+++ b/src/fmenuitem.cpp
@@ -92,7 +92,7 @@ void FMenuItem::init (FWidget* parent)
   hotkey = getHotkey();
   if ( hotkey )
     text_length--;
-  setGeometry (1,1,text_length+2,1, false);
+  setGeometry (1,1,int(text_length+2),1, false);
 
   if ( parent )
   {
@@ -364,17 +364,19 @@ void FMenuItem::setText (FString& txt)
   hotkey = getHotkey();
   if ( hotkey )
     text_length--;
-  setWidth(text_length);
+  setWidth(int(text_length));
 }
 
 //----------------------------------------------------------------------
-inline void FMenuItem::setText (const std::string& txt)
+void FMenuItem::setText (const std::string& txt)
 {
-  setText (FString(txt));
+  FString s = FString(txt);
+  setText (s);
 }
 
 //----------------------------------------------------------------------
-inline void FMenuItem::setText (const char* txt)
+void FMenuItem::setText (const char* txt)
 {
-  setText (FString(txt));
+  FString s = FString(txt);
+  setText (s);
 }
diff --git a/src/fterm.cpp b/src/fterm.cpp
index 0a057aaf..6f9333d5 100644
--- a/src/fterm.cpp
+++ b/src/fterm.cpp
@@ -3467,7 +3467,7 @@ FString FTerm::getAnswerbackMsg()
 
   if ( raw_mode )
   {
-    int n;
+    ssize_t n;
     fd_set ifds;
     struct timeval tv;
     char temp[10] = {};
@@ -3502,7 +3502,7 @@ FString FTerm::getSecDA()
 
   if ( raw_mode )
   {
-    int n;
+    ssize_t n;
     fd_set ifds;
     struct timeval tv;
     char temp[16] = {};