chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suppress a few irrelavent build warnings

Browse Source
This commit is contained in:
Mark Watkins 2013-10-10 01:56:46 +10:00
parent 9918fe0a45
commit 9ae5cdd422
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/quazip/quazip/unzip.c vendored
View File

@ -1245,7 +1245,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len)
return UNZ_PARAMERROR; return UNZ_PARAMERROR;
if ((pfile_in_zip_read_info->read_buffer == NULL)) if (pfile_in_zip_read_info->read_buffer == NULL)
return UNZ_END_OF_LIST_OF_FILE; return UNZ_END_OF_LIST_OF_FILE;
if (len==0) if (len==0)
return 0; return 0;

4
3rdparty/quazip/quazip/zip.c vendored
View File

@ -777,9 +777,9 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
zi->ci.flag = 0; zi->ci.flag = 0;
if ((level==8) || (level==9)) if ((level==8) || (level==9))
zi->ci.flag |= 2; zi->ci.flag |= 2;
if ((level==2)) if (level==2)
zi->ci.flag |= 4; zi->ci.flag |= 4;
if ((level==1)) if (level==1)
zi->ci.flag |= 6; zi->ci.flag |= 6;
if (password != NULL) if (password != NULL)
{ {

2
src/Graphs/gGraphView.cpp
View File

@ -2317,7 +2317,7 @@ bool gGraphView::usePixmapCache()
void gGraphView::DrawTextQue() void gGraphView::DrawTextQue()
{ {
const qint64 expire_after_ms=4000; // expire string pixmaps after this many milliseconds const qint64 expire_after_ms=4000; // expire string pixmaps after this many milliseconds
const qint64 under_limit_cache_bonus=30000; // If under the limit, give a bonus to the millisecond timeout. //const qint64 under_limit_cache_bonus=30000; // If under the limit, give a bonus to the millisecond timeout.
const qint32 max_pixmap_cache=4*1048576; // Maximum size of pixmap cache (it can grow over this, but only temporarily) const qint32 max_pixmap_cache=4*1048576; // Maximum size of pixmap cache (it can grow over this, but only temporarily)
quint64 ti=0,exptime=0; quint64 ti=0,exptime=0;

2
src/Graphs/gYAxis.cpp
View File

@ -138,7 +138,7 @@ gYAxis::~gYAxis()
} }
void gYAxis::paint(gGraph & w,int left,int top, int width, int height) void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
{ {
int x,y,yh=0; int x,y;//,yh=0;
//Todo: clean this up as there is a lot of duplicate code between the sections //Todo: clean this up as there is a lot of duplicate code between the sections

2
src/daily.cpp
View File

@ -498,7 +498,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
total_events+=cnt; total_events+=cnt;
QString st=schema::channel[code].description(); QString st=schema::channel[code].description();
if (st.isEmpty()) { if (st.isEmpty()) {
st="Fixme %1"+code; st=QString("Fixme %1").arg(code);
} }
st+=" "; st+=" ";
if (cnt==1) st+=tr("%1 event").arg(cnt); if (cnt==1) st+=tr("%1 event").arg(cnt);

2
src/oximetry.cpp
View File

@ -1176,7 +1176,7 @@ void Oximetry::serialImport()
// QApplication::processEvents(); // QApplication::processEvents();
} }
void Oximetry::cancel_CheckPorts(QAbstractButton*b) void Oximetry::cancel_CheckPorts(QAbstractButton*)
{ {
qDebug() << "cancel_CheckPorts()"; qDebug() << "cancel_CheckPorts()";
cancel_Import=true; cancel_Import=true;