perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.travis.yml + some code improvements

This commit is contained in:
Markus Gans 2015-10-04 19:01:34 +02:00
parent 46974996c7
commit e0f87bdaf0
5 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -1,6 +1,8 @@
language: c++ language: cpp
compiler: compiler:
- gcc - gcc
install: install:
- lsb_release -a - lsb_release -a
- uname -a - uname -a
@ -14,6 +16,23 @@ install:
- sudo make install - sudo make install
- cd .. - cd ..
- rm -rf finalcut - 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: script:
- autoreconf -v --install --force && ./configure --prefix=/usr && make -j10 && make check - autoreconf -v --install --force && ./configure --prefix=/usr && make -j10 && make check

1
build.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
#CXX="clang++"
PREFIX="/usr" PREFIX="/usr"
case "$1" in case "$1" in

2
src/fmenu.cpp
View File

@ -139,7 +139,7 @@ void FMenu::menu_dimension()
while ( iter != end ) while ( iter != end )
{ {
(*iter)->setGeometry (item_X, item_Y, maxItemWidth, 1); (*iter)->setGeometry (item_X, item_Y, int(maxItemWidth), 1);
item_Y++; item_Y++;
++iter; ++iter;

14
src/fmenuitem.cpp
View File

@ -92,7 +92,7 @@ void FMenuItem::init (FWidget* parent)
hotkey = getHotkey(); hotkey = getHotkey();
if ( hotkey ) if ( hotkey )
text_length--; text_length--;
setGeometry (1,1,text_length+2,1, false); setGeometry (1,1,int(text_length+2),1, false);
if ( parent ) if ( parent )
{ {
@ -364,17 +364,19 @@ void FMenuItem::setText (FString& txt)
hotkey = getHotkey(); hotkey = getHotkey();
if ( hotkey ) if ( hotkey )
text_length--; 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);
} }

4
src/fterm.cpp
View File

@ -3467,7 +3467,7 @@ FString FTerm::getAnswerbackMsg()
if ( raw_mode ) if ( raw_mode )
{ {
int n; ssize_t n;
fd_set ifds; fd_set ifds;
struct timeval tv; struct timeval tv;
char temp[10] = {}; char temp[10] = {};
@ -3502,7 +3502,7 @@ FString FTerm::getSecDA()
if ( raw_mode ) if ( raw_mode )
{ {
int n; ssize_t n;
fd_set ifds; fd_set ifds;
struct timeval tv; struct timeval tv;
char temp[16] = {}; char temp[16] = {};