diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-09-13 13:30:46 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-09-13 13:30:46 +0000 |
| commit | 659a543047882e6c412764795068ee57b8284787 (patch) | |
| tree | a5aa62adde9aaf4f6537e7348bcd072534d1a212 /navit/graphics/qt_qpainter | |
| parent | eb49c62b6ba3edc84c54ca7e3083a7b3c907c0a8 (diff) | |
| download | navit-659a543047882e6c412764795068ee57b8284787.tar.gz | |
Fix:graphics/qt_qpainter::Fix pointer cast and format string warnings.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5893 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/graphics/qt_qpainter')
| -rw-r--r-- | navit/graphics/qt_qpainter/RenderArea.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/navit/graphics/qt_qpainter/RenderArea.cpp b/navit/graphics/qt_qpainter/RenderArea.cpp index 96515f924..8ea80d4a0 100644 --- a/navit/graphics/qt_qpainter/RenderArea.cpp +++ b/navit/graphics/qt_qpainter/RenderArea.cpp @@ -137,7 +137,7 @@ void RenderArea::do_resize(QSize size) painter.fillRect(0, 0, size.width(), size.height(), brush); dbg(0,"size %dx%d\n", size.width(), size.height()); dbg(0,"pixmap %p %dx%d\n", pixmap, pixmap->width(), pixmap->height()); - callback_list_call_attr_2(this->cbl, attr_resize, (void *)size.width(), (void *)size.height()); + callback_list_call_attr_2(this->cbl, attr_resize, GINT_TO_POINTER(size.width()), GINT_TO_POINTER(size.height())); } //############################################################################################################## @@ -164,13 +164,13 @@ void RenderArea::mouseEvent(int pressed, QMouseEvent *event) p.y=event->y(); switch (event->button()) { case Qt::LeftButton: - callback_list_call_attr_3(this->cbl, attr_button, (void *)pressed, (void *)1, (void *)&p); + callback_list_call_attr_3(this->cbl, attr_button, GINT_TO_POINTER(pressed), GINT_TO_POINTER(1), GINT_TO_POINTER(&p)); break; case Qt::MidButton: - callback_list_call_attr_3(this->cbl, attr_button, (void *)pressed, (void *)2, (void *)&p); + callback_list_call_attr_3(this->cbl, attr_button, GINT_TO_POINTER(pressed), GINT_TO_POINTER(2), GINT_TO_POINTER(&p)); break; case Qt::RightButton: - callback_list_call_attr_3(this->cbl, attr_button, (void *)pressed, (void *)3, (void *)&p); + callback_list_call_attr_3(this->cbl, attr_button, GINT_TO_POINTER(pressed), GINT_TO_POINTER(3), GINT_TO_POINTER(&p)); break; default: break; @@ -222,8 +222,8 @@ void RenderArea::wheelEvent(QWheelEvent *event) button=-1; if (button != -1) { - callback_list_call_attr_3(this->cbl, attr_button, (void *)1, (void *)button, (void *)&p); - callback_list_call_attr_3(this->cbl, attr_button, (void *)0, (void *)button, (void *)&p); + callback_list_call_attr_3(this->cbl, attr_button, GINT_TO_POINTER(1), GINT_TO_POINTER(button), GINT_TO_POINTER(&p)); + callback_list_call_attr_3(this->cbl, attr_button, GINT_TO_POINTER(0), GINT_TO_POINTER(button), GINT_TO_POINTER(&p)); } event->accept(); @@ -240,7 +240,7 @@ void RenderArea::keyPressEvent(QKeyEvent *event) #else const char *text=str.toUtf8().constData(); #endif - dbg(0,"enter text='%s' 0x%x (%d) key=%d\n", text, text[0], strlen(text), event->key()); + dbg(0,"enter text='%s' 0x%x (%zu) key=%d\n", text, text[0], strlen(text), event->key()); if (!text || !text[0] || text[0] == 0x7f) { dbg(0,"special key\n"); switch (event->key()) { |