summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-10-16 01:05:12 (UTC)
committer ulf69 <ulf69>2004-10-16 01:05:12 (UTC)
commita6b0eba5c1aac3ba170b99c2b773fcabe10d8a40 (patch) (unidiff)
tree874b41d93e8cf796125038ea4fb5861788cfb2dd
parent6f229ba483beece68b9c408fb754864c8f0e3167 (diff)
downloadkdepimpi-a6b0eba5c1aac3ba170b99c2b773fcabe10d8a40.zip
kdepimpi-a6b0eba5c1aac3ba170b99c2b773fcabe10d8a40.tar.gz
kdepimpi-a6b0eba5c1aac3ba170b99c2b773fcabe10d8a40.tar.bz2
removed references to bzip2 compressformat
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/pwmdoc.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index a5df8f0..0ac5517 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -16,25 +16,25 @@
16 * 16 *
17 * $Id$ 17 * $Id$
18 **************************************************************************/ 18 **************************************************************************/
19 19
20#include "pwmdoc.h" 20#include "pwmdoc.h"
21#include "pwmview.h" 21#include "pwmview.h"
22#include "blowfish.h" 22#include "blowfish.h"
23#include "sha1.h" 23#include "sha1.h"
24#include "globalstuff.h" 24#include "globalstuff.h"
25#include "gpasmanfile.h" 25#include "gpasmanfile.h"
26#include "serializer.h" 26#include "serializer.h"
27#include "compressgzip.h" 27#include "compressgzip.h"
28#include "compressbzip2.h" 28//US#include "compressbzip2.h"
29#include "randomizer.h" 29#include "randomizer.h"
30#include "pwminit.h" 30#include "pwminit.h"
31#include "libgcryptif.h" 31#include "libgcryptif.h"
32#ifdef PWM_EMBEDDED 32#ifdef PWM_EMBEDDED
33#include "pwmprefs.h" 33#include "pwmprefs.h"
34#include "kglobal.h" 34#include "kglobal.h"
35#endif 35#endif
36 36
37#include <kmessagebox.h> 37#include <kmessagebox.h>
38#include <libkcal/syncdefines.h> 38#include <libkcal/syncdefines.h>
39 39
40 40
@@ -1210,46 +1210,48 @@ PwMerror PwMDoc::getCommentByLvp(const QString &category, int listViewPos,
1210 } 1210 }
1211 BUG(); 1211 BUG();
1212 return e_generic; 1212 return e_generic;
1213} 1213}
1214 1214
1215bool PwMDoc::compressDta(string *d, char algo) 1215bool PwMDoc::compressDta(string *d, char algo)
1216{ 1216{
1217 PWM_ASSERT(d); 1217 PWM_ASSERT(d);
1218 switch (algo) { 1218 switch (algo) {
1219 case PWM_COMPRESS_GZIP: { 1219 case PWM_COMPRESS_GZIP: {
1220 CompressGzip comp; 1220 CompressGzip comp;
1221 return comp.compress(d); 1221 return comp.compress(d);
1222 } case PWM_COMPRESS_BZIP2: { 1222 /*US } case PWM_COMPRESS_BZIP2: {
1223 CompressBzip2 comp; 1223 CompressBzip2 comp;
1224 return comp.compress(d); 1224 return comp.compress(d);
1225*/
1225 } case PWM_COMPRESS_NONE: { 1226 } case PWM_COMPRESS_NONE: {
1226 return true; 1227 return true;
1227 } default: { 1228 } default: {
1228 BUG(); 1229 BUG();
1229 } 1230 }
1230 } 1231 }
1231 return false; 1232 return false;
1232} 1233}
1233 1234
1234bool PwMDoc::decompressDta(string *d, char algo) 1235bool PwMDoc::decompressDta(string *d, char algo)
1235{ 1236{
1236 PWM_ASSERT(d); 1237 PWM_ASSERT(d);
1237 switch (algo) { 1238 switch (algo) {
1238 case PWM_COMPRESS_GZIP: { 1239 case PWM_COMPRESS_GZIP: {
1239 CompressGzip comp; 1240 CompressGzip comp;
1240 return comp.decompress(d); 1241 return comp.decompress(d);
1241 } case PWM_COMPRESS_BZIP2: { 1242 /*US } case PWM_COMPRESS_BZIP2: {
1242 CompressBzip2 comp; 1243 CompressBzip2 comp;
1243 return comp.decompress(d); 1244 return comp.decompress(d);
1245 */
1244 } case PWM_COMPRESS_NONE: { 1246 } case PWM_COMPRESS_NONE: {
1245 return true; 1247 return true;
1246 } 1248 }
1247 } 1249 }
1248 return false; 1250 return false;
1249} 1251}
1250 1252
1251PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo) 1253PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo)
1252{ 1254{
1253 PWM_ASSERT(d); 1255 PWM_ASSERT(d);
1254 PWM_ASSERT(pw); 1256 PWM_ASSERT(pw);
1255 PWM_ASSERT(f); 1257 PWM_ASSERT(f);