diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-19 22:07:16 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-19 22:07:16 +0000 |
commit | dcc80ed328fba7f5a398355cfb09a475c43662e3 (patch) | |
tree | 4dc76ff9351b5aa249e99b9b7f64ea8fb668b4b6 /navit/graphics | |
parent | 7cb80b517c9dd06452f421a8c89133faa01f5289 (diff) | |
download | navit-dcc80ed328fba7f5a398355cfb09a475c43662e3.tar.gz |
Fix:graphics/qt_qpainter:Remove code for Qt <4. We currently require Qt >=4.7.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6002 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/graphics')
-rw-r--r-- | navit/graphics/qt_qpainter/RenderArea.cpp | 17 | ||||
-rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp | 65 | ||||
-rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.h | 24 |
3 files changed, 3 insertions, 103 deletions
diff --git a/navit/graphics/qt_qpainter/RenderArea.cpp b/navit/graphics/qt_qpainter/RenderArea.cpp index c1646e2ff..1159082ed 100644 --- a/navit/graphics/qt_qpainter/RenderArea.cpp +++ b/navit/graphics/qt_qpainter/RenderArea.cpp @@ -25,11 +25,7 @@ EmbeddedWidget::EmbeddedWidget(struct graphics_priv *priv, QWidget* child, QWidget *parent) : QX11EmbedWidget(parent) { this->gra=priv; -#if QT_VERSION >= 0x040000 this->setWindowTitle(priv->window_title); -#else - this->setCaption(priv->window_title); -#endif QStackedLayout* _outerLayout = new QStackedLayout(this); this->setLayout(_outerLayout); _outerLayout->addWidget(child); @@ -58,11 +54,7 @@ RenderArea::RenderArea(struct graphics_priv *priv, QT_QPAINTER_RENDERAREA_PARENT grabGesture(Qt::SwipeGesture); grabGesture(Qt::PanGesture); #endif -#if QT_VERSION >= 0x040000 setWindowTitle(priv->window_title); -#else - setCaption(priv->window_title); -#endif } #endif is_overlay=overlay; @@ -72,11 +64,7 @@ RenderArea::RenderArea(struct graphics_priv *priv, QT_QPAINTER_RENDERAREA_PARENT timer_callback=g_hash_table_new(NULL, NULL); watches=g_hash_table_new(NULL, NULL); #ifndef QT_QPAINTER_NO_WIDGET -#if QT_VERSION >= 0x040000 setAttribute(Qt::WA_OpaquePaintEvent, true); -#else - setBackgroundMode(QWidget::NoBackground); -#endif #endif #endif } @@ -234,12 +222,7 @@ void RenderArea::wheelEvent(QWheelEvent *event) void RenderArea::keyPressEvent(QKeyEvent *event) { QString str=event->text(); -#if QT_VERSION < 0x040000 - QCString cstr=str.utf8(); - const char *text=cstr; -#else const char *text=str.toUtf8().constData(); -#endif 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_debug,"special key\n"); diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp index 55b22cfd9..a804673f2 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp @@ -95,23 +95,14 @@ qt_qpainter_draw(struct graphics_priv *gr, const QRect *r, int paintev) if (!overlay->overlay_disable && r->intersects(ovr)) { unsigned char *data; int i,size=ovr.width()*ovr.height(); -#if QT_VERSION < 0x040000 - QImage img=overlay->widget->pixmap->convertToImage(); - img.setAlphaBuffer(1); -#else QImage img=overlay->widget->pixmap->toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); -#endif data=img.bits(); for (i = 0 ; i < size ; i++) { if (data[0] == overlay->rgba[0] && data[1] == overlay->rgba[1] && data[2] == overlay->rgba[2]) data[3]=overlay->rgba[3]; data+=4; } -#if QT_VERSION < 0x040000 - painter.drawImage(QPoint(ovr.x()-r->x(),ovr.y()-r->y()), img, 0); -#else painter.drawImage(QPoint(ovr.x()-r->x(),ovr.y()-r->y()), img); -#endif } overlay=overlay->next; } @@ -231,11 +222,7 @@ static void gc_set_dashes(struct graphics_gc_priv *gc, int w, int offset, unsign //############################################################################################################## static void gc_set_foreground(struct graphics_gc_priv *gc, struct color *c) { -#if QT_VERSION >= 0x040000 QColor col(c->r >> 8, c->g >> 8, c->b >> 8 /* , c->a >> 8 */); -#else - QColor col(c->r >> 8, c->g >> 8, c->b >> 8); -#endif gc->pen->setColor(col); gc->brush->setColor(col); gc->c=*c; @@ -340,11 +327,7 @@ static struct graphics_image_priv * image_new(struct graphics_priv *gr, struct g static void draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count) { int i; -#if QT_VERSION >= 0x040000 QPolygon polygon; -#else - QPointArray polygon; -#endif for (i = 0 ; i < count ; i++) polygon.putPoints(i, 1, p[i].x, p[i].y); @@ -360,11 +343,7 @@ static void draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, st static void draw_polygon(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count) { int i; -#if QT_VERSION >= 0x040000 QPolygon polygon; -#else - QPointArray polygon; -#endif for (i = 0 ; i < count ; i++) polygon.putPoints(i, 1, p[i].x, p[i].y); @@ -407,15 +386,9 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str #ifndef QT_QPAINTER_USE_FREETYPE QString tmp=QString::fromUtf8(text); #ifndef QT_NO_TRANSFORMATIONS -#if QT_VERSION >= 0x040000 QMatrix sav=gr->painter->worldMatrix(); QMatrix m(dx/65535.0,dy/65535.0,-dy/65535.0,dx/65535.0,p->x,p->y); painter->setWorldMatrix(m,TRUE); -#else - QWMatrix sav=gr->painter->worldMatrix(); - QWMatrix m(dx/65535.0,dy/65535.0,-dy/65535.0,dx/65535.0,p->x,p->y); - painter->setWorldMatrix(m,TRUE); -#endif painter->setPen(*fg->pen); painter->setFont(*font->font); painter->drawText(0, 0, tmp); @@ -445,16 +418,9 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str g=*gp++; if (g->w && g->h) { unsigned char *data; -#if QT_VERSION < 0x040000 - QImage img(g->w+2, g->h+2, 32); - img.setAlphaBuffer(1); - data=img.bits(); - gr->freetype_methods.get_shadow(g,(unsigned char *)(img.jumpTable()),32,0,bgc,&transparent); -#else QImage img(g->w+2, g->h+2, QImage::Format_ARGB32_Premultiplied); data=img.bits(); gr->freetype_methods.get_shadow(g,(unsigned char *)data,32,img.bytesPerLine(),bgc,&transparent); -#endif painter->drawImage(((x+g->x)>>6)-1, ((y+g->y)>>6)-1, img); } @@ -471,16 +437,9 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str g=*gp++; if (g->w && g->h) { unsigned char *data; -#if QT_VERSION < 0x040000 - QImage img(g->w, g->h, 32); - img.setAlphaBuffer(1); - data=img.bits(); - gr->freetype_methods.get_glyph(g,(unsigned char *)(img.jumpTable()),32,0,fgc,bgc,&transparent); -#else QImage img(g->w, g->h, QImage::Format_ARGB32_Premultiplied); data=img.bits(); gr->freetype_methods.get_glyph(g,(unsigned char *)data,32,img.bytesPerLine(),fgc,bgc,&transparent); -#endif painter->drawImage((x+g->x)>>6, (y+g->y)>>6, img); } x+=g->dx; @@ -550,25 +509,12 @@ static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) dbg(lvl_debug,"mode for %p %d\n", gr, mode); QRect r; if (mode == draw_mode_begin) { -#if QT_VERSION >= 0x040000 if (gr->widget->pixmap->paintingActive()) { gr->widget->pixmap->paintEngine()->painter()->end(); } -#endif gr->painter->begin(gr->widget->pixmap); -#if 0 - gr->painter->fillRect(QRect(QPoint(0,0), gr->widget->size()), *gr->background_gc->brush); -#endif } -#if QT_VERSION < 0x040000 - if (mode == draw_mode_cursor) { - gr->painter->begin(gr->widget); - } -#endif if (mode == draw_mode_end) { -#if 0 - if (gr->mode == draw_mode_begin) { -#endif gr->painter->end(); if (gr->parent) { if (gr->cleanup) { @@ -582,23 +528,12 @@ static void draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) r.setRect(0, 0, gr->widget->pixmap->width(), gr->widget->pixmap->height()); qt_qpainter_draw(gr, &r, 0); } -#if 0 - } else { -#if QT_VERSION < 0x040000 - gr->painter->end(); -#endif - } -#endif -#if QT_VERSION >= 0x040000 if (!gr->parent) QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents|QEventLoop::ExcludeSocketNotifiers|QEventLoop::DeferredDeletion|QEventLoop::X11ExcludeTimers); -#endif } -#if QT_VERSION >= 0x040000 if (mode == draw_mode_end_lazy) { gr->painter->end(); } -#endif gr->mode=mode; } diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.h b/navit/graphics/qt_qpainter/graphics_qt_qpainter.h index 75ae339ca..9678b0dc0 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.h +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.h @@ -36,6 +36,9 @@ #include "navit/navit.h" #include <qglobal.h> +#if QT_VERSION < 0x040000 +#error "Support for Qt 3 was dropped in rev 5999." +#endif #ifndef QT_QPAINTER_USE_FREETYPE #define QT_QPAINTER_USE_FREETYPE 1 @@ -45,25 +48,6 @@ #include "navit/font/freetype/font_freetype.h" #endif -#if QT_VERSION < 0x040000 -#include <qwidget.h> -#include <qapplication.h> -#include <qpainter.h> -#include <qpen.h> -#include <qbrush.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qpixmapcache.h> -#include <qlistview.h> -#include <qobject.h> -#include <qsocketnotifier.h> -#ifdef HAVE_QPE -#include <qpe/qpeapplication.h> -#endif -#ifndef QT_QPAINTER_USE_EVENT_QT -#define QT_QPAINTER_USE_EVENT_QT 1 -#endif -#else #include <QResizeEvent> #include <QApplication> #if QT_VERSION >= 0x040200 @@ -92,8 +76,6 @@ #endif #endif -#endif - #ifdef QT_QPAINTER_USE_EMBEDDING #include <QX11EmbedWidget> #endif |