summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/powerchord/fretboard.cpp16
-rw-r--r--noncore/multimedia/powerchord/powerchordbase.cpp17
2 files changed, 16 insertions, 17 deletions
diff --git a/noncore/multimedia/powerchord/fretboard.cpp b/noncore/multimedia/powerchord/fretboard.cpp
index bf78e4c..2e48f26 100644
--- a/noncore/multimedia/powerchord/fretboard.cpp
+++ b/noncore/multimedia/powerchord/fretboard.cpp
@@ -10,30 +10,28 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// 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 General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//#include <FL/Fl.H>
-//#include <FL/Fl_Widget.H>
-//#include <FL/fl_draw.H>
-#include <stdio.h>
-#include <qpe/resource.h>
#include "fretboard.h"
+
+#include <opie2/oresource.h>
+
#include <qpainter.h>
void FretBoard::refresh(){
ce.calculate();
emit nameChanged(QString(ce.label()));
for (int i=0;i<6;i++){
Finger(i, ce.finger(i));
// yuk
switch (i) {
case 0:
@@ -65,28 +63,28 @@ FretBoard::FretBoard(QWidget *parent, const char *name )
{
ce.base(9);
ce.chord(0);
ce.fret(0);
ce.span(1);
ce.vary(7);
ce.tune(0);
refresh();
// setPalette( QPalette( QColor( 250, 250, 200) ) );
- stringtop_pix = Resource::loadPixmap( "powerchord/stringtop_s");
- string_pix = Resource::loadPixmap( "powerchord/string_s");
- finger_pix = Resource::loadPixmap( "powerchord/justfing_s");
- mute_pix = Resource::loadPixmap( "powerchord/muted_s");
+ stringtop_pix = Opie::Core::OResource::loadPixmap( "powerchord/stringtop_s");
+ string_pix = Opie::Core::OResource::loadPixmap( "powerchord/string_s");
+ finger_pix = Opie::Core::OResource::loadPixmap( "powerchord/justfing_s");
+ mute_pix = Opie::Core::OResource::loadPixmap( "powerchord/muted_s");
// box(FL_NO_BOX);
// finger[0] = OPEN;
// finger[1] = OPEN;
// finger[2] = OPEN;
// finger[3] = OPEN;
// finger[4] = OPEN;
// finger[5] = OPEN;
initial_fret = 0;
diff --git a/noncore/multimedia/powerchord/powerchordbase.cpp b/noncore/multimedia/powerchord/powerchordbase.cpp
index f0d1487..0efc4bd 100644
--- a/noncore/multimedia/powerchord/powerchordbase.cpp
+++ b/noncore/multimedia/powerchord/powerchordbase.cpp
@@ -3,57 +3,58 @@
**
** Created: Sun Jan 13 23:05:11 2002
** by: The User Interface Compiler (uic)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
#include "powerchordbase.h"
#include "fretboard.h"
#include "vumeter.h"
/* OPIE */
#include <opie2/odebug.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
using namespace Opie::Core;
/* QT */
+#include <qbitmap.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <qlistbox.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <qtabwidget.h>
#include <qlayout.h>
#include <qtooltip.h>
/*
* Constructs a PowerchordBase which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
PowerchordBase::PowerchordBase( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
simulation_timer = 0;
audio_timer = 0;
// setPalette( QPalette( QColor( 232, 227, 215) ) );
// QPixmap image0(QString("/opt/Qtopia/pics/powerchord/image0"));
- QPixmap image1 = Resource::loadPixmap( "powerchord/image1");
- QPixmap image2 = Resource::loadPixmap( "powerchord/image2");
- QPixmap image3 = Resource::loadPixmap( "powerchord/image3");
- QPixmap image4 = Resource::loadPixmap( "powerchord/image4");
- QPixmap image5 = Resource::loadPixmap( "powerchord/image5");
- image6 = Resource::loadPixmap( "powerchord/image6");
- image_open = Resource::loadPixmap( "powerchord/image_open");
+ QPixmap image1 = Opie::Core::OResource::loadPixmap( "powerchord/image1");
+ QPixmap image2 = Opie::Core::OResource::loadPixmap( "powerchord/image2");
+ QPixmap image3 = Opie::Core::OResource::loadPixmap( "powerchord/image3");
+ QPixmap image4 = Opie::Core::OResource::loadPixmap( "powerchord/image4");
+ QPixmap image5 = Opie::Core::OResource::loadPixmap( "powerchord/image5");
+ image6 = Opie::Core::OResource::loadPixmap( "powerchord/image6");
+ image_open = Opie::Core::OResource::loadPixmap( "powerchord/image_open");
// image0.setMask(image0.createHeuristicMask());
image1.setMask(image1.createHeuristicMask());
// image2.setMask(image2.createHeuristicMask());
// image3.setMask(image3.createHeuristicMask());
// image4.setMask(image4.createHeuristicMask());
// image5.setMask(image5.createHeuristicMask());
// image6->setMask(image6->createHeuristicMask());
// image_open->setMask(image_open->createHeuristicMask());
if ( !name )
setName( "PowerchordBase" );