summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-08-12 06:29:54 (UTC)
committer llornkcor <llornkcor>2005-08-12 06:29:54 (UTC)
commit6ee18e3d11d5204ca6c8e885bc563ab34befdaec (patch) (unidiff)
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
@@ -153,7 +153,8 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
153{ 153{
154 setFixedHeight( AppLnk::smallIconSize() +4); 154 setFixedHeight( AppLnk::smallIconSize() +4);
155 setFixedWidth( AppLnk::smallIconSize() ); 155 setFixedWidth( AppLnk::smallIconSize() );
156 _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon )); 156 _pixmap = Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon );
157// _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ));
157 _control = new VolumeAppletControl( this, "control" ); 158 _control = new VolumeAppletControl( this, "control" );
158} 159}
159 160
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
@@ -105,7 +105,7 @@ class VolumeApplet : public Opie::Ui::OTaskbarApplet
105 105
106 private: 106 private:
107 VolumeAppletControl* _control; 107 VolumeAppletControl* _control;
108 QPixmap* _pixmap; 108 QPixmap _pixmap;
109}; 109};
110 110
111#endif 111#endif