[kmobiletools] KDE/kdepim/kmobiletools/kmobiletools
Matthias Lechner
matthias at lmme.de
Sun Jun 10 12:09:13 CEST 2007
SVN commit 673461 by lechner:
Rename smsList() to setSMSList().
Calling setSMSList() now causes sync() to be called internally.
M +1 -1 engines/at_engine/at_engine.cpp
M +3 -3 libkmobiletools/enginedata.cpp
M +4 -6 libkmobiletools/enginedata.h
M +1 -1 libkmobiletools/homepage.cpp
M +10 -10 mainpart/devicehome.cpp
M +1 -1 mainpart/devicehome.h
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/at_engine/at_engine.cpp #673460:673461
@@ -169,7 +169,7 @@
break;
case KMobileTools::Job::fetchSMS:
if( ((FetchSMS*) job)->last()) {
- engineData()->smsList()->sync( ((FetchSMS*)job)->smsList );
+ engineData()->setSMSList( ((FetchSMS*)job)->smsList );
queue_sms=false;
}
// emit smsListUpdated();
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/enginedata.cpp #673460:673461
@@ -129,12 +129,12 @@
return d->p_calendar;
}
-const SMSList* EngineData::constSMSList() const {
+const SMSList* EngineData::smsList() const {
return d->p_smsList;
}
-SMSList* EngineData::smsList() const {
- return d->p_smsList;
+void EngineData::setSMSList( SMSList *smsList ) {
+ d->p_smsList->sync( smsList );
}
ContactsList *EngineData::contactsList() const { return d->p_addresseeList; }
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/enginedata.h #673460:673461
@@ -241,20 +241,18 @@
void setContactsList( ContactsList* contactsList );
/**
- * Returns the fetched sms list for reading and writing
+ * Sets the current list of sms
*
- * @return a SMSList object containing all fetched SMS.
- *
+ * @param smsList the current list of sms
*/
- SMSList* smsList() const;
+ void setSMSList( SMSList* smsList );
/**
* Returns the fetched sms list for reading
*
* @return a SMSList object containing all fetched SMS.
- *
*/
- const SMSList* constSMSList() const;
+ const SMSList* smsList() const;
/**
* Retrieves the phone calendar.
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/homepage.cpp #673460:673461
@@ -233,7 +233,7 @@
default:
if( engine->constEngineData()->phoneConnected() )
{
- const SMSList *l=engine->constEngineData()->constSMSList();
+ const SMSList *l=engine->constEngineData()->smsList();
htmlData+="<ul><li><b>%8</b></li></ul><p>%1 %2</p><p>%3 %4</p><div align='right'><a href=\"infopage:1\">%7</a></div>";
htmlData=htmlData
.arg( QString("<a href=\"%1:sms\">").arg( devname ) +
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/devicehome.cpp #673460:673461
@@ -330,7 +330,7 @@
connect(engine, SIGNAL(fullPhonebook()), this, SLOT(fullPhonebook()) );
connect(p_smsPart, SIGNAL(getSMSList() ), engine, SLOT( slotFetchSMS() ) );
connect(p_smsPart, SIGNAL(remove( SMS* ) ), engine, SLOT(slotDelSMS( SMS* ) ) );
- connect(engine->constEngineData()->constSMSList(), SIGNAL(updated()), this, SLOT(updateSMSList() ) );
+ connect(engine->constEngineData()->smsList(), SIGNAL(updated()), this, SLOT(updateSMSList() ) );
connect(engine, SIGNAL(jobFinished(KMobileTools::Job::JobType)), this, SLOT(jobDone(KMobileTools::Job::JobType)));
#ifdef HAVE_KCAL
connect(engine, SIGNAL(calendarParsed() ), this, SLOT(slotCalendarFetched() ) );
@@ -475,7 +475,7 @@
void DeviceHome::jobDone(KMobileTools::Job::JobType jobtype)
{
if(jobtype==KMobileTools::Job::fetchAddressBook) emit phonebookUpdated();
- int newsmscnt=engine->constEngineData()->constSMSList()->count(SMS::Unread, SMS::SIM | SMS::Phone );
+ int newsmscnt=engine->constEngineData()->smsList()->count(SMS::Unread, SMS::SIM | SMS::Phone );
if(newsmscnt && engine->ThreadWeaver()->isEmpty() && engine->ThreadWeaver()->isIdle() && newsmscnt!=smsnotifynum) {
smsnotifynum=newsmscnt;
@@ -782,7 +782,7 @@
updateSMSCount();
home->printInfoPage( home->currentInfoPage(), engine );
kDebug( ) << "DeviceHome::smsAdded(" << smsUID << ")\n";
- const SMSList *smsList = engine->constEngineData()->constSMSList();
+ const SMSList *smsList = engine->constEngineData()->smsList();
int newSMSIndex=smsList->find( smsUID );
if(newSMSIndex<0) return;
SMS *newSMS=smsList->at(newSMSIndex);
@@ -811,7 +811,7 @@
// return;
updateSMSCount();
home->printInfoPage( home->currentInfoPage(), engine );
- const SMSList *smsList = engine->constEngineData()->constSMSList();
+ const SMSList *smsList = engine->constEngineData()->smsList();
int oldSMSIndex=smsList->find( smsUID );
if(oldSMSIndex<0) return;
SMS *oldSMS=smsList->at(oldSMSIndex);
@@ -847,7 +847,7 @@
{
ui.SMSListView->clear();
- QListIterator<SMS*> it( *(engine->constEngineData()->constSMSList()) );
+ QListIterator<SMS*> it( *(engine->constEngineData()->smsList()) );
while( it.hasNext() )
{
@@ -917,13 +917,13 @@
void DeviceHome::updateSMSCount()
{
if(!engine) return;
- engine->constEngineData()->constSMSList()->calcSMSNumber();
+ engine->constEngineData()->smsList()->calcSMSNumber();
Q3ListViewItemIterator it( ui.SMSFolderView );
SMSFolderListViewItem *tempItem;
while ( it.current() ) {
tempItem=(SMSFolderListViewItem*) it.current();
- tempItem->setText(1, QString::number(engine->constEngineData()->constSMSList()->count( ( tempItem->smsType() & (SMS::Unread | SMS::Unsent) ), tempItem->memSlot() ) ) );
- tempItem->setText(2,QString::number(engine->constEngineData()->constSMSList()->count( tempItem->smsType(), tempItem->memSlot() ) ) );
+ tempItem->setText(1, QString::number(engine->constEngineData()->smsList()->count( ( tempItem->smsType() & (SMS::Unread | SMS::Unsent) ), tempItem->memSlot() ) ) );
+ tempItem->setText(2,QString::number(engine->constEngineData()->smsList()->count( tempItem->smsType(), tempItem->memSlot() ) ) );
++it;
}
}
@@ -1022,7 +1022,7 @@
{
// if ( KMobileTools::MainConfig::self()->maildir() )
KMobileTools::KMobiletoolsHelper::createMailDir( objectName() );
- engine->constEngineData()->constSMSList()->saveToMailBox();
+ engine->constEngineData()->smsList()->saveToMailBox();
kDebug() << "STARTING SMS EXPORT\n";
KMessageBox::information( m_widget, i18n("<qt>SMS List for the mobile phone <b>%1</b> was exported to KMail default directory (%2).<br>To view exported messages, close and reopen KMail.</qt>", DEVCFG(objectName() )->devicename(), DEVCFG(objectName() )->maildir_path() ), i18n("SMS List Exported."), "smslistexported_infobox" );
}
@@ -1035,7 +1035,7 @@
int result;
kDebug() << "STARTING SMS EXPORT TO CSV\n";
- result = engine->constEngineData()->constSMSList()->saveToCSV();
+ result = engine->constEngineData()->smsList()->saveToCSV();
if (result >= 1) {
KMessageBox::information( m_widget, i18n("<qt>SMS List for the mobile phone <b>%1</b> was exported to the selected Directory.</qt>", DEVCFG(objectName() )->devicename() ), i18n("SMS List Exported."), "smslistexportedtocsv_infobox" );
}
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/devicehome.h #673460:673461
@@ -131,7 +131,7 @@
bool openFile() { return false; }
QWidget *widget() { return m_widget;}
QList<QAction*> actionList() { return l_actionList;}
- const SMSList *smsList() { return engine->constEngineData()->constSMSList(); }
+ const SMSList *smsList() { return engine->constEngineData()->smsList(); }
void setupWidgets();
kmobiletoolsMainPart *parent() { return (kmobiletoolsMainPart *) QObject::parent(); }
KCal::CalendarLocal * calendar() { return p_calendar; }
More information about the kmobiletools
mailing list