summaryrefslogtreecommitdiff
authorzecke <zecke>2002-07-12 19:17:11 (UTC)
committer zecke <zecke>2002-07-12 19:17:11 (UTC)
commit04fc12b5275c5b5968f52f84c997fc2bdffb5781 (patch) (side-by-side diff)
treee7ce14fd1df7c6b6b0501f0044b5bc849ec5297b
parentd0401e1888a9a1af6be3a737484afca699642d15 (diff)
downloadopie-04fc12b5275c5b5968f52f84c997fc2bdffb5781.zip
opie-04fc12b5275c5b5968f52f84c997fc2bdffb5781.tar.gz
opie-04fc12b5275c5b5968f52f84c997fc2bdffb5781.tar.bz2
Changes I don't remember
But now the really refactoring begins
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.h2
-rw-r--r--noncore/net/opietooth/manager/btserviceitem.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index a8f4fe4..bbc519c 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -4,24 +4,25 @@
#include <qvariant.h>
#include <qwidget.h>
#include <qscrollview.h>
#include <qsplitter.h>
#include <qlist.h>
#include <qpixmap.h>
#include "bluetoothbase.h"
#include "btserviceitem.h"
#include "btdeviceitem.h"
+#include "popuphelper.h"
#include "bticonloader.h"
#include <remotedevice.h>
#include <manager.h>
class QVBox;
class QHBoxLayout;
class QGridLayout;
class QFrame;
class QLabel;
class QPushButton;
@@ -44,24 +45,25 @@ namespace OpieTooth {
private slots:
void startScan();
private:
void readConfig();
void writeConfig();
void readSavedDevices();
void writeSavedDevices();
void writeToHciConfig();
QString status()const;
void initGui();
void setInfo();
+ PopupHelper m_popHelper;
Manager *m_localDevice;
QMap<QString,BTDeviceItem*> m_deviceList;
void deviceActive( const RemoteDevice &device );
QString m_deviceName;
QString m_defaultPasskey;
bool m_useEncryption;
bool m_enableAuthentification;
bool m_enablePagescan;
bool m_enableInquiryscan;
diff --git a/noncore/net/opietooth/manager/btserviceitem.cpp b/noncore/net/opietooth/manager/btserviceitem.cpp
index db71c3c..352e793 100644
--- a/noncore/net/opietooth/manager/btserviceitem.cpp
+++ b/noncore/net/opietooth/manager/btserviceitem.cpp
@@ -4,20 +4,20 @@
using namespace OpieTooth;
BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv )
: BTListItem( item ) {
m_service = serv;
setText(0, QObject::tr(serv.serviceName() ) );
}
BTServiceItem::~BTServiceItem() {
}
QString BTServiceItem::type() const {
- return QString::fromLatin1("Service");
+ return QString::fromLatin1("service");
}
int BTServiceItem::typeId() const {
return Service;
}
Services BTServiceItem::services() const {
return m_service;
}