| -rw-r--r-- | core/obex/obexsend.h | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/core/obex/obexsend.h b/core/obex/obexsend.h index fd819bc..02100f7 100644 --- a/core/obex/obexsend.h +++ b/core/obex/obexsend.h @@ -21,2 +21,14 @@ namespace OpieObex { class Obex; + + struct Pair { + Pair(const QString& first = QString::null, + const QString& second = QString::null) + : m_first(first), m_second(second ) { + } + QString first()const{ return m_first; } + QString second()const { return m_second; } + private: + QString m_first; + QString m_second; + }; class SendWidget : public QWidget{ @@ -40,3 +52,3 @@ namespace OpieObex { void slotBTDevices( const QMap<QString, QString>& ); - void slotSelectedDevice( const QString& name, int dev ); + void slotSelectedDevice( int id, int dev ); void dispatchIrda( const QCString& str, const QByteArray& ar ); @@ -55,6 +67,9 @@ namespace OpieObex { int m_start; - QStringList m_irDa; - QMap<QString, QString> m_bt; + QMap<int, QString> m_irDa; + QMap<int, QString>::Iterator m_irDaIt; + QMap<int, Pair > m_bt; QString m_file; Obex* m_obex; + int m_irDeSearch; // search of irda and bt devices + int m_btDeSearch; }; @@ -63,3 +78,3 @@ namespace OpieObex { DeviceItem( const QString& name = QString::null, - const QString& status = QString::null, int dev = 3); + const QString& status = QString::null, int dev = 3, int id = -1); ~DeviceItem(); @@ -71,2 +86,3 @@ namespace OpieObex { int device()const; + int id()const; QString toString()const; @@ -76,3 +92,9 @@ namespace OpieObex { int m_dev; + int m_id; }; + + /* + * The text field which contains the information about sending... + * + */ class DeviceBox : public QTextBrowser { @@ -85,12 +107,13 @@ namespace OpieObex { void setSource( const QString& str ); - void addDevice( const QString& name, int dev, - const QString& status = QString::null ); - void removeDevice( const QString& name ); - void setStatus( const QString& name, const QString& ); + int addDevice( const QString& name, int dev, + const QString& status = QString::null ); + void removeDevice( int ); + void setStatus( int, const QString& ); signals: - void selectedDevice( const QString& name, int dev ); + void selectedDevice( int id, int dev ); private: - QMap<QString, DeviceItem> m_dev; - QStringList m_devices; - + /* returns a id for a device from a device range */ + int idFor (int deviceType ); + QString allText(); + QMap<int, DeviceItem> m_dev; }; |