5 files changed, 17 insertions, 9 deletions

diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp
index de7f83f..9c9f7ec 100644
--- a/libopie2/opieui/big-screen/owidgetstack.cpp
+++ b/libopie2/opieui/big-screen/owidgetstack.cpp
@@ -57,385 +57,385 @@ OWidgetStack::OWidgetStack( QWidget* parent, const char* name, WFlags fl)
 {
     m_last = m_mWidget = 0;
     m_forced = false;
 
     QApplication::desktop()->installEventFilter( this );
     setFontPropagation   ( AllChildren );
     setPalettePropagation( AllChildren );
 
     /* sets m_mode and initializes more */
     /* if you change this call change switchTop as well */
     m_stack = 0;
     switchStack();
 }
 
 /**
  * The destructor. It deletes also all added widgets.
  *
  */
 OWidgetStack::~OWidgetStack() {
     if (m_mode == BigScreen && !m_list.isEmpty() ) {
         QMap<int, QWidget*>::Iterator it = m_list.begin();
         for ( ; it != m_list.end(); ++it )
             delete it.data();
     }
     m_list.clear();
 
 }
 
 /**
  * return the mode of the desktop. There are currently two modes. SmallScreen
  * with a normal PDA resolution and BigScreen with resolutions greater than
  * 330 for width and height.
  * You can also force the mode this widget is in with forceMode()
  * Note that NoForce will be never returned from here
  */
 enum OWidgetStack::Mode OWidgetStack::mode()const {
     return m_mode;
 }
 
 /**
  *  You can also force one of the modes and then
  *  this widget stops on listening to size changes. You
  *  can revert to the scanning behaviour by setting mode
  *  to NoForce
  */
 void OWidgetStack::forceMode( enum Mode mode) {
     m_forced = mode != NoForce;
 
     /* we need to see which mode we're in */
     if (!m_forced ) {
         if ( QApplication::desktop()->width() >=
              mode_size )
             mode = BigScreen;
         else
             mode = SmallScreen;
     }
     switch( mode ) {
     case NoForce:
     case SmallScreen:
         switchStack();
         break;
     case BigScreen:
         switchTop();
         break;
 
     }
 
     m_mode = mode;
 }
 
 /**
  * Adds a widget to the stack. The first widget added is considered
  * to be the mainwindow. This is important because if Opie is in
  * BigScreen mode the sizeHint of the MainWindow will be returned.
  * In Small Screen the sizeHint of the QWidgetStack is returned.
  * See QWidgetStack::sizeHint.
  * This widget takes ownership of the widget and may even reparent.
  * All windows will be hidden
  *
  * @param wid The QWidget to be added
  * @param id  An ID for the Widget. If the ID is duplicated the
               last set widget will be related to the id
  *
  */
 void OWidgetStack::addWidget( QWidget* wid, int id) {
     if (!wid)
         return;
 
     /* set our main widget */
     if (!m_mWidget)
         m_mWidget = wid;
 
     m_list.insert( id, wid );
 
     /**
      * adding does not raise any widget
      * But for our mainwidget we prepare
      * the right position with the right parent
      */
     if (m_mode == SmallScreen )
         m_stack->addWidget( wid,id );
     else if ( m_mWidget == wid ) {
         wid->reparent(this, 0, contentsRect().topLeft() );
         wid->hide();
     }else {
         wid->reparent(0, WType_TopLevel, QPoint(10, 10) );
         wid->hide();
     }
 }
 
 
 /**
  * Remove the widget from the stack it'll be reparented to 0
  * and ownership is dropped. You need to delete it.
  * If the removed widget was the mainwindow consider
  * to call setMainWindow.
  *
  * @param wid The QWidget to be removed
  */
 void OWidgetStack::removeWidget( QWidget* wid) {
     if (!wid)
         return;
 
     if (m_mode == SmallScreen )
         m_stack->removeWidget( wid );
 
 
     wid->reparent(0, 0, QPoint(0, 0) );
     m_list.remove( id(wid) );
 
     if ( wid == m_mWidget )
         m_mWidget = 0;
 }
 
 #if 0
 /**
  * @internal_resons
  */
 QSizeHint OWidgetStack::sizeHint()const {
 
 }
 
 /**
  * @internal_reasons
  */
 QSizeHint OWidgetStack::minimumSizeHint()const {
 
 }
 #endif
 
 /**
  * This function tries to find the widget with the id.
  * You supplied a possible id in addWIdget. Note that not
  * QWidget::winId() is used.
  *
  * @param id The id to search for
  *
  * @return The widget or null
  * @see addWidget
  */
 QWidget* OWidgetStack::widget( int id) const {
     return m_list[id];
 }
 
 /**
  * Tries to find the assigned id for the widget
  * or returns -1 if no widget could be found
  * @param wid The widget to look for
  */
 int OWidgetStack::id( QWidget* wid)const{
     if (m_list.isEmpty() )
         return -1;
 
     QMap<int, QWidget*>::ConstIterator it = m_list.begin();
     for ( ; it != m_list.end(); ++it )
         if ( it.data() == wid )
             break;
 
     /* if not at the end return the key */
     return it == m_list.end() ? -1 : it.key();
 }
 
 
 /**
  * This function returns the currently visible
  * widget. In BigScreen mode the mainwindow
  * is returned
  */
 QWidget* OWidgetStack::visibleWidget()const {
     if (m_mode == SmallScreen )
         return m_stack->visibleWidget();
     else
         return m_mWidget;
 
 }
 
 /**
  * This method raises the widget wit the specefic id.
  * Note that in BigScreen mode the widget is made visible
  * but the other ( previous) visible widget(s) will not
  * be made invisible. If you need this use hideWidget().
  *
  * @param id Raise the widget with id
  */
 void OWidgetStack::raiseWidget( int id) {
     return raiseWidget( widget( id ) );
 }
 
 /**
  * This is an overloaded function and only differs in its parameters.
  * @see raiseWidget( int )
  */
 void OWidgetStack::raiseWidget( QWidget* wid) {
     m_last = wid;
     if (m_mode == SmallScreen )
         m_stack->raiseWidget( wid );
     else {
         int ide;
         emit aboutToShow( wid );
         /* if someone is connected and the widget is actually available */
         if ( receivers( SIGNAL(aboutToShow(int) ) ) &&
              ( (ide = id( wid ) ) != -1 ) )
             emit aboutToShow( ide );
 
         /* ### FIXME PLACE THE WIDGET right */
         wid->show();
     }
 }
 
 /**
  * This will hide the currently visible widget
  * and raise the widget specified by the parameter.
  * Note that this method does not use visibleWIdget but remembers
  * the last raisedWidget
  */
 void OWidgetStack::hideWidget( int id) {
     /* hiding our main widget wouldn't be smart */
     if ( m_mode == BigScreen && m_last != m_mWidget )
         m_last->hide();
     raiseWidget( id );
 }
 
 /**
  * This is overloaded and only differs in the parameters
  * it takes.
  */
 void OWidgetStack::hideWidget( QWidget* wid) {
     /* still not smart */
     if ( m_mode == BigScreen && m_last != m_mWidget )
         m_last->hide();
 
     raiseWidget( wid );
 }
 
 
 bool OWidgetStack::eventFilter( QObject* obj, QEvent* e) {
     owarn << " " << obj->name() << " " << obj->className() << "" << oendl;
     if ( e->type() == QEvent::Resize ) {
         QResizeEvent *res = static_cast<QResizeEvent*>( e );
         QSize size = res->size();
         if ( size.width() >= mode_size )
             switchTop();
         else
             switchStack();
     }
     return false;
 }
 
 
 /**
  * @internal_resons
  */
 void OWidgetStack::resizeEvent( QResizeEvent* ev ) {
     QFrame::resizeEvent( ev );
     if (m_mode == SmallScreen )
         m_stack->setGeometry( frameRect() );
     else
         if (m_mWidget )
             m_mWidget->setGeometry( frameRect() );
 
 }
 
 /**
  * setMainWindow gives the OWidgetStack a hint which
  * window should always stay inside the stack.
  * Normally the first added widget is considered to be
  * the mainwindow but you can change this with this
  * function.
  * If in BigScreen mode the current mainwindow will be reparented
  * and hidden. The position will be taken by the new one.
  * If the old MainWindow was hidden the new window will
  * also be hidden. If the window was visible the new mainwindow
  * will be made visible too and the old one hidden. If there
  * was no mainwindow it will be hidden as well.
  *
  * @param wid The new mainwindow
  */
 void OWidgetStack::setMainWindow( QWidget* wid ) {
     if (m_mode == BigScreen ) {
         bool wasVisible = false;
         if (m_mWidget ) {
             wasVisible = !m_mWidget->isHidden();
             /* hidden by default */
             m_mWidget->reparent(0, WType_TopLevel, QPoint(10, 10) );
         }
         wid->reparent(this, 0, frameRect().topLeft() );
 
         if (wasVisible)
             wid->show();
     }
 
     m_mWidget = wid;
 }
 
 /**
  * this is an overloaded member and only differs
  * in the type of arguments.
  * @see setMainWindow(QWidget*)
  */
 void OWidgetStack::setMainWindow( int id) {
     setMainWindow( widget( id ) );
 }
 
 
 /*
  * this function switches to a stack ;)
  */
 void OWidgetStack::switchStack() {
     if (m_stack ) {
         m_stack->setGeometry( frameRect() );
         return;
     }
 
     m_mode = SmallScreen;
     m_stack = new QWidgetStack(this);
 
     connect(m_stack, SIGNAL(aboutToShow(QWidget*) ),
             this, SIGNAL(aboutToShow(QWidget*) ) );
     connect(m_stack, SIGNAL(aboutToShow(int) ),
             this, SIGNAL(aboutToShow(int) ) );
 
     /* now reparent the widgets... luckily QWidgetSatck does most of the work */
     if (m_list.isEmpty() )
         return;
 
     QMap<int, QWidget*>::Iterator it = m_list.begin();
     for ( ; it != m_list.end(); ++it )
         m_stack->addWidget( it.data(), it.key() );
 
 
 }
 
 /*
  * we will switch to top level mode
  * reparent the list of widgets and then delete the stack
  */
 void OWidgetStack::switchTop() {
     m_mode = BigScreen;
     /* this works because it is guaranteed that switchStack was called at least once*/
     if (!m_stack && m_mWidget) {
         m_mWidget->setGeometry( frameRect() );
         return;
     }else if (!m_stack)
         return;
 
     if (!m_list.isEmpty() ) {
         QMap<int, QWidget*>::Iterator it = m_list.begin();
         for ( ; it != m_list.end(); ++it ) {
             /* better than reparenting twice */
             if ( it.data() == m_mWidget ) {
                 m_mWidget->reparent(this, 0, frameRect().topLeft() );
                 m_mWidget->setGeometry( frameRect() );
                 m_mWidget->show();
             }else
                 /* ### FIXME we need to place the widget better */
                 it.data()->reparent(0, WType_TopLevel, QPoint(10, 10) );
         }
     }
 
     delete m_stack;
     m_stack = 0;
 }
 
 }
-}
\ No newline at end of file
+}
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index 6763ee6..4870cd9 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -1,429 +1,430 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Robert Griebl <sandman@handhelds.org>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 /* OPIE */
 #include <opie2/ofontselector.h>
 #include <qpe/fontdatabase.h>
 
 /* QT */
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qmultilineedit.h>
 
 
 namespace Opie {
 namespace Ui   {
 namespace Internal {
 
 class OFontSelectorPrivate
 {
 public:
     QListBox *      m_font_family_list;
     QComboBox *     m_font_style_list;
     QComboBox *     m_font_size_list;
     QMultiLineEdit *m_preview;
 
     bool            m_pointbug : 1;
 
     FontDatabase    m_fdb;
 };
 
 class FontListItem : public QListBoxText
 {
 public:
     FontListItem ( const QString &t, const QStringList &styles, const QValueList<int> &sizes ) : QListBoxText()
     {
         m_name = t;
         m_styles = styles;
         m_sizes = sizes;
 
         QString str = t;
         str [0] = str [0]. upper();
         setText ( str );
     }
 
     QString family() const
     {
         return m_name;
     }
 
     const QStringList &styles() const
     {
         return m_styles;
     }
 
     const QValueList<int> &sizes() const
     {
         return m_sizes;
     }
 
 private:
     QStringList m_styles;
     QValueList<int> m_sizes;
     QString m_name;
 };
 }
 }
 }
 
 
 using namespace Opie::Ui;
 using namespace Opie::Ui::Internal;
 
 static int findItemCB( QComboBox *box, const QString &str )
 {
     for ( int i = 0; i < box->count(); i++ )
     {
         if ( box->text ( i ) == str )
             return i;
     }
     return -1;
 }
 
 /* static same as anon. namespace */
 static int qt_version()
 {
     const char *qver = qVersion();
 
     return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' );
 }
 
 /**
  * Constructs the Selector object
  * @param withpreview If a font preview should be given
  * @param parent The parent of the Font Selector
  * @param name The name of the object
  * @param fl WidgetFlags
  */
 OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *name, WFlags fl ) : QWidget ( parent, name, fl )
 {
     d = new OFontSelectorPrivate();
 
     QGridLayout *gridLayout = new QGridLayout( this, 0, 0, 4, 4 );
     gridLayout->setRowStretch( 4, 10 );
 
     d->m_font_family_list = new QListBox( this, "FontListBox" );
     gridLayout->addMultiCellWidget( d->m_font_family_list, 0, 4, 0, 0 );
     connect( d->m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) );
 
     QLabel *label = new QLabel( tr( "Style" ), this );
     gridLayout->addWidget( label, 0, 1 );
 
     d->m_font_style_list = new QComboBox( this, "StyleListBox" );
     connect( d->m_font_style_list, SIGNAL(  activated(int) ), this, SLOT( fontStyleClicked(int) ) );
     gridLayout->addWidget( d->m_font_style_list, 1, 1 );
 
     label = new QLabel( tr( "Size" ), this );
     gridLayout->addWidget( label, 2, 1 );
 
     d->m_font_size_list = new QComboBox( this, "SizeListBox" );
     connect( d->m_font_size_list, SIGNAL(  activated(int) ),
              this, SLOT( fontSizeClicked(int) ) );
     gridLayout->addWidget( d->m_font_size_list, 3, 1 );
 
     d->m_pointbug = ( qt_version() <= 233 );
 
     if ( withpreview )
     {
         d->m_preview = new QMultiLineEdit ( this, "Preview" );
         d->m_preview->setAlignment ( AlignCenter );
         d->m_preview->setWordWrap ( QMultiLineEdit::WidgetWidth );
         d->m_preview->setMargin ( 3 );
         d->m_preview->setText ( tr( "The Quick Brown Fox Jumps Over The Lazy Dog" ));
         gridLayout->addRowSpacing ( 5, 4 );
         gridLayout->addMultiCellWidget ( d->m_preview, 6, 6, 0, 1 );
         gridLayout->setRowStretch ( 6, 5 );
     }
     else
         d->m_preview = 0;
 
     loadFonts ( d->m_font_family_list );
 }
 
 OFontSelector::~OFontSelector()
 {
     delete d;
 }
 
 /**
  * This methods tries to set the font
  * @param f The wishes font
  * @return success or failure
  */
 bool OFontSelector::setSelectedFont ( const QFont &f )
 {
     return setSelectedFont ( f. family(), d->m_fdb. styleString ( f ), f. pointSize(), QFont::encodingName ( f. charSet()));
 }
 
 
 /**
  * This is an overloaded method @see setSelectedFont
  * @param familyStr The family of the font
  * @param styleStr The style of the font
  * @param sizeVal The size of font
  * @param charset The charset to be used. Will be deprecated by QT3
  */
 bool OFontSelector::setSelectedFont( const QString &familyStr, const QString &styleStr, int sizeVal, const QString & charset )
 {
+    Q_CONST_UNUSED( charset )
     QString sizeStr = QString::number ( sizeVal );
 
     QListBoxItem *family = d->m_font_family_list->findItem ( familyStr );
     if ( !family )
         family = d->m_font_family_list->findItem ( "Helvetica" );
     if ( !family )
         family = d->m_font_family_list->firstItem();
     d->m_font_family_list->setCurrentItem ( family );
     fontFamilyClicked ( d->m_font_family_list->index ( family ));
 
     int style = findItemCB ( d->m_font_style_list, styleStr );
     if ( style < 0 )
         style = findItemCB ( d->m_font_style_list, "Regular" );
     if ( style < 0 && d->m_font_style_list->count() > 0 )
         style = 0;
     d->m_font_style_list->setCurrentItem ( style );
     fontStyleClicked ( style );
 
     int size = findItemCB ( d->m_font_size_list, sizeStr );
     if ( size < 0 )
         size = findItemCB ( d->m_font_size_list, "10" );
     if ( size < 0 && d->m_font_size_list->count() > 0 )
         size = 0;
     d->m_font_size_list->setCurrentItem ( size );
     fontSizeClicked ( size );
 
     return (( family ) && ( style >= 0 ) && ( size >= 0 ));
 }
 
 /**
  * This method returns the name, style and size of the currently selected
  * font or false if no font is selected
  * @param family The font family will be written there
  * @param style The style will be written there
  * @param size The size will be written there
  * @return success or failure
  */
 bool OFontSelector::selectedFont ( QString &family, QString &style, int &size )
 {
     QString dummy;
     return selectedFont ( family, style, size, dummy );
 }
 
 
 /**
  * This method does return the font family or QString::null if there is
  * no font item selected
  * @return the font family
  */
 QString OFontSelector::fontFamily() const
 {
     FontListItem *fli = (FontListItem *) d->m_font_family_list->item ( d->m_font_family_list->currentItem());
 
     return fli ? fli->family() : QString::null;
 }
 
 /**
  * This method will return the style of the font or QString::null
  * @return the style of the font
  */
 QString OFontSelector::fontStyle() const
 {
     FontListItem *fli = (FontListItem *) d->m_font_family_list->item ( d->m_font_family_list->currentItem());
     int fst = d->m_font_style_list->currentItem();
 
     return ( fli && fst >= 0 ) ? fli->styles() [fst] : QString::null;
 }
 
 /**
  * This method will return the font size or 10 if no font size is available
  */
 int OFontSelector::fontSize() const
 {
     FontListItem *fli = (FontListItem *) d->m_font_family_list->item ( d->m_font_family_list->currentItem());
     int fsi = d->m_font_size_list->currentItem();
 
     return ( fli && fsi >= 0 ) ? fli->sizes() [fsi] : 10;
 }
 
 /**
  * returns the charset of the font or QString::null
  */
 QString OFontSelector::fontCharSet() const
 {
     FontListItem *fli = (FontListItem *) d->m_font_family_list->item ( d->m_font_family_list->currentItem());
 
     return fli ? d->m_fdb. charSets ( fli->family()) [0] : QString::null;
 }
 
 /**
  * Overloaded member function see above
  * @see selectedFont
  */
 bool OFontSelector::selectedFont ( QString &family, QString &style, int &size, QString &charset )
 {
     int ffa = d->m_font_family_list->currentItem();
     int fst = d->m_font_style_list->currentItem();
     int fsi = d->m_font_size_list->currentItem();
 
     FontListItem *fli = (FontListItem *) d->m_font_family_list->item ( ffa );
 
     if ( fli )
     {
         family = fli->family();
         style = fst >= 0 ? fli->styles() [fst] : QString::null;
         size = fsi >= 0 ? fli->sizes() [fsi] : 10;
         charset = d->m_fdb. charSets ( fli->family()) [0];
 
         return true;
     }
     else
         return false;
 }
 
 void OFontSelector::loadFonts ( QListBox *list )
 {
     QStringList f = d->m_fdb. families();
 
     for ( QStringList::ConstIterator it = f. begin(); it != f. end(); ++it )
     {
         QValueList <int> ps = d->m_fdb. pointSizes ( *it );
 
         if ( d->m_pointbug )
         {
             for ( QValueList <int>::Iterator it = ps. begin(); it != ps. end(); it++ )
                 *it /= 10;
         }
 
         list->insertItem ( new FontListItem ( *it, d->m_fdb. styles ( *it ), ps ));
     }
 }
 
 void OFontSelector::fontFamilyClicked ( int index )
 {
     QString oldstyle = d->m_font_style_list->currentText();
     QString oldsize  = d->m_font_size_list->currentText();
 
     FontListItem *fli = (FontListItem *) d->m_font_family_list->item ( index );
 
     d->m_font_style_list->clear();
     d->m_font_style_list->insertStringList ( fli->styles());
     d->m_font_style_list->setEnabled ( !fli->styles(). isEmpty());
 
     int i;
 
     i = findItemCB ( d->m_font_style_list, oldstyle );
     if ( i < 0 )
         i = findItemCB ( d->m_font_style_list, "Regular" );
     if (( i < 0 ) && ( d->m_font_style_list->count() > 0 ))
         i = 0;
 
     if ( i >= 0 )
     {
         d->m_font_style_list->setCurrentItem ( i );
         fontStyleClicked ( i );
     }
 
     d->m_font_size_list->clear();
     QValueList<int> sl = fli->sizes();
 
     for ( QValueList<int>::Iterator it = sl. begin(); it != sl. end(); ++it )
         d->m_font_size_list->insertItem ( QString::number ( *it ));
 
     i = findItemCB ( d->m_font_size_list, oldsize );
     if ( i < 0 )
         i = findItemCB ( d->m_font_size_list, "10" );
     if (( i < 0 ) && ( d->m_font_size_list->count() > 0 ))
         i = 0;
 
     if ( i >= 0 )
     {
         d->m_font_size_list->setCurrentItem ( i );
         fontSizeClicked ( i );
     }
     changeFont();
 }
 
 void OFontSelector::fontStyleClicked ( int /*index*/ )
 {
     changeFont();
 }
 
 void OFontSelector::fontSizeClicked ( int /*index*/ )
 {
     changeFont();
 }
 
 void OFontSelector::changeFont()
 {
     QFont f = selectedFont();
 
     if ( d->m_preview )
         d->m_preview->setFont ( f );
 
     emit fontSelected ( f );
 }
 
 /**
  * Return the selected font
  */
 QFont OFontSelector::selectedFont()
 {
     int ffa = d->m_font_family_list->currentItem();
     int fst = d->m_font_style_list->currentItem();
     int fsi = d->m_font_size_list->currentItem();
 
     FontListItem *fli = (FontListItem *) d->m_font_family_list->item ( ffa );
 
     if ( fli )
     {
         return d->m_fdb. font ( fli->family(), \
                                  fst >= 0 ? fli->styles() [fst] : QString::null, \
                                  fsi >= 0 ? fli->sizes() [fsi] : 10, \
                                  d->m_fdb. charSets ( fli->family()) [0] );
     }
     else
         return QFont();
 }
 
 void OFontSelector::resizeEvent ( QResizeEvent *re )
 {
     if ( d->m_preview )
     {
         d->m_preview->setMinimumHeight ( 1 );
         d->m_preview->setMaximumHeight ( 32767 );
     }
 
     QWidget::resizeEvent ( re );
 
     if ( d->m_preview )
         d->m_preview->setFixedHeight ( d->m_preview->height());
 
 }
 
diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index b90c786..67b4b83 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -1,764 +1,768 @@
 /*
                              This file is part of the Opie Project
               =.             (C) 2003-2004 Michael 'Mickey' Lauer <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 /* QT */
 
 #include <qpixmap.h>
 
 /* OPIE */
 
 #include <opie2/odebug.h>
 #include <opie2/olistview.h>
 
 using namespace Opie::Core;
 
 
 namespace Opie {
 namespace Ui   {
 /*======================================================================================
  * OListView
  *======================================================================================*/
 
 OListView::OListView( QWidget *parent, const char *name, WFlags fl )
           :QListView( parent, name, fl )
 {
     //FIXME: get from global settings and calculate ==> see oglobalsettings.*
 
     m_alternateBackground = QColor( 238, 246, 255 );
     m_columnSeparator = QPen( QColor( 150, 160, 170 ), 0, DotLine );
     m_fullWidth = true;
     connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
 }
 
 OListView::~OListView()
 {
 }
 
 void OListView::setFullWidth( bool fullWidth )
 {
     m_fullWidth = fullWidth;
     #if QT_VERSION > 290
     header()->setStretchEnabled( fullWidth, columns()-1 );
     #endif
 }
 
 bool OListView::fullWidth() const
 {
     return m_fullWidth;
 }
 
 int OListView::addColumn( const QString& label, int width )
 {
     int result = QListView::addColumn( label, width );
     #if QT_VERSION > 290
     if (m_fullWidth) {
         header()->setStretchEnabled( false, columns()-2 );
         header()->setStretchEnabled( true, columns()-1  );
     }
     #endif
     return result;
 }
 
 int OListView::addColumn( const QIconSet& iconset, const QString& label, int width )
 {
     int result = QListView::addColumn( iconset, label, width );
     #if QT_VERSION > 290
     if (m_fullWidth) {
         header()->setStretchEnabled( false, columns()-2 );
         header()->setStretchEnabled( true, columns()-1 );
     }
     #endif
     return result;
 }
 
 void OListView::removeColumn( int index )
 {
     QListView::removeColumn(index);
     #if QT_VERSION > 290
     if ( m_fullWidth && index == columns() )
     {
         header()->setStretchEnabled( true, columns()-1 );
     }
     #endif
 }
 
 const QColor& OListView::alternateBackground() const
 {
     return m_alternateBackground;
 }
 
 void OListView::setAlternateBackground( const QColor &c )
 {
     m_alternateBackground = c;
     repaint();
 }
 
 const QPen& OListView::columnSeparator() const
 {
     return m_columnSeparator;
 }
 
 void OListView::setColumnSeparator( const QPen& p )
 {
     m_columnSeparator = p;
     repaint();
 }
 
 void OListView::expand(QListViewItem *item)
 {
          ((OListViewItem*)item)->expand();
 }
 
 OListViewItem* OListView::childFactory()
 {
     return new OListViewItem( this );
 }
 
 #ifndef QT_NO_DATASTREAM
 void OListView::serializeTo( QDataStream& s ) const
 {
     #warning Caution... the binary format is still under construction...
     odebug << "storing OListView..." << oendl;
 
     // store number of columns and the labels
     s << columns();
     for ( int i = 0; i < columns(); ++i )
         s << columnText( i );
 
     // calculate the number of top-level items to serialize
     int items = 0;
     QListViewItem* item = firstChild();
     while ( item )
     {
         item = item->nextSibling();
         items++;
     }
 
     // store number of items and the items itself
     s << items;
     item = firstChild();
     for ( int i = 0; i < items; ++i )
     {
         s << *static_cast<OListViewItem*>( item );
         item = item->nextSibling();
     }
 
     odebug << "OListview stored." << oendl;
 }
 
 void OListView::serializeFrom( QDataStream& s )
 {
     #warning Caution... the binary format is still under construction...
     odebug << "loading OListView..." << oendl;
 
     int cols;
     s >> cols;
     odebug << "read number of columns = " << cols << oendl;
 
     while ( columns() < cols ) addColumn( QString::null );
 
     for ( int i = 0; i < cols; ++i )
     {
         QString coltext;
         s >> coltext;
-        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl; 
+        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl;
         setColumnText( i, coltext );
     }
 
     int items;
     s >> items;
     odebug << "read number of items = " << items << oendl;
 
     for ( int i = 0; i < items; ++i )
     {
         OListViewItem* item = childFactory();
         s >> *item;
     }
 
     odebug << "OListView loaded." << oendl;
 
 }
 
 
 void OListView::expand()
 {
     odebug << "OListView::expand" << oendl;
 
     QListViewItemIterator it( this );
     while ( it.current() ) {
         it.current()->setOpen( true );
         ++it;
     }
 }
 
 
 void OListView::collapse()
 {
     odebug << "OListView::collapse" << oendl;
     QListViewItemIterator it( this );
     while ( it.current() ) {
         it.current()->setOpen( false );
         ++it;
     }
 }
 
 
 QDataStream& operator<<( QDataStream& s, const OListView& lv )
 {
     lv.serializeTo( s );
+    return s;
 }
 
 QDataStream& operator>>( QDataStream& s, OListView& lv )
 {
     lv.serializeFrom( s );
+    return s;
 }
 #endif // QT_NO_DATASTREAM
 
 /*======================================================================================
  * OListViewItem
  *======================================================================================*/
 
 OListViewItem::OListViewItem(QListView *parent)
   : QListViewItem(parent)
 {
     init();
 }
 
 
 OListViewItem::OListViewItem(QListViewItem *parent)
   : QListViewItem(parent)
 {
     init();
 }
 
 
 OListViewItem::OListViewItem(QListView *parent, QListViewItem *after)
   : QListViewItem(parent, after)
 {
     init();
 }
 
 
 OListViewItem::OListViewItem(QListViewItem *parent, QListViewItem *after)
   : QListViewItem(parent, after)
 {
     init();
 }
 
 
 OListViewItem::OListViewItem(QListView *parent,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 
 OListViewItem::OListViewItem(QListViewItem *parent,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 
 OListViewItem::OListViewItem(QListView *parent, QListViewItem *after,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 
 OListViewItem::OListViewItem(QListViewItem *parent, QListViewItem *after,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 
 OListViewItem::~OListViewItem()
 {
 }
 
 
 void OListViewItem::init()
 {
     m_known = false;
 }
 
 
 const QColor &OListViewItem::backgroundColor()
 {
     return isAlternate() ? static_cast<OListView*>(listView())->alternateBackground() :
                            listView()->viewport()->colorGroup().base();
 }
 
 
 bool OListViewItem::isAlternate()
 {
     OListView *lv = static_cast<OListView*>( listView() );
 
     // check if the item above is an OListViewItem
     OListViewItem *above = static_cast<OListViewItem*>( itemAbove() );
     /*if (! itemAbove()->inherits( "OListViewItem" )) return false;*/
 
     // check if we have a valid alternate background color
     if (!(lv && lv->alternateBackground().isValid())) return false;
 
     m_known = above ? above->m_known : true;
     if (m_known)
     {
        m_odd = above ? !above->m_odd : false;
     }
     else
     {
         OListViewItem *item;
         bool previous = true;
         if (parent())
         {
             item = static_cast<OListViewItem *>(parent());
             if ( item /*&& item->inherits( "OListViewItem" )*/ ) previous = item->m_odd;
             item = static_cast<OListViewItem *>(parent()->firstChild());
             /* if ( !item.inherits( "OListViewItem" ) item = 0; */
         }
         else
         {
             item = static_cast<OListViewItem *>(lv->firstChild());
         }
 
         while(item)
         {
             item->m_odd = previous = !previous;
             item->m_known = true;
             item = static_cast<OListViewItem *>(item->nextSibling());
             /* if (!item.inherits( "OListViewItem" ) ) break; */
         }
     }
     return m_odd;
 }
 
 
 void OListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
     QColorGroup _cg = cg;
     const QPixmap *pm = listView()->viewport()->backgroundPixmap();
     if (pm && !pm->isNull())
     {
         _cg.setBrush( QColorGroup::Base, QBrush(backgroundColor(), *pm) );
         p->setBrushOrigin( -listView()->contentsX(), -listView()->contentsY() );
     }
     else if ( isAlternate() )
     {
         _cg.setColor( QColorGroup::Base, static_cast<OListView*>( listView() )->alternateBackground() );
     }
     QListViewItem::paintCell( p, _cg, column, width, alignment );
 
     //FIXME: Use styling here!
 
     const QPen& pen = static_cast<OListView*>( listView() )->columnSeparator();
     p->setPen( pen );
     p->drawLine( width-1, 0, width-1, height() );
 }
 
 
 OListViewItem* OListViewItem::childFactory()
 {
     return new OListViewItem( this );
 }
 
 
 #ifndef QT_NO_DATASTREAM
 void OListViewItem::serializeTo( QDataStream& s ) const
 {
     #warning Caution... the binary format is still under construction...
     odebug << "storing OListViewItem..." << oendl;
 
     // store item text
     for ( int i = 0; i < listView()->columns(); ++i )
     {
         s << text( i );
     }
 
     // calculate the number of children to serialize
     int items = 0;
     QListViewItem* item = firstChild();
     while ( item )
     {
         item = item->nextSibling();
         items++;
     }
 
     // store number of items and the items itself
     s << items;
     item = firstChild();
     for ( int i = 0; i < items; ++i )
     {
         s << *static_cast<OListViewItem*>( item );
         item = item->nextSibling();
     }
 
     odebug << "OListviewItem stored." << oendl;
 }
 
 
 void OListViewItem::serializeFrom( QDataStream& s )
 {
     #warning Caution... the binary format is still under construction...
     odebug << "loading OListViewItem..." << oendl;
 
     for ( int i = 0; i < listView()->columns(); ++i )
     {
         QString coltext;
         s >> coltext;
-        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl; 
+        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl;
         setText( i, coltext );
     }
 
     int items;
     s >> items;
-    odebug << "read number of items = " << items << "" << oendl; 
+    odebug << "read number of items = " << items << "" << oendl;
 
     for ( int i = 0; i < items; ++i )
     {
         OListViewItem* item = childFactory();
         s >> (*item);
     }
 
     odebug << "OListViewItem loaded." << oendl;
 }
 
 
 QDataStream& operator<<( QDataStream& s, const OListViewItem& lvi )
 {
     lvi.serializeTo( s );
+    return s;
 }
 
 
 QDataStream& operator>>( QDataStream& s, OListViewItem& lvi )
 {
     lvi.serializeFrom( s );
+    return s;
 }
 #endif // QT_NO_DATASTREAM
 
 
 /*======================================================================================
  * OCheckListItem
  *======================================================================================*/
 
 OCheckListItem::OCheckListItem( QCheckListItem* parent, const QString& text, Type t )
                :QCheckListItem( parent, text, t )
 {
     init();
 }
 
 
 OCheckListItem::OCheckListItem( QListViewItem* parent, const QString& text, Type t)
                :QCheckListItem( parent, text, t )
 {
     init();
 }
 
 
 OCheckListItem::OCheckListItem( QListView* parent, const QString& text, Type t )
                :QCheckListItem( parent, text, t )
 {
     init();
 }
 
 
 OCheckListItem::OCheckListItem( QListViewItem* parent, const QString& text, const QPixmap& p )
                :QCheckListItem( parent, text, p )
 {
     init();
 }
 
 
 OCheckListItem::OCheckListItem( QListView* parent, const QString& text, const QPixmap& p )
                :QCheckListItem( parent, text, p )
 {
     init();
 }
 
 
 OCheckListItem::~OCheckListItem()
 {
 }
 
 void OCheckListItem::init()
 {
     m_known = false;
 }
 
 
 const QColor &OCheckListItem::backgroundColor()
 {
     return isAlternate() ? static_cast<OListView*>(listView())->alternateBackground() :
                            listView()->viewport()->colorGroup().base();
 }
 
 
 bool OCheckListItem::isAlternate()
 {
     OListView *lv = static_cast<OListView*>( listView() );
 
     // check if the item above is an OCheckListItem
     OCheckListItem *above = static_cast<OCheckListItem*>( itemAbove() );
     /*if (! itemAbove()->inherits( "OCheckListItem" )) return false;*/
 
     // check if we have a valid alternate background color
     if (!(lv && lv->alternateBackground().isValid())) return false;
 
     m_known = above ? above->m_known : true;
     if (m_known)
     {
        m_odd = above ? !above->m_odd : false;
     }
     else
     {
         OCheckListItem *item;
         bool previous = true;
         if (parent())
         {
             item = static_cast<OCheckListItem *>(parent());
             if ( item /*&& item->inherits( "OCheckListItem" )*/ ) previous = item->m_odd;
             item = static_cast<OCheckListItem *>(parent()->firstChild());
             /* if ( !item.inherits( "OCheckListItem" ) item = 0; */
         }
         else
         {
             item = static_cast<OCheckListItem *>(lv->firstChild());
         }
 
         while(item)
         {
             item->m_odd = previous = !previous;
             item->m_known = true;
             item = static_cast<OCheckListItem *>(item->nextSibling());
             /* if (!item.inherits( "OCheckListItem" ) ) break; */
         }
     }
     return m_odd;
 }
 
 
 void OCheckListItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
     QColorGroup _cg = cg;
     const QPixmap *pm = listView()->viewport()->backgroundPixmap();
     if (pm && !pm->isNull())
     {
         _cg.setBrush( QColorGroup::Base, QBrush(backgroundColor(), *pm) );
         p->setBrushOrigin( -listView()->contentsX(), -listView()->contentsY() );
     }
     else if ( isAlternate() )
     {
         _cg.setColor( QColorGroup::Base, static_cast<OListView*>( listView() )->alternateBackground() );
     }
     QCheckListItem::paintCell( p, _cg, column, width, alignment );
 
     //FIXME: Use styling here!
 
     const QPen& pen = static_cast<OListView*>( listView() )->columnSeparator();
     p->setPen( pen );
     p->drawLine( width-1, 0, width-1, height() );
 }
 
 
 /*======================================================================================
  * ONamedListView
  *======================================================================================*/
 
 ONamedListView::ONamedListView( QWidget *parent, const char *name )
                :OListView( parent, name )
 {
 }
 
 
 ONamedListView::~ONamedListView()
 {
 }
 
 
 void ONamedListView::addColumns( const QStringList& columns )
 {
     for ( QStringList::ConstIterator it = columns.begin(); it != columns.end(); ++it )
     {
-        odebug << "adding column " <<  *it << "" << oendl; 
+        odebug << "adding column " <<  *it << "" << oendl;
         addColumn( *it );
     }
 }
 
 
 int ONamedListView::findColumn( const QString& text ) const
 {
     //FIXME: If used excessively, this will slow down performance of updates
     //FIXME: because of the linear search over all column texts.
     //FIXME: I will optimize later by using a hash map.
     for ( int i = 0; i < columns(); ++i )
         if ( columnText( i ) == text )
             return i;
     return -1;
 }
 
 
 ONamedListViewItem* ONamedListView::find( int column, const QString& text, int recurse ) const
 {
     return find( (ONamedListViewItem*) firstChild(), column, text, recurse );
 }
 
 
 ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column, const QString& text, int recurse ) const
 {
     ONamedListViewItem* result;
     while ( item && item->text( column ) != text )
     {
-        odebug << "checked " <<  item->text( column ) << "" << oendl; 
+        odebug << "checked " <<  item->text( column ) << "" << oendl;
 
         if ( recurse < 0 || recurse > 0 )
         {
-            odebug << "recursion is " << recurse << " - recursing into..." << oendl; 
+            odebug << "recursion is " << recurse << " - recursing into..." << oendl;
             result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 );
             if ( result ) return result;
         }
 
 
         item = (ONamedListViewItem*) item->itemBelow();
     }
     if ( item && item->text( column ) == text )
         return item;
     else
         return 0;
 }
 
 
 ONamedListViewItem* ONamedListView::find( const QString& column, const QString& text, int recurse ) const
 {
     int col = findColumn( column );
     if ( col != -1 )
         return find( (ONamedListViewItem*) firstChild(), col, text, recurse );
     else
         return 0;
 }
 
 
 ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, const QString& column, const QString& text, int recurse ) const
 {
     int col = findColumn( column );
     if ( col != -1 )
         return find( item, col, text, recurse );
     else
         return 0;
 }
 
 
 /*======================================================================================
  * ONamedListViewItem
  *======================================================================================*/
 
 ONamedListViewItem::ONamedListViewItem( QListView* parent, const QStringList& texts )
                    :OListViewItem( parent )
 {
     setText( texts );
 }
 
 
 ONamedListViewItem::ONamedListViewItem( QListViewItem* parent, const QStringList& texts )
                    :OListViewItem( parent )
 {
     setText( texts );
 }
 
 
 ONamedListViewItem::ONamedListViewItem( QListView* parent, QListViewItem* after, const QStringList& texts )
                    :OListViewItem( parent, after )
 {
     setText( texts );
 }
 
 
 ONamedListViewItem::ONamedListViewItem( QListViewItem* parent, QListViewItem* after, const QStringList& texts )
                    :OListViewItem( parent, after )
 {
     setText( texts );
 }
 
 
 ONamedListViewItem::~ONamedListViewItem()
 {
 }
 
 
 void ONamedListViewItem::setText( const QStringList& texts )
 {
     int col = 0;
     for ( QStringList::ConstIterator it = texts.begin(); it != texts.end(); ++it )
     {
-        odebug << "setting column " << col << " = text " <<  *it << "" << oendl; 
+        odebug << "setting column " << col << " = text " <<  *it << "" << oendl;
         OListViewItem::setText( col++, *it );
     }
 
 }
 
 
 void ONamedListViewItem::setText( const QString& column, const QString& text )
 {
     //FIXME: If used excessively, this will slow down performance of updates
     //FIXME: because of the linear search over all column texts.
     //FIXME: I will optimize later by using a hash map.
     int col = ( (ONamedListView*) listView() )->findColumn( column );
     if ( col != -1 )
         OListViewItem::setText( col, text );
     else
-        owarn << "ONamedListViewItem::setText(): Warning! Columntext '" <<  column << "' not found." << oendl; 
+        owarn << "ONamedListViewItem::setText(): Warning! Columntext '" <<  column << "' not found." << oendl;
 }
 
 
 ONamedListViewItem* ONamedListViewItem::find( int column, const QString& text, int recurse ) const
 {
     return ( (ONamedListView*) listView() )->find( (ONamedListViewItem*) firstChild(), column, text, recurse );
 }
 
 
 ONamedListViewItem* ONamedListViewItem::find( const QString& column, const QString& text, int recurse ) const
 {
     int col = ( (ONamedListView*) listView() )->findColumn( column );
     if ( col != -1 )
         return ( (ONamedListView*) listView() )->find( (ONamedListViewItem*) firstChild(), col, text, recurse );
     else
         return 0;
 }
 
 }
 }
diff --git a/libopie2/opieui/oselector.cpp b/libopie2/opieui/oselector.cpp
index 5f6f10f..05543c5 100644
--- a/libopie2/opieui/oselector.cpp
+++ b/libopie2/opieui/oselector.cpp
@@ -1,532 +1,534 @@
 /* This file is part of the KDE libraries
     Copyright (C) 1997 Martin Jones (mjones@kde.org)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /* QT */
 
 #include <qimage.h>
 #include <qdrawutil.h>
 
 /* OPIE */
 
 #include <opie2/oimageeffect.h>
 #include <opie2/oselector.h>
 
 #define STORE_W 8
 #define STORE_W2 STORE_W * 2
 
 //-----------------------------------------------------------------------------
 /*
  * 2D value selector.
  * The contents of the selector are drawn by derived class.
  */
 
 using namespace Opie::Ui;
 
 OXYSelector::OXYSelector( QWidget *parent, const char *name )
         : QWidget( parent, name )
 {
         xPos = 0;
         yPos = 0;
         minX = 0;
         minY = 0;
         maxX = 100;
         maxY = 100;
         store.setOptimization( QPixmap::BestOptim );
         store.resize( STORE_W2, STORE_W2 );
 }
 
 
 OXYSelector::~OXYSelector()
 {}
 
 
 void OXYSelector::setRange( int _minX, int _minY, int _maxX, int _maxY )
 {
         px = 2;
         py = 2;
         minX = _minX;
         minY = _minY;
         maxX = _maxX;
         maxY = _maxY;
 }
 
 void OXYSelector::setValues( int _xPos, int _yPos )
 {
         xPos = _xPos;
         yPos = _yPos;
 
         if ( xPos > maxX )
                 xPos = maxX;
         else if ( xPos < minX )
                 xPos = minX;
 
         if ( yPos > maxY )
                 yPos = maxY;
         else if ( yPos < minY )
                 yPos = minY;
 
         int xp = 2 + (width() - 4) * xPos / (maxX - minX);
         int yp = height() - 2 - (height() - 4) * yPos / (maxY - minY);
 
         setPosition( xp, yp );
 }
 
 QRect OXYSelector::contentsRect() const
 {
         return QRect( 2, 2, width()-4, height()-4 );
 }
 
 void OXYSelector::paintEvent( QPaintEvent *ev )
 {
         QRect cursorRect( px - STORE_W, py - STORE_W, STORE_W2, STORE_W2);
         QRect paintRect = ev->rect();
 
         QPainter painter;
         painter.begin( this );
 
         QBrush brush;
         qDrawShadePanel( &painter, 0, 0, width(), height(), colorGroup(),
                         TRUE, 2, &brush );
 
         drawContents( &painter );
         if (paintRect.contains(cursorRect))
         {
            bitBlt( &store, 0, 0, this, px - STORE_W, py - STORE_W,
                 STORE_W2, STORE_W2, CopyROP );
            drawCursor( &painter, px, py );
         }
         else if (paintRect.intersects(cursorRect))
         {
            repaint( cursorRect, false);
         }
 
         painter.end();
 }
 
 void OXYSelector::mousePressEvent( QMouseEvent *e )
 {
     int xVal, yVal;
     valuesFromPosition( e->pos().x() - 2, e->pos().y() - 2, xVal, yVal );
     setValues( xVal, yVal );
 
     emit valueChanged( xPos, yPos );
 }
 
 void OXYSelector::mouseMoveEvent( QMouseEvent *e )
 {
     int xVal, yVal;
     valuesFromPosition( e->pos().x() - 2, e->pos().y() - 2, xVal, yVal );
     setValues( xVal, yVal );
 
     emit valueChanged( xPos, yPos );
 }
 
 void OXYSelector::wheelEvent( QWheelEvent *e )
 {
     #if QT_VERSION > 290
     if ( e->orientation() == Qt::Horizontal )
         setValues( xValue() + e->delta()/120, yValue() );
     else
         setValues( xValue(), yValue() + e->delta()/120 );
 
     emit valueChanged( xPos, yPos );
+    #else
+    Q_UNUSED( e )
     #endif
 }
 
 void OXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
 {
     xVal = ( (maxX-minX) * (x-2) ) / ( width()-4 );
     yVal = maxY - ( ( (maxY-minY) * (y-2) ) / ( height()-4 ) );
 
     if ( xVal > maxX )
         xVal = maxX;
     else if ( xVal < minX )
         xVal = minX;
 
     if ( yVal > maxY )
         yVal = maxY;
     else if ( yVal < minY )
         yVal = minY;
 }
 
 void OXYSelector::setPosition( int xp, int yp )
 {
     if ( xp < 2 )
         xp = 2;
     else if ( xp > width() - 2 )
         xp = width() - 2;
 
     if ( yp < 2 )
         yp = 2;
     else if ( yp > height() - 2 )
         yp = height() - 2;
 
     QPainter painter;
     painter.begin( this );
 
     bitBlt( this, px - STORE_W, py - STORE_W, &store, 0, 0,
             STORE_W2, STORE_W2, CopyROP );
     bitBlt( &store, 0, 0, this, xp - STORE_W, yp - STORE_W,
             STORE_W2, STORE_W2, CopyROP );
     drawCursor( &painter, xp, yp );
     px = xp;
     py = yp;
 
     painter.end();
 }
 
 void OXYSelector::drawContents( QPainter * )
 {}
 
 
 void OXYSelector::drawCursor( QPainter *p, int xp, int yp )
 {
     p->setPen( QPen( white ) );
 
     p->drawLine( xp - 6, yp - 6, xp - 2, yp - 2 );
     p->drawLine( xp - 6, yp + 6, xp - 2, yp + 2 );
     p->drawLine( xp + 6, yp - 6, xp + 2, yp - 2 );
     p->drawLine( xp + 6, yp + 6, xp + 2, yp + 2 );
 }
 
 //-----------------------------------------------------------------------------
 /*
  * 1D value selector with contents drawn by derived class.
  * See OColorDialog for example.
  */
 
 
 OSelector::OSelector( QWidget *parent, const char *name )
         : QWidget( parent, name ), QRangeControl()
 {
         _orientation = Horizontal;
         _indent = TRUE;
 }
 
 OSelector::OSelector( Orientation o, QWidget *parent, const char *name )
         : QWidget( parent, name ), QRangeControl()
 {
         _orientation = o;
         _indent = TRUE;
 }
 
 
 OSelector::~OSelector()
 {}
 
 
 QRect OSelector::contentsRect() const
 {
         if ( orientation() == Vertical )
                 return QRect( 2, 5, width()-9, height()-10 );
         else
                 return QRect( 5, 2, width()-10, height()-9 );
 }
 
 void OSelector::paintEvent( QPaintEvent * )
 {
         QPainter painter;
 
         painter.begin( this );
 
         drawContents( &painter );
 
         QBrush brush;
 
         if ( indent() )
         {
                 if ( orientation() == Vertical )
                         qDrawShadePanel( &painter, 0, 3, width()-5, height()-6,
                                 colorGroup(), TRUE, 2, &brush );
                 else
                         qDrawShadePanel( &painter, 3, 0, width()-6, height()-5,
                                 colorGroup(), TRUE, 2, &brush );
         }
 
         QPoint pos = calcArrowPos( value() );
         drawArrow( &painter, TRUE, pos );
 
         painter.end();
 }
 
 void OSelector::mousePressEvent( QMouseEvent *e )
 {
         moveArrow( e->pos() );
 }
 
 void OSelector::mouseMoveEvent( QMouseEvent *e )
 {
         moveArrow( e->pos() );
 }
 
 void OSelector::wheelEvent( QWheelEvent *e )
 {
         int val = value() + e->delta()/120;
         emit valueChanged( val );
         setValue( val );
 }
 
 void OSelector::valueChange()
 {
         QPainter painter;
         QPoint pos;
 
         painter.begin( this );
 
         pos = calcArrowPos( prevValue() );
         drawArrow( &painter, FALSE, pos );
 
         pos = calcArrowPos( value() );
         drawArrow( &painter, TRUE, pos );
 
         painter.end();
 }
 
 void OSelector::moveArrow( const QPoint &pos )
 {
         int val;
 
         if ( orientation() == Vertical )
                 val = ( maxValue() - minValue() ) * (height()-pos.y()-3)
                                 / (height()-10) + minValue();
         else
                 val = ( maxValue() - minValue() ) * (width()-pos.x()-3)
                                 / (width()-10) + minValue();
 
         if ( val > maxValue() )
                 val = maxValue();
         if ( val < minValue() )
                 val = minValue();
 
         emit valueChanged( val );
         setValue( val );
 }
 
 QPoint OSelector::calcArrowPos( int val )
 {
         QPoint p;
 
         if ( orientation() == Vertical )
         {
                 p.setY( height() - ( (height()-10) * val
                                 / ( maxValue() - minValue() ) + 5 ) );
                 p.setX( width() - 5 );
         }
         else
         {
                 p.setX( width() - ( (width()-10) * val
                                 / ( maxValue() - minValue() ) + 5 ) );
                 p.setY( height() - 5 );
         }
 
         return p;
 }
 
 void OSelector::drawContents( QPainter * )
 {}
 
 void OSelector::drawArrow( QPainter *painter, bool show, const QPoint &pos )
 {
   if ( show )
   {
     QPointArray array(3);
 
     painter->setPen( QPen() );
     painter->setBrush( QBrush( colorGroup().buttonText() ) );
     if ( orientation() == Vertical )
     {
       array.setPoint( 0, pos.x()+0, pos.y()+0 );
       array.setPoint( 1, pos.x()+5, pos.y()+5 );
       array.setPoint( 2, pos.x()+5, pos.y()-5 );
     }
     else
     {
       array.setPoint( 0, pos.x()+0, pos.y()+0 );
       array.setPoint( 1, pos.x()+5, pos.y()+5 );
       array.setPoint( 2, pos.x()-5, pos.y()+5 );
     }
 
     painter->drawPolygon( array );
   }
   else
   {
     if ( orientation() == Vertical )
     {
        repaint(pos.x(), pos.y()-5, 6, 11, true);
     }
     else
     {
        repaint(pos.x()-5, pos.y(), 11, 6, true);
     }
   }
 }
 
 //----------------------------------------------------------------------------
 
 OGradientSelector::OGradientSelector( QWidget *parent, const char *name )
     : OSelector( parent, name )
 {
     init();
 }
 
 
 OGradientSelector::OGradientSelector( Orientation o, QWidget *parent,
                 const char *name )
         : OSelector( o, parent, name )
 {
     init();
 }
 
 
 OGradientSelector::~OGradientSelector()
 {}
 
 
 void OGradientSelector::init()
 {
     color1.setRgb( 0, 0, 0 );
     color2.setRgb( 255, 255, 255 );
 
     text1 = text2 = "";
 }
 
 
 void OGradientSelector::drawContents( QPainter *painter )
 {
         QImage image( contentsRect().width(), contentsRect().height(), 32 );
 
         QColor col;
         float scale;
 
         int redDiff   = color2.red() - color1.red();
         int greenDiff = color2.green() - color1.green();
         int blueDiff  = color2.blue() - color1.blue();
 
         if ( orientation() == Vertical )
         {
                 for ( int y = 0; y < image.height(); y++ )
                 {
                         scale = 1.0 * y / image.height();
                         col.setRgb( color1.red() + int(redDiff*scale),
                                                 color1.green() + int(greenDiff*scale),
                                                 color1.blue() + int(blueDiff*scale) );
 
                         unsigned int *p = (uint *) image.scanLine( y );
                         for ( int x = 0; x < image.width(); x++ )
                                 *p++ = col.rgb();
                 }
         }
         else
         {
                 unsigned int *p = (uint *) image.scanLine( 0 );
 
                 for ( int x = 0; x < image.width(); x++ )
                 {
                         scale = 1.0 * x / image.width();
                         col.setRgb( color1.red() + int(redDiff*scale),
                                                 color1.green() + int(greenDiff*scale),
                                                 color1.blue() + int(blueDiff*scale) );
                         *p++ = col.rgb();
                 }
 
                 for ( int y = 1; y < image.height(); y++ )
                         memcpy( image.scanLine( y ), image.scanLine( y - 1),
                                  sizeof( unsigned int ) * image.width() );
         }
 
         QColor ditherPalette[8];
 
         for ( int s = 0; s < 8; s++ )
                 ditherPalette[s].setRgb( color1.red() + redDiff * s / 8,
                                                                 color1.green() + greenDiff * s / 8,
                                                                 color1.blue() + blueDiff * s / 8 );
 
         OImageEffect::dither( image, ditherPalette, 8 );
 
         QPixmap p;
         p.convertFromImage( image );
 
         painter->drawPixmap( contentsRect().x(), contentsRect().y(), p );
 
         if ( orientation() == Vertical )
         {
                 int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2;
                 int xPos = contentsRect().left() + (contentsRect().width() -
                          painter->fontMetrics().width( text2 )) / 2;
                 QPen pen( color2 );
                 painter->setPen( pen );
                 painter->drawText( xPos, yPos, text2 );
 
                 yPos = contentsRect().bottom() - painter->fontMetrics().descent() - 2;
                 xPos = contentsRect().left() + (contentsRect().width() -
                         painter->fontMetrics().width( text1 )) / 2;
                 pen.setColor( color1 );
                 painter->setPen( pen );
                 painter->drawText( xPos, yPos, text1 );
         }
         else
         {
                 int yPos = contentsRect().bottom()-painter->fontMetrics().descent()-2;
 
                 QPen pen( color2 );
                 painter->setPen( pen );
                 painter->drawText( contentsRect().left() + 2, yPos, text1 );
 
                 pen.setColor( color1 );
                 painter->setPen( pen );
                 painter->drawText( contentsRect().right() -
                          painter->fontMetrics().width( text2 ) - 2, yPos, text2 );
         }
 }
 
 //-----------------------------------------------------------------------------
 
 static QColor *standardPalette = 0;
 
 #define STANDARD_PAL_SIZE 17
 
 OColor::OColor()
 : QColor()
 {
   r = 0; g = 0; b = 0; h = 0; s = 0; v = 0;
 };
 
 OColor::OColor( const OColor &col)
 : QColor( col )
 {
   h = col.h; s = col.s; v = col.v;
   r = col.r; g = col.g; b = col.b;
 };
 
 OColor::OColor( const QColor &col)
 : QColor( col )
 {
   QColor::rgb(&r, &g, &b);
   QColor::hsv(&h, &s, &v);
 };
 
 bool OColor::operator==(const OColor& col) const
 {
   return (h == col.h) && (s == col.s) && (v == col.v) &&
          (r == col.r) && (g == col.g) && (b == col.b);
 }
 
 OColor& OColor::operator=(const OColor& col)
 {
   *(QColor *)this = col;
diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp
index 9519888..ec1f25a 100644
--- a/libopie2/opieui/owait.cpp
+++ b/libopie2/opieui/owait.cpp
@@ -1,112 +1,113 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "owait.h"
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 /* QT */
 #include <qlayout.h>
 #include <qpainter.h>
 
 using namespace Opie::Ui;
 
 static int frame = 0;
 
 /**
  * This will construct a modal dialog.
  *
  * The default timer length is 10.
  *
  * @param parent The parent of the widget
  * @param msg The name of the object
  * @param dispIcon Display Icon?
  */
 OWait::OWait( QWidget *parent, const char* msg, bool dispIcon )
       :QDialog( parent, msg, TRUE, WStyle_Customize )
 {
 
+    Q_UNUSED( dispIcon )
 
     QHBoxLayout * hbox = new QHBoxLayout( this );
 
     m_lb = new QLabel( this );
     m_lb->setBackgroundMode ( NoBackground );
 
     hbox->addWidget( m_lb );
     hbox->activate();
 
     m_pix = Resource::loadPixmap( "BigBusy" );
     m_aniSize = m_pix.height();
     resize( m_aniSize, m_aniSize );
 
     m_timerLength = 10;
 
     m_waitTimer = new QTimer( this );
     connect( m_waitTimer, SIGNAL( timeout() ), this, SLOT( hide() ) );
 }
 
 void OWait::timerEvent( QTimerEvent * )
 {
     frame = ( ++frame ) % 4;
     repaint();
 }
 
 void OWait::paintEvent( QPaintEvent * )
 {
     QPainter p( m_lb );
     p.drawPixmap( 0, 0, m_pix, m_aniSize * frame, 0, m_aniSize, m_aniSize );
 }
 
 void OWait::show()
 {
 
     move( ( ( qApp->desktop() ->width() ) / 2 ) - ( m_aniSize / 2 ), ( ( qApp->desktop() ->height() ) / 2 ) - ( m_aniSize / 2 ) );
     startTimer( 300 );
     m_waitTimer->start( m_timerLength * 1000, true );
     QDialog::show();
 }
 
 void OWait::hide()
 {
     killTimers();
     m_waitTimer->stop();
     frame = 0;
     QDialog::hide();
 }
 
 void OWait::setTimerLength( int length )
 {
     m_timerLength = length;
 }
 
 OWait::~OWait()
 {}