summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-07-17 00:38:43 (UTC)
committer ulf69 <ulf69>2004-07-17 00:38:43 (UTC)
commit01570860c92be8977a1ba558ae7c5f15d4635851 (patch) (unidiff)
tree2f3fead3ad0d2b0185d032fb3982c32c4fa15904
parent2439711b1ac7ee38269baff704293eb37a27f6c9 (diff)
downloadkdepimpi-01570860c92be8977a1ba558ae7c5f15d4635851.zip
kdepimpi-01570860c92be8977a1ba558ae7c5f15d4635851.tar.gz
kdepimpi-01570860c92be8977a1ba558ae7c5f15d4635851.tar.bz2
implementation of sharp import/export resourcehandling
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.h10
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmE.pro2
-rw-r--r--kaddressbook/xxport/qtopia/qtopia_xxport.cpp49
3 files changed, 30 insertions, 31 deletions
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.h b/kabc/plugins/sharpdtm/resourcesharpdtm.h
index 32d0be1..d2e2a52 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.h
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.h
@@ -40,7 +40,7 @@ $Id$
40namespace KABC { 40namespace KABC {
41 41
42class ResourceConfigWidget; 42class ResourceConfigWidget;
43class QtopiaConverter; 43class SharpDTMConverter;
44 44
45/** 45/**
46 @internal 46 @internal
@@ -83,7 +83,7 @@ public:
83 * Closes the file again. 83 * Closes the file again.
84 */ 84 */
85 virtual void doClose(); 85 virtual void doClose();
86 86
87 /** 87 /**
88 * Requests a save ticket, that is used by @ref save() 88 * Requests a save ticket, that is used by @ref save()
89 */ 89 */
@@ -135,12 +135,12 @@ protected:
135 void unlock( const QString &fileName ); 135 void unlock( const QString &fileName );
136 136
137private: 137private:
138 QtopiaConverter* mConverter; 138 SharpDTMConverter* mConverter;
139 139
140 QString mFileName; 140 QString mFileName;
141 141
142 QString mLockUniqueName; 142 QString mLockUniqueName;
143 143
144 KDirWatch mDirWatch; 144 KDirWatch mDirWatch;
145}; 145};
146 146
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index f29be2f..7c7a6d5 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -3,7 +3,7 @@ CONFIG += qt warn_on
3#release debug 3#release debug
4TARGET = microkabc_sharpdtm 4TARGET = microkabc_sharpdtm
5 5
6INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/qtopia ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 6INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
7 7
8 8
9OBJECTS_DIR = obj/$(PLATFORM) 9OBJECTS_DIR = obj/$(PLATFORM)
diff --git a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp
index bf39fdb..c1ed03e 100644
--- a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp
+++ b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp
@@ -88,9 +88,9 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
88{ 88{
89 // we can not choose the filename. Therefore use the default to display 89 // we can not choose the filename. Therefore use the default to display
90 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; 90 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
91 91
92 AddressBookAccess* access = new AddressBookAccess(); 92 AddressBookAccess* access = new AddressBookAccess();
93 93
94 if ( !access ) { 94 if ( !access ) {
95 QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) ); 95 QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
96 qDebug(text.latin1()); 96 qDebug(text.latin1());
@@ -100,7 +100,7 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
100 } 100 }
101 101
102 KABC::QtopiaConverter mConverter; 102 KABC::QtopiaConverter mConverter;
103 103
104 bool res = mConverter.init(); 104 bool res = mConverter.init();
105 if (!res) 105 if (!res)
106 { 106 {
@@ -108,11 +108,11 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
108 qDebug(text); 108 qDebug(text);
109 KMessageBox::error( parentWidget(), text ); 109 KMessageBox::error( parentWidget(), text );
110 delete access; 110 delete access;
111 return false; 111 return false;
112 } 112 }
113 113
114 //Now check if the file has already entries, and ask the user if he wants to delete them first. 114 //Now check if the file has already entries, and ask the user if he wants to delete them first.
115 { //create a new scope 115 { //create a new scope
116 AddressBookIterator it(*access); 116 AddressBookIterator it(*access);
117 const PimContact* firstcontact = it.toFirst(); 117 const PimContact* firstcontact = it.toFirst();
118 if (firstcontact) 118 if (firstcontact)
@@ -128,32 +128,31 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
128 } 128 }
129 } 129 }
130 } 130 }
131 131
132 KABC::Addressee::List::ConstIterator it; 132 KABC::Addressee::List::ConstIterator it;
133 for ( it = list.begin(); it != list.end(); ++it ) { 133 for ( it = list.begin(); it != list.end(); ++it ) {
134 PimContact c; 134 PimContact c;
135 KABC::Addressee addressee = (*it); 135
136
137 res = mConverter.addresseeToQtopia( *it, c ); 136 res = mConverter.addresseeToQtopia( *it, c );
138 if (res == true) 137 if (res == true)
139 { 138 {
140 access->addContact(c); 139 access->addContact(c);
141 } 140 }
142 } 141 }
143 142
144 delete access; 143 delete access;
145 144
146 return true; 145 return true;
147} 146}
148 147
149KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const 148KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
150{ 149{
151 KABC::AddresseeList adrlst; 150 KABC::AddresseeList adrlst;
152 151
153 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; 152 QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
154 153
155 AddressBookAccess* access = new AddressBookAccess(); 154 AddressBookAccess* access = new AddressBookAccess();
156 155
157 if ( !access ) { 156 if ( !access ) {
158 QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) ); 157 QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
159 qDebug(text.latin1()); 158 qDebug(text.latin1());
@@ -161,7 +160,7 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
161 KMessageBox::error( parentWidget(), text ); 160 KMessageBox::error( parentWidget(), text );
162 return KABC::AddresseeList(); 161 return KABC::AddresseeList();
163 } 162 }
164 163
165 KABC::QtopiaConverter mConverter; 164 KABC::QtopiaConverter mConverter;
166 165
167 bool res = mConverter.init(); 166 bool res = mConverter.init();
@@ -173,29 +172,29 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
173 delete access; 172 delete access;
174 return KABC::AddresseeList(); 173 return KABC::AddresseeList();
175 } 174 }
176 175
177 176
178 177
179 { //create a new scope 178 { //create a new scope
180 AddressBookIterator it(*access); 179 AddressBookIterator it(*access);
181 180
182 for (it.toFirst(); it.current(); ++it) { 181 for (it.toFirst(); it.current(); ++it) {
183 const PimContact*contact = it.current(); 182 const PimContact*contact = it.current();
184 183
185 KABC::Addressee addressee; 184 KABC::Addressee addressee;
186 185
187 res = mConverter.qtopiaToAddressee( (*contact), addressee ); 186 res = mConverter.qtopiaToAddressee( (*contact), addressee );
188 187
189 if ( !addressee.isEmpty() && res ) 188 if ( !addressee.isEmpty() && res )
190 { 189 {
191 adrlst.append( addressee ); 190 adrlst.append( addressee );
192 } 191 }
193 } 192 }
194 } 193 }
195 194
196 delete access; 195 delete access;
197//US the deletion of the access object deletes the backend object as well. 196//US the deletion of the access object deletes the backend object as well.
198 197
199 return adrlst; 198 return adrlst;
200 199
201} 200}