From 4b9f224674436e818bbcfe554b72ef18c1a50cb7 Mon Sep 17 00:00:00 2001 From: ephy Date: Sun, 27 Jun 2010 15:06:57 +0000 Subject: [PATCH] GCS: Get rid of some compiler warnings. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@906 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/libs/glc_lib/PQP/PQP.cpp | 2 +- ground/src/libs/glc_lib/lib3ds/chunk.c | 2 +- ground/src/libs/glc_lib/lib3ds/file.c | 7 +++++++ ground/src/libs/glc_lib/lib3ds/light.c | 2 +- ground/src/libs/glc_lib/lib3ds/mesh.c | 2 +- ground/src/libs/glc_lib/lib3ds/tracks.c | 2 ++ ground/src/libs/glc_lib/lib3ds/viewport.c | 2 +- ground/src/libs/glc_lib/viewport/glc_reptrackballmover.cpp | 2 +- ground/src/libs/opmapcontrol/src/core/cache.h | 2 +- ground/src/libs/opmapcontrol/src/core/opmaps.cpp | 6 +++--- ground/src/libs/opmapcontrol/src/core/opmaps.h | 2 +- ground/src/libs/opmapcontrol/src/core/rawtile.cpp | 2 +- ground/src/libs/opmapcontrol/src/internals/core.cpp | 4 ++-- .../src/internals/projections/mercatorprojectionyandex.cpp | 2 +- .../src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.h | 1 + ground/src/libs/qwt/src/qwt_double_range.cpp | 2 +- ground/src/plugins/opmap/opmap_waypointeditor_dialog.h | 1 + ground/src/plugins/rawhid/pjrc_rawhid_unix.cpp | 4 ++-- 18 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ground/src/libs/glc_lib/PQP/PQP.cpp b/ground/src/libs/glc_lib/PQP/PQP.cpp index c18575034..542e003bc 100755 --- a/ground/src/libs/glc_lib/PQP/PQP.cpp +++ b/ground/src/libs/glc_lib/PQP/PQP.cpp @@ -250,7 +250,7 @@ PQP_Model::MemUsage(int msg) if (msg) { - fprintf(stderr,"Total for model %x: %d bytes\n", this, total_mem); + fprintf(stderr,"Total for model %p: %d bytes\n", this, total_mem); fprintf(stderr,"BVs: %d alloced, take %d bytes each\n", num_bvs, sizeof(BV)); fprintf(stderr,"Tris: %d alloced, take %d bytes each\n", diff --git a/ground/src/libs/glc_lib/lib3ds/chunk.c b/ground/src/libs/glc_lib/lib3ds/chunk.c index 30abed1a6..6156393db 100755 --- a/ground/src/libs/glc_lib/lib3ds/chunk.c +++ b/ground/src/libs/glc_lib/lib3ds/chunk.c @@ -58,7 +58,7 @@ static void lib3ds_chunk_debug_dump(Lib3dsChunk *c) { if (enable_dump) { - printf("%s%s (0x%X) size=%lu\n", + printf("%s%s (0x%X) size=%d\n", lib3ds_chunk_level, lib3ds_chunk_name(c->chunk), c->chunk, diff --git a/ground/src/libs/glc_lib/lib3ds/file.c b/ground/src/libs/glc_lib/lib3ds/file.c index 97b052490..2cd2bd33d 100755 --- a/ground/src/libs/glc_lib/lib3ds/file.c +++ b/ground/src/libs/glc_lib/lib3ds/file.c @@ -1963,6 +1963,13 @@ file_bounding_box_of_nodes_impl(Lib3dsNode *node, Lib3dsFile *file, Lib3dsBool i } break; */ + case LIB3DS_UNKNOWN_NODE: + case LIB3DS_AMBIENT_NODE: + case LIB3DS_CAMERA_NODE: + case LIB3DS_TARGET_NODE: + case LIB3DS_LIGHT_NODE: + case LIB3DS_SPOT_NODE: + break; } { Lib3dsNode *p=node->childs; diff --git a/ground/src/libs/glc_lib/lib3ds/light.c b/ground/src/libs/glc_lib/lib3ds/light.c index 311f1d623..3a362bd0b 100755 --- a/ground/src/libs/glc_lib/lib3ds/light.c +++ b/ground/src/libs/glc_lib/lib3ds/light.c @@ -30,7 +30,7 @@ /*! * \defgroup light Lights */ -/*! +/*!*/ /*! diff --git a/ground/src/libs/glc_lib/lib3ds/mesh.c b/ground/src/libs/glc_lib/lib3ds/mesh.c index 55b1f0594..6bea215a4 100755 --- a/ground/src/libs/glc_lib/lib3ds/mesh.c +++ b/ground/src/libs/glc_lib/lib3ds/mesh.c @@ -568,7 +568,7 @@ lib3ds_mesh_dump(Lib3dsMesh *mesh) Lib3dsVector p; ASSERT(mesh); - printf(" %s vertices=%ld faces=%ld\n", + printf(" %s vertices=%d faces=%d\n", mesh->name, mesh->points, mesh->faces diff --git a/ground/src/libs/glc_lib/lib3ds/tracks.c b/ground/src/libs/glc_lib/lib3ds/tracks.c index 6fd083c12..1355abd69 100755 --- a/ground/src/libs/glc_lib/lib3ds/tracks.c +++ b/ground/src/libs/glc_lib/lib3ds/tracks.c @@ -1548,5 +1548,7 @@ lib3ds_dump_tracks(Lib3dsNode *node) printf("pos: "); lib3ds_lin3Track_dump(&node->data.spot.pos_track); break; + case LIB3DS_UNKNOWN_NODE: + break; } } diff --git a/ground/src/libs/glc_lib/lib3ds/viewport.c b/ground/src/libs/glc_lib/lib3ds/viewport.c index be99af3a1..872113ea5 100755 --- a/ground/src/libs/glc_lib/lib3ds/viewport.c +++ b/ground/src/libs/glc_lib/lib3ds/viewport.c @@ -380,7 +380,7 @@ lib3ds_viewport_dump(Lib3dsViewport *vp) printf(" position: %d,%d\n", vp->layout.position[0], vp->layout.position[1]); printf(" size: %d,%d\n", vp->layout.size[0], vp->layout.size[1]); - printf(" views: %ld\n", vp->layout.views); + printf(" views: %d\n", vp->layout.views); if (vp->layout.views > 0 && vp->layout.viewL != NULL) { for(i=0, view=vp->layout.viewL; i < vp->layout.views; ++i, ++view) { printf(" view %d:\n", i); diff --git a/ground/src/libs/glc_lib/viewport/glc_reptrackballmover.cpp b/ground/src/libs/glc_lib/viewport/glc_reptrackballmover.cpp index fc958da86..8661d880a 100755 --- a/ground/src/libs/glc_lib/viewport/glc_reptrackballmover.cpp +++ b/ground/src/libs/glc_lib/viewport/glc_reptrackballmover.cpp @@ -221,7 +221,7 @@ void GLC_RepTrackBallMover::computeRadius() // Circle radius in OpenGL unit = Radius(Pixel) * (dimend GL / dimens Pixel) const double RayonSph= fabs((static_cast(nRayonSph) * ChampsVision / winVSize)); - if (not qFuzzyCompare(RayonSph, 0.0) and not qFuzzyCompare(RayonSph - m_Radius, 0.0) or (RayonSph < 2.0)) + if (((not qFuzzyCompare(RayonSph, 0.0)) and (not qFuzzyCompare(RayonSph - m_Radius, 0.0))) or (RayonSph < 2.0)) { // Main circle radius m_MainCircle.setRadius(RayonSph); diff --git a/ground/src/libs/opmapcontrol/src/core/cache.h b/ground/src/libs/opmapcontrol/src/core/cache.h index 4111c0189..34ebacf81 100644 --- a/ground/src/libs/opmapcontrol/src/core/cache.h +++ b/ground/src/libs/opmapcontrol/src/core/cache.h @@ -51,7 +51,7 @@ namespace core { private: Cache(); Cache(Cache const&){}; - Cache& operator=(Cache const&){}; + Cache& operator=(Cache const&){ return *this; }; static Cache* m_pInstance; QString cache; QString routeCache; diff --git a/ground/src/libs/opmapcontrol/src/core/opmaps.cpp b/ground/src/libs/opmapcontrol/src/core/opmaps.cpp index 610e51254..36f82ddc4 100644 --- a/ground/src/libs/opmapcontrol/src/core/opmaps.cpp +++ b/ground/src/libs/opmapcontrol/src/core/opmaps.cpp @@ -37,7 +37,7 @@ namespace core { m_pInstance=new OPMaps; return m_pInstance; } - OPMaps::OPMaps():useMemoryCache(true),MaxZoom(19),RetryLoadTile(2) + OPMaps::OPMaps():MaxZoom(19),RetryLoadTile(2),useMemoryCache(true) { accessmode=AccessMode::ServerAndCache; Language=LanguageType::PortuguesePortugal; @@ -194,14 +194,14 @@ namespace core { #endif //DEBUG_GMAPS QTime time; time.start(); - while( !(reply->isFinished() | time.elapsed()>(6*Timeout)) ){QCoreApplication::processEvents(QEventLoop::AllEvents);} + while( !(reply->isFinished() || (time.elapsed()>(6*Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);} #ifdef DEBUG_TIMINGS qDebug()<<"Network time:"<error()<<" abort?"<<(time.elapsed()>Timeout*6); #endif //DEBUG_GMAPS - if( (reply->error()!=QNetworkReply::NoError) | (time.elapsed()>Timeout*6)) + if( (reply->error()!=QNetworkReply::NoError) || (time.elapsed()>Timeout*6)) { #ifdef DEBUG_GMAPS qDebug()<<"Request timed out ";//< 0) && (vstep < 0) || (intv < 0) && (vstep > 0)) + if (((intv > 0) && (vstep < 0)) || ((intv < 0) && (vstep > 0))) newStep = -vstep; else newStep = vstep; diff --git a/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h b/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h index 3bfa40fda..cd39a1633 100644 --- a/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h +++ b/ground/src/plugins/opmap/opmap_waypointeditor_dialog.h @@ -49,6 +49,7 @@ namespace Ui { class WaypointItem : public QObject, public QGraphicsItem { Q_OBJECT + Q_INTERFACES(QGraphicsItem) public: WaypointItem(QString name = "", double latitude = 0, double longitude = 0, double height_feet = 0, int time_seconds = 0, int hold_seconds = 0); diff --git a/ground/src/plugins/rawhid/pjrc_rawhid_unix.cpp b/ground/src/plugins/rawhid/pjrc_rawhid_unix.cpp index 519ca3625..19ceb85e7 100644 --- a/ground/src/plugins/rawhid/pjrc_rawhid_unix.cpp +++ b/ground/src/plugins/rawhid/pjrc_rawhid_unix.cpp @@ -156,8 +156,8 @@ int pjrc_rawhid::open(int max, int vid, int pid, int usage_page, int usage) if (parsed_usage_page && parsed_usage) break; } if ((!parsed_usage_page) || (!parsed_usage) || - (usage_page > 0 && parsed_usage_page != usage_page) || - (usage > 0 && parsed_usage != usage)) { + (usage_page > 0 && parsed_usage_page != (uint32_t)usage_page) || + (usage > 0 && parsed_usage != (uint32_t)usage)) { usb_release_interface(u, i); continue; }