summaryrefslogtreecommitdiff
Unidiff
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
@@ -19,12 +19,10 @@
19// along with this program; if not, write to the Free Software 19// along with this program; if not, write to the Free Software
20// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 20// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21 21
22//#include <FL/Fl.H>
23//#include <FL/Fl_Widget.H>
24//#include <FL/fl_draw.H>
25#include <stdio.h>
26#include <qpe/resource.h>
27#include "fretboard.h" 22#include "fretboard.h"
23
24#include <opie2/oresource.h>
25
28#include <qpainter.h> 26#include <qpainter.h>
29 27
30void FretBoard::refresh(){ 28void FretBoard::refresh(){
@@ -74,10 +72,10 @@ FretBoard::FretBoard(QWidget *parent, const char *name )
74 72
75 // setPalette( QPalette( QColor( 250, 250, 200) ) ); 73 // setPalette( QPalette( QColor( 250, 250, 200) ) );
76 74
77 stringtop_pix = Resource::loadPixmap( "powerchord/stringtop_s"); 75 stringtop_pix = Opie::Core::OResource::loadPixmap( "powerchord/stringtop_s");
78 string_pix = Resource::loadPixmap( "powerchord/string_s"); 76 string_pix = Opie::Core::OResource::loadPixmap( "powerchord/string_s");
79 finger_pix = Resource::loadPixmap( "powerchord/justfing_s"); 77 finger_pix = Opie::Core::OResource::loadPixmap( "powerchord/justfing_s");
80 mute_pix = Resource::loadPixmap( "powerchord/muted_s"); 78 mute_pix = Opie::Core::OResource::loadPixmap( "powerchord/muted_s");
81 79
82 // box(FL_NO_BOX); 80 // box(FL_NO_BOX);
83 81
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
@@ -12,10 +12,11 @@
12 12
13/* OPIE */ 13/* OPIE */
14#include <opie2/odebug.h> 14#include <opie2/odebug.h>
15#include <qpe/resource.h> 15#include <opie2/oresource.h>
16using namespace Opie::Core; 16using namespace Opie::Core;
17 17
18/* QT */ 18/* QT */
19#include <qbitmap.h>
19#include <qcombobox.h> 20#include <qcombobox.h>
20#include <qlabel.h> 21#include <qlabel.h>
21#include <qlistbox.h> 22#include <qlistbox.h>
@@ -38,13 +39,13 @@ PowerchordBase::PowerchordBase( QWidget* parent, const char* name, WFlags fl )
38 // setPalette( QPalette( QColor( 232, 227, 215) ) ); 39 // setPalette( QPalette( QColor( 232, 227, 215) ) );
39 40
40 // QPixmap image0(QString("/opt/Qtopia/pics/powerchord/image0")); 41 // QPixmap image0(QString("/opt/Qtopia/pics/powerchord/image0"));
41 QPixmap image1 = Resource::loadPixmap( "powerchord/image1"); 42 QPixmap image1 = Opie::Core::OResource::loadPixmap( "powerchord/image1");
42 QPixmap image2 = Resource::loadPixmap( "powerchord/image2"); 43 QPixmap image2 = Opie::Core::OResource::loadPixmap( "powerchord/image2");
43 QPixmap image3 = Resource::loadPixmap( "powerchord/image3"); 44 QPixmap image3 = Opie::Core::OResource::loadPixmap( "powerchord/image3");
44 QPixmap image4 = Resource::loadPixmap( "powerchord/image4"); 45 QPixmap image4 = Opie::Core::OResource::loadPixmap( "powerchord/image4");
45 QPixmap image5 = Resource::loadPixmap( "powerchord/image5"); 46 QPixmap image5 = Opie::Core::OResource::loadPixmap( "powerchord/image5");
46 image6 = Resource::loadPixmap( "powerchord/image6"); 47 image6 = Opie::Core::OResource::loadPixmap( "powerchord/image6");
47 image_open = Resource::loadPixmap( "powerchord/image_open"); 48 image_open = Opie::Core::OResource::loadPixmap( "powerchord/image_open");
48 49
49 // image0.setMask(image0.createHeuristicMask()); 50 // image0.setMask(image0.createHeuristicMask());
50 image1.setMask(image1.createHeuristicMask()); 51 image1.setMask(image1.createHeuristicMask());