summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-05 16:58:04 (UTC)
committer zecke <zecke>2004-02-05 16:58:04 (UTC)
commit416c72588577bca18ba1c9180701143e7e572eed (patch) (unidiff)
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) (ignore 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
@@ -21,9 +21,9 @@
21#include "batteryappletimpl.h" 21#include "batteryappletimpl.h"
22 22
23 23
24BatteryAppletImpl::BatteryAppletImpl() 24BatteryAppletImpl::BatteryAppletImpl()
25 : battery(0), ref(0) 25 : battery(0)
26{ 26{
27} 27}
28 28
29BatteryAppletImpl::~BatteryAppletImpl() 29BatteryAppletImpl::~BatteryAppletImpl()
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
@@ -37,8 +37,7 @@ public:
37 virtual int position() const; 37 virtual int position() const;
38 38
39private: 39private:
40 BatteryMeter *battery; 40 BatteryMeter *battery;
41 ulong ref;
42}; 41};
43 42
44#endif 43#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
@@ -2,9 +2,9 @@
2#include "cardmonimpl.h" 2#include "cardmonimpl.h"
3 3
4 4
5CardMonitorImpl::CardMonitorImpl() 5CardMonitorImpl::CardMonitorImpl()
6 : cardMonitor(0), ref(0) { 6 : cardMonitor(0) {
7} 7}
8 8
9CardMonitorImpl::~CardMonitorImpl() { 9CardMonitorImpl::~CardMonitorImpl() {
10 delete cardMonitor; 10 delete 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
@@ -14,6 +14,5 @@ public:
14 virtual int position() const; 14 virtual int position() const;
15 15
16private: 16private:
17 CardMonitor *cardMonitor; 17 CardMonitor *cardMonitor;
18 ulong ref;
19}; 18};
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
@@ -21,9 +21,9 @@
21#include "clipboardappletimpl.h" 21#include "clipboardappletimpl.h"
22 22
23 23
24ClipboardAppletImpl::ClipboardAppletImpl() 24ClipboardAppletImpl::ClipboardAppletImpl()
25 : clipboard(0), ref(0) 25 : clipboard(0)
26{ 26{
27} 27}
28 28
29ClipboardAppletImpl::~ClipboardAppletImpl() 29ClipboardAppletImpl::~ClipboardAppletImpl()
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
@@ -37,8 +37,7 @@ public:
37 virtual int position() const; 37 virtual int position() const;
38 38
39private: 39private:
40 ClipboardApplet *clipboard; 40 ClipboardApplet *clipboard;
41 ulong ref;
42}; 41};
43 42
44#endif 43#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
@@ -21,9 +21,9 @@
21#include "clockappletimpl.h" 21#include "clockappletimpl.h"
22 22
23 23
24ClockAppletImpl::ClockAppletImpl() 24ClockAppletImpl::ClockAppletImpl()
25 : clock(0), ref(0) 25 : clock(0)
26{ 26{
27} 27}
28 28
29ClockAppletImpl::~ClockAppletImpl() 29ClockAppletImpl::~ClockAppletImpl()
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
@@ -39,8 +39,7 @@ public:
39 virtual int position() const; 39 virtual int position() const;
40 40
41private: 41private:
42 LauncherClock *clock; 42 LauncherClock *clock;
43 ulong ref;
44}; 43};
45 44
46#endif 45#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
@@ -8,9 +8,9 @@
8#include "home.h" 8#include "home.h"
9 9
10 10
11HomeApplet::HomeApplet ( ) 11HomeApplet::HomeApplet ( )
12 : QObject ( 0, "HomeApplet" ), ref ( 0 ) 12 : QObject ( 0, "HomeApplet" )
13{ 13{
14} 14}
15 15
16HomeApplet::~HomeApplet ( ) 16HomeApplet::~HomeApplet ( )
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
@@ -41,9 +41,7 @@ public:
41 virtual QPopupMenu *popup ( QWidget *parent ) const; 41 virtual QPopupMenu *popup ( QWidget *parent ) const;
42 42
43 virtual void activated ( ); 43 virtual void activated ( );
44 44
45private:
46 ulong ref;
47}; 45};
48 46
49#endif 47#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
@@ -21,9 +21,9 @@
21#include "irdaappletimpl.h" 21#include "irdaappletimpl.h"
22 22
23 23
24IrdaAppletImpl::IrdaAppletImpl() 24IrdaAppletImpl::IrdaAppletImpl()
25 : irda(0), ref(0) 25 : irda(0)
26{ 26{
27} 27}
28 28
29IrdaAppletImpl::~IrdaAppletImpl() 29IrdaAppletImpl::~IrdaAppletImpl()
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
@@ -39,8 +39,7 @@ public:
39 virtual int position() const; 39 virtual int position() const;
40 40
41private: 41private:
42 IrdaApplet *irda; 42 IrdaApplet *irda;
43 ulong ref;
44}; 43};
45 44
46#endif 45#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
@@ -11,9 +11,9 @@
11#include "logout.h" 11#include "logout.h"
12 12
13 13
14LogoutApplet::LogoutApplet ( ) 14LogoutApplet::LogoutApplet ( )
15 : QObject ( 0, "LogoutApplet" ), ref ( 0 ) 15 : QObject ( 0, "LogoutApplet" )
16{ 16{
17} 17}
18 18
19LogoutApplet::~LogoutApplet ( ) 19LogoutApplet::~LogoutApplet ( )
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
@@ -41,9 +41,7 @@ public:
41 virtual QPopupMenu *popup ( QWidget *parent ) const; 41 virtual QPopupMenu *popup ( QWidget *parent ) const;
42 42
43 virtual void activated ( ); 43 virtual void activated ( );
44 44
45private:
46 ulong ref;
47}; 45};
48 46
49#endif 47#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
@@ -14,9 +14,9 @@
14#include "multikey.h" 14#include "multikey.h"
15#include "multikeyappletimpl.h" 15#include "multikeyappletimpl.h"
16 16
17MultikeyAppletImpl::MultikeyAppletImpl() 17MultikeyAppletImpl::MultikeyAppletImpl()
18 : kbd(0), ref(0) 18 : kbd(0)
19{ 19{
20} 20}
21 21
22MultikeyAppletImpl::~MultikeyAppletImpl() 22MultikeyAppletImpl::~MultikeyAppletImpl()
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
@@ -33,8 +33,7 @@ public:
33 virtual int position() const; 33 virtual int position() const;
34 34
35private: 35private:
36 Multikey *kbd; 36 Multikey *kbd;
37 ulong ref;
38}; 37};
39 38
40#endif /* __MULTIKEYAPPLETIMPL_H__ */ 39#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
@@ -21,9 +21,9 @@
21#include "restartappletimpl.h" 21#include "restartappletimpl.h"
22 22
23 23
24RestartAppletImpl::RestartAppletImpl() 24RestartAppletImpl::RestartAppletImpl()
25 : restart(0), ref(0) 25 : restart(0)
26{ 26{
27} 27}
28 28
29RestartAppletImpl::~RestartAppletImpl() 29RestartAppletImpl::~RestartAppletImpl()
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
@@ -37,8 +37,7 @@ public:
37 virtual int position() const; 37 virtual int position() const;
38 38
39private: 39private:
40 RestartApplet *restart; 40 RestartApplet *restart;
41 ulong ref;
42}; 41};
43 42
44#endif 43#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
@@ -41,9 +41,9 @@ static char *restart_xpm[] = {
41" .. ", 41" .. ",
42" "}; 42" "};
43 43
44RestartApplet::RestartApplet ( ) 44RestartApplet::RestartApplet ( )
45 : QObject ( 0, "RestartApplet" ), ref ( 0 ) 45 : QObject ( 0, "RestartApplet" )
46{ 46{
47} 47}
48 48
49RestartApplet::~RestartApplet ( ) 49RestartApplet::~RestartApplet ( )
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
@@ -29,9 +29,7 @@ public:
29 virtual QPopupMenu *popup ( QWidget *parent ) const; 29 virtual QPopupMenu *popup ( QWidget *parent ) const;
30 30
31 virtual void activated ( ); 31 virtual void activated ( );
32 32
33private:
34 ulong ref;
35}; 33};
36 34
37#endif 35#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
@@ -46,9 +46,9 @@ using namespace Opie;
46 46
47#include <time.h> 47#include <time.h>
48 48
49RotateApplet::RotateApplet() 49RotateApplet::RotateApplet()
50 :QObject( 0, "RotateApplet" ), ref( 0 ), m_flipped( false ) 50 :QObject( 0, "RotateApplet" ), m_flipped( false )
51{ 51{
52 52
53#if !defined(QT_NO_COP) 53#if !defined(QT_NO_COP)
54 QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this ); 54 QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this );
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
@@ -63,10 +63,9 @@ public:
63private slots: 63private slots:
64 void channelReceived( const QCString &msg, const QByteArray & data ); 64 void channelReceived( const QCString &msg, const QByteArray & data );
65 65
66private: 66private:
67 ulong ref; 67 bool m_flipped : 1;
68 bool m_flipped;
69 68
70}; 69};
71 70
72#endif 71#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
@@ -21,9 +21,9 @@
21#include "screenshotappletimpl.h" 21#include "screenshotappletimpl.h"
22 22
23 23
24ScreenshotAppletImpl::ScreenshotAppletImpl() 24ScreenshotAppletImpl::ScreenshotAppletImpl()
25 : screenshot(0), ref(0) 25 : screenshot(0)
26{ 26{
27} 27}
28 28
29ScreenshotAppletImpl::~ScreenshotAppletImpl() 29ScreenshotAppletImpl::~ScreenshotAppletImpl()
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
@@ -37,8 +37,7 @@ public:
37 virtual int position() const; 37 virtual int position() const;
38 38
39private: 39private:
40 ScreenshotApplet *screenshot; 40 ScreenshotApplet *screenshot;
41 ulong ref;
42}; 41};
43 42
44#endif 43#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
@@ -8,9 +8,9 @@
8#include "suspend.h" 8#include "suspend.h"
9 9
10 10
11SuspendApplet::SuspendApplet ( ) 11SuspendApplet::SuspendApplet ( )
12 : QObject ( 0, "SuspendApplet" ), ref ( 0 ) 12 : QObject ( 0, "SuspendApplet" )
13{ 13{
14} 14}
15 15
16SuspendApplet::~SuspendApplet ( ) 16SuspendApplet::~SuspendApplet ( )
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
@@ -41,9 +41,7 @@ public:
41 virtual QPopupMenu *popup ( QWidget *parent ) const; 41 virtual QPopupMenu *popup ( QWidget *parent ) const;
42 42
43 virtual void activated ( ); 43 virtual void activated ( );
44 44
45private:
46 ulong ref;
47}; 45};
48 46
49#endif 47#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
@@ -18,9 +18,9 @@
18#include "vmemoimpl.h" 18#include "vmemoimpl.h"
19 19
20 20
21VMemoAppletImpl::VMemoAppletImpl() 21VMemoAppletImpl::VMemoAppletImpl()
22 : vmemo(0), ref(0) 22 : vmemo(0)
23{ 23{
24} 24}
25 25
26VMemoAppletImpl::~VMemoAppletImpl() 26VMemoAppletImpl::~VMemoAppletImpl()
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
@@ -34,8 +34,7 @@ public:
34 virtual int position() const; 34 virtual int position() const;
35 35
36private: 36private:
37 VMemo *vmemo; 37 VMemo *vmemo;
38 ulong ref;
39}; 38};
40 39
41#endif 40#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
@@ -22,9 +22,9 @@
22#include <qpe/qcopenvelope_qws.h> 22#include <qpe/qcopenvelope_qws.h>
23#include <qpe/config.h> 23#include <qpe/config.h>
24 24
25VolumeAppletImpl::VolumeAppletImpl() 25VolumeAppletImpl::VolumeAppletImpl()
26 : volume(0), ref(0) 26 : volume(0)
27{ 27{
28} 28}
29 29
30VolumeAppletImpl::~VolumeAppletImpl() 30VolumeAppletImpl::~VolumeAppletImpl()
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
@@ -37,8 +37,7 @@ public:
37 virtual int position() const; 37 virtual int position() const;
38 38
39private: 39private:
40 VolumeApplet *volume; 40 VolumeApplet *volume;
41 ulong ref;
42}; 41};
43 42
44#endif 43#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
@@ -12,9 +12,8 @@ namespace OpieObex {
12 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 12 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
13 Q_REFCOUNT 13 Q_REFCOUNT
14 14
15 private: 15 private:
16 ulong ref;
17 ObexHandler *m_handler; 16 ObexHandler *m_handler;
18 17
19 }; 18 };
20}; 19};