-rw-r--r-- | noncore/multimedia/opierec/helpwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp index 7f984c3..b0a8ac3 100644 --- a/noncore/multimedia/opierec/helpwindow.cpp +++ b/noncore/multimedia/opierec/helpwindow.cpp | |||
@@ -13,5 +13,5 @@ | |||
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 | ||
@@ -44,9 +44,11 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par | |||
44 | QToolBar *toolbar = new QToolBar( this ); | 44 | QToolBar *toolbar = new QToolBar( this ); |
45 | 45 | ||
46 | QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); | 46 | QAction *a = new QAction( tr( "Backward" ), Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ), |
47 | QString::null, 0, this, 0 ); | ||
47 | connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); | 48 | connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); |
48 | a->addTo( toolbar ); | 49 | a->addTo( toolbar ); |
49 | 50 | ||
50 | a = new QAction( tr( "Forward" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); | 51 | a = new QAction( tr( "Forward" ), Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ), |
52 | QString::null, 0, this, 0 ); | ||
51 | connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) ); | 53 | connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) ); |
52 | a->addTo( toolbar ); | 54 | a->addTo( toolbar ); |
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index 9d3d5cf..75413be 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp | |||
@@ -15,8 +15,8 @@ extern "C" { | |||
15 | /* OPIE */ | 15 | /* OPIE */ |
16 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
17 | #include <opie2/oresource.h> | ||
17 | #include <qpe/config.h> | 18 | #include <qpe/config.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
19 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
20 | #include <qpe/resource.h> | ||
21 | #include <qpe/storage.h> | 21 | #include <qpe/storage.h> |
22 | using namespace Opie::Core; | 22 | using namespace Opie::Core; |
@@ -507,10 +507,10 @@ void QtRec::init() { | |||
507 | layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); | 507 | layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); |
508 | toBeginningButton->setFixedSize( 22, 22); | 508 | toBeginningButton->setFixedSize( 22, 22); |
509 | toBeginningButton->setPixmap( Resource::loadPixmap("fastback") ); | 509 | toBeginningButton->setPixmap( Opie::Core::OResource::loadPixmap("fastback", Opie::Core::OResource::SmallIcon) ); |
510 | 510 | ||
511 | toEndButton = new QPushButton( tab, "End_PushButton" ); | 511 | toEndButton = new QPushButton( tab, "End_PushButton" ); |
512 | layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); | 512 | layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); |
513 | toEndButton->setFixedSize( 22, 22); | 513 | toEndButton->setFixedSize( 22, 22); |
514 | toEndButton->setPixmap( Resource::loadPixmap( "fastforward" ) ); | 514 | toEndButton->setPixmap( Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon ) ); |
515 | 515 | ||
516 | // QLabel *recLabel2; | 516 | // QLabel *recLabel2; |