summaryrefslogtreecommitdiff
authordrw <drw>2005-05-24 22:29:46 (UTC)
committer drw <drw>2005-05-24 22:29:46 (UTC)
commit3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59 (patch) (unidiff)
tree2573d5c8bdad9d95eede843615a5baa1a45bbc95
parenta2542a161d15feface21954afcd26f9ec51f131f (diff)
downloadopie-3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59.zip
opie-3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59.tar.gz
opie-3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/autorotateapplet/autorotate.cpp6
-rw-r--r--noncore/applets/networkapplet/networkapplet.cpp54
-rw-r--r--noncore/applets/notesapplet/notes.cpp4
-rw-r--r--noncore/applets/pyquicklaunch/pyquicklaunch.cpp6
-rw-r--r--noncore/applets/zkbapplet/applet/zkbwidget.cpp8
5 files changed, 39 insertions, 39 deletions
diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp
index 34802fb..28b631b 100644
--- a/noncore/applets/autorotateapplet/autorotate.cpp
+++ b/noncore/applets/autorotateapplet/autorotate.cpp
@@ -17,5 +17,5 @@
17#include <opie2/otaskbarapplet.h> 17#include <opie2/otaskbarapplet.h>
18#include <opie2/oresource.h>
18#include <qpe/applnk.h> 19#include <qpe/applnk.h>
19#include <qpe/config.h> 20#include <qpe/config.h>
20#include <qpe/resource.h>
21using namespace Opie::Core; 21using namespace Opie::Core;
@@ -30,4 +30,4 @@ AutoRotate::AutoRotate(QWidget * parent):QWidget(parent)
30 30
31 enabledPm.convertFromImage( Resource::loadImage("autorotate/rotate").smoothScale( height(), width() ) ); 31 enabledPm = Opie::Core::OResource::loadImage("autorotate/rotate", Opie::Core::OResource::SmallIcon);
32 disabledPm.convertFromImage( Resource::loadImage("autorotate/norotate").smoothScale( height(), width() ) ); 32 disabledPm = Opie::Core::OResource::loadImage("autorotate/norotate", Opie::Core::OResource::SmallIcon);
33 33
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp
index bd6ca66..10c2b34 100644
--- a/noncore/applets/networkapplet/networkapplet.cpp
+++ b/noncore/applets/networkapplet/networkapplet.cpp
@@ -1,3 +1,3 @@
1/* 1/*
2                 This file is part of the Opie Project 2 This file is part of the Opie Project
3 3
@@ -5,21 +5,21 @@
5 .=l. 5 .=l.
6           .>+-= 6 .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7_;:, .> :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_, > . <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 9:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i, .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11- . .-<_> .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12 ._= =} : or (at your option) any later version.
13    .%`+i>       _;_. 13 .%`+i> _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14 .i_,=:_. -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16 : .. .:, . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.= = ; Library General Public License for more
20++=   -.     .`     .: details. 20++= -. .` .: details.
21 :     =  ...= . :.=- 21: = ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22-. .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23 -_. . . )=. = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24 -- :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
@@ -35,5 +35,6 @@
35#include <opie2/onetwork.h> 35#include <opie2/onetwork.h>
36#include <opie2/oresource.h>
36#include <opie2/otaskbarapplet.h> 37#include <opie2/otaskbarapplet.h>
37#include <qpe/applnk.h> 38#include <qpe/applnk.h>
38#include <qpe/resource.h> 39#include <qpe/qpeapplication.h>
39using namespace Opie::Core; 40using namespace Opie::Core;
@@ -57,7 +58,6 @@ IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name )
57 setToggleButton( true ); 58 setToggleButton( true );
58 //setAutoRaise( true ); 59 setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
59 setOnIconSet( QIconSet( Resource::loadPixmap( "up" ) ) ); 60 setOnIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ) );
60 setOffIconSet( QIconSet( Resource::loadPixmap( "down" ) ) ); 61 setOffIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ) ) );
61 setOn( _iface->isUp() ); 62 setOn( _iface->isUp() );
62 //setFixedWidth( 16 );
63 connect( this, SIGNAL( clicked() ), this, SLOT( clicked() ) ); 63 connect( this, SIGNAL( clicked() ), this, SLOT( clicked() ) );
@@ -123,3 +123,3 @@ void NetworkAppletControl::build()
123 QLabel* symbol = new QLabel( this ); 123 QLabel* symbol = new QLabel( this );
124 symbol->setPixmap( Resource::loadPixmap( guessDevice( it.current() ) ) ); 124 symbol->setPixmap( Opie::Core::OResource::loadPixmap( guessDevice( it.current() ), Opie::Core::OResource::SmallIcon ) );
125 h->addWidget( symbol ); 125 h->addWidget( symbol );
@@ -217,3 +217,3 @@ NetworkApplet::NetworkApplet( QWidget *parent, const char *name )
217 setFixedWidth( AppLnk::smallIconSize() ); 217 setFixedWidth( AppLnk::smallIconSize() );
218 _pixmap.convertFromImage( Resource::loadImage( "networkapplet/network" ).smoothScale( height(), width() ) ); 218 _pixmap = Opie::Core::OResource::loadPixmap( "networkapplet/network", Opie::Core::OResource::SmallIcon );
219 _control = new NetworkAppletControl( this, "control" ); 219 _control = new NetworkAppletControl( this, "control" );
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index d06672a..13f297e 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -20,2 +20,3 @@
20#include <opie2/otaskbarapplet.h> 20#include <opie2/otaskbarapplet.h>
21#include <opie2/oresource.h>
21#include <qpe/filemanager.h> 22#include <qpe/filemanager.h>
@@ -26,3 +27,2 @@
26#include <qpe/config.h> 27#include <qpe/config.h>
27#include <qpe/resource.h>
28using namespace Opie::Core; 28using namespace Opie::Core;
@@ -434,3 +434,3 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name )
434 setFixedWidth( AppLnk::smallIconSize() ); 434 setFixedWidth( AppLnk::smallIconSize() );
435 notesPixmap.convertFromImage( Resource::loadImage( "edit" ).smoothScale( height(), width() ) ); 435 notesPixmap = Opie::Core::OResource::loadImage( "edit", Opie::Core::OResource::SmallIcon );
436 vc = new NotesControl; 436 vc = new NotesControl;
diff --git a/noncore/applets/pyquicklaunch/pyquicklaunch.cpp b/noncore/applets/pyquicklaunch/pyquicklaunch.cpp
index bcd2f0d..45eda4e 100644
--- a/noncore/applets/pyquicklaunch/pyquicklaunch.cpp
+++ b/noncore/applets/pyquicklaunch/pyquicklaunch.cpp
@@ -18,2 +18,3 @@
18#include <opie2/odebug.h> 18#include <opie2/odebug.h>
19#include <opie2/oresource.h>
19#include <opie2/otaskbarapplet.h> 20#include <opie2/otaskbarapplet.h>
@@ -21,3 +22,2 @@
21#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
22#include <qpe/resource.h>
23using namespace Opie::Core; 23using namespace Opie::Core;
@@ -84,4 +84,4 @@ PyQuicklaunchApplet::PyQuicklaunchApplet( QWidget *parent, const char *name )
84 84
85 _online = Resource::loadPixmap( "pyquicklaunch/online" ); 85 _online = Opie::Core::OResource::loadPixmap( "pyquicklaunch/online", Opie::Core::OResource::SmallIcon );
86 _offline = Resource::loadPixmap( "pyquicklaunch/offline" ); 86 _offline = Opie::Core::OResource::loadPixmap( "pyquicklaunch/offline", Opie::Core::OResource::SmallIcon );
87 87
diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.cpp b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
index 55c08b3..324ccdc 100644
--- a/noncore/applets/zkbapplet/applet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
@@ -2,2 +2,3 @@
2#include <opie2/okeyfilter.h> 2#include <opie2/okeyfilter.h>
3#include <opie2/oresource.h>
3#include <qpe/qcopenvelope_qws.h> 4#include <qpe/qcopenvelope_qws.h>
@@ -5,5 +6,4 @@
5#include <qpe/qpeapplication.h> 6#include <qpe/qpeapplication.h>
6#include <qpe/resource.h> 7//#include <stdio.h>
7#include <stdio.h> 8//#include <unistd.h>
8#include <unistd.h>
9#include "zkbwidget.h" 9#include "zkbwidget.h"
@@ -14,3 +14,3 @@ using namespace Opie::Ui;
14ZkbWidget::ZkbWidget(QWidget* parent) 14ZkbWidget::ZkbWidget(QWidget* parent)
15 :QLabel(parent),keymap(0),disabled(Resource::loadPixmap("zkb-disabled")) { 15 :QLabel(parent),keymap(0),disabled(Opie::Core::OResource::loadPixmap("zkb-disabled", Opie::Core::OResource::SmallIcon)) {
16 16