summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp55
-rw-r--r--kmicromail/viewmail.cpp4
-rw-r--r--korganizer/calendarview.cpp5
-rw-r--r--korganizer/koprefs.cpp6
-rw-r--r--korganizer/mainwindow.cpp4
-rw-r--r--libkcal/phoneformat.cpp4
-rw-r--r--version2
7 files changed, 21 insertions, 59 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2e408b7..11eeabc 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -707,9 +707,9 @@ void KABCore::export2phone()
}
QString KABCore::getPhoneFile()
{
-#ifdef _WIN32_
+#ifdef DESKTOP_VERSION
return locateLocal("tmp", "phonefile.vcf");
#else
return "/tmp/phonefile.vcf";
#endif
@@ -731,56 +731,17 @@ void KABCore::beamVCard()
void KABCore::beamVCard(const QStringList& uids)
{
-/*US
- QString beamFilename;
- Opie::OPimContact c;
- if ( actionPersonal->isOn() ) {
- beamFilename = addressbookPersonalVCardName();
- if ( !QFile::exists( beamFilename ) )
- return; // can't beam a non-existent file
- Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
- beamFilename );
- Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
- Opie::OPimContactAccess::List allList = access->allRecords();
- Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first
- c = *it;
-
- delete access;
- } else {
- unlink( beamfile ); // delete if exists
- mkdir("/tmp/obex/", 0755);
- c = m_abView -> currentEntry();
- Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
- beamfile );
- Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
- access->add( c );
- access->save();
- delete access;
-
- beamFilename = beamfile;
- }
-
- owarn << "Beaming: " << beamFilename << oendl;
-*/
-
-#if 0
- QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
-
- QString dirName = tmpdir + "/" + KApplication::randomString( 8 );
- QString name = "contact.vcf";
+ // LR: we should use the /tmp dir on the Zaurus,
+ // because: /tmp = RAM, (HOME)/kdepim = flash memory
- QString fileName = dirName + "/" + name;
-#endif
- // LR: we should use the /tmp dir, because: /tmp = RAM, (HOME)/kdepim = flash memory
- //
+#ifdef DESKTOP_VERSION
+ QString fileName = locateLocal("tmp", "kapibeamfile.vcf");
+#else
QString fileName = "/tmp/kapibeamfile.vcf";
-
-
- //QDir().mkdir( dirName, true );
-
+#endif
KABC::VCardConverter converter;
QString description;
QString datastream;
@@ -2861,9 +2822,9 @@ void KABCore::syncFileRequest()
mAddressBook->export2File( sentSyncFile() );
}
QString KABCore::sentSyncFile()
{
-#ifdef _WIN32_
+#ifdef DESKTOP_VERSION
return locateLocal( "tmp", "copysyncab.vcf" );
#else
return QString( "/tmp/copysyncab.vcf" );
#endif
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 6e560d7..32a3b7c 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -252,9 +252,13 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
break ;
case 2:
{
+#ifdef DESKTOP_VERSION
+ QString tmpfile = locateLocal( "tmp", "opiemail-image");
+#else
QString tmpfile = "/tmp/opiemail-image";
+#endif
encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
if (content) {
QFile output(tmpfile);
output.open(IO_WriteOnly);
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 290c0b9..884c61a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2302,10 +2302,13 @@ void CalendarView::beamFilteredCalendar()
void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
{
if ( beamDialog->exec () == QDialog::Rejected )
return;
-
+#ifdef DESKTOP_VERSION
+ QString fn = locateLocal( "tmp", "kopibeamfile" );
+#else
QString fn = "/tmp/kopibeamfile";
+#endif
QString mes;
bool createbup = true;
if ( createbup ) {
QString description = "\n";
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 651442b..258f738 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -201,14 +201,8 @@ KOPrefs::KOPrefs() :
QString hdp= locateLocal("data","korganizer")+"\\\\";
#else
QString hdp= locateLocal("data","korganizer")+"/";
#endif
-// addItemString("RemoteIP",&mRemoteIP, "192.168.0.65");
-// addItemString("RemoteUser",&mRemoteUser, "zaurus");
-// addItemString("RemotePassWd",&mRemotePassWd, "");
-// addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics");
-// addItemString("LocalTempFile",&mLocalTempFile, "/tmp/tempsyncfile.ics" );
-
KPrefs::setCurrentGroup("LoadSaveFileNames");
addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 06470b8..c3e9f75 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1213,12 +1213,12 @@ QString MainWindow::defaultFileName()
return locateLocal( "data", "korganizer/mycalendar.ics" );
}
QString MainWindow::syncFileName()
{
-#ifdef _WIN32_
+#ifdef DESKTOP_VERSION
return locateLocal( "tmp", "synccalendar.ics" );
#else
- return QString( "/tmp/kopitempfile.ics" );
+ return QString( "/tmp/synccalendar.ics" );
#endif
}
void MainWindow::processIncidenceSelection( Incidence *incidence )
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 101db57..900fc04 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -289,9 +289,9 @@ ulong PhoneFormat::getCsum( const QStringList & attList)
bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
{
QString fileName;
-#ifdef _WIN32_
+#ifdef DESKTOP_VERSION
fileName = locateLocal("tmp", "phonefile.vcs");
#else
fileName = "/tmp/phonefile.vcs";
#endif
@@ -476,9 +476,9 @@ void PhoneFormat::afterSave( Incidence* inc,const QString& id ,const QString& cs
}
bool PhoneFormat::writeToPhone( Calendar * calendar)
{
-#ifdef _WIN32_
+#ifdef DESKTOP_VERSION
QString fileName = locateLocal("tmp", "phonefile.vcs");
#else
QString fileName = "/tmp/phonefile.vcs";
#endif
diff --git a/version b/version
index de8a794..0c43deb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.8";
+version = "1.9.9";