summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-05 16:58:04 (UTC)
committer zecke <zecke>2004-02-05 16:58:04 (UTC)
commit416c72588577bca18ba1c9180701143e7e572eed (patch) (side-by-side diff)
tree216727329d2de8cafce72dc811deee77baf24927
parent4c4ed7176231558d01aeca2eb705fc6810ec7766 (diff)
downloadopie-416c72588577bca18ba1c9180701143e7e572eed.zip
opie-416c72588577bca18ba1c9180701143e7e572eed.tar.gz
opie-416c72588577bca18ba1c9180701143e7e572eed.tar.bz2
"Here we are now entertain US....."
Some janitor tasks... remove ulong ref; If we use Q_REFCOUNT
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/batteryappletimpl.cpp2
-rw-r--r--core/applets/batteryapplet/batteryappletimpl.h1
-rw-r--r--core/applets/cardmon/cardmonimpl.cpp2
-rw-r--r--core/applets/cardmon/cardmonimpl.h1
-rw-r--r--core/applets/clipboardapplet/clipboardappletimpl.cpp2
-rw-r--r--core/applets/clipboardapplet/clipboardappletimpl.h1
-rw-r--r--core/applets/clockapplet/clockappletimpl.cpp2
-rw-r--r--core/applets/clockapplet/clockappletimpl.h1
-rw-r--r--core/applets/homeapplet/home.cpp2
-rw-r--r--core/applets/homeapplet/home.h2
-rw-r--r--core/applets/irdaapplet/irdaappletimpl.cpp2
-rw-r--r--core/applets/irdaapplet/irdaappletimpl.h1
-rw-r--r--core/applets/logoutapplet/logout.cpp2
-rw-r--r--core/applets/logoutapplet/logout.h2
-rw-r--r--core/applets/multikeyapplet/multikeyappletimpl.cpp2
-rw-r--r--core/applets/multikeyapplet/multikeyappletimpl.h1
-rw-r--r--core/applets/restartapplet/restartappletimpl.cpp2
-rw-r--r--core/applets/restartapplet/restartappletimpl.h1
-rw-r--r--core/applets/restartapplet2/restart.cpp2
-rw-r--r--core/applets/restartapplet2/restart.h2
-rw-r--r--core/applets/rotateapplet/rotate.cpp2
-rw-r--r--core/applets/rotateapplet/rotate.h3
-rw-r--r--core/applets/screenshotapplet/screenshotappletimpl.cpp2
-rw-r--r--core/applets/screenshotapplet/screenshotappletimpl.h1
-rw-r--r--core/applets/suspendapplet/suspend.cpp2
-rw-r--r--core/applets/suspendapplet/suspend.h2
-rw-r--r--core/applets/vmemo/vmemoimpl.cpp2
-rw-r--r--core/applets/vmemo/vmemoimpl.h1
-rw-r--r--core/applets/volumeapplet/volumeappletimpl.cpp2
-rw-r--r--core/applets/volumeapplet/volumeappletimpl.h1
-rw-r--r--core/obex/obeximpl.h1
31 files changed, 16 insertions, 36 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
@@ -17,17 +17,17 @@
** not clear to you.
**
**********************************************************************/
#include "battery.h"
#include "batteryappletimpl.h"
BatteryAppletImpl::BatteryAppletImpl()
- : battery(0), ref(0)
+ : battery(0)
{
}
BatteryAppletImpl::~BatteryAppletImpl()
{
delete battery;
}
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
@@ -33,12 +33,11 @@ public:
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,14 +1,14 @@
#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 ) {
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
@@ -10,10 +10,9 @@ public:
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
@@ -17,17 +17,17 @@
** not clear to you.
**
**********************************************************************/
#include "clipboard.h"
#include "clipboardappletimpl.h"
ClipboardAppletImpl::ClipboardAppletImpl()
- : clipboard(0), ref(0)
+ : clipboard(0)
{
}
ClipboardAppletImpl::~ClipboardAppletImpl()
{
delete clipboard;
}
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
@@ -33,12 +33,11 @@ public:
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
@@ -17,17 +17,17 @@
** not clear to you.
**
**********************************************************************/
#include "clock.h"
#include "clockappletimpl.h"
ClockAppletImpl::ClockAppletImpl()
- : clock(0), ref(0)
+ : clock(0)
{
}
ClockAppletImpl::~ClockAppletImpl()
{
delete clock;
}
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
@@ -35,12 +35,11 @@ public:
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
@@ -4,17 +4,17 @@
#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
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
@@ -37,13 +37,11 @@ public:
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
@@ -17,17 +17,17 @@
** not clear to you.
**
**********************************************************************/
#include "irda.h"
#include "irdaappletimpl.h"
IrdaAppletImpl::IrdaAppletImpl()
- : irda(0), ref(0)
+ : irda(0)
{
}
IrdaAppletImpl::~IrdaAppletImpl()
{
delete irda;
}
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
@@ -35,12 +35,11 @@ public:
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
@@ -7,17 +7,17 @@
#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
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
@@ -37,13 +37,11 @@ public:
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
@@ -10,17 +10,17 @@
** 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;
}
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
@@ -29,12 +29,11 @@ public:
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
@@ -17,17 +17,17 @@
** not clear to you.
**
**********************************************************************/
#include "restart.h"
#include "restartappletimpl.h"
RestartAppletImpl::RestartAppletImpl()
- : restart(0), ref(0)
+ : restart(0)
{
}
RestartAppletImpl::~RestartAppletImpl()
{
delete restart;
}
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
@@ -33,12 +33,11 @@ public:
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
@@ -37,17 +37,17 @@ static char *restart_xpm[] = {
" .@=$-$++$-$=@. ",
" .+@-..@@..-@+. ",
" ... .+=. ... ",
" .-$. ",
" .. ",
" "};
RestartApplet::RestartApplet ( )
- : QObject ( 0, "RestartApplet" ), ref ( 0 )
+ : QObject ( 0, "RestartApplet" )
{
}
RestartApplet::~RestartApplet ( )
{
}
int RestartApplet::position ( ) 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
@@ -25,13 +25,11 @@ public:
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
@@ -42,17 +42,17 @@ 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
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
@@ -59,14 +59,13 @@ public:
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;
+ bool m_flipped : 1;
};
#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
@@ -17,17 +17,17 @@
** not clear to you.
**
**********************************************************************/
#include "screenshot.h"
#include "screenshotappletimpl.h"
ScreenshotAppletImpl::ScreenshotAppletImpl()
- : screenshot(0), ref(0)
+ : screenshot(0)
{
}
ScreenshotAppletImpl::~ScreenshotAppletImpl()
{
delete screenshot;
}
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
@@ -33,12 +33,11 @@ public:
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
@@ -4,17 +4,17 @@
#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
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
@@ -37,13 +37,11 @@ public:
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
@@ -14,17 +14,17 @@
* $Id$
*/
#include "vmemo.h"
#include "vmemoimpl.h"
VMemoAppletImpl::VMemoAppletImpl()
- : vmemo(0), ref(0)
+ : vmemo(0)
{
}
VMemoAppletImpl::~VMemoAppletImpl()
{
delete vmemo;
}
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
@@ -30,12 +30,11 @@ public:
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
@@ -18,17 +18,17 @@
**
**********************************************************************/
#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;
}
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
@@ -33,12 +33,11 @@ public:
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
virtual QWidget *applet( QWidget *parent );
virtual int position() const;
private:
VolumeApplet *volume;
- ulong ref;
};
#endif
diff --git a/core/obex/obeximpl.h b/core/obex/obeximpl.h
index 604eb8f..5cc9205 100644
--- a/core/obex/obeximpl.h
+++ b/core/obex/obeximpl.h
@@ -8,15 +8,14 @@ namespace OpieObex {
class ObexImpl : public ObexInterface {
public:
ObexImpl();
virtual ~ObexImpl();
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
private:
- ulong ref;
ObexHandler *m_handler;
};
};
#endif