summaryrefslogtreecommitdiff
authordrw <drw>2005-04-15 17:25:13 (UTC)
committer drw <drw>2005-04-15 17:25:13 (UTC)
commit86b1feed1ab2e47a082d974e1fcc513c59a74469 (patch) (unidiff)
tree2a3965d7adf4633db6b9e1e4150b4bd374cb761d
parente2d5048b65d95ba7d658aabadece4e91f17f6310 (diff)
downloadopie-86b1feed1ab2e47a082d974e1fcc513c59a74469.zip
opie-86b1feed1ab2e47a082d974e1fcc513c59a74469.tar.gz
opie-86b1feed1ab2e47a082d974e1fcc513c59a74469.tar.bz2
Resource -> OResource
Diffstat (more/less context) (show 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
@@ -25,8 +25,10 @@
25 25
26/* OPIE */ 26/* OPIE */
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;
31 33
32/* QT */ 34/* QT */
@@ -47,7 +49,7 @@ HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f )
47 49
48void HelpBrowser::init( const QString& _home ) 50void 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 );
52 54
53 browser = new MagicTextBrowser( this ); 55 browser = new MagicTextBrowser( this );
@@ -69,7 +71,8 @@ void HelpBrowser::init( const QString& _home )
69 // addToolBar( toolbar, "Toolbar"); 71 // addToolBar( toolbar, "Toolbar");
70 72
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() ) );
74 connect( browser, SIGNAL( backwardAvailable(bool) ), 77 connect( browser, SIGNAL( backwardAvailable(bool) ),
75 backAction, SLOT( setEnabled(bool) ) ); 78 backAction, SLOT( setEnabled(bool) ) );
@@ -77,7 +80,8 @@ void HelpBrowser::init( const QString& _home )
77 backAction->addTo( toolbar ); 80 backAction->addTo( toolbar );
78 backAction->setEnabled( FALSE ); 81 backAction->setEnabled( FALSE );
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() ) );
82 connect( browser, SIGNAL( forwardAvailable(bool) ), 86 connect( browser, SIGNAL( forwardAvailable(bool) ),
83 forwardAction, SLOT( setEnabled(bool) ) ); 87 forwardAction, SLOT( setEnabled(bool) ) );
@@ -85,7 +89,8 @@ void HelpBrowser::init( const QString& _home )
85 forwardAction->addTo( toolbar ); 89 forwardAction->addTo( toolbar );
86 forwardAction->setEnabled( FALSE ); 90 forwardAction->setEnabled( FALSE );
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() ) );
90 a->addTo( go ); 95 a->addTo( go );
91 a->addTo( toolbar ); 96 a->addTo( toolbar );
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
@@ -20,7 +20,8 @@
20#include <opie2/ofileselector.h> 20#include <opie2/ofileselector.h>
21#include <opie2/ofiledialog.h> 21#include <opie2/ofiledialog.h>
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>
25#include <qpe/qpeapplication.h> 26#include <qpe/qpeapplication.h>
26 27
@@ -169,7 +170,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
169 connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), 170 connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
170 this, SLOT(receive(const QCString&,const QByteArray&)) ); 171 this, SLOT(receive(const QCString&,const QByteArray&)) );
171 172
172 setIcon( Resource::loadPixmap( "textedit/TextEditor" ) ); 173 setIcon( Opie::Core::OResource::loadPixmap( "textedit/TextEditor", Opie::Core::OResource::SmallIcon ) );
173 174
174 QToolBar *bar = new QToolBar( this ); 175 QToolBar *bar = new QToolBar( this );
175 bar->setHorizontalStretchable( true ); 176 bar->setHorizontalStretchable( true );
@@ -185,43 +186,43 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
185 bar = new QToolBar( this ); 186 bar = new QToolBar( this );
186 editBar = bar; 187 editBar = bar;
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 );
190 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); 191 connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
191// a->addTo( bar ); 192// a->addTo( bar );
192 a->addTo( file ); 193 a->addTo( file );
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 );
196 connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); 197 connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
197 a->addTo( bar ); 198 a->addTo( bar );
198 a->addTo( file ); 199 a->addTo( file );
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 );
202 connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); 203 connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
203 file->insertSeparator(); 204 file->insertSeparator();
204 a->addTo( bar ); 205 a->addTo( bar );
205 a->addTo( file ); 206 a->addTo( file );
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 );
209 connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); 210 connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
210 a->addTo( file ); 211 a->addTo( file );
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 );
214 connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); 215 connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
215 a->addTo( editBar ); 216 a->addTo( editBar );
216 a->addTo( edit ); 217 a->addTo( edit );
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 );
220 connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); 221 connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
221 a->addTo( editBar ); 222 a->addTo( editBar );
222 a->addTo( edit ); 223 a->addTo( edit );
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 );
226 connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); 227 connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
227 a->addTo( editBar ); 228 a->addTo( editBar );
@@ -229,19 +230,19 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
229 230
230 231
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 );
234 connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); 235 connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) );
235 a->addTo( edit ); 236 a->addTo( edit );
236#endif 237#endif
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 );
240 connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) ); 241 connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) );
241 edit->insertSeparator(); 242 edit->insertSeparator();
242 a->addTo( edit ); 243 a->addTo( edit );
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 );
246 connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); 247 connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) );
247 a->addTo( bar ); 248 a->addTo( bar );
@@ -331,19 +332,19 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
331 connect( searchEdit, SIGNAL( textChanged(const QString&) ), 332 connect( searchEdit, SIGNAL( textChanged(const QString&) ),
332 this, SLOT( search() ) ); 333 this, SLOT( search() ) );
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 );
336 connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) ); 337 connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
337 a->addTo( searchBar ); 338 a->addTo( searchBar );
338 a->addTo( edit ); 339 a->addTo( edit );
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 );
342 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); 343 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
343 a->addTo( searchBar ); 344 a->addTo( searchBar );
344 345
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 );
348 connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) ); 349 connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
349 a->addTo( edit ); 350 a->addTo( edit );