summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/screenshotapplet/screenshotapplet.pro4
-rw-r--r--core/applets/screenshotapplet/screenshotappletimpl.cpp10
-rw-r--r--core/applets/screenshotapplet/screenshotappletimpl.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index 095cce2..bec49b7 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,13 +1,13 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3HEADERS = screenshot.h screenshotappletimpl.h 3HEADERS = screenshot.h screenshotappletimpl.h
4SOURCES = screenshot.cpp screenshotappletimpl.cpp 4SOURCES = screenshot.cpp screenshotappletimpl.cpp
5TARGET = screenshotapplet 5TARGET = screenshotapplet
6DESTDIR = ../../plugins/applets 6DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(QPEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include 8DEPENDPATH += ../$(QPEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10VERSION = 1.0.0 10VERSION = 1.0.0
11MOC_DIR=opieobj 11MOC_DIR=opieobj
12OBJECTS_DIR=opieobj 12OBJECTS_DIR=opieobj
13 13
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.cpp b/core/applets/screenshotapplet/screenshotappletimpl.cpp
index f1a9827..a537162 100644
--- a/core/applets/screenshotapplet/screenshotappletimpl.cpp
+++ b/core/applets/screenshotapplet/screenshotappletimpl.cpp
@@ -1,64 +1,64 @@
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
24ScreenshotAppletImpl::ScreenshotAppletImpl() 24ScreenshotAppletImpl::ScreenshotAppletImpl()
25 : volume(0), ref(0) 25 : screenshot(0), ref(0)
26{ 26{
27} 27}
28 28
29ScreenshotAppletImpl::~ScreenshotAppletImpl() 29ScreenshotAppletImpl::~ScreenshotAppletImpl()
30{ 30{
31 delete volume; 31 delete screenshot;
32} 32}
33 33
34QWidget *ScreenshotAppletImpl::applet( QWidget *parent ) 34QWidget *ScreenshotAppletImpl::applet( QWidget *parent )
35{ 35{
36 if ( !volume ) 36 if ( !screenshot )
37 volume = new ScreenshotApplet( parent ); 37 screenshot = new ScreenshotApplet( parent );
38 return volume; 38 return screenshot;
39} 39}
40 40
41int ScreenshotAppletImpl::position() const 41int ScreenshotAppletImpl::position() const
42{ 42{
43 return 6; 43 return 6;
44} 44}
45 45
46QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 46QRESULT 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 53
54 if ( *iface ) 54 if ( *iface )
55 (*iface)->addRef(); 55 (*iface)->addRef();
56 return QS_OK; 56 return QS_OK;
57} 57}
58 58
59Q_EXPORT_INTERFACE() 59Q_EXPORT_INTERFACE()
60{ 60{
61 Q_CREATE_INSTANCE( ScreenshotAppletImpl ) 61 Q_CREATE_INSTANCE( ScreenshotAppletImpl )
62} 62}
63 63
64 64
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.h b/core/applets/screenshotapplet/screenshotappletimpl.h
index deca7a9..00661a5 100644
--- a/core/applets/screenshotapplet/screenshotappletimpl.h
+++ b/core/applets/screenshotapplet/screenshotappletimpl.h
@@ -1,44 +1,44 @@
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
25class ScreenshotApplet; 25class ScreenshotApplet;
26 26
27class ScreenshotAppletImpl : public TaskbarAppletInterface 27class ScreenshotAppletImpl : public TaskbarAppletInterface
28{ 28{
29public: 29public:
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
39private: 39private:
40 ScreenshotApplet *volume; 40 ScreenshotApplet *screenshot;
41 ulong ref; 41 ulong ref;
42}; 42};
43 43
44#endif 44#endif