Merge from BRANCH_1_0

8 files changed, 198 insertions, 184 deletions

diff --git a/noncore/unsupported/gsmtool/gsmtool.pro b/noncore/unsupported/gsmtool/gsmtool.pro
index 180195f..40d5942 100644
--- a/noncore/unsupported/gsmtool/gsmtool.pro
+++ b/noncore/unsupported/gsmtool/gsmtool.pro
@@ -7,7 +7,7 @@ SOURCES		= main.cpp gsmtool.cpp
 # This doesn't actually work...
 TMAKE_CXXFLAGS  += -fexceptions
 INCLUDEPATH	+= $(OPIEDIR)/include
-INCLUDEPATH	+= $(GSMLIBDIR)
+#INCLUDEPATH	+= $(GSMLIBDIR)
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -L$(GSMLIBDIR)/gsmlib/.libs -lgsmme
 INTERFACES	= gsmtoolbase.ui
diff --git a/noncore/unsupported/mail2/addresspicker.cpp b/noncore/unsupported/mail2/addresspicker.cpp
index 7f32725..a97b33f 100644
--- a/noncore/unsupported/mail2/addresspicker.cpp
+++ b/noncore/unsupported/mail2/addresspicker.cpp
@@ -24,6 +24,7 @@ AddressPicker::AddressPicker(QWidget *parent, const char *name, bool modal,
 
 	if (f.open(IO_ReadOnly)) {
 		QTextStream stream(&f);
+		stream.setEncoding( QTextStream::UnicodeUTF8 );
 		QString content;
 		while (!f.atEnd()) content += stream.readLine() + "\n";
 		QStringList lines = QStringList::split(QRegExp("\\n"), content);
diff --git a/noncore/unsupported/mail2/bend/opie-mailapplet.control b/noncore/unsupported/mail2/bend/opie-mailapplet.control
index e5d3c6e..d618643 100644
--- a/noncore/unsupported/mail2/bend/opie-mailapplet.control
+++ b/noncore/unsupported/mail2/bend/opie-mailapplet.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
 Architecture: arm
-Version: 0.0.9-$SUB_VERSION
-Depends: task-opie-minimal libopie1 opie-mail2
+Version: $QPE_VERSION$EXTRAVERSION
+Depends: task-opie-minimal, libopie1, opie-mail2
 Description: A Biff-Like mailchecker
 License: LGPL
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index 7f8aeb6..976dc0b 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
 Architecture: arm
-Version: 0.0.9-$SUB_VERSION
+Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
 Description: An IMAP mail client
 License: LGPL
diff --git a/noncore/unsupported/mailit/opie-mailit.control b/noncore/unsupported/mailit/opie-mailit.control
index 65b5b36..77d4102 100644
--- a/noncore/unsupported/mailit/opie-mailit.control
+++ b/noncore/unsupported/mailit/opie-mailit.control
@@ -4,6 +4,6 @@ Priority: optional
 Section: opie
 Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
-Version: $OPIE_VERSION-$SUB_VERSION
+Version: $QPE_VERSION$EXTRAVERSION
 Description: EMail
  A simple POP3 email client for the Opie environment.
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp
index 52237f5..022d938 100644
--- a/noncore/unsupported/qpdf/QOutputDev.cpp
+++ b/noncore/unsupported/qpdf/QOutputDev.cpp
@@ -86,7 +86,7 @@ static QOutFontSubst qStdFonts [] = {
 
 	{ "Symbol",                0,           false, false, QFont::AnyStyle },
 	{ "Zapf-Dingbats",         0,           false, false, QFont::AnyStyle },
-  
+
 	{ 0,                       0,           false, false, QFont::AnyStyle }
 };
 
@@ -96,15 +96,15 @@ static QOutFontSubst qStdFonts [] = {
 
 
 
-QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp_t m22 ) 
+QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp_t m22 )
 {
 	static QDict<QOutFontSubst> stdfonts;
-	
-	// build dict for std. fonts on first invocation	
+
+	// build dict for std. fonts on first invocation
 	if ( stdfonts. isEmpty ( )) {
 		for ( QOutFontSubst *ptr = qStdFonts; ptr-> m_name; ptr++ ) {
 			stdfonts. insert ( QString ( ptr-> m_name ), ptr );
-		}	
+		}
 	}
 
 	// compute size and normalized transform matrix
@@ -119,8 +119,8 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp
 	         gfxFont-> isSerif ( ),
 	         gfxFont-> isSymbolic ( ),
 	         gfxFont-> isCIDFont ( ),
-	         ( gfxFont-> getEmbeddedFontName ( ) ? gfxFont-> getEmbeddedFontName ( ) : "<n/a>" ),
-	         (double) m11, (double) m12, (double) m21, (double) m22 ));
+	         ( gfxFont-> getEmbeddedFontName ( ) ? gfxFont-> getEmbeddedFontName()-> getCString ( ) : "<n/a>" ),
+                          (double) m11, (double) m12, (double) m21, (double) m22 ) );
 
 
 	QString fname (( gfxFont-> getName ( )) ? gfxFont-> getName ( )-> getCString ( ) : "<n/a>" );
@@ -130,32 +130,32 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp
 
 	// fast lookup for std. fonts
 	QOutFontSubst *subst = stdfonts [fname];
-	
+
 	if ( subst ) {
 		if ( subst-> m_sname )
 			f. setFamily ( subst-> m_sname );
-		f. setStyleHint ( subst-> m_hint, (QFont::StyleStrategy) ( QFont::PreferOutline | QFont::PreferQuality ));	
+		f. setStyleHint ( subst-> m_hint, (QFont::StyleStrategy) ( QFont::PreferOutline | QFont::PreferQuality ));
 		f. setBold ( subst-> m_bold );
 		f. setItalic ( subst-> m_italic );
 	}
 	else {
 		QFont::StyleHint sty;
-	
+
 		if ( gfxFont-> isSerif ( ))
 			sty = QFont::Serif;
 		else if ( gfxFont-> isFixedWidth ( ))
 			sty = QFont::TypeWriter;
 		else
 			sty = QFont::Helvetica;
-	
-		f. setStyleHint ( sty, (QFont::StyleStrategy) ( QFont::PreferOutline | QFont::PreferQuality ));	
+
+		f. setStyleHint ( sty, (QFont::StyleStrategy) ( QFont::PreferOutline | QFont::PreferQuality ));
 		f. setBold ( gfxFont-> isBold ( ) > 0 );
 		f. setItalic ( gfxFont-> isItalic ( ) > 0 );
 		f. setFixedPitch ( gfxFont-> isFixedWidth ( ) > 0 );
-	
-		// common specifiers in font names 
+
+		// common specifiers in font names
 		if ( fname. contains ( "Oblique" ) || fname. contains ( "Italic" ))
-			f. setItalic ( true ); 
+			f. setItalic ( true );
 		if ( fname. contains ( "Bold" ))
 			f. setWeight ( QFont::Bold );
 		if ( fname. contains ( "Demi" ))
@@ -164,11 +164,11 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp
 			f. setWeight ( QFont::Light );
 		if ( fname. contains ( "Black" ))
 			f. setWeight ( QFont::Black );
-	}		
+	}
 	// Treat x-sheared fonts as italic
 	if (( m12 > -0.1 ) && ( m12 < 0.1 ) && ((( m21 > -5.0 ) && ( m21 < -0.1 )) || (( m21 > 0.1 ) && ( m21 < 5.0 )))) {
-		f. setItalic ( true ); 
-	}	
+		f. setItalic ( true );
+	}
 	return f;
 }
 
@@ -182,12 +182,12 @@ QOutputDev::QOutputDev ( QWidget *parent, const char *name, int flags ) : QScrol
 {
 	m_pixmap = 0;
 	m_painter = 0;
-	
+
 	// create text object
 	m_text = new TextPage ( gFalse );
 }
 
-QOutputDev::~QOutputDev ( ) 
+QOutputDev::~QOutputDev ( )
 {
 	delete m_painter;
 	delete m_pixmap;
@@ -195,46 +195,53 @@ QOutputDev::~QOutputDev ( )
 }
 
 
-void QOutputDev::startPage ( int /*pageNum*/, GfxState *state ) 
+void QOutputDev::startPage ( int /*pageNum*/, GfxState *state )
 {
 	delete m_pixmap;
 	delete m_painter;
-	
+
 	m_pixmap = new QPixmap ( lrint ( state-> getPageWidth ( )), lrint ( state-> getPageHeight ( )));
 	m_painter = new QPainter ( m_pixmap );
 
 	QPDFDBG( printf ( "NEW PIXMAP (%ld x %ld)\n", lrint ( state-> getPageWidth ( )),  lrint ( state-> getPageHeight ( ))));
-	
+
 	resizeContents ( m_pixmap-> width ( ), m_pixmap-> height ( ));
 	setContentsPos ( 0, 0 );
 
 	m_pixmap-> fill ( white ); // clear window
-	m_text-> clear ( ); // cleat text object	
-	viewport ( )-> repaint ( );	
+	m_text-> clear ( ); // cleat text object
+	viewport ( )-> repaint ( );
 }
 
-void QOutputDev::endPage ( ) 
+void QOutputDev::endPage ( )
 {
+        QPDFDBG( printf("End page\n") );
 	m_text-> coalesce ( );
-	
+
+        /*
+         * I get stupid crashes after endPage is called and then we do clipping
+         * and other stuff.....
+         */
+#if 0
 	delete m_painter;
 	m_painter = 0;
-	
+#endif
+
 	updateContents ( 0, 0, contentsWidth ( ), contentsHeight ( ));
 }
 
-void QOutputDev::drawLink ( Link *link, Catalog */*catalog*/ ) 
+void QOutputDev::drawLink ( Link *link, Catalog */*catalog*/ )
 {
 	fp_t x1, y1, x2, y2, w;
 
 	link-> getBorder ( &x1, &y1, &x2, &y2, &w );
-	
+
 	if ( w > 0 ) {
 		int x, y, dx, dy;
-	
+
 		cvtUserToDev ( x1, y1, &x,  &y );
 		cvtUserToDev ( x2, y2, &dx, &dy );
-		
+
 		QPen oldpen = m_painter-> pen ( );
 		m_painter-> setPen ( blue );
 		m_painter-> drawRect ( x, y, dx, dy );
@@ -242,23 +249,29 @@ void QOutputDev::drawLink ( Link *link, Catalog */*catalog*/ )
 	}
 }
 
-void QOutputDev::saveState ( GfxState */*state*/ ) 
+void QOutputDev::saveState ( GfxState */*state*/ )
 {
+        if ( ! m_painter )
+            return;
+
 	QPDFDBG( printf ( "SAVE (CLIP=%d/%d)\n",  m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( )));
 
-	m_painter-> save ( );	
+        m_painter-> save ( );
 }
 
-void QOutputDev::restoreState ( GfxState */*state*/ ) 
+void QOutputDev::restoreState ( GfxState */*state*/ )
 {
+	if( ! m_painter )
+	    return;
+
 	m_painter-> restore ( );
-	
+
 //	m_painter-> setClipRegion ( QRect ( 0, 0, m_pixmap-> width ( ), m_pixmap-> height ( )));
 //	m_painter-> setClipping ( false );
 	QPDFDBG ( printf ( "RESTORE (CLIP=%d/%d)\n", m_painter-> hasClipping ( ), !m_painter-> clipRegion ( ). isEmpty ( )));
 }
 
-void QOutputDev::updateAll ( GfxState *state ) 
+void QOutputDev::updateAll ( GfxState *state )
 {
 	updateLineAttrs ( state, gTrue );
 //	updateFlatness ( state );
@@ -268,44 +281,44 @@ void QOutputDev::updateAll ( GfxState *state )
 	updateFont ( state );
 }
 
-void QOutputDev::updateCTM ( GfxState *state, fp_t /*m11*/, fp_t /*m12*/, fp_t /*m21*/, fp_t /*m22*/, fp_t /*m31*/, fp_t /*m32*/ ) 
+void QOutputDev::updateCTM ( GfxState *state, fp_t /*m11*/, fp_t /*m12*/, fp_t /*m21*/, fp_t /*m22*/, fp_t /*m31*/, fp_t /*m32*/ )
 {
 	updateLineAttrs ( state, gTrue );
 }
 
-void QOutputDev::updateLineDash ( GfxState *state ) 
+void QOutputDev::updateLineDash ( GfxState *state )
 {
 	updateLineAttrs ( state, gTrue );
 }
 
-void QOutputDev::updateFlatness ( GfxState */*state*/ ) 
+void QOutputDev::updateFlatness ( GfxState */*state*/ )
 {
 	// not supported
 	QPDFDBG( printf ( "updateFlatness not supported !\n" ));
 }
 
-void QOutputDev::updateLineJoin ( GfxState *state ) 
+void QOutputDev::updateLineJoin ( GfxState *state )
 {
 	updateLineAttrs ( state, gFalse );
 }
 
-void QOutputDev::updateLineCap ( GfxState *state ) 
+void QOutputDev::updateLineCap ( GfxState *state )
 {
 	updateLineAttrs ( state, gFalse );
 }
 
 // unimplemented
-void QOutputDev::updateMiterLimit ( GfxState */*state*/ ) 
+void QOutputDev::updateMiterLimit ( GfxState */*state*/ )
 {
 	QPDFDBG( printf ( "updateMiterLimit not supported !\n" ));
 }
 
-void QOutputDev::updateLineWidth ( GfxState *state ) 
+void QOutputDev::updateLineWidth ( GfxState *state )
 {
 	updateLineAttrs ( state, gFalse );
 }
 
-void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash ) 
+void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash )
 {
 	fp_t *dashPattern;
 	int dashLength;
@@ -316,7 +329,7 @@ void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash )
 	int width;
 
 	width = lrint ( state-> getTransformedLineWidth ( ));
-	
+
 	switch ( state-> getLineCap ( )) {
 		case 0: cap = FlatCap; break;
 		case 1: cap = RoundCap; break;
@@ -326,7 +339,7 @@ void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash )
 			cap = FlatCap;
 			break;
 	}
-		
+
 	switch (state->getLineJoin()) {
 		case 0: join = MiterJoin; break;
 		case 1: join = RoundJoin; break;
@@ -336,7 +349,7 @@ void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash )
 			join = MiterJoin;
 			break;
 	}
-	
+
 	state-> getLineDash ( &dashPattern, &dashLength, &dashStart );
 
 	QColor oldcol = m_painter-> pen ( ). color ( );
@@ -349,7 +362,7 @@ void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash )
 
 	if ( updateDash && ( dashLength > 0 )) {
 		// Not supported by QT
-/*	
+/*
 		char dashList[20];
 		if (dashLength > 20)
 			dashLength = 20;
@@ -363,7 +376,7 @@ void QOutputDev::updateLineAttrs ( GfxState *state, GBool updateDash )
 	}
 }
 
-void QOutputDev::updateFillColor ( GfxState *state ) 
+void QOutputDev::updateFillColor ( GfxState *state )
 {
 	GfxRGB rgb;
 	state-> getFillRGB ( &rgb );
@@ -371,35 +384,35 @@ void QOutputDev::updateFillColor ( GfxState *state )
 	m_painter-> setBrush ( q_col ( rgb ));
 }
 
-void QOutputDev::updateStrokeColor ( GfxState *state ) 
+void QOutputDev::updateStrokeColor ( GfxState *state )
 {
 	GfxRGB rgb;
 	state-> getStrokeRGB ( &rgb );
-	
+
 	QPen pen = m_painter-> pen ( );
 	pen. setColor ( q_col ( rgb ));
 	m_painter-> setPen ( pen );
 }
 
-void QOutputDev::updateFont ( GfxState *state ) 
+void QOutputDev::updateFont ( GfxState *state )
 {
 	fp_t m11, m12, m21, m22;
 	GfxFont *gfxFont = state-> getFont ( );
-	 
+
 	if ( !gfxFont )
 		return;
-	
+
 	state-> getFontTransMat ( &m11, &m12, &m21, &m22 );
 	m11 *= state-> getHorizScaling ( );
 	m12 *= state-> getHorizScaling ( );
-  
+
 	QFont font = matchFont ( gfxFont, m11, m12, m21, m22 );
-	
+
 	m_painter-> setFont ( font );
 	m_text-> updateFont ( state );
 }
 
-void QOutputDev::stroke ( GfxState *state ) 
+void QOutputDev::stroke ( GfxState *state )
 {
 	QPointArray points;
 	QArray<int> lengths;
@@ -408,31 +421,31 @@ void QOutputDev::stroke ( GfxState *state )
 	int n = convertPath ( state, points, lengths );
 
 	QPDFDBG( printf ( "DRAWING: %d POLYS\n", n ));
-	
+
 	// draw each subpath
 	int j = 0;
 	for ( int i = 0; i < n; i++ ) {
 		int len = lengths [i];
-	
+
 		if ( len >= 2 ) {
 			QPDFDBG( printf ( " - POLY %d: ", i ));
 			QPDFDBG( for ( int ii = 0; ii < len; ii++ ))
 				QPDFDBG( printf ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( )));
 			QPDFDBG( printf ( "\n" ));
-			
+
 			m_painter-> drawPolyline ( points, j, len );
-		}	
+		}
 		j += len;
 	}
 	qApp-> processEvents ( );
 }
 
-void QOutputDev::fill ( GfxState *state ) 
+void QOutputDev::fill ( GfxState *state )
 {
 	doFill ( state, true );
 }
 
-void QOutputDev::eoFill ( GfxState *state ) 
+void QOutputDev::eoFill ( GfxState *state )
 {
 	doFill ( state, false );
 }
@@ -446,7 +459,7 @@ void QOutputDev::eoFill ( GfxState *state )
 //  only for single-component polygons, since it's not very
 //  compatible with the compound polygon kludge (see convertPath()).
 //
-void QOutputDev::doFill ( GfxState *state, bool winding ) 
+void QOutputDev::doFill ( GfxState *state, bool winding )
 {
 	QPointArray points;
 	QArray<int> lengths;
@@ -455,23 +468,23 @@ void QOutputDev::doFill ( GfxState *state, bool winding )
 	int n = convertPath ( state, points, lengths );
 
 	QPDFDBG( printf ( "FILLING: %d POLYS\n", n ));
-	
+
 	QPen oldpen = m_painter-> pen ( );
 	m_painter-> setPen ( QPen ( NoPen ));
-	
+
 	// draw each subpath
 	int j = 0;
 	for ( int i = 0; i < n; i++ ) {
 		int len = lengths [i];
-	
+
 		if ( len >= 3 ) {
 			QPDFDBG( printf ( " - POLY %d: ", i ));
 			QPDFDBG( for ( int ii = 0; ii < len; ii++ ))
 				QPDFDBG( printf ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( )));
 			QPDFDBG( printf ( "\n" ));
-		
+
 			m_painter-> drawPolygon ( points, winding, j, len );
-		}	
+		}
 		j += len;
 	}
 	m_painter-> setPen ( oldpen );
@@ -479,17 +492,17 @@ void QOutputDev::doFill ( GfxState *state, bool winding )
 	qApp-> processEvents ( );
 }
 
-void QOutputDev::clip ( GfxState *state ) 
+void QOutputDev::clip ( GfxState *state )
 {
 	doClip ( state, true );
 }
 
-void QOutputDev::eoClip ( GfxState *state ) 
+void QOutputDev::eoClip ( GfxState *state )
 {
 	doClip ( state, false );
 }
 
-void QOutputDev::doClip ( GfxState *state, bool winding ) 
+void QOutputDev::doClip ( GfxState *state, bool winding )
 {
 	QPointArray points;
 	QArray<int> lengths;
@@ -498,35 +511,35 @@ void QOutputDev::doClip ( GfxState *state, bool winding )
 	int n = convertPath ( state, points, lengths );
 
 	QRegion region;
-	
+
 	QPDFDBG( printf ( "CLIPPING: %d POLYS\n", n ));
-	
+
 	// draw each subpath
 	int j = 0;
 	for ( int i = 0; i < n; i++ ) {
 		int len = lengths [i];
-		
-		if ( len >= 3 ) {		
+
+		if ( len >= 3 ) {
 			QPointArray dummy;
 			dummy. setRawData ( points. data ( ) + j, len );
-		
+
 			QPDFDBG( printf ( " - POLY %d: ", i ));
 			QPDFDBG( for ( int ii = 0; ii < len; ii++ ) printf ( "(%d/%d) ", points [j+ii]. x ( ), points [j+ii]. y ( )));
 			QPDFDBG( printf ( "\n" ));
-		
+
 			region |= QRegion ( dummy, winding );
-		
+
 			dummy. resetRawData ( points. data ( ) + j, len );
-		}		
+		}
 		j += len;
 	}
-	
-	if ( m_painter-> hasClipping ( ))
+
+	if ( m_painter && m_painter-> hasClipping ( ))
 		region &= m_painter-> clipRegion ( );
 
 //	m_painter-> setClipRegion ( region );
 //	m_painter-> setClipping ( true );
-	
+
 //	m_painter-> fillRect ( 0, 0, m_pixmap-> width ( ), m_pixmap-> height ( ), red );
 //	m_painter-> drawText ( points [0]. x ( ) + 10, points [0]. y ( ) + 10, "Bla bla" );
 	qApp-> processEvents ( );
@@ -541,7 +554,7 @@ void QOutputDev::doClip ( GfxState *state, bool winding )
 // Then it connects subaths within a single compound polygon to a single
 // point so that X can fill the polygon (sort of).
 //
-int QOutputDev::convertPath ( GfxState *state, QPointArray &points, QArray<int> &lengths ) 
+int QOutputDev::convertPath ( GfxState *state, QPointArray &points, QArray<int> &lengths )
 {
 	GfxPath *path = state-> getPath ( );
 	int n = path-> getNumSubpaths ( );
@@ -569,36 +582,36 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr
 
 	int m = subpath-> getNumPoints ( );
 	int i = 0;
-	
+
 	while ( i < m ) {
 		if ( i >= 1 && subpath-> getCurve ( i )) {
 			state-> transform ( subpath-> getX ( i - 1 ), subpath-> getY ( i - 1 ), &x0, &y0 );
 			state-> transform ( subpath-> getX ( i ),     subpath-> getY ( i ),     &x1, &y1 );
 			state-> transform ( subpath-> getX ( i + 1 ), subpath-> getY ( i + 1 ), &x2, &y2 );
 			state-> transform ( subpath-> getX ( i + 2 ), subpath-> getY ( i + 2 ), &x3, &y3 );
-			
+
 			QPointArray tmp;
 			tmp. setPoints ( 4, lrint ( x0 ), lrint ( y0 ), lrint ( x1 ), lrint ( y1 ),
 			                    lrint ( x2 ), lrint ( y2 ), lrint ( x3 ), lrint ( y3 ));
 
 #if QT_VERSION < 300
 			tmp = tmp. quadBezier ( );
-			
+
 			for ( uint loop = 0; loop < tmp. count ( ); loop++ ) {
 				QPoint p = tmp. point ( loop );
 				points. putPoints ( points. count ( ), 1, p. x ( ), p. y ( ));
 			}
 #else
 			tmp = tmp. cubicBezier ( );
-			points. putPoints ( points. count ( ), tmp. count ( ), tmp );			
+			points. putPoints ( points. count ( ), tmp. count ( ), tmp );
 #endif
 
 			i += 3;
-		} 
+		}
 		else {
 			state-> transform ( subpath-> getX ( i ), subpath-> getY ( i ), &x1, &y1 );
-			
-			points. putPoints ( points. count ( ), 1, lrint ( x1 ), lrint ( y1 ));			
+
+			points. putPoints ( points. count ( ), 1, lrint ( x1 ), lrint ( y1 ));
 			++i;
 		}
 	}
@@ -606,22 +619,22 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr
 }
 
 
-void QOutputDev::beginString ( GfxState *state, GString */*s*/ ) 
+void QOutputDev::beginString ( GfxState *state, GString */*s*/ )
 {
 	m_text-> beginString ( state );
 }
 
-void QOutputDev::endString ( GfxState */*state*/ ) 
+void QOutputDev::endString ( GfxState */*state*/ )
 {
 	m_text-> endString ( );
 }
 
 void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
                            fp_t dx, fp_t dy, fp_t originX, fp_t originY,
-                           CharCode code, Unicode *u, int uLen ) 
+                           CharCode code, Unicode *u, int uLen )
 {
 	fp_t x1, y1, dx1, dy1;
-	
+
 	if ( uLen > 0 )
 		m_text-> addChar ( state, x, y, dx, dy, u, uLen );
 
@@ -639,10 +652,10 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
 	if ( uLen > 0 ) {
 		QString str;
 		QFontMetrics fm = m_painter-> fontMetrics ( );
-		
+
 		for ( int i = 0; i < uLen; i++ ) {
 			QChar c = QChar ( u [i] );
-			
+
 			if ( fm. inFont ( c )) {
 				str [i] = QChar ( u [i] );
 			}
@@ -651,61 +664,61 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
 				QPDFDBG( printf ( "CHARACTER NOT IN FONT: %hx\n", c. unicode ( )));
 			}
 		}
-		
+
 		if (( uLen == 1 ) && ( str [0] == ' ' ))
 			return;
-	
-	
+
+
 		fp_t m11, m12, m21, m22;
-	
+
 		state-> getFontTransMat ( &m11, &m12, &m21, &m22 );
 		m11 *= state-> getHorizScaling ( );
 		m12 *= state-> getHorizScaling ( );
-		
+
 		fp_t fsize = m_painter-> font ( ). pixelSize ( );
 
 #ifndef QT_NO_TRANSFORMATIONS
 		QWMatrix oldmat;
-		
-		bool dorot = (( m12 < -0.1 ) || ( m12 > 0.1 )) && (( m21 < -0.1 ) || ( m21 > 0.1 ));		
 
-		if ( dorot ) {	
+		bool dorot = (( m12 < -0.1 ) || ( m12 > 0.1 )) && (( m21 < -0.1 ) || ( m21 > 0.1 ));
+
+		if ( dorot ) {
 			oldmat = m_painter-> worldMatrix ( );
 
 			std::cerr << std::endl << "ROTATED: " << m11 << ", " << m12 << ", " << m21 << ", " << m22 << " / SIZE: " << fsize << " / TEXT: " << str. local8Bit ( ) << endl << endl;
-						
+
 			QWMatrix mat ( lrint ( m11 / fsize ), lrint ( m12 / fsize ), -lrint ( m21 / fsize ), -lrint ( m22 / fsize ), lrint ( x1 ), lrint ( y1 ));
-			
+
 			m_painter-> setWorldMatrix ( mat );
 
 			x1 = 0;
-			y1 = 0;			
+			y1 = 0;
 		}
 #endif
-		
+
 		QPen oldpen = m_painter-> pen ( );
-	
+
 		if (!( state-> getRender ( ) & 1 )) {
 			QPen fillpen = oldpen;
-		
+
 			fillpen. setColor ( m_painter-> brush ( ). color ( ));
 			m_painter-> setPen ( fillpen );
-		}	
+		}
 
 		if ( fsize > 5 )
 			m_painter-> drawText ( lrint ( x1 ), lrint ( y1 ), str );
 		else
 			m_painter-> fillRect ( lrint ( x1 ), lrint ( y1 ), lrint ( QMAX( fp_t(1), dx1 )), lrint ( QMAX( fsize, dy1 )), m_painter-> pen ( ). color ( ));
-		
+
 		m_painter-> setPen ( oldpen );
-		
+
 #ifndef QT_NO_TRANSFORMATIONS
 		if ( dorot )
 			m_painter-> setWorldMatrix ( oldmat );
-#endif	
-		
+#endif
+
 		QPDFDBG( printf ( "DRAW TEXT: \"%s\" at (%ld/%ld)\n", str. local8Bit ( ). data ( ), lrint ( x1 ), lrint ( y1 )));
-	} 
+	}
 	else if ( code != 0 ) {
 		// some PDF files use CID 0, which is .notdef, so just ignore it
 		qWarning ( "Unknown character (CID=%d Unicode=%hx)\n", code, (unsigned short) ( uLen > 0 ? u [0] : (Unicode) 0 ));
@@ -715,14 +728,14 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y,
 
 
 
-void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, int width, int height, GBool invert, GBool inlineImg ) 
+void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str, int width, int height, GBool invert, GBool inlineImg )
 {
 	// get CTM, check for singular matrix
 	fp_t *ctm = state-> getCTM ( );
-	
+
 	if ( fabs ( ctm [0] * ctm [3] - ctm [1] * ctm [2] ) < 0.000001 ) {
 		qWarning ( "Singular CTM in drawImage\n" );
-		
+
 		if ( inlineImg ) {
 			str-> reset ( );
 			int j = height * (( width + 7 ) / 8 );
@@ -733,13 +746,13 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
 		}
 		return;
 	}
-	
-	GfxRGB rgb;	
+
+	GfxRGB rgb;
 	state-> getFillRGB ( &rgb );
 	uint val = ( lrint ( rgb. r * 255 ) & 0xff ) << 16 | ( lrint ( rgb. g * 255 ) & 0xff ) << 8 | ( lrint ( rgb. b * 255 ) & 0xff );
-	
-	
-	QImage img ( width, height, 32 );	
+
+
+	QImage img ( width, height, 32 );
 	img. setAlphaBuffer ( true );
 
 	QPDFDBG( printf ( "IMAGE MASK (%dx%d)\n", width, height ));
@@ -749,39 +762,39 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
 	imgStr-> reset ( );
 
 	uchar **scanlines = img. jumpTable ( );
-	
+
 	if ( ctm [3] > 0 )
 		scanlines += ( height - 1 );
-	
+
 	for ( int y = 0; y < height; y++ ) {
 		QRgb *scanline = (QRgb *) *scanlines;
-	
+
 		if ( ctm [0] < 0 )
 			scanline += ( width - 1 );
-	
+
 		for ( int x = 0; x < width; x++ ) {
 			Guchar alpha;
-		
+
 			imgStr-> getPixel ( &alpha );
-			
+
 			if ( invert )
 				alpha ^= 1;
-				
+
 			*scanline = ( alpha == 0 ) ? 0xff000000 | val : val;
-			
+
 			ctm [0] < 0 ? scanline-- : scanline++;
 		}
 		ctm [3] > 0 ? scanlines-- : scanlines++;
 
 		qApp-> processEvents ( );
 	}
-			
-#ifndef QT_NO_TRANSFORMATIONS			
+
+#ifndef QT_NO_TRANSFORMATIONS
 	QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
-	
-	std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl 
+
+	std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl
 	         << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
-	         
+
 	QWMatrix oldmat = m_painter-> worldMatrix ( );
 	m_painter-> setWorldMatrix ( mat, true );
 
@@ -802,10 +815,10 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
 	else {
 		int x = lrint ( ctm [4] );
 		int y = lrint ( ctm [5] );
-		
+
 		int w = lrint ( ctm [0] );
 		int h = lrint ( ctm [3] );
-		
+
 		if ( w < 0 ) {
 			x += w;
 			w = -w;
@@ -814,25 +827,25 @@ void QOutputDev::drawImageMask ( GfxState *state, Object */*ref*/, Stream *str,
 			y += h;
 			h = -h;
 		}
-	
+
 		QPDFDBG( printf ( "DRAWING IMAGE MASKED: %d/%d - %dx%d\n", x, y, w, h ));
 
 		img = img. smoothScale ( w, h );
-		qApp-> processEvents ( );		
+		qApp-> processEvents ( );
 		m_painter-> drawImage ( x, y, img );
 	}
 
 #endif
-	    	
-	delete imgStr;			       
+
+	delete imgStr;
 	qApp-> processEvents ( );
 }
 
 
-void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int width, int height, GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg ) 
+void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int width, int height, GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg )
 {
 	int nComps, nVals, nBits;
-	
+
 	// image parameters
 	nComps = colorMap->getNumPixelComps ( );
 	nVals = width * nComps;
@@ -840,10 +853,10 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
 
 	// get CTM, check for singular matrix
 	fp_t *ctm = state-> getCTM ( );
-	
+
 	if ( fabs ( ctm [0] * ctm [3] - ctm [1] * ctm [2] ) < 0.000001 ) {
 		qWarning ( "Singular CTM in drawImage\n" );
-		
+
 		if ( inlineImg ) {
 			str-> reset ( );
 			int j = height * (( nVals * nBits + 7 ) / 8 );
@@ -856,7 +869,7 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
 	}
 
 	QImage img ( width, height, 32 );
-	
+
 	if ( maskColors )
 		img. setAlphaBuffer ( true );
 
@@ -868,47 +881,47 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
 
 	Guchar pixBuf [gfxColorMaxComps];
 	GfxRGB rgb;
-	
+
 
 	uchar **scanlines = img. jumpTable ( );
-	
+
 	if ( ctm [3] > 0 )
 		scanlines += ( height - 1 );
-	
+
 	for ( int y = 0; y < height; y++ ) {
 		QRgb *scanline = (QRgb *) *scanlines;
-	
+
 		if ( ctm [0] < 0 )
 			scanline += ( width - 1 );
-	
+
 		for ( int x = 0; x < width; x++ ) {
 			imgStr-> getPixel ( pixBuf );
 			colorMap-> getRGB ( pixBuf, &rgb );
-			
+
 			uint val = ( lrint ( rgb. r * 255 ) & 0xff ) << 16 | ( lrint ( rgb. g * 255 ) & 0xff ) << 8 | ( lrint ( rgb. b * 255 ) & 0xff );
-			
+
 			if ( maskColors ) {
 				for ( int k = 0; k < nComps; ++k ) {
-					if (( pixBuf [k] < maskColors [2 * k] ) || ( pixBuf [k] > maskColors [2 * k] )) { 
+					if (( pixBuf [k] < maskColors [2 * k] ) || ( pixBuf [k] > maskColors [2 * k] )) {
 						val |= 0xff000000;
 						break;
 					}
 				}
 			}
 			*scanline = val;
-			
+
 			ctm [0] < 0 ? scanline-- : scanline++;
 		}
 		ctm [3] > 0 ? scanlines-- : scanlines++;
-		
+
 		qApp-> processEvents ( );
 	}
 
 
-#ifndef QT_NO_TRANSFORMATIONS			
+#ifndef QT_NO_TRANSFORMATIONS
 	QWMatrix mat ( ctm [0] / width, ctm [1], ctm [2], ctm [3] / height, ctm [4], ctm [5] );
 
-	std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl 
+	std::cerr << "MATRIX T=" << mat. dx ( ) << "/" << mat. dy ( ) << std::endl
 	         << " - M=" << mat. m11 ( ) << "/" << mat. m12 ( ) << "/" << mat. m21 ( ) << "/" << mat. m22 ( ) << std::endl;
 
 	QWMatrix oldmat = m_painter-> worldMatrix ( );
@@ -918,8 +931,8 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
 	QPixmap pm;
 	pm. convertFromImage ( img );
 	m_painter-> drawPixmap ( 0, 0, pm );
-#else	
-	m_painter-> drawImage ( QPoint ( 0, 0 ), img );	
+#else
+	m_painter-> drawImage ( QPoint ( 0, 0 ), img );
 #endif
 
 	m_painter-> setWorldMatrix ( oldmat );
@@ -932,10 +945,10 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
 	else {
 		int x = lrint ( ctm [4] );
 		int y = lrint ( ctm [5] );
-		
+
 		int w = lrint ( ctm [0] );
 		int h = lrint ( ctm [3] );
-		
+
 		if ( w < 0 ) {
 			x += w;
 			w = -w;
@@ -944,14 +957,14 @@ void QOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, int wi
 			y += h;
 			h = -h;
 		}
-	
+
 		QPDFDBG( printf ( "DRAWING IMAGE: %d/%d - %dx%d\n", x, y, w, h ));
 
-		img = img. smoothScale ( w, h );		
-		qApp-> processEvents ( );		
+		img = img. smoothScale ( w, h );
+		qApp-> processEvents ( );
 		m_painter-> drawImage ( x, y, img );
 	}
-	
+
 #endif
 
 
@@ -977,7 +990,7 @@ bool QOutputDev::findText ( const QString &str, int &l, int &t, int &w, int &h,
 	bool found = false;
 	uint len = str. length ( );
 	Unicode *s = new Unicode [len];
-	
+
 	for ( uint i = 0; i < len; i++ )
 		s [i] = str [i]. unicode ( );
 
@@ -986,7 +999,7 @@ bool QOutputDev::findText ( const QString &str, int &l, int &t, int &w, int &h,
 	fp_t x2 = (fp_t) l + w - 1;
 	fp_t y2 = (fp_t) t + h - 1;
 
-	if ( m_text-> findText ( s, len, top, bottom, &x1, &y1, &x2, &y2 )) {		
+	if ( m_text-> findText ( s, len, top, bottom, &x1, &y1, &x2, &y2 )) {
 		l = lrint ( x1 );
 		t = lrint ( y1 );
 		w = lrint ( x2 ) - l + 1;
@@ -994,7 +1007,7 @@ bool QOutputDev::findText ( const QString &str, int &l, int &t, int &w, int &h,
 		found = true;
 	}
 	delete [] s;
-	
+
 	return found;
 }
 
@@ -1005,7 +1018,7 @@ GBool QOutputDev::findText ( Unicode *s, int len, GBool top, GBool bottom, int *
 	fp_t yMin1 = (double) *yMin;
 	fp_t xMax1 = (double) *xMax;
 	fp_t yMax1 = (double) *yMax;
-	
+
 	if ( m_text-> findText ( s, len, top, bottom, &xMin1, &yMin1, &xMax1, &yMax1 )) {
 		*xMin = lrint ( xMin1 );
 		*xMax = lrint ( xMax1 );
@@ -1021,10 +1034,10 @@ QString QOutputDev::getText ( int l, int t, int w, int h )
 	GString *gstr = m_text-> getText ( l, t, l + w - 1, t + h - 1 );
 	QString str = gstr-> getCString ( );
 	delete gstr;
-	return str;	
+	return str;
 }
 
-QString QOutputDev::getText ( const QRect &r ) 
+QString QOutputDev::getText ( const QRect &r )
 {
 	return getText ( r. left ( ), r. top ( ), r. width ( ), r. height ( ));
 }
@@ -1035,6 +1048,6 @@ void QOutputDev::drawContents ( QPainter *p, int clipx, int clipy, int clipw, in
 {
 	if ( m_pixmap )
 		p-> drawPixmap ( clipx, clipy, *m_pixmap, clipx, clipy, clipw, cliph );
-	else 
+	else
 		p-> fillRect ( clipx, clipy, clipw, cliph, white );
 }
diff --git a/noncore/unsupported/qpdf/opie-qpdf.control b/noncore/unsupported/qpdf/opie-qpdf.control
index 33df3e1..208dcb1 100644
--- a/noncore/unsupported/qpdf/opie-qpdf.control
+++ b/noncore/unsupported/qpdf/opie-qpdf.control
@@ -4,6 +4,6 @@ Priority: optional
 Section: opie/applications
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, gzip
 Description: A PDF viewer for OPIE.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index 61f097b..de1dcf3 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -507,7 +507,7 @@ void QPdfDlg::openFile ( const DocLnk &f )
 		updateCaption ( );
 	}
 	else
-		QMessageBox::warning ( this, tr( "Error" ), tr( "File does not exist !" ));
+		QMessageBox::warning ( this, tr( "Error" ), tr( "File does not exist!" ));
 }
 
 void QPdfDlg::setDocument ( const QString &f )