author | drw <drw> | 2005-06-04 00:20:05 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-04 00:20:05 (UTC) |
commit | d5f6413fb06e8363eb6c3170905b1b18831438f4 (patch) (side-by-side diff) | |
tree | 4e1d1f7d09e629f35e84bc54c8843391873736fd /noncore | |
parent | c220c5e580c3cd0e16cf9a7c252a0f66b7034d02 (diff) | |
download | opie-d5f6413fb06e8363eb6c3170905b1b18831438f4.zip opie-d5f6413fb06e8363eb6c3170905b1b18831438f4.tar.gz opie-d5f6413fb06e8363eb6c3170905b1b18831438f4.tar.bz2 |
Resource -> OResource and fix compile warning
-rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.cpp | 48 |
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,51 +1,53 @@ /* - This file is part of the Opie Project + This file is part of the Opie Project =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> .=l. - .>+-= - _;:, .> :=|. This program is free software; you can -.> <`_, > . <= redistribute it and/or modify it under -:`=1 )Y*s>-.-- : the terms of the GNU Library General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This program is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=|` MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU -..}^=.= = ; Library General Public License for more -++= -. .` .: details. - : = ...= . :.=- - -. .:....=;==+<; You should have received a copy of the GNU - -_. . . )=. = Library General Public License along with - -- :-=` this library; see the file COPYING.LIB. + .>+-= +_;:, .> :=|. This program is free software; you can +.> <`_, > . <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- : the terms of the GNU Library General Public +.="- .-=="i, .._ License as published by the Free Software +- . .-<_> .<> Foundation; either version 2 of the License, + ._= =} : or (at your option) any later version. + .%`+i> _;_. + .i_,=:_. -<s. This program is distributed in the hope that + + . -:. = it will be useful, but WITHOUT ANY WARRANTY; + : .. .:, . . . without even the implied warranty of + =_ + =;=|` MERCHANTABILITY or FITNESS FOR A + _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU +..}^=.= = ; Library General Public License for more +++= -. .` .: details. +: = ...= . :.=- +-. .:....=;==+<; You should have received a copy of the GNU + -_. . . )=. = Library General Public License along with + -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "volumeapplet.h" /* OPIE */ #include <opie2/odebug.h> #include <opie2/otaskbarapplet.h> #include <opie2/osoundsystem.h> #include <opie2/oledbox.h> +#include <opie2/oresource.h> + #include <qpe/applnk.h> -#include <qpe/resource.h> + using namespace Opie::Core; using namespace Opie::MM; using namespace Opie::Ui; /* QT */ #include <qpainter.h> #include <qlabel.h> #include <qlayout.h> #include <qslider.h> /* STD */ #include <assert.h> @@ -82,25 +84,25 @@ VolumeAppletControl::VolumeAppletControl( OTaskbarApplet* parent, const char* na void VolumeAppletControl::build() { OSoundSystem* sound = OSoundSystem::instance(); OSoundSystem::CardIterator it = sound->iterator(); OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); QStringList channels = mixer->allChannels(); int x = 0; - int y = 0; + // int y = 0; for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) { odebug << "OSSDEMO: Mixer has channel " << *it << "" << oendl; odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl; l->addWidget( new Channel( mixer, this, *it ), 0, x++, AlignCenter ); } } @@ -126,25 +128,25 @@ void VolumeAppletControl::hideEvent( QHideEvent* e ) QSize VolumeAppletControl::sizeHint() const { return QSize( 200, 200 ); //QFrame::sizeHint(); } VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) :OTaskbarApplet( parent, name ) { setFixedHeight( AppLnk::smallIconSize() ); setFixedWidth( AppLnk::smallIconSize() ); - _pixmap.convertFromImage( Resource::loadImage( "volumeapplet/volume" ).smoothScale( height(), width() ) ); + _pixmap = Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ); _control = new VolumeAppletControl( this, "control" ); } VolumeApplet::~VolumeApplet() { } int VolumeApplet::position() { return 4; |