summaryrefslogtreecommitdiff
Unidiff
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
@@ -148,17 +148,18 @@ void VolumeAppletControl::hideEvent( QHideEvent* e )
148} 148}
149 149
150 150
151VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) 151VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
152 :OTaskbarApplet( parent, name ) 152 :OTaskbarApplet( parent, 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
160 161
161VolumeApplet::~VolumeApplet() 162VolumeApplet::~VolumeApplet()
162{ 163{
163} 164}
164 165
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
@@ -100,13 +100,13 @@ class VolumeApplet : public Opie::Ui::OTaskbarApplet
100 100
101 static int position(); 101 static int position();
102 protected: 102 protected:
103 virtual void paintEvent( QPaintEvent* ); 103 virtual void paintEvent( QPaintEvent* );
104 virtual void mousePressEvent( QMouseEvent* ); 104 virtual void mousePressEvent( QMouseEvent* );
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
112 112