author | drw <drw> | 2005-05-23 23:25:38 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-23 23:25:38 (UTC) |
commit | 3e2acb4665ddcdb24e0749e3ebfc589313be0065 (patch) (side-by-side diff) | |
tree | b7884a189d1b4928e61d71c1c4b5f908205a3655 | |
parent | 71ecaf241641c2c58b997df56074cf4849e6d6c5 (diff) | |
download | opie-3e2acb4665ddcdb24e0749e3ebfc589313be0065.zip opie-3e2acb4665ddcdb24e0749e3ebfc589313be0065.tar.gz opie-3e2acb4665ddcdb24e0749e3ebfc589313be0065.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/graphics/opie-eye/gui/filesystem.cpp | 5 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 29 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageinfoui.cpp | 8 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 38 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 73 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/viewmodebutton.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/viewmodebutton.h | 2 |
7 files changed, 93 insertions, 64 deletions
diff --git a/noncore/graphics/opie-eye/gui/filesystem.cpp b/noncore/graphics/opie-eye/gui/filesystem.cpp index 8efcdf7..d84e9f8 100644 --- a/noncore/graphics/opie-eye/gui/filesystem.cpp +++ b/noncore/graphics/opie-eye/gui/filesystem.cpp @@ -8,3 +8,4 @@ -#include <qpe/resource.h> +#include <opie2/oresource.h> + #include <qpe/storage.h> @@ -17,3 +18,3 @@ PFileSystem::PFileSystem( QToolBar* bar) { - setIconSet( Resource::loadIconSet( "cardmon/pcmcia" ) ); + setIconSet( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) ); diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 59091a8..9365932 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -18,4 +18,4 @@ #include <opie2/oimagescrollview.h> +#include <opie2/oresource.h> -#include <qpe/resource.h> #include <qpe/qpemessagebox.h> @@ -104,3 +104,3 @@ namespace { if (!_dirPix ) { - _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser")); + _dirPix = new QPixmap( Opie::Core::OResource::loadPixmap("advancedfm/FileBrowser", Opie::Core::OResource::SmallIcon)); } @@ -108,3 +108,3 @@ namespace { if (!_unkPix ) { - _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); + _unkPix = new QPixmap( Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon ) ); } @@ -272,20 +272,20 @@ void PIconView::initKeys() { m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam", - Resource::loadPixmap("beam"), BeamItem, - Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton), + Opie::Core::OResource::loadPixmap("beam", Opie::Core::OResource::SmallIcon), + BeamItem, Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton), this, SLOT(slotBeam())) ); m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete", - Resource::loadPixmap("trash"), DeleteItem, - Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton), + Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon), + DeleteItem, Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton), this, SLOT(slotTrash())) ); m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view", - Resource::loadPixmap("1to1"), ViewItem, - Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), + Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), + ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), this, SLOT(slotShowImage()))); m_viewManager->addKeyConfig( OKeyConfigItem(tr("Show Image Info") , "info", - Resource::loadPixmap("DocumentTypeWord"), InfoItem, - Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ), + Opie::Core::OResource::loadPixmap("DocumentTypeWord", Opie::Core::OResource::SmallIcon), + InfoItem, Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ), this, SLOT(slotImageInfo()) ) ); m_viewManager->addKeyConfig( OKeyConfigItem(tr("Start slideshow"), "slideshow", - Resource::loadPixmap("1to1"), SlideItem, - Opie::Core::OKeyPair(Qt::Key_S, Qt::ShiftButton), + Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), + SlideItem, Opie::Core::OKeyPair(Qt::Key_S, Qt::ShiftButton), this, SLOT(slotStartSlide()))); @@ -644,3 +644,4 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { } else { - PPixmapCache::self()->insertImage( _path, Resource::loadPixmap( "UnknownDocument" ), m_iconsize, m_iconsize ); + PPixmapCache::self()->insertImage( _path, Opie::Core::OResource::loadPixmap( "UnknownDocument", + Opie::Core::OResource::SmallIcon ), m_iconsize, m_iconsize ); } diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp index 7afb62d..8f70602 100644 --- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp +++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp @@ -21,5 +21,5 @@ #include <opie2/odebug.h> +#include <opie2/oresource.h> #include <qpe/qcopenvelope_qws.h> -#include <qpe/resource.h> @@ -74,4 +74,4 @@ void imageinfo::initKeys() m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview", - Resource::loadPixmap("1to1"), ViewItem, - Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), + Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), + ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), this, SLOT(slotShowImage()))); @@ -137,3 +137,3 @@ void imageinfo::slotChangeName(const QString&_path) if (!m_pix) { - PixmapLabel1->setPixmap(QPixmap( Resource::loadPixmap( "UnknownDocument" ))); + PixmapLabel1->setPixmap(QPixmap( Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon ))); SlaveMaster::self()->thumbNail(currentFile,THUMBSIZE,THUMBSIZE); diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index b919ca8..cda1a96 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp @@ -5,4 +5,4 @@ #include <opie2/okeyconfigwidget.h> +#include <opie2/oresource.h> -#include <qpe/resource.h> #include <qpe/qpeapplication.h> @@ -165,4 +165,4 @@ void ImageView::initKeys() m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo", - Resource::loadPixmap("1to1"), ViewInfo, - Opie::Core::OKeyPair(Qt::Key_I,0), + Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), + ViewInfo, Opie::Core::OKeyPair(Qt::Key_I,0), this, SLOT(slotShowImageInfo()))); @@ -170,8 +170,8 @@ void ImageView::initKeys() m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate", - Resource::loadPixmap("rotate"), Autorotate, - Opie::Core::OKeyPair(Qt::Key_R,0), + Opie::Core::OResource::loadPixmap("rotate", Opie::Core::OResource::SmallIcon), + Autorotate, Opie::Core::OKeyPair(Qt::Key_R,0), this, SIGNAL(toggleAutorotate()))); m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale", - Resource::loadPixmap("1to1"), Autoscale, - Opie::Core::OKeyPair(Qt::Key_S,0), + Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), + Autoscale, Opie::Core::OKeyPair(Qt::Key_S,0), this, SIGNAL(toggleAutoscale()))); @@ -179,16 +179,16 @@ void ImageView::initKeys() m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext", - Resource::loadPixmap("forward"), ShowNext, - Opie::Core::OKeyPair(Qt::Key_Return,0), + Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon), + ShowNext, Opie::Core::OKeyPair(Qt::Key_Return,0), this, SIGNAL(dispNext()))); m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to previous image"), "imageshowprev", - Resource::loadPixmap("back"), ShowPrevious, - Opie::Core::OKeyPair(Qt::Key_P,0), + Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon), + ShowPrevious, Opie::Core::OKeyPair(Qt::Key_P,0), this, SIGNAL(dispPrev()))); m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle fullscreen"), "imagefullscreen", - Resource::loadPixmap("fullscreen"), FullScreen, - Opie::Core::OKeyPair(Qt::Key_F,0), + Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon), + FullScreen, Opie::Core::OKeyPair(Qt::Key_F,0), this, SIGNAL(toggleFullScreen()))); m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle thumbnail"), "imagezoomer", - Resource::loadPixmap("mag"), Zoomer, - Opie::Core::OKeyPair(Qt::Key_T,0), + Opie::Core::OResource::loadPixmap("mag", Opie::Core::OResource::SmallIcon), + Zoomer, Opie::Core::OKeyPair(Qt::Key_T,0), this, SIGNAL(toggleZoomer()))); @@ -196,8 +196,8 @@ void ImageView::initKeys() m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Increase brightness"), "incbrightness", - Resource::loadPixmap("up"), Incbrightness, - Opie::Core::OKeyPair(Qt::Key_B,0), + Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon), + Incbrightness, Opie::Core::OKeyPair(Qt::Key_B,0), this, SIGNAL(incBrightness()))); m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Decrease brightness"), "decbrightness", - Resource::loadPixmap("down"), Decbrightness, - Opie::Core::OKeyPair(Qt::Key_D,0), + Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon), + Decbrightness, Opie::Core::OKeyPair(Qt::Key_D,0), this, SIGNAL(decBrightness()))); diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 3efbb53..d4c5b42 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -23,4 +23,4 @@ #include <opie2/oapplication.h> +#include <opie2/oresource.h> -#include <qpe/resource.h> #include <qpe/config.h> @@ -519,3 +519,4 @@ void PMainWindow::setupActions() { - m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), 0, 0, this, 0, true ); + m_aDirUp = new QAction( tr( "Go dir up" ), Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, true ); m_aDirUp->setToggleAction(false); @@ -524,3 +525,4 @@ void PMainWindow::setupActions() if ( Ir::supported() ) { - m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),0, 0, this, 0, true ); + m_aBeam = new QAction( tr( "Beam file" ), Opie::Core::OResource::loadPixmap( "beam", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, true ); m_aBeam->setToggleAction(false); @@ -531,3 +533,4 @@ void PMainWindow::setupActions() - m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), 0, 0, this, 0, true ); + m_aShowInfo = new QAction( tr( "Show imageinfo" ), Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, true ); m_aShowInfo->setToggleAction(false); @@ -535,3 +538,4 @@ void PMainWindow::setupActions() - m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet("trash"), 0, 0, this, 0, true ); + m_aTrash = new QAction( tr( "Delete file" ), Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon), + 0, 0, this, 0, true ); m_aTrash->setToggleAction(false); @@ -539,3 +543,4 @@ void PMainWindow::setupActions() - m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet("mag"), 0, 0, this, 0, true ); + m_aViewfile = new QAction( tr( "Display image" ), Opie::Core::OResource::loadPixmap("mag", Opie::Core::OResource::SmallIcon), + 0, 0, this, 0, true ); m_aViewfile->setToggleAction(false); @@ -543,3 +548,4 @@ void PMainWindow::setupActions() - m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet("play"),0, 0, this, 0, true ); + m_aStartSlide = new QAction( tr( "Start slideshow" ), Opie::Core::OResource::loadPixmap("play", Opie::Core::OResource::SmallIcon), + 0, 0, this, 0, true ); m_aStartSlide->setToggleAction(false); @@ -547,3 +553,4 @@ void PMainWindow::setupActions() - m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), 0, 0, this, 0, true ); + m_aHideToolbar = new QAction( tr( "Show toolbar" ), Opie::Core::OResource::loadPixmap( "UtilsIcon", + Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, true ); m_aHideToolbar->setOn (true); @@ -551,3 +558,4 @@ void PMainWindow::setupActions() - m_aSetup = new QAction( tr( "Settings" ), Resource::loadIconSet("SettingsIcon"), 0, 0, this, 0, true ); + m_aSetup = new QAction( tr( "Settings" ), Opie::Core::OResource::loadPixmap("SettingsIcon", Opie::Core::OResource::SmallIcon), + 0, 0, this, 0, true ); m_aSetup->setToggleAction(false); @@ -558,7 +566,10 @@ void PMainWindow::setupActions() - m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Resource::loadIconSet("opie-eye/opie-eye-thumb"), 0, 0, this, 0, true ); + m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb", + Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true ); m_aDirLong->setToggleAction(true); - m_aDirShort = new QAction( tr( "Thumbnail and name" ),Resource::loadIconSet("opie-eye/opie-eye-thumbonly"), 0, 0, this, 0, true ); + m_aDirShort = new QAction( tr( "Thumbnail and name" ),Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumbonly", + Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true ); m_aDirShort->setToggleAction(true); - m_aDirName = new QAction( tr( "Name only" ), Resource::loadIconSet("opie-eye/opie-eye-textview"),0, 0, this, 0, true ); + m_aDirName = new QAction( tr( "Name only" ), Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-textview", + Opie::Core::OResource::SmallIcon),0, 0, this, 0, true ); m_aDirName->setToggleAction(true); @@ -582,6 +593,8 @@ void PMainWindow::setupActions() m_gPrevNext = new QActionGroup(this,"imageprevnext",false); - m_aNext = new QAction( tr( "Next image" ), Resource::loadIconSet("forward"), 0, 0, this, 0, true ); + m_aNext = new QAction( tr( "Next image" ),Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon), + 0, 0, this, 0, true ); m_aNext->setToggleAction(false); connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext())); - m_aPrevious = new QAction( tr( "Previous image" ), Resource::loadIconSet("back"), 0, 0, this, 0, true ); + m_aPrevious = new QAction( tr( "Previous image" ),Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon), + 0, 0, this, 0, true ); m_aPrevious->setToggleAction(false); @@ -592,3 +605,3 @@ void PMainWindow::setupActions() m_aFullScreen = new QAction( tr( "Show images fullscreen" ), - Resource::loadIconSet("fullscreen"), 0, 0, this, 0, true ); + Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon), 0, 0, this, 0, true ); m_aFullScreen->setToggleAction(true); @@ -602,3 +615,5 @@ void PMainWindow::setupActions() m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false); - m_aAutoRotate = new QAction( tr( "Auto rotate images" ), Resource::loadIconSet( "rotate" ), 0, 0, this, 0, true ); + m_aAutoRotate = new QAction( tr( "Auto rotate images" ), + Opie::Core::OResource::loadPixmap( "rotate", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, true ); m_aAutoRotate->setToggleAction(true); @@ -615,3 +630,5 @@ void PMainWindow::setupActions() - m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true ); + m_aUnscaled = new QAction( tr( "Show images unscaled" ), + Opie::Core::OResource::loadPixmap( "1to1", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, true ); m_aUnscaled->setToggleAction(true); @@ -624,3 +641,5 @@ void PMainWindow::setupActions() - m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true ); + m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), + Opie::Core::OResource::loadPixmap( "mag", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, true ); m_aZoomer->setToggleAction(true); @@ -640,3 +659,5 @@ void PMainWindow::setupActions() if (!m_SmallWindow) { - m_aForceSmall = new QAction(tr("Dont show seperate windows"),Resource::loadIconSet( "AppsIcon" ), 0, 0, this, 0, true); + m_aForceSmall = new QAction(tr("Dont show seperate windows"), + Opie::Core::OResource::loadPixmap( "AppsIcon", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, true); m_aForceSmall->setToggleAction(true); @@ -648,4 +669,8 @@ void PMainWindow::setupActions() connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness())); - m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false); - m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false); + m_IncBrightness = new QAction(tr("Increase brightness by 5"), + Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, false); + m_DecBrightness = new QAction(tr("Decrease brightness by 5"), + Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ), + 0, 0, this, 0, false); m_hBright = new QActionGroup(this,"actioncollection",false), @@ -722,3 +747,4 @@ void PMainWindow::setupMenu() fsMenu = new QPopupMenu(fileMenu); - fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu); + fileMenu->insertItem(Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ), + tr("Select filesystem"),fsMenu); connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); @@ -734,3 +760,4 @@ void PMainWindow::setupMenu() listviewMenu = new QPopupMenu(dispMenu); - dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu); + dispMenu->insertItem(Opie::Core::OResource::loadPixmap("opie-eye/opie-eye-thumb", Opie::Core::OResource::SmallIcon), + tr("Listview mode"),listviewMenu); m_gListViewMode->addTo(listviewMenu); diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp index aa15d31..5680454 100644 --- a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp +++ b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp @@ -46,3 +46,3 @@ void ViewModeButton::slotChange( int i ) { owarn << "foo " << name << oendl; - setIconSet( Resource::loadIconSet( name ) ); + setIconSet( Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); } diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.h b/noncore/graphics/opie-eye/gui/viewmodebutton.h index 48f0e67..1637888 100644 --- a/noncore/graphics/opie-eye/gui/viewmodebutton.h +++ b/noncore/graphics/opie-eye/gui/viewmodebutton.h @@ -8,3 +8,3 @@ -#include <qpe/resource.h> +#include <opie2/oresource.h> |