summaryrefslogtreecommitdiff
authordrw <drw>2005-05-16 17:49:55 (UTC)
committer drw <drw>2005-05-16 17:49:55 (UTC)
commitd54ee25eca9a9e8d38e342828aa21589dc523ce3 (patch) (side-by-side diff)
tree89bc093b7696bd42b0e7fa3b88bca1890f002bcf
parentd2426de3452342ab4af8e95214b9ff408f30744e (diff)
downloadopie-d54ee25eca9a9e8d38e342828aa21589dc523ce3.zip
opie-d54ee25eca9a9e8d38e342828aa21589dc523ce3.tar.gz
opie-d54ee25eca9a9e8d38e342828aa21589dc523ce3.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/dagger/configuredlg.cpp8
-rw-r--r--noncore/apps/dagger/navbar.cpp19
-rw-r--r--noncore/apps/dagger/opentextdlg.cpp4
-rw-r--r--noncore/apps/dagger/searchbar.cpp18
4 files changed, 25 insertions, 24 deletions
diff --git a/noncore/apps/dagger/configuredlg.cpp b/noncore/apps/dagger/configuredlg.cpp
index 42bc6da..791eeb1 100644
--- a/noncore/apps/dagger/configuredlg.cpp
+++ b/noncore/apps/dagger/configuredlg.cpp
@@ -20,4 +20,3 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
#include <opie2/ofiledialog.h>
-
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
@@ -53,5 +52,4 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa
grid->addWidget( m_swordPath, 1, 0 );
- QPixmap pic;
- pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
- QPushButton *btn = new QPushButton( pic, QString::null, widget );
+ QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
+ QString::null, widget );
btn->setMaximumWidth( btn->height() );
diff --git a/noncore/apps/dagger/navbar.cpp b/noncore/apps/dagger/navbar.cpp
index ac49613..b28c677 100644
--- a/noncore/apps/dagger/navbar.cpp
+++ b/noncore/apps/dagger/navbar.cpp
@@ -28,4 +28,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
-using Opie::Core::OResource;
-
NavBar::NavBar( QMainWindow *parent )
@@ -34,3 +32,4 @@ NavBar::NavBar( QMainWindow *parent )
// Initialize UI
- m_actionPrevPage = new QAction( tr( "Previous page" ), OResource::loadPixmap( "fastback", OResource::SmallIcon ),
+ m_actionPrevPage = new QAction( tr( "Previous page" ),
+ Opie::Core::OResource::loadPixmap( "fastback", Opie::Core::OResource::SmallIcon ),
QString::null, 0, this, 0 );
@@ -40,3 +39,4 @@ NavBar::NavBar( QMainWindow *parent )
- m_actionPrevVerse = new QAction( tr( "Previous verse" ), OResource::loadPixmap( "back", OResource::SmallIcon ),
+ m_actionPrevVerse = new QAction( tr( "Previous verse" ),
+ Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ),
QString::null, 0, this, 0 );
@@ -51,3 +51,4 @@ NavBar::NavBar( QMainWindow *parent )
- m_actionNextVerse = new QAction( tr( "Next verse" ), OResource::loadPixmap( "forward", OResource::SmallIcon ),
+ m_actionNextVerse = new QAction( tr( "Next verse" ),
+ Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ),
QString::null, 0, this, 0 );
@@ -57,4 +58,5 @@ NavBar::NavBar( QMainWindow *parent )
- m_actionNextPage = new QAction( tr( "Next page" ), OResource::loadPixmap( "fastforward", OResource::SmallIcon ),
- QString::null, 0, this, 0 );
+ m_actionNextPage = new QAction( tr( "Next page" ),
+ Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) );
@@ -70,3 +72,4 @@ NavBar::NavBar( QMainWindow *parent )
- m_actionScroll = new QAction( tr( "Auto-scroll" ), OResource::loadPixmap( "dagger/autoscroll", OResource::SmallIcon ),
+ m_actionScroll = new QAction( tr( "Auto-scroll" ),
+ Opie::Core::OResource::loadPixmap( "dagger/autoscroll", Opie::Core::OResource::SmallIcon ),
QString::null, 0, this, 0 );
diff --git a/noncore/apps/dagger/opentextdlg.cpp b/noncore/apps/dagger/opentextdlg.cpp
index 8c94a4b..7fd5cde 100644
--- a/noncore/apps/dagger/opentextdlg.cpp
+++ b/noncore/apps/dagger/opentextdlg.cpp
@@ -19,3 +19,3 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
-#include <qpe/resource.h>
+#include <qpe/applnk.h>
@@ -37,3 +37,3 @@ OpenTextDlg::OpenTextDlg( QWidget *parent, sword::SWMgr *swordMgr, QPixmap *bibl
m_textList.setRootIsDecorated( true );
- m_textList.addColumn( tr( "Icon" ),35 );
+ m_textList.addColumn( tr( "Icon" ) );
m_textList.addColumn( tr( "Text" ) );
diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp
index b794bfd..b195f67 100644
--- a/noncore/apps/dagger/searchbar.cpp
+++ b/noncore/apps/dagger/searchbar.cpp
@@ -24,3 +24,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
@@ -35,4 +34,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
-using Opie::Core::OResource;
-
void searchCallback( char /*percent*/, void */*userData*/ )
@@ -53,4 +50,5 @@ SearchBar::SearchBar( QMainWindow *parent )
- m_actionFind = new QAction( tr( "Find" ), OResource::loadPixmap( "find", OResource::SmallIcon ), QString::null,
- 0, this, 0 );
+ m_actionFind = new QAction( tr( "Find" ),
+ Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
m_actionFind->setEnabled( false );
@@ -62,4 +60,5 @@ SearchBar::SearchBar( QMainWindow *parent )
- m_actionPrev = new QAction( tr( "Previous result" ), OResource::loadPixmap( "back", OResource::SmallIcon ),
- QString::null, 0, this, 0 );
+ m_actionPrev = new QAction( tr( "Previous result" ),
+ Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
m_actionPrev->setEnabled( false );
@@ -74,4 +73,5 @@ SearchBar::SearchBar( QMainWindow *parent )
- m_actionNext = new QAction( tr( "Next result" ), OResource::loadPixmap( "forward", OResource::SmallIcon ),
- QString::null, 0, this, 0 );
+ m_actionNext = new QAction( tr( "Next result" ),
+ Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
m_actionNext->setEnabled( false );