summaryrefslogtreecommitdiff
authordrw <drw>2005-06-04 00:20:05 (UTC)
committer drw <drw>2005-06-04 00:20:05 (UTC)
commitd5f6413fb06e8363eb6c3170905b1b18831438f4 (patch) (unidiff)
tree4e1d1f7d09e629f35e84bc54c8843391873736fd
parentc220c5e580c3cd0e16cf9a7c252a0f66b7034d02 (diff)
downloadopie-d5f6413fb06e8363eb6c3170905b1b18831438f4.zip
opie-d5f6413fb06e8363eb6c3170905b1b18831438f4.tar.gz
opie-d5f6413fb06e8363eb6c3170905b1b18831438f4.tar.bz2
Resource -> OResource and fix compile warning
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/volumeapplet2/volumeapplet.cpp48
1 files changed, 25 insertions, 23 deletions
diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp
index c153a78..2f61f48 100644
--- a/noncore/applets/volumeapplet2/volumeapplet.cpp
+++ b/noncore/applets/volumeapplet2/volumeapplet.cpp
@@ -1,27 +1,27 @@
1/* 1/*
2                 This file is part of the Opie Project 2 This file is part of the Opie Project
3 3
4 =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> 4 =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
5 .=l. 5 .=l.
6           .>+-= 6 .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7_;:, .> :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_, > . <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 9:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i, .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11- . .-<_> .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12 ._= =} : or (at your option) any later version.
13    .%`+i>       _;_. 13 .%`+i> _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14 .i_,=:_. -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16 : .. .:, . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.= = ; Library General Public License for more
20++=   -.     .`     .: details. 20++= -. .` .: details.
21 :     =  ...= . :.=- 21: = ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22-. .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23 -_. . . )=. = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24 -- :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
@@ -35,8 +35,10 @@
35#include <opie2/otaskbarapplet.h> 35#include <opie2/otaskbarapplet.h>
36#include <opie2/osoundsystem.h> 36#include <opie2/osoundsystem.h>
37#include <opie2/oledbox.h> 37#include <opie2/oledbox.h>
38#include <opie2/oresource.h>
39
38#include <qpe/applnk.h> 40#include <qpe/applnk.h>
39#include <qpe/resource.h> 41
40using namespace Opie::Core; 42using namespace Opie::Core;
41using namespace Opie::MM; 43using namespace Opie::MM;
42using namespace Opie::Ui; 44using namespace Opie::Ui;
@@ -91,7 +93,7 @@ void VolumeAppletControl::build()
91 QStringList channels = mixer->allChannels(); 93 QStringList channels = mixer->allChannels();
92 94
93 int x = 0; 95 int x = 0;
94 int y = 0; 96 // int y = 0;
95 97
96 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) 98 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it )
97 { 99 {
@@ -135,7 +137,7 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
135{ 137{
136 setFixedHeight( AppLnk::smallIconSize() ); 138 setFixedHeight( AppLnk::smallIconSize() );
137 setFixedWidth( AppLnk::smallIconSize() ); 139 setFixedWidth( AppLnk::smallIconSize() );
138 _pixmap.convertFromImage( Resource::loadImage( "volumeapplet/volume" ).smoothScale( height(), width() ) ); 140 _pixmap = Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon );
139 _control = new VolumeAppletControl( this, "control" ); 141 _control = new VolumeAppletControl( this, "control" );
140} 142}
141 143