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 | |||
@@ -1,65 +1,65 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 "battery.h" | 20 | #include "battery.h" |
21 | #include "batteryappletimpl.h" | 21 | #include "batteryappletimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | BatteryAppletImpl::BatteryAppletImpl() | 24 | BatteryAppletImpl::BatteryAppletImpl() |
25 | : battery(0), ref(0) | 25 | : battery(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | BatteryAppletImpl::~BatteryAppletImpl() | 29 | BatteryAppletImpl::~BatteryAppletImpl() |
30 | { | 30 | { |
31 | delete battery; | 31 | delete battery; |
32 | } | 32 | } |
33 | 33 | ||
34 | QWidget *BatteryAppletImpl::applet( QWidget *parent ) | 34 | QWidget *BatteryAppletImpl::applet( QWidget *parent ) |
35 | { | 35 | { |
36 | if ( !battery ) | 36 | if ( !battery ) |
37 | battery = new BatteryMeter( parent ); | 37 | battery = new BatteryMeter( parent ); |
38 | return battery; | 38 | return battery; |
39 | } | 39 | } |
40 | 40 | ||
41 | int BatteryAppletImpl::position() const | 41 | int BatteryAppletImpl::position() const |
42 | { | 42 | { |
43 | return 8; | 43 | return 8; |
44 | } | 44 | } |
45 | 45 | ||
46 | QRESULT BatteryAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 46 | QRESULT BatteryAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
47 | { | 47 | { |
48 | *iface = 0; | 48 | *iface = 0; |
49 | if ( uuid == IID_QUnknown ) | 49 | if ( uuid == IID_QUnknown ) |
50 | *iface = this; | 50 | *iface = this; |
51 | else if ( uuid == IID_TaskbarApplet ) | 51 | else if ( uuid == IID_TaskbarApplet ) |
52 | *iface = this; | 52 | *iface = this; |
53 | else | 53 | else |
54 | return QS_FALSE; | 54 | return QS_FALSE; |
55 | 55 | ||
56 | if ( *iface ) | 56 | if ( *iface ) |
57 | (*iface)->addRef(); | 57 | (*iface)->addRef(); |
58 | return QS_OK; | 58 | return QS_OK; |
59 | } | 59 | } |
60 | 60 | ||
61 | Q_EXPORT_INTERFACE() | 61 | Q_EXPORT_INTERFACE() |
62 | { | 62 | { |
63 | Q_CREATE_INSTANCE( BatteryAppletImpl ) | 63 | Q_CREATE_INSTANCE( BatteryAppletImpl ) |
64 | } | 64 | } |
65 | 65 | ||
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 | |||
@@ -1,44 +1,43 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef BATTERYAPPLETIMPL_H | 20 | #ifndef BATTERYAPPLETIMPL_H |
21 | #define BATTERYAPPLETIMPL_H | 21 | #define BATTERYAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qpe/taskbarappletinterface.h> | 23 | #include <qpe/taskbarappletinterface.h> |
24 | 24 | ||
25 | class BatteryMeter; | 25 | class BatteryMeter; |
26 | 26 | ||
27 | class BatteryAppletImpl : public TaskbarAppletInterface | 27 | class BatteryAppletImpl : public TaskbarAppletInterface |
28 | { | 28 | { |
29 | public: | 29 | public: |
30 | BatteryAppletImpl(); | 30 | BatteryAppletImpl(); |
31 | virtual ~BatteryAppletImpl(); | 31 | virtual ~BatteryAppletImpl(); |
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 | 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 | |||
@@ -1,42 +1,42 @@ | |||
1 | #include "cardmon.h" | 1 | #include "cardmon.h" |
2 | #include "cardmonimpl.h" | 2 | #include "cardmonimpl.h" |
3 | 3 | ||
4 | 4 | ||
5 | CardMonitorImpl::CardMonitorImpl() | 5 | CardMonitorImpl::CardMonitorImpl() |
6 | : cardMonitor(0), ref(0) { | 6 | : cardMonitor(0) { |
7 | } | 7 | } |
8 | 8 | ||
9 | CardMonitorImpl::~CardMonitorImpl() { | 9 | CardMonitorImpl::~CardMonitorImpl() { |
10 | delete cardMonitor; | 10 | delete cardMonitor; |
11 | } | 11 | } |
12 | 12 | ||
13 | QWidget *CardMonitorImpl::applet( QWidget *parent ) { | 13 | QWidget *CardMonitorImpl::applet( QWidget *parent ) { |
14 | if ( !cardMonitor ) { | 14 | if ( !cardMonitor ) { |
15 | cardMonitor = new CardMonitor( parent ); | 15 | cardMonitor = new CardMonitor( parent ); |
16 | } | 16 | } |
17 | return cardMonitor; | 17 | return cardMonitor; |
18 | } | 18 | } |
19 | 19 | ||
20 | int CardMonitorImpl::position() const { | 20 | int CardMonitorImpl::position() const { |
21 | return 7; | 21 | return 7; |
22 | } | 22 | } |
23 | 23 | ||
24 | QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { | 24 | QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { |
25 | *iface = 0; | 25 | *iface = 0; |
26 | if ( uuid == IID_QUnknown ) { | 26 | if ( uuid == IID_QUnknown ) { |
27 | *iface = this; | 27 | *iface = this; |
28 | } else if ( uuid == IID_TaskbarApplet ) { | 28 | } else if ( uuid == IID_TaskbarApplet ) { |
29 | *iface = this; | 29 | *iface = this; |
30 | } else { | 30 | } else { |
31 | return QS_FALSE; | 31 | return QS_FALSE; |
32 | } | 32 | } |
33 | 33 | ||
34 | if ( *iface ) { | 34 | if ( *iface ) { |
35 | (*iface)->addRef(); | 35 | (*iface)->addRef(); |
36 | } | 36 | } |
37 | return QS_OK; | 37 | return QS_OK; |
38 | } | 38 | } |
39 | 39 | ||
40 | Q_EXPORT_INTERFACE() { | 40 | Q_EXPORT_INTERFACE() { |
41 | Q_CREATE_INSTANCE( CardMonitorImpl ) | 41 | Q_CREATE_INSTANCE( CardMonitorImpl ) |
42 | } | 42 | } |
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 @@ | |||
1 | #include <qpe/taskbarappletinterface.h> | 1 | #include <qpe/taskbarappletinterface.h> |
2 | 2 | ||
3 | class CardMonitor; | 3 | class CardMonitor; |
4 | 4 | ||
5 | class CardMonitorImpl : public TaskbarAppletInterface { | 5 | class CardMonitorImpl : public TaskbarAppletInterface { |
6 | public: | 6 | public: |
7 | CardMonitorImpl(); | 7 | CardMonitorImpl(); |
8 | virtual ~CardMonitorImpl(); | 8 | virtual ~CardMonitorImpl(); |
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 | 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 | |||
@@ -1,66 +1,66 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 "clipboard.h" | 20 | #include "clipboard.h" |
21 | #include "clipboardappletimpl.h" | 21 | #include "clipboardappletimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | ClipboardAppletImpl::ClipboardAppletImpl() | 24 | ClipboardAppletImpl::ClipboardAppletImpl() |
25 | : clipboard(0), ref(0) | 25 | : clipboard(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | ClipboardAppletImpl::~ClipboardAppletImpl() | 29 | ClipboardAppletImpl::~ClipboardAppletImpl() |
30 | { | 30 | { |
31 | delete clipboard; | 31 | delete clipboard; |
32 | } | 32 | } |
33 | 33 | ||
34 | QWidget *ClipboardAppletImpl::applet( QWidget *parent ) | 34 | QWidget *ClipboardAppletImpl::applet( QWidget *parent ) |
35 | { | 35 | { |
36 | if ( !clipboard ) | 36 | if ( !clipboard ) |
37 | clipboard = new ClipboardApplet( parent ); | 37 | clipboard = new ClipboardApplet( parent ); |
38 | return clipboard; | 38 | return clipboard; |
39 | } | 39 | } |
40 | 40 | ||
41 | int ClipboardAppletImpl::position() const | 41 | int ClipboardAppletImpl::position() const |
42 | { | 42 | { |
43 | return 6; | 43 | return 6; |
44 | } | 44 | } |
45 | 45 | ||
46 | QRESULT ClipboardAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 46 | QRESULT ClipboardAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
47 | { | 47 | { |
48 | *iface = 0; | 48 | *iface = 0; |
49 | if ( uuid == IID_QUnknown ) | 49 | if ( uuid == IID_QUnknown ) |
50 | *iface = this; | 50 | *iface = this; |
51 | else if ( uuid == IID_TaskbarApplet ) | 51 | else if ( uuid == IID_TaskbarApplet ) |
52 | *iface = this; | 52 | *iface = this; |
53 | else | 53 | else |
54 | return QS_FALSE; | 54 | return QS_FALSE; |
55 | 55 | ||
56 | if ( *iface ) | 56 | if ( *iface ) |
57 | (*iface)->addRef(); | 57 | (*iface)->addRef(); |
58 | return QS_OK; | 58 | return QS_OK; |
59 | } | 59 | } |
60 | 60 | ||
61 | Q_EXPORT_INTERFACE() | 61 | Q_EXPORT_INTERFACE() |
62 | { | 62 | { |
63 | Q_CREATE_INSTANCE( ClipboardAppletImpl ) | 63 | Q_CREATE_INSTANCE( ClipboardAppletImpl ) |
64 | } | 64 | } |
65 | 65 | ||
66 | 66 | ||
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 | |||
@@ -1,44 +1,43 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef CLIPBOARDAPPLETIMPL_H | 20 | #ifndef CLIPBOARDAPPLETIMPL_H |
21 | #define CLIPBOARDAPPLETIMPL_H | 21 | #define CLIPBOARDAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qpe/taskbarappletinterface.h> | 23 | #include <qpe/taskbarappletinterface.h> |
24 | 24 | ||
25 | class ClipboardApplet; | 25 | class ClipboardApplet; |
26 | 26 | ||
27 | class ClipboardAppletImpl : public TaskbarAppletInterface | 27 | class ClipboardAppletImpl : public TaskbarAppletInterface |
28 | { | 28 | { |
29 | public: | 29 | public: |
30 | ClipboardAppletImpl(); | 30 | ClipboardAppletImpl(); |
31 | virtual ~ClipboardAppletImpl(); | 31 | virtual ~ClipboardAppletImpl(); |
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 | 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 | |||
@@ -1,67 +1,67 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 "clock.h" | 20 | #include "clock.h" |
21 | #include "clockappletimpl.h" | 21 | #include "clockappletimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | ClockAppletImpl::ClockAppletImpl() | 24 | ClockAppletImpl::ClockAppletImpl() |
25 | : clock(0), ref(0) | 25 | : clock(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | ClockAppletImpl::~ClockAppletImpl() | 29 | ClockAppletImpl::~ClockAppletImpl() |
30 | { | 30 | { |
31 | delete clock; | 31 | delete clock; |
32 | } | 32 | } |
33 | 33 | ||
34 | QWidget *ClockAppletImpl::applet( QWidget *parent ) | 34 | QWidget *ClockAppletImpl::applet( QWidget *parent ) |
35 | { | 35 | { |
36 | if ( !clock ) | 36 | if ( !clock ) |
37 | clock = new LauncherClock( parent ); | 37 | clock = new LauncherClock( parent ); |
38 | return clock; | 38 | return clock; |
39 | } | 39 | } |
40 | 40 | ||
41 | int ClockAppletImpl::position() const | 41 | int ClockAppletImpl::position() const |
42 | { | 42 | { |
43 | return 10; | 43 | return 10; |
44 | } | 44 | } |
45 | 45 | ||
46 | #ifndef QT_NO_COMPONENT | 46 | #ifndef QT_NO_COMPONENT |
47 | QRESULT ClockAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 47 | QRESULT ClockAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
48 | { | 48 | { |
49 | *iface = 0; | 49 | *iface = 0; |
50 | if ( uuid == IID_QUnknown ) | 50 | if ( uuid == IID_QUnknown ) |
51 | *iface = this; | 51 | *iface = this; |
52 | else if ( uuid == IID_TaskbarApplet ) | 52 | else if ( uuid == IID_TaskbarApplet ) |
53 | *iface = this; | 53 | *iface = this; |
54 | else | 54 | else |
55 | return QS_FALSE; | 55 | return QS_FALSE; |
56 | 56 | ||
57 | if ( *iface ) | 57 | if ( *iface ) |
58 | (*iface)->addRef(); | 58 | (*iface)->addRef(); |
59 | return QS_OK; | 59 | return QS_OK; |
60 | } | 60 | } |
61 | 61 | ||
62 | Q_EXPORT_INTERFACE() | 62 | Q_EXPORT_INTERFACE() |
63 | { | 63 | { |
64 | Q_CREATE_INSTANCE( ClockAppletImpl ) | 64 | Q_CREATE_INSTANCE( ClockAppletImpl ) |
65 | } | 65 | } |
66 | #endif | 66 | #endif |
67 | 67 | ||
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 | |||
@@ -1,46 +1,45 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef CLOCKAPPLETIMPL_H | 20 | #ifndef CLOCKAPPLETIMPL_H |
21 | #define CLOCKAPPLETIMPL_H | 21 | #define CLOCKAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qpe/taskbarappletinterface.h> | 23 | #include <qpe/taskbarappletinterface.h> |
24 | 24 | ||
25 | class LauncherClock; | 25 | class LauncherClock; |
26 | 26 | ||
27 | class ClockAppletImpl : public TaskbarAppletInterface | 27 | class ClockAppletImpl : public TaskbarAppletInterface |
28 | { | 28 | { |
29 | public: | 29 | public: |
30 | ClockAppletImpl(); | 30 | ClockAppletImpl(); |
31 | virtual ~ClockAppletImpl(); | 31 | virtual ~ClockAppletImpl(); |
32 | 32 | ||
33 | #ifndef QT_NO_COMPONENT | 33 | #ifndef QT_NO_COMPONENT |
34 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 34 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
35 | Q_REFCOUNT | 35 | Q_REFCOUNT |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | virtual QWidget *applet( QWidget *parent ); | 38 | virtual QWidget *applet( QWidget *parent ); |
39 | virtual int position() const; | 39 | virtual int position() const; |
40 | 40 | ||
41 | private: | 41 | private: |
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 | |||
@@ -1,87 +1,87 @@ | |||
1 | #include <qpe/resource.h> | 1 | #include <qpe/resource.h> |
2 | #include <qpe/qcopenvelope_qws.h> | 2 | #include <qpe/qcopenvelope_qws.h> |
3 | 3 | ||
4 | #include <qapplication.h> | 4 | #include <qapplication.h> |
5 | #include <qiconset.h> | 5 | #include <qiconset.h> |
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | 7 | ||
8 | #include "home.h" | 8 | #include "home.h" |
9 | 9 | ||
10 | 10 | ||
11 | HomeApplet::HomeApplet ( ) | 11 | HomeApplet::HomeApplet ( ) |
12 | : QObject ( 0, "HomeApplet" ), ref ( 0 ) | 12 | : QObject ( 0, "HomeApplet" ) |
13 | { | 13 | { |
14 | } | 14 | } |
15 | 15 | ||
16 | HomeApplet::~HomeApplet ( ) | 16 | HomeApplet::~HomeApplet ( ) |
17 | { | 17 | { |
18 | } | 18 | } |
19 | 19 | ||
20 | int HomeApplet::position ( ) const | 20 | int HomeApplet::position ( ) const |
21 | { | 21 | { |
22 | return 4; | 22 | return 4; |
23 | } | 23 | } |
24 | 24 | ||
25 | QString HomeApplet::name ( ) const | 25 | QString HomeApplet::name ( ) const |
26 | { | 26 | { |
27 | return tr( "Home shortcut" ); | 27 | return tr( "Home shortcut" ); |
28 | } | 28 | } |
29 | 29 | ||
30 | QString HomeApplet::text ( ) const | 30 | QString HomeApplet::text ( ) const |
31 | { | 31 | { |
32 | return tr( "Desktop" ); | 32 | return tr( "Desktop" ); |
33 | } | 33 | } |
34 | 34 | ||
35 | QString HomeApplet::tr( const char* s ) const | 35 | QString HomeApplet::tr( const char* s ) const |
36 | { | 36 | { |
37 | return qApp->translate( "HomeApplet", s, 0 ); | 37 | return qApp->translate( "HomeApplet", s, 0 ); |
38 | } | 38 | } |
39 | 39 | ||
40 | QString HomeApplet::tr( const char* s, const char* p ) const | 40 | QString HomeApplet::tr( const char* s, const char* p ) const |
41 | { | 41 | { |
42 | return qApp->translate( "HomeApplet", s, p ); | 42 | return qApp->translate( "HomeApplet", s, p ); |
43 | } | 43 | } |
44 | 44 | ||
45 | QIconSet HomeApplet::icon ( ) const | 45 | QIconSet HomeApplet::icon ( ) const |
46 | { | 46 | { |
47 | QPixmap pix; | 47 | QPixmap pix; |
48 | QImage img = Resource::loadImage ( "home" ); | 48 | QImage img = Resource::loadImage ( "home" ); |
49 | 49 | ||
50 | if ( !img. isNull ( )) | 50 | if ( !img. isNull ( )) |
51 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 51 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
52 | return pix; | 52 | return pix; |
53 | } | 53 | } |
54 | 54 | ||
55 | QPopupMenu *HomeApplet::popup ( QWidget * ) const | 55 | QPopupMenu *HomeApplet::popup ( QWidget * ) const |
56 | { | 56 | { |
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |
59 | 59 | ||
60 | void HomeApplet::activated ( ) | 60 | void HomeApplet::activated ( ) |
61 | { | 61 | { |
62 | // to desktop (home) | 62 | // to desktop (home) |
63 | QCopEnvelope ( "QPE/Application/qpe", "raise()" ); | 63 | QCopEnvelope ( "QPE/Application/qpe", "raise()" ); |
64 | } | 64 | } |
65 | 65 | ||
66 | 66 | ||
67 | QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 67 | QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
68 | { | 68 | { |
69 | *iface = 0; | 69 | *iface = 0; |
70 | if ( uuid == IID_QUnknown ) | 70 | if ( uuid == IID_QUnknown ) |
71 | *iface = this; | 71 | *iface = this; |
72 | else if ( uuid == IID_MenuApplet ) | 72 | else if ( uuid == IID_MenuApplet ) |
73 | *iface = this; | 73 | *iface = this; |
74 | else | 74 | else |
75 | return QS_FALSE; | 75 | return QS_FALSE; |
76 | 76 | ||
77 | if ( *iface ) | 77 | if ( *iface ) |
78 | (*iface)-> addRef ( ); | 78 | (*iface)-> addRef ( ); |
79 | return QS_OK; | 79 | return QS_OK; |
80 | } | 80 | } |
81 | 81 | ||
82 | Q_EXPORT_INTERFACE( ) | 82 | Q_EXPORT_INTERFACE( ) |
83 | { | 83 | { |
84 | Q_CREATE_INSTANCE( HomeApplet ) | 84 | Q_CREATE_INSTANCE( HomeApplet ) |
85 | } | 85 | } |
86 | 86 | ||
87 | 87 | ||
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 | |||
@@ -1,49 +1,47 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef __OPIE_HOME_APPLET_H__ | 20 | #ifndef __OPIE_HOME_APPLET_H__ |
21 | #define __OPIE_HOME_APPLET_H__ | 21 | #define __OPIE_HOME_APPLET_H__ |
22 | 22 | ||
23 | #include <qpe/menuappletinterface.h> | 23 | #include <qpe/menuappletinterface.h> |
24 | 24 | ||
25 | class HomeApplet : public QObject, public MenuAppletInterface | 25 | class HomeApplet : public QObject, public MenuAppletInterface |
26 | { | 26 | { |
27 | public: | 27 | public: |
28 | HomeApplet ( ); | 28 | HomeApplet ( ); |
29 | virtual ~HomeApplet ( ); | 29 | virtual ~HomeApplet ( ); |
30 | 30 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
32 | Q_REFCOUNT | 32 | Q_REFCOUNT |
33 | 33 | ||
34 | virtual int position() const; | 34 | virtual int position() const; |
35 | 35 | ||
36 | virtual QString name ( ) const; | 36 | virtual QString name ( ) const; |
37 | virtual QIconSet icon ( ) const; | 37 | virtual QIconSet icon ( ) const; |
38 | virtual QString text ( ) const; | 38 | virtual QString text ( ) const; |
39 | virtual QString tr( const char* ) const; | 39 | virtual QString tr( const char* ) const; |
40 | virtual QString tr( const char*, const char* ) const; | 40 | virtual QString tr( const char*, const char* ) const; |
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 | ||
45 | private: | ||
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 | |||
@@ -1,66 +1,66 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 "irda.h" | 20 | #include "irda.h" |
21 | #include "irdaappletimpl.h" | 21 | #include "irdaappletimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | IrdaAppletImpl::IrdaAppletImpl() | 24 | IrdaAppletImpl::IrdaAppletImpl() |
25 | : irda(0), ref(0) | 25 | : irda(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | IrdaAppletImpl::~IrdaAppletImpl() | 29 | IrdaAppletImpl::~IrdaAppletImpl() |
30 | { | 30 | { |
31 | delete irda; | 31 | delete irda; |
32 | } | 32 | } |
33 | 33 | ||
34 | QWidget *IrdaAppletImpl::applet( QWidget *parent ) | 34 | QWidget *IrdaAppletImpl::applet( QWidget *parent ) |
35 | { | 35 | { |
36 | if ( !irda ) | 36 | if ( !irda ) |
37 | irda = new IrdaApplet( parent ); | 37 | irda = new IrdaApplet( parent ); |
38 | return irda; | 38 | return irda; |
39 | } | 39 | } |
40 | 40 | ||
41 | int IrdaAppletImpl::position() const | 41 | int IrdaAppletImpl::position() const |
42 | { | 42 | { |
43 | return 6; | 43 | return 6; |
44 | } | 44 | } |
45 | 45 | ||
46 | QRESULT IrdaAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 46 | QRESULT IrdaAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
47 | { | 47 | { |
48 | *iface = 0; | 48 | *iface = 0; |
49 | if ( uuid == IID_QUnknown ) | 49 | if ( uuid == IID_QUnknown ) |
50 | *iface = this; | 50 | *iface = this; |
51 | else if ( uuid == IID_TaskbarApplet ) | 51 | else if ( uuid == IID_TaskbarApplet ) |
52 | *iface = this; | 52 | *iface = this; |
53 | else | 53 | else |
54 | return QS_FALSE; | 54 | return QS_FALSE; |
55 | 55 | ||
56 | if ( *iface ) | 56 | if ( *iface ) |
57 | (*iface)->addRef(); | 57 | (*iface)->addRef(); |
58 | return QS_OK; | 58 | return QS_OK; |
59 | } | 59 | } |
60 | 60 | ||
61 | Q_EXPORT_INTERFACE() | 61 | Q_EXPORT_INTERFACE() |
62 | { | 62 | { |
63 | Q_CREATE_INSTANCE( IrdaAppletImpl ) | 63 | Q_CREATE_INSTANCE( IrdaAppletImpl ) |
64 | } | 64 | } |
65 | 65 | ||
66 | 66 | ||
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 | |||
@@ -1,46 +1,45 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef IRDAAPPLETIMPL_H | 20 | #ifndef IRDAAPPLETIMPL_H |
21 | #define IRDAAPPLETIMPL_H | 21 | #define IRDAAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qwidget.h> | 23 | #include <qwidget.h> |
24 | 24 | ||
25 | #include <qpe/taskbarappletinterface.h> | 25 | #include <qpe/taskbarappletinterface.h> |
26 | 26 | ||
27 | class IrdaApplet; | 27 | class IrdaApplet; |
28 | 28 | ||
29 | class IrdaAppletImpl : public TaskbarAppletInterface | 29 | class IrdaAppletImpl : public TaskbarAppletInterface |
30 | { | 30 | { |
31 | public: | 31 | public: |
32 | IrdaAppletImpl(); | 32 | IrdaAppletImpl(); |
33 | virtual ~IrdaAppletImpl(); | 33 | virtual ~IrdaAppletImpl(); |
34 | 34 | ||
35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
36 | Q_REFCOUNT | 36 | Q_REFCOUNT |
37 | 37 | ||
38 | virtual QWidget *applet( QWidget *parent ); | 38 | virtual QWidget *applet( QWidget *parent ); |
39 | virtual int position() const; | 39 | virtual int position() const; |
40 | 40 | ||
41 | private: | 41 | private: |
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 | |||
@@ -1,126 +1,126 @@ | |||
1 | #include <qpe/resource.h> | 1 | #include <qpe/resource.h> |
2 | #include <qpe/qcopenvelope_qws.h> | 2 | #include <qpe/qcopenvelope_qws.h> |
3 | 3 | ||
4 | #include <qapplication.h> | 4 | #include <qapplication.h> |
5 | #include <qiconset.h> | 5 | #include <qiconset.h> |
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | 8 | ||
9 | #include <unistd.h> | 9 | #include <unistd.h> |
10 | 10 | ||
11 | #include "logout.h" | 11 | #include "logout.h" |
12 | 12 | ||
13 | 13 | ||
14 | LogoutApplet::LogoutApplet ( ) | 14 | LogoutApplet::LogoutApplet ( ) |
15 | : QObject ( 0, "LogoutApplet" ), ref ( 0 ) | 15 | : QObject ( 0, "LogoutApplet" ) |
16 | { | 16 | { |
17 | } | 17 | } |
18 | 18 | ||
19 | LogoutApplet::~LogoutApplet ( ) | 19 | LogoutApplet::~LogoutApplet ( ) |
20 | { | 20 | { |
21 | } | 21 | } |
22 | 22 | ||
23 | int LogoutApplet::position ( ) const | 23 | int LogoutApplet::position ( ) const |
24 | { | 24 | { |
25 | return 0; | 25 | return 0; |
26 | } | 26 | } |
27 | 27 | ||
28 | QString LogoutApplet::name ( ) const | 28 | QString LogoutApplet::name ( ) const |
29 | { | 29 | { |
30 | return tr( "Logout shortcut" ); | 30 | return tr( "Logout shortcut" ); |
31 | } | 31 | } |
32 | 32 | ||
33 | QString LogoutApplet::text ( ) const | 33 | QString LogoutApplet::text ( ) const |
34 | { | 34 | { |
35 | return tr( "Logout" ); | 35 | return tr( "Logout" ); |
36 | } | 36 | } |
37 | 37 | ||
38 | QString LogoutApplet::tr( const char* s ) const | 38 | QString LogoutApplet::tr( const char* s ) const |
39 | { | 39 | { |
40 | return qApp->translate( "LogoutApplet", s, 0 ); | 40 | return qApp->translate( "LogoutApplet", s, 0 ); |
41 | } | 41 | } |
42 | 42 | ||
43 | QString LogoutApplet::tr( const char* s, const char* p ) const | 43 | QString LogoutApplet::tr( const char* s, const char* p ) const |
44 | { | 44 | { |
45 | return qApp->translate( "LogoutApplet", s, p ); | 45 | return qApp->translate( "LogoutApplet", s, p ); |
46 | } | 46 | } |
47 | 47 | ||
48 | QIconSet LogoutApplet::icon ( ) const | 48 | QIconSet LogoutApplet::icon ( ) const |
49 | { | 49 | { |
50 | QPixmap pix; | 50 | QPixmap pix; |
51 | QImage img = Resource::loadImage ( "logout" ); | 51 | QImage img = Resource::loadImage ( "logout" ); |
52 | 52 | ||
53 | if ( !img. isNull ( )) | 53 | if ( !img. isNull ( )) |
54 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 54 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
55 | return pix; | 55 | return pix; |
56 | } | 56 | } |
57 | 57 | ||
58 | QPopupMenu *LogoutApplet::popup ( QWidget * ) const | 58 | QPopupMenu *LogoutApplet::popup ( QWidget * ) const |
59 | { | 59 | { |
60 | return 0; | 60 | return 0; |
61 | } | 61 | } |
62 | 62 | ||
63 | // This is a workaround for a Qt bug | 63 | // This is a workaround for a Qt bug |
64 | // clipboard applet has to stop its poll timer, or Qt/E | 64 | // clipboard applet has to stop its poll timer, or Qt/E |
65 | // will hang on quit() right before it emits aboutToQuit() | 65 | // will hang on quit() right before it emits aboutToQuit() |
66 | 66 | ||
67 | class HackApplication : public QApplication { | 67 | class HackApplication : public QApplication { |
68 | public: | 68 | public: |
69 | HackApplication ( ) : QApplication ( dummy, 0 ) | 69 | HackApplication ( ) : QApplication ( dummy, 0 ) |
70 | { | 70 | { |
71 | } | 71 | } |
72 | 72 | ||
73 | void emit_about_to_quit ( ) | 73 | void emit_about_to_quit ( ) |
74 | { | 74 | { |
75 | emit aboutToQuit ( ); | 75 | emit aboutToQuit ( ); |
76 | } | 76 | } |
77 | 77 | ||
78 | int dummy; | 78 | int dummy; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | 81 | ||
82 | void LogoutApplet::activated ( ) | 82 | void LogoutApplet::activated ( ) |
83 | { | 83 | { |
84 | QMessageBox mb ( tr( "Logout" ), | 84 | QMessageBox mb ( tr( "Logout" ), |
85 | tr( "Do you really want to\nend this session ?" ), | 85 | tr( "Do you really want to\nend this session ?" ), |
86 | QMessageBox::NoIcon, | 86 | QMessageBox::NoIcon, |
87 | QMessageBox::Yes | QMessageBox::Default, | 87 | QMessageBox::Yes | QMessageBox::Default, |
88 | QMessageBox::No | QMessageBox::Escape, | 88 | QMessageBox::No | QMessageBox::Escape, |
89 | QMessageBox::NoButton ); | 89 | QMessageBox::NoButton ); |
90 | 90 | ||
91 | mb. setButtonText ( QMessageBox::Yes, "Yes" ); | 91 | mb. setButtonText ( QMessageBox::Yes, "Yes" ); |
92 | mb. setButtonText ( QMessageBox::No, "No" ); | 92 | mb. setButtonText ( QMessageBox::No, "No" ); |
93 | mb. setIconPixmap ( icon ( ). pixmap ( )); | 93 | mb. setIconPixmap ( icon ( ). pixmap ( )); |
94 | 94 | ||
95 | if ( mb. exec ( ) == QMessageBox::Yes ) { | 95 | if ( mb. exec ( ) == QMessageBox::Yes ) { |
96 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); } | 96 | { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); } |
97 | 97 | ||
98 | qApp-> processEvents ( ); // ensure the message goes out. | 98 | qApp-> processEvents ( ); // ensure the message goes out. |
99 | sleep ( 1 ); // You have 1 second to comply. | 99 | sleep ( 1 ); // You have 1 second to comply. |
100 | 100 | ||
101 | ((HackApplication *) qApp )-> emit_about_to_quit ( ); | 101 | ((HackApplication *) qApp )-> emit_about_to_quit ( ); |
102 | qApp-> quit(); | 102 | qApp-> quit(); |
103 | } | 103 | } |
104 | } | 104 | } |
105 | 105 | ||
106 | 106 | ||
107 | QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 107 | QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
108 | { | 108 | { |
109 | *iface = 0; | 109 | *iface = 0; |
110 | if ( uuid == IID_QUnknown ) | 110 | if ( uuid == IID_QUnknown ) |
111 | *iface = this; | 111 | *iface = this; |
112 | else if ( uuid == IID_MenuApplet ) | 112 | else if ( uuid == IID_MenuApplet ) |
113 | *iface = this; | 113 | *iface = this; |
114 | else | 114 | else |
115 | return QS_FALSE; | 115 | return QS_FALSE; |
116 | 116 | ||
117 | if ( *iface ) | 117 | if ( *iface ) |
118 | (*iface)-> addRef ( ); | 118 | (*iface)-> addRef ( ); |
119 | return QS_OK; | 119 | return QS_OK; |
120 | } | 120 | } |
121 | 121 | ||
122 | Q_EXPORT_INTERFACE( ) | 122 | Q_EXPORT_INTERFACE( ) |
123 | { | 123 | { |
124 | Q_CREATE_INSTANCE( LogoutApplet ) | 124 | Q_CREATE_INSTANCE( LogoutApplet ) |
125 | } | 125 | } |
126 | 126 | ||
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 | |||
@@ -1,49 +1,47 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef __OPIE_LOGOUT_APPLET_H__ | 20 | #ifndef __OPIE_LOGOUT_APPLET_H__ |
21 | #define __OPIE_LOGOUT_APPLET_H__ | 21 | #define __OPIE_LOGOUT_APPLET_H__ |
22 | 22 | ||
23 | #include <qpe/menuappletinterface.h> | 23 | #include <qpe/menuappletinterface.h> |
24 | 24 | ||
25 | class LogoutApplet : public QObject, public MenuAppletInterface | 25 | class LogoutApplet : public QObject, public MenuAppletInterface |
26 | { | 26 | { |
27 | public: | 27 | public: |
28 | LogoutApplet ( ); | 28 | LogoutApplet ( ); |
29 | virtual ~LogoutApplet ( ); | 29 | virtual ~LogoutApplet ( ); |
30 | 30 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
32 | Q_REFCOUNT | 32 | Q_REFCOUNT |
33 | 33 | ||
34 | virtual int position() const; | 34 | virtual int position() const; |
35 | 35 | ||
36 | virtual QString name ( ) const; | 36 | virtual QString name ( ) const; |
37 | virtual QIconSet icon ( ) const; | 37 | virtual QIconSet icon ( ) const; |
38 | virtual QString text ( ) const; | 38 | virtual QString text ( ) const; |
39 | virtual QString tr( const char* ) const; | 39 | virtual QString tr( const char* ) const; |
40 | virtual QString tr( const char*, const char* ) const; | 40 | virtual QString tr( const char*, const char* ) const; |
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 | ||
45 | private: | ||
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 | |||
@@ -1,59 +1,59 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2004 Anton Kachalov mouse@altlinux.ru | 2 | ** Copyright (C) 2004 Anton Kachalov mouse@altlinux.ru |
3 | ** All rights reserved. | 3 | ** All rights reserved. |
4 | ** | 4 | ** |
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 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | **********************************************************************/ | 13 | **********************************************************************/ |
14 | #include "multikey.h" | 14 | #include "multikey.h" |
15 | #include "multikeyappletimpl.h" | 15 | #include "multikeyappletimpl.h" |
16 | 16 | ||
17 | MultikeyAppletImpl::MultikeyAppletImpl() | 17 | MultikeyAppletImpl::MultikeyAppletImpl() |
18 | : kbd(0), ref(0) | 18 | : kbd(0) |
19 | { | 19 | { |
20 | } | 20 | } |
21 | 21 | ||
22 | MultikeyAppletImpl::~MultikeyAppletImpl() | 22 | MultikeyAppletImpl::~MultikeyAppletImpl() |
23 | { | 23 | { |
24 | delete kbd; | 24 | delete kbd; |
25 | } | 25 | } |
26 | 26 | ||
27 | QWidget *MultikeyAppletImpl::applet( QWidget *parent ) | 27 | QWidget *MultikeyAppletImpl::applet( QWidget *parent ) |
28 | { | 28 | { |
29 | if ( !kbd ) | 29 | if ( !kbd ) |
30 | kbd = new Multikey(parent); | 30 | kbd = new Multikey(parent); |
31 | return kbd; | 31 | return kbd; |
32 | } | 32 | } |
33 | 33 | ||
34 | int MultikeyAppletImpl::position() const | 34 | int MultikeyAppletImpl::position() const |
35 | { | 35 | { |
36 | return 10; | 36 | return 10; |
37 | } | 37 | } |
38 | 38 | ||
39 | #ifndef QT_NO_COMPONENT | 39 | #ifndef QT_NO_COMPONENT |
40 | QRESULT MultikeyAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 40 | QRESULT MultikeyAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
41 | { | 41 | { |
42 | *iface = 0; | 42 | *iface = 0; |
43 | if ( uuid == IID_QUnknown ) | 43 | if ( uuid == IID_QUnknown ) |
44 | *iface = this; | 44 | *iface = this; |
45 | else if ( uuid == IID_TaskbarApplet ) | 45 | else if ( uuid == IID_TaskbarApplet ) |
46 | *iface = this; | 46 | *iface = this; |
47 | else | 47 | else |
48 | return QS_FALSE; | 48 | return QS_FALSE; |
49 | 49 | ||
50 | if ( *iface ) | 50 | if ( *iface ) |
51 | (*iface)->addRef(); | 51 | (*iface)->addRef(); |
52 | return QS_OK; | 52 | return QS_OK; |
53 | } | 53 | } |
54 | 54 | ||
55 | Q_EXPORT_INTERFACE() | 55 | Q_EXPORT_INTERFACE() |
56 | { | 56 | { |
57 | Q_CREATE_INSTANCE( MultikeyAppletImpl ) | 57 | Q_CREATE_INSTANCE( MultikeyAppletImpl ) |
58 | } | 58 | } |
59 | #endif | 59 | #endif |
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 | |||
@@ -1,40 +1,39 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2004 Anton Kachalov mouse@altlinux.ru | 2 | ** Copyright (C) 2004 Anton Kachalov mouse@altlinux.ru |
3 | ** All rights reserved. | 3 | ** All rights reserved. |
4 | ** | 4 | ** |
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 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | **********************************************************************/ | 13 | **********************************************************************/ |
14 | #ifndef __MULTIKEYAPPLETIMPL_H__ | 14 | #ifndef __MULTIKEYAPPLETIMPL_H__ |
15 | #define __MULTIKEYAPPLETIMPL_H__ | 15 | #define __MULTIKEYAPPLETIMPL_H__ |
16 | 16 | ||
17 | #include <qpe/taskbarappletinterface.h> | 17 | #include <qpe/taskbarappletinterface.h> |
18 | 18 | ||
19 | class Multikey; | 19 | class Multikey; |
20 | 20 | ||
21 | class MultikeyAppletImpl : public TaskbarAppletInterface | 21 | class MultikeyAppletImpl : public TaskbarAppletInterface |
22 | { | 22 | { |
23 | public: | 23 | public: |
24 | MultikeyAppletImpl(); | 24 | MultikeyAppletImpl(); |
25 | virtual ~MultikeyAppletImpl(); | 25 | virtual ~MultikeyAppletImpl(); |
26 | 26 | ||
27 | #ifndef QT_NO_COMPONENT | 27 | #ifndef QT_NO_COMPONENT |
28 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 28 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
29 | Q_REFCOUNT | 29 | Q_REFCOUNT |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | virtual QWidget *applet( QWidget *parent ); | 32 | virtual QWidget *applet( QWidget *parent ); |
33 | virtual int position() const; | 33 | virtual int position() const; |
34 | 34 | ||
35 | private: | 35 | private: |
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 | |||
@@ -1,67 +1,67 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 "restart.h" | 20 | #include "restart.h" |
21 | #include "restartappletimpl.h" | 21 | #include "restartappletimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | RestartAppletImpl::RestartAppletImpl() | 24 | RestartAppletImpl::RestartAppletImpl() |
25 | : restart(0), ref(0) | 25 | : restart(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | RestartAppletImpl::~RestartAppletImpl() | 29 | RestartAppletImpl::~RestartAppletImpl() |
30 | { | 30 | { |
31 | delete restart; | 31 | delete restart; |
32 | } | 32 | } |
33 | 33 | ||
34 | QWidget *RestartAppletImpl::applet( QWidget *parent ) | 34 | QWidget *RestartAppletImpl::applet( QWidget *parent ) |
35 | { | 35 | { |
36 | qDebug("restart applet"); | 36 | qDebug("restart applet"); |
37 | if ( !restart ) | 37 | if ( !restart ) |
38 | restart = new RestartApplet( parent ); | 38 | restart = new RestartApplet( parent ); |
39 | return restart; | 39 | return restart; |
40 | } | 40 | } |
41 | 41 | ||
42 | int RestartAppletImpl::position() const | 42 | int RestartAppletImpl::position() const |
43 | { | 43 | { |
44 | return 6; | 44 | return 6; |
45 | } | 45 | } |
46 | 46 | ||
47 | QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 47 | QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
48 | { | 48 | { |
49 | *iface = 0; | 49 | *iface = 0; |
50 | if ( uuid == IID_QUnknown ) | 50 | if ( uuid == IID_QUnknown ) |
51 | *iface = this; | 51 | *iface = this; |
52 | else if ( uuid == IID_TaskbarApplet ) | 52 | else if ( uuid == IID_TaskbarApplet ) |
53 | *iface = this; | 53 | *iface = this; |
54 | else | 54 | else |
55 | return QS_FALSE; | 55 | return QS_FALSE; |
56 | 56 | ||
57 | if ( *iface ) | 57 | if ( *iface ) |
58 | (*iface)->addRef(); | 58 | (*iface)->addRef(); |
59 | return QS_OK; | 59 | return QS_OK; |
60 | } | 60 | } |
61 | 61 | ||
62 | Q_EXPORT_INTERFACE() | 62 | Q_EXPORT_INTERFACE() |
63 | { | 63 | { |
64 | Q_CREATE_INSTANCE( RestartAppletImpl ) | 64 | Q_CREATE_INSTANCE( RestartAppletImpl ) |
65 | } | 65 | } |
66 | 66 | ||
67 | 67 | ||
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 | |||
@@ -1,44 +1,43 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef RESTARTAPPLETIMPL_H | 20 | #ifndef RESTARTAPPLETIMPL_H |
21 | #define RESTARTAPPLETIMPL_H | 21 | #define RESTARTAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qpe/taskbarappletinterface.h> | 23 | #include <qpe/taskbarappletinterface.h> |
24 | 24 | ||
25 | class RestartApplet; | 25 | class RestartApplet; |
26 | 26 | ||
27 | class RestartAppletImpl : public TaskbarAppletInterface | 27 | class RestartAppletImpl : public TaskbarAppletInterface |
28 | { | 28 | { |
29 | public: | 29 | public: |
30 | RestartAppletImpl(); | 30 | RestartAppletImpl(); |
31 | virtual ~RestartAppletImpl(); | 31 | virtual ~RestartAppletImpl(); |
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 | 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 | |||
@@ -1,109 +1,109 @@ | |||
1 | // coptright Mon 10-21-2002 01:14:03 by L. Potter <ljp@llornkcor.com> | 1 | // coptright Mon 10-21-2002 01:14:03 by L. Potter <ljp@llornkcor.com> |
2 | 2 | ||
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | #include <qpe/resource.h> | 4 | #include <qpe/resource.h> |
5 | #include <qpe/qcopenvelope_qws.h> | 5 | #include <qpe/qcopenvelope_qws.h> |
6 | 6 | ||
7 | #include "restart.h" | 7 | #include "restart.h" |
8 | 8 | ||
9 | // #include <stdlib.h> | 9 | // #include <stdlib.h> |
10 | // #include <unistd.h> | 10 | // #include <unistd.h> |
11 | // #include <sys/stat.h> | 11 | // #include <sys/stat.h> |
12 | //#include <dirent.h> | 12 | //#include <dirent.h> |
13 | /* XPM */ | 13 | /* XPM */ |
14 | static char *restart_xpm[] = { | 14 | static char *restart_xpm[] = { |
15 | "16 16 11 1", | 15 | "16 16 11 1", |
16 | " c None", | 16 | " c None", |
17 | ". c #000000", | 17 | ". c #000000", |
18 | "+ c #DCDCDC", | 18 | "+ c #DCDCDC", |
19 | "@ c #A0A0A0", | 19 | "@ c #A0A0A0", |
20 | "# c #C3C3C3", | 20 | "# c #C3C3C3", |
21 | "$ c #808080", | 21 | "$ c #808080", |
22 | "% c #FFA858", | 22 | "% c #FFA858", |
23 | "& c #FFDCA8", | 23 | "& c #FFDCA8", |
24 | "* c #FFFFC0", | 24 | "* c #FFFFC0", |
25 | "= c #FFFFFF", | 25 | "= c #FFFFFF", |
26 | "- c #585858", | 26 | "- c #585858", |
27 | " .. ", | 27 | " .. ", |
28 | " .. .++. .. ", | 28 | " .. .++. .. ", |
29 | " .+@.@##@.@+. ", | 29 | " .+@.@##@.@+. ", |
30 | " .@+$@%%@$+@. ", | 30 | " .@+$@%%@$+@. ", |
31 | " .$%%&%&%$. ", | 31 | " .$%%&%&%$. ", |
32 | " ..+@%&$$%&@+.. ", | 32 | " ..+@%&$$%&@+.. ", |
33 | ".+#@%&%@@&*%@#+.", | 33 | ".+#@%&%@@&*%@#+.", |
34 | ".$@+$&*&&=*$+@$.", | 34 | ".$@+$&*&&=*$+@$.", |
35 | " .--+$&*=&$+--. ", | 35 | " .--+$&*=&$+--. ", |
36 | " .$#++$$++#$. ", | 36 | " .$#++$$++#$. ", |
37 | " .@=$-$++$-$=@. ", | 37 | " .@=$-$++$-$=@. ", |
38 | " .+@-..@@..-@+. ", | 38 | " .+@-..@@..-@+. ", |
39 | " ... .+=. ... ", | 39 | " ... .+=. ... ", |
40 | " .-$. ", | 40 | " .-$. ", |
41 | " .. ", | 41 | " .. ", |
42 | " "}; | 42 | " "}; |
43 | 43 | ||
44 | RestartApplet::RestartApplet ( ) | 44 | RestartApplet::RestartApplet ( ) |
45 | : QObject ( 0, "RestartApplet" ), ref ( 0 ) | 45 | : QObject ( 0, "RestartApplet" ) |
46 | { | 46 | { |
47 | } | 47 | } |
48 | 48 | ||
49 | RestartApplet::~RestartApplet ( ) | 49 | RestartApplet::~RestartApplet ( ) |
50 | { | 50 | { |
51 | } | 51 | } |
52 | 52 | ||
53 | int RestartApplet::position ( ) const | 53 | int RestartApplet::position ( ) const |
54 | { | 54 | { |
55 | return 4; | 55 | return 4; |
56 | } | 56 | } |
57 | 57 | ||
58 | QString RestartApplet::name ( ) const | 58 | QString RestartApplet::name ( ) const |
59 | { | 59 | { |
60 | return tr( "Restart" ); | 60 | return tr( "Restart" ); |
61 | } | 61 | } |
62 | 62 | ||
63 | QString RestartApplet::text ( ) const | 63 | QString RestartApplet::text ( ) const |
64 | { | 64 | { |
65 | return tr( "Restart Opie" ); | 65 | return tr( "Restart Opie" ); |
66 | } | 66 | } |
67 | 67 | ||
68 | QIconSet RestartApplet::icon ( ) const | 68 | QIconSet RestartApplet::icon ( ) const |
69 | { | 69 | { |
70 | QPixmap pix; | 70 | QPixmap pix; |
71 | QImage img = ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" ); | 71 | QImage img = ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" ); |
72 | 72 | ||
73 | if ( !img. isNull ( )) | 73 | if ( !img. isNull ( )) |
74 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 74 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
75 | return pix; | 75 | return pix; |
76 | } | 76 | } |
77 | 77 | ||
78 | QPopupMenu *RestartApplet::popup ( QWidget * ) const | 78 | QPopupMenu *RestartApplet::popup ( QWidget * ) const |
79 | { | 79 | { |
80 | return 0; | 80 | return 0; |
81 | } | 81 | } |
82 | 82 | ||
83 | void RestartApplet::activated ( ) | 83 | void RestartApplet::activated ( ) |
84 | { | 84 | { |
85 | QCopEnvelope e("QPE/System", "restart()"); | 85 | QCopEnvelope e("QPE/System", "restart()"); |
86 | } | 86 | } |
87 | 87 | ||
88 | 88 | ||
89 | QRESULT RestartApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 89 | QRESULT RestartApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
90 | { | 90 | { |
91 | *iface = 0; | 91 | *iface = 0; |
92 | if ( uuid == IID_QUnknown ) | 92 | if ( uuid == IID_QUnknown ) |
93 | *iface = this; | 93 | *iface = this; |
94 | else if ( uuid == IID_MenuApplet ) | 94 | else if ( uuid == IID_MenuApplet ) |
95 | *iface = this; | 95 | *iface = this; |
96 | else | 96 | else |
97 | return QS_FALSE; | 97 | return QS_FALSE; |
98 | 98 | ||
99 | if ( *iface ) | 99 | if ( *iface ) |
100 | (*iface)-> addRef ( ); | 100 | (*iface)-> addRef ( ); |
101 | return QS_OK; | 101 | return QS_OK; |
102 | } | 102 | } |
103 | 103 | ||
104 | Q_EXPORT_INTERFACE( ) | 104 | Q_EXPORT_INTERFACE( ) |
105 | { | 105 | { |
106 | Q_CREATE_INSTANCE( RestartApplet ) | 106 | Q_CREATE_INSTANCE( RestartApplet ) |
107 | } | 107 | } |
108 | 108 | ||
109 | 109 | ||
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 | |||
@@ -1,37 +1,35 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002 ljp <llornkcor@handhelds.org> | 2 | ** Copyright (C) 2002 ljp <llornkcor@handhelds.org> |
3 | 3 | ||
4 | ** This file may be distributed and/or modified under the terms of the | 4 | ** This file may be distributed and/or modified under the terms of the |
5 | ** GNU General Public License version 2 as published by the Free Software | 5 | ** GNU General Public License version 2 as published by the Free Software |
6 | ** Foundation and appearing in the file LICENSE.GPL included in the | 6 | ** Foundation and appearing in the file LICENSE.GPL included in the |
7 | ** packaging of this file. | 7 | ** packaging of this file. |
8 | ** | 8 | ** |
9 | **********************************************************************/ | 9 | **********************************************************************/ |
10 | #ifndef __OPIE_RESTART_APPLET_H__ | 10 | #ifndef __OPIE_RESTART_APPLET_H__ |
11 | #define __OPIE_RESTART_APPLET_H__ | 11 | #define __OPIE_RESTART_APPLET_H__ |
12 | 12 | ||
13 | #include <qpe/menuappletinterface.h> | 13 | #include <qpe/menuappletinterface.h> |
14 | 14 | ||
15 | class RestartApplet : public QObject, public MenuAppletInterface | 15 | class RestartApplet : public QObject, public MenuAppletInterface |
16 | { | 16 | { |
17 | public: | 17 | public: |
18 | RestartApplet ( ); | 18 | RestartApplet ( ); |
19 | virtual ~RestartApplet ( ); | 19 | virtual ~RestartApplet ( ); |
20 | 20 | ||
21 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 21 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
22 | Q_REFCOUNT | 22 | Q_REFCOUNT |
23 | 23 | ||
24 | virtual int position() const; | 24 | virtual int position() const; |
25 | 25 | ||
26 | virtual QString name ( ) const; | 26 | virtual QString name ( ) const; |
27 | virtual QIconSet icon ( ) const; | 27 | virtual QIconSet icon ( ) const; |
28 | virtual QString text ( ) const; | 28 | virtual QString text ( ) const; |
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 | ||
33 | private: | ||
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 | |||
@@ -1,178 +1,178 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | This file is part of the OPIE Project |
3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | 3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> |
4 | Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> | 4 | Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> |
5 | =. Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> | 5 | =. Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> |
6 | .=l. | 6 | .=l. |
7 | .>+-= | 7 | .>+-= |
8 | _;:, .> :=|. This library is free software; you can | 8 | _;:, .> :=|. This library is free software; you can |
9 | .> <, > . <= redistribute it and/or modify it under | 9 | .> <, > . <= redistribute it and/or modify it under |
10 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%+i> _;_. | 14 | .%+i> _;_. |
15 | .i_,=:_. -<s. This library is distributed in the hope that | 15 | .i_,=:_. -<s. This library is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. . .: details. | 21 | ++= -. . .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-= this library; see the file COPYING.LIB. | 25 | -- :-= this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "rotate.h" | 31 | #include "rotate.h" |
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie/odevice.h> | 34 | #include <opie/odevice.h> |
35 | #include <qpe/applnk.h> | 35 | #include <qpe/applnk.h> |
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | #include <qpe/power.h> | 37 | #include <qpe/power.h> |
38 | #include <qpe/qpeapplication.h> | 38 | #include <qpe/qpeapplication.h> |
39 | #include <qpe/qcopenvelope_qws.h> | 39 | #include <qpe/qcopenvelope_qws.h> |
40 | #include <qpe/resource.h> | 40 | #include <qpe/resource.h> |
41 | using namespace Opie; | 41 | using namespace Opie; |
42 | 42 | ||
43 | /* QT */ | 43 | /* QT */ |
44 | #include <qiconset.h> | 44 | #include <qiconset.h> |
45 | #include <qpopupmenu.h> | 45 | #include <qpopupmenu.h> |
46 | 46 | ||
47 | #include <time.h> | 47 | #include <time.h> |
48 | 48 | ||
49 | RotateApplet::RotateApplet() | 49 | RotateApplet::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 ); |
55 | connect ( rotateChannel, SIGNAL( received( const QCString &, const QByteArray &) ), | 55 | connect ( rotateChannel, SIGNAL( received( const QCString &, const QByteArray &) ), |
56 | this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); | 56 | this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | } | 59 | } |
60 | 60 | ||
61 | RotateApplet::~RotateApplet ( ) | 61 | RotateApplet::~RotateApplet ( ) |
62 | {} | 62 | {} |
63 | 63 | ||
64 | /** | 64 | /** |
65 | * Qcop receive method. | 65 | * Qcop receive method. |
66 | */ | 66 | */ |
67 | void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data ) | 67 | void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data ) |
68 | { | 68 | { |
69 | qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg ); | 69 | qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg ); |
70 | 70 | ||
71 | if ( ODevice::inst()->hasHingeSensor() ) | 71 | if ( ODevice::inst()->hasHingeSensor() ) |
72 | { | 72 | { |
73 | struct timespec interval; | 73 | struct timespec interval; |
74 | struct timespec remain; | 74 | struct timespec remain; |
75 | interval.tv_sec = 0; | 75 | interval.tv_sec = 0; |
76 | interval.tv_nsec = 600000; | 76 | interval.tv_nsec = 600000; |
77 | ::nanosleep( &interval, &remain ); | 77 | ::nanosleep( &interval, &remain ); |
78 | OHingeStatus status = ODevice::inst()->readHingeSensor(); | 78 | OHingeStatus status = ODevice::inst()->readHingeSensor(); |
79 | qDebug( "RotateApplet::readHingeSensor = %d", (int) status ); | 79 | qDebug( "RotateApplet::readHingeSensor = %d", (int) status ); |
80 | 80 | ||
81 | Config cfg( "apm" ); | 81 | Config cfg( "apm" ); |
82 | cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" ); | 82 | cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" ); |
83 | int action = cfg.readNumEntry( "CloseHingeAction", 0 ); | 83 | int action = cfg.readNumEntry( "CloseHingeAction", 0 ); |
84 | 84 | ||
85 | if ( status == CASE_CLOSED ) | 85 | if ( status == CASE_CLOSED ) |
86 | { | 86 | { |
87 | switch ( action ) | 87 | switch ( action ) |
88 | { | 88 | { |
89 | case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 0 ); break; | 89 | case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 0 ); break; |
90 | case 2: /* SUSPEND */ ODevice::inst()->suspend(); break; | 90 | case 2: /* SUSPEND */ ODevice::inst()->suspend(); break; |
91 | default: /* IGNORE */ break; | 91 | default: /* IGNORE */ break; |
92 | } | 92 | } |
93 | } | 93 | } |
94 | else /* status != CASE_CLOSED */ | 94 | else /* status != CASE_CLOSED */ |
95 | { | 95 | { |
96 | switch ( action ) | 96 | switch ( action ) |
97 | { | 97 | { |
98 | case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 127 ); break; | 98 | case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 127 ); break; |
99 | case 2: /* SUSPEND */ /* How to wake up the device from kernel? */; break; | 99 | case 2: /* SUSPEND */ /* How to wake up the device from kernel? */; break; |
100 | default: /* IGNORE */ break; | 100 | default: /* IGNORE */ break; |
101 | } | 101 | } |
102 | } | 102 | } |
103 | qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) ); | 103 | qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) ); |
104 | } | 104 | } |
105 | 105 | ||
106 | QDataStream stream( data, IO_ReadOnly ); | 106 | QDataStream stream( data, IO_ReadOnly ); |
107 | if ( msg == "flip()" ) | 107 | if ( msg == "flip()" ) |
108 | { | 108 | { |
109 | activated ( ); | 109 | activated ( ); |
110 | } | 110 | } |
111 | else if ( msg == "rotateDefault()") | 111 | else if ( msg == "rotateDefault()") |
112 | { | 112 | { |
113 | rotateDefault(); | 113 | rotateDefault(); |
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||
117 | int RotateApplet::position() const | 117 | int RotateApplet::position() const |
118 | { | 118 | { |
119 | return 3; | 119 | return 3; |
120 | } | 120 | } |
121 | 121 | ||
122 | QString RotateApplet::name() const | 122 | QString RotateApplet::name() const |
123 | { | 123 | { |
124 | return tr( "Rotate shortcut" ); | 124 | return tr( "Rotate shortcut" ); |
125 | } | 125 | } |
126 | 126 | ||
127 | QString RotateApplet::text() const | 127 | QString RotateApplet::text() const |
128 | { | 128 | { |
129 | return tr( "Rotate" ); | 129 | return tr( "Rotate" ); |
130 | } | 130 | } |
131 | 131 | ||
132 | /*QString RotateApplet::tr( const char* s ) const | 132 | /*QString RotateApplet::tr( const char* s ) const |
133 | { | 133 | { |
134 | return qApp->translate( "RotateApplet", s, 0 ); | 134 | return qApp->translate( "RotateApplet", s, 0 ); |
135 | } | 135 | } |
136 | 136 | ||
137 | QString RotateApplet::tr( const char* s, const char* p ) const | 137 | QString RotateApplet::tr( const char* s, const char* p ) const |
138 | { | 138 | { |
139 | return qApp->translate( "RotateApplet", s, p ); | 139 | return qApp->translate( "RotateApplet", s, p ); |
140 | } | 140 | } |
141 | */ | 141 | */ |
142 | 142 | ||
143 | QIconSet RotateApplet::icon() const | 143 | QIconSet RotateApplet::icon() const |
144 | { | 144 | { |
145 | QPixmap pix; | 145 | QPixmap pix; |
146 | QImage img = Resource::loadImage( "Rotation" ); | 146 | QImage img = Resource::loadImage( "Rotation" ); |
147 | if ( !img.isNull() ) | 147 | if ( !img.isNull() ) |
148 | pix.convertFromImage( img.smoothScale( 14, 14 ) ); | 148 | pix.convertFromImage( img.smoothScale( 14, 14 ) ); |
149 | return pix; | 149 | return pix; |
150 | } | 150 | } |
151 | 151 | ||
152 | QPopupMenu* RotateApplet::popup(QWidget*) const | 152 | QPopupMenu* RotateApplet::popup(QWidget*) const |
153 | { | 153 | { |
154 | return 0; | 154 | return 0; |
155 | } | 155 | } |
156 | 156 | ||
157 | void RotateApplet::rotateDefault() | 157 | void RotateApplet::rotateDefault() |
158 | { | 158 | { |
159 | int rot = ODevice::inst()->rotation(); | 159 | int rot = ODevice::inst()->rotation(); |
160 | 160 | ||
161 | switch (rot) | 161 | switch (rot) |
162 | { | 162 | { |
163 | case Rot0: rot=0; break; | 163 | case Rot0: rot=0; break; |
164 | case Rot90: rot=90; break; | 164 | case Rot90: rot=90; break; |
165 | case Rot180: rot=180; break; | 165 | case Rot180: rot=180; break; |
166 | case Rot270: rot=270; break; | 166 | case Rot270: rot=270; break; |
167 | default: rot=0; break; | 167 | default: rot=0; break; |
168 | } | 168 | } |
169 | 169 | ||
170 | Config cfg( "qpe" ); | 170 | Config cfg( "qpe" ); |
171 | cfg.setGroup( "Appearance" ); | 171 | cfg.setGroup( "Appearance" ); |
172 | 172 | ||
173 | bool rotateEnabled = cfg.readBoolEntry( "rotateEnabled",true ); | 173 | bool rotateEnabled = cfg.readBoolEntry( "rotateEnabled",true ); |
174 | 174 | ||
175 | if ( !rotateEnabled) return; | 175 | if ( !rotateEnabled) return; |
176 | 176 | ||
177 | // hide inputs methods before rotation | 177 | // hide inputs methods before rotation |
178 | QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" ); | 178 | QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" ); |
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 | |||
@@ -1,72 +1,71 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2003 Maximilian Reiss <harlekin@handhelds.org> | 3 | .=l. Copyright (c) 2003 Maximilian Reiss <harlekin@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This library is free software; you can | 5 | _;:, .> :=|. This library is free software; you can |
6 | .> <_, > . <= redistribute it and/or modify it under | 6 | .> <_, > . <= redistribute it and/or modify it under |
7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%+i> _;_. | 11 | .%+i> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. . .: details. | 18 | ++= -. . .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-= this library; see the file COPYING.LIB. | 22 | -- :-= this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | 30 | ||
31 | #ifndef __OPIE_ROTATE_APPLET_H__ | 31 | #ifndef __OPIE_ROTATE_APPLET_H__ |
32 | #define __OPIE_ROTATE_APPLET_H__ | 32 | #define __OPIE_ROTATE_APPLET_H__ |
33 | 33 | ||
34 | #include <qpe/menuappletinterface.h> | 34 | #include <qpe/menuappletinterface.h> |
35 | #include <qobject.h> | 35 | #include <qobject.h> |
36 | 36 | ||
37 | #include <qobject.h> | 37 | #include <qobject.h> |
38 | 38 | ||
39 | class RotateApplet : public QObject, public MenuAppletInterface | 39 | class RotateApplet : public QObject, public MenuAppletInterface |
40 | { | 40 | { |
41 | 41 | ||
42 | Q_OBJECT | 42 | Q_OBJECT |
43 | 43 | ||
44 | public: | 44 | public: |
45 | RotateApplet ( ); | 45 | RotateApplet ( ); |
46 | virtual ~RotateApplet ( ); | 46 | virtual ~RotateApplet ( ); |
47 | 47 | ||
48 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 48 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
49 | Q_REFCOUNT | 49 | Q_REFCOUNT |
50 | 50 | ||
51 | virtual int position() const; | 51 | virtual int position() const; |
52 | 52 | ||
53 | virtual QString name ( ) const; | 53 | virtual QString name ( ) const; |
54 | virtual QIconSet icon ( ) const; | 54 | virtual QIconSet icon ( ) const; |
55 | virtual QString text ( ) const; | 55 | virtual QString text ( ) const; |
56 | /* virtual QString tr( const char* ) const; | 56 | /* virtual QString tr( const char* ) const; |
57 | virtual QString tr( const char*, const char* ) const; | 57 | virtual QString tr( const char*, const char* ) const; |
58 | */ | 58 | */ |
59 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 59 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
60 | virtual void activated ( ); | 60 | virtual void activated ( ); |
61 | virtual void rotateDefault ( ); | 61 | virtual void rotateDefault ( ); |
62 | 62 | ||
63 | private slots: | 63 | private slots: |
64 | void channelReceived( const QCString &msg, const QByteArray & data ); | 64 | void channelReceived( const QCString &msg, const QByteArray & data ); |
65 | 65 | ||
66 | private: | 66 | private: |
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 | |||
@@ -1,66 +1,66 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 "screenshot.h" | 20 | #include "screenshot.h" |
21 | #include "screenshotappletimpl.h" | 21 | #include "screenshotappletimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | ScreenshotAppletImpl::ScreenshotAppletImpl() | 24 | ScreenshotAppletImpl::ScreenshotAppletImpl() |
25 | : screenshot(0), ref(0) | 25 | : screenshot(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | ScreenshotAppletImpl::~ScreenshotAppletImpl() | 29 | ScreenshotAppletImpl::~ScreenshotAppletImpl() |
30 | { | 30 | { |
31 | delete screenshot; | 31 | delete screenshot; |
32 | } | 32 | } |
33 | 33 | ||
34 | QWidget *ScreenshotAppletImpl::applet( QWidget *parent ) | 34 | QWidget *ScreenshotAppletImpl::applet( QWidget *parent ) |
35 | { | 35 | { |
36 | if ( !screenshot ) | 36 | if ( !screenshot ) |
37 | screenshot = new ScreenshotApplet( parent ); | 37 | screenshot = new ScreenshotApplet( parent ); |
38 | return screenshot; | 38 | return screenshot; |
39 | } | 39 | } |
40 | 40 | ||
41 | int ScreenshotAppletImpl::position() const | 41 | int ScreenshotAppletImpl::position() const |
42 | { | 42 | { |
43 | return 6; | 43 | return 6; |
44 | } | 44 | } |
45 | 45 | ||
46 | QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 46 | QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
47 | { | 47 | { |
48 | *iface = 0; | 48 | *iface = 0; |
49 | if ( uuid == IID_QUnknown ) | 49 | if ( uuid == IID_QUnknown ) |
50 | *iface = this; | 50 | *iface = this; |
51 | else if ( uuid == IID_TaskbarApplet ) | 51 | else if ( uuid == IID_TaskbarApplet ) |
52 | *iface = this; | 52 | *iface = this; |
53 | else | 53 | else |
54 | return QS_FALSE; | 54 | return QS_FALSE; |
55 | 55 | ||
56 | if ( *iface ) | 56 | if ( *iface ) |
57 | (*iface)->addRef(); | 57 | (*iface)->addRef(); |
58 | return QS_OK; | 58 | return QS_OK; |
59 | } | 59 | } |
60 | 60 | ||
61 | Q_EXPORT_INTERFACE() | 61 | Q_EXPORT_INTERFACE() |
62 | { | 62 | { |
63 | Q_CREATE_INSTANCE( ScreenshotAppletImpl ) | 63 | Q_CREATE_INSTANCE( ScreenshotAppletImpl ) |
64 | } | 64 | } |
65 | 65 | ||
66 | 66 | ||
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 | |||
@@ -1,44 +1,43 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef SCREENSHOTAPPLETIMPL_H | 20 | #ifndef SCREENSHOTAPPLETIMPL_H |
21 | #define SCREENSHOTAPPLETIMPL_H | 21 | #define SCREENSHOTAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qpe/taskbarappletinterface.h> | 23 | #include <qpe/taskbarappletinterface.h> |
24 | 24 | ||
25 | class ScreenshotApplet; | 25 | class ScreenshotApplet; |
26 | 26 | ||
27 | class ScreenshotAppletImpl : public TaskbarAppletInterface | 27 | class ScreenshotAppletImpl : public TaskbarAppletInterface |
28 | { | 28 | { |
29 | public: | 29 | public: |
30 | ScreenshotAppletImpl(); | 30 | ScreenshotAppletImpl(); |
31 | virtual ~ScreenshotAppletImpl(); | 31 | virtual ~ScreenshotAppletImpl(); |
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 | 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 | |||
@@ -1,87 +1,87 @@ | |||
1 | #include <qpe/resource.h> | 1 | #include <qpe/resource.h> |
2 | #include <qpe/qcopenvelope_qws.h> | 2 | #include <qpe/qcopenvelope_qws.h> |
3 | 3 | ||
4 | #include <qapplication.h> | 4 | #include <qapplication.h> |
5 | #include <qiconset.h> | 5 | #include <qiconset.h> |
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | 7 | ||
8 | #include "suspend.h" | 8 | #include "suspend.h" |
9 | 9 | ||
10 | 10 | ||
11 | SuspendApplet::SuspendApplet ( ) | 11 | SuspendApplet::SuspendApplet ( ) |
12 | : QObject ( 0, "SuspendApplet" ), ref ( 0 ) | 12 | : QObject ( 0, "SuspendApplet" ) |
13 | { | 13 | { |
14 | } | 14 | } |
15 | 15 | ||
16 | SuspendApplet::~SuspendApplet ( ) | 16 | SuspendApplet::~SuspendApplet ( ) |
17 | { | 17 | { |
18 | } | 18 | } |
19 | 19 | ||
20 | int SuspendApplet::position ( ) const | 20 | int SuspendApplet::position ( ) const |
21 | { | 21 | { |
22 | return 2; | 22 | return 2; |
23 | } | 23 | } |
24 | 24 | ||
25 | QString SuspendApplet::name ( ) const | 25 | QString SuspendApplet::name ( ) const |
26 | { | 26 | { |
27 | return tr( "Suspend shortcut" ); | 27 | return tr( "Suspend shortcut" ); |
28 | } | 28 | } |
29 | 29 | ||
30 | QString SuspendApplet::text ( ) const | 30 | QString SuspendApplet::text ( ) const |
31 | { | 31 | { |
32 | return tr( "Suspend" ); | 32 | return tr( "Suspend" ); |
33 | } | 33 | } |
34 | 34 | ||
35 | QString SuspendApplet::tr( const char* s ) const | 35 | QString SuspendApplet::tr( const char* s ) const |
36 | { | 36 | { |
37 | return qApp->translate( "SuspendApplet", s, 0 ); | 37 | return qApp->translate( "SuspendApplet", s, 0 ); |
38 | } | 38 | } |
39 | 39 | ||
40 | QString SuspendApplet::tr( const char* s, const char* p ) const | 40 | QString SuspendApplet::tr( const char* s, const char* p ) const |
41 | { | 41 | { |
42 | return qApp->translate( "SuspendApplet", s, p ); | 42 | return qApp->translate( "SuspendApplet", s, p ); |
43 | } | 43 | } |
44 | 44 | ||
45 | QIconSet SuspendApplet::icon ( ) const | 45 | QIconSet SuspendApplet::icon ( ) const |
46 | { | 46 | { |
47 | QPixmap pix; | 47 | QPixmap pix; |
48 | QImage img = Resource::loadImage ( "suspend" ); | 48 | QImage img = Resource::loadImage ( "suspend" ); |
49 | 49 | ||
50 | if ( !img. isNull ( )) | 50 | if ( !img. isNull ( )) |
51 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 51 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
52 | return pix; | 52 | return pix; |
53 | } | 53 | } |
54 | 54 | ||
55 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const | 55 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const |
56 | { | 56 | { |
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |
59 | 59 | ||
60 | void SuspendApplet::activated ( ) | 60 | void SuspendApplet::activated ( ) |
61 | { | 61 | { |
62 | // suspend | 62 | // suspend |
63 | QCopEnvelope ( "QPE/System", "suspend()" ); | 63 | QCopEnvelope ( "QPE/System", "suspend()" ); |
64 | } | 64 | } |
65 | 65 | ||
66 | 66 | ||
67 | QRESULT SuspendApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 67 | QRESULT SuspendApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
68 | { | 68 | { |
69 | *iface = 0; | 69 | *iface = 0; |
70 | if ( uuid == IID_QUnknown ) | 70 | if ( uuid == IID_QUnknown ) |
71 | *iface = this; | 71 | *iface = this; |
72 | else if ( uuid == IID_MenuApplet ) | 72 | else if ( uuid == IID_MenuApplet ) |
73 | *iface = this; | 73 | *iface = this; |
74 | else | 74 | else |
75 | return QS_FALSE; | 75 | return QS_FALSE; |
76 | 76 | ||
77 | if ( *iface ) | 77 | if ( *iface ) |
78 | (*iface)-> addRef ( ); | 78 | (*iface)-> addRef ( ); |
79 | return QS_OK; | 79 | return QS_OK; |
80 | } | 80 | } |
81 | 81 | ||
82 | Q_EXPORT_INTERFACE( ) | 82 | Q_EXPORT_INTERFACE( ) |
83 | { | 83 | { |
84 | Q_CREATE_INSTANCE( SuspendApplet ) | 84 | Q_CREATE_INSTANCE( SuspendApplet ) |
85 | } | 85 | } |
86 | 86 | ||
87 | 87 | ||
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 | |||
@@ -1,49 +1,47 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef __OPIE_SUSPEND_APPLET_H__ | 20 | #ifndef __OPIE_SUSPEND_APPLET_H__ |
21 | #define __OPIE_SUSPEND_APPLET_H__ | 21 | #define __OPIE_SUSPEND_APPLET_H__ |
22 | 22 | ||
23 | #include <qpe/menuappletinterface.h> | 23 | #include <qpe/menuappletinterface.h> |
24 | 24 | ||
25 | class SuspendApplet : public QObject, public MenuAppletInterface | 25 | class SuspendApplet : public QObject, public MenuAppletInterface |
26 | { | 26 | { |
27 | public: | 27 | public: |
28 | SuspendApplet ( ); | 28 | SuspendApplet ( ); |
29 | virtual ~SuspendApplet ( ); | 29 | virtual ~SuspendApplet ( ); |
30 | 30 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
32 | Q_REFCOUNT | 32 | Q_REFCOUNT |
33 | 33 | ||
34 | virtual int position() const; | 34 | virtual int position() const; |
35 | 35 | ||
36 | virtual QString name ( ) const; | 36 | virtual QString name ( ) const; |
37 | virtual QIconSet icon ( ) const; | 37 | virtual QIconSet icon ( ) const; |
38 | virtual QString text ( ) const; | 38 | virtual QString text ( ) const; |
39 | virtual QString tr( const char* ) const; | 39 | virtual QString tr( const char* ) const; |
40 | virtual QString tr( const char*, const char* ) const; | 40 | virtual QString tr( const char*, const char* ) const; |
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 | ||
45 | private: | ||
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 | |||
@@ -1,61 +1,61 @@ | |||
1 | /**************************************************************************************94x78** | 1 | /**************************************************************************************94x78** |
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | *********************************************************************************************/ | 11 | *********************************************************************************************/ |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * $Id$ | 14 | * $Id$ |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "vmemo.h" | 17 | #include "vmemo.h" |
18 | #include "vmemoimpl.h" | 18 | #include "vmemoimpl.h" |
19 | 19 | ||
20 | 20 | ||
21 | VMemoAppletImpl::VMemoAppletImpl() | 21 | VMemoAppletImpl::VMemoAppletImpl() |
22 | : vmemo(0), ref(0) | 22 | : vmemo(0) |
23 | { | 23 | { |
24 | } | 24 | } |
25 | 25 | ||
26 | VMemoAppletImpl::~VMemoAppletImpl() | 26 | VMemoAppletImpl::~VMemoAppletImpl() |
27 | { | 27 | { |
28 | delete vmemo; | 28 | delete vmemo; |
29 | } | 29 | } |
30 | 30 | ||
31 | QWidget *VMemoAppletImpl::applet( QWidget *parent ) | 31 | QWidget *VMemoAppletImpl::applet( QWidget *parent ) |
32 | { | 32 | { |
33 | if ( !vmemo ) | 33 | if ( !vmemo ) |
34 | vmemo = new VMemo( parent ); | 34 | vmemo = new VMemo( parent ); |
35 | return vmemo; | 35 | return vmemo; |
36 | } | 36 | } |
37 | 37 | ||
38 | int VMemoAppletImpl::position() const | 38 | int VMemoAppletImpl::position() const |
39 | { | 39 | { |
40 | return 6; | 40 | return 6; |
41 | } | 41 | } |
42 | 42 | ||
43 | QRESULT VMemoAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 43 | QRESULT VMemoAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
44 | { | 44 | { |
45 | *iface = 0; | 45 | *iface = 0; |
46 | if ( uuid == IID_QUnknown ) | 46 | if ( uuid == IID_QUnknown ) |
47 | *iface = this; | 47 | *iface = this; |
48 | else if ( uuid == IID_TaskbarApplet ) | 48 | else if ( uuid == IID_TaskbarApplet ) |
49 | *iface = this; | 49 | *iface = this; |
50 | else | 50 | else |
51 | return QS_FALSE; | 51 | return QS_FALSE; |
52 | 52 | ||
53 | if ( *iface ) | 53 | if ( *iface ) |
54 | (*iface)->addRef(); | 54 | (*iface)->addRef(); |
55 | return QS_OK; | 55 | return QS_OK; |
56 | } | 56 | } |
57 | 57 | ||
58 | Q_EXPORT_INTERFACE() | 58 | Q_EXPORT_INTERFACE() |
59 | { | 59 | { |
60 | Q_CREATE_INSTANCE( VMemoAppletImpl ) | 60 | Q_CREATE_INSTANCE( VMemoAppletImpl ) |
61 | } | 61 | } |
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 | |||
@@ -1,41 +1,40 @@ | |||
1 | /**************************************************************************************94x78** | 1 | /**************************************************************************************94x78** |
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | *********************************************************************************************/ | 11 | *********************************************************************************************/ |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * $Id$ | 14 | * $Id$ |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #ifndef __VMEMOIMPLAPPLETIMPL_H__ | 17 | #ifndef __VMEMOIMPLAPPLETIMPL_H__ |
18 | #define __VMEMOIMPLAPPLETIMPL_H__ | 18 | #define __VMEMOIMPLAPPLETIMPL_H__ |
19 | 19 | ||
20 | #include <qpe/taskbarappletinterface.h> | 20 | #include <qpe/taskbarappletinterface.h> |
21 | 21 | ||
22 | class VMemo; | 22 | class VMemo; |
23 | 23 | ||
24 | class VMemoAppletImpl : public TaskbarAppletInterface | 24 | class VMemoAppletImpl : public TaskbarAppletInterface |
25 | { | 25 | { |
26 | public: | 26 | public: |
27 | VMemoAppletImpl(); | 27 | VMemoAppletImpl(); |
28 | virtual ~VMemoAppletImpl(); | 28 | virtual ~VMemoAppletImpl(); |
29 | 29 | ||
30 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 30 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
31 | Q_REFCOUNT | 31 | Q_REFCOUNT |
32 | 32 | ||
33 | virtual QWidget *applet( QWidget *parent ); | 33 | virtual QWidget *applet( QWidget *parent ); |
34 | virtual int position() const; | 34 | virtual int position() const; |
35 | 35 | ||
36 | private: | 36 | private: |
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 | |||
@@ -1,67 +1,67 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 "volume.h" | 20 | #include "volume.h" |
21 | #include "volumeappletimpl.h" | 21 | #include "volumeappletimpl.h" |
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
24 | 24 | ||
25 | VolumeAppletImpl::VolumeAppletImpl() | 25 | VolumeAppletImpl::VolumeAppletImpl() |
26 | : volume(0), ref(0) | 26 | : volume(0) |
27 | { | 27 | { |
28 | } | 28 | } |
29 | 29 | ||
30 | VolumeAppletImpl::~VolumeAppletImpl() | 30 | VolumeAppletImpl::~VolumeAppletImpl() |
31 | { | 31 | { |
32 | delete volume; | 32 | delete volume; |
33 | } | 33 | } |
34 | 34 | ||
35 | QWidget *VolumeAppletImpl::applet( QWidget *parent ) | 35 | QWidget *VolumeAppletImpl::applet( QWidget *parent ) |
36 | { | 36 | { |
37 | if ( !volume ) | 37 | if ( !volume ) |
38 | volume = new VolumeApplet( parent ); | 38 | volume = new VolumeApplet( parent ); |
39 | return volume; | 39 | return volume; |
40 | } | 40 | } |
41 | 41 | ||
42 | int VolumeAppletImpl::position() const | 42 | int VolumeAppletImpl::position() const |
43 | { | 43 | { |
44 | return 6; | 44 | return 6; |
45 | } | 45 | } |
46 | 46 | ||
47 | QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 47 | QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
48 | { | 48 | { |
49 | *iface = 0; | 49 | *iface = 0; |
50 | if ( uuid == IID_QUnknown ) | 50 | if ( uuid == IID_QUnknown ) |
51 | *iface = this; | 51 | *iface = this; |
52 | else if ( uuid == IID_TaskbarApplet ) | 52 | else if ( uuid == IID_TaskbarApplet ) |
53 | *iface = this; | 53 | *iface = this; |
54 | else | 54 | else |
55 | return QS_FALSE; | 55 | return QS_FALSE; |
56 | 56 | ||
57 | if ( *iface ) | 57 | if ( *iface ) |
58 | (*iface)->addRef(); | 58 | (*iface)->addRef(); |
59 | return QS_OK; | 59 | return QS_OK; |
60 | } | 60 | } |
61 | 61 | ||
62 | Q_EXPORT_INTERFACE() | 62 | Q_EXPORT_INTERFACE() |
63 | { | 63 | { |
64 | Q_CREATE_INSTANCE( VolumeAppletImpl ) | 64 | Q_CREATE_INSTANCE( VolumeAppletImpl ) |
65 | } | 65 | } |
66 | 66 | ||
67 | 67 | ||
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 | |||
@@ -1,44 +1,43 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
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 | #ifndef VOLUMEAPPLETIMPL_H | 20 | #ifndef VOLUMEAPPLETIMPL_H |
21 | #define VOLUMEAPPLETIMPL_H | 21 | #define VOLUMEAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qpe/taskbarappletinterface.h> | 23 | #include <qpe/taskbarappletinterface.h> |
24 | 24 | ||
25 | class VolumeApplet; | 25 | class VolumeApplet; |
26 | 26 | ||
27 | class VolumeAppletImpl : public TaskbarAppletInterface | 27 | class VolumeAppletImpl : public TaskbarAppletInterface |
28 | { | 28 | { |
29 | public: | 29 | public: |
30 | VolumeAppletImpl(); | 30 | VolumeAppletImpl(); |
31 | virtual ~VolumeAppletImpl(); | 31 | virtual ~VolumeAppletImpl(); |
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 | 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 | |||
@@ -1,22 +1,21 @@ | |||
1 | #ifndef OPIE_OBEX_IMPL_QUERY_H | 1 | #ifndef OPIE_OBEX_IMPL_QUERY_H |
2 | #define OPIE_OBEX_IMPL_QUERY_H | 2 | #define OPIE_OBEX_IMPL_QUERY_H |
3 | 3 | ||
4 | #include <obexinterface.h> | 4 | #include <obexinterface.h> |
5 | 5 | ||
6 | namespace OpieObex { | 6 | namespace OpieObex { |
7 | class ObexHandler; | 7 | class ObexHandler; |
8 | class ObexImpl : public ObexInterface { | 8 | class ObexImpl : public ObexInterface { |
9 | public: | 9 | public: |
10 | ObexImpl(); | 10 | ObexImpl(); |
11 | virtual ~ObexImpl(); | 11 | virtual ~ObexImpl(); |
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 | }; |
21 | 20 | ||
22 | #endif | 21 | #endif |