author | drw <drw> | 2005-05-24 21:00:44 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-24 21:00:44 (UTC) |
commit | 82a7658f6ff0c82cdba2088b70bd2a05aeb85fd6 (patch) (unidiff) | |
tree | b1ee63fc6f8de7ebafcdf209ee25576046b4be10 /noncore/multimedia/powerchord/powerchordbase.cpp | |
parent | 22cda9f7212641869c3abe210c66bf54a03f9579 (diff) | |
download | opie-82a7658f6ff0c82cdba2088b70bd2a05aeb85fd6.zip opie-82a7658f6ff0c82cdba2088b70bd2a05aeb85fd6.tar.gz opie-82a7658f6ff0c82cdba2088b70bd2a05aeb85fd6.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'noncore/multimedia/powerchord/powerchordbase.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/powerchord/powerchordbase.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
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 @@ | |||
3 | ** | 3 | ** |
4 | ** Created: Sun Jan 13 23:05:11 2002 | 4 | ** Created: Sun Jan 13 23:05:11 2002 |
5 | ** by: The User Interface Compiler (uic) | 5 | ** by: The User Interface Compiler (uic) |
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #include "powerchordbase.h" | 9 | #include "powerchordbase.h" |
10 | #include "fretboard.h" | 10 | #include "fretboard.h" |
11 | #include "vumeter.h" | 11 | #include "vumeter.h" |
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> |
16 | using namespace Opie::Core; | 16 | using 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> |
22 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
23 | #include <qspinbox.h> | 24 | #include <qspinbox.h> |
24 | #include <qtabwidget.h> | 25 | #include <qtabwidget.h> |
25 | #include <qlayout.h> | 26 | #include <qlayout.h> |
26 | #include <qtooltip.h> | 27 | #include <qtooltip.h> |
27 | 28 | ||
28 | /* | 29 | /* |
29 | * Constructs a PowerchordBase which is a child of 'parent', with the | 30 | * Constructs a PowerchordBase which is a child of 'parent', with the |
30 | * name 'name' and widget flags set to 'f' | 31 | * name 'name' and widget flags set to 'f' |
31 | */ | 32 | */ |
32 | PowerchordBase::PowerchordBase( QWidget* parent, const char* name, WFlags fl ) | 33 | PowerchordBase::PowerchordBase( QWidget* parent, const char* name, WFlags fl ) |
33 | : QWidget( parent, name, fl ) | 34 | : QWidget( parent, name, fl ) |
34 | { | 35 | { |
35 | simulation_timer = 0; | 36 | simulation_timer = 0; |
36 | audio_timer = 0; | 37 | audio_timer = 0; |
37 | 38 | ||
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()); |
51 | // image2.setMask(image2.createHeuristicMask()); | 52 | // image2.setMask(image2.createHeuristicMask()); |
52 | // image3.setMask(image3.createHeuristicMask()); | 53 | // image3.setMask(image3.createHeuristicMask()); |
53 | // image4.setMask(image4.createHeuristicMask()); | 54 | // image4.setMask(image4.createHeuristicMask()); |
54 | // image5.setMask(image5.createHeuristicMask()); | 55 | // image5.setMask(image5.createHeuristicMask()); |
55 | // image6->setMask(image6->createHeuristicMask()); | 56 | // image6->setMask(image6->createHeuristicMask()); |
56 | // image_open->setMask(image_open->createHeuristicMask()); | 57 | // image_open->setMask(image_open->createHeuristicMask()); |
57 | 58 | ||
58 | if ( !name ) | 59 | if ( !name ) |
59 | setName( "PowerchordBase" ); | 60 | setName( "PowerchordBase" ); |