Updatet the applets

author: zecke <zecke> 2004-03-14 17:37:48 (UTC)
committer: zecke <zecke> 2004-03-14 17:37:48 (UTC)
commit: d69b11f67e3118f86d068c38c422984d754e13cc (patch) (unidiff)
tree: 9733e26ab49003bead06d820d70a14babd0c09f0
parent: 64820b76cc9d1c06a6967cd34114f3b95896aaeb (diff)
download: opie-d69b11f67e3118f86d068c38c422984d754e13cc.zip
opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.gz
opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.bz2
33 files changed, 66 insertions, 70 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index b2cef55..18e368e 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -1,182 +1,182 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "battery.h"
 #include "batterystatus.h"
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
+#include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 /* QT */
 #include <qpainter.h>
 #include <qtimer.h>
+using namespace Opie::Ui;
 BatteryMeter::BatteryMeter( QWidget *parent )
    : QWidget( parent ), charging(false)
 {
    ps = new PowerStatus;
    startTimer( 10000 );
    setFixedWidth(  QMAX(AppLnk::smallIconSize()*3/4, 6) );
    setFixedHeight( AppLnk::smallIconSize() );
    chargeTimer = new QTimer( this );
    connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) );
    timerEvent(0);
    QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
    Config c( "qpe" );
    c.setGroup( "Battery" );
    style = c.readNumEntry( "Style", 0 );
 }
 BatteryMeter::~BatteryMeter()
 {
    delete ps;
 }
 QSize BatteryMeter::sizeHint() const
 {
    return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() );
 }
 void BatteryMeter::mousePressEvent( QMouseEvent* e )
 {
    if ( e->button() == RightButton )
    {
        style = 1-style;
        Config c( "qpe" );
        c.setGroup( "Battery" );
        c.writeEntry( "Style", style );
        repaint( true );
    }
    QWidget::mousePressEvent( e );
 }
 void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ )
 {
    if ( batteryView && batteryView->isVisible() ) {
        delete (QWidget *) batteryView;
    } else {
        if ( !batteryView ) batteryView = new BatteryStatus( ps );
        QPEApplication::showWidget( batteryView );
        batteryView->raise();
        batteryView->show();
    }
 }
 void BatteryMeter::timerEvent( QTimerEvent * )
 {
    PowerStatus prev = *ps;
    *ps = PowerStatusManager::readStatus();
    if ( prev != *ps ) {
    percent = ps->batteryPercentRemaining();
    if ( !charging && ps->batteryStatus() == PowerStatus::Charging ) {
        percent = 0;
        charging = true;
        chargeTimer->start( 500 );
    } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) {
        charging = false;
        chargeTimer->stop();
        if ( batteryView )
        batteryView->updatePercent( percent );
    }
    repaint( style != 0 );
    if ( batteryView )
        batteryView->repaint();
    }
 }
 void BatteryMeter::chargeTimeout()
 {
    percent += 20;
    if ( percent > 100 )
    percent = 0;
    repaint(FALSE);
    if ( batteryView )
    batteryView->updatePercent( percent );
 }
 void BatteryMeter::paintEvent( QPaintEvent* )
 {
    if ( style == 1 )
    {
        QPainter p(this);
        QFont f( "Fixed", AppLnk::smallIconSize()/2 );
        QFontMetrics fm( f );
        p.setFont( f );
        p.drawText( 0, height()/2, QString::number( percent ) );
        p.drawText( width()/4, height(), "%" );
        return;
    }
    QPainter p(this);
    QColor color;
    QColor g = gray.light( 160 );
    switch ( ps->acStatus() )
    {
        case PowerStatus::Offline: color = blue.light( 150 ); break;
        case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break;
        default: color = red.light( 160 );
    }
    int w = height() / 2;
    if ( !(w%2) ) w--; // should have an odd value to get a real middle line
    int h = height() - 4;
    int pix = (percent * h) / 100;
    int y2 = height() -2;
    int y = y2 - pix;
    int x1 = (width() - w ) / 2;
    p.setPen(QColor(80,80,80));
    p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0);  // header
    p.drawRect(x1,1,w,height()-1);      // corpus
    p.setBrush(color);
    //int extra = ((percent * h) % 100)/(100/4);
    int middle = w/2;
    for ( int i = 0; i < middle; i++ )
    {
        p.setPen( gray.dark( 100+i*20 ) );
        p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 );
        p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 );
        p.setPen( color.dark( 100+i*20 ) );
        p.drawLine( x1+middle-i, y, x1+middle-i, y2 );
        p.drawLine( x1+middle+i, y, x1+middle+i, y2 );
    }
 }
 int BatteryMeter::position()
 {
    return 8;
 }
-Q_EXPORT_INTERFACE()
+EXPORT_OPIE_APPLET_v1( BatteryMeter )
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> );
-}
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index ea11495..bd86f77 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -1,144 +1,144 @@
 #include "batterystatus.h"
 /* OPIE */
 #include <opie2/odevice.h>
 #include <qpe/power.h>
 /* QT */
 #include <qpushbutton.h>
 #include <qdrawutil.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
-using namespace Opie;
+using namespace Opie::Core;
 BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
  : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
  setCaption( tr("Battery status") );
  setMinimumSize( 150, 200 );
  QPushButton *pb = new QPushButton( tr("Close"), this );
  QVBoxLayout *layout = new QVBoxLayout ( this );
  jackPercent = 0;
  pb->setMaximumSize( 120, 40 );
  pb->show();
  layout->addStretch();
  layout->addWidget( pb );
  if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
      getProcApmStatusIpaq();
  }
  connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) );
  percent = ps->batteryPercentRemaining();
  show();
 }
 BatteryStatus::~BatteryStatus()
 {
 }
 /*
 * Make use of the advanced apm interface of the ipaq
 */
 bool BatteryStatus::getProcApmStatusIpaq() {
  bat2 = false;
  QFile procApmIpaq("/proc/hal/battery");
  if (procApmIpaq.open(IO_ReadOnly) ) {
    QStringList list;
    // since it is /proc we _must_ use QTextStream
    QTextStream stream ( &procApmIpaq);
    QString streamIn;
    streamIn = stream.read();
    list = QStringList::split("\n", streamIn);
    for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
      // not nice, need a rewrite later
      if( (*line).startsWith(" Percentage") ){
        if (bat2 == true) {
      perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
    } else {
      perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
    }
      }else if( (*line).startsWith(" Life") ){
    if (bat2 == true) {
      sec2 = (*line).mid(((*line).find(':')+2), 5 );
    } else {
      sec1 = (*line).mid(((*line).find(':')+2), 5 );
    }
      }else if( (*line).startsWith("Battery #1") ){
    bat2 = true;
      }else if( (*line).startsWith(" Status") ){
    if (bat2 == true) {
      jackStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
        } else {
      ipaqStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
    }
      }else if( (*line).startsWith(" Chemistry") ) {
    if (bat2 == true) {
      jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
    } else {
      ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
    }
      }
    }
  } else {
    QMessageBox::warning(this, tr("Failure"),tr("could not open file"));
  }
  procApmIpaq.close();
  jackPercent = perc2.toInt();
  ipaqPercent = perc1.toInt();
  if (perc2.isEmpty()) {
    perc2 = tr("no data");
  } else {
    perc2 += " %";
  }
  if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) {
    sec2 = tr("no data");
  } else {
    sec2 += " min";
  }
  jackStatus == (" ( " + jackStatus + " )");
  return true;
 }
 void BatteryStatus::updatePercent( int pc ) {
  percent = pc;
  repaint(FALSE);
 }
 void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) {
  int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height;
  topgrad.hsv( &h1, &s1, &v1 );
  botgrad.hsv( &h2, &s2, &v2 );
  for ( int j = 0; j < hy-2; j++ ) {
    p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
               v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
    p->drawLine( r.x(), r.top()+hy-2-j, r.x()+r.width(), r.top()+hy-2-j );
  }
  for ( int j = 0; j < hh; j++ ) {
    p->setPen( highlight );
    p->drawLine( r.x(), r.top()+hy-2+j, r.x()+r.width(), r.top()+hy-2+j );
    }
  for ( int j = 0; j < ng-hy-hh; j++ ) {
    p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
               v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
    p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j );
  }
diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in
index 3067317..eca07e3 100644
--- a/core/applets/batteryapplet/config.in
+++ b/core/applets/batteryapplet/config.in
@@ -1,4 +1,4 @@
  config BATTERYAPPLET
    boolean "opie-batteryapplet (Applet to monitor battery status)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 6090b68..ed4bfc7 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -1,177 +1,178 @@
 /*
 * cardmon.cpp
 *
 * ---------------------
 *
 * copyright   : (c) 2002 by Maximilian Reiss
 * email       : max.reiss@gmx.de
 * based on two apps by Devin Butterfield
 */
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "cardmon.h"
 /* OPIE */
 #include <opie2/odevice.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 /* QT */
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qsound.h>
 #include <qtimer.h>
 /* STD */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 using namespace Opie;
 using namespace Opie::Ui;
+using namespace Opie::Ui;
 using namespace Opie::Core;
 CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
        pm( Resource::loadPixmap( "cardmon/pcmcia" ) )
 {
    QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
    connect( pcmciaChannel,
             SIGNAL( received(const QCString&,const QByteArray&) ), this,
             SLOT( cardMessage(const QCString&,const QByteArray&) ) );
    QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
    connect( sdChannel,
             SIGNAL( received(const QCString&,const QByteArray&) ), this,
             SLOT( cardMessage(const QCString&,const QByteArray&) ) );
    cardInPcmcia0 = FALSE;
    cardInPcmcia1 = FALSE;
    cardInSd = FALSE;
    setFocusPolicy( NoFocus );
    setFixedWidth ( AppLnk::smallIconSize() );
    setFixedHeight ( AppLnk::smallIconSize() );
    getStatusPcmcia( TRUE );
    getStatusSd( TRUE );
    repaint( FALSE );
    popupMenu = 0;
 }
 CardMonitor::~CardMonitor()
 {
    if ( popupMenu )
    {
        delete popupMenu;
    }
 }
 void CardMonitor::popUp( QString message, QString icon )
 {
    if ( !popupMenu )
    {
        popupMenu = new QPopupMenu( this );
    }
    popupMenu->clear();
    if ( icon.isEmpty() )
    {
        popupMenu->insertItem( message, 0 );
    }
    else
    {
        popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ),
                               message, 0 );
    }
    QPoint p = mapToGlobal( QPoint( 0, 0 ) );
    QSize s = popupMenu->sizeHint();
    popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                              p.y() - s.height() ), 0 );
    QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
 }
 void CardMonitor::popupTimeout()
 {
    popupMenu->hide();
 }
 void CardMonitor::mousePressEvent( QMouseEvent * )
 {
    QPopupMenu * menu = new QPopupMenu( this );
    QString cmd;
    int err = 0;
    if ( cardInSd )
    {
        menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ),
                          tr( "Eject SD/MMC card" ), 0 );
    }
    if ( cardInPcmcia0 )
    {
        menu->
        insertItem( QIconSet
                    ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ),
                    tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
    }
    if ( cardInPcmcia1 )
    {
        menu->
        insertItem( QIconSet
                    ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
                    tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
    }
    QPoint p = mapToGlobal( QPoint( 0, 0 ) );
    QSize s = menu->sizeHint();
    int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                                  p.y() - s.height() ), 0 );
    if ( opt == 1 )
    {
        cmd = "/sbin/cardctl eject 0";
        err = system( ( const char * ) cmd );
        if ( err != 0 )
        {
            qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d",
                    err );
            popUp( tr( "CF/PCMCIA card eject failed!" ) );
        }
    }
    else if ( opt == 0 )
    {
        if ( ODevice::inst() ->system() == System_Familiar )
        {
            cmd = "umount /dev/mmc/part1";
        }
        else
        {
            cmd = "umount /dev/mmcda1";
        }
        err = system( ( const char * ) cmd );
        if ( err != 0 )
        {
            popUp( tr( "SD/MMC card eject failed!" ) );
diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in
index f3d57fd..8626c75 100644
--- a/core/applets/cardmon/config.in
+++ b/core/applets/cardmon/config.in
@@ -1,4 +1,4 @@
  config CARDMON
    boolean "opie-cardmon (monitor cf/sd/mmc card status, and eject function)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 4fc8076..57a4088 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -1,189 +1,188 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "clipboard.h"
 #include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpainter.h>
 #include <qpopupmenu.h>
 #include <qwindowsystem_qws.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qtimer.h>
 //===========================================================================
+using namespace Opie::Ui;
 ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
 {
        setFixedWidth ( AppLnk::smallIconSize()  );
        setFixedHeight ( AppLnk::smallIconSize()  );
        QImage img = Resource::loadImage( "paste");
        img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
        m_clipboardPixmap.convertFromImage( img );
        m_timer = new QTimer ( this );
        connect ( QApplication::clipboard ( ), SIGNAL( dataChanged()), this, SLOT( newData()));
        connect ( m_timer, SIGNAL( timeout()), this, SLOT( newData()));
        connect ( qApp, SIGNAL( aboutToQuit()), this, SLOT( shutdown()));
        m_menu = 0;
        m_dirty = true;
        m_lasttext = QString::null;
        m_timer-> start ( 0, true );
 }
 ClipboardApplet::~ClipboardApplet ( )
 {
 }
 int ClipboardApplet::position()
 {
    return 6;
 }
 void ClipboardApplet::shutdown ( )
 {
        // the timer has to be stopped, or Qt/E will hang on quit()
        // see launcher/desktop.cpp
        m_timer-> stop ( );
 }
 void ClipboardApplet::mousePressEvent ( QMouseEvent *)
 {
        if ( m_dirty ) {
                delete m_menu;
                m_menu = new QPopupMenu ( this );
                m_menu-> setCheckable ( true );
                if ( m_history. count ( )) {
                        for ( unsigned int i = 0; i < m_history. count ( ); i++ ) {
                                QString str = m_history [i];
                                if ( str. length ( ) > 20 )
                                        str = str. left ( 20 ) + "...";
                                m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i );
                                m_menu-> setItemChecked ( i, false );
                        }
                        m_menu-> setItemChecked ( m_history. count ( ) - 1, true );
                        m_menu-> insertSeparator ( );
                }
                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 );
                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 );
                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 );
                connect ( m_menu, SIGNAL( activated(int)), this, SLOT( action(int)));
                m_dirty = false;
        }
        QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
        QSize s = m_menu-> sizeHint ( );
        m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )));
 }
 void ClipboardApplet::action(int id)
 {
        ushort unicode = 0;
        int scan = 0;
        switch ( id ) {
                case 100:
                        unicode = 'X' - '@';
                        scan    = Key_X; // Cut
                        break;
                case 101:
                        unicode = 'C' - '@';
                        scan    = Key_C; // Copy
                        break;
                case 102:
                        unicode = 'V' - '@';
                        scan    = Key_V; // Paste
                        break;
                default:
                        if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) {
                                QApplication::clipboard ( )-> setText ( m_history [id] );
                                for ( uint i = 0; i < m_history. count ( ); i++ )
                                        m_menu-> setItemChecked ( i, i == uint( id ));
                                unicode = 'V' - '@';
                                scan    = Key_V;
                        }
                        break;
        }
        if ( scan ) {
                qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false );
                qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, false, false );
        }
 }
 void ClipboardApplet::paintEvent ( QPaintEvent* )
 {
        QPainter p ( this );
        /* center the height but our pixmap is as big as the height ;)*/
              p. drawPixmap( 0, 0,
                       m_clipboardPixmap );
 }
 void ClipboardApplet::newData ( )
 {
        static bool excllock = false;
        if ( excllock )
                return;
        else
                excllock = true;
        m_timer-> stop ( );
        QCString type = "plain";
        QString txt = QApplication::clipboard ( )-> text ( type );
        if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) {
                m_history. append ( txt );
                if ( m_history. count ( ) > 5 )
                        m_history. remove ( m_history. begin ( ));
                m_dirty = true;
        }
        m_timer-> start ( 1500, true );
        excllock = false;
 }
-Q_EXPORT_INTERFACE()
+EXPORT_OPIE_APPLET_v1( ClipboardApplet )
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ClipboardApplet> );
-}
diff --git a/core/applets/clipboardapplet/config.in b/core/applets/clipboardapplet/config.in
index 1205b26..e58d239 100644
--- a/core/applets/clipboardapplet/config.in
+++ b/core/applets/clipboardapplet/config.in
@@ -1,4 +1,4 @@
  config CLIPBOARDAPPLET
    boolean "opie-clipboardapplet (copy/cut/paste applet)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 )
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index 120a019..3b13d74 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -1,121 +1,120 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "clock.h"
 #include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
+using namespace Opie::Ui;
 LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
 {
    // If you want a sunken border around the clock do this:
    // setFrameStyle( QFrame::Panel | QFrame::Sunken );
    //setFont( QFont( "Helvetica", , QFont::Normal ) );
    connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime() ) );
    connect( qApp, SIGNAL( clockChanged(bool) ),
       this, SLOT( slotClockChanged(bool) ) );
    readConfig();
    timerId = 0;
    timerEvent( 0 );
    show();
 }
 int LauncherClock::position()
 {
    return 10;
 }
 void LauncherClock::readConfig() {
    Config config( "qpe" );
    config.setGroup( "Time" );
    ampmFormat = config.readBoolEntry( "AMPM", TRUE );
    config.setGroup( "Date" );
    format = config.readNumEntry("ClockApplet",0);
 }
 void LauncherClock::mouseReleaseEvent( QMouseEvent * )
 {
        QCString setTimeApp;
        setTimeApp="systemtime";
        QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()");
 }
 void LauncherClock::timerEvent( QTimerEvent *e )
 {
    if ( !e || e->timerId() == timerId ) {
  killTimer( timerId );
  changeTime();
  QTime t = QTime::currentTime();
  int ms = (60 - t.second())*1000 - t.msec();
  timerId = startTimer( ms );
    } else {
  QLabel::timerEvent( e );
    }
 }
 void LauncherClock::updateTime( void )
 {
    changeTime();
 }
 void LauncherClock::changeTime( void )
 {
    QTime tm = QDateTime::currentDateTime().time();
    QString s;
    if( ampmFormat ) {
  int hour = tm.hour();
  if (hour == 0)
      hour = 12;
  if (hour > 12)
      hour -= 12;
  s.sprintf( "%2d:%02d %s", hour, tm.minute(),
       (tm.hour() >= 12) ? "PM" : "AM" );
    } else
  s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
    if (format==1) {
  QDate dm = QDate::currentDate();
  QString d;
  d.sprintf("%d/%d ", dm.day(), dm.month());
  setText( d+s );
    } else if (format==2) {
  QDate dm = QDate::currentDate();
  QString d;
  d.sprintf("%d/%d ", dm.month(), dm.day());
  setText( d+s );
    } else {
  setText( s );
    }
 }
 void LauncherClock::slotClockChanged( bool pm )
 {
    readConfig();
    updateTime();
 }
-Q_EXPORT_INTERFACE()
-{
+EXPORT_OPIE_APPLET_v1( LauncherClock )
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<LauncherClock> );
-}
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in
index 20bd39d..6c32f79 100644
--- a/core/applets/clockapplet/config.in
+++ b/core/applets/clockapplet/config.in
@@ -1,4 +1,4 @@
  config CLOCKAPPLET
    boolean "opie-clockapplet (Digital clock applet)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/applets/homeapplet/config.in b/core/applets/homeapplet/config.in
index 1828da0..53d7882 100644
--- a/core/applets/homeapplet/config.in
+++ b/core/applets/homeapplet/config.in
@@ -1,4 +1,4 @@
  config HOMEAPPLET
    boolean "Home"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in
index 56ec664..0976e8f 100644
--- a/core/applets/irdaapplet/config.in
+++ b/core/applets/irdaapplet/config.in
@@ -1,4 +1,4 @@
  config IRDAAPPLET
    boolean "opie-irdaapplet (applet for IR beaming/discovery)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index dde8050..2196d18 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -1,167 +1,168 @@
 /**********************************************************************
 ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org>
 **                    Max Reiss <harlekin@handhelds.org> [trivial stuff]
 **                    Robert Griebl <sandman@handhelds.org>
 **                    Holger Freyther <zecke@handhelds.org> QCOP Interface
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #include "irda.h"
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 /* QT */
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 /* STD */
 #include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 //===========================================================================
+using namespace Opie::Ui;
 IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
                : QWidget ( parent, name )
 {
        setFixedHeight ( 18 );
        setFixedWidth ( 14 );
        m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
        m_irdaOnPixmap          = Resource::loadPixmap( "irdaapplet/irdaon" );
        m_irdaOffPixmap         = Resource::loadPixmap( "irdaapplet/irdaoff" );
        m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
        m_receiveActivePixmap   = Resource::loadPixmap( "irdaapplet/receive" );
        m_irda_active = false;
        m_irda_discovery_active = false;
        m_receive_active = false;
        m_receive_state_changed = false;
        m_popup = 0;
                m_wasOn = false;
                m_wasDiscover = false;
        QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
        connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
                this, SLOT(slotMessage(const QCString&,const QByteArray&) ) );
 }
 int IrdaApplet::position()
 {
        return 6;
 }
 void IrdaApplet::show()
 {
        QWidget::show ( );
        startTimer ( 2000 );
 }
 IrdaApplet::~IrdaApplet()
 {
        if ( m_sockfd >= 0 )
                ::close ( m_sockfd );
 }
 void IrdaApplet::popup ( QString message, QString icon )
 {
        if ( !m_popup )
                m_popup = new QPopupMenu ( this );
        m_popup-> clear ( );
        if ( icon. isEmpty ( ))
                m_popup-> insertItem ( message, 0 );
        else
                m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 );
        QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
        QSize s = m_popup-> sizeHint ( );
        m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
                                   p. y ( ) - s. height ( )));
        QTimer::singleShot ( 2000, this, SLOT( popupTimeout()));
 }
 void IrdaApplet::popupTimeout ( )
 {
        m_popup-> hide ( );
 }
 bool IrdaApplet::checkIrdaStatus ( )
 {
        struct ifreq ifr;
        strcpy ( ifr. ifr_name, "irda0" );
        if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                return false;
        return ( ifr. ifr_flags & IFF_UP );
 }
 bool IrdaApplet::setIrdaStatus ( bool b )
 {
        struct ifreq ifr;
        strcpy ( ifr. ifr_name, "irda0" );
        if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                return false;
        if ( b ) {
                ifr. ifr_flags |= IFF_UP;
        }
        else {
                setIrdaDiscoveryStatus ( 0 );
                setIrdaReceiveStatus ( 0 );
                ifr. ifr_flags &= ~IFF_UP;
        }
        if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 )
                return false;
        return true;
 }
 bool IrdaApplet::checkIrdaDiscoveryStatus ( )
 {
        QFile discovery ( "/proc/sys/net/irda/discovery" );
        QString streamIn = "0";
        if ( discovery. open ( IO_ReadOnly )) {
                QTextStream stream ( &discovery );
                streamIn = stream. read ( );
        }
        return streamIn. toInt ( ) > 0;
 }
 bool IrdaApplet::setIrdaDiscoveryStatus ( bool d )
 {
        QFile discovery ( "/proc/sys/net/irda/discovery" );
        if ( discovery. open ( IO_WriteOnly | IO_Raw )) {
                discovery.putch ( d ? '1' : '0' );
                return true;
        }
        return false;
 }
@@ -234,132 +235,129 @@ void IrdaApplet::showDiscovered ( )
                        else
                                it++;
                }
                // XXX if( qcopsend ) {
                    QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" );
                    e << ( m_devices. count ( ) > 0 );
                // }
        }
 }
 void IrdaApplet::mousePressEvent ( QMouseEvent * )
 {
        QPopupMenu *menu = new QPopupMenu ( this );
        QString cmd;
        /* Refresh active state */
        timerEvent ( 0 );
                //menu->insertItem( tr("More..."), 4 );
        if ( m_irda_active && !m_devices. isEmpty ( )) {
                menu-> insertItem ( tr( "Discovered Device:" ), 9 );
                for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
                        menu-> insertItem ( *it );
                menu-> insertSeparator ( );
        }
        menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
        if ( m_irda_active ) {
                menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
                menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
        }
        QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
        QSize s = menu-> sizeHint ( );
        p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));
        switch (  menu-> exec ( p )) {
                case 0:
                        setIrdaStatus ( !m_irda_active );
                        timerEvent ( 0 );
                        break;
                case 1:
                        setIrdaDiscoveryStatus ( !m_irda_discovery_active );
                        timerEvent ( 0 );
                        break;
                case 2:
                        setIrdaReceiveStatus ( !m_receive_active );
                        timerEvent( 0 );
                        break;
        }
        delete menu;
 }
 void IrdaApplet::timerEvent ( QTimerEvent * )
 {
        bool oldactive = m_irda_active;
        bool olddiscovery = m_irda_discovery_active;
        bool receiveUpdate = false;
        if ( m_receive_state_changed ) {
                receiveUpdate = true;
                m_receive_state_changed = false;
        }
        m_irda_active = checkIrdaStatus ( );
        m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
        if ( m_irda_discovery_active )
                showDiscovered ( );
        if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate )
                update ( );
 }
 void IrdaApplet::paintEvent ( QPaintEvent * )
 {
        QPainter p ( this );
        p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
        if ( m_irda_discovery_active )
                    p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
        if ( m_receive_active )
                p. drawPixmap( 0, 1, m_receiveActivePixmap );
 }
 /*
 * We know 3 calls
 * a) enable
 * b) disable
 * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on
 * c) listDevices: We will return a list of known devices
 */
 void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
    if ( str == "enableIrda()") {
        m_wasOn = checkIrdaStatus();
        m_wasDiscover = checkIrdaDiscoveryStatus();
        if (!m_wasOn)  {
            setIrdaStatus( true );
        }
        if ( !m_wasDiscover ) {
            setIrdaDiscoveryStatus ( true );
        }
    } else if ( str == "disableIrda()") {
        if (!m_wasOn)  {
            setIrdaStatus( false );
        }
        if ( !m_wasDiscover ) {
            setIrdaDiscoveryStatus ( false );
        }
    } else if ( str == "listDevices()") {
        QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
        QStringList list;
        QMap<QString, QString>::Iterator it;
        for (it = m_devices.begin(); it != m_devices.end(); ++it )
            list << (*it);
        e << list;
    }
 }
-Q_EXPORT_INTERFACE()
+EXPORT_OPIE_APPLET_v1( IrdaApplet )
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<IrdaApplet> );
-}
diff --git a/core/applets/logoutapplet/config.in b/core/applets/logoutapplet/config.in
index 385b02f..0d48c6a 100644
--- a/core/applets/logoutapplet/config.in
+++ b/core/applets/logoutapplet/config.in
@@ -1,4 +1,4 @@
  config LOGOUTAPPLET
    boolean "Logout"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index fc5f093..195ada5 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -1,143 +1,142 @@
 /**********************************************************************
 ** Copyright (C) 2004 Anton Kachalov mouse@altlinux.ru
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #include "multikey.h"
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 /* QT */
 #include <qdir.h>
+using namespace Opie::Ui;
 Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
 {
    QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this);
    connect( swChannel, SIGNAL(received(const QCString&,const QByteArray&)),
             this, SLOT(message(const QCString&,const QByteArray&)));
    setFont( QFont( "Helvetica", 10, QFont::Normal ) );
    QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
    lang = 0;
    QCopEnvelope e("MultiKey/Keyboard", "getmultikey()");
    setText("EN");
    popupMenu.insertItem("EN", 0);
    show();
 }
 void Multikey::mousePressEvent(QMouseEvent *ev)
 {
    if (!sw_maps.count())
        return;
    if (ev->button() == RightButton) {
        QPoint p = mapToGlobal(QPoint(0, 0));
        QSize s = popupMenu.sizeHint();
        int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2),
                                        p.y() - s.height()), 0);
        if (opt == -1)
            return;
        lang = opt;
        QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
        e << sw_maps[lang];
        setText(labels[lang]);
    }
    QWidget::mousePressEvent(ev);
 }
 void Multikey::mouseReleaseEvent(QMouseEvent *ev)
 {
    if (!sw_maps.count())
        return;
    lang = lang < sw_maps.count()-1 ? lang+1 : 0;
    QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
    //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii());
    e << sw_maps[lang];
    setText(labels[lang]);
 }
 void Multikey::message(const QCString &message, const QByteArray &data)
 {
    if ( message == "setsw(QString,QString)" ) {
        QDataStream stream(data, IO_ReadOnly);
        QString maps, current_map;
        stream >> maps >> current_map;
        QStringList sw = QStringList::split(QChar('|'), maps);
        sw.append(current_map);
        QDir map_dir(QPEApplication::qpeDir() + "/share/multikey/", "*.keymap");
        lang = 0;
        labels.clear();
        sw_maps.clear();
        popupMenu.clear();
        for (uint i = 0; i < sw.count(); ++i) {
            QString keymap_map;
            if (sw[i][0] != '/') {
                keymap_map =  map_dir.absPath() + "/" + sw[i];
            } else {
                if ((map_dir.exists(QFileInfo(sw[i]).fileName(), false)
                     && i != sw.count()-1) || !QFile::exists(sw[i])) {
                    continue;
                }
                keymap_map = sw[i];
            }
            QFile map(keymap_map);
            if (map.open(IO_ReadOnly)) {
                QString line;
                map.readLine(line, 1024);
                while (!map.atEnd()) {
                    if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) {
                        if (i != sw.count()-1) {
                            if (keymap_map == current_map) {
                                lang = i;
                            }
                            sw_maps.append(keymap_map);
                            labels.append(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
                            popupMenu.insertItem(labels[labels.count()-1], labels.count()-1);
                        } else {
                            current = line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace();
                        }
                        break;
                    }
                    map.readLine(line, 1024);
                }
                map.close();
            }
        }
        setText(current);
    }
 }
 int Multikey::position()
 {
    return 10;
 }
-Q_EXPORT_INTERFACE()
+EXPORT_OPIE_APPLET_v1( Multikey )
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> );
-}
diff --git a/core/applets/restartapplet/config.in b/core/applets/restartapplet/config.in
index aa2580f..764ae58 100644
--- a/core/applets/restartapplet/config.in
+++ b/core/applets/restartapplet/config.in
@@ -1,4 +1,4 @@
  config RESTARTAPPLET
    boolean "opie-restartapplet (Restart Opie via taskbar)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/applets/rotateapplet/config.in b/core/applets/rotateapplet/config.in
index 1a0d923..d3de89a 100644
--- a/core/applets/rotateapplet/config.in
+++ b/core/applets/rotateapplet/config.in
@@ -1,4 +1,4 @@
  config ROTATEAPPLET
    boolean "Rotate"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 0488c36..f621aa9 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -1,167 +1,167 @@
 /*
                             This file is part of the OPIE Project
                             Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org>
                             Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net>
 � � � � � � � �=.            Copyright (C) 2004 Michael Lauer <mickey@Vanille.de>
 � � � � � � �.=l.
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This library 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 library is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|     MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>:      PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � . � � .:        details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=            this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "rotate.h"
 /* OPIE */
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
-using namespace Opie;
+using namespace Opie::Core;
 /* QT */
 #include <time.h>
 RotateApplet::RotateApplet()
             :QObject( 0, "RotateApplet" ), m_flipped( false )
 {
 #if !defined(QT_NO_COP)
    QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this );
    connect ( rotateChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
              this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
 #endif
 }
 RotateApplet::~RotateApplet ( )
 {}
 /**
 * Qcop receive method.
 */
 void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data )
 {
    qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg );
    if ( ODevice::inst()->hasHingeSensor() )
    {
        struct timespec interval;
        struct timespec remain;
        interval.tv_sec = 0;
        interval.tv_nsec = 600000;
        ::nanosleep( &interval, &remain );
        OHingeStatus status = ODevice::inst()->readHingeSensor();
        qDebug( "RotateApplet::readHingeSensor = %d", (int) status );
        Config cfg( "apm" );
        cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" );
        int action = cfg.readNumEntry( "CloseHingeAction", 0 );
        if ( status == CASE_CLOSED )
        {
            switch ( action )
            {
                case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 0 ); break;
                case 2: /* SUSPEND */ ODevice::inst()->suspend(); break;
                default: /* IGNORE */ break;
            }
        }
        else /* status != CASE_CLOSED */
        {
            switch ( action )
            {
                case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 127 ); break;
                case 2: /* SUSPEND */ /* How to wake up the device from kernel? */; break;
                default: /* IGNORE */ break;
            }
        }
        qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) );
    }
    QDataStream stream( data, IO_ReadOnly );
    if ( msg == "flip()" )
    {
        activated ( );
    }
    else if ( msg == "rotateDefault()")
    {
        rotateDefault();
    }
 }
 int RotateApplet::position() const
 {
    return 3;
 }
 QString RotateApplet::name() const
 {
    return tr( "Rotate shortcut" );
 }
 QString RotateApplet::text() const
 {
    return tr( "Rotate" );
 }
 /*QString RotateApplet::tr( const char* s ) const
 {
    return qApp->translate( "RotateApplet", s, 0 );
 }
 QString RotateApplet::tr( const char* s, const char* p ) const
 {
    return qApp->translate( "RotateApplet", s, p );
 }
 */
 QIconSet RotateApplet::icon() const
 {
    QPixmap pix;
    QImage img = Resource::loadImage( "Rotation" );
    if ( !img.isNull() )
        pix.convertFromImage( img.smoothScale( 14, 14 ) );
    return pix;
 }
 QPopupMenu* RotateApplet::popup(QWidget*) const
 {
    return 0;
 }
 void RotateApplet::rotateDefault()
 {
    int rot = ODevice::inst()->rotation();
    switch (rot)
    {
        case Rot0:   rot=0;   break;
        case Rot90:  rot=90;  break;
        case Rot180: rot=180; break;
        case Rot270: rot=270; break;
        default:     rot=0;   break;
    }
    Config cfg( "qpe" );
    cfg.setGroup( "Appearance" );
diff --git a/core/applets/rotateapplet/rotateapplet.pro b/core/applets/rotateapplet/rotateapplet.pro
index f24682c..7a4420f 100644
--- a/core/applets/rotateapplet/rotateapplet.pro
+++ b/core/applets/rotateapplet/rotateapplet.pro
@@ -1,13 +1,13 @@
 TEMPLATE      = lib
 CONFIG       += qt plugn warn_on release
 HEADERS       = rotate.h
 SOURCES       = rotate.cpp
 TARGET        = rotateapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
-LIBS         += -lqpe
+LIBS         += -lqpe -lopiecore2
 VERSION       = 1.0.0
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in
index cafd470..98f2b61 100644
--- a/core/applets/screenshotapplet/config.in
+++ b/core/applets/screenshotapplet/config.in
@@ -1,4 +1,4 @@
  config SCREENSHOTAPPLET
    boolean "opie-screenshotapplet (create images from your current display)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/applets/screenshotapplet/inputDialog.cpp b/core/applets/screenshotapplet/inputDialog.cpp
index 73ec773..ce03ec0 100644
--- a/core/applets/screenshotapplet/inputDialog.cpp
+++ b/core/applets/screenshotapplet/inputDialog.cpp
@@ -1,64 +1,65 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'inputDialog.ui'
 **
 ** Created: Sat Mar 2 07:55:03 2002
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #include "inputDialog.h"
 #include <qpe/resource.h>
 #include <opie2/ofiledialog.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
+using namespace Opie::Ui;
 InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
    : QDialog( parent, name, modal, fl )
 {
    if ( !name )
  setName( "InputDialog" );
    resize( 234, 115);
    setMaximumSize( QSize( 240, 40));
    setCaption( tr(name ) );
    QPushButton *browserButton;
    browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton");
    browserButton->setGeometry( QRect( 205, 10, 22, 22));
    connect( browserButton, SIGNAL(released()),this,SLOT(browse()));
    LineEdit1 = new QLineEdit( this, "LineEdit1" );
    LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) );
 }
 /*
 *  Destroys the object and frees any allocated resources
 */
 InputDialog::~InputDialog()
 {
    inputText= LineEdit1->text();
 }
 void InputDialog::browse() {
    MimeTypes types;
    QStringList audio, video, all;
    audio << "audio/*";
    audio << "playlist/plain";
    audio << "audio/x-mpegurl";
    video << "video/*";
    video << "playlist/plain";
    all += audio;
    all += video;
    types.insert("All Media Files", all );
    types.insert("Audio",  audio );
    types.insert("Video", video );
-    QString str = Opie::OFileDialog::getOpenFileName( 1,"/","", types, 0 );
+    QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/","", types, 0 );
    LineEdit1->setText(str);
 }
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 20e1c9b..9aa012a 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -1,169 +1,170 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #include "screenshot.h"
 #include "inputDialog.h"
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 /* QT */
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qmessagebox.h>
 /* STD */
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <unistd.h>
 /* XPM */
+using namespace Opie::Ui;
 static char * snapshot_xpm[] = {
 "32 32 177 2",
        "  c None",
        ". c #042045",
        "+ c #0D2B47",
        "@ c #0E325E",
        "# c #0D2E50",
        "$ c #0A1C32",
        "% c #0F3A69",
        "& c #164680",
        "* c #165EAE",
        "= c #134D89",
        "- c #0A3A6E",
        "; c #031024",
        "> c #031B36",
        ", c #1A5EA3",
        "' c #1862B1",
        ") c #1866B9",
        "! c #0F5AAC",
        "~ c #0F56A8",
        "{ c #0C4C96",
        "] c #030918",
        "^ c #060206",
        "/ c #20242C",
        "( c #3E3B3B",
        "_ c #186ABD",
        ": c #115EB3",
        "< c #082644",
        "[ c #222C38",
        "} c #5A5859",
        "| c #091921",
        "1 c #1E7EDE",
        "2 c #1A7ADA",
        "3 c #1970CD",
        "4 c #1758A1",
        "5 c #0E529A",
        "6 c #094388",
        "7 c #22364E",
        "8 c #384454",
        "9 c #04162C",
        "0 c #123451",
        "a c #3296B4",
        "b c #298AB1",
        "c c #2484AC",
        "d c #033D86",
        "e c #033677",
        "f c #072C58",
        "g c #525862",
        "h c #5E5E5E",
        "i c #23492A",
        "j c #4FBD3F",
        "k c #50B24C",
        "l c #51C72E",
        "m c #42C64A",
        "n c #2686CA",
        "o c #0B52A4",
        "p c #054A9A",
        "q c #053B7C",
        "r c #2B2325",
        "s c #6E7070",
        "t c #0D240E",
        "u c #1E423E",
        "v c #468ABE",
        "w c #6A8AC2",
        "x c #7EAA8E",
        "y c #84BE4E",
        "z c #65C639",
        "A c #064EA0",
        "B c #0A4DA0",
        "C c #4E5242",
        "D c #62362E",
        "E c #721A1A",
        "F c #6E0A0A",
        "G c #3E0E0E",
        "H c #6AB85E",
        "I c #7E8ECA",
        "J c #929CD4",
        "K c #9EAECA",
        "L c #9EBEAE",
        "M c #8EC26A",
        "N c #32A276",
        "O c #20518C",
        "P c #46566E",
        "Q c #614A51",
        "R c #AE2A26",
        "S c #C41C1A",
        "T c #CE0A0A",
        "U c #A60606",
        "V c #921616",
        "W c #863735",
        "X c #866A66",
        "Y c #9E9EA2",
        "Z c #1E5212",
        "` c #7EC652",
        " .c #B2B2F2",
        "..c #CACAF6",
        "+.c #AECEC6",
        "@.c #92CE72",
        "#.c #42AA86",
        "$.c #365E96",
        "%.c #B82420",
        "&.c #E20E0E",
        "*.c #EF0E0B",
        "=.c #566A86",
        "-.c #92929A",
        ";.c #16260E",
        ">.c #2E571A",
        ",.c #7ED64E",
        "'.c #9ECEB2",
        ").c #C6D5EF",
        "!.c #E2E0FE",
        "~.c #A2DE8A",
        "{.c #4AAA5B",
        "].c #2A6AB2",
        "^.c #9A7A6E",
        "/.c #D25A52",
        "(.c #F62626",
        "_.c #FA0206",
        ":.c #DE1E16",
        "<.c #B63A26",
        "[.c #865A2E",
        "}.c #26568E",
        "|.c #435F7D",
        "1.c #7AE246",
        "2.c #96EA6E",
        "3.c #BEEAAE",
        "4.c #D0EADC",
        "5.c #B6CEFE",
@@ -411,133 +412,131 @@ void ScreenshotControl::performGrab()
                                qApp->processEvents();
                                savePixmap();
                } else {
                                grabTimer->stop();
                                struct sockaddr_in raddr;
                                struct hostent *rhost_info;
                                int sock = -1;
                                bool ok = false;
                                QString displayEnv = getenv("QWS_DISPLAY");
                                qDebug(displayEnv);
                                if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) {
                                                if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
                                                ::memset ( &raddr, 0, sizeof (struct sockaddr_in));
                                                ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
                                                raddr. sin_family = rhost_info-> h_addrtype;
                                                raddr. sin_port = htons ( SCAP_port );
                                                if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) {
                                                                if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
                                                                                QString header;
                                                                                QPixmap pix;
                                                                                QString SCAP_model="";
 #warning FIXME: model string should be filled with actual device model
                                                                                                if( snapshot.width() > 320)
                                                                                                                SCAP_model ="Corgi";
                                                                                
                                                                                if(displayEnv == "QVFb:0")  {//set this if you plan on using this app in qvfb!!
                                                                                                pix = snapshot.xForm(QWMatrix().rotate(90));
                                                                                } else
                                                                                                pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) ); 
                                                                        
                                                                                QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it
                                                                                header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n"  // 1: model / 2: user
                                                                                                "Content-length: %3\n"                     // 3: content length
                                                                                                "Content-Type: image/png\n"
                                                                                                "Host: %4\n"                               // 4: scap host
                                                                                                "\n";
                 
                                                                                header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname );
                                                                                qDebug(header);
                                        
                                                                                if ( !pix.isNull() )  {
                                                                                                const char *ascii = header.latin1( );
                                                                                                uint ascii_len = ::strlen( ascii );
                                                                                                ::write ( sock, ascii, ascii_len );
                                                                                                ::write ( sock, img.bits(), img.numBytes() );
                                                                                                ok = true;
                                                                                }
                                                                }
                                                                ::close ( sock );
                                                }
                                }
                                if ( ok ) {
                                                QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
                                } else {
                                                QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
                                }
                } else {
                                QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
                        }
                }
                                
 }
 //===========================================================================
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
    : QWidget( parent, name )
 {
                setFixedWidth( AppLnk::smallIconSize());
    QImage  img = (const char **)snapshot_xpm;
    img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
    m_icon.convertFromImage(img);
 }
 ScreenshotApplet::~ScreenshotApplet()
 {
 }
 int ScreenshotApplet::position()
 {
    return 6;
 }
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
 {
  ScreenshotControl *sc = new ScreenshotControl ( );
  QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
  // windowPosX is the windows position centered above the applets icon.
  // If the icon is near the edge of the screen, the window would leave the visible area
  // so we check the position against the screen width and correct the difference if needed
  
  int screenWidth = qApp->desktop()->width();
  int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ;
  int ZwindowPosX, XwindowPosX;
  
  // the window would be placed beyond the screen wich doesn't look tooo good
  if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) {
          XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
        ZwindowPosX = windowPosX - XwindowPosX - 1;
  } else {
          ZwindowPosX = windowPosX;
  }
  
   sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) );
   sc-> show ( );
 }
 void ScreenshotApplet::paintEvent( QPaintEvent* )
 {
  QPainter p ( this );
        p.drawPixmap( 0,0, m_icon );
 }
-Q_EXPORT_INTERFACE()
-{
+EXPORT_OPIE_APPLET_v1( ScreenshotApplet )
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> );
-}
diff --git a/core/applets/suspendapplet/config.in b/core/applets/suspendapplet/config.in
index fdbe8b3..d75f581 100644
--- a/core/applets/suspendapplet/config.in
+++ b/core/applets/suspendapplet/config.in
@@ -1,4 +1,4 @@
  config SUSPENDAPPLET
    boolean "Suspend"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 )
diff --git a/core/applets/vmemo/config.in b/core/applets/vmemo/config.in
index d13492d..356ab16 100644
--- a/core/applets/vmemo/config.in
+++ b/core/applets/vmemo/config.in
@@ -1,4 +1,4 @@
  config VMEMO
    boolean "opie-vmemo (take voice memos)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 27f6015..7dd5b4b 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -68,256 +68,257 @@ struct adpcm_state encoder_state;
 #include <qpainter.h>
 #include <qmessagebox.h>
 int seq = 0;
 /* XPM */
 static char * vmemo_xpm[] = {
  "16 16 102 2",
  "   c None",
  ".  c #60636A",
  "+  c #6E6E72",
  "@  c #68696E",
  "#  c #4D525C",
  "$  c #6B6C70",
  "%  c #E3E3E8",
  "&  c #EEEEF2",
  "*  c #EAEAEF",
  "=  c #CACAD0",
  "-  c #474A51",
  ";  c #171819",
  ">  c #9B9B9F",
  ",  c #EBEBF0",
  "'  c #F4F4F7",
  ")  c #F1F1F5",
  "!  c #DEDEE4",
  "~  c #57575C",
  "{  c #010101",
  "]  c #A2A2A6",
  "^  c #747477",
  "/  c #B5B5B8",
  "(  c #AEAEB2",
  "_  c #69696D",
  ":  c #525256",
  "<  c #181C24",
  "[  c #97979B",
  "}  c #A7A7AC",
  "|  c #B0B0B4",
  "1  c #C8C8D1",
  "2  c #75757B",
  "3  c #46464A",
  "4  c #494A4F",
  "5  c #323234",
  "6  c #909095",
  "7  c #39393B",
  "8  c #757578",
  "9  c #87878E",
  "0  c #222224",
  "a  c #414144",
  "b  c #6A6A6E",
  "c  c #020C16",
  "d  c #6B6B6F",
  "e  c #68686D",
  "f  c #5B5B60",
  "g  c #8A8A8F",
  "h  c #6B6B6E",
  "i  c #ADADB2",
  "j  c #828289",
  "k  c #3E3E41",
  "l  c #CFCFD7",
  "m  c #4C4C50",
  "n  c #000000",
  "o  c #66666A",
  "p  c #505054",
  "q  c #838388",
  "r  c #A1A1A7",
  "s  c #A9A9AE",
  "t  c #A8A8B0",
  "u  c #5E5E63",
  "v  c #3A3A3E",
  "w  c #BDBDC6",
  "x  c #59595E",
  "y  c #76767C",
  "z  c #373738",
  "A  c #717174",
  "B  c #727278",
  "C  c #1C1C1E",
  "D  c #3C3C3F",
  "E  c #ADADB6",
  "F  c #54555A",
  "G  c #8B8C94",
  "H  c #5A5A5F",
  "I  c #BBBBC3",
  "J  c #C4C4CB",
  "K  c #909098",
  "L  c #737379",
  "M  c #343437",
  "N  c #8F8F98",
  "O  c #000407",
  "P  c #2D3137",
  "Q  c #B0B1BC",
  "R  c #3B3C40",
  "S  c #6E6E74",
  "T  c #95959C",
  "U  c #74747A",
  "V  c #1D1D1E",
  "W  c #91929A",
  "X  c #42444A",
  "Y  c #22282E",
  "Z  c #B0B2BC",
  "`  c #898A90",
  " . c #65656A",
  ".. c #999AA2",
  "+. c #52535A",
  "@. c #151B21",
  "#. c #515257",
  "$. c #B5B5BE",
  "%. c #616167",
  "&. c #1A1D22",
  "*. c #000713",
  "=. c #1F1F21",
  "                                ",
  "            . + @ #             ",
  "          $ % & * = -           ",
  "        ; > , ' ) ! ~           ",
  "        { ] ^ / ( _ :           ",
  "        < [ } | 1 2 3           ",
  "      4 5 6 7 8 9 0 a b c       ",
  "    d e f g h i j 3 k l m n     ",
  "      o p q r s t u v w n       ",
  "      o x y z A B C D E n       ",
  "      F G H I J K L M N O       ",
  "      P Q R S T U V W X         ",
  "        Y Z ` b  ...+.          ",
  "          @.#.$.%.&.            ",
  "            *.B =.              ",
  "      n n n n n n n n n         "};
+using namespace Opie::Ui;
 VMemo::VMemo( QWidget *parent, const char *_name )
  : QWidget( parent, _name ) {
  setFixedHeight( 18 );
  setFixedWidth( 14 );
  
  t_timer = new QTimer( this );
  connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) );
  
    Config vmCfg("Vmemo");
    vmCfg.setGroup("Defaults");
    int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1));
    useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
    qDebug("toggleKey %d", toggleKey);
    if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
         systemZaurus=TRUE;
    else 
      systemZaurus=FALSE;
      
    myChannel = new QCopChannel( "QPE/VMemo", this );
    connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)),
             this, SLOT(receive(const QCString&,const QByteArray&)) );
    if( toggleKey != -1 ) {
      // keyRegister(key, channel, message)
      QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
      //           e << 4096; // Key_Escape
      //          e << Key_F5; //4148
      e << toggleKey;
      e << QString("QPE/VMemo");
      e << QString("toggleRecord()");
    }
    if(toggleKey == 1)
        usingIcon=TRUE;
    else
        usingIcon=FALSE;
    if( vmCfg.readNumEntry("hideIcon",0) == 1)
      hide();
    recording = FALSE;
    // }
 }
 VMemo::~VMemo() {
 }
 int VMemo::position()
 {
    return 6;
 }
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
  qDebug("receive");
  QDataStream stream( data, IO_ReadOnly );
  if (msg == "toggleRecord()")  {
      if (recording) {
          fromToggle = TRUE;
          stopRecording();
      }  else {
          fromToggle = TRUE;
          startRecording();
      }
  }
 }
 void VMemo::paintEvent( QPaintEvent* ) {
  QPainter p(this);
  p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
 }
 void VMemo::mousePressEvent( QMouseEvent * me) {
  /*  No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
         mousePressEvent and mouseReleaseEvent with a NULL parameter.  */
        
 //  if (!systemZaurus && me != NULL)
 //        return;
 //    }
  if(!recording)
       startRecording();
   else
       stopRecording();
 }
 void VMemo::mouseReleaseEvent( QMouseEvent * ) {
 }
 bool VMemo::startRecording() {
  Config config( "Vmemo" );
  config.setGroup( "System" );
  useAlerts = config.readBoolEntry("Alert",1);
  if(useAlerts) {
    msgLabel = new QLabel( 0, "alertLabel" );
    msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
    msgLabel->show();
  }
  qDebug("Start recording engines");
  recording = TRUE;
  if (openDSP() == -1)  {
    recording = FALSE;
    return FALSE;
  }
  
  config.setGroup("Defaults");
  date = TimeString::dateString( QDateTime::currentDateTime(),false,true);
  date.replace(QRegExp("'"),"");
  date.replace(QRegExp(" "),"_");
  date.replace(QRegExp(":"),".");
  date.replace(QRegExp(","),"");
  QString fName;
  config.setGroup( "System" );
  fName = QPEApplication::documentDir() ;
  fileName = config.readEntry("RecLocation", fName);
  int s;
  s=fileName.find(':');
  if(s)
    fileName=fileName.right(fileName.length()-s-2);
  qDebug("pathname will be "+fileName);   
  if( fileName.left(1).find('/') == -1)
    fileName="/"+fileName;
@@ -513,133 +514,131 @@ bool VMemo::record() {
        if( result <= 0) {
          perror("recording error ");
 //          qDebug(currentFileName);
          QMessageBox::message(tr("Note"),tr("error recording"));
          recording=FALSE;
          break;
          return FALSE;
        }
        if(useADPCM) {
            adpcm_coder( sbuf, abuf, result/2, &encoder_state);
            bytesWritten =  ::write(wav, abuf, result/4);
        } else {
            for (int i = 0; i < result; i++) { //since Z is mono do normally
                monoBuffer[i] = sound[i];
            }
            length+=write(wav, monoBuffer, result);
        }
        length +=bytesWritten;
      if(length<0) {
        recording=false;
        perror("dev/dsp's is a lookin' messy");
        QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
          break;
          return FALSE;
      }
      //       printf("%d\r",length);
      //       fflush(stdout);
      qApp->processEvents();
    }
    //  qDebug("file has length of %d lasting %d seconds",
    //         length, (( length / speed) / channels) / 2 );
    //  }
  //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<//
  value = length+36;
  lseek(wav, 4, SEEK_SET);
  write(wav, &value, 4);
  lseek(wav, 40, SEEK_SET);
  write(wav, &length, 4);
  track.close();
  qDebug("Track closed");
  
  if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
    perror("ioctl(\"SNDCTL_DSP_RESET\")");
  ::close(dsp);
      Config cfgO("OpieRec");
      cfgO.setGroup("Sounds");
      int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
      QString currentFileName = fileName;
      QString currentFile = "vm_"+ date;
      
      float numberOfRecordedSeconds=(float) length / (float)speed * (float)2;
      cfgO.writeEntry( "NumberofFiles", nFiles + 1);
      cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
      cfgO.writeEntry( currentFile, currentFileName);
      QString time;
      time.sprintf("%.2f", numberOfRecordedSeconds);
      cfgO.writeEntry( currentFileName, time );
      //      qDebug("writing config numberOfRecordedSeconds "+time);
      cfgO.write();
      qDebug("done recording "+fileName);
  Config cfg("qpe");
  cfg.setGroup("Volume");
  QString foo = cfg.readEntry("Mute","TRUE");
  if(foo.find("TRUE",0,TRUE) != -1)
    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
 return TRUE;
 }
 int VMemo::setToggleButton(int tog) {
  for( int i=0; i < 10;i++) {
    switch (tog) {
    case 0:
      return -1; 
      break; 
    case 1:
      return 0; 
      break; 
    case 2:
        return Key_F24; //was Escape
      break; 
    case 3:
      return Key_Space;
      break; 
    case 4:
      return Key_F12;
      break; 
    case 5:
      return Key_F9;
      break; 
    case 6:
      return Key_F10;
      break; 
    case 7:
      return Key_F11;
      break; 
    case 8:
      return Key_F13;
      break; 
    };
  }
  return -1;
 }
 void VMemo::timerBreak() {
  //stop
    stopRecording();
  QMessageBox::message("Vmemo","Vmemo recording has ended");
 }
-Q_EXPORT_INTERFACE()
-{
+EXPORT_OPIE_APPLET_v1( VMemo )
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VMemo> );
-}
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in
index 1233d9f..f097591 100644
--- a/core/applets/volumeapplet/config.in
+++ b/core/applets/volumeapplet/config.in
@@ -1,4 +1,4 @@
  config VOLUMEAPPLET
    boolean "opie-volumeapplet (set volume for microphone and speaker)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index 942cebb..276f47f 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -1,177 +1,178 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "volume.h"
 #include "oledbox.h"
 #include <opie2/odevice.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpainter.h>
 #include <qcheckbox.h>
 #include <qslider.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qtimer.h>
 #include <stdio.h>
-using namespace Opie;
+using namespace Opie::Core;
 #define RATE_TIMER_INTERVAL 100
 // Ten times per second is fine (RATE_TIMER_INTERVAL 100).  A shorter time
 // results in "hanging" buttons on the iPAQ due to quite high CPU consumption.
 /* XPM */
+using namespace Opie::Ui;
 static const char * vol_xpm[] = {
 "20 20 3 1",
 "   c None",
 ".  c #0000FF",
 "+  c #000000",
 "                    ",
 "        .           ",
 "        . . . .     ",
 "    . . . . . .     ",
 "    . . . . . . .   ",
 "    . . ..... . .   ",
 "  . ... ..... ...   ",
 "  ........... ....  ",
 "  ................. ",
 "++++++++++++++++++++",
 " .................. ",
 "  . ............. . ",
 "  . ..... .......   ",
 "    . ... ..... .   ",
 "    . ... ..... .   ",
 "    . ... .....     ",
 "    .  .  . . .     ",
 "       .  . .       ",
 "       .  . .       ",
 "                    "};
 /* XPM */
 static const char * mic_xpm[] = {
 "20 20 21 1",
 "   c None",
 ".  c #000000",
 "+  c #EEEEEE",
 "@  c #B4B6B4",
 "#  c #8B8D8B",
 "$  c #D5D6D5",
 "%  c #E6E6E6",
 "&  c #9C9D9C",
 "*  c #6A696A",
 "=  c #E6E2E6",
 "-  c #F6F2F6",
 ";  c #CDC6CD",
 ">  c #737573",
 ",  c #4A484A",
 "'  c #DEDEDE",
 ")  c #F6EEF6",
 "!  c #414041",
 "~  c #202020",
 "{  c #ACAEAC",
 "]  c #838583",
 "^  c #6A656A",
 "                    ",
 "            ....    ",
 "           .+@+#.   ",
 "          ..$%&%*.  ",
 "         .=-.;=>=,. ",
 "         .'+).&+!+. ",
 "         .+;+;.~+~. ",
 "         ..%{%,.... ",
 "         ..&=>=~..  ",
 "        .+..]^,..   ",
 "       .+.......    ",
 "      .%...         ",
 "     .=...          ",
 "    .+...           ",
 "   .+...            ",
 "   ....             ",
 "  ....              ",
 "  ..                ",
 " .                  ",
 ".                   "};
 static const char * bass_xpm[] = {
 "20 20 3 1",
 "       c None",
 ".      c #000000",
 "+      c #0000FF",
 "                    ",
 "                    ",
 "                    ",
 ".....   +++   ......",
 "      +++++++       ",
 "     ++    ++       ",
 "... ++ ...  ++  ++ .",
 "    +++     ++  ++  ",
 "    ++++    ++      ",
 "... ++++ .. ++ .....",
 "     ++    ++       ",
 "           ++   ++  ",
 "..........++    ++ .",
 "         ++         ",
 "        ++          ",
 "...... ++  .........",
 "       +            ",
 "                    ",
 "                    ",
 "                    "};
 static const char * treble_xpm[] = {
 "20 20 3 1",
 "       c None",
 ".      c #0000FF",
 "+      c #000000",
 "          ..        ",
 "         . ..       ",
 "         . ..       ",
 "++++++++ . .. ++++++",
 "         . .        ",
 "         ...        ",
 "++++++++ .   +++++++",
 "        ..          ",
 "      .. .          ",
 "+++  ..  ... +++++++",
 "    ..  .. ..       ",
 "    .. . .  ..      ",
 "+++ .. . . + . +++++",
 "    ..   .  ..      ",
 "     ..  . ..       ",
 "++++  ...... +++++++",
 "         .          ",
 "      .. .          ",
 "      .. .          ",
 "       ..           "};
 /* XPM */
@@ -652,132 +653,129 @@ void VolumeControl::alarmMoved ( int percent )
  // clamp volume percent to be between 0 and 100
  m_alarm_percent = ( m_alarm_percent < 0 ) ? 0 : (( m_alarm_percent > 100 ) ? 100 : m_alarm_percent );
  writeConfigEntry ( "AlarmPercent", m_alarm_percent, UPD_None );
 }
 void VolumeControl::bassMoved ( int percent )
 {
  m_bass_percent = 100 - percent;
  // clamp bass percent to be between 0 and 100
  m_bass_percent = ( m_bass_percent < 0 ) ? 0 : (( m_bass_percent > 100 ) ? 100 : m_bass_percent );
  writeConfigEntry ( "BassPercent", m_bass_percent, UPD_Bass );
 }
 void VolumeControl::trebleMoved ( int percent )
 {
  m_treble_percent = 100 - percent;
  // clamp treble percent to be between 0 and 100
  m_treble_percent = ( m_treble_percent < 0 ) ? 0 : (( m_treble_percent > 100 ) ? 100 : m_treble_percent );
  writeConfigEntry ( "TreblePercent", m_treble_percent, UPD_Treble );
 }
 void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd )
 {
  Config cfg ( "qpe" );
  cfg. setGroup ( "Volume" );
  cfg. writeEntry ( entry, val );
 //  cfg. write ( );
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
  switch ( upd ) {
    case UPD_Vol: {
      QCopEnvelope ( "QPE/System", "volumeChange(bool)" ) << m_vol_muted;
      break;
    }
    case UPD_Mic: {
      QCopEnvelope ( "QPE/System", "micChange(bool)" ) << m_mic_muted;
      break;
    }
    case UPD_Bass: {
      QCopEnvelope ( "QPE/System", "bassChange(bool)" ) << true;
      break;
    }
    case UPD_Treble: {
      QCopEnvelope ( "QPE/System", "trebleChange(bool)" ) << true;
      break;
    }
    case UPD_None:
      break;
  }
 #endif
 }
 //===========================================================================
 VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
    : QWidget( parent, name )
 {
  setFixedWidth ( AppLnk::smallIconSize()  );
  setFixedHeight ( AppLnk::smallIconSize()+4 );
  m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" ));
  m_dialog = new VolumeControl ( this, true, this, "volumecontrol" );
  connect ( qApp, SIGNAL( volumeChanged(bool)), m_dialog, SLOT( volumeChanged(bool)));
  connect ( qApp, SIGNAL( micChanged(bool)), m_dialog, SLOT ( micChanged(bool)));
 }
 VolumeApplet::~VolumeApplet()
 {
  delete m_pixmap;
 }
 int VolumeApplet::position()
 {
  return 6;
 }
 void VolumeApplet::mousePressEvent ( QMouseEvent * )
 {
  if ( m_dialog-> isVisible ( ))
    m_dialog-> hide ( );
  else
    m_dialog-> show ( true );
 }
 void VolumeApplet::redraw ( bool all )
 {
        if ( all )
                repaint ( true );
        else
                repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false );
 }
 void VolumeApplet::paintEvent ( QPaintEvent * )
 {
  QPainter p ( this );
  p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap );
  p. setPen ( darkGray );
  p. drawRect ( 1, height() - 4, width() - 2, 4 );
  int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100;
  p. fillRect ( 2, height() - 3, pixelsWide, 2, red );
  p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray );
  if ( m_dialog-> volMuted ( )) {
    p. setPen ( red );
    p. drawLine ( 1, 2, width() - 2, height() - 5 );
    p. drawLine ( 1, 3, width() - 2, height() - 4 );
    p. drawLine ( width() - 2, 2, 1, height() - 5 );
    p. drawLine ( width() - 2, 3, 1, height() - 4 );
  }
 }
-Q_EXPORT_INTERFACE()
+EXPORT_OPIE_APPLET_v1( VolumeApplet )
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> );
-}
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index b14956e..b478ed1 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,13 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on release
        HEADERS         = volume.h oledbox.h
        SOURCES         = volume.cpp oledbox.cpp
        TARGET  = volumeapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
        VERSION         = 1.0.0
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/vtapplet/config.in b/core/applets/vtapplet/config.in
index 85692a5..8fe4200 100644
--- a/core/applets/vtapplet/config.in
+++ b/core/applets/vtapplet/config.in
@@ -1,4 +1,4 @@
  config VTAPPLET
    boolean "VT (switch to another virtual terminal)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/core/obex/config.in b/core/obex/config.in
index ef09f7a..c0208d1 100644
--- a/core/obex/config.in
+++ b/core/obex/config.in
@@ -1,4 +1,4 @@
  config OBEX
    boolean "libopieobex0 (library needed for beaming in Opie)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
diff --git a/core/obex/obex.cc b/core/obex/obex.cc
index 50e5201..3c99af6 100644
--- a/core/obex/obex.cc
+++ b/core/obex/obex.cc
@@ -1,199 +1,200 @@
 #include <qfileinfo.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 #include "obex.h"
 using namespace  OpieObex;
+using namespace Opie::Core;
 /* TRANSLATOR OpieObex::Obex */
 Obex::Obex( QObject *parent, const char* name )
  : QObject(parent, name )
 {
    m_rec = 0;
    m_send=0;
    m_count = 0;
    m_receive = false;
    connect( this, SIGNAL(error(int) ), // for recovering to receive
             SLOT(slotError() ) );
    connect( this, SIGNAL(sent(bool) ),
             SLOT(slotError() ) );
 };
 Obex::~Obex() {
    delete m_rec;
    delete m_send;
 }
 void Obex::receive()  {
    m_receive = true;
    m_outp = QString::null;
    qWarning("Receive" );
    m_rec = new OProcess();
    *m_rec << "irobex_palm3";
    // connect to the necessary slots
-    connect(m_rec,  SIGNAL(processExited(OProcess*) ),
+    connect(m_rec,  SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this,  SLOT(slotExited(OProcess*) ) );
+            this,  SLOT(slotExited(Opie::Core::OProcess*) ) );
-    connect(m_rec,  SIGNAL(receivedStdout(OProcess*, char*,  int ) ),
+    connect(m_rec,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
-            this,  SLOT(slotStdOut(OProcess*, char*, int) ) );
+            this,  SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
    if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
        qWarning("could not start :(");
        emit done( false );
        delete m_rec;
        m_rec = 0;
    }
 //    emit currentTry(m_count );
 }
 void Obex::send( const QString& fileName) { // if currently receiving stop it send receive
    m_count = 0;
    m_file = fileName;
    qWarning("send %s", fileName.latin1() );
    if (m_rec != 0 ) {
        qWarning("running");
        if (m_rec->isRunning() ) {
            emit error(-1 );
            qWarning("is running");
            delete m_rec;
            m_rec = 0;
        }else{
            qWarning("is not running");
            emit error( -1 ); // we did not delete yet but it's not running slotExited is pending
            return;
        }
    }
    sendNow();
 }
 void Obex::sendNow(){
    qWarning("sendNow");
    if ( m_count >= 25 ) { // could not send
        emit error(-1 );
        emit sent(false);
        return;
    }
    // OProcess inititialisation
    m_send = new OProcess();
    *m_send << "irobex_palm3";
    *m_send << QFile::encodeName(m_file);
    // connect to slots Exited and and StdOut
-    connect(m_send,  SIGNAL(processExited(OProcess*) ),
+    connect(m_send,  SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this, SLOT(slotExited(OProcess*)) );
+            this, SLOT(slotExited(Opie::Core::OProcess*)) );
-    connect(m_send,  SIGNAL(receivedStdout(OProcess*, char*,  int )),
+    connect(m_send,  SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int )),
-            this, SLOT(slotStdOut(OProcess*, char*, int) ) );
+            this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) );
    // now start it
    if (!m_send->start(/*OProcess::NotifyOnExit,  OProcess::AllOutput*/ ) ) {
        qWarning("could not send" );
        m_count = 25;
        emit error(-1 );
        delete m_send;
        m_send=0;
    }
    // end
    m_count++;
    emit currentTry( m_count );
 }
 void Obex::slotExited(OProcess* proc ){
    if (proc == m_rec ) { // receive process
        received();
    }else if ( proc == m_send ) {
        sendEnd();
    }
 }
 void Obex::slotStdOut(OProcess* proc, char* buf, int len){
    if ( proc == m_rec ) { // only receive
        QByteArray ar( len  );
        memcpy( ar.data(), buf, len );
        qWarning("parsed: %s", ar.data() );
        m_outp.append( ar );
    }
 }
 void Obex::received() {
  if (m_rec->normalExit() ) {
      if ( m_rec->exitStatus() == 0 ) { // we got one
          QString filename = parseOut();
          qWarning("ACHTUNG %s", filename.latin1() );
          emit receivedFile( filename );
      }
  }else{
      emit done(false);
  };
  delete m_rec;
  m_rec = 0;
  receive();
 }
 void Obex::sendEnd() {
  if (m_send->normalExit() ) {
    if ( m_send->exitStatus() == 0 ) {
      delete m_send;
      m_send=0;
      qWarning("done" );
      emit sent(true);
    }else if (m_send->exitStatus() == 255 ) { // it failed maybe the other side wasn't ready
      // let's try it again
      delete m_send;
      m_send = 0;
      qWarning("try sending again" );
      sendNow();
    }
  }else {
    emit error( -1 );
    delete m_send;
    m_send = 0;
  }
 }
 QString Obex::parseOut(     ){
  QString path;
  QStringList list = QStringList::split("\n",  m_outp);
  QStringList::Iterator it;
  for (it = list.begin(); it != list.end(); ++it ) {
    if ( (*it).startsWith("Wrote"  ) ) {
        int pos = (*it).findRev('(' );
        if ( pos > 0 ) {
            qWarning( "%d %s", pos,  (*it).mid(6 ).latin1() ) ;
            qWarning("%d %d",  (*it).length(),  (*it).length()-pos );
            path = (*it).remove( pos, (*it).length() - pos );
            qWarning("%s",  path.latin1() );
            path = path.mid(6 );
            path = path.stripWhiteSpace();
            qWarning("path %s", path.latin1() );
        }
    }
  }
  return path;
 }
 /**
 * when sent is done slotError is called we  will start receive again
 */
 void Obex::slotError() {
    qWarning("slotError");
    if ( m_receive )
        receive();
 };
 void Obex::setReceiveEnabled( bool receive ) {
    if ( !receive ) { //
        m_receive = false;
        shutDownReceive();
    }
 }
 void Obex::shutDownReceive() {
    if (m_rec != 0 ) {
        qWarning("running");
        if (m_rec->isRunning() ) {
            emit error(-1 );
            qWarning("is running");
            delete m_rec;
            m_rec = 0;
        }
    }
 }
diff --git a/core/obex/obex.h b/core/obex/obex.h
index 60f5d28..284cb12 100644
--- a/core/obex/obex.h
+++ b/core/obex/obex.h
@@ -1,84 +1,84 @@
 #ifndef OpieObex_H
 #define OpieObex_H
 #include <qobject.h>
-class OProcess;
+namespace Opie {namespace Core {class OProcess;}}
 class QCopChannel;
 namespace OpieObex {
  class Obex : public QObject {
      Q_OBJECT
  public:
      /**
       * Obex c'tor look
       */
      Obex( QObject *parent, const char* name);
      /**
       * d'tor
       */
      ~Obex();
      /**
       *  Starting listening to irda after enabled by the applet
       * a  signal gets emitted when recieved a file
       */
      void receive();
      void send( const QString& );
      void setReceiveEnabled( bool = false );
  signals:
      /**
       * a signal
       * @param path The path to the recieved file
       */
      void receivedFile( const QString& path);
      /**
       * error signal if the program couldn't be started or the
       * the connection timed out
       */
      void error( int );
      /**
       *  The current try to receive data
       */
      void currentTry(unsigned int);
      /**
       * signal sent The file got beamed to the remote location
       */
      void sent(bool);
      void done(bool);
  private:
      uint m_count;
      QString m_file;
      QString m_outp;
-      OProcess *m_send;
+      Opie::Core::OProcess *m_send;
-      OProcess *m_rec;
+      Opie::Core::OProcess *m_rec;
      bool m_receive : 1;
      void shutDownReceive();
 private slots:
      /**
       * send over palm obex
       */
      //void send(const QString&);
      // the process exited
-      void slotExited(OProcess* proc) ;
+      void slotExited(Opie::Core::OProcess* proc) ;
-      void slotStdOut(OProcess*, char*, int);
+      void slotStdOut(Opie::Core::OProcess*, char*, int);
      void slotError();
  private:
      void sendNow();
      QString parseOut();
      void received();
      void sendEnd();
  };
 };
 #endif
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index a296b2c..51fa300 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -1,13 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
-        HEADERS=   obex.h obexhandler.h obexsend.h receiver.h
+        HEADERS=   obex.h obexhandler.h obexsend.h receiver.h obeximpl.h
-        SOURCES=   obex.cc obexsend.cpp obexhandler.cpp receiver.cpp
+        SOURCES=   obex.cc obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp
        TARGET  = opieobex
        DESTDIR         = $(OPIEDIR)/plugins/obex
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
        VERSION         = 0.0.2
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp
index 5b53644..ca6ce7b 100644
--- a/core/obex/obeximpl.cpp
+++ b/core/obex/obeximpl.cpp
@@ -1,32 +1,34 @@
 #include "obexhandler.h"
 #include "obeximpl.h"
 using namespace OpieObex;
 /* TRANSLATOR OpieObex::ObexImpl */
 ObexImpl::ObexImpl() {
    m_handler = new ObexHandler;
 }
 ObexImpl::~ObexImpl() {
    delete m_handler;
 }
 QRESULT ObexImpl::queryInterface( const QUuid& uuid, QUnknownInterface **iface ) {
    *iface = 0;
    if ( uuid == IID_QUnknown ) {
        *iface = this;
    }else if ( uuid == IID_ObexInterface )
        *iface = this;
    else
        return QS_FALSE;
    if (*iface)
        (*iface)->addRef();
    return QS_OK;
 }
 Q_EXPORT_INTERFACE() {
    Q_CREATE_INSTANCE( ObexImpl )
 }
author	zecke <zecke>	2004-03-14 17:37:48 (UTC)
committer	zecke <zecke>	2004-03-14 17:37:48 (UTC)
commit	d69b11f67e3118f86d068c38c422984d754e13cc (patch) (unidiff)
tree	9733e26ab49003bead06d820d70a14babd0c09f0
parent	64820b76cc9d1c06a6967cd34114f3b95896aaeb (diff)
download	opie-d69b11f67e3118f86d068c38c422984d754e13cc.zip opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.gz opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.bz2