| -rw-r--r-- | core/apps/helpbrowser/helpbrowser.cpp | 15 | ||||
| -rw-r--r-- | core/apps/textedit/textedit.cpp | 31 |
2 files changed, 26 insertions, 20 deletions
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp index 4bd9565..c2059c0 100644 --- a/core/apps/helpbrowser/helpbrowser.cpp +++ b/core/apps/helpbrowser/helpbrowser.cpp @@ -27,4 +27,6 @@ #include <opie2/odebug.h> +#include <opie2/oresource.h> + #include <qpe/qpeapplication.h> -#include <qpe/resource.h> + using namespace Opie::Core; @@ -49,3 +51,3 @@ void HelpBrowser::init( const QString& _home ) { - setIcon( Resource::loadPixmap( "HelpBrowser" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "HelpBrowser", Opie::Core::OResource::SmallIcon ) ); setBackgroundMode( PaletteButton ); @@ -71,3 +73,4 @@ void HelpBrowser::init( const QString& _home ) QPopupMenu* go = new QPopupMenu( this ); - backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); + backAction = new QAction( tr( "Backward" ), Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) ); @@ -79,3 +82,4 @@ void HelpBrowser::init( const QString& _home ) - forwardAction = new QAction( tr( "Forward" ), Resource::loadIconSet( "forward" ), QString::null, 0, this, 0 ); + forwardAction = new QAction( tr( "Forward" ), Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) ); @@ -87,3 +91,4 @@ void HelpBrowser::init( const QString& _home ) - QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 ); + QAction *a = new QAction( tr( "Home" ), Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ), + QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), browser, SLOT( home() ) ); diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 63709dd..ca760bb 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -22,3 +22,4 @@ #include <opie2/ofontselector.h> -#include <qpe/resource.h> +#include <opie2/oresource.h> + #include <qpe/config.h> @@ -171,3 +172,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - setIcon( Resource::loadPixmap( "textedit/TextEditor" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "textedit/TextEditor", Opie::Core::OResource::SmallIcon ) ); @@ -187,3 +188,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), + QAction *a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -193,3 +194,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), + a = new QAction( tr( "Open" ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -199,3 +200,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Save" ), Resource::loadPixmap("save") , + a = new QAction( tr( "Save" ), Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -206,3 +207,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Save As" ), Resource::loadPixmap("save") , + a = new QAction( tr( "Save As" ), Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -211,3 +212,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), + a = new QAction( tr( "Cut" ), Opie::Core::OResource::loadPixmap( "cut", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -217,3 +218,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), + a = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -223,3 +224,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), + a = new QAction( tr( "Paste" ), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -231,3 +232,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) #ifndef QT_NO_CLIPBOARD - a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), + a = new QAction( tr( "Insert Time and Date" ), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -237,3 +238,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ), + a = new QAction( tr( "Goto Line..." ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -243,3 +244,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), + a = new QAction( tr( "Find..." ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -333,3 +334,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), + a = new QAction( tr( "Find Next" ), Opie::Core::OResource::loadPixmap( "next", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -339,3 +340,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), + a = new QAction( tr( "Close Find" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); @@ -345,3 +346,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) edit->insertSeparator(); - a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), + a = new QAction( tr( "Delete" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); |