run the optimize_connect script

the whole cvs is tagged with "before_optimize_connect" if there are problems you can check the diff (but it had compiled and run here)
author: alwin <alwin> 2004-03-02 12:14:15 (UTC)
committer: alwin <alwin> 2004-03-02 12:14:15 (UTC)
commit: 0d59c780513da78033f4d9040475dee9db0256d4 (patch) (unidiff)
tree: 503d320b4aa3daae9982082e7b34e3e2c48bdfb7 /libopie2
parent: a0981652d61776d70f25980f035748b21339e946 (diff)
download: opie-0d59c780513da78033f4d9040475dee9db0256d4.zip
opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.gz
opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.bz2
18 files changed, 77 insertions, 77 deletions
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
index a75f9dc..789496c 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
@@ -1,79 +1,79 @@
 #include <qstring.h>
 #include <qlabel.h>
 #include <qheader.h>
 #include <qlayout.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/oapplicationfactory.h>
 #include "osplitter_mail.h"
 OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
 class Folder {
    int dummy;
 };
 // -----------------------------------------------------------------
 ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
    : QWidget( p, name, fl ) {
    qApp->installEventFilter( this );
    m_lstFolders.setAutoDelete( true );
    QHBoxLayout *lay = new QHBoxLayout(this);
    m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" );
    lay->addWidget( m_splitter );
-    connect(m_splitter, SIGNAL(sizeChange(bool, const QSize& ) ),
+    connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ),
-            this, SLOT(slotSizeChange(bool, const QSize& ) ) );
+            this, SLOT(slotSizeChange(bool,const QSize&) ) );
    m_overview = new QListView( m_splitter );
    m_overview->header()->setClickEnabled( FALSE );
    m_overview->addColumn( tr("Folder") );
    m_overview->setMaximumWidth( 200 );
    m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
    m_splitter->setSizeChange( 300 );
    /* OSplitter starts with the small mode */
    m_messages = 0;
    m_message = m_attach  = 0;
    splitti = new OSplitter( Vertical, m_splitter, "Splitti2" );
    splitti->setSizeChange( 300 );
    splitti->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) );
    QLabel *lbl = new QLabel(splitti);
    lbl->setTextFormat ( Qt::RichText );
    lbl->setText("<br><br><b>Test Test  Test</b><br><br><p>Fooooo hjhh</p>");
    m_messages = new QListView( splitti );
    m_messages->addColumn(" Messages ");
    folder1 = new QListView( splitti );
    folder1->addColumn( "Messages 2 " );
    splitti->addWidget(m_messages, "mail", tr("Mails") );
    splitti->addWidget(folder1, "folder", tr("Folder") );
    splitti->addWidget( lbl, "logo", tr("Label") );
    m_message = lbl;
    m_splitter->addWidget( splitti );
 }
 ListViews::~ListViews() {
 }
 bool ListViews::eventFilter( QObject* obj, QEvent* ev ) {
    if (!obj->isWidgetType() )
        return false;
    if ( ev->type() == QEvent::MouseButtonRelease ) {
        qWarning(" name %s, class %s", obj->name(), obj->className() );
    }
    return false;
 }
diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
index f62729c..0d8bc9f 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
@@ -17,189 +17,189 @@
 #include <qcolor.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qvbox.h>
 #include <qstring.h>
 #include <qstringlist.h>
 // Qtopia
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 #endif
 // Opie
 #ifdef QWS
 #include <opie2/odevice.h>
 using namespace Opie;
 #endif
 #include <opie2/ocompletionbox.h>
 #include <opie2/olineedit.h>
 #include <opie2/ocombobox.h>
 #include <opie2/oeditlistbox.h>
 #include <opie2/oselector.h>
 #include <opie2/opopupmenu.h>
 #include <qtabwidget.h>
 #include "oversatileviewdemo.h"
 // Local
 #include "opieuidemo.h"
 enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector };
 OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl )
    : QMainWindow( parent, name, fl )
 {
    QMenuBar* mbar = this->menuBar();
    OPopupMenu* demo = new OPopupMenu( this );
    demo->setTitle( "Title" );
    demo->setItemParameter( demo->insertItem( "OCompletionBox", this, SLOT( demo(int) ) ), ocompletionbox );
    demo->setItemParameter( demo->insertItem( "OLineEdit", this, SLOT( demo(int) ) ), olineedit );
    demo->setItemParameter( demo->insertItem( "OComboBox", this, SLOT( demo(int) ) ), ocombobox );
    demo->setItemParameter( demo->insertItem( "OEditListBox", this, SLOT( demo(int) ) ), oeditlistbox );
    demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector );
    mbar->insertItem( "Demonstrate", demo );
    build();
 }
 OpieUIDemo::~OpieUIDemo()
 {
 }
 void OpieUIDemo::build()
 {
    main = new QTabWidget( this, "tabwidget" );
    setCentralWidget( main );
    main->show();
    main->addTab( new OVersatileViewDemo( main ), "VersatileView" );
 }
 void OpieUIDemo::demo( int d )
 {
    switch (d)
    {
        case ocompletionbox: demoOCompletionBox(); break;
        case olineedit: demoOLineEdit(); break;
        case ocombobox: demoOComboBox(); break;
        case oeditlistbox: demoOEditListBox(); break;
        case oselector: demoOSelector(); break;
    }
 }
 void OpieUIDemo::demoOCompletionBox()
 {
    qDebug( "ocompletionbox" );
    OCompletionBox* box = new OCompletionBox( 0 );
    box->insertItem( "This CompletionBox" );
    box->insertItem( "Says 'Hello World'" );
    box->insertItem( "Here are some" );
    box->insertItem( "Additional Items" );
    box->insertItem( "Complete Completion Box" );
-    connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) );
+    connect( box, SIGNAL( activated(const QString&) ), this, SLOT( messageBox(const QString&) ) );
    box->popup();
 }
 void OpieUIDemo::demoOLineEdit()
 {
    qDebug( "olineedit" );
    OLineEdit *edit = new OLineEdit( 0, "lineedit" );
    edit->setCompletionMode( OGlobalSettings::CompletionPopup );
    OCompletion* comp = edit->completionObject();
    QStringList list;
    list << "mickeyl@handhelds.org";
    list << "mickey@tm.informatik.uni-frankfurt.de";
    list << "mickey@vanille.de";
    comp->setItems( list );
    edit->show();
 }
 void OpieUIDemo::demoOComboBox()
 {
    qDebug( "ocombobox" );
    OComboBox *combo = new OComboBox( true, 0, "combobox" );
    combo->setCompletionMode( OGlobalSettings::CompletionPopup );
    OCompletion* comp = combo->completionObject();
    QStringList ilist;
    ilist << "kergoth@handhelds.org";
    ilist << "harlekin@handhelds.org";
    ilist << "groucho@handhelds.org";
    combo->insertStringList( ilist );
    QStringList clist;
    clist << "mickeyl@handhelds.org";
    clist << "mickey@tm.informatik.uni-frankfurt.de";
    clist << "mickey@vanille.de";
    comp->setItems( clist );
    combo->show();
 }
 void OpieUIDemo::demoOEditListBox()
 {
    qDebug( "oeditlistbox" );
    OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" );
    edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup );
    OCompletion* comp = edit->lineEdit()->completionObject();
    QStringList clist;
    clist << "Completion everywhere";
    clist << "Cool Completion everywhere";
    clist << "History History History";
    comp->setItems( clist );
    QStringList list;
    list << "kergoth@handhelds.org";
    list << "harlekin@handhelds.org";
    list << "groucho@handhelds.org";
    list << "mickeyl@handhelds.org";
    edit->insertStringList( list );
    edit->show();
 }
 void OpieUIDemo::demoOSelector()
 {
    qDebug( "oselector" );
    OHSSelector* sel = new OHSSelector( 0, "gradientselector" );
    //#sel->resize( QSize( 200, 30 ) );
    //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) );
    //#sel->setText( "Dark", "Light" );
    sel->show();
 }
 void OpieUIDemo::messageBox( const QString& text )
 {
    QString info;
    info = "You have selected '" + text + "'";
    QMessageBox::information( this, "OpieUIDemo", info );
 }
diff --git a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
index cf1e443..9db4e62 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
@@ -1,158 +1,158 @@
 /*
 � � � � � � � �             This file is part of the Opie Project
 � � � � � � �                Copyright (C) 2003 Michael 'Mickey' Lauer
                             <mickey@tm.informatik.uni-frankfurt.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.
 */
 #include "oversatileviewdemo.h"
 #include <opie2/oversatileview.h>
 #include <opie2/oversatileviewitem.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qlistview.h>
 OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlags f )
                   :QVBox( parent, name, f )
 {
    vv = new OVersatileView( this );
    
    vv->addColumn( "First" );
    vv->addColumn( "2nd" );
    vv->addColumn( "IIIrd" );
    
    QString counter;
    
    QPixmap leaf( "leaf.png" );
    QPixmap opened( "folder_opened.png" );
    QPixmap closed( "folder_closed.png" );
    
    QPixmap leaf32( "leaf32.png" );
    QPixmap opened32( "folder_opened32.png" );
    QPixmap closed32( "folder_closed32.png" );
    
    vv->setDefaultPixmaps( OVersatileView::Tree, leaf, opened, closed );
    vv->setDefaultPixmaps( OVersatileView::Icons, leaf32, opened32, closed32 );
    
    OVersatileViewItem* item;
    OVersatileViewItem* item2;
    
    for ( int i = 0; i < 5; ++i )
    {
        counter.sprintf( "%d", i );
        item = new OVersatileViewItem( vv, "Item", "Text", "Some more", counter );
        item->setRenameEnabled( true );
        item2 = new OVersatileViewItem( item, "OSubitem", "123", "...", counter );
        item2->setRenameEnabled( true );
    }
   
    connect( vv, SIGNAL( selectionChanged() ), this, SLOT( selectionChanged() ) );
-    connect( vv, SIGNAL( selectionChanged( OVersatileViewItem * ) ), this, SLOT( selectionChanged( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( selectionChanged(OVersatileViewItem*) ), this, SLOT( selectionChanged(OVersatileViewItem*) ) );
-    connect( vv, SIGNAL( currentChanged( OVersatileViewItem * ) ), this, SLOT( currentChanged( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( currentChanged(OVersatileViewItem*) ), this, SLOT( currentChanged(OVersatileViewItem*) ) );
-    connect( vv, SIGNAL( clicked( OVersatileViewItem * ) ), this, SLOT( clicked( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( clicked(OVersatileViewItem*) ), this, SLOT( clicked(OVersatileViewItem*) ) );
-    connect( vv, SIGNAL( pressed( OVersatileViewItem * ) ), this, SLOT( pressed( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( pressed(OVersatileViewItem*) ), this, SLOT( pressed(OVersatileViewItem*) ) );
-    connect( vv, SIGNAL( doubleClicked( OVersatileViewItem * ) ), this, SLOT( doubleClicked( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( doubleClicked(OVersatileViewItem*) ), this, SLOT( doubleClicked(OVersatileViewItem*) ) );
-    connect( vv, SIGNAL( returnPressed( OVersatileViewItem * ) ), this, SLOT( returnPressed( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( returnPressed(OVersatileViewItem*) ), this, SLOT( returnPressed(OVersatileViewItem*) ) );
  
-    connect( vv, SIGNAL( onItem( OVersatileViewItem * ) ), this, SLOT( onItem( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( onItem(OVersatileViewItem*) ), this, SLOT( onItem(OVersatileViewItem*) ) );
    connect( vv, SIGNAL( onViewport() ), this, SLOT( onViewport() ) );
    
-    connect( vv, SIGNAL( expanded( OVersatileViewItem * ) ), this, SLOT( expanded( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( expanded(OVersatileViewItem*) ), this, SLOT( expanded(OVersatileViewItem*) ) );
-    connect( vv, SIGNAL( collapsed( OVersatileViewItem * ) ), this, SLOT( collapsed( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( collapsed(OVersatileViewItem*) ), this, SLOT( collapsed(OVersatileViewItem*) ) );
    connect( vv, SIGNAL( moved() ), this, SLOT( moved() ) );
-    connect( vv, SIGNAL( contextMenuRequested( OVersatileViewItem *, const QPoint&, int ) ), this, SLOT( contextMenuRequested( OVersatileViewItem *, const QPoint&, int ) ) );
+    connect( vv, SIGNAL( contextMenuRequested(OVersatileViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(OVersatileViewItem*,const QPoint&,int) ) );
    
 }
 OVersatileViewDemo::~OVersatileViewDemo()
 {
 }
 void OVersatileViewDemo::selectionChanged()
 {
    qDebug( "received signal selectionChanged()" );
 }
 void OVersatileViewDemo::selectionChanged( OVersatileViewItem * item )
 {
    qDebug( "received signal selectionChanged(OVersatileViewItem*)" );
 }
 void OVersatileViewDemo::currentChanged( OVersatileViewItem * item )
 {
    qDebug( "received signal currentChanged( OVersatileViewItem * )" );
 }
 void OVersatileViewDemo::clicked( OVersatileViewItem * item )
 {
    qDebug( "received signal clicked( OVersatileViewItem * )" );
 }
 void OVersatileViewDemo::pressed( OVersatileViewItem * item )
 {
    qDebug( "received signal pressed( OVersatileViewItem * )" );
 }
 void OVersatileViewDemo::doubleClicked( OVersatileViewItem *item )
 {
    qDebug( "received signal doubleClicked( OVersatileViewItem *item )" );
 }
 void OVersatileViewDemo::returnPressed( OVersatileViewItem *item )
 {
    qDebug( "received signal returnPressed( OVersatileViewItem *item )" );
 }
 void OVersatileViewDemo::onItem( OVersatileViewItem *item )
 {
    qDebug( "received signal onItem( OVersatileViewItem *item )" );
 }
 void OVersatileViewDemo::onViewport()
 {
    qDebug( "received signal onViewport()" );
 }
 void OVersatileViewDemo::expanded( OVersatileViewItem *item )
 {
    qDebug( "received signal expanded( OVersatileViewItem *item )" );
 }
 void OVersatileViewDemo::collapsed( OVersatileViewItem *item )
 {
    qDebug( "received signal collapsed( OVersatileViewItem *item )" );
 }
 void OVersatileViewDemo::moved()
 {
    qDebug( "received signal moved( OVersatileViewItem *item )" );
 }
 void OVersatileViewDemo::contextMenuRequested( OVersatileViewItem *item, const QPoint& pos, int col )
 {
    qDebug( "received signal contextMenuRequested( OVersatileViewItem *item )" );
 }
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index b8d48fe..27b0e53 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -52,193 +52,193 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
 using namespace Opie;
 ODevice *ODevice::inst()
 {
    static ODevice *dev = 0;
    // rewrite this to only use /proc/cpuinfo or so
    if ( !dev )
    {
        QFile f( PATH_PROC_CPUINFO );
        if ( f.open( IO_ReadOnly ) )
        {
            QTextStream s( &f );
            while ( !s.atEnd() )
            {
                QString line;
                line = s.readLine();
                if ( line.startsWith( "Hardware" ) )
                {
                    qDebug( "ODevice() - found '%s'", (const char*) line );
                    if ( line.contains( "sharp", false ) ) dev = new Zaurus();
                    else if ( line.contains( "ipaq", false ) ) dev = new iPAQ();
                    else if ( line.contains( "simpad", false ) ) dev = new SIMpad();
                    else if ( line.contains( "jornada", false ) ) dev = new Jornada();
                    else if ( line.contains( "ramses", false ) ) dev = new Ramses();
                    else qWarning( "ODevice() - unknown hardware - using default." );
                    break;
                }
            }
        }
        else
        {
            qWarning( "ODevice() - can't open '%s' - unknown hardware - using default." );
        }
        if ( !dev ) dev = new ODevice();
        dev->init();
    }
    return dev;
 }
 ODevice::ODevice()
 {
    d = new ODeviceData;
    d->m_modelstr = "Unknown";
    d->m_model = Model_Unknown;
    d->m_vendorstr = "Unknown";
    d->m_vendor = Vendor_Unknown;
    d->m_systemstr = "Unknown";
    d->m_system = System_Unknown;
    d->m_sysverstr = "0.0";
    d->m_rotation = Rot0;
    d->m_direction = CW;
    d->m_holdtime = 1000; // 1000ms
    d->m_buttons = 0;
    d->m_cpu_frequencies = new QStrList;
 }
 void ODevice::systemMessage ( const QCString &msg, const QByteArray & )
 {
    if ( msg == "deviceButtonMappingChanged()" ) {
        reloadButtonMapping();
    }
 }
 void ODevice::init()
 {
 }
 /**
 * This method initialises the button mapping
 */
 void ODevice::initButtons()
 {
    if ( d->m_buttons )
        return;
    qDebug ( "init Buttons" );
    d->m_buttons = new QValueList <ODeviceButton>;
    reloadButtonMapping();
    QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
 ODevice::~ODevice()
 {
 // we leak m_devicebuttons and m_cpu_frequency
 // but it's a singleton and it is not so importantant
 // -zecke
    delete d;
 }
 bool ODevice::setSoftSuspend ( bool /*soft*/ )
 {
    return false;
 }
 //#include <linux/apm_bios.h>
 #define APM_IOC_SUSPEND          OD_IO( 'A', 2 )
 /**
 * This method will try to suspend the device
 * It only works if the user is the QWS Server and the apm application
 * is installed.
 * It tries to suspend and then waits some time cause some distributions
 * do have asynchronus apm implementations.
 * This method will either fail and return false or it'll suspend the
 * device and return once the device got woken up
 *
 * @return if the device got suspended
 */
 bool ODevice::suspend()
 {
    qDebug("ODevice::suspend");
    if ( !isQWS( ) ) // only qwsserver is allowed to suspend
        return false;
    if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
        return false;
    bool res = false;
    ODevice::sendSuspendmsg();
    
    struct timeval tvs, tvn;
    ::gettimeofday ( &tvs, 0 );
    ::sync(); // flush fs caches
    res = ( ::system ( "apm --suspend" ) == 0 );
    // This is needed because the iPAQ apm implementation is asynchronous and we
    // can not be sure when exactly the device is really suspended
    // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists.
    if ( res ) {
        do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
            ::usleep ( 200 * 1000 );
            ::gettimeofday ( &tvn, 0 );
        } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 );
    }
    return res;
 }
 //#include <linux/fb.h> better not rely on kernel headers in userspace ...
 #define FBIOBLANK             OD_IO( 'F', 0x11 ) // 0x4611
 /* VESA Blanking Levels */
 #define VESA_NO_BLANKING      0
 #define VESA_VSYNC_SUSPEND    1
 #define VESA_HSYNC_SUSPEND    2
 #define VESA_POWERDOWN        3
 /**
 * This sets the display on or off
 */
 bool ODevice::setDisplayStatus ( bool on )
 {
    qDebug("ODevice::setDisplayStatus(%d)", on);
    if ( d->m_model == Model_Unknown )
        return false;
    bool res = false;
    int fd;
    if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) {
        res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 );
        ::close ( fd );
    }
    return res;
 }
 /**
 * This sets the display brightness
 *
 * @param p The brightness to be set on a scale from 0 to 255
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index cc4b01a..8ecea1b 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -119,193 +119,193 @@ void iPAQ::init()
    if ( f. open ( IO_ReadOnly )) {
        QTextStream ts ( &f );
        d->m_modelstr = "H" + ts. readLine();
        if ( d->m_modelstr == "H3100" )
            d->m_model = Model_iPAQ_H31xx;
        else if ( d->m_modelstr == "H3600" )
            d->m_model = Model_iPAQ_H36xx;
        else if ( d->m_modelstr == "H3700" )
            d->m_model = Model_iPAQ_H37xx;
        else if ( d->m_modelstr == "H3800" )
            d->m_model = Model_iPAQ_H38xx;
        else if ( d->m_modelstr == "H3900" )
            d->m_model = Model_iPAQ_H39xx;
        else if ( d->m_modelstr == "H5400" )
            d->m_model = Model_iPAQ_H5xxx;
        else
            d->m_model = Model_Unknown;
        f. close();
    }
    switch ( d->m_model ) {
        case Model_iPAQ_H31xx:
        case Model_iPAQ_H38xx:
            d->m_rotation = Rot90;
            break;
        case Model_iPAQ_H36xx:
        case Model_iPAQ_H37xx:
        case Model_iPAQ_H39xx:
        default:
            d->m_rotation = Rot270;
            break;
        case Model_iPAQ_H5xxx:
            d->m_rotation = Rot0;
        }
    f. setName ( "/etc/familiar-version" );
    if ( f. open ( IO_ReadOnly )) {
        d->m_systemstr = "Familiar";
        d->m_system = System_Familiar;
        QTextStream ts ( &f );
        d->m_sysverstr = ts. readLine(). mid ( 10 );
        f. close();
    } else {
        f. setName ( "/etc/oz_version" );
                    if ( f. open ( IO_ReadOnly )) {
            d->m_systemstr = "OpenEmbedded/iPaq";
            d->m_system = System_Familiar;
            QTextStream ts ( &f );
            ts.setDevice ( &f );
            d->m_sysverstr = ts. readLine();
            f. close();
        }
    }
    m_leds [0] = m_leds [1] = Led_Off;
    m_power_timer = 0;
 }
 void iPAQ::initButtons()
 {
    if ( d->m_buttons )
        return;
    if ( isQWS( ) )
        QWSServer::setKeyboardFilter ( this );
    d->m_buttons = new QValueList <ODeviceButton>;
    for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
        i_button *ib = ipaq_buttons + i;
        ODeviceButton b;
        if (( ib->model & d->m_model ) == d->m_model ) {
            b. setKeycode ( ib->code );
            b. setUserText ( QObject::tr ( "Button", ib->utext ));
            b. setPixmap ( Resource::loadPixmap ( ib->pix ));
            b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction ));
            b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction ));
            d->m_buttons->append ( b );
        }
    }
    reloadButtonMapping();
    QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
 QValueList <OLed> iPAQ::ledList() const
 {
    QValueList <OLed> vl;
    vl << Led_Power;
    if ( d->m_model == Model_iPAQ_H38xx )
        vl << Led_BlueTooth;
    return vl;
 }
 QValueList <OLedState> iPAQ::ledStateList ( OLed l ) const
 {
    QValueList <OLedState> vl;
    if ( l == Led_Power )
        vl << Led_Off << Led_On << Led_BlinkSlow << Led_BlinkFast;
    else if ( l == Led_BlueTooth && d->m_model == Model_iPAQ_H38xx )
        vl << Led_Off; // << Led_On << ???
    return vl;
 }
 OLedState iPAQ::ledState ( OLed l ) const
 {
    switch ( l ) {
        case Led_Power:
            return m_leds [0];
        case Led_BlueTooth:
            return m_leds [1];
        default:
            return Led_Off;
    }
 }
 bool iPAQ::setLedState ( OLed l, OLedState st )
 {
    static int fd = ::open ( "/dev/touchscreen/0", O_RDWR | O_NONBLOCK );
    if ( l == Led_Power ) {
        if ( fd >= 0 ) {
            LED_IN leds;
            ::memset ( &leds, 0, sizeof( leds ));
            leds. TotalTime  = 0;
            leds. OnTime     = 0;
            leds. OffTime    = 1;
            leds. OffOnBlink = 2;
            switch ( st ) {
                case Led_Off      : leds. OffOnBlink = 0; break;
                case Led_On       : leds. OffOnBlink = 1; break;
                case Led_BlinkSlow: leds. OnTime = 10; leds. OffTime = 10; break;
                case Led_BlinkFast: leds. OnTime =  5; leds. OffTime =  5; break;
            }
            if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) {
                m_leds [0] = st;
                return true;
            }
        }
    }
    return false;
 }
 bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
    int newkeycode = keycode;
    switch ( keycode ) {
        // H38xx/H39xx have no "Q" key anymore - this is now the Mail key
        case HardKey_Menu: {
            if (( d->m_model == Model_iPAQ_H38xx ) ||
                ( d->m_model == Model_iPAQ_H39xx ) ||
                ( d->m_model == Model_iPAQ_H5xxx)) {
                newkeycode = HardKey_Mail;
            }
            break;
        }
        // Rotate cursor keys 180� or 270�
        case Key_Left :
        case Key_Right:
        case Key_Up   :
        case Key_Down : {
            if (( d->m_model == Model_iPAQ_H31xx ) ||
                ( d->m_model == Model_iPAQ_H38xx )) {
                newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
            }
            // Rotate the cursor keys by 270�
            // keycode - Key_Left = position of the button starting from left clockwise
            // add the rotation to it and modolo. No we've the original offset
            // add the offset to the Key_Left key
            if ( d-> m_model == Model_iPAQ_H5xxx )
                newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 31b9297..90aca2f 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -96,193 +96,193 @@ struct s_button simpad_buttons [] = {
    Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"),
    "devicebuttons/simpad_upper_left",
    "QPE/Rotation", "flip()",
    "QPE/Rotation", "flip()" },
    /*
    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
    Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"),
    "devicebuttons/simpad_lower_upper",
    "QPE/Launcher", "home()",
    "buttonsettings", "raise()" },
    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
    Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"),
    "devicebuttons/simpad_upper_lower",
    "QPE/Launcher", "home()",
    "buttonsettings", "raise()" },
    */
 };
 void SIMpad::init()
 {
    d->m_vendorstr = "SIEMENS";
    d->m_vendor = Vendor_SIEMENS;
    QFile f ( "/proc/hal/model" );
    //TODO Implement model checking
    //FIXME For now we assume an SL4
    d->m_modelstr = "SL4";
    d->m_model = Model_SIMpad_SL4;
    switch ( d->m_model ) {
        default:
            d->m_rotation = Rot0;
            d->m_direction = CCW;
            d->m_holdtime = 1000; // 1000ms
            break;
    }
    f. setName ( "/etc/familiar-version" );
    if ( f. open ( IO_ReadOnly )) {
        d->m_systemstr = "Familiar";
        d->m_system = System_Familiar;
        QTextStream ts ( &f );
        d->m_sysverstr = ts. readLine(). mid ( 10 );
        f. close();
    } else {
        f. setName ( "/etc/oz_version" );
                    if ( f. open ( IO_ReadOnly )) {
            d->m_systemstr = "OpenEmbedded/SIMpad";
            d->m_system = System_OpenZaurus;
            QTextStream ts ( &f );
            ts.setDevice ( &f );
            d->m_sysverstr = ts. readLine();
            f. close();
        }
    }
    m_leds [0] = m_leds [1] = Led_Off;
    m_power_timer = 0;
 }
 void SIMpad::initButtons()
 {
    if ( d->m_buttons )
        return;
    if ( isQWS( ) )
        QWSServer::setKeyboardFilter ( this );
    d->m_buttons = new QValueList <ODeviceButton>;
    for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) {
        s_button *sb = simpad_buttons + i;
        ODeviceButton b;
        if (( sb->model & d->m_model ) == d->m_model ) {
            b. setKeycode ( sb->code );
            b. setUserText ( QObject::tr ( "Button", sb->utext ));
            b. setPixmap ( Resource::loadPixmap ( sb->pix ));
            b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction ));
            b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction ));
            d->m_buttons->append ( b );
        }
    }
    reloadButtonMapping();
    QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
 // SIMpad boardcontrol register CS3
 #define SIMPAD_BOARDCONTROL "/proc/cs3"
 #define SIMPAD_VCC_5V_EN                   0x0001 // For 5V PCMCIA
 #define SIMPAD_VCC_3V_EN                   0x0002 // FOR 3.3V PCMCIA
 #define SIMPAD_EN1                         0x0004 // This is only for EPROM's
 #define SIMPAD_EN0                         0x0008 // Both should be enable for 3.3V or 5V
 #define SIMPAD_DISPLAY_ON                  0x0010
 #define SIMPAD_PCMCIA_BUFF_DIS             0x0020
 #define SIMPAD_MQ_RESET                    0x0040
 #define SIMPAD_PCMCIA_RESET                0x0080
 #define SIMPAD_DECT_POWER_ON               0x0100
 #define SIMPAD_IRDA_SD                     0x0200 // Shutdown for powersave
 #define SIMPAD_RS232_ON                    0x0400
 #define SIMPAD_SD_MEDIAQ                   0x0800 // Shutdown for powersave
 #define SIMPAD_LED2_ON                     0x1000
 #define SIMPAD_IRDA_MODE                   0x2000 // Fast/Slow IrDA mode
 #define SIMPAD_ENABLE_5V                   0x4000 // Enable 5V circuit
 #define SIMPAD_RESET_SIMCARD               0x8000
 //SIMpad touchscreen backlight strength control
 #define SIMPAD_BACKLIGHT_CONTROL "/proc/driver/mq200/registers/PWM_CONTROL"
 #define SIMPAD_BACKLIGHT_MASK    0x00a10044
 QValueList <OLed> SIMpad::ledList() const
 {
    QValueList <OLed> vl;
    vl << Led_Power; //FIXME which LED is LED2 ? The green one or the amber one?
    //vl << Led_Mail; //TODO find out if LED1 is accessible anyway
    return vl;
 }
 QValueList <OLedState> SIMpad::ledStateList ( OLed l ) const
 {
    QValueList <OLedState> vl;
    if ( l == Led_Power )  //FIXME which LED is LED2 ? The green one or the amber one?
        vl << Led_Off << Led_On;
    //else if ( l == Led_Mail ) //TODO find out if LED1 is accessible anyway
        //vl << Led_Off;
    return vl;
 }
 OLedState SIMpad::ledState ( OLed l ) const
 {
    switch ( l ) {
        case Led_Power:
            return m_leds [0];
        //case Led_Mail:
                //return m_leds [1];
        default:
            return Led_Off;
    }
 }
 bool SIMpad::setLedState ( OLed l, OLedState st )
 {
 #if 0
    static int fd = ::open ( SIMPAD_BOARDCONTROL, O_RDWR | O_NONBLOCK );
            /*TODO Implement this like that:
            read from cs3
            && with SIMPAD_LED2_ON
            write to cs3 */
                m_leds [0] = st;
                return true;
            }
        }
    }
 #endif
    return false;
 }
 bool SIMpad::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
    //TODO
    return false;
 }
 void SIMpad::timerEvent ( QTimerEvent * )
 {
    killTimer ( m_power_timer );
    m_power_timer = 0;
    QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
    QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 void SIMpad::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
    static Sound snd ( "alarm" );
    int fd;
diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp
index a76f90b..d241db8 100644
--- a/libopie2/opiecore/device/odevice_yopy.cpp
+++ b/libopie2/opiecore/device/odevice_yopy.cpp
@@ -26,138 +26,138 @@ _;:, � � .> � �:=|.         This program is free software; you can
                            Inc., 59 Temple Place - Suite 330,
                            Boston, MA 02111-1307, USA.
 */
 #include "odevice_yopy.h"
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 using namespace Opie;
 struct yopy_button yopy_buttons [] = {
    { Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Action Button" ),
        "devicebuttons/yopy_action",
        "datebook", "nextView()",
        "today", "raise()" },
    { Qt::Key_F11, QT_TRANSLATE_NOOP( "Button", "OK Button" ),
        "devicebuttons/yopy_ok",
        "addressbook", "raise()",
        "addressbook", "beamBusinessCard()" },
    { Qt::Key_F12, QT_TRANSLATE_NOOP( "Button", "End Button" ),
        "devicebuttons/yopy_end",
        "QPE/Launcher", "home()",
        "buttonsettings", "raise()" },
 };
 void Yopy::init()
 {
    d->m_vendorstr = "G.Mate";
    d->m_vendor = Vendor_GMate;
    d->m_modelstr = "Yopy3700";
    d->m_model = Model_Yopy_3700;
    d->m_rotation = Rot0;
    d->m_systemstr = "Linupy";
    d->m_system = System_Linupy;
    QFile f ( "/etc/issue" );
    if ( f. open ( IO_ReadOnly ) )
    {
        QTextStream ts ( &f );
        ts.readLine();
        d->m_sysverstr = ts. readLine();
        f. close();
    }
 }
 void Yopy::initButtons()
 {
    if ( d->m_buttons )
        return ;
    d->m_buttons = new QValueList <ODeviceButton>;
    for ( uint i = 0; i < ( sizeof( yopy_buttons ) / sizeof( yopy_button ) ); i++ )
    {
        yopy_button *ib = yopy_buttons + i;
        ODeviceButton b;
        b. setKeycode ( ib->code );
        b. setUserText ( QObject::tr ( "Button", ib->utext ) );
        b. setPixmap ( Resource::loadPixmap ( ib->pix ) );
        b. setFactoryPresetPressedAction
        ( OQCopMessage( makeChannel( ib->fpressedservice ), ib->fpressedaction ) );
        b. setFactoryPresetHeldAction
        ( OQCopMessage( makeChannel( ib->fheldservice ), ib->fheldaction ) );
        d->m_buttons->append ( b );
    }
    reloadButtonMapping();
    QCopChannel *sysch = new QCopChannel( "QPE/System", this );
-    connect( sysch, SIGNAL( received( const QCString &, const QByteArray & ) ),
+    connect( sysch, SIGNAL( received(const QCString&,const QByteArray&) ),
-             this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
+             this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 }
 bool Yopy::suspend()
 {
    /* Opie for Yopy does not implement its own power management at the
        moment.  The public version runs parallel to X, and relies on the
        existing power management features. */
    return false;
 }
 bool Yopy::setDisplayBrightness( int bright )
 {
    /* The code here works, but is disabled as the current version runs
        parallel to X, and relies on the existing backlight demon. */
 #if 0
    if ( QFile::exists( "/proc/sys/pm/light" ) )
    {
        int fd = ::open( "/proc/sys/pm/light", O_WRONLY );
        if ( fd >= 0 )
        {
            if ( bright )
                ::write( fd, "1\n", 2 );
            else
                ::write( fd, "0\n", 2 );
            ::close( fd );
            return true;
        }
    }
 #endif
    return false;
 }
 int Yopy::displayBrightnessResolution() const
 {
    return 2;
 }
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 9d23a12..8ab3cbe 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -159,194 +159,194 @@ void Zaurus::init()
    }
    else {
        d->m_systemstr = "Zaurus";
        d->m_system = System_Zaurus;
    }
    f. setName ( "/proc/cpuinfo" );
    if ( f. open ( IO_ReadOnly ) ) {
        QTextStream ts ( &f );
        QString line;
        while( line = ts. readLine() ) {
            if ( line. left ( 8 ) == "Hardware" )
                break;
        }
        int loc = line. find ( ":" );
        if ( loc != -1 )
            model = line. mid ( loc + 2 ). simplifyWhiteSpace( );
    }
    if ( model == "SHARP Corgi" ) {
        d->m_model = Model_Zaurus_SLC7x0;
        d->m_modelstr = "Zaurus SL-C700";
    } else if ( model == "SHARP Shepherd" ) {
        d->m_model = Model_Zaurus_SLC7x0;
        d->m_modelstr = "Zaurus SL-C750";
    } else if ( model == "SHARP Husky" ) {
        d->m_model = Model_Zaurus_SLC7x0;
        d->m_modelstr = "Zaurus SL-C760";
    } else if ( model == "SHARP Poodle" ) {
        d->m_model = Model_Zaurus_SLB600;
        d->m_modelstr = "Zaurus SL-B500 or SL-5600";
    } else if ( model == "Sharp-Collie" || model == "Collie" ) {
        d->m_model = Model_Zaurus_SL5500;
        d->m_modelstr = "Zaurus SL-5500 or SL-5000d";
    } else {
        d->m_model = Model_Zaurus_SL5500;
        d->m_modelstr = "Zaurus (Model unknown)";
    }
    bool flipstate = false;
    switch ( d->m_model ) {
        case Model_Zaurus_SLA300:
            d->m_rotation = Rot0;
            break;
        case Model_Zaurus_SLC7x0:
            d->m_rotation = rotation();
            d->m_direction = direction();
            break;
        case Model_Zaurus_SLB600:
        case Model_Zaurus_SL5500:
        case Model_Zaurus_SL5000:
        default:
            d->m_rotation = Rot270;
            break;
    }
    m_leds [0] = Led_Off;
 }
 void Zaurus::initButtons()
 {
    if ( d->m_buttons )
        return;
    d->m_buttons = new QValueList <ODeviceButton>;
    struct z_button * pz_buttons;
    int buttoncount;
    switch ( d->m_model ) {
        case Model_Zaurus_SLC7x0:
            pz_buttons = z_buttons_c700;
            buttoncount = ARRAY_SIZE(z_buttons_c700);
            break;
        default:
            pz_buttons = z_buttons;
            buttoncount = ARRAY_SIZE(z_buttons);
            break;
    }
    for ( int i = 0; i < buttoncount; i++ ) {
        struct z_button *zb = pz_buttons + i;
        ODeviceButton b;
        b. setKeycode ( zb->code );
        b. setUserText ( QObject::tr ( "Button", zb->utext ));
        b. setPixmap ( Resource::loadPixmap ( zb->pix ));
        b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb->fpressedservice ),
                                zb->fpressedaction ));
        b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb->fheldservice ),
                                zb->fheldaction ));
        d->m_buttons->append ( b );
    }
    reloadButtonMapping();
    QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )),
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)),
-        this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+        this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 //#include <asm/sharp_char.h> // including kernel headers is evil ...
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
        #defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 /* --- for SHARP_BUZZER device --- */
        //#defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 //#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 #define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
 #define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
 #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
 //#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 //#define SHARP_BUZ_KEYSOUND         2  /* key sound */
 //#define SHARP_PDA_ILLCLICKSOUND    3  /* illegal click */
 //#define SHARP_PDA_WARNSOUND        4  /* warning occurred */
 //#define SHARP_PDA_ERRORSOUND       5  /* error occurred */
 //#define SHARP_PDA_CRITICALSOUND    6  /* critical error occurred */
 //#define SHARP_PDA_SYSSTARTSOUND    7  /* system start */
 //#define SHARP_PDA_SYSTEMENDSOUND   8  /* system shutdown */
 //#define SHARP_PDA_APPSTART         9  /* application start */
 //#define SHARP_PDA_APPQUIT         10  /* application ends */
 //#define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 //#define SHARP_BUZ_DAILY_ALARM     12  /* daily alarm */
 //#define SHARP_BUZ_GOT_PHONE_CALL  13  /* phone call sound */
 //#define SHARP_BUZ_GOT_MAIL        14  /* mail sound */
 //
        #defineSHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_LED_SETSTATUS   (SHARP_LED_IOCTL_START+1)
 #define  SHARP_IOCTL_GET_ROTATION 0x413c
 typedef struct sharp_led_status {
 int which;   /* select which LED status is wanted. */
 int status;  /* set new led status if you call SHARP_LED_SETSTATUS */
 } sharp_led_status;
 #define SHARP_LED_MAIL_EXISTS  9       /* mail status (exists or not) */
 #define LED_MAIL_NO_UNREAD_MAIL  0   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_NEWMAIL_EXISTS  1   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_UNREAD_MAIL_EX  2   /* for SHARP_LED_MAIL_EXISTS */
 // #include <asm/sharp_apm.h> // including kernel headers is evil ...
 #define APM_IOCGEVTSRC          OD_IOR( 'A', 203, int )
 #define APM_IOCSEVTSRC          OD_IORW( 'A', 204, int )
 #define APM_EVT_POWER_BUTTON    (1 << 0)
 #define FL_IOCTL_STEP_CONTRAST    100
 void Zaurus::buzzer ( int sound )
 {
 #ifndef QT_NO_SOUND
    QString soundname;
    // Not all devices have real sound
    if ( d->m_model == Model_Zaurus_SLC7x0
        || d->m_model == Model_Zaurus_SLB600 ){
        switch ( sound ){
        case SHARP_BUZ_SCHEDULE_ALARM:
            soundname = "alarm";
            break;
        case SHARP_BUZ_TOUCHSOUND:
            soundname = "touchsound";
            break;
        case SHARP_BUZ_KEYSOUND:
            soundname = "keysound";
            break;
        default:
            soundname = "alarm";
        }
    }
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp
index 0a361a1..6349c83 100644
--- a/libopie2/opiecore/oprocess.cpp
+++ b/libopie2/opiecore/oprocess.cpp
@@ -579,214 +579,214 @@ void OProcess::slotSendData( int )
 void OProcess::processHasExited( int state )
 {
    if ( runs )
    {
        runs = false;
        status = state;
        commClose(); // cleanup communication sockets
        // also emit a signal if the process was run Blocking
        if ( DontCare != run_mode )
        {
            emit processExited( this );
        }
    }
 }
 int OProcess::childOutput( int fdno )
 {
    if ( communication & NoRead )
    {
        int len = -1;
        emit receivedStdout( fdno, len );
        errno = 0; // Make sure errno doesn't read "EAGAIN"
        return len;
    }
    else
    {
        char buffer[ 1024 ];
        int len;
        len = ::read( fdno, buffer, 1024 );
        if ( 0 < len )
        {
            emit receivedStdout( this, buffer, len );
        }
        return len;
    }
 }
 int OProcess::childError( int fdno )
 {
    char buffer[ 1024 ];
    int len;
    len = ::read( fdno, buffer, 1024 );
    if ( 0 < len )
        emit receivedStderr( this, buffer, len );
    return len;
 }
 int OProcess::setupCommunication( Communication comm )
 {
    int ok;
    communication = comm;
    ok = 1;
    if ( comm & Stdin )
        ok &= socketpair( AF_UNIX, SOCK_STREAM, 0, in ) >= 0;
    if ( comm & Stdout )
        ok &= socketpair( AF_UNIX, SOCK_STREAM, 0, out ) >= 0;
    if ( comm & Stderr )
        ok &= socketpair( AF_UNIX, SOCK_STREAM, 0, err ) >= 0;
    return ok;
 }
 int OProcess::commSetupDoneP()
 {
    int ok = 1;
    if ( communication != NoCommunication )
    {
        if ( communication & Stdin )
            close( in[ 0 ] );
        if ( communication & Stdout )
            close( out[ 1 ] );
        if ( communication & Stderr )
            close( err[ 1 ] );
        // Don't create socket notifiers and set the sockets non-blocking if
        // blocking is requested.
        if ( run_mode == Block )
            return ok;
        if ( communication & Stdin )
        {
            //        ok &= (-1 != fcntl(in[1], F_SETFL, O_NONBLOCK));
            innot = new QSocketNotifier( in[ 1 ], QSocketNotifier::Write, this );
            CHECK_PTR( innot );
            innot->setEnabled( false ); // will be enabled when data has to be sent
-            QObject::connect( innot, SIGNAL( activated( int ) ),
+            QObject::connect( innot, SIGNAL( activated(int) ),
-                              this, SLOT( slotSendData( int ) ) );
+                              this, SLOT( slotSendData(int) ) );
        }
        if ( communication & Stdout )
        {
            //        ok &= (-1 != fcntl(out[0], F_SETFL, O_NONBLOCK));
            outnot = new QSocketNotifier( out[ 0 ], QSocketNotifier::Read, this );
            CHECK_PTR( outnot );
-            QObject::connect( outnot, SIGNAL( activated( int ) ),
+            QObject::connect( outnot, SIGNAL( activated(int) ),
-                              this, SLOT( slotChildOutput( int ) ) );
+                              this, SLOT( slotChildOutput(int) ) );
            if ( communication & NoRead )
                suspend();
        }
        if ( communication & Stderr )
        {
            //        ok &= (-1 != fcntl(err[0], F_SETFL, O_NONBLOCK));
            errnot = new QSocketNotifier( err[ 0 ], QSocketNotifier::Read, this );
            CHECK_PTR( errnot );
-            QObject::connect( errnot, SIGNAL( activated( int ) ),
+            QObject::connect( errnot, SIGNAL( activated(int) ),
-                              this, SLOT( slotChildError( int ) ) );
+                              this, SLOT( slotChildError(int) ) );
        }
    }
    return ok;
 }
 int OProcess::commSetupDoneC()
 {
    int ok = 1;
    struct linger so;
    memset( &so, 0, sizeof( so ) );
    if ( communication & Stdin )
        close( in[ 1 ] );
    if ( communication & Stdout )
        close( out[ 0 ] );
    if ( communication & Stderr )
        close( err[ 0 ] );
    if ( communication & Stdin )
        ok &= dup2( in[ 0 ], STDIN_FILENO ) != -1;
    else
    {
        int null_fd = open( "/dev/null", O_RDONLY );
        ok &= dup2( null_fd, STDIN_FILENO ) != -1;
        close( null_fd );
    }
    if ( communication & Stdout )
    {
        ok &= dup2( out[ 1 ], STDOUT_FILENO ) != -1;
        ok &= !setsockopt( out[ 1 ], SOL_SOCKET, SO_LINGER, ( char* ) & so, sizeof( so ) );
    }
    else
    {
        int null_fd = open( "/dev/null", O_WRONLY );
        ok &= dup2( null_fd, STDOUT_FILENO ) != -1;
        close( null_fd );
    }
    if ( communication & Stderr )
    {
        ok &= dup2( err[ 1 ], STDERR_FILENO ) != -1;
        ok &= !setsockopt( err[ 1 ], SOL_SOCKET, SO_LINGER, reinterpret_cast<char *>( &so ), sizeof( so ) );
    }
    else
    {
        int null_fd = open( "/dev/null", O_WRONLY );
        ok &= dup2( null_fd, STDERR_FILENO ) != -1;
        close( null_fd );
    }
    return ok;
 }
 void OProcess::commClose()
 {
    if ( NoCommunication != communication )
    {
        bool b_in = ( communication & Stdin );
        bool b_out = ( communication & Stdout );
        bool b_err = ( communication & Stderr );
        if ( b_in )
            delete innot;
        if ( b_out || b_err )
        {
            // If both channels are being read we need to make sure that one socket buffer
            // doesn't fill up whilst we are waiting for data on the other (causing a deadlock).
            // Hence we need to use select.
            // Once one or other of the channels has reached EOF (or given an error) go back
            // to the usual mechanism.
            int fds_ready = 1;
            fd_set rfds;
            int max_fd = 0;
            if ( b_out )
            {
                fcntl( out[ 0 ], F_SETFL, O_NONBLOCK );
                if ( out[ 0 ] > max_fd )
                    max_fd = out[ 0 ];
                delete outnot;
                outnot = 0;
            }
            if ( b_err )
            {
                fcntl( err[ 0 ], F_SETFL, O_NONBLOCK );
                if ( err[ 0 ] > max_fd )
                    max_fd = err[ 0 ];
                delete errnot;
                errnot = 0;
            }
            while ( b_out || b_err )
            {
                // * If the process is still running we block until we
                // receive data. (p_timeout = 0, no timeout)
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index c12e138..4f9b504 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -1,152 +1,152 @@
 /*
                             This file is part of the Opie Project
                             Copyright (C) The Main Author <main-author@whereever.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.
 */
 /*
 * =====================================================================
 * ToDo: XML-Backend: Automatic reload if something was changed...
 *
 *
 */
 #include "ocontactaccess.h"
 #include "obackendfactory.h"
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qlist.h>
 #include <qcopchannel_qws.h>
 //#include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <opie2/ocontactaccessbackend_xml.h>
 namespace Opie {
 OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
                         OPimContactAccessBackend* end, bool autosync ):
        OPimAccessTemplate<OPimContact>( end )
 {
        /* take care of the backend. If there is no one defined, we
         * will use the XML-Backend as default (until we have a cute SQL-Backend..).
         */
        if( end == 0 ) {
                qWarning ("Using BackendFactory !");
                end = OBackendFactory<OPimContactAccessBackend>::Default( "contact", appname );
        }
        // Set backend locally and in template
        m_backEnd = end;
        OPimAccessTemplate<OPimContact>::setBackEnd (end);
        /* Connect signal of external db change to function */
        QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
-        connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)),
+        connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
-               this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+               this, SLOT(copMessage(const QCString&,const QByteArray&)) );
        if ( autosync ){
                QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
-                connect( syncchannel, SIGNAL(received(const QCString &, const QByteArray &)),
+                connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
-                         this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+                         this, SLOT(copMessage(const QCString&,const QByteArray&)) );
        }
 }
 OPimContactAccess::~OPimContactAccess ()
 {
        /* The user may forget to save the changed database, therefore try to
         * do it for him..
         */
        save();
        // delete m_backEnd; is done by template..
 }
 bool OPimContactAccess::save ()
 {
        /* If the database was changed externally, we could not save the
         * Data. This will remove added items which is unacceptable !
         * Therefore: Reload database and merge the data...
         */
        if ( OPimAccessTemplate<OPimContact>::wasChangedExternally() )
                reload();
        bool status = OPimAccessTemplate<OPimContact>::save();
        if ( !status ) return false;
        /* Now tell everyone that new data is available.
         */
        QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" );
        return true;
 }
 const uint OPimContactAccess::querySettings()
 {
        return ( m_backEnd->querySettings() );
 }
 bool OPimContactAccess::hasQuerySettings ( int querySettings ) const
 {
        return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
 OPimRecordList<OPimContact> OPimContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
 {
        QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
        return ( OPimRecordList<OPimContact>(matchingContacts, this) );
 }
 bool OPimContactAccess::wasChangedExternally()const
 {
        return ( m_backEnd->wasChangedExternally() );
 }
 void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
        if ( msg == "addressbookUpdated()" ){
                qWarning ("OPimContactAccess: Received addressbokUpdated()");
                emit signalChanged ( this );
        } else if ( msg == "flush()" ) {
                qWarning ("OPimContactAccess: Received flush()");
                save ();
        } else if ( msg == "reload()" ) {
                qWarning ("OPimContactAccess: Received reload()");
                reload ();
                emit signalChanged ( this );
        }
 }
 }
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index 10ed743..40dc297 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -1,149 +1,149 @@
 /*
                             This file is part of the Opie Project
                             Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
              =.             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.
 */
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qcopchannel_qws.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/opimresolver.h>
 #include "opimmainwindow.h"
 namespace Opie {
 OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent,
                                const char* name, WFlags flag )
    : QMainWindow( parent, name, flag ), m_rtti(-1), m_service( service ), m_fallBack(0l) {
    /*
     * let's generate our QCopChannel
     */
    m_str = QString("QPE/"+m_service).local8Bit();
    m_channel= new QCopChannel(m_str, this );
-    connect(m_channel, SIGNAL(received(const QCString&, const QByteArray& ) ),
+    connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
-    connect(qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ),
+    connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
    /* connect flush and reload */
    connect(qApp, SIGNAL(flush() ),
            this, SLOT(flush() ) );
    connect(qApp, SIGNAL(reload() ),
            this, SLOT(reload() ) );
 }
 OPimMainWindow::~OPimMainWindow() {
    delete m_channel;
 }
 QCopChannel* OPimMainWindow::channel() {
    return m_channel;
 }
 void OPimMainWindow::doSetDocument( const QString&  ) {
 }
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
    bool needShow = false;
    /*
     * create demands to create
     * a new record...
     */
    QDataStream stream(array, IO_ReadOnly);
    if ( cmd == "create()" ) {
        raise();
        int uid = create();
        QCopEnvelope e(m_str, "created(int)" );
        e << uid;
        needShow = true;
    }else if ( cmd == "remove(int)" ) {
        int uid;
        stream >> uid;
        bool rem = remove( uid );
        QCopEnvelope e(m_str, "removed(bool)" );
        e << rem;
        needShow = true;
    }else if ( cmd == "beam(int)" ) {
        int uid;
        stream >> uid;
        beam( uid);
    }else if ( cmd == "show(int)" ) {
        raise();
        int uid;
        stream >> uid;
        show( uid );
        needShow = true;
    }else if ( cmd == "edit(int)" ) {
        raise();
        int uid;
        stream >> uid;
        edit( uid );
    }else if ( cmd == "add(int,QByteArray)" ) {
        int rtti;
        QByteArray array;
        stream >> rtti;
        stream >> array;
        m_fallBack = record(rtti, array );
        if (!m_fallBack) return;
        add( *m_fallBack );
        delete m_fallBack;
    }else if ( cmd == "alarm(QDateTime,int)" ) {
        raise();
        QDateTime dt; int uid;
        stream >> dt;
        stream >> uid;
        qWarning(" Date: %s Uid: %d", dt.toString().latin1(), uid );
        QDateTime current = QDateTime::currentDateTime();
        if ( current.time().hour() != dt.time().hour() && current.time().minute() != dt.time().minute() )
            return;
        doAlarm( dt,  uid );
        needShow = true;
    }
    if (needShow )
        QPEApplication::setKeepRunning();
 }
 /* implement the url scripting here */
 void OPimMainWindow::setDocument( const QString& str) {
    doSetDocument( str );
 }
 /*
 * we now try to get the array demarshalled
 * check if the rtti matches this one
 */
 OPimRecord* OPimMainWindow::record( int rtti,  const QByteArray& array ) {
    if ( service() != rtti )
        return 0l;
    OPimRecord* record = OPimResolver::self()->record( rtti );
    QDataStream str(array, IO_ReadOnly );
    if ( !record || !record->loadFromStream(str) ) {
        delete record;
        record = 0l;
    }
    return record;
diff --git a/libopie2/opiepim/ui/opimrecurrencewidget.cpp b/libopie2/opiepim/ui/opimrecurrencewidget.cpp
index 569bdd5..90c1a5f 100644
--- a/libopie2/opiepim/ui/opimrecurrencewidget.cpp
+++ b/libopie2/opiepim/ui/opimrecurrencewidget.cpp
@@ -459,176 +459,176 @@ void OPimRecurrenceWidget::setupDaily() {
    spinFreq->setValue( 1 );
    lblFreq->setText( tr("day(s)") );
    lblVar2->show();
    showRepeatStuff();
    lblRepeat->setText( strDayTemplate );
    setupRepeatLabel( 1 );
 }
 void OPimRecurrenceWidget::setupWeekly() {
 // reshow the buttons...
    fraExtra->setTitle( tr("Repeat On") );
    fraExtra->setExclusive( FALSE );
    fraExtra->show();
    if ( startWeekOnMonday ) {
        cmdExtra1->setText( tr("Mon") );
        cmdExtra2->setText( tr("Tue") );
        cmdExtra3->setText( tr("Wed") );
        cmdExtra4->setText( tr("Thu") );
        cmdExtra5->setText( tr("Fri") );
        cmdExtra6->setText( tr("Sat") );
        cmdExtra7->setText( tr("Sun") );
    } else {
        cmdExtra1->setText( tr("Sun") );
        cmdExtra2->setText( tr("Mon") );
        cmdExtra3->setText( tr("Tue") );
        cmdExtra4->setText( tr("Wed") );
        cmdExtra5->setText( tr("Thu") );
        cmdExtra6->setText( tr("Fri") );
        cmdExtra7->setText( tr("Sat") );
    }
    // I hope clustering these improve performance....
    cmdExtra1->setOn( FALSE );
    cmdExtra2->setOn( FALSE );
    cmdExtra3->setOn( FALSE );
    cmdExtra4->setOn( FALSE );
    cmdExtra5->setOn( FALSE );
    cmdExtra6->setOn( FALSE );
    cmdExtra7->setOn( FALSE );
    cmdExtra1->show();
    cmdExtra2->show();
    cmdExtra3->show();
    cmdExtra4->show();
    cmdExtra5->show();
    cmdExtra6->show();
    cmdExtra7->show();
    lblWeekVar->show();
    spinFreq->setValue( 1 );
    // might as well set the day too...
    if ( startWeekOnMonday ) {
        fraExtra->setButton( start.dayOfWeek() - 1 );
    } else {
        fraExtra->setButton( start.dayOfWeek() % 7 );
    }
    lblFreq->setText( tr("week(s)") );
    lblVar2->show();
    showRepeatStuff();
    setupRepeatLabel( 1 );
 }
 void OPimRecurrenceWidget::setupMonthly() {
    hideExtras();
    lblWeekVar->hide();
    fraExtra->setTitle( tr("Repeat By") );
    fraExtra->setExclusive( TRUE );
    fraExtra->show();
    cmdExtra1->setText( tr("Day") );
    cmdExtra1->show();
    cmdExtra2->setText( tr("Date") );
    cmdExtra2->show();
    spinFreq->setValue( 1 );
    lblFreq->setText( tr("month(s)") );
    lblVar2->show();
    showRepeatStuff();
    setupRepeatLabel( 1 );
 }
 void OPimRecurrenceWidget::setupYearly() {
 hideExtras();
    lblWeekVar->hide();
    spinFreq->setValue( 1 );
    lblFreq->setText( tr("year(s)") );
    lblFreq->show();
    lblFreq->show();
    showRepeatStuff();
    lblVar2->show();
    QString strEvery = strYearTemplate.arg( start.monthName(start.month()) ).arg( numberPlacing(start.day()) );
    lblRepeat->setText( strEvery );
    setupRepeatLabel( 1 );
 }
 void OPimRecurrenceWidget::init() {
 QPopupMenu *m1 = new QPopupMenu( this );
    repeatPicker = new DateBookMonth( m1, 0, TRUE );
    m1->insertItem( repeatPicker );
    cmdEnd->setPopup( m1 );
    cmdEnd->setPopupDelay( 0 );
-    QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)),
+    QObject::connect( repeatPicker, SIGNAL(dateClicked(int,int,int)),
-                      this, SLOT(endDateChanged(int, int, int)) );
+                      this, SLOT(endDateChanged(int,int,int)) );
    QObject::connect( qApp, SIGNAL(weekChanged(bool)),
                      this, SLOT(slotChangeStartOfWeek(bool)) );
    listRTypeButtons.setAutoDelete( TRUE );
    listRTypeButtons.append( cmdNone );
    listRTypeButtons.append( cmdDay );
    listRTypeButtons.append( cmdWeek );
    listRTypeButtons.append( cmdMonth );
    listRTypeButtons.append( cmdYear );
    listExtra.setAutoDelete( TRUE );
    listExtra.append( cmdExtra1 );
    listExtra.append( cmdExtra2 );
    listExtra.append( cmdExtra3 );
    listExtra.append( cmdExtra4 );
    listExtra.append( cmdExtra5 );
    listExtra.append( cmdExtra6 );
    listExtra.append( cmdExtra7 );
 }
 void OPimRecurrenceWidget::hideExtras() {
      // hide the extra buttons...
    fraExtra->hide();
    chkNoEnd->hide();
    QListIterator<QToolButton> it( listExtra );
    for ( ; *it; ++it ) {
        (*it)->hide();
        (*it)->setOn( FALSE );
    }
 }
 void OPimRecurrenceWidget::showRepeatStuff() {
    cmdEnd->show();
    chkNoEnd->show();
    lblFreq->show();
    lblEvery->show();
    lblFreq->show();
    spinFreq->show();
    lblEnd->show();
    lblRepeat->setText( tr("Every") );
 }
 static int week( const QDate &start )
 {
    // figure out the week...
    int stop = start.day(),
        sentinel = start.dayOfWeek(),
        dayOfWeek = QDate( start.year(), start.month(), 1 ).dayOfWeek(),
        week = 1,
        i;
    for ( i = 1; i < stop; i++ ) {
        if ( dayOfWeek++ == sentinel )
            week++;
        if ( dayOfWeek > 7 )
            dayOfWeek = 0;
    }
    return week;
 }
 static QString numberPlacing( int x )
 {
    // I hope this works in other languages besides english...
    QString str = QString::number( x );
    switch ( x % 10 ) {
        case 1:
            str += QWidget::tr( "st" );
            break;
        case 2:
            str += QWidget::tr( "nd" );
            break;
        case 3:
            str += QWidget::tr( "rd" );
            break;
        default:
            str += QWidget::tr( "th" );
            break;
    }
    return str;
 }
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index 2a89c5d..e7daead 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -18,194 +18,194 @@
 ++= � -. � � .` � � .:       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/ofiledialog.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 /* QT */
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qlayout.h>
 using namespace Opie;
 namespace
 {
 /*
 * helper functions to load the start dir
 * and to save it
 * helper to extract the dir out of a file name
 */
 /**
 * This method will use Config( argv[0] );
 * @param key The group key used
 */
 QString lastUsedDir( const QString& key )
 {
    if ( qApp->argc() < 1 )
        return QString::null;
    Config cfg( QFileInfo(qApp->argv()[0]).fileName() ); // appname
    cfg.setGroup( key );
    return cfg.readEntry("LastDir", QPEApplication::documentDir() );
 }
 void saveLastDir( const QString& key, const QString& file )
 {
    if ( qApp->argc() < 1 )
        return;
    Config cfg(  QFileInfo(qApp->argv()[0]).fileName() );
    cfg.setGroup( key );
    QFileInfo inf( file );
    cfg.writeEntry("LastDir", inf.dirPath( true ) );
 }
 };
 /**
 * This constructs a modal dialog
 *
 * @param caption The caption of the dialog
 * @param wid The parent widget
 * @param mode The mode of the OFileSelector @see OFileSelector
 * @param selector The selector of the OFileSelector
 * @param dirName the dir or resource to start from
 * @param fileName  a proposed or existing filename
 * @param mimetypes The mimeTypes
 */
 OFileDialog::OFileDialog(const QString &caption,
                         QWidget *wid, int mode, int selector,
                         const QString &dirName,
                         const QString &fileName,
                         const QMap<QString,QStringList>& mimetypes )
        : QDialog( wid, "OFileDialog", true )
 {
    //  QVBoxLayout *lay = new QVBoxLayout(this);
    //showMaximized();
    QVBoxLayout *lay = new QVBoxLayout(this );
    file = new OFileSelector(this , mode, selector,
                             dirName, fileName,
                             mimetypes );
    lay->addWidget( file );
    //lay->addWidget( file );
    //showFullScreen();
    setCaption( caption.isEmpty() ? tr("FileDialog") : caption );
    connect(file, SIGNAL(fileSelected(const QString&) ),
            this, SLOT(slotFileSelected(const QString&) ) );
    connect(file, SIGNAL(ok() ),
            this, SLOT(slotSelectorOk()) ) ;
    connect(file, SIGNAL(dirSelected(const QString&) ), this, SLOT(slotDirSelected(const QString&) ) );
 #if 0
-    connect(file, SIGNAL(dirSelected(const QString &) ),
+    connect(file, SIGNAL(dirSelected(const QString&) ),
-            this, SLOT(slotDirSelected(const QString &) ) );
+            this, SLOT(slotDirSelected(const QString&) ) );
 #endif
 }
 /**
 * @returns the mimetype of the selected
 * currently it return QString::null
 */
 QString OFileDialog::mimetype()const
 {
    return QString::null;
 }
 /**
 * @return the fileName
 */
 QString OFileDialog::fileName()const
 {
    return file->selectedName();
 }
 /**
 * return a DocLnk to the current file
 */
 DocLnk OFileDialog::selectedDocument()const
 {
    return file->selectedDocument();
 }
 /**
 * This opens up a filedialog in Open mode
 *
 * @param selector the Selector Mode
 * @param startDir Where to start from
 * @param file A proposed filename
 * @param mimes A list of MimeTypes
 * @param wid the parent
 * @param caption of the dialog if QString::null tr("Open") will be used
 * @return the fileName or QString::null
 */
 QString OFileDialog::getOpenFileName(int selector,
                                     const QString &_startDir,
                                     const QString &file,
                                     const MimeTypes &mimes,
                                     QWidget *wid,
                                     const QString &caption )
 {
    QString ret;
    QString startDir = _startDir;
    if (startDir.isEmpty() )
        startDir = lastUsedDir( "FileDialog-OPEN" );
    OFileDialog dlg( caption.isEmpty() ? tr("Open") : caption,
                     wid, OFileSelector::Open, selector, startDir, file, mimes);
    dlg.showMaximized();
    if( dlg.exec() )
    {
        ret = dlg.fileName();
        saveLastDir( "FileDialog-OPEN", ret );
    }
    return ret;
 }
 /**
 * This opens up a file dialog in save mode
 * @see getOpenFileName
 */
 QString OFileDialog::getSaveFileName(int selector,
                                     const QString &_startDir,
                                     const QString &file,
                                     const MimeTypes &mimes,
                                     QWidget *wid,
                                     const QString &caption )
 {
    QString ret;
    QString startDir = _startDir;
    if (startDir.isEmpty() )
        startDir = lastUsedDir( "FileDialog-SAVE" );
    OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption,
                     wid, OFileSelector::Save, selector, startDir, file, mimes);
    dlg.showMaximized();
    if( dlg.exec() )
    {
        ret = dlg.fileName();
        saveLastDir( "FileDialog-SAVE", ret );
    }
    return ret;
 }
 void OFileDialog::slotFileSelected(const QString & )
 {
    accept();
 }
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index 600daff..15cadd4 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -117,198 +117,198 @@ void OFileViewInterface::ok()
 void OFileViewInterface::cancel()
 {
    emit selector()->cancel();
 }
 void OFileViewInterface::closeMe()
 {
    emit selector()->closeMe();
 }
 void OFileViewInterface::fileSelected( const QString& str)
 {
    emit selector()->fileSelected( str);
 }
 void OFileViewInterface::fileSelected( const DocLnk& lnk)
 {
    emit selector()->fileSelected( lnk );
 }
 void OFileViewInterface::setCurrentFileName( const QString& str )
 {
    selector()->m_lneEdit->setText( str );
 }
 QString OFileViewInterface::currentFileName()const
 {
    return selector()->m_lneEdit->text();
 }
 QString OFileViewInterface::startDirectory()const
 {
    return selector()->m_startDir;
 }
 ODocumentFileView::ODocumentFileView( OFileSelector* selector )
                  :OFileViewInterface( selector )
 {
    m_selector = 0;
    setName( QObject::tr("Documents") );
 }
 ODocumentFileView::~ODocumentFileView()
 {
 }
 QString ODocumentFileView::selectedName()const
 {
    if (!m_selector)
        return QString::null;
    return m_selector->selectedDocument().file();
 }
 QString ODocumentFileView::selectedPath()const
 {
    return QPEApplication::documentDir();
 }
 QString ODocumentFileView::directory()const
 {
    return selectedPath();
 }
 void ODocumentFileView::reread()
 {
    if (!m_selector)
        return;
    m_selector->setNewVisible( showNew() );
    m_selector->setCloseVisible( showClose() );
    m_selector->filter = currentMimeType().join(";");
    m_selector->reread();
 }
 int ODocumentFileView::fileCount()const
 {
    if (!m_selector)
        return -1;
    return m_selector->fileCount();
 }
 DocLnk ODocumentFileView::selectedDocument()const
 {
    if (!m_selector)
        return DocLnk();
    return m_selector->selectedDocument();
 }
 QWidget* ODocumentFileView::widget( QWidget* parent )
 {
    if (!m_selector )
    {
        m_selector = new FileSelector(currentMimeType().join(";"), parent, "fileselector", showNew(), showClose() );
-        QObject::connect(m_selector, SIGNAL(fileSelected( const DocLnk& ) ),
+        QObject::connect(m_selector, SIGNAL(fileSelected(const DocLnk&) ),
                         selector(), SLOT(slotDocLnkBridge(const DocLnk&) ) );
        QObject::connect(m_selector, SIGNAL(closeMe() ),
                         selector(), SIGNAL(closeMe() ) );
-        QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk& ) ),
+        QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk&) ),
-                         selector(), SIGNAL(newSelected(const DocLnk& ) ) );
+                         selector(), SIGNAL(newSelected(const DocLnk&) ) );
    }
    return m_selector;
 }
 /*
 * This is the file system view used
 * we use a QListView + QListViewItems for it
 */
 OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap,
                                      const QString& path, const QString& date,
                                      const QString& size, const QString& dir,
                                      bool isLocked, bool isDir )
        : QListViewItem( view )
 {
    setPixmap(0, pixmap );
    setText(1, path );
    setText(2, size );
    setText(3, date );
    m_isDir = isDir;
    m_dir = dir;
    m_locked = isLocked;
 }
 OFileSelectorItem::~OFileSelectorItem()
 {
 }
 bool OFileSelectorItem::isLocked()const
 {
    return m_locked;
 }
 QString OFileSelectorItem::directory()const
 {
    return m_dir;
 }
 bool OFileSelectorItem::isDir()const
 {
    return m_isDir;
 }
 QString OFileSelectorItem::path()const
 {
    return text( 1 );
 }
 QString OFileSelectorItem::key( int id, bool )const
 {
    QString ke;
    if( id == 0 || id == 1 )
    { // name
        if( m_isDir )
        {
            ke.append("0" );
            ke.append( text(1) );
        }
        else
        {
            ke.append("1" );
            ke.append( text(1) );
        }
        return ke;
    }
    else
        return text( id );
 }
 OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& startDir, OFileSelector* sel)
                      :QWidget( parent ), m_sel( sel )
 {
    m_all = false;
    QVBoxLayout* lay = new QVBoxLayout( this );
    m_currentDir = startDir;
    /*
     * now we add a special bar
     * One Button For Up
     * Home
     * Doc
     * And a dropdown menu with FileSystems
     * FUTURE: one to change dir with lineedit
     * Bookmarks
     * Create Dir
     */
    QHBox* box = new QHBox(this );
    box->setBackgroundMode( PaletteButton );
    box->setSpacing( 0 );
    QToolButton *btn = new QToolButton( box );
    btn->setIconSet( Resource::loadIconSet("up") );
    connect(btn, SIGNAL(clicked() ),
            this, SLOT( cdUP() ) );
@@ -431,194 +431,194 @@ void OFileViewFileListView::reread( bool all )
    const QFileInfoList *list = dir.entryInfoList();
    if (!list)
    {
        cdUP();
        return;
    }
    QFileInfoListIterator it( *list );
    QFileInfo *fi;
    while( (fi=it.current() ) )
    {
        if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") )
        {
            ++it;
            continue;
        }
        /*
         * It is a symlink we try to resolve it now but don't let us attack by DOS
         *
         */
        if( fi->isSymLink() )
        {
            QString file = fi->dirPath( true ) + "/" + fi->readLink();
            for( int i = 0; i<=4; i++)
            { // 5 tries to prevent dos
                QFileInfo info( file );
                if( !info.exists() )
                {
                    addSymlink( fi, TRUE );
                    break;
                }
                else if( info.isDir() )
                {
                    addDir( fi, TRUE );
                    break;
                }
                else if( info.isFile() )
                {
                    addFile( fi, TRUE );
                    break;
                }
                else if( info.isSymLink() )
                {
                    file = info.dirPath(true ) + "/" + info.readLink() ;
                    break;
                }
                else if( i == 4)
                { // couldn't resolve symlink add it as symlink
                    addSymlink( fi );
                }
            } // off for loop for symlink resolving
        }
        else if( fi->isDir() )
            addDir(  fi );
        else if( fi->isFile() )
            addFile( fi );
        ++it;
    } // of while loop
    m_view->sort();
 }
 int OFileViewFileListView::fileCount()const
 {
    return m_view->childCount();
 }
 QString OFileViewFileListView::currentDir()const
 {
    return m_currentDir;
 }
 OFileSelector* OFileViewFileListView::selector()
 {
    return m_sel;
 }
 bool OFileViewFileListView::eventFilter (QObject *o, QEvent *e)
 {
    if ( e->type() == QEvent::KeyPress )
    {
        QKeyEvent *k = (QKeyEvent *)e;
        if ( (k->key()==Key_Enter) || (k->key()==Key_Return))
        {
            slotClicked( Qt::LeftButton,m_view->currentItem(),QPoint(0,0),0);
            return true;
        }
    }
    return false;
 }
 void OFileViewFileListView::connectSlots()
 {
    connect(m_view, SIGNAL(clicked(QListViewItem*) ),
            this, SLOT(slotCurrentChanged(QListViewItem*) ) );
-    connect(m_view, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint&, int ) ),
+    connect(m_view, SIGNAL(mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),
-            this, SLOT(slotClicked(int, QListViewItem*, const QPoint&, int ) ) );
+            this, SLOT(slotClicked(int,QListViewItem*,const QPoint&,int) ) );
 }
 void OFileViewFileListView::slotCurrentChanged( QListViewItem* item)
 {
    if (!item)
        return;
 #if 0
    OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
    if (!sel->isDir() )
    {
        selector()->m_lneEdit->setText( sel->text(1) );
        // if in fileselector mode we will emit selected
        if ( selector()->mode() == OFileSelector::FileSelector )
        {
            qWarning("slot Current Changed");
            QStringList str = QStringList::split("->", sel->text(1) );
            QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
            emit selector()->fileSelected( path );
            DocLnk lnk( path );
            emit selector()->fileSelected( lnk );
        }
    }
 #endif
 }
 void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const QPoint&, int )
 {
    if (!item || ( button != Qt::LeftButton) )
        return;
    OFileSelectorItem *sel = static_cast<OFileSelectorItem*>(item);
    if (!sel->isLocked() )
    {
        QStringList str = QStringList::split("->", sel->text(1) );
        if (sel->isDir() )
        {
            m_currentDir = sel->directory() + "/" + str[0].stripWhiteSpace();
            emit selector()->dirSelected( m_currentDir );
            reread( m_all );
        }
        else
        { // file
            qWarning("slot Clicked");
            selector()->m_lneEdit->setText( str[0].stripWhiteSpace() );
            QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
            emit selector()->fileSelected( path );
            DocLnk lnk( path );
            emit selector()->fileSelected( lnk );
        }
    } // not locked
 }
 void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
 {
    MimeType type( info->absFilePath() );
    if (!compliesMime( type.id() ) )
        return;
    QPixmap pix = type.pixmap();
    QString dir, name; bool locked;
    if ( pix.isNull() )
    {
        QWMatrix matrix;
        QPixmap pixer(Resource::loadPixmap("UnknownDocument") );
        matrix.scale( .4, .4 );
        pix = pixer.xForm( matrix );
    }
    dir = info->dirPath( true );
    locked = false;
    if ( symlink )
        name = info->fileName() + " -> " + info->dirPath() + "/" + info->readLink();
    else
    {
        name = info->fileName();
        if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) ||
                ( (selector()->mode() == OFileSelector::Save)&& !info->isWritable() ) )
        {
            locked = true; pix = Resource::loadPixmap("locked");
        }
    }
    (void)new OFileSelectorItem( m_view, pix, name,
                                 info->lastModified().toString(), QString::number( info->size() ),
                                 dir, locked );
 }
 void OFileViewFileListView::addDir( QFileInfo* info, bool symlink )
 {
    bool locked = false; QString name; QPixmap pix;
    if ( ( ( selector()->mode() == OFileSelector::Open )  && !info->isReadable() ) ||
            ( ( selector()->mode() == OFileSelector::Save )  && !info->isWritable() ) )
    {
        locked = true;
        if ( symlink )
@@ -886,194 +886,194 @@ OFileSelector::OFileSelector( QWidget* parent, int mode, int sel,
 * This a convience c'tor to just substitute the use of FileSelector
 */
 OFileSelector::OFileSelector( const QString& mimeFilter, QWidget* parent, const char* name,
                              bool showNew, bool showClose )
        : QWidget( parent, name )
 {
    m_current = 0;
    m_shNew   = showNew;
    m_shClose = showClose;
    m_startDir = QPEApplication::documentDir();
    if (!mimeFilter.isEmpty() )
        m_mimeType.insert(mimeFilter, QStringList::split(";", mimeFilter ) );
    m_mode = OFileSelector::FileSelector;
    m_selector = OFileSelector::Normal;
    initUI();
    initMime();
    initViews();
    m_cmbView->setCurrentItem( 0 );
    slotViewChange( QObject::tr("Documents") );
 }
 /*
 * INIT UI will set up the basic GUI
 * Layout: Simple VBoxLayout
 * On top a WidgetStack containing the Views...
 *  - List View
 *  - Document View
 * Below we will have a Label + LineEdit
 * Below we will have two ComoBoxes one for choosing the view one for
 *       choosing the mimetype
 */
 void OFileSelector::initUI()
 {
    QVBoxLayout* lay = new QVBoxLayout( this );
    m_stack = new QWidgetStack( this );
    lay->addWidget( m_stack, 1000 );
    m_nameBox = new QHBox( this );
    (void)new QLabel( tr("Name:"), m_nameBox );
    m_lneEdit = new QLineEdit( m_nameBox );
    m_lneEdit ->installEventFilter(this);
    lay->addWidget( m_nameBox );
    m_cmbBox = new QHBox( this );
    m_cmbView = new QComboBox( m_cmbBox );
    m_cmbMime = new QComboBox( m_cmbBox );
    lay->addWidget( m_cmbBox );
 }
 /*
 * This will make sure that the return key in the name edit causes dialogs to close
 */
 bool OFileSelector::eventFilter (QObject *o, QEvent *e)
 {
    if ( e->type() == QEvent::KeyPress )
    {
        QKeyEvent *k = (QKeyEvent *)e;
        if ( (k->key()==Key_Enter) || (k->key()==Key_Return))
        {
            emit ok();
            return true;
        }
    }
    return false;
 }
 /*
 * This will insert the MimeTypes into the Combo Box
 * And also connect the changed signal
 *
 * AutoMimeTyping is disabled for now. It used to reparse a dir and then set available mimetypes
 */
 void OFileSelector::initMime()
 {
    MimeTypes::Iterator it;
    for ( it = m_mimeType.begin(); it != m_mimeType.end(); ++it )
    {
        m_cmbMime->insertItem( it.key() );
    }
    m_cmbMime->setCurrentItem( 0 );
    connect( m_cmbMime, SIGNAL(activated(int) ),
             this, SLOT(slotMimeTypeChanged() ) );
 }
 void OFileSelector::initViews()
 {
    m_cmbView->insertItem( QObject::tr("Documents") );
    m_cmbView->insertItem( QObject::tr("Files") );
    m_cmbView->insertItem( QObject::tr("All Files") );
-    connect(m_cmbView, SIGNAL(activated( const QString& ) ),
+    connect(m_cmbView, SIGNAL(activated(const QString&) ),
-            this, SLOT(slotViewChange( const QString& ) ) );
+            this, SLOT(slotViewChange(const QString&) ) );
    m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) );
    /* see above why add both */
    OFileViewInterface* in = new OFileViewFileSystem( this );
    m_views.insert( QObject::tr("Files"), in );
    m_views.insert( QObject::tr("All Files"), in );
 }
 /**
 * d'tor
 */
 OFileSelector::~OFileSelector()
 {
 }
 /**
 * Convience function for the fileselector
 * make sure to delete the DocLnk
 *
 * @see DocLnk
 * @todo remove in ODP
 */
 const DocLnk* OFileSelector::selected()
 {
    DocLnk* lnk = new DocLnk( currentView()->selectedDocument() );
    return lnk;
 }
 /**
 *
 * @return the name of the selected file
 */
 QString OFileSelector::selectedName()const
 {
    return currentView()->selectedName();
 }
 /**
 * @return the selected path
 */
 QString OFileSelector::selectedPath()const
 {
    return currentView()->selectedPath();
 }
 /**
 * @return the directory name
 */
 QString OFileSelector::directory()const
 {
    return currentView()->directory();
 }
 /**
 * @return a DocLnk for the selected document
 */
 DocLnk OFileSelector::selectedDocument()const
 {
    return currentView()->selectedDocument();
 }
 /**
 * @return the number of items for the current view
 */
 int OFileSelector::fileCount()const
 {
    return currentView()->fileCount();
 }
 /**
 * @return  reparse the file content
 */
 void OFileSelector::reread()
 {
    return currentView()->reread();
 }
 OFileViewInterface* OFileSelector::currentView()const
 {
    return m_current;
 }
 bool OFileSelector::showNew()const
 {
    return m_shNew;
 }
 bool OFileSelector::showClose()const
 {
    return m_shClose;
 }
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index 49ddeb6..f93781f 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -39,207 +39,207 @@
 #include <qmultilineedit.h>
 using namespace Opie;
 namespace Opie
 {
 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;
 };
 };
 namespace
 {
 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;
 };
 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 ) ) );
+    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 ) ) );
+    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 ) ),
+    connect( d->m_font_size_list, SIGNAL(  activated(int) ),
-             this, SLOT( fontSizeClicked( 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 )
 {
    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
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp
index ec6af9d..f47c90b 100644
--- a/libopie2/opieui/otabwidget.cpp
+++ b/libopie2/opieui/otabwidget.cpp
@@ -1,177 +1,177 @@
 /*
 � � � � � � � �             This file is part of the Opie Project
 � � � � � � �                Copyright (c)  2002 Dan Williams <williamsdr@acm.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 <opie2/otabwidget.h>
 /* OPIE */
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <opie2/otabbar.h>
 /* QT */
 #include <qcombobox.h>
 #include <qwidgetstack.h>
 using namespace Opie;
 OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p )
        : QWidget( parent, name )
 {
    if ( s == Global )
    {
        Config config( "qpe" );
        config.setGroup( "Appearance" );
        s = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab );
        if ( s <= Global || s > IconList)
        {
            s = IconTab;
        }
        QString pos = config.readEntry( "TabPosition", "Top");
        if ( pos == "Bottom" )
        {
            p = Bottom;
        }
        else
        {
            p = Top;
        }
    }
    widgetStack = new QWidgetStack( this, "widgetstack" );
    widgetStack->setFrameStyle( QFrame::NoFrame );
    widgetStack->setLineWidth( style().defaultFrameWidth() );
    tabBarStack = new QWidgetStack( this, "tabbarstack" );
    tabBar = new OTabBar( tabBarStack, "tabbar" );
    tabBarStack->addWidget( tabBar, 0 );
-    connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
+    connect( tabBar, SIGNAL( selected(int) ), this, SLOT( slotTabBarSelected(int) ) );
    tabList = new QComboBox( false, tabBarStack, "tablist" );
    tabBarStack->addWidget( tabList, 1 );
-    connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
+    connect( tabList, SIGNAL( activated(int) ), this, SLOT( slotTabListSelected(int) ) );
    tabBarPosition = p;
    setTabStyle( s );
    setTabPosition( p );
    currTab= 0x0;
 }
 OTabWidget::~OTabWidget()
 {}
 void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label )
 {
    QPixmap iconset = loadSmooth( icon );
    QTab *tab = new QTab();
    if ( tabBarStyle == IconTab )
    {
        tab->label = QString::null;
    }
    else
    {
        tab->label = label;
    }
    if ( tabBarStyle == IconTab || tabBarStyle == IconList )
    {
        tab->iconset = new QIconSet( iconset );
    }
    int tabid = tabBar->addTab( tab );
    if ( tabBarStyle == IconTab || tabBarStyle == IconList )
    {
        tabList->insertItem( iconset, label, -1 );
    }
    else
    {
        tabList->insertItem( label );
    }
    widgetStack->addWidget( child, tabid );
    widgetStack->raiseWidget( child );
    widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised );
    OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label );
    tabs.append( tabinfo );
    selectTab( tabinfo );
 }
 void OTabWidget::removePage( QWidget *childwidget )
 {
    if ( childwidget )
    {
        OTabInfo *tab = tabs.first();
        while ( tab && tab->control() != childwidget )
        {
            tab = tabs.next();
        }
        if ( tab && tab->control() == childwidget )
        {
            tabBar->setTabEnabled( tab->id(), FALSE );
            tabBar->removeTab( tabBar->tab( tab->id() ) );
            int i = 0;
            while ( i < tabList->count() && tabList->text( i ) != tab->label() )
            {
                i++;
            }
            if ( tabList->text( i ) == tab->label() )
            {
                tabList->removeItem( i );
            }
            widgetStack->removeWidget( childwidget );
            tabs.remove( tab );
            delete tab;
            currTab = tabs.current();
            if ( !currTab )
            {
                widgetStack->setFrameStyle( QFrame::NoFrame );
            }
            setUpLayout();
        }
    }
 }
 void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QString &label)
 {
    OTabInfo *currtab = tabs.first();
    while ( currtab && currtab->control() != widget )
    {
        currtab = tabs.next();
    }
    if ( currtab && currtab->control() == widget )
    {
        QTab *tab = tabBar->tab( currtab->id() );
        QPixmap icon( loadSmooth( iconset ) );
        tab->setText( label );
diff --git a/libopie2/opieui/otimepicker.cpp b/libopie2/opieui/otimepicker.cpp
index d4712a4..66f9ce0 100644
--- a/libopie2/opieui/otimepicker.cpp
+++ b/libopie2/opieui/otimepicker.cpp
@@ -128,165 +128,165 @@ void OTimePicker::slotHour(bool b)
 void OTimePicker::slotMinute(bool b)
 {
    OClickableLabel *r = (OClickableLabel *) sender();
    if (b)
    {
        QValueListIterator<OClickableLabel *> it;
        for (it=minuteLst.begin(); it!=minuteLst.end(); it++)
        {
            if (*it != r) (*it)->setOn(false);
            else tm.setHMS(tm.hour(),(*it)->text().toInt(), 0);
        }
        emit timeChanged(tm);
    }
    else
    {
        r->setOn(true);
    }
 }
 /**
 * Method to set the time. No signal gets emitted during this method call
 * Minutes must be within 5 minutes step starting at 0 ( 0,5,10,15,20... )
 * @param t The time to be set
 */
 void OTimePicker::setTime( const QTime& t)
 {
    setTime( t.hour(), t.minute() );
 }
 /**
 * Method to set the time. No signal gets emitted during this method call
 * @param h The hour
 * @param m The minute. Minutes need to set by 5 minute steps
 */
 void OTimePicker::setTime( int h,  int m )
 {
    setHour(h);
    setMinute(m);
 }
 /*
 * FIXME round minutes to the 5 minute arrangement -zecke
 */
 /**
 * Method to set the minutes
 * @param m minutes
 */
 void OTimePicker::setMinute(int m)
 {
    QString minute;
    minute.sprintf("%.2d",m);
    QValueListIterator<OClickableLabel *> it;
    for (it=minuteLst.begin(); it!=minuteLst.end(); it++)
    {
        if ((*it)->text() == minute) (*it)->setOn(true);
        else (*it)->setOn(false);
    }
    tm.setHMS(tm.hour(),m,0);
 }
 /**
 * Method to set the hour
 */
 void OTimePicker::setHour(int h)
 {
    QString hour;
    hour.sprintf("%.2d",h);
    QValueListIterator<OClickableLabel *> it;
    for (it=hourLst.begin(); it!=hourLst.end(); it++)
    {
        if ((*it)->text() == hour) (*it)->setOn(true);
        else (*it)->setOn(false);
    }
    tm.setHMS(h,tm.minute(),0);
 }
 /**
 * This is a modal Dialog.
 *
 * @param parent The parent widget
 * @param name The name of the object
 * @param fl Possible window flags
 */
 OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags fl )
        : OTimePickerDialogBase (parent , name, true , fl)
 {
-    connect ( m_timePicker, SIGNAL( timeChanged( const QTime& ) ),
+    connect ( m_timePicker, SIGNAL( timeChanged(const QTime&) ),
-              this, SLOT( setTime ( const QTime& ) ) );
+              this, SLOT( setTime(const QTime&) ) );
-    connect ( minuteField, SIGNAL( textChanged ( const QString& ) ),
+    connect ( minuteField, SIGNAL( textChanged(const QString&) ),
-              this, SLOT ( setMinute ( const QString& ) ) );
+              this, SLOT ( setMinute(const QString&) ) );
-    connect ( hourField, SIGNAL( textChanged ( const QString& ) ),
+    connect ( hourField, SIGNAL( textChanged(const QString&) ),
-              this, SLOT ( setHour ( const QString& ) ) );
+              this, SLOT ( setHour(const QString&) ) );
 }
 /**
 * @return the time
 */
 QTime OTimePickerDialog::time()const
 {
    return m_time;
 }
 /**
 * Set the time to time
 * @param time The time to be set
 */
 void OTimePickerDialog::setTime( const QTime& time )
 {
    m_time = time;
    m_timePicker->setHour ( time.hour() );
    m_timePicker->setMinute( time.minute() );
    // Set Textfields
    if ( time.hour() < 10 )
        hourField->setText( "0" + QString::number( time.hour() ) );
    else
        hourField->setText( QString::number( time.hour() ) );
    if ( time.minute() < 10 )
        minuteField->setText( "0" + QString::number( time.minute() ) );
    else
        minuteField->setText( QString::number( time.minute() ) );
 }
 /**
 * This method takes the current minute and tries to set hour
 * to hour. This succeeds if the resulting date is valid
 * @param hour The hour as a string
 */
 void OTimePickerDialog::setHour ( const QString& hour )
 {
    if ( QTime::isValid ( hour.toInt(),  m_time.minute() , 00 ) )
    {
        m_time.setHMS ( hour.toInt(),  m_time.minute() , 00 );
        setTime ( m_time );
    }
 }
 /**
 * Method to set a new minute. It tries to convert the string to int and
 * if the resulting date is valid a new date is set.
 * @see setHour
 */
 void OTimePickerDialog::setMinute ( const QString& minute )
 {
    if ( QTime::isValid ( m_time.hour(), minute.toInt(), 00 ) )
    {
        m_time.setHMS ( m_time.hour(), minute.toInt(), 00 );
        setTime ( m_time );
    }
 }
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 8839456..78154b7 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -77,238 +77,238 @@ static const char * view_icon_xpm[] = {
 "                "};
 /* XPM */
 static const char * view_tree_xpm[] = {
 "16 16 17 1",
        " c None",
        ".c #3A3A3A",
        "+c #87BD88",
        "@c #8BBE8B",
        "#c #81BA81",
        "$c #6DAF6D",
        "%c #87BD87",
        "&c #FCFDFC",
        "*c #AED0AE",
        "=c #4E9C4C",
        "-c #91BD91",
        ";c #72B172",
        ">c #448643",
        ",c #686868",
        "'c #519F50",
        ")c #499247",
        "!c #356A35",
 " .              ",
 " .              ",
 " .  +@#$        ",
 " .  %&*=        ",
 " .. #-;>  ,, ,,,",
 " .  $')!        ",
 " .              ",
 " .              ",
 " .              ",
 " .  +@#$        ",
 " .  %&*=        ",
 " .. #-;>  ,, ,,,",
 "    $')!        ",
 "                ",
 "                ",
 "                "};
 OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
               :QWidgetStack( parent, name ),
                _viewmode( mode ), _warningpolicy( None ),
                _treeleaf(), _treeopened(), _treeclosed(),
                _iconleaf(), _iconopened(), _iconclosed()
 {
    //
    // Create child widgets and set some reasonable default styles
    //
    _listview = new OListView( this, "oversatileview embedded listview" );
    _iconview = new QIconView( this, "oversatileview embedded iconview" );
    _listview->setAllColumnsShowFocus( true );
    _listview->setRootIsDecorated( true );
    _listview->setShowSortIndicator( true );
    _iconview->setGridX( 90 );
    _iconview->setGridY( 42 );
    _iconview->setAutoArrange( true );
    
    #ifdef QWS  // TODO: Let this depend on current geometry (rotation)
    _iconview->setArrangement( QIconView::TopToBottom );
    #else
    _iconview->setArrangement( QIconView::LeftToRight );
    #endif
    
    _iconview->setResizeMode( QIconView::Adjust );
    
    // qt-embedded: map stylus right on hold to right button press
    #ifdef QWS
    ( (QPEApplication*) qApp)->setStylusOperation( _iconview->viewport(), QPEApplication::RightOnHold );
    ( (QPEApplication*) qApp)->setStylusOperation( _listview->viewport(), QPEApplication::RightOnHold );
    #endif
    setViewMode( mode ); // TODO: Read last style from config
    // setSynchronization( true ); // TODO: Implement this
    // create context menu allowing to switch between the views
    _contextmenu = new QPopupMenu( 0, "oversatileview contextmenu" );
    _contextmenu->setCaption( "Style" );
    _contextmenu->setCheckable( true );
    QActionGroup* ag = new QActionGroup( _contextmenu, "style option group" );
    QAction* a1 = new QAction( "View Items in Icon Style", QIconSet( QPixmap( view_icon_xpm ) ),
                               "View Icons", 0, ag, "viewicon action", true );
    QAction* a2 = new QAction( "View Items in Tree Style", QIconSet( QPixmap( view_tree_xpm ) ),
                                "View Tree", 0, ag, "viewtree action", true );
    ag->addTo( _contextmenu );
    if ( mode == Icons )
        a1->setOn( true );
    else if ( mode == Tree )
        a2->setOn( true );
    connect( a1, SIGNAL( activated() ), this, SLOT( setIconViewMode() ) );
    connect( a2, SIGNAL( activated() ), this, SLOT( setTreeViewMode() ) );
    
    #if (QT_VERSION >= 0x030000)
-    connect( _listview, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ), this, SLOT( contextMenuRequested( QListViewItem*, const QPoint&, int ) ) );
+    connect( _listview, SIGNAL( contextMenuRequested(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
-    connect( _iconview, SIGNAL( contextMenuRequested( QIconViewItem*, const QPoint& ) ), this, SLOT( contextMenuRequested( QIconViewItem*, const QPoint& ) ) );
+    connect( _iconview, SIGNAL( contextMenuRequested(QIconViewItem*,const QPoint&) ), this, SLOT( contextMenuRequested(QIconViewItem*,const QPoint&) ) );
    #else
-    connect( _listview, SIGNAL( rightButtonPressed( QListViewItem*, const QPoint&, int ) ), this, SLOT( contextMenuRequested( QListViewItem*, const QPoint&, int ) ) );
+    connect( _listview, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
-    connect( _iconview, SIGNAL( rightButtonPressed( QIconViewItem*, const QPoint& ) ), this, SLOT( contextMenuRequested( QIconViewItem*, const QPoint& ) ) );
+    connect( _iconview, SIGNAL( rightButtonPressed(QIconViewItem*,const QPoint&) ), this, SLOT( contextMenuRequested(QIconViewItem*,const QPoint&) ) );
    #endif
        
    //
    // signal forwarders
    //
    // unfortunately we can't short-circuit all the QListView and QIconView signals
    // to OVersatileView signals, because the signal/slot mechanism doesn't allow
    // type-conversion :-(
    // common signals for listview
    
    connect( _listview, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
-    connect( _listview, SIGNAL( selectionChanged( QListViewItem * ) ), this, SLOT( selectionChanged( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( selectionChanged(QListViewItem*) ), this, SLOT( selectionChanged(QListViewItem*) ) );
-    connect( _listview, SIGNAL( currentChanged( QListViewItem * ) ), this, SLOT( currentChanged( QListViewItem * ) ) );   
+    connect( _listview, SIGNAL( currentChanged(QListViewItem*) ), this, SLOT( currentChanged(QListViewItem*) ) );   
-    connect( _listview, SIGNAL( clicked( QListViewItem * ) ), this, SLOT( clicked( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( clicked(QListViewItem*) ), this, SLOT( clicked(QListViewItem*) ) );
-    connect( _listview, SIGNAL( pressed( QListViewItem * ) ), this, SLOT( pressed( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( pressed(QListViewItem*) ), this, SLOT( pressed(QListViewItem*) ) );
    
-    connect( _listview, SIGNAL( doubleClicked( QListViewItem * ) ), this, SLOT( doubleClicked( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( doubleClicked(QListViewItem*) ) );
-    connect( _listview, SIGNAL( returnPressed( QListViewItem * ) ), this, SLOT( returnPressed( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( returnPressed(QListViewItem*) ), this, SLOT( returnPressed(QListViewItem*) ) );
    
-    connect( _listview, SIGNAL( onItem( QListViewItem * ) ), this, SLOT( onItem( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( onItem(QListViewItem*) ), this, SLOT( onItem(QListViewItem*) ) );
    connect( _listview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
    // common signals for iconview
    
    connect( _iconview, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
-    connect( _iconview, SIGNAL( selectionChanged( QIconViewItem * ) ), this, SLOT( selectionChanged( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( selectionChanged(QIconViewItem*) ), this, SLOT( selectionChanged(QIconViewItem*) ) );
-    connect( _iconview, SIGNAL( currentChanged( QIconViewItem * ) ), this, SLOT( currentChanged( QIconViewItem * ) ) );   
+    connect( _iconview, SIGNAL( currentChanged(QIconViewItem*) ), this, SLOT( currentChanged(QIconViewItem*) ) );   
-    connect( _iconview, SIGNAL( clicked( QIconViewItem * ) ), this, SLOT( clicked( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( clicked(QIconViewItem*) ), this, SLOT( clicked(QIconViewItem*) ) );
-    connect( _iconview, SIGNAL( pressed( QIconViewItem * ) ), this, SLOT( pressed( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( pressed(QIconViewItem*) ), this, SLOT( pressed(QIconViewItem*) ) );
    
-    connect( _iconview, SIGNAL( doubleClicked( QIconViewItem * ) ), this, SLOT( doubleClicked( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( doubleClicked(QIconViewItem*) ), this, SLOT( doubleClicked(QIconViewItem*) ) );
-    connect( _iconview, SIGNAL( returnPressed( QIconViewItem * ) ), this, SLOT( returnPressed( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( returnPressed(QIconViewItem*) ), this, SLOT( returnPressed(QIconViewItem*) ) );
    
-    connect( _iconview, SIGNAL( onItem( QIconViewItem * ) ), this, SLOT( onItem( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( onItem(QIconViewItem*) ), this, SLOT( onItem(QIconViewItem*) ) );
    connect( _iconview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
    
    // listview only signals
    
-    connect( _listview, SIGNAL( expanded( QListViewItem * ) ), this, SLOT( expanded( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( expanded(QListViewItem*) ), this, SLOT( expanded(QListViewItem*) ) );
-    connect( _listview, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( collapsed( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( collapsed(QListViewItem*) ), this, SLOT( collapsed(QListViewItem*) ) );
    
    // iconview only signals
    
    connect( _iconview, SIGNAL( moved() ), this, SIGNAL( moved() ) );
 }
 OVersatileView::~OVersatileView()
 {
 }
 QPopupMenu* OVersatileView::contextMenu() const
 {
    return _contextmenu;
 }
 void OVersatileView::contextMenuRequested( QListViewItem* item, const QPoint& pos, int col )
 {
    // can't use QObject::inherits here, because ListViewItems, beit Q, O or K,
    // do not inherit from QObject - assuming here the programmer is
    // disciplined enough to only add OVersatileViewItems to an OVersatileView
    popupContextMenu( static_cast<OVersatileViewItem*>( item ), pos, col );
 }
 void OVersatileView::contextMenuRequested( QIconViewItem* item, const QPoint& pos )
 {
    // see above
    popupContextMenu( static_cast<OVersatileViewItem*>( item ), pos, -1 );
 }
 void OVersatileView::popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col )
 {
    if ( !item )
        _contextmenu->exec( pos );
    else
        emit( contextMenuRequested( item, pos, col ) );
 }
 void OVersatileView::setSynchronization( bool sync )
 {
    _synchronization = sync;
 }
 bool OVersatileView::synchronization()
 {
    return _synchronization;
 }
 void OVersatileView::setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened, QPixmap& closed )
 {
    if ( mode == Tree )
    {
        _treeleaf = leaf;
        _treeopened = opened;
        _treeclosed = closed;
    }
    else if ( mode == Icons )
    {
        _iconleaf = leaf;
        _iconopened = opened;
        _iconclosed = closed;
    }
    else
    {
        odebug << "OVersatileView::setDefaultPixmaps(): invalid mode" << oendl;
    }
 }
 QIconView* OVersatileView::iconView() const
 {
    return _iconview;
 }
 OListView* OVersatileView::listView() const
 {
    return _listview;
 }
 void OVersatileView::setViewMode( int mode )
 {
    if ( mode == Tree )
    {
        _viewmode = mode;
        raiseWidget( _listview );
    }
    else if ( mode == Icons )
    {
        _viewmode = mode;
        raiseWidget( _iconview );
    }
    else
    {
        odebug << "OVersatileView::setViewMode(): invalid mode" << oendl;
    }
 }
 void OVersatileView::setIconViewMode()
author	alwin <alwin>	2004-03-02 12:14:15 (UTC)
committer	alwin <alwin>	2004-03-02 12:14:15 (UTC)
commit	0d59c780513da78033f4d9040475dee9db0256d4 (patch) (unidiff)
tree	503d320b4aa3daae9982082e7b34e3e2c48bdfb7 /libopie2
parent	a0981652d61776d70f25980f035748b21339e946 (diff)
download	opie-0d59c780513da78033f4d9040475dee9db0256d4.zip opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.gz opie-0d59c780513da78033f4d9040475dee9db0256d4.tar.bz2