[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim/KDE/4.14] kaddressbook: Make it as a real class
From: Montel Laurent <montel () kde ! org>
Date: 2015-03-31 21:02:09
Message-ID: E1Yd3IX-0007sd-Nc () scm ! kde ! org
[Download RAW message or body]
Git commit 39b4a22ef19047fdc9f7e1fdd18b7166f2ef2764 by Montel Laurent.
Committed on 31/03/2015 at 21:00.
Pushed by mlaurent into branch 'KDE/4.14'.
Make it as a real class
M +35 -5 kaddressbook/contactlist.cpp
M +12 -2 kaddressbook/contactlist.h
M +4 -4 kaddressbook/contactselectionwidget.cpp
M +1 -1 kaddressbook/printing/printingwizard.cpp
M +3 -3 kaddressbook/xxport/csv/csv_xxport.cpp
M +3 -3 kaddressbook/xxport/gmx/gmx_xxport.cpp
M +1 -1 kaddressbook/xxport/ldap/ldap_xxport.cpp
M +6 -2 kaddressbook/xxport/ldif/ldif_xxport.cpp
M +2 -2 kaddressbook/xxport/vcard/vcard_xxport.cpp
M +6 -6 kaddressbook/xxport/xxportmanager.cpp
http://commits.kde.org/kdepim/39b4a22ef19047fdc9f7e1fdd18b7166f2ef2764
diff --git a/kaddressbook/contactlist.cpp b/kaddressbook/contactlist.cpp
index 50d88fd..95fa674 100644
--- a/kaddressbook/contactlist.cpp
+++ b/kaddressbook/contactlist.cpp
@@ -27,17 +27,47 @@ ContactList::ContactList()
bool ContactList::isEmpty() const
{
- return (addressList.isEmpty() && contactGroupList.isEmpty());
+ return (mAddressList.isEmpty() && mContactGroupList.isEmpty());
}
int ContactList::count() const
{
- return (addressList.count() + contactGroupList.count());
+ return (mAddressList.count() + mContactGroupList.count());
}
-
void ContactList::clear()
{
- addressList.clear();
- contactGroupList.clear();
+ mAddressList.clear();
+ mContactGroupList.clear();
+}
+
+void ContactList::append(const KABC::Addressee &addr)
+{
+ mAddressList.append(addr);
+}
+
+void ContactList::append(const KABC::ContactGroup &group)
+{
+ mContactGroupList.append(group);
+}
+
+KABC::ContactGroup::List ContactList::contactGroupList() const
+{
+ return mContactGroupList;
}
+
+void ContactList::setContactGroupList(const KABC::ContactGroup::List &value)
+{
+ mContactGroupList = value;
+}
+
+KABC::Addressee::List ContactList::addressList() const
+{
+ return mAddressList;
+}
+
+void ContactList::setAddressList(const KABC::Addressee::List &value)
+{
+ mAddressList = value;
+}
+
diff --git a/kaddressbook/contactlist.h b/kaddressbook/contactlist.h
index 468b1be..01efc28 100644
--- a/kaddressbook/contactlist.h
+++ b/kaddressbook/contactlist.h
@@ -32,8 +32,18 @@ public:
bool isEmpty() const;
int count() const;
void clear();
- KABC::Addressee::List addressList;
- KABC::ContactGroup::List contactGroupList;
+
+ void append(const KABC::Addressee &addr);
+ void append(const KABC::ContactGroup &group);
+
+ KABC::Addressee::List addressList() const;
+ void setAddressList(const KABC::Addressee::List &value);
+ KABC::ContactGroup::List contactGroupList() const;
+ void setContactGroupList(const KABC::ContactGroup::List &value);
+
+private:
+ KABC::Addressee::List mAddressList;
+ KABC::ContactGroup::List mContactGroupList;
};
#endif // CONTACTLIST_H
diff --git a/kaddressbook/contactselectionwidget.cpp \
b/kaddressbook/contactselectionwidget.cpp index 395d8c2..0a78b7c 100644
--- a/kaddressbook/contactselectionwidget.cpp
+++ b/kaddressbook/contactselectionwidget.cpp
@@ -177,7 +177,7 @@ ContactList ContactSelectionWidget::collectAllContacts() const
foreach ( const Akonadi::Item &item, job->items() ) {
if ( item.isValid() ) {
if (item.hasPayload<KABC::Addressee>() ) {
- contacts.addressList.append( item.payload<KABC::Addressee>() );
+ contacts.append( item.payload<KABC::Addressee>() );
}
}
}
@@ -198,7 +198,7 @@ ContactList ContactSelectionWidget::collectSelectedContacts() \
const
index.data( Akonadi::EntityTreeModel::ItemRole \
).value<Akonadi::Item>(); if ( item.isValid() ) {
if (item.hasPayload<KABC::Addressee>() ) {
- contacts.addressList.append( item.payload<KABC::Addressee>() );
+ contacts.append( item.payload<KABC::Addressee>() );
}
}
}
@@ -228,7 +228,7 @@ ContactList ContactSelectionWidget::collectAddressBookContacts() \
const
foreach ( const Akonadi::Item &item, job->items() ) {
if ( item.hasPayload<KABC::Addressee>() ) {
- contacts.addressList.append( item.payload<KABC::Addressee>() );
+ contacts.append( item.payload<KABC::Addressee>() );
}
}
} else {
@@ -241,7 +241,7 @@ ContactList ContactSelectionWidget::collectAddressBookContacts() \
const
foreach ( const Akonadi::Item &item, job->items() ) {
if ( item.hasPayload<KABC::Addressee>() ) {
- contacts.addressList.append( item.payload<KABC::Addressee>() );
+ contacts.append( item.payload<KABC::Addressee>() );
}
}
}
diff --git a/kaddressbook/printing/printingwizard.cpp \
b/kaddressbook/printing/printingwizard.cpp index 55e371a..0d59d72 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -224,7 +224,7 @@ void PrintingWizard::print()
setCurrentPage( progressItem );
kapp->processEvents();
- KABC::Addressee::List contacts = mSelectionPage->selectedContacts().addressList;
+ KABC::Addressee::List contacts = \
mSelectionPage->selectedContacts().addressList();
const ContactSorter sorter( mStylePage->sortField(), mStylePage->sortOrder() );
sorter.sort( contacts );
diff --git a/kaddressbook/xxport/csv/csv_xxport.cpp \
b/kaddressbook/xxport/csv/csv_xxport.cpp index ff2fe19..18602da 100644
--- a/kaddressbook/xxport/csv/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv/csv_xxport.cpp
@@ -69,7 +69,7 @@ bool CsvXXPort::exportContacts(const ContactList &contacts , \
VCardExportSelectio return false;
}
- exportToFile( &tmpFile, contacts.addressList );
+ exportToFile( &tmpFile, contacts.addressList() );
tmpFile.flush();
return KIO::NetAccess::upload( tmpFile.fileName(), url, parentWidget() );
@@ -82,7 +82,7 @@ bool CsvXXPort::exportContacts(const ContactList &contacts , \
VCardExportSelectio return false;
}
- exportToFile( &file, contacts.addressList );
+ exportToFile( &file, contacts.addressList() );
file.close();
return true;
@@ -153,7 +153,7 @@ ContactList CsvXXPort::importContacts() const
ContactList contactList;
QPointer<CSVImportDialog> dlg = new CSVImportDialog( parentWidget() );
if ( dlg->exec() && dlg ) {
- contactList.addressList = dlg->contacts();
+ contactList.setAddressList(dlg->contacts());
}
delete dlg;
diff --git a/kaddressbook/xxport/gmx/gmx_xxport.cpp \
b/kaddressbook/xxport/gmx/gmx_xxport.cpp index d35e29d..a48c683 100644
--- a/kaddressbook/xxport/gmx/gmx_xxport.cpp
+++ b/kaddressbook/xxport/gmx/gmx_xxport.cpp
@@ -336,7 +336,7 @@ ContactList GMXXXPort::importContacts() const
}
file.close();
- contactList.addressList = addresseeList;
+ contactList.setAddressList(addresseeList);
return contactList;
}
@@ -374,7 +374,7 @@ bool GMXXXPort::exportContacts( const ContactList &list, \
VCardExportSelectionWid return false;
}
- doExport( &tmpFile, list.addressList );
+ doExport( &tmpFile, list.addressList() );
tmpFile.flush();
return KIO::NetAccess::upload( tmpFile.fileName(), url, parentWidget() );
@@ -388,7 +388,7 @@ bool GMXXXPort::exportContacts( const ContactList &list, \
VCardExportSelectionWid return false;
}
- doExport( &file, list.addressList );
+ doExport( &file, list.addressList() );
file.close();
return true;
diff --git a/kaddressbook/xxport/ldap/ldap_xxport.cpp \
b/kaddressbook/xxport/ldap/ldap_xxport.cpp index 83e3f44..060daa2 100644
--- a/kaddressbook/xxport/ldap/ldap_xxport.cpp
+++ b/kaddressbook/xxport/ldap/ldap_xxport.cpp
@@ -40,7 +40,7 @@ ContactList LDAPXXPort::importContacts() const
QPointer<KLDAP::LdapSearchDialog> dlg = new KLDAP::LdapSearchDialog( \
parentWidget() );
if ( dlg->exec() && dlg ) {
- contactList.addressList = dlg->selectedContacts();
+ contactList.setAddressList(dlg->selectedContacts());
}
delete dlg;
diff --git a/kaddressbook/xxport/ldif/ldif_xxport.cpp \
b/kaddressbook/xxport/ldif/ldif_xxport.cpp index 71d4715..fc372c2 100644
--- a/kaddressbook/xxport/ldif/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif/ldif_xxport.cpp
@@ -52,7 +52,7 @@
void doExport( QFile *file, const ContactList &list )
{
QString data;
- KABC::LDIFConverter::addresseeAndContactGroupToLDIF( list.addressList, \
list.contactGroupList, data ); + \
KABC::LDIFConverter::addresseeAndContactGroupToLDIF( list.addressList(), \
list.contactGroupList(), data );
QTextStream stream( file );
stream.setCodec( "UTF-8" );
@@ -85,7 +85,11 @@ ContactList LDIFXXPort::importContacts() const
const QString wholeFile = stream.readAll();
const QDateTime dtDefault = QFileInfo( file ).lastModified();
file.close();
- KABC::LDIFConverter::LDIFToAddressee( wholeFile, contactList.addressList, \
contactList.contactGroupList, dtDefault ); + KABC::ContactGroup::List lstGroup;
+ KABC::Addressee::List lstAddresses;
+ KABC::LDIFConverter::LDIFToAddressee( wholeFile, lstAddresses, lstGroup, \
dtDefault ); + contactList.setAddressList(lstAddresses);
+ contactList.setContactGroupList(lstGroup);
return contactList;
}
diff --git a/kaddressbook/xxport/vcard/vcard_xxport.cpp \
b/kaddressbook/xxport/vcard/vcard_xxport.cpp index 4713167..a4c4ed8 100644
--- a/kaddressbook/xxport/vcard/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard/vcard_xxport.cpp
@@ -61,7 +61,7 @@ bool VCardXXPort::exportContacts( const ContactList &contacts, \
VCardExportSelect KABC::VCardConverter converter;
KUrl url;
- const KABC::Addressee::List list = filterContacts( contacts.addressList, \
exportFields ); + const KABC::Addressee::List list = filterContacts( \
contacts.addressList(), exportFields ); if ( list.isEmpty() ) { // no contact \
selected return true;
}
@@ -235,7 +235,7 @@ ContactList VCardXXPort::importContacts() const
}
}
}
- contactList.addressList = addrList;
+ contactList.setAddressList(addrList);
return contactList;
}
diff --git a/kaddressbook/xxport/xxportmanager.cpp \
b/kaddressbook/xxport/xxportmanager.cpp index 4213ddb..7cc1f39 100644
--- a/kaddressbook/xxport/xxportmanager.cpp
+++ b/kaddressbook/xxport/xxportmanager.cpp
@@ -147,17 +147,17 @@ void XXPortManager::import(const ContactList &contacts)
mImportProgressDialog->show();
- for ( int i = 0; i < contacts.addressList.count(); ++i ) {
+ for ( int i = 0; i < contacts.addressList().count(); ++i ) {
Akonadi::Item item;
- item.setPayload<KABC::Addressee>( contacts.addressList.at( i ) );
+ item.setPayload<KABC::Addressee>( contacts.addressList().at( i ) );
item.setMimeType( KABC::Addressee::mimeType() );
Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob( item, collection \
);
connect( job, SIGNAL(result(KJob*)), SLOT(slotImportJobDone(KJob*)) );
}
- for (int i = 0; i < contacts.contactGroupList.count(); ++i ) {
+ for (int i = 0; i < contacts.contactGroupList().count(); ++i ) {
Akonadi::Item groupItem( KABC::ContactGroup::mimeType() );
- groupItem.setPayload<KABC::ContactGroup>( contacts.contactGroupList.at(i) );
+ groupItem.setPayload<KABC::ContactGroup>( contacts.contactGroupList().at(i) \
);
Akonadi::Job *createJob = new Akonadi::ItemCreateJob( groupItem, collection \
);
connect( createJob, SIGNAL(result(KJob*)), this, \
SLOT(slotImportJobDone(KJob*)) ); @@ -198,7 +198,7 @@ void XXPortManager::slotExport( \
const QString &identifier ) return;
}
- const KABC::AddresseeList contacts = dlg->selectedContacts().addressList;
+ const KABC::AddresseeList contacts = dlg->selectedContacts().addressList();
const VCardExportSelectionWidget::ExportFields exportFields = dlg->exportType();
delete dlg;
@@ -212,7 +212,7 @@ void XXPortManager::slotExport( const QString &identifier )
return;
}
ContactList contactLists;
- contactLists.addressList = contacts;
+ contactLists.setAddressList(contacts);
xxport->exportContacts( contactLists, exportFields );
delete xxport;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic