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 @@
 #include <qfile.h>
+#include  <QDesktopWidget>
 
@@ -483,3 +484,4 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
                         rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF);
-                tmpFileMoved = filename + "." + rnd_buf + ".mv";
+                tmpFileMoved = filename; tmpFileMoved += '.';
+                tmpFileMoved += rnd_buf; tmpFileMoved += ".mv";
                 if (!copyFile(filename, tmpFileMoved))
@@ -493,3 +495,3 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
         f.setName(filename);
-        if (!f.open(IO_ReadWrite)) {
+        if (!f.open(QIODevice::ReadWrite)) {
                 ret = e_openFile;
@@ -636,3 +638,3 @@ PwMerror PwMDoc::openDoc(const QString *file, int openLocked)
 
-        if (!f.open(IO_ReadOnly))
+        if (!f.open(QIODevice::ReadOnly))
                 return e_openFile;
@@ -1005,6 +1007,6 @@ bool PwMDoc::copyFile(const QString &src, const QString &dst)
         QFile srcFd(src);
-        if (!srcFd.open(IO_ReadOnly))
+        if (!srcFd.open(QIODevice::ReadOnly))
                 return false;
         QFile dstFd(dst);
-        if (!dstFd.open(IO_ReadWrite)) {
+        if (!dstFd.open(QIODevice::ReadWrite)) {
                 srcFd.close();
@@ -1487,3 +1489,3 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
 
-        unsigned int cryptLen = f->size() - pos;
+        size_t cryptLen = f->size() - pos;
         byte *encrypted = new byte[cryptLen];
@@ -1527,5 +1529,5 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
                 PwMerror err;
-                err = gc.decrypt(&decrypted,
+                err = gc.decrypt((unsigned char **)&decrypted,
                                  &cryptLen,
-                                 encrypted,
+                                 (unsigned char*)encrypted,
                                  cryptLen,
@@ -2435,3 +2437,3 @@ PwMerror PwMDoc::exportToText(const QString *file)
         QFile f(*file);
-        if (!f.open(IO_ReadWrite))
+        if (!f.open(QIODevice::ReadWrite))
                 return e_openFile;
@@ -2709,3 +2711,3 @@ PwMerror PwMDoc::importText_PwM(const QString *file)
         PwMDataItem currItem;
-        bool res = f.open(IO_ReadOnly);
+        bool res = f.open(QIODevice::ReadOnly);
         if (res == false)
@@ -3631,4 +3633,4 @@ QStringList PwMDoc::getIDEntryList()
 
-#ifndef PWM_EMBEDDED
-#include "pwmdoc.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmdoc.cpp"
 #endif