summaryrefslogtreecommitdiff
path: root/examples/main-tab/simple.cpp
Unidiff
Diffstat (limited to 'examples/main-tab/simple.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--examples/main-tab/simple.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/examples/main-tab/simple.cpp b/examples/main-tab/simple.cpp
index 7edb557..1e2d028 100644
--- a/examples/main-tab/simple.cpp
+++ b/examples/main-tab/simple.cpp
@@ -6,10 +6,10 @@
6#include <qlayout.h> 6#include <qlayout.h>
7 7
8#include <qpe/qpeapplication.h> // the QPEApplication 8#include <qpe/qpeapplication.h> // the QPEApplication
9#include <qpe/resource.h>
10#include <qpe/sound.h> 9#include <qpe/sound.h>
11 10
12#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching 11#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
12#include <opie2/oresource.h>
13#include <opie2/otabwidget.h> 13#include <opie2/otabwidget.h>
14 14
15#include "simple.h" 15#include "simple.h"
@@ -87,7 +87,7 @@ void MainWindow::initUI() {
87 QPopupMenu *fileMenu = new QPopupMenu( this ); 87 QPopupMenu *fileMenu = new QPopupMenu( this );
88 88
89 89
90 QAction *a = new QAction( tr("Quit"), Resource::loadIconSet("quit_icon"), 90 QAction *a = new QAction( tr("Quit"), Opie::Core::OResource::loadPixmap("quit_icon", Opie::Core::OResource::SmallIcon),
91 QString::null, 0, this, "quit_action" ); 91 QString::null, 0, this, "quit_action" );
92 /* 92 /*
93 * Connect quit to the QApplication quit slot 93 * Connect quit to the QApplication quit slot
@@ -96,8 +96,7 @@ void MainWindow::initUI() {
96 qApp, SLOT(quit() ) ); 96 qApp, SLOT(quit() ) );
97 a->addTo( fileMenu ); 97 a->addTo( fileMenu );
98 98
99 a = new QAction(tr("Fire"), 99 a = new QAction(tr("Fire"), Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon),
100 Resource::loadIconSet("new"),
101 QString::null, 0, this, "fire_button"); 100 QString::null, 0, this, "fire_button");
102 101
103 /* see the power? */ 102 /* see the power? */
@@ -173,11 +172,11 @@ Simple2::Simple2( QWidget* parent, const char* name, WFlags fl )
173 */ 172 */
174 QLabel *lbl = new QLabel( this, "a name for the label" ); 173 QLabel *lbl = new QLabel( this, "a name for the label" );
175 /* 174 /*
176 * Resource will search hard for a Pixmap in $OPIEDIR/pics 175 * OResource will search hard for a Pixmap in $OPIEDIR/pics
177 * to find 'logo/opielogo' You need to pass the subdir 176 * to find 'logo/opielogo' You need to pass the subdir
178 * but not the ending 177 * but not the ending
179 */ 178 */
180 lbl->setPixmap( Resource::loadPixmap("logo/opielogo") ); 179 lbl->setPixmap( Opie::Core::OResource::loadPixmap("logo/opielogo", Opie::Core::OResource::SmallIcon) );
181 layout->addWidget( lbl ); 180 layout->addWidget( lbl );
182 181
183 182