summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-07-07 04:52:18 (UTC)
committer korovkin <korovkin>2006-07-07 04:52:18 (UTC)
commit9fb74057cd43bf6ac0cb50c617f9146457367cbc (patch) (unidiff)
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
@@ -64,17 +64,17 @@ namespace OpieTooth {
64 bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); 64 bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
65 bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); 65 bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
66 bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" ); 66 bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" );
67 bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" ); 67 bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" );
68#else 68#else
69 bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon ); 69 bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
70 bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon ); 70 bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
71 bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon ); 71 bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon );
72 bluezReceiveOnPixmap = )Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon ); 72 bluezReceiveOnPixmap = Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
73#endif 73#endif
74 startTimer(2000); 74 startTimer(2000);
75 btDevice = 0; 75 btDevice = 0;
76 btManager = 0; 76 btManager = 0;
77 bluezactive = false; 77 bluezactive = false;
78 bluezDiscoveryActive = false; 78 bluezDiscoveryActive = false;
79 bluezReceiveActive = false; 79 bluezReceiveActive = false;
80 bluezReceiveChanged = false; 80 bluezReceiveChanged = false;
@@ -133,19 +133,19 @@ namespace OpieTooth {
133 btDevice = new Device( "/dev/tts/1", "any", "921600" ); 133 btDevice = new Device( "/dev/tts/1", "any", "921600" );
134 break; 134 break;
135 135
136#if OPIE_VERSION >= 102010 136#if OPIE_VERSION >= 102010
137 case Model_MyPal_716: 137 case Model_MyPal_716:
138 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" ); 138 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" );
139 break; 139 break;
140#endif 140#endif
141 case Model_iPAQ_H22xx: 141 case Model_iPAQ_H22xx:
142 btDevice = new Device( "/dev/tts/3", "any", "921600" ); 142 btDevice = new Device( "/dev/tts/3", "any", "921600" );
143 break; 143 break;
144 144
145 default: 145 default:
146 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" ); 146 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );
147 break; 147 break;
148 } 148 }
149 m_sync = sync; 149 m_sync = sync;
150 connect(btDevice, SIGNAL(device(const QString&, bool)), 150 connect(btDevice, SIGNAL(device(const QString&, bool)),
151 this, SLOT(slotDevice(const QString&, bool))); 151 this, SLOT(slotDevice(const QString&, bool)));