[kmobiletools] KDE/kdepim/kmobiletools/kmobiletools

[Matthias Lechner]

SVN commit 673313 by lechner:

It's getting too late for me ;-) correcting some signal-slot connections

 M  +1 -1      engines/at_engine/at_engine.cpp  
 M  +45 -13    libkmobiletools/enginedata.cpp  
 M  +4 -2      libkmobiletools/engineslist.cpp  


--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/at_engine/at_engine.cpp #673312:673313
@@ -55,7 +55,7 @@
     device=NULL;
 //     p_smsList = new SMSList();
     queue_sms=false;
-    connect( this, SIGNAL(engineData()->connected()), this, SLOT(slotFetchInfos()) );
+    connect( this->engineData(), SIGNAL(connected()), this, SLOT(slotFetchInfos()) );
 }
 
 
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/enginedata.cpp #673312:673313
@@ -77,26 +77,58 @@
 
 #include "enginedata.moc"
 
-QString EngineData::manufacturer() const { return d->s_manufacturer;}
-void EngineData::setManufacturer(const QString &s) { d->s_manufacturer=s;}
+QString EngineData::manufacturer() const {
+    return d->s_manufacturer;
+}
 
-void EngineData::setManufacturerID(int i) { d->i_manufacturer=i; }
-int EngineData::manufacturerID() const { return d->i_manufacturer; }
+void EngineData::setManufacturer( const QString &s ) {
+    d->s_manufacturer=s;
+}
 
-void EngineData::setModel(const QString &s) { d->s_model=s;}
-QString EngineData::model() const { return d->s_model; }
+void EngineData::setManufacturerID( int i ) {
+    d->i_manufacturer=i;
+}
 
-void EngineData::setIMEI(const QString &s) { d->s_imei=s;}
-QString EngineData::imei() const { return d->s_imei; }
+int EngineData::manufacturerID() const {
+    return d->i_manufacturer;
+}
 
-void EngineData::setSMSCenter(const QString &s) { d->s_smscenter=s;}
-QString EngineData::smsCenter() const { return d->s_smscenter;}
+void EngineData::setModel( const QString &s ) {
+    d->s_model=s;
+}
 
-void EngineData::setRevision(const QString &s) { d->s_revision=s;}
-QString EngineData::revision() const { return d->s_revision; }
+QString EngineData::model() const {
+    return d->s_model;
+}
 
-KCal::Event::List *EngineData::calendar() { return d->p_calendar; }
+void EngineData::setIMEI( const QString &s ) {
+    d->s_imei=s;
+}
 
+QString EngineData::imei() const {
+    return d->s_imei;
+}
+
+void EngineData::setSMSCenter( const QString &s ){
+    d->s_smscenter=s;
+}
+
+QString EngineData::smsCenter() const {
+    return d->s_smscenter;
+}
+
+void EngineData::setRevision( const QString &s ) {
+    d->s_revision=s;
+}
+
+QString EngineData::revision() const {
+    return d->s_revision;
+}
+
+KCal::Event::List *EngineData::calendar() {
+    return d->p_calendar;
+}
+
 const SMSList* EngineData::constSMSList() const {
     return d->p_smsList;
 }
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/engineslist.cpp #673312:673313
@@ -19,6 +19,7 @@
  ***************************************************************************/
 #include "engineslist.h"
 #include "devicesconfig.h"
+#include "enginedata.h"
 
 #include "weaver.h"
 #include "engine.h"
@@ -82,14 +83,15 @@
 void KMobileTools::EnginesList::append( KMobileTools::Engine* item )
 {
     emit engineAdded( item );
-    connect(item, SIGNAL(constEngineData()->phoneBookChanged()), this, SIGNAL(phonebookUpdated() ));
+    connect(item->constEngineData(), SIGNAL(phoneBookChanged()), this, SIGNAL( phonebookUpdated() ));
+
     QList<KMobileTools::Engine*>::append(item);
 }
 
 void KMobileTools::EnginesList::remove( KMobileTools::Engine* item )
 {
     emit engineRemoved( item );
-    disconnect(item, SIGNAL(constEngineData()->phoneBookChanged()), this, SIGNAL(phonebookUpdated() ));
+    disconnect(item->constEngineData(), SIGNAL(phoneBookChanged()), this, SIGNAL(phonebookUpdated() ));
     QList<KMobileTools::Engine*>::removeAll(item);
 }
 /*