Merge branch 'trunk' into Android_gradleAndroid_gradle

1 files changed, 11 insertions, 11 deletions

diff --git a/navit/graphics/qt5/QNavitWidget.cpp b/navit/graphics/qt5/QNavitWidget.cpp
index 5a5bd303b..df051b557 100644
--- a/navit/graphics/qt5/QNavitWidget.cpp
+++ b/navit/graphics/qt5/QNavitWidget.cpp
@@ -70,7 +70,7 @@ static void paintOverlays(QPainter* painter, struct graphics_priv* gp, QPaintEve
         if (!value->disable) {
             QRect rr(value->x, value->y, value->pixmap->width(), value->pixmap->height());
             if (event->rect().intersects(rr)) {
-                dbg(lvl_debug, "draw overlay (%d, %d, %d, %d)\n", value->x + value->scroll_x, value->y + value->scroll_y, value->pixmap->width(), value->pixmap->height());
+                dbg(lvl_debug, "draw overlay (%d, %d, %d, %d)", value->x + value->scroll_x, value->y + value->scroll_y, value->pixmap->width(), value->pixmap->height());
                 painter->drawPixmap(value->x + value->scroll_x, value->y + value->scroll_y, *value->pixmap);
                 /* draw overlays of overlay if any by recursive calling */
                 paintOverlays(painter, value, event);
@@ -81,7 +81,7 @@ static void paintOverlays(QPainter* painter, struct graphics_priv* gp, QPaintEve
 
 void QNavitWidget::paintEvent(QPaintEvent* event)
 {
-    dbg(lvl_debug, "enter (%d, %d, %d, %d)\n", event->rect().x(), event->rect().y(), event->rect().width(), event->rect().height());
+    dbg(lvl_debug, "enter (%d, %d, %d, %d)", event->rect().x(), event->rect().y(), event->rect().width(), event->rect().height());
     QPainter painter(this);
     /* color background if any */
     if (graphics_priv->background_graphics_gc_priv != NULL) {
@@ -109,8 +109,8 @@ void QNavitWidget::resizeEvent(QResizeEvent* event)
         painter->fillRect(0, 0, width(), height(), brush);
         delete painter;
     }
-    dbg(lvl_debug, "size %dx%d\n", width(), height());
-    dbg(lvl_debug, "pixmap %p %dx%d\n", graphics_priv->pixmap, graphics_priv->pixmap->width(), graphics_priv->pixmap->height());
+    dbg(lvl_debug, "size %dx%d", width(), height());
+    dbg(lvl_debug, "pixmap %p %dx%d", graphics_priv->pixmap, graphics_priv->pixmap->width(), graphics_priv->pixmap->height());
     /* if the root window got resized, tell navit about it */
     if (graphics_priv->root)
         resize_callback(graphics_priv, width(), height());
@@ -119,7 +119,7 @@ void QNavitWidget::resizeEvent(QResizeEvent* event)
 void QNavitWidget::mouseEvent(int pressed, QMouseEvent* event)
 {
     struct point p;
-    //        dbg(lvl_debug,"enter\n");
+    //        dbg(lvl_debug,"enter");
     p.x = event->x();
     p.y = event->y();
     switch (event->button()) {
@@ -139,7 +139,7 @@ void QNavitWidget::mouseEvent(int pressed, QMouseEvent* event)
 
 void QNavitWidget::keyPressEvent(QKeyEvent* event)
 {
-    dbg(lvl_debug, "enter\n");
+    dbg(lvl_debug, "enter");
     char key[2];
     int keycode;
     char* text = NULL;
@@ -199,25 +199,25 @@ void QNavitWidget::keyPressEvent(QKeyEvent* event)
     else if (key[0])
         callback_list_call_attr_1(graphics_priv->callbacks, attr_keypress, (void*)key);
     else
-        dbg(lvl_debug, "keyval 0x%x\n", keycode);
+        dbg(lvl_debug, "keyval 0x%x", keycode);
 }
 
 void QNavitWidget::mousePressEvent(QMouseEvent* event)
 {
-    //        dbg(lvl_debug,"enter\n");
+    //        dbg(lvl_debug,"enter");
     mouseEvent(1, event);
 }
 
 void QNavitWidget::mouseReleaseEvent(QMouseEvent* event)
 {
-    //        dbg(lvl_debug,"enter\n");
+    //        dbg(lvl_debug,"enter");
     mouseEvent(0, event);
 }
 
 void QNavitWidget::mouseMoveEvent(QMouseEvent* event)
 {
     struct point p;
-    //        dbg(lvl_debug,"enter\n");
+    //        dbg(lvl_debug,"enter");
     p.x = event->x();
     p.y = event->y();
     callback_list_call_attr_1(graphics_priv->callbacks, attr_motion, (void*)&p);
@@ -227,7 +227,7 @@ void QNavitWidget::wheelEvent(QWheelEvent* event)
 {
     struct point p;
     int button;
-    dbg(lvl_debug, "enter\n");
+    dbg(lvl_debug, "enter");
     p.x = event->x(); // xy-coordinates of the mouse pointer
     p.y = event->y();