author | korovkin <korovkin> | 2006-11-10 20:53:23 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-11-10 20:53:23 (UTC) |
commit | b06913999f349254ba1c6e182950cb71d0b7aa67 (patch) (side-by-side diff) | |
tree | b91b3ad0745e9e471b244ca56456af56ba1e69a9 /noncore/net/opietooth/manager | |
parent | 961e5561b24452d9cfc2bf7400f6f5952b31431c (diff) | |
download | opie-b06913999f349254ba1c6e182950cb71d0b7aa67.zip opie-b06913999f349254ba1c6e182950cb71d0b7aa67.tar.gz opie-b06913999f349254ba1c6e182950cb71d0b7aa67.tar.bz2 |
Files devicehandler.cpp and devicehandler.h moved from manager to
library to be used by obex to load a list of saved receivers.
-rw-r--r-- | noncore/net/opietooth/manager/devicehandler.cpp | 89 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/devicehandler.h | 41 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 |
3 files changed, 2 insertions, 132 deletions
diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/manager/devicehandler.cpp deleted file mode 100644 index 320ad44..0000000 --- a/noncore/net/opietooth/manager/devicehandler.cpp +++ b/dev/null @@ -1,89 +0,0 @@ - -#include <stdlib.h> - -#include <qdir.h> -#include <qpe/config.h> -#include <opie2/odebug.h> -using namespace Opie::Core; - -#include "devicehandler.h" - -using namespace OpieTooth; - -DeviceHandler::DeviceHandler() { - -}; -DeviceHandler::~DeviceHandler() { - -} - -RemoteDevice::ValueList DeviceHandler::load() { - RemoteDevice::ValueList list; -QString path = QDir::homeDirPath() + "/Settings/bluetooth"; - QDir deviceListSave( path); - - // list of .conf files - QStringList devicesFileList = deviceListSave.entryList(); - - - // cut .conf of to get the mac and also read the name entry in it. - if (!devicesFileList.isEmpty() ) { - QString name; - QString mac; - QStringList::Iterator it; - for (it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { - if ( (*it) == "." || (*it) == ".." ) - continue; - - odebug << (*it).latin1() << oendl; - Config conf(path + "/"+(*it), Config::File); - conf.setGroup("Info"); - name = conf.readEntry("name", "Error"); - mac = conf.readEntry("mac", QString::null); - odebug << "MAC: " + mac << oendl; - odebug << "NAME: " + name << oendl; - if (mac.isEmpty() ) - continue; - RemoteDevice currentDevice( mac , name ); - list.append( currentDevice ); - } - } - return list; -}; -/* - * This is some how rude but make sure all old devices - * are getting deleted - */ -void DeviceHandler::save( const RemoteDevice::ValueList& list) { - QCString rm; - rm += "rm -rf "; - rm += QDir::homeDirPath() + "/Settings/bluetooth"; - system ( rm.data() ); - - if (list.isEmpty() ) // no need to create the dir - return; - - /** - * Create a new dir - */ - rm = "mkdir "; - rm += QDir::homeDirPath() + "/Settings/bluetooth"; - owarn << "out " << rm.data() << "" << oendl; - system( rm.data() ); - - RemoteDevice::ValueList::ConstIterator it; - // write the config - - for ( it = list.begin(); it != list.end(); ++it ) { - odebug << "/Settings/bluetooth/" + (*it).mac() + ".conf" << oendl; - - Config conf( QDir::homeDirPath() + - "/Settings/bluetooth/" + - (*it).mac() + ".conf", Config::File ); - - conf.setGroup( "Info" ); - conf.writeEntry( "name", (*it).name() ); - conf.writeEntry( "mac", (*it).mac() ); - } - -} diff --git a/noncore/net/opietooth/manager/devicehandler.h b/noncore/net/opietooth/manager/devicehandler.h deleted file mode 100644 index 5cfe048..0000000 --- a/noncore/net/opietooth/manager/devicehandler.h +++ b/dev/null @@ -1,41 +0,0 @@ - -#ifndef OPIE_TOOTH_DEVICE_HANDLER_H -#define OPIE_TOOTH_DEVICE_HANDLER_H - -#include <qvaluelist.h> - -#include <remotedevice.h> - -namespace OpieTooth { - /** - * DeviceHandler is responsible for loading - * and saving devices from a config File - */ - class DeviceHandler { - public: - /** - * c'tor - */ - DeviceHandler(); - - /** - * d'tor - */ - ~DeviceHandler(); - - /** - * loads from $HOME/Settings/bluetooth/ * - */ - RemoteDevice::ValueList load(); - - /** - * Saves to $HOME/Settings/bluetooth - */ - void save( const RemoteDevice::ValueList & ); - - }; - - -}; - -#endif diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index dc048c4..567932e 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro @@ -1,33 +1,33 @@ CONFIG = qt warn_on quick-app HEADERS = btconnectionitem.h btdeviceitem.h \ btserviceitem.h stdpopups.h \ popuphelper.h bluebase.h \ scandialog.h btlistitem.h filistitem.h \ hciconfwrapper.h bticonloader.h \ pppdialog.h dundialog.h pandialog.h \ obexdialog.h obexftpdialog.h \ rfcommassigndialogimpl.h rfcommassigndialogitem.h \ - devicehandler.h rfcpopup.h obexpopup.h obexftpopup.h \ + rfcpopup.h obexpopup.h obexftpopup.h \ rfcommhelper.h panpopup.h dunpopup.h rfcommconfhandler.h \ servicesdialog.h btconfhandler.h hidpopup.h SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ btserviceitem.cpp filelistitem.cpp stdpopups.cpp \ popuphelper.cpp main.cpp \ bluebase.cpp scandialog.cpp \ btlistitem.cpp hciconfwrapper.cpp \ bticonloader.cpp pppdialog.cpp dundialog.cpp pandialog.cpp \ rfcommassigndialogimpl.cpp rfcommassigndialogitem.cpp \ - obexdialog.cpp devicehandler.cpp \ + obexdialog.cpp \ rfcpopup.cpp obexpopup.cpp obexftpopup.cpp obexftpdialog.cpp \ rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp \ servicesdialog.cpp btconfhandler.cpp hidpopup.cpp INCLUDEPATH += $(OPIEDIR)/include INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lbluetooth -lopietooth1 -lopiecore2 -lopieui2 -lopenobex INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui \ rfcommdialogitembase.ui obexftpdialogbase.ui \ servicesdialogbase.ui TARGET = bluetooth-manager |