2 files changed, 169 insertions, 1 deletions

diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
new file mode 100644
index 0000000..34f7403
--- a/dev/null
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -0,0 +1,168 @@
+        TEMPLATE= app
+        CONFIG  += qt warn_on
+
+
+        TARGET  = pwmpi
+OBJECTS_DIR = obj/$(PLATFORM)
+MOC_DIR = moc/$(PLATFORM)
+DESTDIR=$(QPEDIR)/bin
+
+INCLUDEPATH += . ../../ ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
+DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION
+
+#enable this setting if you want debugoutput for pwmanager
+#DEFINES += CONFIG_DEBUG
+LIBS += -L../libcrypt/$(PLATFORM)
+LIBS += -lmicrokde
+LIBS += -lmicroqtcompat
+LIBS += -lmicrokdepim
+LIBS += -L$(QPEDIR)/lib
+LIBS += -lqpe
+LIBS += -lzlib
+#LIBS += -lbz2
+#LIBS += -lkpmicrogcrypt
+LIBS += -ljpeg
+LIBS += $(QTOPIALIB)
+LIBS += -lkpmicrocipher
+LIBS += -lkpmicroerror
+LIBS += -lkpmicrompi
+LIBS += -lstdc++
+
+#INTERFACES = \
+#addentrywnd.ui \
+#configwnd.ui \
+#findwnd.ui \
+#getmasterpwwnd.ui \
+#pwgenwnd.ui \
+#setmasterpwwnd.ui \
+#subtbledit.ui
+
+#INTERFACES = \
+#subtbledit.ui \
+
+
+
+#HEADERS = \
+#configuration_31compat.h \
+#configuration.h \
+#configwnd.h \
+#configwndimpl.h \
+#selftest.h
+#subtbledit.h \
+#subtbleditimpl.h \
+#compressbzip2.h \
+
+HEADERS = \
+addentrywnd_emb.h \
+addentrywndimpl.h \
+base64.h \
+binentrygen.h \
+blowfish.h \
+commentbox.h \
+compiler.h \
+compressgzip.h \
+findwnd_emb.h \
+findwndimpl.h \
+genpasswd.h \
+getkeycardwnd.h \
+getmasterpwwnd_emb.h \
+getmasterpwwndimpl.h \
+globalstuff.h \
+gpasmanfile.h \
+htmlgen.h \
+htmlparse.h \
+ipc.h \
+libgcryptif.h \
+listobjselectwnd.h \
+listviewpwm.h \
+printtext.h \
+pwgenwnd_emb.h \
+pwgenwndimpl.h \
+pwmdoc.h \
+pwmdocui.h \
+pwmexception.h \
+pwm.h \
+pwminit.h \
+pwmprefs.h \
+pwmprint.h \
+pwmtray.h \
+pwmview.h \
+pwmviewstyle_0.h \
+pwmviewstyle_1.h \
+pwmviewstyle.h \
+randomizer.h \
+rc2.h \
+rencatwnd.h \
+serializer.h \
+setmasterpwwnd_emb.h \
+setmasterpwwndimpl.h \
+sha1.h \
+waitwnd.h \
+kcmconfigs/kcmpwmconfig.h \ 
+kcmconfigs/pwmconfigwidget.h
+
+#sources that need not be build
+#SOURCES = \
+#advcommeditimpl.cpp \
+#configuration.cpp \
+#configwnd.cpp \
+#configwndimpl.cpp \
+#configuration_31compat.cpp \
+#htmlparse.cpp \
+#printtext.cpp \
+#selftest.cpp \
+#pwmprint.cpp \
+#spinforsignal.cpp
+#subtbledit.cpp \
+#subtbleditimpl.cpp \
+#compressbzip2.cpp
+ 
+
+SOURCES = \
+addentrywnd_emb.cpp \
+addentrywndimpl.cpp \
+base64.cpp \
+binentrygen.cpp \
+blowfish.cpp \
+commentbox.cpp \
+compressgzip.cpp \
+findwnd_emb.cpp \
+findwndimpl.cpp \
+genpasswd.cpp \
+getkeycardwnd.cpp \
+getmasterpwwnd_emb.cpp \
+getmasterpwwndimpl.cpp \
+globalstuff.cpp \
+gpasmanfile.cpp \
+htmlgen.cpp \
+ipc.cpp \
+libgcryptif.cpp \
+listobjselectwnd.cpp \
+listviewpwm.cpp \
+main.cpp \
+pwgenwnd_emb.cpp \
+pwgenwndimpl.cpp \
+pwm.cpp \
+pwmdoc.cpp \
+pwmdocui.cpp \
+pwmexception.cpp \
+pwminit.cpp \
+pwmprefs.cpp \
+pwmtray.cpp \
+pwmview.cpp \
+pwmviewstyle_0.cpp \
+pwmviewstyle_1.cpp \
+pwmviewstyle.cpp \
+randomizer.cpp \
+rc2.cpp \
+rencatwnd.cpp \
+serializer.cpp \
+setmasterpwwnd_emb.cpp \
+setmasterpwwndimpl.cpp \
+sha1.cpp \
+waitwnd.cpp \
+kcmconfigs/kcmpwmconfig.cpp \ 
+kcmconfigs/pwmconfigwidget.cpp
+
+
+
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index a6e5f58..635361a 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -98,65 +98,65 @@ class QFile;
 struct PwMMetaData
 {
         PwMMetaData()
          : updateInt (0)
                 { }
         /** creation date of the PwMDataItem to which
           * this meta data belongs.
           */
                 QDateTimecreate;
         /** becomes valid on this date */
                 QDateTimevalid;
         /** expire date */
                 QDateTimeexpire;
         /** update date (last updated at this date) */
                 QDateTimeupdate;
         /** update interval (in minutes). Time since the
           * last update to remind the user to update the item.
           * 0 disables.
           */
         unsigned long updateInt;
  
         //US ENH: enhancements of the filestructure
         /* each entry gets a unique id assigned  */
         string  uniqueid;
 
 
         void clear()
                 {
                         create = QDateTime();
                         expire = QDateTime();
                         update = QDateTime();
                         updateInt = 0;
-                        uniqueid = KApplication::randomString(8);
+                        uniqueid = KApplication::randomString(8).latin1();
                 }
 
         inline bool isValid() const
                 {
                         if (valid.isNull())
                                 return true;
                         return (valid < QDateTime::currentDateTime());
                 }
         inline bool isExpired() const
                 {
                         if (expire.isNull())
                                 return false;
                         return (expire < QDateTime::currentDateTime());
                 }
         inline bool isUpdateIntOver() const
                 {
                         if (updateInt == 0 ||
                             update.isNull())
                                 return false;
                         QDateTime d(update);
                         return (d.addSecs(updateInt * 60) < QDateTime::currentDateTime());
                 }
 };
 
 struct PwMDataItem
 {
         PwMDataItem()
          : lockStat (true)
          , listViewPos (-1)
          , binary (false)
          , rev (0)
                 { }