author | zecke <zecke> | 2004-02-05 17:43:45 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-05 17:43:45 (UTC) |
commit | c5db70388cbe21934d4e3b2df3e8c8c1d9807d41 (patch) (unidiff) | |
tree | 5ec39d9114a60dac06c58e2bcf700f8d0b9a4345 /noncore/applets | |
parent | c79bbb6696edf7539ebeda64092f3f91f65ba500 (diff) | |
download | opie-c5db70388cbe21934d4e3b2df3e8c8c1d9807d41.zip opie-c5db70388cbe21934d4e3b2df3e8c8c1d9807d41.tar.gz opie-c5db70388cbe21934d4e3b2df3e8c8c1d9807d41.tar.bz2 |
Janitor: ulong ref removed
8 files changed, 4 insertions, 8 deletions
diff --git a/noncore/applets/autorotateapplet/autorotateimpl.cpp b/noncore/applets/autorotateapplet/autorotateimpl.cpp index 1b15c6d..305ac50 100644 --- a/noncore/applets/autorotateapplet/autorotateimpl.cpp +++ b/noncore/applets/autorotateapplet/autorotateimpl.cpp | |||
@@ -1,18 +1,18 @@ | |||
1 | #include "autorotate.h" | 1 | #include "autorotate.h" |
2 | #include "autorotateimpl.h" | 2 | #include "autorotateimpl.h" |
3 | 3 | ||
4 | 4 | ||
5 | AutoRotateImpl::AutoRotateImpl() | 5 | AutoRotateImpl::AutoRotateImpl() |
6 | : autoRotate(0), ref(0) { | 6 | : autoRotate(0){ |
7 | qDebug ("here"); | 7 | qDebug ("here"); |
8 | } | 8 | } |
9 | 9 | ||
10 | AutoRotateImpl::~AutoRotateImpl() { | 10 | AutoRotateImpl::~AutoRotateImpl() { |
11 | delete autoRotate; | 11 | delete autoRotate; |
12 | } | 12 | } |
13 | 13 | ||
14 | QWidget *AutoRotateImpl::applet( QWidget *parent ) { | 14 | QWidget *AutoRotateImpl::applet( QWidget *parent ) { |
15 | if ( !autoRotate ) { | 15 | if ( !autoRotate ) { |
16 | autoRotate = new AutoRotate( parent ); | 16 | autoRotate = new AutoRotate( parent ); |
17 | } | 17 | } |
18 | return autoRotate; | 18 | return autoRotate; |
diff --git a/noncore/applets/autorotateapplet/autorotateimpl.h b/noncore/applets/autorotateapplet/autorotateimpl.h index 87b0731..fde23a9 100644 --- a/noncore/applets/autorotateapplet/autorotateimpl.h +++ b/noncore/applets/autorotateapplet/autorotateimpl.h | |||
@@ -6,14 +6,13 @@ class AutoRotateImpl : public TaskbarAppletInterface { | |||
6 | public: | 6 | public: |
7 | AutoRotateImpl(); | 7 | AutoRotateImpl(); |
8 | virtual ~AutoRotateImpl(); | 8 | virtual ~AutoRotateImpl(); |
9 | 9 | ||
10 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 10 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
11 | Q_REFCOUNT | 11 | Q_REFCOUNT |
12 | 12 | ||
13 | virtual QWidget *applet( QWidget *parent ); | 13 | virtual QWidget *applet( QWidget *parent ); |
14 | virtual int position() const; | 14 | virtual int position() const; |
15 | 15 | ||
16 | private: | 16 | private: |
17 | AutoRotate *autoRotate; | 17 | AutoRotate *autoRotate; |
18 | ulong ref; | ||
19 | }; | 18 | }; |
diff --git a/noncore/applets/memoryapplet/memoryappletimpl.cpp b/noncore/applets/memoryapplet/memoryappletimpl.cpp index a57f4a9..a117e7f 100644 --- a/noncore/applets/memoryapplet/memoryappletimpl.cpp +++ b/noncore/applets/memoryapplet/memoryappletimpl.cpp | |||
@@ -12,25 +12,25 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "memorymeter.h" | 20 | #include "memorymeter.h" |
21 | #include "memoryappletimpl.h" | 21 | #include "memoryappletimpl.h" |
22 | 22 | ||
23 | MemoryAppletImpl::MemoryAppletImpl() | 23 | MemoryAppletImpl::MemoryAppletImpl() |
24 | : memory(0), ref(0) | 24 | : memory(0) |
25 | { | 25 | { |
26 | } | 26 | } |
27 | 27 | ||
28 | MemoryAppletImpl::~MemoryAppletImpl() | 28 | MemoryAppletImpl::~MemoryAppletImpl() |
29 | { | 29 | { |
30 | delete memory; | 30 | delete memory; |
31 | } | 31 | } |
32 | 32 | ||
33 | QWidget *MemoryAppletImpl::applet( QWidget *parent ) | 33 | QWidget *MemoryAppletImpl::applet( QWidget *parent ) |
34 | { | 34 | { |
35 | if ( !memory ) | 35 | if ( !memory ) |
36 | memory = new MemoryMeter( parent ); | 36 | memory = new MemoryMeter( parent ); |
diff --git a/noncore/applets/memoryapplet/memoryappletimpl.h b/noncore/applets/memoryapplet/memoryappletimpl.h index e0016e1..2db7dbe 100644 --- a/noncore/applets/memoryapplet/memoryappletimpl.h +++ b/noncore/applets/memoryapplet/memoryappletimpl.h | |||
@@ -29,16 +29,15 @@ class /*QTOPIA_PLUGIN_EXPORT*/ MemoryAppletImpl : public TaskbarAppletInterface | |||
29 | public: | 29 | public: |
30 | MemoryAppletImpl(); | 30 | MemoryAppletImpl(); |
31 | virtual ~MemoryAppletImpl(); | 31 | virtual ~MemoryAppletImpl(); |
32 | 32 | ||
33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
34 | Q_REFCOUNT | 34 | Q_REFCOUNT |
35 | 35 | ||
36 | virtual QWidget *applet( QWidget *parent ); | 36 | virtual QWidget *applet( QWidget *parent ); |
37 | virtual int position() const; | 37 | virtual int position() const; |
38 | 38 | ||
39 | private: | 39 | private: |
40 | MemoryMeter *memory; | 40 | MemoryMeter *memory; |
41 | ulong ref; | ||
42 | }; | 41 | }; |
43 | 42 | ||
44 | #endif | 43 | #endif |
diff --git a/noncore/applets/notesapplet/notesappletimpl.cpp b/noncore/applets/notesapplet/notesappletimpl.cpp index 93de433..8a9da7f 100644 --- a/noncore/applets/notesapplet/notesappletimpl.cpp +++ b/noncore/applets/notesapplet/notesappletimpl.cpp | |||
@@ -5,25 +5,25 @@ | |||
5 | ** This file may be distributed and/or modified under the terms of the | 5 | ** This file may be distributed and/or modified under the terms of the |
6 | ** GNU General Public License version 2 as published by the Free Software | 6 | ** GNU General Public License version 2 as published by the Free Software |
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | 7 | ** Foundation and appearing in the file LICENSE.GPL included in the |
8 | ** packaging of this file. | 8 | ** packaging of this file. |
9 | ** | 9 | ** |
10 | ** | 10 | ** |
11 | **********************************************************************/ | 11 | **********************************************************************/ |
12 | #include "notes.h" | 12 | #include "notes.h" |
13 | #include "notesappletimpl.h" | 13 | #include "notesappletimpl.h" |
14 | 14 | ||
15 | 15 | ||
16 | NotesAppletImpl::NotesAppletImpl() | 16 | NotesAppletImpl::NotesAppletImpl() |
17 | : notes(0), ref(0) { | 17 | : notes(0){ |
18 | } | 18 | } |
19 | 19 | ||
20 | NotesAppletImpl::~NotesAppletImpl() { | 20 | NotesAppletImpl::~NotesAppletImpl() { |
21 | // not needed though cause we should have a valid parent | 21 | // not needed though cause we should have a valid parent |
22 | delete notes; | 22 | delete notes; |
23 | } | 23 | } |
24 | 24 | ||
25 | QWidget *NotesAppletImpl::applet( QWidget *parent ) { | 25 | QWidget *NotesAppletImpl::applet( QWidget *parent ) { |
26 | if ( !notes ) | 26 | if ( !notes ) |
27 | notes = new NotesApplet( parent ); | 27 | notes = new NotesApplet( parent ); |
28 | return notes; | 28 | return notes; |
29 | } | 29 | } |
diff --git a/noncore/applets/notesapplet/notesappletimpl.h b/noncore/applets/notesapplet/notesappletimpl.h index add9865..a87118c 100644 --- a/noncore/applets/notesapplet/notesappletimpl.h +++ b/noncore/applets/notesapplet/notesappletimpl.h | |||
@@ -21,16 +21,15 @@ class NotesAppletImpl : public TaskbarAppletInterface | |||
21 | public: | 21 | public: |
22 | NotesAppletImpl(); | 22 | NotesAppletImpl(); |
23 | virtual ~NotesAppletImpl(); | 23 | virtual ~NotesAppletImpl(); |
24 | 24 | ||
25 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 25 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
26 | Q_REFCOUNT | 26 | Q_REFCOUNT |
27 | 27 | ||
28 | virtual QWidget *applet( QWidget *parent ); | 28 | virtual QWidget *applet( QWidget *parent ); |
29 | virtual int position() const; | 29 | virtual int position() const; |
30 | 30 | ||
31 | private: | 31 | private: |
32 | NotesApplet *notes; | 32 | NotesApplet *notes; |
33 | ulong ref; | ||
34 | }; | 33 | }; |
35 | 34 | ||
36 | #endif | 35 | #endif |
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp b/noncore/applets/wirelessapplet/wirelessappletimpl.cpp index 8b7afcf..de70714 100644 --- a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp +++ b/noncore/applets/wirelessapplet/wirelessappletimpl.cpp | |||
@@ -13,25 +13,25 @@ | |||
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "wireless.h" | 20 | #include "wireless.h" |
21 | #include "wirelessappletimpl.h" | 21 | #include "wirelessappletimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | WirelessAppletImpl::WirelessAppletImpl() | 24 | WirelessAppletImpl::WirelessAppletImpl() |
25 | : wireless(0), ref(0) | 25 | : wireless(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | WirelessAppletImpl::~WirelessAppletImpl() | 29 | WirelessAppletImpl::~WirelessAppletImpl() |
30 | { | 30 | { |
31 | delete wireless; | 31 | delete wireless; |
32 | } | 32 | } |
33 | 33 | ||
34 | QWidget *WirelessAppletImpl::applet( QWidget *parent ) | 34 | QWidget *WirelessAppletImpl::applet( QWidget *parent ) |
35 | { | 35 | { |
36 | if ( !wireless ) | 36 | if ( !wireless ) |
37 | wireless = new WirelessApplet( parent ); | 37 | wireless = new WirelessApplet( parent ); |
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.h b/noncore/applets/wirelessapplet/wirelessappletimpl.h index 7008d51..1bf4507 100644 --- a/noncore/applets/wirelessapplet/wirelessappletimpl.h +++ b/noncore/applets/wirelessapplet/wirelessappletimpl.h | |||
@@ -29,16 +29,15 @@ class WirelessAppletImpl : public TaskbarAppletInterface | |||
29 | public: | 29 | public: |
30 | WirelessAppletImpl(); | 30 | WirelessAppletImpl(); |
31 | virtual ~WirelessAppletImpl(); | 31 | virtual ~WirelessAppletImpl(); |
32 | 32 | ||
33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
34 | Q_REFCOUNT | 34 | Q_REFCOUNT |
35 | 35 | ||
36 | virtual QWidget *applet( QWidget *parent ); | 36 | virtual QWidget *applet( QWidget *parent ); |
37 | virtual int position() const; | 37 | virtual int position() const; |
38 | 38 | ||
39 | private: | 39 | private: |
40 | WirelessApplet *wireless; | 40 | WirelessApplet *wireless; |
41 | ulong ref; | ||
42 | }; | 41 | }; |
43 | 42 | ||
44 | #endif | 43 | #endif |