30 files changed, 16 insertions, 35 deletions
diff --git a/core/applets/batteryapplet/batteryappletimpl.cpp b/core/applets/batteryapplet/batteryappletimpl.cpp
index 9ad0382..7cc5f50 100644
--- a/core/applets/batteryapplet/batteryappletimpl.cpp
+++ b/core/applets/batteryapplet/batteryappletimpl.cpp
@@ -1,49 +1,49 @@
 /**********************************************************************
 ** 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 "batteryappletimpl.h"
 BatteryAppletImpl::BatteryAppletImpl()
-    : battery(0), ref(0)
+    : battery(0)
 {
 }
 BatteryAppletImpl::~BatteryAppletImpl()
 {
    delete battery;
 }
 QWidget *BatteryAppletImpl::applet( QWidget *parent )
 {
    if ( !battery )
        battery = new BatteryMeter( parent );
    return battery;
 }
 int BatteryAppletImpl::position() const
 {
    return 8;
 }
 QRESULT BatteryAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
    if ( uuid == IID_QUnknown )
diff --git a/core/applets/batteryapplet/batteryappletimpl.h b/core/applets/batteryapplet/batteryappletimpl.h
index 94f49db..99654e3 100644
--- a/core/applets/batteryapplet/batteryappletimpl.h
+++ b/core/applets/batteryapplet/batteryappletimpl.h
@@ -17,28 +17,27 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef BATTERYAPPLETIMPL_H
 #define BATTERYAPPLETIMPL_H
 #include <qpe/taskbarappletinterface.h>
 class BatteryMeter;
 class BatteryAppletImpl : public TaskbarAppletInterface
 {
 public:
    BatteryAppletImpl();
    virtual ~BatteryAppletImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    BatteryMeter *battery;
-    ulong ref;
 };
 #endif
diff --git a/core/applets/cardmon/cardmonimpl.cpp b/core/applets/cardmon/cardmonimpl.cpp
index 265214e..7b144d4 100644
--- a/core/applets/cardmon/cardmonimpl.cpp
+++ b/core/applets/cardmon/cardmonimpl.cpp
@@ -1,30 +1,30 @@
 #include "cardmon.h"
 #include "cardmonimpl.h"
 CardMonitorImpl::CardMonitorImpl()
-    : cardMonitor(0), ref(0) {
+    : cardMonitor(0) {
 }
 CardMonitorImpl::~CardMonitorImpl() {
    delete cardMonitor;
 }
 QWidget *CardMonitorImpl::applet( QWidget *parent ) {
    if ( !cardMonitor ) {
        cardMonitor = new CardMonitor( parent );
    }
    return cardMonitor;
 }
 int CardMonitorImpl::position() const {
    return 7;
 }
 QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
    *iface = 0;
    if ( uuid == IID_QUnknown ) {
        *iface = this;
    } else if ( uuid == IID_TaskbarApplet ) {
        *iface = this;
    } else {
diff --git a/core/applets/cardmon/cardmonimpl.h b/core/applets/cardmon/cardmonimpl.h
index ec2d871..26b7fe5 100644
--- a/core/applets/cardmon/cardmonimpl.h
+++ b/core/applets/cardmon/cardmonimpl.h
@@ -1,19 +1,18 @@
 #include <qpe/taskbarappletinterface.h>
 class CardMonitor;
 class CardMonitorImpl : public TaskbarAppletInterface {
 public:
    CardMonitorImpl();
    virtual ~CardMonitorImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    CardMonitor *cardMonitor;
-    ulong ref;
 };
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.cpp b/core/applets/clipboardapplet/clipboardappletimpl.cpp
index 8fcf117..f454529 100644
--- a/core/applets/clipboardapplet/clipboardappletimpl.cpp
+++ b/core/applets/clipboardapplet/clipboardappletimpl.cpp
@@ -1,49 +1,49 @@
 /**********************************************************************
 ** 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 "clipboardappletimpl.h"
 ClipboardAppletImpl::ClipboardAppletImpl()
-    : clipboard(0), ref(0)
+    : clipboard(0)
 {
 }
 ClipboardAppletImpl::~ClipboardAppletImpl()
 {
    delete clipboard;
 }
 QWidget *ClipboardAppletImpl::applet( QWidget *parent )
 {
    if ( !clipboard )
        clipboard = new ClipboardApplet( parent );
    return clipboard;
 }
 int ClipboardAppletImpl::position() const
 {
    return 6;
 }
 QRESULT ClipboardAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
    if ( uuid == IID_QUnknown )
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.h b/core/applets/clipboardapplet/clipboardappletimpl.h
index 0426109..497360c 100644
--- a/core/applets/clipboardapplet/clipboardappletimpl.h
+++ b/core/applets/clipboardapplet/clipboardappletimpl.h
@@ -17,28 +17,27 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef CLIPBOARDAPPLETIMPL_H
 #define CLIPBOARDAPPLETIMPL_H
 #include <qpe/taskbarappletinterface.h>
 class ClipboardApplet;
 class ClipboardAppletImpl : public TaskbarAppletInterface
 {
 public:
    ClipboardAppletImpl();
    virtual ~ClipboardAppletImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    ClipboardApplet *clipboard;
-    ulong ref;
 };
 #endif
diff --git a/core/applets/clockapplet/clockappletimpl.cpp b/core/applets/clockapplet/clockappletimpl.cpp
index 2b9cc05..7481f19 100644
--- a/core/applets/clockapplet/clockappletimpl.cpp
+++ b/core/applets/clockapplet/clockappletimpl.cpp
@@ -1,49 +1,49 @@
 /**********************************************************************
 ** 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 "clockappletimpl.h"
 ClockAppletImpl::ClockAppletImpl()
-    : clock(0), ref(0)
+    : clock(0)
 {
 }
 ClockAppletImpl::~ClockAppletImpl()
 {
    delete clock;
 }
 QWidget *ClockAppletImpl::applet( QWidget *parent )
 {
    if ( !clock )
        clock = new LauncherClock( parent );
    return clock;
 }
 int ClockAppletImpl::position() const
 {
    return 10;
 }
 #ifndef QT_NO_COMPONENT
 QRESULT ClockAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
diff --git a/core/applets/clockapplet/clockappletimpl.h b/core/applets/clockapplet/clockappletimpl.h
index 0c0912e..1f9c8f0 100644
--- a/core/applets/clockapplet/clockappletimpl.h
+++ b/core/applets/clockapplet/clockappletimpl.h
@@ -19,28 +19,27 @@
 **********************************************************************/
 #ifndef CLOCKAPPLETIMPL_H
 #define CLOCKAPPLETIMPL_H
 #include <qpe/taskbarappletinterface.h>
 class LauncherClock;
 class ClockAppletImpl : public TaskbarAppletInterface
 {
 public:
    ClockAppletImpl();
    virtual ~ClockAppletImpl();
 #ifndef QT_NO_COMPONENT
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
 #endif
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    LauncherClock *clock;
-    ulong ref;
 };
 #endif
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index 36307ab..455575f 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -1,36 +1,36 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qapplication.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 #include "home.h"
 HomeApplet::HomeApplet ( )
-        : QObject ( 0, "HomeApplet" ), ref ( 0 )
+        : QObject ( 0, "HomeApplet" )
 {
 }
 HomeApplet::~HomeApplet ( )
 {
 }
 int HomeApplet::position ( ) const
 {
    return 4;
 }
 QString HomeApplet::name ( ) const
 {
        return tr( "Home shortcut" );
 }
 QString HomeApplet::text ( ) const
 {
        return tr( "Desktop" );
 }
 QString HomeApplet::tr( const char* s ) const
 {
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h
index 1186caf..22ecd47 100644
--- a/core/applets/homeapplet/home.h
+++ b/core/applets/homeapplet/home.h
@@ -21,29 +21,27 @@
 #define __OPIE_HOME_APPLET_H__
 #include <qpe/menuappletinterface.h>
 class HomeApplet : public QObject, public MenuAppletInterface
 {
 public:
    HomeApplet ( );
    virtual ~HomeApplet ( );
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual int position() const;
    virtual QString name ( ) const;
    virtual QIconSet icon ( ) const;
    virtual QString text ( ) const;
    virtual QString tr( const char* ) const;
    virtual QString tr( const char*, const char* ) const;
    virtual QPopupMenu *popup ( QWidget *parent ) const;
    virtual void activated ( );
-private:
-    ulong ref;
 };
 #endif
diff --git a/core/applets/irdaapplet/irdaappletimpl.cpp b/core/applets/irdaapplet/irdaappletimpl.cpp
index 3617698..33d98af 100644
--- a/core/applets/irdaapplet/irdaappletimpl.cpp
+++ b/core/applets/irdaapplet/irdaappletimpl.cpp
@@ -1,49 +1,49 @@
 /**********************************************************************
 ** 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 "irda.h"
 #include "irdaappletimpl.h"
 IrdaAppletImpl::IrdaAppletImpl()
-    : irda(0), ref(0)
+    : irda(0)
 {
 }
 IrdaAppletImpl::~IrdaAppletImpl()
 {
    delete irda;
 }
 QWidget *IrdaAppletImpl::applet( QWidget *parent )
 {
    if ( !irda )
  irda = new IrdaApplet( parent );
    return irda;
 }
 int IrdaAppletImpl::position() const
 {
    return 6;
 }
 QRESULT IrdaAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
    if ( uuid == IID_QUnknown )
diff --git a/core/applets/irdaapplet/irdaappletimpl.h b/core/applets/irdaapplet/irdaappletimpl.h
index f9e855a..024cc06 100644
--- a/core/applets/irdaapplet/irdaappletimpl.h
+++ b/core/applets/irdaapplet/irdaappletimpl.h
@@ -19,28 +19,27 @@
 **********************************************************************/
 #ifndef IRDAAPPLETIMPL_H
 #define IRDAAPPLETIMPL_H
 #include <qwidget.h>
 #include <qpe/taskbarappletinterface.h>
 class IrdaApplet;
 class IrdaAppletImpl : public TaskbarAppletInterface
 {
 public:
    IrdaAppletImpl();
    virtual ~IrdaAppletImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    IrdaApplet *irda;
-    ulong ref;
 };
 #endif
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp
index 8d3cdba..92222c9 100644
--- a/core/applets/logoutapplet/logout.cpp
+++ b/core/applets/logoutapplet/logout.cpp
@@ -1,39 +1,39 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qapplication.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <unistd.h>
 #include "logout.h"
 LogoutApplet::LogoutApplet ( )
-        : QObject ( 0, "LogoutApplet" ), ref ( 0 )
+        : QObject ( 0, "LogoutApplet" )
 {
 }
 LogoutApplet::~LogoutApplet ( )
 {
 }
 int LogoutApplet::position ( ) const
 {
    return 0;
 }
 QString LogoutApplet::name ( ) const
 {
        return tr( "Logout shortcut" );
 }
 QString LogoutApplet::text ( ) const
 {
        return tr( "Logout" );
 }
 QString LogoutApplet::tr( const char* s ) const
 {
diff --git a/core/applets/logoutapplet/logout.h b/core/applets/logoutapplet/logout.h
index 3fcb295..a991f65 100644
--- a/core/applets/logoutapplet/logout.h
+++ b/core/applets/logoutapplet/logout.h
@@ -21,29 +21,27 @@
 #define __OPIE_LOGOUT_APPLET_H__
 #include <qpe/menuappletinterface.h>
 class LogoutApplet : public QObject, public MenuAppletInterface
 {
 public:
    LogoutApplet ( );
    virtual ~LogoutApplet ( );
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual int position() const;
    virtual QString name ( ) const;
    virtual QIconSet icon ( ) const;
    virtual QString text ( ) const;
    virtual QString tr( const char* ) const;
    virtual QString tr( const char*, const char* ) const;
    virtual QPopupMenu *popup ( QWidget *parent ) const;
    virtual void activated ( );
-private:
-    ulong ref;
 };
 #endif
diff --git a/core/applets/multikeyapplet/multikeyappletimpl.cpp b/core/applets/multikeyapplet/multikeyappletimpl.cpp
index adf92c4..9fa6ef1 100644
--- a/core/applets/multikeyapplet/multikeyappletimpl.cpp
+++ b/core/applets/multikeyapplet/multikeyappletimpl.cpp
@@ -1,42 +1,42 @@
 /**********************************************************************
 ** 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"
 #include "multikeyappletimpl.h"
 MultikeyAppletImpl::MultikeyAppletImpl()
-    : kbd(0), ref(0)
+    : kbd(0)
 {
 }
 MultikeyAppletImpl::~MultikeyAppletImpl()
 {
    delete kbd;
 }
 QWidget *MultikeyAppletImpl::applet( QWidget *parent )
 {
    if ( !kbd )
        kbd = new Multikey(parent);
    return kbd;
 }
 int MultikeyAppletImpl::position() const
 {
    return 10;
 }
 #ifndef QT_NO_COMPONENT
 QRESULT MultikeyAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
diff --git a/core/applets/multikeyapplet/multikeyappletimpl.h b/core/applets/multikeyapplet/multikeyappletimpl.h
index c77e347..68962ee 100644
--- a/core/applets/multikeyapplet/multikeyappletimpl.h
+++ b/core/applets/multikeyapplet/multikeyappletimpl.h
@@ -13,28 +13,27 @@
 **********************************************************************/
 #ifndef __MULTIKEYAPPLETIMPL_H__
 #define __MULTIKEYAPPLETIMPL_H__
 #include <qpe/taskbarappletinterface.h>
 class Multikey;
 class MultikeyAppletImpl : public TaskbarAppletInterface
 {
 public:
    MultikeyAppletImpl();
    virtual ~MultikeyAppletImpl();
 #ifndef QT_NO_COMPONENT
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
 #endif
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    Multikey *kbd;
-    ulong ref;
 };
 #endif /* __MULTIKEYAPPLETIMPL_H__ */
diff --git a/core/applets/restartapplet/restartappletimpl.cpp b/core/applets/restartapplet/restartappletimpl.cpp
index 5b0092d..d8e10d3 100644
--- a/core/applets/restartapplet/restartappletimpl.cpp
+++ b/core/applets/restartapplet/restartappletimpl.cpp
@@ -1,49 +1,49 @@
 /**********************************************************************
 ** 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 "restart.h"
 #include "restartappletimpl.h"
 RestartAppletImpl::RestartAppletImpl()
-    : restart(0), ref(0)
+    : restart(0)
 {
 }
 RestartAppletImpl::~RestartAppletImpl()
 {
    delete restart;
 }
 QWidget *RestartAppletImpl::applet( QWidget *parent )
 {
    qDebug("restart applet");
    if ( !restart )
        restart = new RestartApplet( parent );
    return restart;
 }
 int RestartAppletImpl::position() const
 {
    return 6;
 }
 QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
diff --git a/core/applets/restartapplet/restartappletimpl.h b/core/applets/restartapplet/restartappletimpl.h
index cdda49c..db2b821 100644
--- a/core/applets/restartapplet/restartappletimpl.h
+++ b/core/applets/restartapplet/restartappletimpl.h
@@ -17,28 +17,27 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef RESTARTAPPLETIMPL_H
 #define RESTARTAPPLETIMPL_H
 #include <qpe/taskbarappletinterface.h>
 class RestartApplet;
 class RestartAppletImpl : public TaskbarAppletInterface
 {
 public:
    RestartAppletImpl();
    virtual ~RestartAppletImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    RestartApplet *restart;
-    ulong ref;
 };
 #endif
diff --git a/core/applets/restartapplet2/restart.cpp b/core/applets/restartapplet2/restart.cpp
index 576087b..a169505 100644
--- a/core/applets/restartapplet2/restart.cpp
+++ b/core/applets/restartapplet2/restart.cpp
@@ -21,49 +21,49 @@ static char *restart_xpm[] = {
 "$  c #808080",
 "%  c #FFA858",
 "&  c #FFDCA8",
 "*  c #FFFFC0",
 "=  c #FFFFFF",
 "-  c #585858",
 "       ..       ",
 "   .. .++. ..   ",
 "  .+@.@##@.@+.  ",
 "  .@+$@%%@$+@.  ",
 "   .$%%&%&%$.   ",
 " ..+@%&$$%&@+.. ",
 ".+#@%&%@@&*%@#+.",
 ".$@+$&*&&=*$+@$.",
 " .--+$&*=&$+--. ",
 "  .$#++$$++#$.  ",
 " .@=$-$++$-$=@. ",
 " .+@-..@@..-@+. ",
 "  ... .+=. ...  ",
 "      .-$.      ",
 "       ..       ",
 "                "};
 RestartApplet::RestartApplet ( )
-  : QObject ( 0, "RestartApplet" ), ref ( 0 )
+  : QObject ( 0, "RestartApplet" )
 {
 }
 RestartApplet::~RestartApplet ( )
 {
 }
 int RestartApplet::position ( ) const
 {
    return 4;
 }
 QString RestartApplet::name ( ) const
 {
  return tr( "Restart" );
 }
 QString RestartApplet::text ( ) const
 {
  return tr( "Restart Opie" );
 }
 QIconSet RestartApplet::icon ( ) const
 {
diff --git a/core/applets/restartapplet2/restart.h b/core/applets/restartapplet2/restart.h
index 9536886..6939b28 100644
--- a/core/applets/restartapplet2/restart.h
+++ b/core/applets/restartapplet2/restart.h
@@ -9,29 +9,27 @@
 **********************************************************************/
 #ifndef __OPIE_RESTART_APPLET_H__
 #define __OPIE_RESTART_APPLET_H__
 #include <qpe/menuappletinterface.h>
 class RestartApplet : public QObject, public MenuAppletInterface
 {
 public:
    RestartApplet ( );
    virtual ~RestartApplet ( );
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual int position() const;
    
    virtual QString name ( ) const;
    virtual QIconSet icon ( ) const;
    virtual QString text ( ) const;
    virtual QPopupMenu *popup ( QWidget *parent ) const;
    
    virtual void activated ( );
-private:
-    ulong ref;
 };
 #endif
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index b676c74..cf3f28b 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -26,49 +26,49 @@
                             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 <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 using namespace Opie;
 /* QT */
 #include <qiconset.h>
 #include <qpopupmenu.h>
 #include <time.h>
 RotateApplet::RotateApplet()
-             :QObject( 0, "RotateApplet" ), ref( 0 ), m_flipped( false )
+             :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;
diff --git a/core/applets/rotateapplet/rotate.h b/core/applets/rotateapplet/rotate.h
index 4403c7d..2396993 100644
--- a/core/applets/rotateapplet/rotate.h
+++ b/core/applets/rotateapplet/rotate.h
@@ -43,30 +43,29 @@ class RotateApplet : public QObject, public MenuAppletInterface
 public:
    RotateApplet ( );
    virtual ~RotateApplet ( );
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual int position() const;
    
    virtual QString name ( ) const;
    virtual QIconSet icon ( ) const;
    virtual QString text ( ) const;
    /* virtual QString tr( const char* ) const;
    virtual QString tr( const char*, const char* ) const;
    */
    virtual QPopupMenu *popup ( QWidget *parent ) const;
    virtual void activated ( );
    virtual void rotateDefault ( );
 private slots:
    void channelReceived( const QCString &msg, const QByteArray & data );
 private:
-    ulong ref;
+    bool m_flipped : 1;
-    bool m_flipped;
 };
 #endif
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.cpp b/core/applets/screenshotapplet/screenshotappletimpl.cpp
index 4a7512e..e99ecb0 100644
--- a/core/applets/screenshotapplet/screenshotappletimpl.cpp
+++ b/core/applets/screenshotapplet/screenshotappletimpl.cpp
@@ -1,49 +1,49 @@
 /**********************************************************************
 ** 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 "screenshot.h"
 #include "screenshotappletimpl.h"
 ScreenshotAppletImpl::ScreenshotAppletImpl()
-    : screenshot(0), ref(0)
+    : screenshot(0)
 {
 }
 ScreenshotAppletImpl::~ScreenshotAppletImpl()
 {
    delete screenshot;
 }
 QWidget *ScreenshotAppletImpl::applet( QWidget *parent )
 {
    if ( !screenshot )
  screenshot = new ScreenshotApplet( parent );
    return screenshot;
 }
 int ScreenshotAppletImpl::position() const
 {
    return 6;
 }
 QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
    if ( uuid == IID_QUnknown )
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.h b/core/applets/screenshotapplet/screenshotappletimpl.h
index 00661a5..988a34c 100644
--- a/core/applets/screenshotapplet/screenshotappletimpl.h
+++ b/core/applets/screenshotapplet/screenshotappletimpl.h
@@ -17,28 +17,27 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef SCREENSHOTAPPLETIMPL_H
 #define SCREENSHOTAPPLETIMPL_H
 #include <qpe/taskbarappletinterface.h>
 class ScreenshotApplet;
 class ScreenshotAppletImpl : public TaskbarAppletInterface
 {
 public:
    ScreenshotAppletImpl();
    virtual ~ScreenshotAppletImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    ScreenshotApplet *screenshot;
-    ulong ref;
 };
 #endif
diff --git a/core/applets/suspendapplet/suspend.cpp b/core/applets/suspendapplet/suspend.cpp
index 63f16b8..e17142b 100644
--- a/core/applets/suspendapplet/suspend.cpp
+++ b/core/applets/suspendapplet/suspend.cpp
@@ -1,36 +1,36 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qapplication.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 #include "suspend.h"
 SuspendApplet::SuspendApplet ( )
-        : QObject ( 0, "SuspendApplet" ), ref ( 0 )
+        : QObject ( 0, "SuspendApplet" )
 {
 }
 SuspendApplet::~SuspendApplet ( )
 {
 }
 int SuspendApplet::position ( ) const
 {
    return 2;
 }
 QString SuspendApplet::name ( ) const
 {
        return tr( "Suspend shortcut" );
 }
 QString SuspendApplet::text ( ) const
 {
        return tr( "Suspend" );
 }
 QString SuspendApplet::tr( const char* s ) const
 {
diff --git a/core/applets/suspendapplet/suspend.h b/core/applets/suspendapplet/suspend.h
index 75467c1..8c54cde 100644
--- a/core/applets/suspendapplet/suspend.h
+++ b/core/applets/suspendapplet/suspend.h
@@ -21,29 +21,27 @@
 #define __OPIE_SUSPEND_APPLET_H__
 #include <qpe/menuappletinterface.h>
 class SuspendApplet : public QObject, public MenuAppletInterface
 {
 public:
    SuspendApplet ( );
    virtual ~SuspendApplet ( );
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual int position() const;
    virtual QString name ( ) const;
    virtual QIconSet icon ( ) const;
    virtual QString text ( ) const;
    virtual QString tr( const char* ) const;
    virtual QString tr( const char*, const char* ) const;
    virtual QPopupMenu *popup ( QWidget *parent ) const;
    virtual void activated ( );
-private:
-    ulong ref;
 };
 #endif
diff --git a/core/applets/vmemo/vmemoimpl.cpp b/core/applets/vmemo/vmemoimpl.cpp
index 71d47e5..7779b83 100644
--- a/core/applets/vmemo/vmemoimpl.cpp
+++ b/core/applets/vmemo/vmemoimpl.cpp
@@ -1,46 +1,46 @@
 /**************************************************************************************94x78**
 **
 ** 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.
 **
 *********************************************************************************************/
 /*
 * $Id$
 */
 #include "vmemo.h"
 #include "vmemoimpl.h"
 VMemoAppletImpl::VMemoAppletImpl()
-        : vmemo(0), ref(0)
+        : vmemo(0)
 {
 }
 VMemoAppletImpl::~VMemoAppletImpl()
 {
    delete vmemo;
 }
 QWidget *VMemoAppletImpl::applet( QWidget *parent )
 {
    if ( !vmemo )
        vmemo = new VMemo( parent );
    return vmemo;
 }
 int VMemoAppletImpl::position() const
 {
    return 6;
 }
 QRESULT VMemoAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
    *iface = 0;
    if ( uuid == IID_QUnknown )
diff --git a/core/applets/vmemo/vmemoimpl.h b/core/applets/vmemo/vmemoimpl.h
index 0b78609..985138b 100644
--- a/core/applets/vmemo/vmemoimpl.h
+++ b/core/applets/vmemo/vmemoimpl.h
@@ -14,28 +14,27 @@
 * $Id$
 */
 #ifndef __VMEMOIMPLAPPLETIMPL_H__
 #define __VMEMOIMPLAPPLETIMPL_H__
 #include <qpe/taskbarappletinterface.h>
 class VMemo;
 class VMemoAppletImpl : public TaskbarAppletInterface
 {
 public:
    VMemoAppletImpl();
    virtual ~VMemoAppletImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    VMemo *vmemo;
-    ulong ref;
 };
 #endif
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp
index 80b3e74..4cbab31 100644
--- a/core/applets/volumeapplet/volumeappletimpl.cpp
+++ b/core/applets/volumeapplet/volumeappletimpl.cpp
@@ -2,49 +2,49 @@
 ** 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 "volumeappletimpl.h"
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 VolumeAppletImpl::VolumeAppletImpl()
-    : volume(0), ref(0)
+    : volume(0)
 {
 }
 VolumeAppletImpl::~VolumeAppletImpl()
 {
        delete volume;
 }
 QWidget *VolumeAppletImpl::applet( QWidget *parent )
 {
        if ( !volume )
                volume = new VolumeApplet( parent );
        return volume;
 }
 int VolumeAppletImpl::position() const
 {
        return 6;
 }
 QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
        *iface = 0;
        if ( uuid == IID_QUnknown )
diff --git a/core/applets/volumeapplet/volumeappletimpl.h b/core/applets/volumeapplet/volumeappletimpl.h
index 9b2952a..a9221c6 100644
--- a/core/applets/volumeapplet/volumeappletimpl.h
+++ b/core/applets/volumeapplet/volumeappletimpl.h
@@ -17,28 +17,27 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef VOLUMEAPPLETIMPL_H
 #define VOLUMEAPPLETIMPL_H
 #include <qpe/taskbarappletinterface.h>
 class VolumeApplet;
 class VolumeAppletImpl : public TaskbarAppletInterface
 {
 public:
    VolumeAppletImpl();
    virtual ~VolumeAppletImpl();
    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
    Q_REFCOUNT
    virtual QWidget *applet( QWidget *parent );
    virtual int position() const;
 private:
    VolumeApplet *volume;
-    ulong ref;
 };
 #endif