- Fixed setting of CFLAGS and CXXFLAGS: With --enable-debug, disable -O

 - Removed ccmalloc support. Now using valgrind
 - Added missing mainainer-clean-local targets
 - Fixed uninitialized array in IOwatch, reported by valgrind.
 - Fixed missing definition of LC_ALL if compiling without -O
 - Fixed invalid access to datapump thread (not yet created), reported by
   valgrind.
 - Fixed wrong parameters of QRegExp when using QT 3.x
 - Fixed KTar initialization which has changed in KDE 3.x

10 files changed, 56 insertions, 6 deletions

diff --git a/kde2/doc/Makefile.am b/kde2/doc/Makefile.am
index 43dfa7e..8d0fd41 100644
--- a/kde2/doc/Makefile.am
+++ b/kde2/doc/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = en de kioslave
+
+maintainer-clean-local:
+	rm -f Makefile.in
diff --git a/kde2/doc/de/Makefile.am b/kde2/doc/de/Makefile.am
index 96e877a..4ea6f6d 100644
--- a/kde2/doc/de/Makefile.am
+++ b/kde2/doc/de/Makefile.am
@@ -6,3 +6,6 @@ EXTRA_DIST = index.docbook.in
 
 index.docbook: index.docbook.in
 	cat index.docbook.in | perl -e 'while (<>) { if (/\$$Date:\s+(.*)\s+\$$/) { $$d=$$1; } s/__DATE__/$$d/; s/__VERSION__/$(VERSION)/; print; }' > index.docbook
+
+maintainer-clean-local:
+	rm -f Makefile.in
diff --git a/kde2/doc/en/Makefile.am b/kde2/doc/en/Makefile.am
index 232ee79..f43ce69 100644
--- a/kde2/doc/en/Makefile.am
+++ b/kde2/doc/en/Makefile.am
@@ -6,3 +6,6 @@ EXTRA_DIST = index.docbook.in
 
 index.docbook: index.docbook.in
 	cat index.docbook.in | perl -e 'while (<>) { if (/\$$Date:\s+(.*)\s+\$$/) { $$d=$$1; } s/__DATE__/$$d/; s/__VERSION__/$(VERSION)/; print; }' > index.docbook
+
+maintainer-clean-local:
+	rm -f Makefile.in
diff --git a/kde2/doc/kioslave/Makefile.am b/kde2/doc/kioslave/Makefile.am
index ed0ced8..c29d289 100644
--- a/kde2/doc/kioslave/Makefile.am
+++ b/kde2/doc/kioslave/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = en de
+
+maintainer-clean-local:
+	rm -f Makefile.in
diff --git a/kde2/doc/kioslave/de/Makefile.am b/kde2/doc/kioslave/de/Makefile.am
index fbf8d2f..3906f0b 100644
--- a/kde2/doc/kioslave/de/Makefile.am
+++ b/kde2/doc/kioslave/de/Makefile.am
@@ -2,3 +2,6 @@ KDE_LANG = de
 kiodocdir = $(kde_libs_htmldir)/$(KDE_LANG)/kioslave
 kiodoc_DATA = psion.docbook
 EXTRA_DIST = $(kiodoc_DATA)
+
+maintainer-clean-local:
+	rm -f Makefile.in
diff --git a/kde2/doc/kioslave/en/Makefile.am b/kde2/doc/kioslave/en/Makefile.am
index 52af9e0..5335df3 100644
--- a/kde2/doc/kioslave/en/Makefile.am
+++ b/kde2/doc/kioslave/en/Makefile.am
@@ -2,3 +2,6 @@ KDE_LANG = en
 kiodocdir = $(kde_libs_htmldir)/$(KDE_LANG)/kioslave
 kiodoc_DATA = psion.docbook
 EXTRA_DIST = $(kiodoc_DATA)
+
+maintainer-clean-local:
+	rm -f Makefile.in
diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp
index 64bffd8..18e9374 100644
--- a/kde2/kpsion/kpsion.cpp
+++ b/kde2/kpsion/kpsion.cpp
@@ -28,7 +28,6 @@
 #include "kpsionconfig.h"
 #include "wizards.h"
 
-#include <kapp.h>
 #include <klocale.h>
 #include <kaction.h>
 #include <kstdaction.h>
@@ -180,7 +179,11 @@ psion2unix(const char * const path) {
     QString tmp = path;
     tmp.replace(QRegExp("%"), "%25");
     tmp.replace(QRegExp("/"), "%2f");
+#if QT_VERSION >= 300
+    tmp.replace(QRegExp("\\\\"), "/");
+#else
     tmp.replace(QRegExp("\\"), "/");
+#endif
     return tmp;
 }
 
@@ -909,7 +912,11 @@ doBackup() {
     strftime(tstr, sizeof(tstr), "%Y-%m-%d-%H-%M-%S.tmp.gz",
 	     localtime(&now));
     archiveName += tstr;
+#if KDE_VERSION >= 300
+    backupTgz = new KTar(archiveName, "application/x-gzip");
+#else
     backupTgz = new KTarGz(archiveName);
+#endif
     backupTgz->open(IO_WriteOnly);
     createIndex();
 
@@ -924,7 +931,6 @@ doBackup() {
     for (int i = 0; i < toBackup.size(); i++) {
 	PlpDirent e = toBackup[i];
 	const char *fn = e.getName();
-	QString unixname = psion2unix(fn);
 	QByteArray ba;
 	QDataStream os(ba, IO_WriteOnly);
 
@@ -980,7 +986,8 @@ doBackup() {
 	    break;
 	if (res != rfsv::E_PSI_GEN_NONE)
 	    continue;
-	backupTgz->writeFile(unixname, "root", "root", ba.size(), ba.data());
+	backupTgz->writeFile(psion2unix(fn), "root", "root", ba.size(),
+			     ba.data());
     }
 
     if (!badBackup) {
@@ -1088,7 +1095,11 @@ removeOldBackups(QStringList &drives) {
     while ((fi = it.current())) {
 	kapp->processEvents();
 
+#if KDE_VERSION >= 300
+	KTar tgz(fi->absFilePath());
+#else
 	KTarGz tgz(fi->absFilePath());
+#endif
 	const KTarEntry *te;
 
 	tgz.open(IO_ReadOnly);
@@ -1128,7 +1139,11 @@ removeOldBackups(QStringList &drives) {
     while ((fi = it.current())) {
 	kapp->processEvents();
 
+#if KDE_VERSION >= 300
+	KTar tgz(fi->absFilePath());
+#else
 	KTarGz tgz(fi->absFilePath());
+#endif
 	const KTarEntry *te;
 	bool valid = false;
 	bool del = false;
@@ -1308,7 +1323,11 @@ slotStartRestore() {
 	for (t = tars.begin(); t != tars.end(); t++) {
 	    PlpDir toRestore = restoreDialog.getRestoreList(*t);
 	    if (toRestore.size() > 0) {
+#if KDE_VERSION >= 300
+		KTar tgz(*t);
+#else
 		KTarGz tgz(*t);
+#endif
 		const KTarEntry *te;
 		QString pDir("");
 
@@ -1318,7 +1337,6 @@ slotStartRestore() {
 		    PlpDirent olde;
 
 		    const char *fn = e.getName();
-		    QString unixname = psion2unix(fn);
 		    Enum<rfsv::errs> res;
 
 		    progressLocal = e.getSize();
@@ -1327,7 +1345,7 @@ slotStartRestore() {
 		    emit setProgressText(QString("%1").arg(fn));
 		    emit setProgress(0);
 
-		    te = findTarEntry(tgz.directory(), unixname);
+		    te = findTarEntry(tgz.directory(), psion2unix(fn));
 		    if (te != 0L) {
 			u_int32_t handle;
 			QString cpDir(fn);
diff --git a/kde2/kpsion/kpsion.h b/kde2/kpsion/kpsion.h
index a3d5f71..00423e5 100644
--- a/kde2/kpsion/kpsion.h
+++ b/kde2/kpsion/kpsion.h
@@ -23,6 +23,9 @@
 #ifndef _KPSION_H_
 #define _KPSION_H_
 
+// get KDE_VERSION
+#include <kapplication.h>
+
 #include "setupdialog.h"
 #include "statusbarprogress.h"
 #include "kpsionrestoredialog.h"
@@ -112,7 +115,11 @@ private:
     SetupDialog *setupDialog;
     KIconView *view;
     KPsionStatusBarProgress *progress;
+#if KDE_VERSION >= 300
+    KTar *backupTgz;
+#else
     KTarGz *backupTgz;
+#endif
     KCmdLineArgs *args;
 
     driveMap drives;
diff --git a/kde2/kpsion/kpsionbackuplistview.cpp b/kde2/kpsion/kpsionbackuplistview.cpp
index f8b5f77..4897753 100644
--- a/kde2/kpsion/kpsionbackuplistview.cpp
+++ b/kde2/kpsion/kpsionbackuplistview.cpp
@@ -25,8 +25,8 @@
 #include <config.h>
 #endif
 
-#include "kpsionbackuplistview.h"
 #include "kpsion.h"
+#include "kpsionbackuplistview.h"
 #include "kpsionconfig.h"
 
 #include <kapp.h>
@@ -283,7 +283,11 @@ readBackups(QString uid) {
 	kapp->processEvents();
 
 	bool isValid = false;
+#if KDE_VERSION >= 300
+	KTar tgz(fi->absFilePath());
+#else
 	KTarGz tgz(fi->absFilePath());
+#endif
 	const KTarEntry *te;
 	QString bTypeName;
 	int bType;
diff --git a/kde2/po/de/Makefile.am b/kde2/po/de/Makefile.am
index 62d74e6..8517d98 100644
--- a/kde2/po/de/Makefile.am
+++ b/kde2/po/de/Makefile.am
@@ -1,3 +1,6 @@
 KDE_LANG = de
 
 POFILES = AUTO
+
+maintainer-clean-local:
+	rm -f Makefile.in