-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 10 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notes.h | 1 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notesapplet.pro | 8 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notesappletimpl.cpp | 53 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notesappletimpl.h | 35 |
5 files changed, 13 insertions, 94 deletions
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 7b8bdd9..1142028 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp | |||
@@ -21,2 +21,3 @@ | |||
21 | 21 | ||
22 | #include <opie2/otaskbarapplet.h> | ||
22 | #include <qpe/filemanager.h> | 23 | #include <qpe/filemanager.h> |
@@ -468,2 +469,7 @@ NotesApplet::~NotesApplet() { | |||
468 | 469 | ||
470 | int NotesApplet::position() | ||
471 | { | ||
472 | return 6; | ||
473 | } | ||
474 | |||
469 | void NotesApplet::mousePressEvent( QMouseEvent *) { | 475 | void NotesApplet::mousePressEvent( QMouseEvent *) { |
@@ -504 +510,5 @@ void NotesApplet::paintEvent( QPaintEvent* ) { | |||
504 | 510 | ||
511 | Q_EXPORT_INTERFACE() | ||
512 | { | ||
513 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NotesApplet> ); | ||
514 | } | ||
diff --git a/noncore/applets/notesapplet/notes.h b/noncore/applets/notesapplet/notes.h index 08253cb..ed1f98c 100644 --- a/noncore/applets/notesapplet/notes.h +++ b/noncore/applets/notesapplet/notes.h | |||
@@ -78,2 +78,3 @@ public: | |||
78 | ~NotesApplet(); | 78 | ~NotesApplet(); |
79 | static int position(); | ||
79 | NotesControl *vc; | 80 | NotesControl *vc; |
diff --git a/noncore/applets/notesapplet/notesapplet.pro b/noncore/applets/notesapplet/notesapplet.pro index 3075948..38ba184 100644 --- a/noncore/applets/notesapplet/notesapplet.pro +++ b/noncore/applets/notesapplet/notesapplet.pro | |||
@@ -2,4 +2,4 @@ TEMPLATE = lib | |||
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = notes.h notesappletimpl.h | 3 | HEADERS = notes.h |
4 | SOURCES = notes.cpp notesappletimpl.cpp | 4 | SOURCES = notes.cpp |
5 | TARGET = notesapplet | 5 | TARGET = notesapplet |
@@ -10,6 +10,2 @@ LIBS += -lqpe | |||
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | MOC_DIR=opieobj | ||
12 | OBJECTS_DIR=opieobj | ||
13 | |||
14 | |||
15 | 11 | ||
diff --git a/noncore/applets/notesapplet/notesappletimpl.cpp b/noncore/applets/notesapplet/notesappletimpl.cpp deleted file mode 100644 index 8a9da7f..0000000 --- a/noncore/applets/notesapplet/notesappletimpl.cpp +++ b/dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org> | ||
3 | ** | ||
4 | ** | ||
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 | ||
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
8 | ** packaging of this file. | ||
9 | ** | ||
10 | ** | ||
11 | **********************************************************************/ | ||
12 | #include "notes.h" | ||
13 | #include "notesappletimpl.h" | ||
14 | |||
15 | |||
16 | NotesAppletImpl::NotesAppletImpl() | ||
17 | : notes(0){ | ||
18 | } | ||
19 | |||
20 | NotesAppletImpl::~NotesAppletImpl() { | ||
21 | // not needed though cause we should have a valid parent | ||
22 | delete notes; | ||
23 | } | ||
24 | |||
25 | QWidget *NotesAppletImpl::applet( QWidget *parent ) { | ||
26 | if ( !notes ) | ||
27 | notes = new NotesApplet( parent ); | ||
28 | return notes; | ||
29 | } | ||
30 | |||
31 | int NotesAppletImpl::position() const { | ||
32 | return 6; | ||
33 | } | ||
34 | |||
35 | QRESULT NotesAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { | ||
36 | *iface = 0; | ||
37 | if ( uuid == IID_QUnknown ) | ||
38 | *iface = this; | ||
39 | else if ( uuid == IID_TaskbarApplet ) | ||
40 | *iface = this; | ||
41 | else | ||
42 | return QS_FALSE; | ||
43 | |||
44 | if ( *iface ) | ||
45 | (*iface)->addRef(); | ||
46 | return QS_OK; | ||
47 | } | ||
48 | |||
49 | Q_EXPORT_INTERFACE() { | ||
50 | Q_CREATE_INSTANCE( NotesAppletImpl ) | ||
51 | } | ||
52 | |||
53 | |||
diff --git a/noncore/applets/notesapplet/notesappletimpl.h b/noncore/applets/notesapplet/notesappletimpl.h deleted file mode 100644 index a87118c..0000000 --- a/noncore/applets/notesapplet/notesappletimpl.h +++ b/dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org> | ||
3 | ** | ||
4 | ** | ||
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 | ||
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
8 | ** packaging of this file. | ||
9 | ** | ||
10 | ** | ||
11 | **********************************************************************/ | ||
12 | #ifndef NOTESAPPLETIMPL_H | ||
13 | #define NOTESAPPLETIMPL_H | ||
14 | |||
15 | #include <qpe/taskbarappletinterface.h> | ||
16 | |||
17 | class NotesApplet; | ||
18 | |||
19 | class NotesAppletImpl : public TaskbarAppletInterface | ||
20 | { | ||
21 | public: | ||
22 | NotesAppletImpl(); | ||
23 | virtual ~NotesAppletImpl(); | ||
24 | |||
25 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
26 | Q_REFCOUNT | ||
27 | |||
28 | virtual QWidget *applet( QWidget *parent ); | ||
29 | virtual int position() const; | ||
30 | |||
31 | private: | ||
32 | NotesApplet *notes; | ||
33 | }; | ||
34 | |||
35 | #endif | ||