Diffstat (limited to 'noncore/net/opietooth/manager/bluebase.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 5d742b7..cc51405 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -79,7 +79,6 @@ namespace OpieTooth { | |||
79 | readConfig(); | 79 | readConfig(); |
80 | initGui(); | 80 | initGui(); |
81 | 81 | ||
82 | |||
83 | //TESTING | 82 | //TESTING |
84 | ListView2->setRootIsDecorated(true); | 83 | ListView2->setRootIsDecorated(true); |
85 | 84 | ||
@@ -134,12 +133,25 @@ namespace OpieTooth { | |||
134 | 133 | ||
135 | QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>; | 134 | QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>; |
136 | 135 | ||
137 | Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File ); | 136 | QDir deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/"); |
137 | // list of .conf files | ||
138 | QStringList devicesFileList = deviceListSave.entryList(); | ||
138 | 139 | ||
140 | // cut .conf of to get the mac and also read the name entry in it. | ||
139 | 141 | ||
140 | // RemoteDevice *currentDevice = RemoteDevice( , ); | 142 | for ( QStringList::Iterator it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { |
141 | //loadedDevices->append( currentDevice ); | ||
142 | 143 | ||
144 | QString name; | ||
145 | QString mac; | ||
146 | qDebug((*it).latin1() ); | ||
147 | Config conf((*it)); | ||
148 | conf.setGroup("Info"); | ||
149 | name = conf.readEntry("name", "Error"); | ||
150 | qDebug("MAC: " + mac); | ||
151 | qDebug("NAME: " + name); | ||
152 | RemoteDevice currentDevice = RemoteDevice( mac , name ); | ||
153 | loadedDevices->append( ¤tDevice ); | ||
154 | } | ||
143 | addSearchedDevices( *loadedDevices ); | 155 | addSearchedDevices( *loadedDevices ); |
144 | } | 156 | } |
145 | 157 | ||
@@ -191,7 +203,6 @@ namespace OpieTooth { | |||
191 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); | 203 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); |
192 | 204 | ||
193 | return (infoString); | 205 | return (infoString); |
194 | |||
195 | } | 206 | } |
196 | 207 | ||
197 | 208 | ||
@@ -212,7 +223,6 @@ namespace OpieTooth { | |||
212 | QMessageBox* box = new QMessageBox( this, "Test" ); | 223 | QMessageBox* box = new QMessageBox( this, "Test" ); |
213 | box->setText( tr( "Changes applied" ) ); | 224 | box->setText( tr( "Changes applied" ) ); |
214 | box->show(); | 225 | box->show(); |
215 | |||
216 | // falls nötig hcid killhupen - die funktionalität adden | 226 | // falls nötig hcid killhupen - die funktionalität adden |
217 | } | 227 | } |
218 | 228 | ||
@@ -261,7 +271,6 @@ namespace OpieTooth { | |||
261 | */ | 271 | */ |
262 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) { | 272 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) { |
263 | 273 | ||
264 | |||
265 | } | 274 | } |
266 | 275 | ||
267 | /** | 276 | /** |
@@ -305,8 +314,6 @@ namespace OpieTooth { | |||
305 | 314 | ||
306 | QValueList<OpieTooth::Services>::Iterator it2; | 315 | QValueList<OpieTooth::Services>::Iterator it2; |
307 | 316 | ||
308 | |||
309 | |||
310 | QListViewItem * serviceItem; | 317 | QListViewItem * serviceItem; |
311 | 318 | ||
312 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { | 319 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { |
@@ -332,7 +339,6 @@ namespace OpieTooth { | |||
332 | bool BlueBase::deviceActive( RemoteDevice *device ) { | 339 | bool BlueBase::deviceActive( RemoteDevice *device ) { |
333 | 340 | ||
334 | // search by mac | 341 | // search by mac |
335 | // | ||
336 | localDevice->isAvailable( device->mac() ); | 342 | localDevice->isAvailable( device->mac() ); |
337 | 343 | ||
338 | return true; | 344 | return true; |
@@ -365,6 +371,5 @@ namespace OpieTooth { | |||
365 | BlueBase::~BlueBase() { | 371 | BlueBase::~BlueBase() { |
366 | writeSavedDevices(); | 372 | writeSavedDevices(); |
367 | } | 373 | } |
368 | |||
369 | } | 374 | } |
370 | 375 | ||