| -rw-r--r-- | libopie2/opiebluez/obluetooth.cpp | 13 | ||||
| -rw-r--r-- | libopie2/opiebluez/obluetooth.h | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp index 80f4bfc..e8e6bb3 100644 --- a/libopie2/opiebluez/obluetooth.cpp +++ b/libopie2/opiebluez/obluetooth.cpp @@ -296,79 +296,66 @@ QString OBluetoothDevice::deviceClass() const case 2: major = "Phone"; switch ( min ) { case 0: minor = "Uncategorized"; break; case 1: minor = "Cellular"; break; case 2: minor = "Cordless"; break; case 3: minor = "Smart phone"; break; case 4: minor = "Wired modem or voice gateway"; break; case 5: minor = "Common ISDN Access"; break; case 6: minor = "Sim Card Reader"; break; } break; case 3: major = "LAN Access"; break; case 4: major = "Audio/Video"; switch ( min ) { case 0: minor = "Uncategorized"; break; case 1: minor = "Device conforms to the Headset profile"; break; case 2: minor = "Hands-free"; break; case 3: minor = "Reserved(3)"; break; case 4: minor = "Microphone"; break; case 5: minor = "Loudspeaker"; break; case 6: minor = "Headphones"; break; case 7: minor = "Portable Audio"; break; case 8: minor = "Car Audio"; break; case 9: minor = "Set-top box"; break; case 10: minor = "HiFi Audio Device"; break; case 11: minor = "VCR"; break; case 12: minor = "Video Camera"; break; case 13: minor = "Camcorder"; break; case 14: minor = "Video Monitor"; break; case 15: minor = "Video Display and Loudspeaker"; break; case 16: minor = "Video Conferencing"; break; case 17: minor = "Reserved(17)"; break; case 18: minor = "Gaming/Toy"; break; } break; case 5: major = "Peripheral"; switch ( min ) { case 16: minor = "Keyboard"; break; case 32: minor = "Pointing Device"; break; case 48: minor = "Keyboard and Pointing Device"; break; } break; case 6: major = "Imaging"; if (min & 4) minor = "Display"; else if (min & 8) minor = "Camera"; else if (min & 16) minor = "Scanner"; else if (min & 32) minor = "Printer"; break; case 63: major = "Uncategorized"; break; } return QString( "%1:%2" ).arg( major ).arg( minor ); } -QString OBluetoothDevice::getName() -{ - /* FIXME: Uahhh, this gets ugly. - The BlueZ kernel interface seems to be very badly (if at all) documented. - All people are assuming that you use libbluetooth to talk to that stack. - However since libbluetooth is GPL, we can't do that :/ - Guess, we are stuck here until someone finds time and/or motivation to look - into that and create some easy-to-understand examples for how to talk - directly to the BlueZ kernel interface. - */ -}; - - } } diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h index fa3d2c1..4bcd964 100644 --- a/libopie2/opiebluez/obluetooth.h +++ b/libopie2/opiebluez/obluetooth.h @@ -122,78 +122,74 @@ class OBluetoothInterface : public QObject public: /** * Constructor. Normally you don't create @ref OBluetoothInterface objects yourself, * but access them via @ref OBluetooth::interface(). */ OBluetoothInterface( QObject* parent, const char* name, void* devinfo, int ctlfd ); /** * Destructor. */ virtual ~OBluetoothInterface(); /** * @return the MAC address of the interface. */ QString macAddress() const; /** * Setting an interface to up enables it to receive packets. */ bool setUp( bool ); /** * @returns true if the interface is up. */ bool isUp() const; /** * @returns an iterator usable for iterating through the devices in range. */ DeviceIterator neighbourhood(); private: DeviceMap _devices; class Private; Private *d; }; /*====================================================================================== * OBluetoothDevice *======================================================================================*/ /** * @brief An bluetooth (remote) device abstraction. * * This class resembles a (remote) bluetooth device. * @author Michael 'Mickey' Lauer <mickey@vanille.de> */ class OBluetoothDevice : public QObject { Q_OBJECT public: /** * Constructor. */ OBluetoothDevice( QObject* parent, const char* name, void* inqinfo ); /** * Destructor. */ virtual ~OBluetoothDevice(); /** * @returns the MAC address of the device's interface. */ QString macAddress() const; /** * @returns the class of device. */ QString deviceClass() const; - /** - * @returns the device name. - */ - QString getName(); private: class Private; Private *d; }; } } #endif |