author | drw <drw> | 2005-05-24 21:48:49 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-24 21:48:49 (UTC) |
commit | a2542a161d15feface21954afcd26f9ec51f131f (patch) (side-by-side diff) | |
tree | 2af887a81a3943732ab1b68b548dbc0e817fd994 | |
parent | c3acfb9caacd7c83f9798940aed5b7d2624ecc01 (diff) | |
download | opie-a2542a161d15feface21954afcd26f9ec51f131f.zip opie-a2542a161d15feface21954afcd26f9ec51f131f.tar.gz opie-a2542a161d15feface21954afcd26f9ec51f131f.tar.bz2 |
Resource -> OResource
-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 @@ /* OPIE */ #include <opie2/odebug.h> -#include <qpe/resource.h> +#include <opie2/oresource.h> using namespace Opie::Core; @@ -44,9 +44,11 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par QToolBar *toolbar = new QToolBar( this ); - QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); + QAction *a = new QAction( tr( "Backward" ), Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); a->addTo( toolbar ); - a = new QAction( tr( "Forward" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); + a = new QAction( tr( "Forward" ), Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) ); 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" { /* OPIE */ #include <opie2/odebug.h> +#include <opie2/oresource.h> #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qpe/storage.h> using namespace Opie::Core; @@ -507,10 +507,10 @@ void QtRec::init() { layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); toBeginningButton->setFixedSize( 22, 22); - toBeginningButton->setPixmap( Resource::loadPixmap("fastback") ); + toBeginningButton->setPixmap( Opie::Core::OResource::loadPixmap("fastback", Opie::Core::OResource::SmallIcon) ); toEndButton = new QPushButton( tab, "End_PushButton" ); layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); toEndButton->setFixedSize( 22, 22); - toEndButton->setPixmap( Resource::loadPixmap( "fastforward" ) ); + toEndButton->setPixmap( Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon ) ); // QLabel *recLabel2; |