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 @@
 TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   screenshot.h screenshotappletimpl.h
 SOURCES =   screenshot.cpp screenshotappletimpl.cpp
 TARGET    = screenshotapplet
 DESTDIR   = ../../plugins/applets
-INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH      += ../$(OPIEDIR)/include
+INCLUDEPATH += $(QPEDIR)/include
+DEPENDPATH      += ../$(QPEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
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 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "screenshot.h"
 #include "screenshotappletimpl.h"
 
 
 ScreenshotAppletImpl::ScreenshotAppletImpl()
-    : volume(0), ref(0)
+    : screenshot(0), ref(0)
 {
 }
 
 ScreenshotAppletImpl::~ScreenshotAppletImpl()
 {
-    delete volume;
+    delete screenshot;
 }
 
 QWidget *ScreenshotAppletImpl::applet( QWidget *parent )
 {
-    if ( !volume )
-  volume = new ScreenshotApplet( parent );
-    return volume;
+    if ( !screenshot )
+  screenshot = new ScreenshotApplet( parent );
+    return screenshot;
 }
 
 int ScreenshotAppletImpl::position() const
 {
     return 6;
 }
 
 QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
   *iface = this;
     else if ( uuid == IID_TaskbarApplet )
   *iface = this;
 
     if ( *iface )
   (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( ScreenshotAppletImpl )
 }
 
 
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 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef SCREENSHOTAPPLETIMPL_H
 #define SCREENSHOTAPPLETIMPL_H
 
 #include <qpe/taskbarappletinterface.h>
 
 class ScreenshotApplet;
 
 class ScreenshotAppletImpl : public TaskbarAppletInterface
 {
 public:
     ScreenshotAppletImpl();
     virtual ~ScreenshotAppletImpl();
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual QWidget *applet( QWidget *parent );
     virtual int position() const;
 
 private:
-    ScreenshotApplet *volume;
+    ScreenshotApplet *screenshot;
     ulong ref;
 };
 
 #endif