Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 3 insertions, 3 deletions

diff --git a/library/imageedit.cpp b/library/imageedit.cpp
index 0c22448..caa538a 100644
--- a/library/imageedit.cpp
+++ b/library/imageedit.cpp
@@ -1,55 +1,55 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "imageedit.h"
 #include <qpainter.h>
 
-ImageEdit::ImageEdit( QWidget *parent, const char *name )
+ImageEdit::ImageEdit( QWidget *parent, const char *name)
     : QScrollView( parent, name, WNorthWestGravity | WResizeNoErase ), buffer()
 {
     buffer.resize( size() );
     buffer.fill( colorGroup().color( QColorGroup::Base ) );
 }
 
 ImageEdit::~ImageEdit()
 {
     
 }
 
 void ImageEdit::contentsMousePressEvent( QMouseEvent *e )
 {
     lastPos = e->pos();
 }
 
 void ImageEdit::contentsMouseMoveEvent( QMouseEvent *e )
 {
     QPainter pw( viewport() );
     QPainter pb( &buffer );
     pb.drawLine( lastPos, e->pos() );
     pw.drawLine( contentsToViewport( lastPos ),
                  contentsToViewport( e->pos() ) );
     lastPos = e->pos();
 }
 
 void ImageEdit::contentsMouseReleaseEvent( QMouseEvent * )
 {
 }
 
 void ImageEdit::viewportResizeEvent( QResizeEvent *e )
 {