summaryrefslogtreecommitdiff
path: root/libopie2/opiebluez
authorerik <erik>2007-04-20 21:27:48 (UTC)
committer erik <erik>2007-04-20 21:27:48 (UTC)
commit1edbb754d3c8cfccf1630e2ad1e531e907555cbd (patch) (side-by-side diff)
treec8f3048a913d51534408f5ae75f6f8e7ff73d144 /libopie2/opiebluez
parentd07beba6b9351c6b575235522781e3ce8495e578 (diff)
downloadopie-1edbb754d3c8cfccf1630e2ad1e531e907555cbd.zip
opie-1edbb754d3c8cfccf1630e2ad1e531e907555cbd.tar.gz
opie-1edbb754d3c8cfccf1630e2ad1e531e907555cbd.tar.bz2
removed unused member function
Diffstat (limited to 'libopie2/opiebluez') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiebluez/obluetooth.cpp13
-rw-r--r--libopie2/opiebluez/obluetooth.h4
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
@@ -264,111 +264,98 @@ QString OBluetoothDevice::macAddress() const
d->inqinfo.bdaddr.b[3],
d->inqinfo.bdaddr.b[2],
d->inqinfo.bdaddr.b[1],
d->inqinfo.bdaddr.b[0] );
}
QString OBluetoothDevice::deviceClass() const
{
int maj = d->inqinfo.dev_class[1] & 0x1f;
int min = d->inqinfo.dev_class[0] >> 2;
QString major = QString( "Unknown(%1)" ).arg( maj );
QString minor = QString( "Unknown(%1)" ).arg( min );
switch ( maj )
{
case 0: major = "Miscellaneous";
break;
case 1: major = "Computer";
switch ( min )
{
case 0: minor = "Uncategorized";
case 1: minor = "Desktop workstation";
case 2: minor = "Server";
case 3: minor = "Laptop";
case 4: minor = "Handheld";
case 5: minor = "Palm";
case 6: minor = "Wearable";
}
break;
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
@@ -90,110 +90,106 @@ class OBluetooth : public QObject
protected:
OBluetooth();
private:
static OBluetooth* _instance;
InterfaceMap _interfaces;
class OBluetoothPrivate;
OBluetoothPrivate *d;
int _fd;
};
/*======================================================================================
* OBluetoothInterface
*======================================================================================*/
/**
* @brief An bluetooth interface wrapper.
*
* This class provides a wrapper for a bluetooth HCI device. All the cumbersome details of
* Linux ioctls are hidden under a convenient high-level interface.
* @warning Most of the setting methods contained in this class require the appropriate
* process permissions to work.
*
* @author Michael 'Mickey' Lauer <mickey@vanille.de>
*/
class OBluetoothInterface : public QObject
{
Q_OBJECT
public:
typedef QDict<OBluetoothDevice> DeviceMap;
typedef QDictIterator<OBluetoothDevice> DeviceIterator;
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