summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-07-07 04:52:18 (UTC)
committer korovkin <korovkin>2006-07-07 04:52:18 (UTC)
commit9fb74057cd43bf6ac0cb50c617f9146457367cbc (patch) (side-by-side diff)
tree67571bdef0866d8b2dc281ed5814cd872edf5895
parent060b467fb04094352343298688db04d89943f4b3 (diff)
downloadopie-9fb74057cd43bf6ac0cb50c617f9146457367cbc.zip
opie-9fb74057cd43bf6ac0cb50c617f9146457367cbc.tar.gz
opie-9fb74057cd43bf6ac0cb50c617f9146457367cbc.tar.bz2
Fixed the typo in the Resource::loadImage function call.
Reformatted setBluezStatus function.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 32560a1..91ab2e1 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -56,33 +56,33 @@ using namespace Opie::Core;
/* STD */
#include <device.h>
namespace OpieTooth {
BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
setFixedHeight( AppLnk::smallIconSize() );
setFixedWidth( AppLnk::smallIconSize() );
#if OPIE_VERSION < 102010
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 = Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
#endif
startTimer(2000);
btDevice = 0;
btManager = 0;
bluezactive = false;
bluezDiscoveryActive = false;
bluezReceiveActive = false;
bluezReceiveChanged = false;
doListDevice = false;
isScanning = false;
m_wasOn = false;
m_sync = false;
// TODO: determine whether this channel has to be closed at destruction time.
QCopChannel* chan = new QCopChannel("QPE/Bluetooth", this );
connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
@@ -125,35 +125,35 @@ namespace OpieTooth {
if ( c == 1 ) {
switch ( ODevice::inst()->model() ) {
case Model_iPAQ_H39xx:
btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
break;
case Model_iPAQ_H5xxx:
btDevice = new Device( "/dev/tts/1", "any", "921600" );
break;
#if OPIE_VERSION >= 102010
case Model_MyPal_716:
btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" );
break;
#endif
- case Model_iPAQ_H22xx:
- btDevice = new Device( "/dev/tts/3", "any", "921600" );
- break;
+ case Model_iPAQ_H22xx:
+ btDevice = new Device( "/dev/tts/3", "any", "921600" );
+ break;
default:
btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );
break;
}
m_sync = sync;
connect(btDevice, SIGNAL(device(const QString&, bool)),
this, SLOT(slotDevice(const QString&, bool)));
} else {
setObexRecieveStatus(0);
::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null");
if ( btManager ) {
delete btManager;
btManager = 0;
}