Diffstat (limited to 'pwmanager/pwmanager/pwmdoc.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index b58d7e2..9213360 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp | |||
@@ -50,2 +50,3 @@ | |||
50 | #include <qfile.h> | 50 | #include <qfile.h> |
51 | #include <QDesktopWidget> | ||
51 | 52 | ||
@@ -483,3 +484,4 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file) | |||
483 | rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF); | 484 | rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF); |
484 | tmpFileMoved = filename + "." + rnd_buf + ".mv"; | 485 | tmpFileMoved = filename; tmpFileMoved += '.'; |
486 | tmpFileMoved += rnd_buf; tmpFileMoved += ".mv"; | ||
485 | if (!copyFile(filename, tmpFileMoved)) | 487 | if (!copyFile(filename, tmpFileMoved)) |
@@ -493,3 +495,3 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file) | |||
493 | f.setName(filename); | 495 | f.setName(filename); |
494 | if (!f.open(IO_ReadWrite)) { | 496 | if (!f.open(QIODevice::ReadWrite)) { |
495 | ret = e_openFile; | 497 | ret = e_openFile; |
@@ -636,3 +638,3 @@ PwMerror PwMDoc::openDoc(const QString *file, int openLocked) | |||
636 | 638 | ||
637 | if (!f.open(IO_ReadOnly)) | 639 | if (!f.open(QIODevice::ReadOnly)) |
638 | return e_openFile; | 640 | return e_openFile; |
@@ -1005,6 +1007,6 @@ bool PwMDoc::copyFile(const QString &src, const QString &dst) | |||
1005 | QFile srcFd(src); | 1007 | QFile srcFd(src); |
1006 | if (!srcFd.open(IO_ReadOnly)) | 1008 | if (!srcFd.open(QIODevice::ReadOnly)) |
1007 | return false; | 1009 | return false; |
1008 | QFile dstFd(dst); | 1010 | QFile dstFd(dst); |
1009 | if (!dstFd.open(IO_ReadWrite)) { | 1011 | if (!dstFd.open(QIODevice::ReadWrite)) { |
1010 | srcFd.close(); | 1012 | srcFd.close(); |
@@ -1487,3 +1489,3 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw, | |||
1487 | 1489 | ||
1488 | unsigned int cryptLen = f->size() - pos; | 1490 | size_t cryptLen = f->size() - pos; |
1489 | byte *encrypted = new byte[cryptLen]; | 1491 | byte *encrypted = new byte[cryptLen]; |
@@ -1527,5 +1529,5 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw, | |||
1527 | PwMerror err; | 1529 | PwMerror err; |
1528 | err = gc.decrypt(&decrypted, | 1530 | err = gc.decrypt((unsigned char **)&decrypted, |
1529 | &cryptLen, | 1531 | &cryptLen, |
1530 | encrypted, | 1532 | (unsigned char*)encrypted, |
1531 | cryptLen, | 1533 | cryptLen, |
@@ -2435,3 +2437,3 @@ PwMerror PwMDoc::exportToText(const QString *file) | |||
2435 | QFile f(*file); | 2437 | QFile f(*file); |
2436 | if (!f.open(IO_ReadWrite)) | 2438 | if (!f.open(QIODevice::ReadWrite)) |
2437 | return e_openFile; | 2439 | return e_openFile; |
@@ -2709,3 +2711,3 @@ PwMerror PwMDoc::importText_PwM(const QString *file) | |||
2709 | PwMDataItem currItem; | 2711 | PwMDataItem currItem; |
2710 | bool res = f.open(IO_ReadOnly); | 2712 | bool res = f.open(QIODevice::ReadOnly); |
2711 | if (res == false) | 2713 | if (res == false) |
@@ -3631,4 +3633,4 @@ QStringList PwMDoc::getIDEntryList() | |||
3631 | 3633 | ||
3632 | #ifndef PWM_EMBEDDED | 3634 | #ifndef PWM_EMBEDDED_ |
3633 | #include "pwmdoc.moc" | 3635 | #include "moc_pwmdoc.cpp" |
3634 | #endif | 3636 | #endif |