Fix:core:Change all logging at lvl_error/warning to lvl_debug, unless it looks like an error message.|#1269, part 5

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5967 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 19 insertions, 19 deletions

diff --git a/navit/graphics/qt_qpainter/RenderArea.cpp b/navit/graphics/qt_qpainter/RenderArea.cpp
index d394b6e5e..c1646e2ff 100644
--- a/navit/graphics/qt_qpainter/RenderArea.cpp
+++ b/navit/graphics/qt_qpainter/RenderArea.cpp
@@ -98,7 +98,7 @@ bool RenderArea::event(QEvent *event)
 {
 #if QT_VERSION >= 0x040700                                                 
 	if (event->type() == QEvent::Gesture) {
-		dbg(lvl_error,"gesture\n");
+		dbg(lvl_debug,"gesture\n");
 		return true;
 	}
 #endif
@@ -135,8 +135,8 @@ void RenderArea::do_resize(QSize size)
     QPainter painter(pixmap);
     QBrush brush;
 	painter.fillRect(0, 0, size.width(), size.height(), brush);
-	dbg(lvl_error,"size %dx%d\n", size.width(), size.height());
-	dbg(lvl_error,"pixmap %p %dx%d\n", pixmap, pixmap->width(), pixmap->height());
+	dbg(lvl_debug,"size %dx%d\n", size.width(), size.height());
+	dbg(lvl_debug,"pixmap %p %dx%d\n", pixmap, pixmap->width(), pixmap->height());
 	callback_list_call_attr_2(this->cbl, attr_resize, GINT_TO_POINTER(size.width()), GINT_TO_POINTER(size.height()));
 }
 
@@ -240,9 +240,9 @@ void RenderArea::keyPressEvent(QKeyEvent *event)
 #else
 	const char *text=str.toUtf8().constData();
 #endif
-	dbg(lvl_error,"enter text='%s' 0x%x (%zu) key=%d\n", text, text[0], strlen(text), event->key());
+	dbg(lvl_debug,"enter text='%s' 0x%x (%zu) key=%d\n", text, text[0], strlen(text), event->key());
 	if (!text || !text[0] || text[0] == 0x7f) {
-		dbg(lvl_error,"special key\n");
+		dbg(lvl_debug,"special key\n");
 		switch (event->key()) {
 		case 4099:
 			{
@@ -305,7 +305,7 @@ void RenderArea::watchEvent(int fd)
 {
 #ifdef QT_QPAINTER_USE_EVENT_QT
 	struct event_watch *ev=(struct event_watch *)g_hash_table_lookup(watches, (void *)fd);
-	dbg(lvl_warning,"fd=%d ev=%p cb=%p\n", fd, ev, ev->cb);
+	dbg(lvl_debug,"fd=%d ev=%p cb=%p\n", fd, ev, ev->cb);
 	callback_call_0(ev->cb);
 #endif
 }
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index f4d8c18da..55b22cfd9 100644
--- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
@@ -65,7 +65,7 @@ qt_qpainter_draw(struct graphics_priv *gr, const QRect *r, int paintev)
 {
 	if (!paintev) {
 #ifndef QT_QPAINTER_NO_WIDGET
-		dbg(lvl_warning,"update %d,%d %d x %d\n", r->x(), r->y(), r->width(), r->height());
+		dbg(lvl_debug,"update %d,%d %d x %d\n", r->x(), r->y(), r->width(), r->height());
 		if (r->x() <= -r->width())
 			return;
 		if (r->y() <= -r->height())
@@ -74,7 +74,7 @@ qt_qpainter_draw(struct graphics_priv *gr, const QRect *r, int paintev)
 			return;
 		if (r->y() > gr->widget->pixmap->height())
 			return;
-		dbg(lvl_warning,"update valid %d,%d %dx%d\n", r->x(), r->y(), r->width(), r->height());
+		dbg(lvl_debug,"update valid %d,%d %dx%d\n", r->x(), r->y(), r->width(), r->height());
 		gr->widget->update(*r);
 #endif
 		return;
@@ -380,7 +380,7 @@ static void draw_polygon(struct graphics_priv *gr, struct graphics_gc_priv *gc,
 //##############################################################################################################
 static void draw_rectangle(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int w, int h)
 {
-	dbg(lvl_warning,"gr=%p gc=%p %d,%d,%d,%d\n", gr, gc, p->x, p->y, w, h);
+	dbg(lvl_debug,"gr=%p gc=%p %d,%d,%d,%d\n", gr, gc, p->x, p->y, w, h);
 	gr->painter->fillRect(p->x,p->y, w, h, *gc->brush);
 }
 
@@ -547,7 +547,7 @@ static void background_gc(struct graphics_priv *gr, struct graphics_gc_priv *gc)
 //##############################################################################################################
 static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode)
 {
-	dbg(lvl_warning,"mode for %p %d\n", gr, mode);
+	dbg(lvl_debug,"mode for %p %d\n", gr, mode);
 	QRect r;
 	if (mode == draw_mode_begin) {
 #if QT_VERSION >= 0x040000
@@ -652,7 +652,7 @@ static void * get_data(struct graphics_priv *this_, const char *type)
 	bool ok;
 
 	if (!strcmp(type, "resize")) {
-		dbg(lvl_error,"resize %d %d\n",this_->w,this_->h);
+		dbg(lvl_debug,"resize %d %d\n",this_->w,this_->h);
 		QSize size(this_->w,this_->h);
 		this_->widget->do_resize(size);
 	}
@@ -821,14 +821,14 @@ event_qt_main_loop_run(void)
 
 static void event_qt_main_loop_quit(void)
 {
-	dbg(lvl_error,"enter\n");
+	dbg(lvl_debug,"enter\n");
 	exit(0);
 }
 
 static struct event_watch *
 event_qt_add_watch(int fd, enum event_watch_cond cond, struct callback *cb)
 {
-	dbg(lvl_warning,"enter fd=%d\n",(int)(long)fd);
+	dbg(lvl_debug,"enter fd=%d\n",(int)(long)fd);
 	struct event_watch *ret=g_new0(struct event_watch, 1);
 	ret->fd=fd;
 	ret->cb=cb;
@@ -868,21 +868,21 @@ event_qt_remove_timeout(struct event_timeout *ev)
 static struct event_idle *
 event_qt_add_idle(int priority, struct callback *cb)
 {
-	dbg(lvl_error,"enter\n");
+	dbg(lvl_debug,"enter\n");
 	return (struct event_idle *)event_qt_add_timeout(0, 1, cb);
 }
 
 static void
 event_qt_remove_idle(struct event_idle *ev)
 {
-	dbg(lvl_error,"enter\n");
+	dbg(lvl_debug,"enter\n");
 	event_qt_remove_timeout((struct event_timeout *) ev);
 }
 
 static void
 event_qt_call_callback(struct callback_list *cb)
 {
-	dbg(lvl_error,"enter\n");
+	dbg(lvl_debug,"enter\n");
 }
 
 static struct event_methods event_qt_methods = {
@@ -903,7 +903,7 @@ struct event_priv {
 struct event_priv *
 event_qt_new(struct event_methods *meth)
 {
-	dbg(lvl_error,"enter\n");
+	dbg(lvl_debug,"enter\n");
 	*meth=event_qt_methods;
 	return NULL;
 }
@@ -920,7 +920,7 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct
 	struct font_priv * (*font_freetype_new)(void *meth);
 	struct attr *attr;
 
-	dbg(lvl_error,"enter\n");
+	dbg(lvl_debug,"enter\n");
 #ifdef QT_QPAINTER_USE_EVENT_QT
 	if (event_gr)
 		return NULL;
@@ -987,7 +987,7 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct
 	else
 		ret->window_title=g_strdup("Navit");
 
-	dbg(lvl_error,"return\n");
+	dbg(lvl_debug,"return\n");
 	return ret;
 }