summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-07-07 10:39:20 (UTC)
committer mickeyl <mickeyl>2006-07-07 10:39:20 (UTC)
commit043999046de3e7088ef386f18348ebe4484b0e65 (patch) (side-by-side diff)
treec46908a6ccc183713b98c2ccbf4e0134c74d66b1
parent9fb74057cd43bf6ac0cb50c617f9146457367cbc (diff)
downloadopie-043999046de3e7088ef386f18348ebe4484b0e65.zip
opie-043999046de3e7088ef386f18348ebe4484b0e65.tar.gz
opie-043999046de3e7088ef386f18348ebe4484b0e65.tar.bz2
s/Resource/OResource/
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/obex/obexsend.cpp6
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 9a30a0a..2512de3 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -6,17 +6,17 @@
#include "obex.h"
#include "btobex.h"
#include "obexsend.h"
using namespace OpieObex;
/* OPIE */
#include <opie2/odebug.h>
#include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
using namespace Opie::Core;
/* QT */
#include <qlabel.h>
#include <qpushbutton.h>
#include <qpixmap.h>
#include <qlistview.h>
@@ -69,17 +69,17 @@ void SendWidget::send( const QString& file, const QString& desc ) {
fileToSend->setText(desc.isEmpty() ? file : desc );
scan_for_receivers();
}
int SendWidget::addReceiver(const char *r, const char *icon)
{
QListViewItem * item = new QListViewItem( receiverList, 0 );
item->setText( 0, r);
- item->setPixmap( 1, Resource::loadPixmap( icon ) );
+ item->setPixmap( 1, OResource::loadPixmap( icon ) );
int id=receivers.count();
receivers[id]=item;
return id;
}
bool SendWidget::receiverSelected(int id)
{
@@ -220,17 +220,17 @@ void SendWidget::scan_for_receivers()
}
void SendWidget::toggle_receiver(QListViewItem* item)
{
// toggle the state of an individual receiver.
if(item->pixmap(2))
item->setPixmap(2,QPixmap());
else
- item->setPixmap(2,Resource::loadPixmap("obex/check.png"));
+ item->setPixmap(2, OResource::loadPixmap("obex/check.png"));
}
void SendWidget::closeEvent( QCloseEvent* evt) {
delete m_obex;
m_obex = NULL;
delete m_btobex;
m_btobex = NULL;
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 91ab2e1..8498afc 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -64,17 +64,17 @@ namespace OpieTooth {
bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" );
bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" );
#else
bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon );
- bluezReceiveOnPixmap = Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
+ bluezReceiveOnPixmap = OResource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
#endif
startTimer(2000);
btDevice = 0;
btManager = 0;
bluezactive = false;
bluezDiscoveryActive = false;
bluezReceiveActive = false;
bluezReceiveChanged = false;