summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/helpbrowser/helpbrowser.cpp15
-rw-r--r--core/apps/textedit/textedit.cpp31
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 @@
27#include <opie2/odebug.h> 27#include <opie2/odebug.h>
28#include <opie2/oresource.h>
29
28#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
29#include <qpe/resource.h> 31
30using namespace Opie::Core; 32using namespace Opie::Core;
@@ -49,3 +51,3 @@ void HelpBrowser::init( const QString& _home )
49{ 51{
50 setIcon( Resource::loadPixmap( "HelpBrowser" ) ); 52 setIcon( Opie::Core::OResource::loadPixmap( "HelpBrowser", Opie::Core::OResource::SmallIcon ) );
51 setBackgroundMode( PaletteButton ); 53 setBackgroundMode( PaletteButton );
@@ -71,3 +73,4 @@ void HelpBrowser::init( const QString& _home )
71 QPopupMenu* go = new QPopupMenu( this ); 73 QPopupMenu* go = new QPopupMenu( this );
72 backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); 74 backAction = new QAction( tr( "Backward" ), Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ),
75 QString::null, 0, this, 0 );
73 connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) ); 76 connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) );
@@ -79,3 +82,4 @@ void HelpBrowser::init( const QString& _home )
79 82
80 forwardAction = new QAction( tr( "Forward" ), Resource::loadIconSet( "forward" ), QString::null, 0, this, 0 ); 83 forwardAction = new QAction( tr( "Forward" ), Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ),
84 QString::null, 0, this, 0 );
81 connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) ); 85 connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) );
@@ -87,3 +91,4 @@ void HelpBrowser::init( const QString& _home )
87 91
88 QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 ); 92 QAction *a = new QAction( tr( "Home" ), Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ),
93 QString::null, 0, this, 0 );
89 connect( a, SIGNAL( activated() ), browser, SLOT( home() ) ); 94 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 @@
22#include <opie2/ofontselector.h> 22#include <opie2/ofontselector.h>
23#include <qpe/resource.h> 23#include <opie2/oresource.h>
24
24#include <qpe/config.h> 25#include <qpe/config.h>
@@ -171,3 +172,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
171 172
172 setIcon( Resource::loadPixmap( "textedit/TextEditor" ) ); 173 setIcon( Opie::Core::OResource::loadPixmap( "textedit/TextEditor", Opie::Core::OResource::SmallIcon ) );
173 174
@@ -187,3 +188,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
187 188
188 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), 189 QAction *a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
189 QString::null, 0, this, 0 ); 190 QString::null, 0, this, 0 );
@@ -193,3 +194,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
193 194
194 a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), 195 a = new QAction( tr( "Open" ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ),
195 QString::null, 0, this, 0 ); 196 QString::null, 0, this, 0 );
@@ -199,3 +200,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
199 200
200 a = new QAction( tr( "Save" ), Resource::loadPixmap("save") , 201 a = new QAction( tr( "Save" ), Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ),
201 QString::null, 0, this, 0 ); 202 QString::null, 0, this, 0 );
@@ -206,3 +207,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
206 207
207 a = new QAction( tr( "Save As" ), Resource::loadPixmap("save") , 208 a = new QAction( tr( "Save As" ), Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ),
208 QString::null, 0, this, 0 ); 209 QString::null, 0, this, 0 );
@@ -211,3 +212,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
211 212
212 a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), 213 a = new QAction( tr( "Cut" ), Opie::Core::OResource::loadPixmap( "cut", Opie::Core::OResource::SmallIcon ),
213 QString::null, 0, this, 0 ); 214 QString::null, 0, this, 0 );
@@ -217,3 +218,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
217 218
218 a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), 219 a = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ),
219 QString::null, 0, this, 0 ); 220 QString::null, 0, this, 0 );
@@ -223,3 +224,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
223 224
224 a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), 225 a = new QAction( tr( "Paste" ), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ),
225 QString::null, 0, this, 0 ); 226 QString::null, 0, this, 0 );
@@ -231,3 +232,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
231#ifndef QT_NO_CLIPBOARD 232#ifndef QT_NO_CLIPBOARD
232 a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), 233 a = new QAction( tr( "Insert Time and Date" ), Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ),
233 QString::null, 0, this, 0 ); 234 QString::null, 0, this, 0 );
@@ -237,3 +238,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
237 238
238 a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ), 239 a = new QAction( tr( "Goto Line..." ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
239 QString::null, 0, this, 0 ); 240 QString::null, 0, this, 0 );
@@ -243,3 +244,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
243 244
244 a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), 245 a = new QAction( tr( "Find..." ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
245 QString::null, 0, this, 0 ); 246 QString::null, 0, this, 0 );
@@ -333,3 +334,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
333 334
334 a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), 335 a = new QAction( tr( "Find Next" ), Opie::Core::OResource::loadPixmap( "next", Opie::Core::OResource::SmallIcon ),
335 QString::null, 0, this, 0 ); 336 QString::null, 0, this, 0 );
@@ -339,3 +340,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
339 340
340 a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), 341 a = new QAction( tr( "Close Find" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
341 QString::null, 0, this, 0 ); 342 QString::null, 0, this, 0 );
@@ -345,3 +346,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
345 edit->insertSeparator(); 346 edit->insertSeparator();
346 a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ), 347 a = new QAction( tr( "Delete" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
347 QString::null, 0, this, 0 ); 348 QString::null, 0, this, 0 );