*** empty log message ***

10 files changed, 83 insertions, 23 deletions

diff --git a/pwmanager/pwmanager/configwnd.cpp b/pwmanager/pwmanager/configwnd.cpp
index 230ca1b..108c40f 100644
--- a/pwmanager/pwmanager/configwnd.cpp
+++ b/pwmanager/pwmanager/configwnd.cpp
@@ -35,116 +35,117 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
     if ( !name )
         setName( "configWnd" );
 
     okButton = new QPushButton( this, "okButton" );
     okButton->setGeometry( QRect( 10, 280, 107, 27 ) );
 
     cancelButton = new QPushButton( this, "cancelButton" );
     cancelButton->setGeometry( QRect( 370, 280, 107, 27 ) );
 
     tabWidget2 = new QTabWidget( this, "tabWidget2" );
     tabWidget2->setGeometry( QRect( 10, 10, 470, 260 ) );
 
+    //////////////////////////////
     tab = new QWidget( tabWidget2, "tab" );
 
     windowStyleComboBox = new QComboBox( FALSE, tab, "windowStyleComboBox" );
     windowStyleComboBox->setGeometry( QRect( 220, 180, 210, 28 ) );
 
     textLabel1_5 = new QLabel( tab, "textLabel1_5" );
     textLabel1_5->setGeometry( QRect( 30, 180, 180, 20 ) );
     textLabel1_5->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
 
     textLabel1_4 = new QLabel( tab, "textLabel1_4" );
     textLabel1_4->setGeometry( QRect( 30, 40, 400, 20 ) );
 
     selEntrFontButton = new QPushButton( tab, "selEntrFontButton" );
     selEntrFontButton->setGeometry( QRect( 30, 90, 160, 27 ) );
 
     currEntrFont = new QLabel( tab, "currEntrFont" );
     currEntrFont->setGeometry( QRect( 30, 70, 230, 20 ) );
     tabWidget2->insertTab( tab, QString("") );
-
+    //////////////////////////////////////
     TabPage = new QWidget( tabWidget2, "TabPage" );
 
     compressionComboBox = new QComboBox( FALSE, TabPage, "compressionComboBox" );
     compressionComboBox->setGeometry( QRect( 290, 50, 150, 28 ) );
 
     textLabel1_6 = new QLabel( TabPage, "textLabel1_6" );
     textLabel1_6->setGeometry( QRect( 10, 50, 270, 20 ) );
     textLabel1_6->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
 
     textLabel1_8 = new QLabel( TabPage, "textLabel1_8" );
     textLabel1_8->setGeometry( QRect( 10, 90, 270, 20 ) );
     textLabel1_8->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
 
     permissionLineEdit = new QLineEdit( TabPage, "permissionLineEdit" );
     permissionLineEdit->setGeometry( QRect( 290, 90, 142, 27 ) );
     permissionLineEdit->setMaxLength( 3 );
 
     fileBackupCheckBox = new QCheckBox( TabPage, "fileBackupCheckBox" );
     fileBackupCheckBox->setGeometry( QRect( 80, 140, 360, 23 ) );
     tabWidget2->insertTab( TabPage, QString("") );
-
+    //////////////////////////////////////
     tab_2 = new QWidget( tabWidget2, "tab_2" );
 
     pwTimeoutSpinBox = new QSpinBox( tab_2, "pwTimeoutSpinBox" );
     pwTimeoutSpinBox->setGeometry( QRect( 390, 50, 55, 23 ) );
 
     textLabel1 = new QLabel( tab_2, "textLabel1" );
     textLabel1->setGeometry( QRect( 10, 20, 370, 80 ) );
     textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) );
 
     textLabel1_7 = new QLabel( tab_2, "textLabel1_7" );
     textLabel1_7->setGeometry( QRect( 10, 110, 370, 80 ) );
     textLabel1_7->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) );
 
     lockTimeoutSpinBox = new QSpinBox( tab_2, "lockTimeoutSpinBox" );
     lockTimeoutSpinBox->setGeometry( QRect( 390, 140, 55, 23 ) );
 
     autoDeepLockCheckBox = new QCheckBox( tab_2, "autoDeepLockCheckBox" );
     autoDeepLockCheckBox->setGeometry( QRect( 60, 180, 380, 25 ) );
     tabWidget2->insertTab( tab_2, QString("") );
-
+    ///////////////////////////////////////////
     tab_3 = new QWidget( tabWidget2, "tab_3" );
 
     textLabel1_3 = new QLabel( tab_3, "textLabel1_3" );
     textLabel1_3->setGeometry( QRect( 30, 30, 400, 20 ) );
 
     autoStartLineEdit = new QLineEdit( tab_3, "autoStartLineEdit" );
     autoStartLineEdit->setGeometry( QRect( 30, 50, 360, 20 ) );
 
     browseAutoStButton = new QPushButton( tab_3, "browseAutoStButton" );
     browseAutoStButton->setGeometry( QRect( 400, 50, 30, 20 ) );
 
     autostartDeeplockedCheckBox = new QCheckBox( tab_3, "autostartDeeplockedCheckBox" );
     autostartDeeplockedCheckBox->setGeometry( QRect( 40, 80, 390, 25 ) );
     tabWidget2->insertTab( tab_3, QString("") );
-
+    ////////////////////////////////////////////
     tab_4 = new QWidget( tabWidget2, "tab_4" );
 
     textLabel2 = new QLabel( tab_4, "textLabel2" );
     textLabel2->setGeometry( QRect( 20, 40, 280, 20 ) );
     textLabel2->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
 
     browserLineEdit = new QLineEdit( tab_4, "browserLineEdit" );
     browserLineEdit->setGeometry( QRect( 310, 40, 130, 27 ) );
 
     xtermLineEdit = new QLineEdit( tab_4, "xtermLineEdit" );
     xtermLineEdit->setGeometry( QRect( 310, 100, 130, 27 ) );
 
     textLabel3 = new QLabel( tab_4, "textLabel3" );
     textLabel3->setGeometry( QRect( 20, 100, 280, 20 ) );
     textLabel3->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
     tabWidget2->insertTab( tab_4, QString("") );
-
+    ///////////////////////////////////////////////
     tab_5 = new QWidget( tabWidget2, "tab_5" );
 
     trayCheckBox = new QCheckBox( tab_5, "trayCheckBox" );
     trayCheckBox->setGeometry( QRect( 30, 30, 400, 20 ) );
 
     openUnlockedCheckBox = new QCheckBox( tab_5, "openUnlockedCheckBox" );
     openUnlockedCheckBox->setGeometry( QRect( 30, 80, 400, 20 ) );
 
     autoMinimizeCheckBox = new QCheckBox( tab_5, "autoMinimizeCheckBox" );
     autoMinimizeCheckBox->setEnabled( FALSE );
     autoMinimizeCheckBox->setGeometry( QRect( 50, 50, 380, 25 ) );
 
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index e5579f8..08fcb25 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -19,47 +19,52 @@
 
 #include <klocale.h>
 #include <klistview.h>
 #include <ktoolbar.h>
 #include <kfiledialog.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #ifndef PWM_EMBEDDED
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <dcopclient.h>
+#include "configwndimpl.h"
+#include "configuration.h"
 #else
 #include <qmenubar.h>
 #include <qmessagebox.h>
+#include <pwmprefs.h>
+#include <kpimglobalprefs.h>
+#include <kcmconfigs/kcmpwmconfig.h>
+#include <kcmconfigs/kcmkdepimconfig.h>
+#include <kcmultidialog.h>
 #endif
 
 #include <qpixmap.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qlineedit.h>
 #include <qfileinfo.h>
 #include <qclipboard.h>
 
 
 #include <stdio.h>
 
 #include "pwm.h"
 #include "pwminit.h"
-#include "configwndimpl.h"
 #include "pwmprint.h"
 #include "addentrywndimpl.h"
 #include "globalstuff.h"
 #include "findwndimpl.h"
-#include "configuration.h"
 
 #ifdef CONFIG_KWALLETIF
 # include "kwalletif.h"
 # include "kwalletemu.h"
 #endif
 #ifdef CONFIG_KEYCARD
 # include "pwmkeycard.h"
 #endif
 
 
         #define DEFAULT_SIZE    (QSize(700, 400))
 
@@ -742,32 +747,48 @@ void PwM::deepLockWnd_slot()
         PWM_ASSERT(curDoc());
         curDoc()->deepLock();
 }
 
 void PwM::unlockWnd_slot()
 {
         PWM_ASSERT(curDoc());
         curDoc()->lockAll(false);
 }
 
 void PwM::config_slot()
 {
-        Configuration *conf = Configuration::obj();
-        int oldStyle = conf->confWndMainViewStyle();
+  int oldStyle = conf()->confWndMainViewStyle();
+#ifdef PWM_EMBEDDED  
+    KCMultiDialog*  ConfigureDialog = new KCMultiDialog( "PIM", this ,"pwmconfigdialog", true );
+
+    KCMPwmConfig* pwmcfg = new KCMPwmConfig( ConfigureDialog->getNewVBoxPage(i18n( "PwManager")) , "KCMPwmConfig" );
+    ConfigureDialog->addModule(pwmcfg );
 
+    KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" );
+    ConfigureDialog->addModule(kdelibcfg );
+
+#ifndef DESKTOP_VERSION
+    ConfigureDialog->showMaximized();
+#endif
+    if ( ConfigureDialog->exec() )
+        KMessageBox::information( this,  i18n("Some changes are only\neffective after a restart!\n") );
+    delete ConfigureDialog;
+
+#else //PWM_EMBEDDED
         // display the configuration window (modal mode)
-        if (!conf->showConfWnd(this))
+        if (!conf()->showConfWnd(this))
                 return;
+#endif
 
-        int newStyle = conf->confWndMainViewStyle();
+        int newStyle = conf()->confWndMainViewStyle();
         // reinitialize tray
         init->initTray();
         // reinitialize KWallet emulation
         init->initKWalletEmu();
 
         PwMDocList *_dl = PwMDoc::getOpenDocList();
         const vector<PwMDocList::listItem> *dl = _dl->getList();
         vector<PwMDocList::listItem>::const_iterator i = dl->begin(),
                                                      end = dl->end();
         PwMDoc *doc;
         while (i != end) {
                 doc = (*i).doc;
@@ -784,25 +805,25 @@ void PwM::config_slot()
                                           end2 = ml->end();
 #else
         QValueList<PwM *>::ConstIterator i2 = ml->begin(),
                                           end2 = ml->end();
 #endif
         PwM *pwm;
         while (i2 != end2) {
                 pwm = *i2;
                 // reinitialize the window style.
                 if (oldStyle != newStyle)
                         pwm->curView()->initStyle(newStyle);
                 // set the new font
-                pwm->curView()->setFont(conf->confGlobEntryFont());
+                pwm->curView()->setFont(conf()->confGlobEntryFont());
                 ++i2;
         }
 }
 
 void PwM::activateMpButton(bool activate)
 {
         managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_CHANGEMP, activate);
 }
 
 void PwM::closeEvent(QCloseEvent *e)
 {
         e->accept();
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 2cd69a5..5c29ea4 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -1,144 +1,153 @@
         TEMPLATE= app
         CONFIG  += qt warn_on
 
 
         TARGET  = pwmpi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
-INCLUDEPATH += . ../../qtcompat ../../qtcompat/xml ../../microkde ../../microkde/kdecore ../../microkde/kdeui $(QPEDIR)/include
+INCLUDEPATH += . ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
 DEFINES += PWM_EMBEDDED PWM_DEBUG
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
+LIBS += -lmicrokdepim
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 LIBS += -lbz2
 LIBS += $(QTOPIALIB)
 
 #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
 
 HEADERS = \
 addentrywnd.h \
 addentrywndimpl.h \
 base64.h \
 binentrygen.h \
 blowfish.h \
 commentbox.h \
 compiler.h \
 compressbzip2.h \
 compressgzip.h \
-configuration_31compat.h \
-configuration.h \
-configwnd.h \
-configwndimpl.h \
 findwnd.h \
 findwndimpl.h \
 genpasswd.h \
 getkeycardwnd.h \
 getmasterpwwnd.h \
 getmasterpwwndimpl.h \
 globalstuff.h \
 gpasmanfile.h \
 htmlgen.h \
 htmlparse.h \
 ipc.h \
 listobjselectwnd.h \
 listviewpwm.h \
 printtext.h \
 pwgenwnd.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.h \
 setmasterpwwndimpl.h \
 sha1.h \
 subtbledit.h \
 subtbleditimpl.h \
-waitwnd.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
 
 SOURCES = \
 addentrywnd.cpp \
 addentrywndimpl.cpp \
 base64.cpp \
 binentrygen.cpp \
 blowfish.cpp \
 commentbox.cpp \
 compressbzip2.cpp \
 compressgzip.cpp \
-configuration.cpp \
-configwnd.cpp \
-configwndimpl.cpp \
 findwnd.cpp \
 findwndimpl.cpp \
 genpasswd.cpp \
 getkeycardwnd.cpp \
 getmasterpwwnd.cpp \
 getmasterpwwndimpl.cpp \
 globalstuff.cpp \
 gpasmanfile.cpp \
 htmlgen.cpp \
 ipc.cpp \
 listobjselectwnd.cpp \
 listviewpwm.cpp \
 main.cpp \
 pwgenwnd.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.cpp \
 setmasterpwwndimpl.cpp \
 sha1.cpp \
 subtbledit.cpp \
 subtbleditimpl.cpp \
 waitwnd.cpp \
+kcmconfigs/kcmpwmconfig.cpp \ 
+kcmconfigs/pwmconfigwidget.cpp \
+
 
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 04af360..9fe4809 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -22,24 +22,26 @@
 #include "blowfish.h"
 #include "sha1.h"
 #include "globalstuff.h"
 #include "gpasmanfile.h"
 #include "serializer.h"
 #include "compressgzip.h"
 #include "compressbzip2.h"
 #include "randomizer.h"
 #include "pwminit.h"
 #ifndef PWM_EMBEDDED
 //US #include "libgryptif.h"
 #else
+#include "pwmprefs.h"
+#include "kglobal.h"
 #endif
 
 #ifdef CONFIG_KWALLETIF
 # include "kwalletemu.h"
 #endif // CONFIG_KWALLETIF
 
 #include <qdatetime.h>
 #include <qsize.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 
 #include <stdio.h>
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 9650d55..193247e 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -39,33 +39,33 @@
         #define PWM_CRYPT_TWOFISH128(static_cast<char>(0x07))
 
         #define PWM_COMPRESS_NONE(static_cast<char>(0x00))
         #define PWM_COMPRESS_GZIP(static_cast<char>(0x01))
         #define PWM_COMPRESS_BZIP2(static_cast<char>(0x02))
 
         #define DEFAULT_MAX_ENTRIES(~(static_cast<unsigned int>(0)))
         #define FILE_ID_HEADER  "PWM_PASSWORD_FILE"
 
 
 #include "pwmexception.h"
 #include "pwmdocui.h"
-#include "configuration.h"
 
 #include <qobject.h>
 #include <qtimer.h>
 #include <qdatetime.h>
 
 #include <kprocess.h>
 
 #ifndef PWM_EMBEDDED
+#include "configuration.h"
 #else
 #include <kapplication.h>
 #endif
 
 #include <string>
 #include <vector>
 #include <utility>
 
 using std::vector;
 using std::string;
 using std::pair;
 
diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp
index b308b40..3993fa8 100644
--- a/pwmanager/pwmanager/pwmdocui.cpp
+++ b/pwmanager/pwmanager/pwmdocui.cpp
@@ -27,24 +27,25 @@
 #include "spinforsignal.h"
 
 #include <qlineedit.h>
 #include <qtabwidget.h>
 
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 
 #ifndef PWM_EMBEDDED
 #include <kwin.h>
 #else
 #include <qdir.h>
+#include "pwmprefs.h"
 #endif
 
 
 #ifdef CONFIG_KEYCARD
 # include "pwmkeycard.h"
 #endif
 
 
 PwMDocUi::PwMDocUi(QObject *parent, const char *name)
  : QObject(parent, name)
 {
         currentView = 0;
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index 2f1aa4e..8946443 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -9,29 +9,31 @@
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "pwminit.h"
-#include "configuration.h"
 #include "randomizer.h"
 
 #ifndef PWM_EMBEDDED
 #include "selftest.h"
+#include "configuration.h"
+#else
+#include "pwmprefs.h"
 #endif
 
 #include "pwm.h"
 #include "pwmexception.h"
 #include "pwmtray.h"
 #include "pwmdoc.h"
 
 #ifdef CONFIG_KWALLETIF
 # include "kwalletemu.h"
 #endif // CONFIG_KWALLETIF
 #ifdef CONFIG_KEYCARD
 # include "pwmkeycard.h"
@@ -110,51 +112,66 @@ PwMInit::~PwMInit()
                 ++i2;
         }
 
 #ifdef CONFIG_KWALLETIF
         delete_ifnot_null(_kwalletEmu);
 #endif // CONFIG_KWALLETIF
 #ifdef CONFIG_KEYCARD
         delete_ifnot_null(_keycard);
 #endif // CONFIG_KEYCARD
         delete_ifnot_null(_tray);
 
         Randomizer::cleanup();
+#ifndef PWM_EMBEDDED
         Configuration::cleanup();
+#endif
 }
 
 void PwMInit::initializeApp()
 {
         PWM_ASSERT(runStatus == unknown);
         runStatus = init;
         initPosixSignalHandler();
         Randomizer::init();
+#ifndef PWM_EMBEDDED
         Configuration::init();
+#endif
         initDCOP();
         initKWalletEmu();
         initKeycard();
         initTray();
         handleCmdLineArgs();
 
         bool openDeeplocked = false;
         if (conf()->confGlobAutostartDeepLocked() ||
             savedCmd.open_deeplocked)
                 openDeeplocked = true;
         if (conf()->confWndAutoMinimizeOnStart() ||
             savedCmd.minToTray) {
                 PwMDoc *newDoc = createDoc();
                 if (!newDoc->openDocUi(newDoc,
                                        conf()->confGlobAutoStart(),
                                        openDeeplocked)) {
                         delete newDoc;
+
+                        //US ENH for embedded devices: in the case of failure, open a document the default way  
+                        createMainWnd(conf()->confGlobAutoStart(),
+                              openDeeplocked,
+                              true,
+                              0,
+                              savedCmd.minimized);
+                        
+
+
+
                 }
         } else {
                 createMainWnd(conf()->confGlobAutoStart(),
                               openDeeplocked,
                               true,
                               0,
                               savedCmd.minimized);
         }
 
         runStatus = running;
 }
 
diff --git a/pwmanager/pwmanager/pwmtray.cpp b/pwmanager/pwmanager/pwmtray.cpp
index 0f286c1..fe074ca 100644
--- a/pwmanager/pwmanager/pwmtray.cpp
+++ b/pwmanager/pwmanager/pwmtray.cpp
@@ -16,25 +16,29 @@
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "pwmtray.h"
 #include "pwmexception.h"
 #include "pwm.h"
 #include "pwmdoc.h"
 #include "pwminit.h"
+#ifndef PWM_EMBEDDED
 #include "configuration.h"
+#else
+#include "pwmprefs.h"
+#endif
 
 #include <klocale.h>
 
 
 void ActiveTreeItem::execIt()
 {
 #ifndef PWM_EMBEDDED
         unsigned int entr = static_cast<unsigned int>(entry);
         unsigned int cat = static_cast<unsigned int>(category);
 #else
         unsigned int entr = (unsigned int)(entry);
         unsigned int cat = (unsigned int)(category);
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index c09fbf5..58c2fca 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -13,25 +13,29 @@
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "pwmview.h"
 #include "pwmexception.h"
 #include "globalstuff.h"
 #include "pwm.h"
 #include "rencatwnd.h"
+#ifndef PWM_EMBEDDED
 #include "configuration.h"
+#else
+#include "pwmprefs.h"
+#endif
 #include "commentbox.h"
 
 #include <kmessagebox.h>
 #include <klocale.h>
 
 #include <qlineedit.h>
 #include <qpoint.h>
 #include <qapplication.h>
 
         #define COLUMN_DESC     0
         #define COLUMN_NAME     1
         #define COLUMN_PW       2
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 65e442d..f29ef6c 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -13,24 +13,25 @@
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 2.0 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "serializer.h"
 #include "pwmexception.h"
 
 #ifdef PWM_EMBEDDED
+#include <kglobal.h>
 #include <klocale.h>
 #endif
 
 /* enable/disable serializer debugging (0/1) */
         #define SERIALIZER_DEBUG0
 /* use the old xml tags for writing (0/1) */
         #define USE_OLD_TAGS    0
 /* write a CDATA section (0/1) */
         #define WRITE_CDATA_SEC         0
 
 
         #define META_CREATE_DATE"c"