summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-08-12 06:29:54 (UTC)
committer llornkcor <llornkcor>2005-08-12 06:29:54 (UTC)
commit6ee18e3d11d5204ca6c8e885bc563ab34befdaec (patch) (side-by-side diff)
tree02e437a5f232e99ac87c72c8ebacb301275ef962
parent374d60dacd347a947d5833b21cd73793ffb057ca (diff)
downloadopie-6ee18e3d11d5204ca6c8e885bc563ab34befdaec.zip
opie-6ee18e3d11d5204ca6c8e885bc563ab34befdaec.tar.gz
opie-6ee18e3d11d5204ca6c8e885bc563ab34befdaec.tar.bz2
revert
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/volumeapplet2/volumeapplet.cpp3
-rw-r--r--noncore/applets/volumeapplet2/volumeapplet.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp
index 946616f..fad8e42 100644
--- a/noncore/applets/volumeapplet2/volumeapplet.cpp
+++ b/noncore/applets/volumeapplet2/volumeapplet.cpp
@@ -152,9 +152,10 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
:OTaskbarApplet( parent, name )
{
setFixedHeight( AppLnk::smallIconSize() +4);
setFixedWidth( AppLnk::smallIconSize() );
- _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ));
+ _pixmap = Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon );
+// _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ));
_control = new VolumeAppletControl( this, "control" );
}
diff --git a/noncore/applets/volumeapplet2/volumeapplet.h b/noncore/applets/volumeapplet2/volumeapplet.h
index 953c305..e5dd4b9 100644
--- a/noncore/applets/volumeapplet2/volumeapplet.h
+++ b/noncore/applets/volumeapplet2/volumeapplet.h
@@ -104,9 +104,9 @@ class VolumeApplet : public Opie::Ui::OTaskbarApplet
virtual void mousePressEvent( QMouseEvent* );
private:
VolumeAppletControl* _control;
- QPixmap* _pixmap;
+ QPixmap _pixmap;
};
#endif