initial public commit of qt4 portp1

68 files changed, 483 insertions, 364 deletions

diff --git a/pwmanager/libcrypt/cipher/cipher.pro b/pwmanager/libcrypt/cipher/cipher.pro
index ad96201..7e1a330 100644
--- a/pwmanager/libcrypt/cipher/cipher.pro
+++ b/pwmanager/libcrypt/cipher/cipher.pro
@@ -68,3 +68,5 @@ SOURCES += ../crypt/ath.c \
 
 #LIBS += -L../$(PLATFORM)
 #LIBS +=  -lgcrypt -lmpi -lerror
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/libcrypt/error/error.pro b/pwmanager/libcrypt/error/error.pro
index 8c5f667..e96bcee 100644
--- a/pwmanager/libcrypt/error/error.pro
+++ b/pwmanager/libcrypt/error/error.pro
@@ -29,4 +29,6 @@ SOURCES += code-from-errno.c \
      #      gpg-error.c \
        #    gpg-error.h \
       #     mkerrcodes.h
-     #      mkerrcodes.c \
\ No newline at end of file
+     #      mkerrcodes.c \
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/libcrypt/mpi/mpi.pro b/pwmanager/libcrypt/mpi/mpi.pro
index 4eb6346..d213bc3 100644
--- a/pwmanager/libcrypt/mpi/mpi.pro
+++ b/pwmanager/libcrypt/mpi/mpi.pro
@@ -40,3 +40,5 @@ SOURCES += mpi-add.c \
            generic/mpih-rshift.c \
            generic/mpih-sub1.c \
            generic/udiv-w-sdiv.c
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/libcrypt/zlib/zlib.pro b/pwmanager/libcrypt/zlib/zlib.pro
index 2841aaf..7ba44e3 100644
--- a/pwmanager/libcrypt/zlib/zlib.pro
+++ b/pwmanager/libcrypt/zlib/zlib.pro
@@ -34,3 +34,5 @@ SOURCES += adler32.c \
            trees.c \
            uncompr.c \
            zutil.c
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/pwmanager/addentrywnd_emb.cpp b/pwmanager/pwmanager/addentrywnd_emb.cpp
index 2fa9e8a..f76d33b 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.cpp
+++ b/pwmanager/pwmanager/addentrywnd_emb.cpp
@@ -29,12 +29,15 @@ $Id$
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <qpushbutton.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 
 /*
  *  Constructs a addEntryWnd as a child of 'parent', with the
@@ -49,7 +52,7 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
                  KDialogBase::Ok, parent, name, true ), doc(d)
 {
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
     QTabWidget* mTabWidget = new QTabWidget( page );
     pageLayout->addWidget( mTabWidget );
@@ -58,7 +61,7 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
     // This is the Password tab
     QWidget *tab1 = new QWidget( mTabWidget );
 
-    QGridLayout *layout = new QGridLayout( tab1, 3, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( tab1, 3, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
@@ -77,7 +80,7 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
     layout->addWidget( categoryComboBox, i, 1 );
     i++;
     categoryComboBox->setEditable( TRUE );
-    categoryComboBox->setSizeLimit( 8 );
+    categoryComboBox->setMaxVisibleItems( 8 );
     categoryComboBox->setAutoCompletion( TRUE );
     categoryComboBox->setDuplicatesEnabled( FALSE );
     connect(categoryComboBox,SIGNAL(activated(const QString&)), SLOT(categorySelected(const QString&))); 
@@ -117,12 +120,12 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
     // This is the Comment tab
     QWidget *tab2 = new QWidget( mTabWidget );
 
-    layout = new QGridLayout( tab2, 3, 1 );
+    layout = new Q3GridLayout( tab2, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
     layout->setSpacing( KDialogBase::spacingHintSmall() );
     i = 0;
 
-    commentTextEdit = new QMultiLineEdit(tab2);
+    commentTextEdit = new Q3MultiLineEdit(tab2);
     layout->addMultiCellWidget( commentTextEdit, i, i, 0, 0 );
     i++;
 
@@ -134,7 +137,7 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
     // This is the Launcher tab
     QWidget *tab3 = new QWidget( mTabWidget );
 
-    layout = new QGridLayout( tab3, 3, 1 );
+    layout = new Q3GridLayout( tab3, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
     layout->setSpacing( KDialogBase::spacingHintSmall() );
     i = 0;
diff --git a/pwmanager/pwmanager/addentrywnd_emb.h b/pwmanager/pwmanager/addentrywnd_emb.h
index 966d9d2..ad7d30c 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.h
+++ b/pwmanager/pwmanager/addentrywnd_emb.h
@@ -27,18 +27,23 @@ $Id$
 #define ADDENTRYWND_EMB_H
 
 #include <qvariant.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
 #include <kdialogbase.h>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
 class QSpacerItem;
 class KLineEdit;
 class QPushButton;
 class KComboBox;
 class QLabel;
-class QGroupBox;
-class QMultiLineEdit;
+class Q3GroupBox;
+class Q3MultiLineEdit;
 class PwMDoc;
 
 class addEntryWnd : public KDialogBase
@@ -61,7 +66,7 @@ public:
     QLabel* pwLineLabel;
 
     QPushButton* revealButton;
-    QMultiLineEdit* commentTextEdit;
+    Q3MultiLineEdit* commentTextEdit;
     PwMDoc* doc;
 
 public slots:
diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp
index 09efd1c..c952ead 100644
--- a/pwmanager/pwmanager/addentrywndimpl.cpp
+++ b/pwmanager/pwmanager/addentrywndimpl.cpp
@@ -196,7 +196,7 @@ void AddEntryWndImpl::switchComment(bool toAdvanced)
 		if (commentTextEdit)
 			return;
 
-		commentTextEdit = new QTextEdit(commentDummy);
+		commentTextEdit = new Q3TextEdit(commentDummy);
 		commentTextEdit->setTextFormat(Qt::PlainText);
 		commentTextEdit->resize(commentDummy->size());
 		commentTextEdit->setText(savedCommentText);
@@ -216,6 +216,6 @@ void AddEntryWndImpl::editAdvCommentButton_slot()
 #endif
 }
 
-#ifndef PWM_EMBEDDED
-#include "addentrywndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_addentrywndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/addentrywndimpl.h b/pwmanager/pwmanager/addentrywndimpl.h
index e13eb54..c5f4bb1 100644
--- a/pwmanager/pwmanager/addentrywndimpl.h
+++ b/pwmanager/pwmanager/addentrywndimpl.h
@@ -23,13 +23,13 @@
 
 #ifndef PWM_EMBEDDED
 #include <qlineedit.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
 #include <qcombobox.h>
 #include "addentrywnd.h"
 #else
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include "addentrywnd_emb.h"
 #endif
 
@@ -86,12 +86,12 @@ public:
 
 public slots:
 #ifndef PWM_EMBEDDED 
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 	/** OK button pressed */
 	void okButton_slot();
 	/** cancel button pressed */
 	void cancelButton_slot();
-//MOC_SKIP_END
+#endif
 #else
 	virtual void slotOk();
 #endif
@@ -110,7 +110,7 @@ protected:
 protected:
 	QPushButton *editAdvCommentButton;
 #ifndef PWM_EMBEDDED
-	QTextEdit *commentTextEdit;
+	Q3TextEdit *commentTextEdit;
 #else
 	//nothing here 
 #endif
diff --git a/pwmanager/pwmanager/binentrygen.h b/pwmanager/pwmanager/binentrygen.h
index 49288aa..9263cdc 100644
--- a/pwmanager/pwmanager/binentrygen.h
+++ b/pwmanager/pwmanager/binentrygen.h
@@ -21,7 +21,7 @@
 #define __BINENTRYGEN_H
 
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include "pwmdoc.h"
 
diff --git a/pwmanager/pwmanager/commentbox.cpp b/pwmanager/pwmanager/commentbox.cpp
index 5416856..a60440d 100644
--- a/pwmanager/pwmanager/commentbox.cpp
+++ b/pwmanager/pwmanager/commentbox.cpp
@@ -26,9 +26,9 @@
 #ifndef PWM_EMBEDDED
 #include <khtml_part.h>
 #include <khtmlview.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif
 
 
@@ -137,7 +137,7 @@ void CommentBox::switchTo(commentBoxMode newMode)
 	// setup new mode
 	switch (newMode) {
 	case mode_text:
-		textDta = new QTextEdit(parentWidget);
+		textDta = new Q3TextEdit(parentWidget);
 		textDta->setTextFormat(Qt::PlainText);
 		textDta->setReadOnly(true);
 		textDta->show();
@@ -229,11 +229,11 @@ QSize CommentBox::size()
 #else
 
 CommentBox::CommentBox(QWidget *_parentWidget)
-  : QTextBrowser(_parentWidget) 
+  : Q3TextBrowser(_parentWidget) 
 
 {
     //this->setReadOnly(true);
-  setFocusPolicy( QWidget::ClickFocus );
+  setFocusPolicy( Qt::ClickFocus );
 }
 
 CommentBox::~CommentBox()
@@ -248,7 +248,7 @@ void CommentBox::clear()
 
 void CommentBox::setText(const QString &text)
 {
-	QTextBrowser::setText( text);
+	Q3TextBrowser::setText( text);
 	if (!isVisible())
 		show();
 }
diff --git a/pwmanager/pwmanager/commentbox.h b/pwmanager/pwmanager/commentbox.h
index 3103353..d14ba13 100644
--- a/pwmanager/pwmanager/commentbox.h
+++ b/pwmanager/pwmanager/commentbox.h
@@ -23,7 +23,7 @@
 #include <qstring.h>
 #include <qsize.h>
 class QWidget;
-class QTextEdit;
+class Q3TextEdit;
 class KHTMLPart;
 
 #ifndef PWM_EMBEDDED
@@ -85,18 +85,18 @@ protected:
 	/** current comment box usage type */
 	commentBoxMode mode;
 	/** if the comment box is a normal textbox, data is stored here */
-	QTextEdit *textDta;
+	Q3TextEdit *textDta;
 	/** if the comment box is a HTML box, data is stored here */
 	KHTMLPart *htmlDta;
 };
 
 #else
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 /** Implementation of the advanced HTML comment box */
 //US ENH: CommentBox must be derived from QWidget, to allow the splitter to set a initial size
 // without conflicting with the two display modes 
 
-class CommentBox : public QTextBrowser 
+class CommentBox : public Q3TextBrowser 
 {
 public:
 	CommentBox(QWidget *_parentWidget);
diff --git a/pwmanager/pwmanager/csv.cpp b/pwmanager/pwmanager/csv.cpp
index 194edf2..226cc08 100644
--- a/pwmanager/pwmanager/csv.cpp
+++ b/pwmanager/pwmanager/csv.cpp
@@ -23,6 +23,8 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #define MAX_CSV_FILE_SIZE	(50 * 1024 * 1024) // bytes
 
@@ -42,7 +44,7 @@ bool Csv::importData(const QString &filepath,
 	bool ret = true;
 	QByteArray d;
 	QFile f(filepath);
-	if (!f.open(IO_ReadOnly)) {
+	if (!f.open(QIODevice::ReadOnly)) {
 		KMessageBox::error(parent,
 				   i18n("Could not open file.\n"
 					"Does the file exist?"),
@@ -89,7 +91,7 @@ bool Csv::doImport(const QByteArray &d,
 
 	int refIndex = 0;
 	int ret;
-	QCString s, curCat;
+	Q3CString s, curCat;
 	int fieldIndex = 0;
 	bool inRecord = false;
 	/* fieldIndex is a reference count to see which
@@ -121,27 +123,27 @@ bool Csv::doImport(const QByteArray &d,
 					curCat = s;
 				break;
 			case 1:	// desc
-				di.desc = s;
+				di.desc = std::string(s);
 				++fieldIndex;
 				break;
 			case 2: // name
-				di.name = s;
+				di.name = std::string(s);
 				++fieldIndex;
 				break;
 			case 3: // pw
-				di.pw = s;
+				di.pw = std::string(s);
 				++fieldIndex;
 				break;
 			case 4: // url
-				di.url = s;
+				di.url = std::string(s);
 				++fieldIndex;
 				break;
 			case 5: // launcher
-				di.launcher = s;
+				di.launcher = std::string(s);
 				++fieldIndex;
 				break;
 			case 6: // comment
-				di.comment = s;
+				di.comment = std::string(s);
 				++fieldIndex;
 				break;
 			default:
@@ -154,7 +156,7 @@ bool Csv::doImport(const QByteArray &d,
 		case 1:
 			// record complete.
 			if (fieldIndex == 6)
-				di.comment = s;
+				di.comment = std::string(s);
 			inRecord = false;
 			fieldIndex = 0;
 			doc->addEntry(curCat, &di, true);
@@ -175,7 +177,7 @@ bool Csv::doImport(const QByteArray &d,
 	return false;
 }
 
-int Csv::nextField(QCString *ret,
+int Csv::nextField(Q3CString *ret,
 		   const QByteArray &in,
 		   bool inRecord,
 		   int *_refIndex)
@@ -353,7 +355,7 @@ bool Csv::exportData(const QString &filepath,
 		}
 	}
 	QFile f(filepath);
-	if (!f.open(IO_ReadWrite)) {
+	if (!f.open(QIODevice::ReadWrite)) {
 		KMessageBox::error(parent,
 				   i18n("Could not open file for writing."),
 				   i18n("Open error."));
@@ -376,7 +378,7 @@ bool Csv::doExport(QFile &f,
 	unsigned int numEntr;
 	unsigned int i, j;
 	PwMDataItem d;
-	QCString s, catName;
+	Q3CString s, catName;
 	QByteArray b;
 
 	for (i = 0; i < numCat; ++i) {
@@ -401,7 +403,7 @@ bool Csv::doExport(QFile &f,
 			b = s;
 			// remove \0 termination
 #ifndef PWM_EMBEDDED
-			b.resize(b.size() - 1, QGArray::SpeedOptim);
+			b.resize(b.size() - 1, Q3GArray::SpeedOptim);
 #else
 			b.resize(b.size() - 1);
 #endif
@@ -412,15 +414,15 @@ bool Csv::doExport(QFile &f,
 	return true;
 }
 
-QCString Csv::newField(QCString s)
+Q3CString Csv::newField(Q3CString s)
 {
 	if (s.isEmpty())
-		return QCString();
-	QCString ret("\"");
+		return Q3CString();
+	Q3CString ret("\"");
 #ifndef PWM_EMBEDDED
 	s.replace('\"', "\"\"");
 #else
-	s.replace(QRegExp("\""), "\"\"");
+	s.replace("\"", "\"\"");
 #endif
 	ret += s;
 	ret += "\"";
diff --git a/pwmanager/pwmanager/csv.h b/pwmanager/pwmanager/csv.h
index 6f3c1e1..8049122 100644
--- a/pwmanager/pwmanager/csv.h
+++ b/pwmanager/pwmanager/csv.h
@@ -21,7 +21,7 @@
 #ifndef __PWMANAGER_CSV_H
 #define __PWMANAGER_CSV_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qfile.h>
 
 
@@ -73,7 +73,7 @@ protected:
 	  *         2  -> data end.
 	  *         -1 -> parser error.
 	  */
-	int nextField(QCString *ret,
+	int nextField(Q3CString *ret,
 		      const QByteArray &in,
 		      bool inRecord,
 		      int *_refIndex);
@@ -81,7 +81,7 @@ protected:
 	bool doExport(QFile &f,
 		      PwMDoc *doc);
 	/** generate a new data field string. */
-	QCString newField(QCString s);
+	Q3CString newField(Q3CString s);
 
 protected:
 	/** current parent widget. */
diff --git a/pwmanager/pwmanager/editcategory.cpp b/pwmanager/pwmanager/editcategory.cpp
index 4e2378c..4f19299 100644
--- a/pwmanager/pwmanager/editcategory.cpp
+++ b/pwmanager/pwmanager/editcategory.cpp
@@ -28,7 +28,9 @@ $Id$
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -55,7 +57,7 @@ editCategoryWnd::editCategoryWnd( PwMDoc* d, QWidget* parent, const char* name)
 
 
     QWidget *page = plainPage();
-    QGridLayout *layout = new QGridLayout( page, 3, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( page, 3, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
@@ -66,7 +68,7 @@ editCategoryWnd::editCategoryWnd( PwMDoc* d, QWidget* parent, const char* name)
     layout->addWidget( categoryComboBox, i, 1 );
     i++;
     categoryComboBox->setEditable( FALSE );
-    categoryComboBox->setSizeLimit( 100 );
+    categoryComboBox->setMaxVisibleItems( 100 );
     connect(categoryComboBox,SIGNAL(activated(const QString&)), SLOT(categorySelected(const QString&))); 
 
 
diff --git a/pwmanager/pwmanager/editcategory.h b/pwmanager/pwmanager/editcategory.h
index 90b685b..10a012b 100644
--- a/pwmanager/pwmanager/editcategory.h
+++ b/pwmanager/pwmanager/editcategory.h
@@ -27,18 +27,23 @@ $Id$
 #define EDITCATEGORY_H
 
 #include <qvariant.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
 #include <kdialogbase.h>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
 class QSpacerItem;
 class KLineEdit;
 class QPushButton;
 class KComboBox;
 class QLabel;
-class QGroupBox;
-class QMultiLineEdit;
+class Q3GroupBox;
+class Q3MultiLineEdit;
 class PwMDoc;
 
 class editCategoryWnd : public KDialogBase
diff --git a/pwmanager/pwmanager/findwnd_emb.cpp b/pwmanager/pwmanager/findwnd_emb.cpp
index 6dcabe8..03d4e38 100644
--- a/pwmanager/pwmanager/findwnd_emb.cpp
+++ b/pwmanager/pwmanager/findwnd_emb.cpp
@@ -28,9 +28,11 @@ $Id$
 #include <klocale.h>
 
 #include <qcheckbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <klineedit.h>
 #include <qlabel.h>
 
@@ -57,7 +59,7 @@ findWnd::findWnd( QWidget* parent, const char* name )
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout *layout = new QVBoxLayout( page );
+    Q3VBoxLayout *layout = new Q3VBoxLayout( page );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
@@ -68,7 +70,7 @@ findWnd::findWnd( QWidget* parent, const char* name )
     layout->addWidget( caseSensCheckBox );
 
 
-    QButtonGroup* buttonGroup1 = new QButtonGroup(1, Qt::Horizontal, i18n( "Search in Column" ), page );
+    Q3ButtonGroup* buttonGroup1 = new Q3ButtonGroup(1, Qt::Horizontal, i18n( "Search in Column" ), page );
     layout->addWidget( buttonGroup1 );
 
     descRadioButton = new QRadioButton( i18n( "&Description" ), buttonGroup1  );
diff --git a/pwmanager/pwmanager/findwndimpl.cpp b/pwmanager/pwmanager/findwndimpl.cpp
index 059219f..d323133 100644
--- a/pwmanager/pwmanager/findwndimpl.cpp
+++ b/pwmanager/pwmanager/findwndimpl.cpp
@@ -133,6 +133,6 @@ void FindWndImpl::selectionChanged_slot()
 	currFoundPos = -1;
 }
 
-#ifndef PWM_EMBEDDED
-#include "findwndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_findwndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/genpasswd.cpp b/pwmanager/pwmanager/genpasswd.cpp
index 41078b3..82f0c06 100644
--- a/pwmanager/pwmanager/genpasswd.cpp
+++ b/pwmanager/pwmanager/genpasswd.cpp
@@ -21,6 +21,8 @@
 #include "pwmexception.h"
 #include "randomizer.h"
 #include "globalstuff.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 
 /* how often can a char of the same charset be reused in order */
@@ -158,7 +160,7 @@ GenPasswd::dynCharset_element * GenPasswd::selectNextCharset()
 	Randomizer *rnd = Randomizer::obj();
 	if (useFilter) {
 		// find out which charsets are allowed (filtering)
-		QPtrList<dynCharset_element> allowedCharsets;
+		Q3PtrList<dynCharset_element> allowedCharsets;
 		// QPtrList<dynCharset_element>::iterator is not available in QT-3.1
 		unsigned int i, cnt = dynCharset.count();
 		dynCharset_element *p;
diff --git a/pwmanager/pwmanager/genpasswd.h b/pwmanager/pwmanager/genpasswd.h
index 3fa1607..5493891 100644
--- a/pwmanager/pwmanager/genpasswd.h
+++ b/pwmanager/pwmanager/genpasswd.h
@@ -21,7 +21,7 @@
 #define __GENPASSWD_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 /** internal password generator of PwManager */
 class GenPasswd
@@ -70,7 +70,7 @@ protected:
 	/** use the filter? */
 	bool useFilter;
 	/** dynamic charset used for generating the password */
-	QPtrList<dynCharset_element> dynCharset;
+	Q3PtrList<dynCharset_element> dynCharset;
 };
 
 #endif // __GENPASSWD_H
diff --git a/pwmanager/pwmanager/getkeycardwnd.cpp b/pwmanager/pwmanager/getkeycardwnd.cpp
index 89dada2..b8e6174 100644
--- a/pwmanager/pwmanager/getkeycardwnd.cpp
+++ b/pwmanager/pwmanager/getkeycardwnd.cpp
@@ -20,17 +20,20 @@
 #include "getkeycardwnd.h"
 
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
 #include <klocale.h>
 
 
 GetKeyCardWnd::GetKeyCardWnd(QWidget *parent,
-			 const char *name, bool modal, WFlags f)
+			 const char *name, bool modal, Qt::WFlags f)
  : QDialog(parent, name, modal, f)
 {
-	vbox1 = new QVBox(this);
+	vbox1 = new Q3VBox(this);
 	text_label = new QLabel(vbox1);
-	hbox1 = new QHBox(vbox1);
+	hbox1 = new Q3HBox(vbox1);
 	okButton = new QPushButton(i18n("&Ok"), hbox1);
 	cancelButton = new QPushButton(i18n("&Cancel"), hbox1);
 
@@ -62,6 +65,6 @@ void GetKeyCardWnd::okButton_slot()
 	done(1);
 }
 
-#ifndef PWM_EMBEDDED
-#include "getkeycardwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_getkeycardwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/getkeycardwnd.h b/pwmanager/pwmanager/getkeycardwnd.h
index fbe46ee..202e920 100644
--- a/pwmanager/pwmanager/getkeycardwnd.h
+++ b/pwmanager/pwmanager/getkeycardwnd.h
@@ -20,12 +20,14 @@
 #ifndef GETKEYCARDWND_H
 #define GETKEYCARDWND_H
 
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
 /** The equivalent to GetMasterPwWndImpl for chipcards */
 class GetKeyCardWnd : public QDialog
@@ -33,15 +35,15 @@ class GetKeyCardWnd : public QDialog
 	Q_OBJECT
 public:
 	GetKeyCardWnd(QWidget *parent = 0, const char *name = 0,
-		      bool modal = FALSE, WFlags f = 0);
+		      bool modal = FALSE, Qt::WFlags f = 0);
 	~GetKeyCardWnd();
 
 protected slots:
 	void okButton_slot();
 
 protected:
-	QVBox *vbox1;
-	QHBox *hbox1;
+	Q3VBox *vbox1;
+	Q3HBox *hbox1;
 	QLabel *text_label;
 	QPushButton *okButton;
 	QPushButton *cancelButton;
diff --git a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
index 678f05f..7e4bbb7 100644
--- a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
+++ b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
@@ -43,6 +43,9 @@ $Id$
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
 /*
  *  Constructs a getMasterPwWnd as a child of 'parent', with the
@@ -54,13 +57,13 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
     pwLineEdit = new QLineEdit( page, "pwLineEdit" );
     pwLineEdit->setEchoMode( QLineEdit::Password );
 
     QLabel* textLabel1 = new QLabel( pwLineEdit, i18n("Please enter the master-password:"), page, "textLabel1" );
-    textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
+    textLabel1->setAlignment( int( Qt::WordBreak | Qt::AlignCenter ) );
     pageLayout->addWidget(textLabel1);
     pageLayout->addWidget(pwLineEdit);
     
@@ -76,7 +79,7 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
     }
 #endif
 
-    QGridLayout* numberLayout = new QGridLayout( numberBox, 4, 3 );
+    Q3GridLayout* numberLayout = new Q3GridLayout( numberBox, 4, 3 );
     numberLayout->setMargin( 0 );
     numberLayout->setSpacing( 0 );
 
diff --git a/pwmanager/pwmanager/getmasterpwwndimpl.cpp b/pwmanager/pwmanager/getmasterpwwndimpl.cpp
index 6be9618..f741f72 100644
--- a/pwmanager/pwmanager/getmasterpwwndimpl.cpp
+++ b/pwmanager/pwmanager/getmasterpwwndimpl.cpp
@@ -55,6 +55,6 @@ void GetMasterPwWndImpl::slotOk()
 }
 #endif
 
-#ifndef PWM_EMBEDDED
-#include "getmasterpwwndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_getmasterpwwndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/globalstuff.h b/pwmanager/pwmanager/globalstuff.h
index 090fcda..2e8f287 100644
--- a/pwmanager/pwmanager/globalstuff.h
+++ b/pwmanager/pwmanager/globalstuff.h
@@ -34,7 +34,7 @@
 #include <sstream>
 #else
 #include <qstring.h>
-#include <qtextstream.h>
+#include <QTextOStream>
 #endif
 
 #ifndef CONFIG_KEYCARD
@@ -97,7 +97,7 @@ template <class T> inline
 std::string tostr(const T &t)
 {
   QString result;
-  QTextOStream(&result) << t;
+  QTextOStream tmp(&result); tmp << t;
   return result.latin1();
 }
 #endif
diff --git a/pwmanager/pwmanager/htmlgen.cpp b/pwmanager/pwmanager/htmlgen.cpp
index bee8198..be3406a 100644
--- a/pwmanager/pwmanager/htmlgen.cpp
+++ b/pwmanager/pwmanager/htmlgen.cpp
@@ -60,7 +60,7 @@ QString HtmlGen::escapeHtmlText(const QString &str)
 	unsigned int len = str.length(), i;
 	char c;
 	for (i = 0; i < len; ++i) {
-		c = str.at(i);
+		c = str.at(i).toLatin1();
 		switch (c) {
 		case '<':
 			ret.append("&lt;");
diff --git a/pwmanager/pwmanager/ipc.cpp b/pwmanager/pwmanager/ipc.cpp
index 643b022..4c65f1d 100644
--- a/pwmanager/pwmanager/ipc.cpp
+++ b/pwmanager/pwmanager/ipc.cpp
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #else
-#include <qsocket.h>
+#include <q3socket.h>
 #endif
 
 #define END_OF_LINE		'\n'
@@ -77,7 +77,7 @@ Ipc::Ipc()
 	  qDebug("Ipc: socketpair() failed");
 	}
 #endif
-	QSocket* qsock = new QSocket();
+	Q3Socket* qsock = new Q3Socket();
 	qsock->setSocket(sock[0]);
 
 	rdBufSize = INIT_LINEBUF_LEN;
@@ -88,7 +88,7 @@ Ipc::Ipc()
 		qDebug("Ipc: OOM");
 	}
 
-	qsock = new QSocket();
+	qsock = new Q3Socket();
 	qsock->setSocket(sock[0]);
 
 	/*US
@@ -152,7 +152,7 @@ Ipc::Ipc(const Ipc *ipc)
 	sock[0] = ipc->sock[1];
 	sock[1] = ipc->sock[0];
 
-	qSock = new QSocket();
+	qSock = new Q3Socket();
 	qSock->setSocket(sock[0]);
 
 	/*US
@@ -212,6 +212,6 @@ void Ipc::receiveData(int s)
 
 }
 
-#ifndef PWM_EMBEDDED
-#include "ipc.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_ipc.cpp"
 #endif
diff --git a/pwmanager/pwmanager/ipc.h b/pwmanager/pwmanager/ipc.h
index 7bfca02..3248283 100644
--- a/pwmanager/pwmanager/ipc.h
+++ b/pwmanager/pwmanager/ipc.h
@@ -29,7 +29,7 @@
 #ifndef PWM_EMBEDDED
 #include <stdio.h>
 #else
-#include <qsocket.h>
+#include <q3socket.h>
 #endif
 
 class QSocketNotifier;
@@ -74,7 +74,7 @@ protected:
 	/** current receive buffer size */
 	size_t rdBufSize;
 #else
-	QSocket* qSock;
+	Q3Socket* qSock;
 	/** current receive buffer size */
 	unsigned int rdBufSize;
 #endif
diff --git a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp
index b7944c3..1804e88 100644
--- a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp
@@ -22,6 +22,8 @@
 */
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 
@@ -42,7 +44,7 @@ extern "C"
 KCMPwmConfig::KCMPwmConfig(QWidget *parent, const char *name )
   : KCModule( PWMPrefs::instance(), parent, name )
 {
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   mConfigWidget = new PWMConfigWidget( (PWMPrefs*)getPreferences(), this, "mConfigWidget" );
   layout->addWidget( mConfigWidget );
   layout->setSpacing( 0 );
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
index 2c5189c..04771b3 100644
--- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
@@ -22,8 +22,8 @@
 */
 
 #include <qcheckbox.h>
-#include <qframe.h>
-#include <qgroupbox.h>
+#include <q3frame.h>
+#include <q3groupbox.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
@@ -32,7 +32,10 @@
 #include <qspinbox.h>
 #include <qlabel.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
 #include <kconfig.h>
 #include <kdebug.h>
@@ -52,7 +55,7 @@
 PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *name )
   : KPrefsWidget(prefs,  parent, name )
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   QTabWidget *tabWidget = new QTabWidget( this );
@@ -61,7 +64,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   // windowsStyle page
   //////////////////////////////////////////////////////
   QWidget *windowStylePage = new QWidget( this );
-  QGridLayout *windowStyleLayout = new QGridLayout( windowStylePage, 3, 3);
+  Q3GridLayout *windowStyleLayout = new Q3GridLayout( windowStylePage, 3, 3);
   
   int i = 0;
   KPrefsWidRadios * windowStyle = addWidRadios(i18n("Window-style:") ,&(prefs->mMainViewStyle), windowStylePage);
@@ -98,7 +101,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   // File page
   //////////////////////////////////////////////////////
   QWidget *filePage = new QWidget( this );
-  QGridLayout *fileLayout = new QGridLayout( filePage, 3, 2);
+  Q3GridLayout *fileLayout = new Q3GridLayout( filePage, 3, 2);
   
   i = 0;
   QLabel* kcfg_compression_label = new QLabel(i18n("Compression:"), filePage);
@@ -154,7 +157,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   // Timeout page
   //////////////////////////////////////////////////////
   QWidget *timeoutPage = new QWidget( this );
-  QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2);
+  Q3GridLayout *timeoutLayout = new Q3GridLayout( timeoutPage, 3, 2);
 
   i = 0;
   pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" );
@@ -183,7 +186,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   // Autostart page
   //////////////////////////////////////////////////////
   QWidget *autostartPage = new QWidget( this );
-  QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2);
+  Q3GridLayout *autostartLayout = new Q3GridLayout( autostartPage, 3, 2);
 
   i = 0;
 
@@ -203,7 +206,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   // external app page
   //////////////////////////////////////////////////////
   QWidget *externalappPage = new QWidget( this );
-  QGridLayout *externalappLayout = new QGridLayout( externalappPage, 3, 2);
+  Q3GridLayout *externalappLayout = new Q3GridLayout( externalappPage, 3, 2);
 
   i = 0;
 
@@ -223,7 +226,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   // miscelaneous page
   //////////////////////////////////////////////////////
   QWidget *miscPage = new QWidget( this );
-  QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2);
+  Q3GridLayout *miscLayout = new Q3GridLayout( miscPage, 3, 2);
 
   i = 0;
 
@@ -359,7 +362,7 @@ void PWMConfigWidget::setFilePermissions(int perm)
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmconfigwidget.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmconfigwidget.cpp"
 #endif //PWM_EMBEDDED
 
diff --git a/pwmanager/pwmanager/listobjselectwnd.cpp b/pwmanager/pwmanager/listobjselectwnd.cpp
index 59729f1..7da7e95 100644
--- a/pwmanager/pwmanager/listobjselectwnd.cpp
+++ b/pwmanager/pwmanager/listobjselectwnd.cpp
@@ -20,22 +20,25 @@
 #include "listobjselectwnd.h"
 
 #include <klocale.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
 
 ListObjSelectWnd::ListObjSelectWnd(const QString &caption, const QString &titleText,
 				   QWidget *parent, bool multiSel, const char *name,
-				   bool modal, WFlags f)
+				   bool modal, Qt::WFlags f)
  : QDialog(parent, name, modal, f)
 {
-	vbox1 = new QVBox(this);
+	vbox1 = new Q3VBox(this);
 	title = new QLabel(vbox1);
-	list = new QListBox(vbox1);
+	list = new Q3ListBox(vbox1);
 	if (multiSel) {
-		hbox2 = new QHBox(vbox1);
+		hbox2 = new Q3HBox(vbox1);
 		selAllButton = new QPushButton(i18n("&Select all"), hbox2);
 		unselAllButton = new QPushButton(i18n("&Unselect all"), hbox2);
 	}
-	hbox1 = new QHBox(vbox1);
+	hbox1 = new Q3HBox(vbox1);
 	okButton = new QPushButton(i18n("&Ok"), hbox1);
 	cancelButton = new QPushButton(i18n("&Cancel"), hbox1);
 
@@ -45,7 +48,7 @@ ListObjSelectWnd::ListObjSelectWnd(const QString &caption, const QString &titleT
 	resize(250, 300);
 	setCaption(caption);
 	if (multiSel) {
-		list->setSelectionMode(QListBox::Multi);
+		list->setSelectionMode(Q3ListBox::Multi);
 	}
 
 	title->setAlignment(Qt::AlignHCenter | Qt::WordBreak);
@@ -126,6 +129,6 @@ void ListObjSelectWnd::setList(const QStringList &_list)
 	list->insertStringList(_list);
 }
 
-#ifndef PWM_EMBEDDED
-#include "listobjselectwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_listobjselectwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/listobjselectwnd.h b/pwmanager/pwmanager/listobjselectwnd.h
index 3b5f1eb..df3da93 100644
--- a/pwmanager/pwmanager/listobjselectwnd.h
+++ b/pwmanager/pwmanager/listobjselectwnd.h
@@ -21,12 +21,14 @@
 #define LISTOBJSELECTWND_H
 
 #include <qdialog.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
 
 /** Display a list-window for selection of some objects */
@@ -37,7 +39,7 @@ public:
 	ListObjSelectWnd(const QString &caption, const QString &titleText,
 			 QWidget *parent = 0, bool multiSel = false,
 			 const char *name = 0,
-			 bool modal = FALSE, WFlags f = 0);
+			 bool modal = FALSE, Qt::WFlags f = 0);
 	~ListObjSelectWnd();
 
 	void setList(const QStringList &_list);
@@ -62,11 +64,11 @@ public:
 			{ list->clear(); }
 
 protected:
-	QVBox *vbox1;
-	QHBox *hbox1;
-	QHBox *hbox2;
+	Q3VBox *vbox1;
+	Q3HBox *hbox1;
+	Q3HBox *hbox2;
 	QLabel *title;
-	QListBox *list;
+	Q3ListBox *list;
 	QPushButton *okButton;
 	QPushButton *cancelButton;
 	QPushButton *selAllButton;
diff --git a/pwmanager/pwmanager/listviewpwm.cpp b/pwmanager/pwmanager/listviewpwm.cpp
index 0df9431..4253ab1 100644
--- a/pwmanager/pwmanager/listviewpwm.cpp
+++ b/pwmanager/pwmanager/listviewpwm.cpp
@@ -23,6 +23,9 @@
 
 #include <qpainter.h>
 #include <qpixmap.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QKeyEvent>
 
 #include <kiconloader.h>
 
@@ -39,7 +42,7 @@ ListViewPwM::ListViewPwM(QWidget *parent, const char *name)
 
 bool ListViewPwM::event(QEvent *e)
 {
-	if (e->type() == QEvent::LayoutHint)
+	if (e->type() == QEvent::LayoutRequest)
 		emit layoutChanged();
 	if (e->type() == QEvent::KeyPress) {
         QKeyEvent* ke = (QKeyEvent*) e;
@@ -64,8 +67,8 @@ bool ListViewPwM::event(QEvent *e)
 QPixmap * ListViewItemPwM::onPix = 0;
 QPixmap * ListViewItemPwM::offPix = 0;
 
-ListViewItemPwM::ListViewItemPwM(QListView *parent)
- : QCheckListItem(parent, "", QCheckListItem::CheckBox)
+ListViewItemPwM::ListViewItemPwM(Q3ListView *parent)
+ : Q3CheckListItem(parent, "", Q3CheckListItem::CheckBox)
 {
 	if (!onPix) {
 		PWM_ASSERT(!offPix);
@@ -97,7 +100,7 @@ void ListViewItemPwM::paintCell(QPainter *p, const QColorGroup &cg,
 		return;
 	//US BUG: 
 	if (column != COLUMN_DESC) {
-		QCheckListItem::paintCell(p, cg, column, width, align);
+		Q3CheckListItem::paintCell(p, cg, column, width, align);
 		return;
 	}
 	QPixmap *curPix = isOn() ? onPix : offPix;
@@ -120,10 +123,10 @@ void ListViewItemPwM::paintCell(QPainter *p, const QColorGroup &cg,
 	p->translate( pixSpace, 0 );
 
 #endif
-	QListViewItem::paintCell(p, cg, column, width - pixSpace, align);
+	Q3ListViewItem::paintCell(p, cg, column, width - pixSpace, align);
 
 }
 
-#ifndef PWM_EMBEDDED
-#include "listviewpwm.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_listviewpwm.cpp"
 #endif
diff --git a/pwmanager/pwmanager/listviewpwm.h b/pwmanager/pwmanager/listviewpwm.h
index 51008b8..2652939 100644
--- a/pwmanager/pwmanager/listviewpwm.h
+++ b/pwmanager/pwmanager/listviewpwm.h
@@ -21,6 +21,9 @@
 #define __LISTVIEW_H
 
 #include <klistview.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QPixmap>
 
 /** PwManager implementation of the list view.
   * Derived from KListView.
@@ -41,10 +44,10 @@ protected:
 	virtual bool event(QEvent *e);
 };
 
-class ListViewItemPwM : public QCheckListItem
+class ListViewItemPwM : public Q3CheckListItem
 {
 public:
-	ListViewItemPwM(QListView *parent);
+	ListViewItemPwM(Q3ListView *parent);
 
 protected:
 	void paintCell(QPainter *p, const QColorGroup &cg,
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index ee26082..acb0011 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -142,6 +142,7 @@ static void addAuthors(KAboutData *aboutData)
 
 int main(int argc, char *argv[])
 {
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
 	printDebugConfigureInfo();
 #ifndef PWM_EMBEDDED
 	KAboutData aboutData(PACKAGE_NAME, PROG_NAME,
diff --git a/pwmanager/pwmanager/printtext.h b/pwmanager/pwmanager/printtext.h
index 82e31b0..71bc2e0 100644
--- a/pwmanager/pwmanager/printtext.h
+++ b/pwmanager/pwmanager/printtext.h
@@ -15,7 +15,7 @@
 #include <kprinter.h>
 
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #include <qrect.h>
 #include <qpoint.h>
 
@@ -42,7 +42,7 @@ protected:
 	/** painter object */
 	QPainter *paint;
 	/** metrics */
-	QPaintDeviceMetrics *metrics;
+	Q3PaintDeviceMetrics *metrics;
 	/** left field of header */
 	QString headerLeft;
 	/** middle field of header */
diff --git a/pwmanager/pwmanager/pwgenwnd_emb.cpp b/pwmanager/pwmanager/pwgenwnd_emb.cpp
index 429904c..21e0af4 100644
--- a/pwmanager/pwmanager/pwgenwnd_emb.cpp
+++ b/pwmanager/pwmanager/pwgenwnd_emb.cpp
@@ -26,12 +26,15 @@ $Id$
 #include "pwgenwnd_emb.h"
 
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 #include "klocale.h"
 
@@ -46,14 +49,14 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout* pwGenWndLayout = new QVBoxLayout( page, 11, 6, "pwGenWndLayout"); 
+    Q3VBoxLayout* pwGenWndLayout = new Q3VBoxLayout( page, 11, 6, "pwGenWndLayout"); 
 
-    QGroupBox* groupBox1 = new QGroupBox( page, "groupBox1" );
+    Q3GroupBox* groupBox1 = new Q3GroupBox( page, "groupBox1" );
     groupBox1->setTitle( i18n( "Character set:" ) );
     groupBox1->setColumnLayout(0, Qt::Vertical );
     groupBox1->layout()->setSpacing( 6 );
     groupBox1->layout()->setMargin( 11 );
-    QVBoxLayout* groupBox1Layout = new QVBoxLayout( groupBox1->layout() );
+    Q3VBoxLayout* groupBox1Layout = new Q3VBoxLayout( groupBox1->layout() );
     groupBox1Layout->setAlignment( Qt::AlignTop );
 
     int_charLowerCheckBox = new QCheckBox( i18n("Lowercase (abc)"), groupBox1, "int_charLowerCheckBox" );
@@ -80,7 +83,7 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
     int_charBlankCheckBox = new QCheckBox( i18n( "Spaces (blank characters)"), groupBox1, "int_charBlankCheckBox" );
     groupBox1Layout->addWidget( int_charBlankCheckBox );
 
-    QHBoxLayout* layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
+    Q3HBoxLayout* layout7 = new Q3HBoxLayout( 0, 0, 6, "layout7"); 
 
     int_charUserCheckBox = new QCheckBox( i18n("User defined:"), groupBox1, "int_charUserCheckBox" );
     layout7->addWidget( int_charUserCheckBox );
@@ -92,7 +95,7 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
     pwGenWndLayout->addWidget( groupBox1 );
 
 
-    QHBoxLayout* layout8 = new QHBoxLayout( 0, 0, 6, "layout8"); 
+    Q3HBoxLayout* layout8 = new Q3HBoxLayout( 0, 0, 6, "layout8"); 
 
     int_lenSpinBox = new QSpinBox( page, "int_lenSpinBox" );
     QLabel* textLabel2 = new QLabel( int_lenSpinBox, i18n("Password Length:"), page, "textLabel2" );
diff --git a/pwmanager/pwmanager/pwgenwndimpl.cpp b/pwmanager/pwmanager/pwgenwndimpl.cpp
index 5313060..0eb7043 100644
--- a/pwmanager/pwmanager/pwgenwndimpl.cpp
+++ b/pwmanager/pwmanager/pwgenwndimpl.cpp
@@ -34,7 +34,7 @@
 PwGenWndImpl::PwGenWndImpl(QWidget *parent,
 			   const char *name,
 			   bool modal,
-			   WFlags fl)
+			   Qt::WFlags fl)
  : pwGenWnd(parent, name, modal, fl)
 {
 }
diff --git a/pwmanager/pwmanager/pwgenwndimpl.h b/pwmanager/pwmanager/pwgenwndimpl.h
index 994ff2f..1e706a1 100644
--- a/pwmanager/pwmanager/pwgenwndimpl.h
+++ b/pwmanager/pwmanager/pwgenwndimpl.h
@@ -33,7 +33,7 @@ public:
 	PwGenWndImpl(QWidget *parent = 0,
 		     const char *name = 0,
 		     bool modal = FALSE,
-		     WFlags fl = 0);
+		     Qt::WFlags fl = 0);
 #else
 	PwGenWndImpl( QWidget* parent = 0, const char* name = 0);
 #endif
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 8373850..694fb13 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -25,6 +25,12 @@
 #include <kmessagebox.h>
 
 #include <qstatusbar.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QHideEvent>
+#include <QFocusEvent>
+#include <QCloseEvent>
 
 #ifndef PWM_EMBEDDED
 #include <kmenubar.h>
@@ -186,7 +192,7 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
 	initToolbar();
 	initMetrics();
 	setVirgin(virginity);
-	setFocusPolicy(QWidget::WheelFocus);
+	setFocusPolicy(Qt::WheelFocus);
 #ifndef PWM_EMBEDDED
 	statusBar()->show();
 #endif
@@ -240,20 +246,20 @@ void PwM::initMenubar()
 	optionsPopup = new KPopupMenu(this);
 
 // "file" popup menu
-	filePopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("filenew", KIcon::Small)),
 			      i18n("&New"), this,
 			      SLOT(new_slot()), 0, BUTTON_POPUP_FILE_NEW);
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileopen", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileopen", KIcon::Small)),
 			      i18n("&Open"), this,
 			      SLOT(open_slot()), 0, BUTTON_POPUP_FILE_OPEN);
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileclose", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileclose", KIcon::Small)),
 			      i18n("&Close"), this,
 			      SLOT(close_slot()), 0, BUTTON_POPUP_FILE_CLOSE);
 	filePopup->insertSeparator();
-	filePopup->insertItem(QIconSet(picons->loadIcon("filesave", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("filesave", KIcon::Small)),
 			      i18n("&Save"), this,
 			      SLOT(save_slot()), 0, BUTTON_POPUP_FILE_SAVE);
-	filePopup->insertItem(QIconSet(picons->loadIcon("filesaveas", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("filesaveas", KIcon::Small)),
 			      i18n("Save &as..."),
 			      this, SLOT(saveAs_slot()), 0,
 			      BUTTON_POPUP_FILE_SAVEAS);
@@ -269,7 +275,7 @@ void PwM::initMenubar()
 	exportPopup->insertItem(i18n("&KWallet..."), this,
 				SLOT(exportToKWallet()), 0, BUTTON_POPUP_EXPORT_KWALLET);
 #endif
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileexport", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileexport", KIcon::Small)),
 			      i18n("E&xport"), exportPopup,
 			      BUTTON_POPUP_FILE_EXPORT);
 	// "file/import" popup menu
@@ -283,87 +289,87 @@ void PwM::initMenubar()
 	importPopup->insertItem(i18n("&KWallet..."), this,
 				SLOT(importKWallet()), 0, BUTTON_POPUP_IMPORT_KWALLET);
 #endif
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileimport", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileimport", KIcon::Small)),
 			      i18n("I&mport"), importPopup,
 			      BUTTON_POPUP_FILE_IMPORT);
 	filePopup->insertSeparator();
 #if 0
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileprint", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileprint", KIcon::Small)),
 			      i18n("&Print..."), this,
 			      SLOT(print_slot()), 0, BUTTON_POPUP_FILE_PRINT);
 	filePopup->insertSeparator();
 #endif
-	filePopup->insertItem(QIconSet(picons->loadIcon("exit", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("exit", KIcon::Small)),
 			      i18n("&Quit"), this,
 			      SLOT(quitButton_slot()), 0, BUTTON_POPUP_FILE_QUIT);
 	menuBar()->insertItem(i18n("&File"), filePopup);
 // "manage" popup menu
-	managePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)),
+	managePopup->insertItem(QIcon(picons->loadIcon("pencil", KIcon::Small)),
 				i18n("&Add password"), this,
 				SLOT(addPwd_slot()), 0,
 				BUTTON_POPUP_MANAGE_ADD);
 	managePopup->insertSeparator();
-	managePopup->insertItem(QIconSet(picons->loadIcon("edit", KIcon::Small)),
+	managePopup->insertItem(QIcon(picons->loadIcon("edit", KIcon::Small)),
 				i18n("&Edit"), this, SLOT(editPwd_slot()), 0,
 				BUTTON_POPUP_MANAGE_EDIT);
-	managePopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
+	managePopup->insertItem(QIcon(picons->loadIcon("editdelete", KIcon::Small)),
 				i18n("&Delete"), this, SLOT(deletePwd_slot()),
 				0, BUTTON_POPUP_MANAGE_DEL);
 	managePopup->insertSeparator();
-	managePopup->insertItem(QIconSet(picons->loadIcon("rotate", KIcon::Small)),
+	managePopup->insertItem(QIcon(picons->loadIcon("rotate", KIcon::Small)),
 				i18n("Change &Master Password"), this,
 				SLOT(changeMasterPwd_slot()), 0,
 				BUTTON_POPUP_MANAGE_CHANGEMP);
 	menuBar()->insertItem(i18n("&Manage"), managePopup);
 // "chipcard" popup menu
 #ifdef CONFIG_KEYCARD
-	chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
+	chipcardPopup->insertItem(QIcon(picons->loadIcon("filenew", KIcon::Small)),
 				  i18n("&Generate new key-card"), this,
 				  SLOT(genNewCard_slot()), 0,
 				  BUTTON_POPUP_CHIPCARD_GENNEW);
-	chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
+	chipcardPopup->insertItem(QIcon(picons->loadIcon("editdelete", KIcon::Small)),
 				  i18n("&Erase key-card"), this,
 				  SLOT(eraseCard_slot()), 0,
 				  BUTTON_POPUP_CHIPCARD_DEL);
-	chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)),
+	chipcardPopup->insertItem(QIcon(picons->loadIcon("", KIcon::Small)),
 				  i18n("Read card-&ID"), this,
 				  SLOT(readCardId_slot()), 0,
 				  BUTTON_POPUP_CHIPCARD_READID);
 	chipcardPopup->insertSeparator();
-	chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)),
+	chipcardPopup->insertItem(QIcon(picons->loadIcon("2rightarrow", KIcon::Small)),
 				  i18n("&Make card backup-image"), this,
 				  SLOT(makeCardBackup_slot()), 0,
 				  BUTTON_POPUP_CHIPCARD_SAVEBACKUP);
-	chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)),
+	chipcardPopup->insertItem(QIcon(picons->loadIcon("2leftarrow", KIcon::Small)),
 				  i18n("&Replay card backup-image"), this,
 				  SLOT(replayCardBackup_slot()), 0,
 				  BUTTON_POPUP_CHIPCARD_REPLAYBACKUP);
 	menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup);
 #endif // CONFIG_KEYCARD
 // "view" popup menu
-	viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)),
+	viewPopup->insertItem(QIcon(picons->loadIcon("find", KIcon::Small)),
 				i18n("&Find"), this,
 				SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND);
 	viewPopup->insertSeparator();
-	viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)),
+	viewPopup->insertItem(QIcon(picons->loadIcon("halfencrypted", KIcon::Small)),
 				i18n("&Lock all entries"), this,
 				SLOT(lockWnd_slot()), 0,
 				BUTTON_POPUP_VIEW_LOCK);
-	viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)),
+	viewPopup->insertItem(QIcon(picons->loadIcon("encrypted", KIcon::Small)),
 				i18n("&Deep-lock all entries"), this,
 				SLOT(deepLockWnd_slot()), 0,
 				BUTTON_POPUP_VIEW_DEEPLOCK);
-	viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)),
+	viewPopup->insertItem(QIcon(picons->loadIcon("decrypted", KIcon::Small)),
 				i18n("&Unlock all entries"), this,
 				SLOT(unlockWnd_slot()), 0,
 				BUTTON_POPUP_VIEW_UNLOCK);
 	menuBar()->insertItem(i18n("&View"), viewPopup);
 // "options" popup menu
-	optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+	optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
 				 i18n("&Configure PwM/Pi..."), this,
                  SLOT(config_slot()),0,
 				 BUTTON_POPUP_OPTIONS_CONFIG);
-	optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+	optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
 				 i18n("Global Settings..."), this,
                  SLOT(config_global_slot()),0,
 				 BUTTON_POPUP_OPTIONS_GLOBAL_CONFIG);
@@ -376,7 +382,7 @@ void PwM::initMenubar()
 #ifndef PWM_EMBEDDED
 	helpPopup = helpMenu(QString::null, false);
 #else
-	optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+	optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
 				 i18n("C&ategories..."), this,
                  SLOT(category_slot()),0,
 				 BUTTON_POPUP_OPTIONS_CATEGORY);
@@ -922,12 +928,12 @@ void PwM::config_slot()
 		++i;
 	}
 
-	const QValueList<PwM *> *ml = init->mainWndList();
+	const Q3ValueList<PwM *> *ml = init->mainWndList();
 #ifndef PWM_EMBEDDED
-	QValueList<PwM *>::const_iterator i2 = ml->begin(),
+	Q3ValueList<PwM *>::const_iterator i2 = ml->begin(),
 					  end2 = ml->end();
 #else
-	QValueList<PwM *>::ConstIterator i2 = ml->begin(),
+	Q3ValueList<PwM *>::ConstIterator i2 = ml->begin(),
 					  end2 = ml->end();
 #endif
 	PwM *pwm;
@@ -1594,6 +1600,6 @@ void PwM::removeSyncInfo( QString syncProfile)
 #endif
 
 
-#ifndef PWM_EMBEDDED
-#include "pwm.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwm.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index c4bbb4e..450d13f 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -36,6 +36,11 @@
 #include <kaction.h>
 
 #include <qglobal.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <QFocusEvent>
+#include <Q3PopupMenu>
+#include <QHideEvent>
 
 #include "pwmview.h"
 #include "pwmexception.h"
@@ -50,9 +55,9 @@ class KSyncManager;
 
 /** PwM is the base class of the project */
 #ifndef PWM_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwM : public KMainWindow
-//MOC_SKIP_END
+#endif
 #else
 class PwM : public KMainWindow, public KSyncInterface
 #endif
@@ -284,7 +289,7 @@ protected:
 
     // LR *******************************
     // sync stuff!
-    QPopupMenu *syncPopup;
+    Q3PopupMenu *syncPopup;
     KSyncManager* syncManager;
 #endif
 
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 7efe45c..d6d8dbe 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -11,8 +11,8 @@ DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION
 #DEFINES += CONFIG_DEBUG
 LIBS += -L../libcrypt/
 LIBS += -L../../bin/
-LIBS += -lmicrokde
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokde
+LIBS += -lxmicrokdepim
 LIBS += -lzlib
 LIBS += -lkpmicrocipher
 LIBS += -lkpmicroerror
@@ -175,3 +175,5 @@ kcmconfigs/pwmconfigwidget.cpp
 
 
 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 6b68514..e80d1ae 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -14,9 +14,9 @@ DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY
 #DEFINES += CONFIG_DEBUG
 
 LIBS += -L../libcrypt/$(PLATFORM)
-LIBS += -lmicrokde
+LIBS += -lxmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokdepim
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 LIBS += -lzlib
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
@@ -48,6 +48,7 @@
 #include <qsize.h>
 #include <qfileinfo.h>
 #include <qfile.h>
+#include  <QDesktopWidget>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -481,7 +482,8 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
 		char rnd_buf[5];
 		sprintf(rnd_buf, "%X%X%X%X", rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF,
 			rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF);
-		tmpFileMoved = filename + "." + rnd_buf + ".mv";
+		tmpFileMoved = filename; tmpFileMoved += '.';
+		tmpFileMoved += rnd_buf; tmpFileMoved += ".mv";
 		if (!copyFile(filename, tmpFileMoved))
 			return e_openFile;
 		if (!QFile::remove(filename)) {
@@ -491,7 +493,7 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
 		}
 	}
 	f.setName(filename);
-	if (!f.open(IO_ReadWrite)) {
+	if (!f.open(QIODevice::ReadWrite)) {
 		ret = e_openFile;
 		goto out_moveback;
 	}
@@ -634,7 +636,7 @@ PwMerror PwMDoc::openDoc(const QString *file, int openLocked)
 		goto out_success;
 	}
 
-	if (!f.open(IO_ReadOnly))
+	if (!f.open(QIODevice::ReadOnly))
 		return e_openFile;
 
 	ret = checkHeader(&cryptAlgo, &currentPw, &compress, &headerLen,
@@ -1003,10 +1005,10 @@ bool PwMDoc::copyFile(const QString &src, const QString &dst)
 			return false;
 	}
 	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();
 		return false;
 	}
@@ -1485,7 +1487,7 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
 	PWM_ASSERT(pw);
 	PWM_ASSERT(f);
 
-	unsigned int cryptLen = f->size() - pos;
+	size_t cryptLen = f->size() - pos;
 	byte *encrypted = new byte[cryptLen];
 	byte *decrypted = new byte[cryptLen];
 
@@ -1525,9 +1527,9 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
 			return e_cryptNotImpl;
 		LibGCryptIf gc;
 		PwMerror err;
-		err = gc.decrypt(&decrypted,
+		err = gc.decrypt((unsigned char **)&decrypted,
 				 &cryptLen,
-				 encrypted,
+				 (unsigned char*)encrypted,
 				 cryptLen,
 				 reinterpret_cast<const unsigned char *>(pw->latin1()),
 				 pw->length(),
@@ -2433,7 +2435,7 @@ PwMerror PwMDoc::exportToText(const QString *file)
 			return e_accessFile;
 	}
 	QFile f(*file);
-	if (!f.open(IO_ReadWrite))
+	if (!f.open(QIODevice::ReadWrite))
 		return e_openFile;
 
 	if (!unlockAll_tempoary()) {
@@ -2707,7 +2709,7 @@ PwMerror PwMDoc::importText_PwM(const QString *file)
 	string curCat;
 	unsigned int entriesRead = 0;
 	PwMDataItem currItem;
-	bool res = f.open(IO_ReadOnly);
+	bool res = f.open(QIODevice::ReadOnly);
 	if (res == false)
 	  return e_openFile;
 
@@ -3629,6 +3631,6 @@ QStringList PwMDoc::getIDEntryList()
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmdoc.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmdoc.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 144831f..07c97a9 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -212,7 +212,7 @@ struct PwMDataItem
   //US ENH: we need this operator to compare two items if we have no unique ids
   //available. Generaly this happens before the first sync
 
-	bool PwMDataItem::operator==( const PwMDataItem &a ) const
+	bool operator==( const PwMDataItem &a ) const
 	{
 	  //qDebug("oper==%s", a.desc.c_str());
 	  if ( desc != a.desc ) return false;
@@ -227,7 +227,7 @@ struct PwMDataItem
 
   //US ENH: this sync method actually copies all values from the parameter like the =operator
   //does with two exceptions: listViewPos will not be changed, and the launcher only if required.
-  bool PwMDataItem::syncItem(const PwMDataItem &a, bool syncLauncher=true )
+  bool syncItem(const PwMDataItem &a, bool syncLauncher=true )
   {
     desc = a.desc;
     name = a.name;
diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp
index a9916c2..ea96509 100644
--- a/pwmanager/pwmanager/pwmdocui.cpp
+++ b/pwmanager/pwmanager/pwmdocui.cpp
@@ -465,6 +465,6 @@ QString PwMDocUi::string_defaultTitle()
 	return i18n("Untitled");
 }
 
-#ifndef PWM_EMBEDDED
-#include "pwmdocui.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmdocui.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index d59d4d8..15e21ee 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -20,6 +20,8 @@
 #include "pwminit.h"
 #include "randomizer.h"
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #ifndef PWM_EMBEDDED
 #include "selftest.h"
@@ -92,12 +94,12 @@ PwMInit::~PwMInit()
 #ifndef PWM_EMBEDDED
 	SelfTest::cancel();
 	// close all open mainwnds
-	QValueList<PwM *>::iterator i = _mainWndList.begin(),
+	Q3ValueList<PwM *>::iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
 
 #else
 	// close all open mainwnds
-	QValueList<PwM *>::Iterator i = _mainWndList.begin(),
+	Q3ValueList<PwM *>::Iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
 #endif
 	while (i != end) {
@@ -426,11 +428,11 @@ again:
 	}
 #ifndef PWM_EMBEDDED
 	// find the closed window in the "mainWndList" and delete it.
-	QValueList<PwM *>::iterator i = _mainWndList.begin(),
+	Q3ValueList<PwM *>::iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
 #else
 	// find the closed window in the "mainWndList" and delete it.
-	QValueList<PwM *>::Iterator i = _mainWndList.begin(),
+	Q3ValueList<PwM *>::Iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
 #endif
 	while (i != end) {
@@ -573,12 +575,12 @@ void PwMInit::minimizeAllMainWnd(bool toTray)
 	if (!_mainWndList.count())
 		return;
 #endif
-	const QValueList<PwM *> *ml = mainWndList();
+	const Q3ValueList<PwM *> *ml = mainWndList();
 #ifndef PWM_EMBEDDED
-	QValueList<PwM *>::const_iterator it = ml->begin(),
+	Q3ValueList<PwM *>::const_iterator it = ml->begin(),
 					  end = ml->end();
 #else
-	QValueList<PwM *>::ConstIterator it = ml->begin(),
+	Q3ValueList<PwM *>::ConstIterator it = ml->begin(),
 					  end = ml->end();
 #endif
 	PwM *wnd;
@@ -624,7 +626,6 @@ PwMApplication::PwMApplication(int & argc, char ** argv)
   	 : QApplication( argc, argv )
 	  , init (0)
 { 
-  setStyle( new QPlatinumStyle ());
   QString hdir = QDir::homeDirPath();
   // there is a bug when creating dirs for WIN 98
   // it is difficult to fix, because we have no WIN 98 runnung
@@ -656,6 +657,6 @@ PwMApplication::~PwMApplication()
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwminit.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwminit.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwminit.h b/pwmanager/pwmanager/pwminit.h
index bf72093..32d1b4f 100644
--- a/pwmanager/pwmanager/pwminit.h
+++ b/pwmanager/pwmanager/pwminit.h
@@ -20,7 +20,7 @@
 #ifndef __PWMINIT_H
 #define __PWMINIT_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qobject.h>
 #ifndef PWM_EMBEDDED 
 #include <kuniqueapplication.h>
@@ -30,7 +30,6 @@
 #include <qpe/qpeapplication.h>
 #else //DESKTOP_VERSION
 #include <qapplication.h>
-#include <qplatinumstyle.h>
 #endif //DESKTOP_VERSION
 
 #include <kapplication.h>
@@ -50,7 +49,7 @@ class PwMInit;
 
 /** main application class */
 #ifndef PWM_EMBEDDED 
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwMApplication : public KUniqueApplication
 {
 public:
@@ -68,7 +67,7 @@ public:
 protected:
 	PwMInit *init;
 };
-//MOC_SKIP_END
+#endif
 #else //PWM_EMBEDDED
 
 #ifndef DESKTOP_VERSION
@@ -154,7 +153,7 @@ public:
 	PwMTray * tray()
 			{ return _tray; }
 	/** returns a list of all open main windows */
-	const QValueList<PwM *> * mainWndList()
+	const Q3ValueList<PwM *> * mainWndList()
 			{ return &_mainWndList; }
 	/** create a new document */
 	PwMDoc * createDoc();
@@ -214,7 +213,7 @@ protected:
 	/** pointer to the tray icon */
 	PwMTray *_tray;
 	/** list of all open main windows */
-	QValueList<PwM *> _mainWndList;
+	Q3ValueList<PwM *> _mainWndList;
 	/** saved command line options. */
 	savedCmd_t savedCmd;
 };
diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h
index 1f6a35c..42f7c2e 100644
--- a/pwmanager/pwmanager/pwmprefs.h
+++ b/pwmanager/pwmanager/pwmprefs.h
@@ -28,6 +28,8 @@
 
 #include <qstringlist.h>
 #include <qsize.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <kpimprefs.h>
 
@@ -150,8 +152,8 @@ public:
   bool mClose;
 
   //US ENH
-  QValueList<int> mCommentSplitter;
-  QValueList<int> mCategorySplitter;
+  Q3ValueList<int> mCommentSplitter;
+  Q3ValueList<int> mCategorySplitter;
 
 
     // US introduce a nonconst way to return the config object.
diff --git a/pwmanager/pwmanager/pwmtray.cpp b/pwmanager/pwmanager/pwmtray.cpp
index fe074ca..478116f 100644
--- a/pwmanager/pwmanager/pwmtray.cpp
+++ b/pwmanager/pwmanager/pwmtray.cpp
@@ -32,6 +32,9 @@
 #endif
 
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QMouseEvent>
 
 
 void ActiveTreeItem::execIt()
@@ -87,12 +90,12 @@ void ActiveTreeItem::execIt()
 			break;
 		} case openMainWnd: {
 			// search if there is already an open window.
-			const QValueList<PwM *> *wl = tray->init->mainWndList();
+			const Q3ValueList<PwM *> *wl = tray->init->mainWndList();
 #ifndef PWM_EMBEDDED
-			QValueList<PwM *>::const_iterator i = wl->begin(),
+			Q3ValueList<PwM *>::const_iterator i = wl->begin(),
 							  end = wl->end();
 #else
-			QValueList<PwM *>::ConstIterator i = wl->begin(),
+			Q3ValueList<PwM *>::ConstIterator i = wl->begin(),
 							  end = wl->end();
 #endif
 			PwM *wnd;
@@ -178,7 +181,7 @@ void PwMTray::buildMain()
 void PwMTray::insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
 				   ActiveTreeItem::Task task, PwMDoc *doc,
 				   int docCategory, int docEntry,
-				   QValueList<int> *activeItemsList)
+				   Q3ValueList<int> *activeItemsList)
 {
 	ActiveTreeItem *activeItem;
 	int id;
@@ -196,7 +199,7 @@ void PwMTray::insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
 }
 
 void PwMTray::rebuildTree(KPopupMenu *popup, PwMDoc *doc,
-			  QValueList<int> *activeItems)
+			  Q3ValueList<int> *activeItems)
 {
 	PWM_ASSERT(doc);
 	PWM_ASSERT(popup);
@@ -334,11 +337,11 @@ void PwMTray::updateTree(PwMDoc *document)
 	if (treeItemNum != -1) {
 		// delete all *old* active items
 		KPopupMenu *ctxMenu = contextMenu();
-		QValueList<int> *oldItems = &tree[treeItemNum].activeItems;
+		Q3ValueList<int> *oldItems = &tree[treeItemNum].activeItems;
 #ifndef PWM_EMBEDDED
-		QValueList<int>::iterator i = oldItems->begin();
+		Q3ValueList<int>::iterator i = oldItems->begin();
 #else
-		QValueList<int>::Iterator i = oldItems->begin();
+		Q3ValueList<int>::Iterator i = oldItems->begin();
 #endif
 		while (i != oldItems->end()) {
 			ctxMenu->removeItem(*i);
@@ -481,6 +484,6 @@ void PwMTray::undock()
 	// Attention! "this" is already deleted here!
 }
 
-#ifndef PWM_EMBEDDED
-#include "pwmtray.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmtray.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmtray.h b/pwmanager/pwmanager/pwmtray.h
index ffb625e..b1145e0 100644
--- a/pwmanager/pwmanager/pwmtray.h
+++ b/pwmanager/pwmanager/pwmtray.h
@@ -27,7 +27,10 @@
 #include <kpopupmenu.h>
 
 #include <qpainter.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QMenuItem>
 
 //#include "pwmexception.h"
 
@@ -36,8 +39,7 @@ class PwMDoc;
 class PwMTray;
 
 /* wrapper to workaround MOC problems */
-class __ActiveTreeItem : public QCustomMenuItem
-		       , public QObject
+class __ActiveTreeItem : public QMenuItem
 {
 public:
 	__ActiveTreeItem() {}
@@ -87,14 +89,14 @@ public:
 		   bool /*enabled*/, int x, int y, int w, int h)
 		{
 			p->setFont(font);
-			p->drawText(x, y, w, h, AlignLeft | AlignVCenter |
-				    DontClip | ShowPrefix, text);
+			p->drawText(x, y, w, h, Qt::AlignLeft | Qt::AlignVCenter |
+				    Qt::DontClip | Qt::ShowPrefix, text);
 		}
 
 	QSize sizeHint()
 		{
-			return QFontMetrics(font).size(AlignLeft | AlignVCenter |
-						       ShowPrefix | DontClip,  text);
+			return QFontMetrics(font).size(Qt::AlignLeft | Qt::AlignVCenter |
+						       Qt::ShowPrefix | Qt::DontClip,  text);
 		}
 
 	bool fullSpan() const
@@ -122,7 +124,7 @@ protected:
 
 /** tray icon implementation */
 #ifndef PWM_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwMTray : public KSystemTray
 {
 	Q_OBJECT
@@ -134,7 +136,7 @@ class PwMTray : public KSystemTray
 		int menuId;
 		PwMDoc *doc;
 		KPopupMenu *menu;
-		QValueList<int> activeItems; // ids of all active items
+		Q3ValueList<int> activeItems; // ids of all active items
 	};
 
 public: 
@@ -170,7 +172,7 @@ protected:
 	/** holds a list of all open files, its documents and
 	  * its menuIDs
 	  */
-	QValueList<struct treeItem> tree;
+	Q3ValueList<struct treeItem> tree;
 	/** pointer to init */
 	PwMInit *init;
 
@@ -185,7 +187,7 @@ protected:
 	void buildMain();
 	/** rebuilds the tree for the given KPopupMenu entry */
 	void rebuildTree(KPopupMenu *popup, PwMDoc *doc,
-			 QValueList<int> *activeItems);
+			 Q3ValueList<int> *activeItems);
 	/** insert a new tree-entry for the given doc and returns the ID.*/
 	int insertTreeEntry(PwMDoc *doc, KPopupMenu **popup);
 	/** removes a tree entry */
@@ -194,7 +196,7 @@ protected:
 	void insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
 				  ActiveTreeItem::Task task, PwMDoc *doc,
 				  int docCategory, int docEntry,
-				  QValueList<int> *activeItemsList);
+				  Q3ValueList<int> *activeItemsList);
 	/** mouse event on icon */
 	void mouseReleaseEvent(QMouseEvent *e);
 	/** inserts the items for the main window control
@@ -202,7 +204,7 @@ protected:
 	  */
 	void insertMainWndCtrl(KPopupMenu *menu, PwMDoc *doc);
 };
-//MOC_SKIP_END
+#endif
 #else
 class PwMTray : public QWidget 
 {
@@ -215,7 +217,7 @@ class PwMTray : public QWidget
 		int menuId;
 		PwMDoc *doc;
 		KPopupMenu *menu;
-		QValueList<int> activeItems; // ids of all active items
+		Q3ValueList<int> activeItems; // ids of all active items
 	};
 
 public: 
@@ -255,7 +257,7 @@ protected:
 	/** holds a list of all open files, its documents and
 	  * its menuIDs
 	  */
-	QValueList<struct treeItem> tree;
+	Q3ValueList<struct treeItem> tree;
 	/** pointer to init */
 	PwMInit *init;
 
@@ -270,7 +272,7 @@ protected:
 	void buildMain();
 	/** rebuilds the tree for the given KPopupMenu entry */
 	void rebuildTree(KPopupMenu *popup, PwMDoc *doc,
-			 QValueList<int> *activeItems);
+			 Q3ValueList<int> *activeItems);
 	/** insert a new tree-entry for the given doc and returns the ID.*/
 	int insertTreeEntry(PwMDoc *doc, KPopupMenu **popup);
 	/** removes a tree entry */
@@ -279,7 +281,7 @@ protected:
 	void insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
 				  ActiveTreeItem::Task task, PwMDoc *doc,
 				  int docCategory, int docEntry,
-				  QValueList<int> *activeItemsList);
+				  Q3ValueList<int> *activeItemsList);
 	/** mouse event on icon */
 	void mouseReleaseEvent(QMouseEvent *e);
 	/** inserts the items for the main window control
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index 2533487..68500d0 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -35,7 +35,15 @@
 #include <qlineedit.h>
 #include <qpoint.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
 //US ENH: wouldn't it be a good idea if we could use this consts everywhere else.
 //US ENH: for examle in listviewpwm.cpp
@@ -76,7 +84,7 @@ PwMView::~PwMView()
 
 void PwMView::initCtxMenu()
 {
-	ctxMenu = new QPopupMenu(this);
+	ctxMenu = new Q3PopupMenu(this);
 	ctxMenu->insertItem(i18n("&Add password"), mainClass, SLOT(addPwd_slot()));
 	ctxMenu->insertSeparator();
 	ctxMenu->insertItem(i18n("&Edit"), mainClass, SLOT(editPwd_slot()));
@@ -106,7 +114,7 @@ void PwMView::resizeEvent(QResizeEvent *)
 	resizeView(size());
 }
 
-void PwMView::refreshCommentTextEdit(QListViewItem *curItem)
+void PwMView::refreshCommentTextEdit(Q3ListViewItem *curItem)
 {
 	PWM_ASSERT(commentBox);
 	if (!curItem)
@@ -136,14 +144,14 @@ void PwMView::keyReleaseEvent(QKeyEvent * /*e*/)
 
 bool PwMView::getCurEntryIndex(unsigned int *index)
 {
-	QListViewItem *current = lv->currentItem();
+	Q3ListViewItem *current = lv->currentItem();
 	if (!current)
 		return false;
 	return getDocEntryIndex(index, current);
 }
 
 bool PwMView::getDocEntryIndex(unsigned int *index,
-			       const QListViewItem *item)
+			       const Q3ListViewItem *item)
 {
 	vector<unsigned int> foundPositions;
 	PwMDataItem curItem;
@@ -166,12 +174,12 @@ bool PwMView::getDocEntryIndex(unsigned int *index,
 	return false;
 }
 
-void PwMView::handleToggle(QListViewItem *item)
+void PwMView::handleToggle(Q3ListViewItem *item)
 {
 	PWM_ASSERT(doc);
 	if (!item)
 		return;
-	QCheckListItem *clItem = (QCheckListItem *)item;
+	Q3CheckListItem *clItem = (Q3CheckListItem *)item;
 	QString curCat(getCurrentCategory());
 
 	// find document position of this entry.
@@ -195,7 +203,7 @@ void PwMView::handleToggle(QListViewItem *item)
 	doc->lockAt(curCat, curEntryDocIndex, !clItem->isOn());
 }
 
-void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int)
+void PwMView::handleRightClick(Q3ListViewItem *item, const QPoint &point, int)
 {
 	if (!item)
 		return;
@@ -274,7 +282,7 @@ void PwMView::shiftToView()
 	  lv->setColumnText(COLUMN_PW, catItem->pw_text.c_str());
 	}
 
-	QCheckListItem *newItem;
+	Q3CheckListItem *newItem;
 	vector<PwMDataItem>::iterator it = tmpSorted.begin(),
 				      end = tmpSorted.end();
 	while (it != end) {
@@ -313,7 +321,7 @@ void PwMView::reorgLp()
 		return;
 	PWM_ASSERT(doc);
 	PWM_ASSERT(!doc->isDocEmpty());
-	QListViewItem *currItem;
+	Q3ListViewItem *currItem;
 	vector<unsigned int> foundPos;
 	/* This searchIn _should_ be:
 	 *	const unsigned int searchIn = SEARCH_IN_DESC;
@@ -355,7 +363,7 @@ void PwMView::reorgLp()
 
 void PwMView::selAt(int index)
 {
-	QListViewItem *item = lv->itemAtIndex(index);
+	Q3ListViewItem *item = lv->itemAtIndex(index);
 	if (!item)
 		return;
 	lv->setCurrentItem(item);
@@ -479,7 +487,7 @@ void PwMView::copyCommentToClip()
 
 
 PwMDataItemView::PwMDataItemView( QWidget *parent, const char *name )
-  : QTextBrowser( parent, name )
+  : Q3TextBrowser( parent, name )
 
 
 {
@@ -566,24 +574,24 @@ PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool t
     findButton( User1 )->setText( i18n("Local"));
     QWidget* topframe = new QWidget( this );
     setMainWidget( topframe );
-    QBoxLayout* bl;
+    Q3BoxLayout* bl;
     if ( QApplication::desktop()->width() < 640 ) {
-        bl = new QVBoxLayout( topframe  );
+        bl = new Q3VBoxLayout( topframe  );
     } else {
-        bl = new QHBoxLayout( topframe  );
+        bl = new Q3HBoxLayout( topframe  );
     }
-    QVBox* subframe = new QVBox( topframe );
+    Q3VBox* subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     QLabel* lab = new QLabel( i18n("Local Entry"), subframe ); 
     if ( takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     PwMDataItemView * av = new PwMDataItemView( subframe );
     av->setPwMDataItem( loc );
-    subframe = new QVBox( topframe );
+    subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     lab = new QLabel( i18n("Remote Entry"), subframe  ); 
     if ( !takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     av = new PwMDataItemView( subframe );
     av->setPwMDataItem( rem );
     QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); 
@@ -618,6 +626,6 @@ void PwMDataItemChooser::slot_local()
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmview.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmview.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmview.h b/pwmanager/pwmanager/pwmview.h
index e42b17a..8f60063 100644
--- a/pwmanager/pwmanager/pwmview.h
+++ b/pwmanager/pwmanager/pwmview.h
@@ -41,7 +41,11 @@
 #include <qevent.h>
 #include <qfont.h>
 #include <qobject.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QKeyEvent>
+#include <Q3PopupMenu>
 
 #include <vector>
 #include <string>
@@ -77,7 +81,7 @@ public:
 	  * Note: This func only serches in the current category.
 	  */
 	bool getDocEntryIndex(unsigned int *index,
-			      const QListViewItem *item);
+			      const Q3ListViewItem *item);
 
 public slots:
 	/** update the view (call if dirty) */
@@ -89,9 +93,9 @@ public slots:
 	/** (re)sort all items and (re)shift them to listView. */
 	void shiftToView();
 	/** handle clicking on an item */
-	void handleToggle(QListViewItem *item);
+	void handleToggle(Q3ListViewItem *item);
 	/** handle right-clicking on an item */
-	void handleRightClick(QListViewItem *item, const QPoint &point, int);
+	void handleRightClick(Q3ListViewItem *item, const QPoint &point, int);
 	/** selects the item at "index" */
 	void selAt(int index);
 	/** rename category button pressed */
@@ -101,7 +105,7 @@ public slots:
 
 protected:
 	/** right-click context-menu */
-	QPopupMenu *ctxMenu;
+	Q3PopupMenu *ctxMenu;
 
 protected:
 	/** update the categories from document */
@@ -124,7 +128,7 @@ protected:
 
 protected slots:
 	/** changes the comment text-edit, because a new item has been selected */
-	void refreshCommentTextEdit(QListViewItem *curItem);
+	void refreshCommentTextEdit(Q3ListViewItem *curItem);
 	/** copy pw to clipboard */
 	void copyPwToClip();
 	/** copy name to clipboard */
@@ -152,7 +156,7 @@ private:
 
 //US ENH basic widget to view an password entry. We need it for the sync stuff.
 //But might be oif interest for other functionalities as well.
-class PwMDataItemView : public QTextBrowser
+class PwMDataItemView : public Q3TextBrowser
 {
   public:
     PwMDataItemView( QWidget *parent = 0, const char *name = 0 );
diff --git a/pwmanager/pwmanager/pwmviewstyle.cpp b/pwmanager/pwmanager/pwmviewstyle.cpp
index ee35472..b6d930f 100644
--- a/pwmanager/pwmanager/pwmviewstyle.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle.cpp
@@ -61,7 +61,7 @@ PwMViewStyle::~PwMViewStyle()
 	delete_ifnot_null(s1);
 }
 
-void PwMViewStyle::editPassWord( QListViewItem * i )
+void PwMViewStyle::editPassWord( Q3ListViewItem * i )
 {
     if ( !i )
         return;
@@ -93,16 +93,16 @@ void PwMViewStyle::initStyle(style_t style)
 		return;
 	}
 	curStyle = style;
-	connect(lv, SIGNAL(pressed(QListViewItem *)),
-		v, SLOT(handleToggle(QListViewItem *)));
-	connect(lv, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, int)),
-		v, SLOT(handleRightClick(QListViewItem *, const QPoint &, int)));
-	connect(lv, SIGNAL(clicked(QListViewItem *)),
-		v, SLOT(refreshCommentTextEdit(QListViewItem *)));
-	connect(lv, SIGNAL(returnPressed(QListViewItem *)),
-		this, SLOT(editPassWord(QListViewItem *)));
-	connect(lv, SIGNAL(doubleClicked(QListViewItem *)),
-		this, SLOT(editPassWord(QListViewItem *)));
+	connect(lv, SIGNAL(pressed(Q3ListViewItem *)),
+		v, SLOT(handleToggle(Q3ListViewItem *)));
+	connect(lv, SIGNAL(rightButtonClicked(Q3ListViewItem *, const QPoint &, int)),
+		v, SLOT(handleRightClick(Q3ListViewItem *, const QPoint &, int)));
+	connect(lv, SIGNAL(clicked(Q3ListViewItem *)),
+		v, SLOT(refreshCommentTextEdit(Q3ListViewItem *)));
+	connect(lv, SIGNAL(returnPressed(Q3ListViewItem *)),
+		this, SLOT(editPassWord(Q3ListViewItem *)));
+	connect(lv, SIGNAL(doubleClicked(Q3ListViewItem *)),
+		this, SLOT(editPassWord(Q3ListViewItem *)));
 	connect(lv, SIGNAL(insertPW()),
 		this, SIGNAL( insertPW() ));
 	connect(lv, SIGNAL(deletePW()),
@@ -249,6 +249,6 @@ int PwMViewStyle::numCategories()
 	return 0;
 }
 
-#ifndef PWM_EMBEDDED
-#include "pwmviewstyle.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmviewstyle.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle.h b/pwmanager/pwmanager/pwmviewstyle.h
index 6c2d81c..a7dccbe 100644
--- a/pwmanager/pwmanager/pwmviewstyle.h
+++ b/pwmanager/pwmanager/pwmviewstyle.h
@@ -23,18 +23,18 @@
 
 #include <qwidget.h>
 #include <qsplitter.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qpushbutton.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #ifndef PWM_EMBEDDED
-#include <qtextedit.h>
+#include <q3textedit.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif
 
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qcombobox.h>
 #include <qsize.h>
 
@@ -42,7 +42,7 @@ class ListViewPwM;
 class PwMViewStyle_0;
 class PwMViewStyle_1;
 class PwMView;
-class QListViewItem;
+class Q3ListViewItem;
 class CommentBox;
 
 class PwMViewStyle : public QWidget
@@ -94,7 +94,7 @@ protected:
 	CommentBox *commentBox;
 
 protected slots:
-    void editPassWord( QListViewItem * );
+    void editPassWord( Q3ListViewItem * );
 
 private:
 	/** which style has the view?
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.cpp b/pwmanager/pwmanager/pwmviewstyle_0.cpp
index 1d88a34..3d1f41f 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_0.cpp
@@ -26,13 +26,16 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include "pwmprefs.h"
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3ValueList>
 
 PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
  : QObject()
 {
-	vbox1 = new QVBox(view);
+	vbox1 = new Q3VBox(view);
 	vbox1->setSpacing(0);
-	hbox1 = new QHBox(vbox1);
+	hbox1 = new Q3HBox(vbox1);
 	hbox1->setSpacing(0);
 	categoriesTitle = new QLabel(hbox1);
 	categoriesTitle->setText(i18n("Category:"));
@@ -46,8 +49,8 @@ PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
     delCatButton->setPixmap (KGlobal::iconLoader()->loadIcon("editdelete", KIcon::Small) );
     maxsi = delCatButton->sizeHint().height()+4;
     delCatButton->setMinimumSize( maxsi, maxsi );
-    delCatButton->setFocusPolicy( QWidget::NoFocus );
-    renCatButton->setFocusPolicy( QWidget::NoFocus );
+    delCatButton->setFocusPolicy( Qt::NoFocus );
+    renCatButton->setFocusPolicy( Qt::NoFocus );
     
 #ifndef PWM_EMBEDDED
 	splitter1 = new QSplitter(vbox1);
@@ -81,9 +84,9 @@ PwMViewStyle_0::~PwMViewStyle_0()
 void PwMViewStyle_0::toggleSplitter()
 { 
     
-    QValueList<int> si = splitter1->sizes();
+    Q3ValueList<int> si = splitter1->sizes();
     splitter1->toggle();
-    QValueList<int> si2 = splitter1->sizes();
+    Q3ValueList<int> si2 = splitter1->sizes();
     //qDebug("PwMViewStyle_0::toggleSplitter() %d %d %d %d", si[0],si[1],si2[0],si2[1] );
     if ( si[0] == si2[0] && si[1] == si2[1] && si2[1] == 1 ) {
         int diff = si[0]/2;
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.h b/pwmanager/pwmanager/pwmviewstyle_0.h
index 6d3c1d1..f144eec 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.h
+++ b/pwmanager/pwmanager/pwmviewstyle_0.h
@@ -20,14 +20,14 @@
 #ifndef PWMVIEWSTYLE_0_H
 #define PWMVIEWSTYLE_0_H
 
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qpushbutton.h>
 #ifndef PWM_EMBEDDED
-#include <qtextedit.h>
+#include <q3textedit.h>
 #include <qsplitter.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <KDGanttMinimizeSplitter.h>
 #endif
 #include <qlabel.h>
@@ -87,9 +87,9 @@ protected:
 	/** title string for the categories combo or list box */
 	QLabel *categoriesTitle;
 	/** hbox1 for widget style */
-	QHBox *hbox1;
+	Q3HBox *hbox1;
 	/** vbox1 for widget style */
-	QVBox *vbox1;
+	Q3VBox *vbox1;
 	/** splitter for commentTextEdit */
 #ifndef PWM_EMBEDDED	
 	QSplitter *splitter1;
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp
index e335a3f..83eed97 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp
@@ -29,6 +29,12 @@
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3ValueList>
+#include <Q3Frame>
+#include <Q3PopupMenu>
 #endif
 #define INITIAL_CATEGORIES_WIDTH	100
 
@@ -54,9 +60,9 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 	//US  topLayout->addWidget(mMiniSplitter );
 #endif
 
-	vbox1 = new QVBox(splitter);
+	vbox1 = new Q3VBox(splitter);
 	categoriesTitle = new QLabel(vbox1);
-	categoriesList = new QListBox(vbox1);
+	categoriesList = new Q3ListBox(vbox1);
 #ifndef PWM_EMBEDDED
 	splitter2 = new QSplitter(splitter);
 	splitter2->setOrientation(Qt::Vertical);
@@ -70,7 +76,7 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 	commentBox = new CommentBox(splitter2);
 	// set sizes and styles
 	//US	commentBox->resize(commentBox->size().width(), 60);
-	QValueList<int> sizes;
+	Q3ValueList<int> sizes;
 #ifndef PWM_EMBEDDED
 	sizes.push_back(INITIAL_CATEGORIES_WIDTH);
 	sizes.push_back(view->height() - INITIAL_CATEGORIES_WIDTH);
@@ -81,12 +87,12 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 	//US	splitter->setSizes(sizes);
 	categoriesTitle->setAlignment(Qt::AlignHCenter);
 #ifndef PWM_EMBEDDED
-	categoriesTitle->setFrameShape(QFrame::MenuBarPanel);
+	categoriesTitle->setFrameShape(Q3Frame::MenuBarPanel);
 #else
 	//categoriesTitle->setFrameShape(QFrame::StyledPanel);
 #endif
 	categoriesTitle->setText(i18n("Category:"));
-	catCtxMenu = new QPopupMenu(view);
+	catCtxMenu = new Q3PopupMenu(view);
 	catCtxMenu->insertItem(i18n("&Rename"),
 			       view, SLOT(renCatButton_slot()));
 	catCtxMenu->insertItem(i18n("&Delete"),
@@ -100,9 +106,9 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 	connect(categoriesList, SIGNAL(highlighted(int)),
 		view, SLOT(shiftToView()));
 	connect(categoriesList,
-		SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)),
+		SIGNAL(rightButtonClicked(Q3ListBoxItem *, const QPoint &)),
 		this,
-		SLOT(catRightClick(QListBoxItem *, const QPoint &)));
+		SLOT(catRightClick(Q3ListBoxItem *, const QPoint &)));
 
 	connect(lv, SIGNAL(toggleOverview()),
 		this, SLOT(toggleSplitter()));
@@ -115,9 +121,9 @@ PwMViewStyle_1::~PwMViewStyle_1()
 }
 void PwMViewStyle_1::toggleSplitter()
 {
-    QValueList<int> si = splitter2->sizes();
+    Q3ValueList<int> si = splitter2->sizes();
     splitter2->toggle();
-    QValueList<int> si2 = splitter2->sizes();
+    Q3ValueList<int> si2 = splitter2->sizes();
     //qDebug("PwMViewStyle_1::toggleSplitter() %d %d %d %d", si[0],si[1],si2[0],si2[1] );
     if ( si[0] == si2[0] && si[1] == si2[1] && si2[1] == 1 ) {
         int diff = si[0]/2;
@@ -130,7 +136,7 @@ void PwMViewStyle_1::toggleSplitter()
     }
 }
 
-void PwMViewStyle_1::catRightClick(QListBoxItem *item, const QPoint &point)
+void PwMViewStyle_1::catRightClick(Q3ListBoxItem *item, const QPoint &point)
 {
 	if (!item)
 		return;
@@ -187,6 +193,6 @@ void PwMViewStyle_1::saveSettings(PWMPrefs* prefs)
 }
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmviewstyle_1.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmviewstyle_1.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.h b/pwmanager/pwmanager/pwmviewstyle_1.h
index 4f7a256..66cba03 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.h
+++ b/pwmanager/pwmanager/pwmviewstyle_1.h
@@ -20,19 +20,19 @@
 #ifndef PWMVIEWSTYLE_1_H
 #define PWMVIEWSTYLE_1_H
 
-#include <qvbox.h>
+#include <q3vbox.h>
 
 #ifndef PWM_EMBEDDED
-#include <qtextedit.h>
+#include <q3textedit.h>
 #include <qsplitter.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <KDGanttMinimizeSplitter.h>
 #endif
 
 #include <qlabel.h>
-#include <qlistbox.h>
-#include <qpopupmenu.h>
+#include <q3listbox.h>
+#include <q3popupmenu.h>
 
 class PwMView;
 class ListViewPwM;
@@ -82,7 +82,7 @@ public slots:
     void toggleSplitter();
 protected slots:
 	/** user clicked right button in category list */
-	void catRightClick(QListBoxItem *item, const QPoint &point);
+	void catRightClick(Q3ListBoxItem *item, const QPoint &point);
 
 protected:
 	/** main list view */
@@ -100,15 +100,15 @@ protected:
 #endif
 
 	/** categories list-box */
-	QListBox *categoriesList;
+	Q3ListBox *categoriesList;
 	/** title string for the categories combo or list box */
 	QLabel *categoriesTitle;
 	/** hbox1 for widget style */
-	QVBox *vbox1;
+	Q3VBox *vbox1;
 	/** text-edit to display the comment */
 	CommentBox *commentBox;
 	/** category list context menu */
-	QPopupMenu *catCtxMenu;
+	Q3PopupMenu *catCtxMenu;
 };
 
 #endif
diff --git a/pwmanager/pwmanager/randomizer.cpp b/pwmanager/pwmanager/randomizer.cpp
index da4df78..24f9926 100644
--- a/pwmanager/pwmanager/randomizer.cpp
+++ b/pwmanager/pwmanager/randomizer.cpp
@@ -53,7 +53,7 @@ Randomizer::Randomizer()
 	// probe for /dev/urandom
 	rndDev->setName("/dev/urandom");
 	if (rndDev->exists() &&
-	    rndDev->open(IO_ReadOnly)) {
+	    rndDev->open(QIODevice::ReadOnly)) {
 		printDebug("Randomizer: using /dev/urandom");
 		return;
 	}
@@ -61,7 +61,7 @@ Randomizer::Randomizer()
 	// probe for /dev/random
 	rndDev->setName("/dev/random");
 	if (rndDev->exists() &&
-	    rndDev->open(IO_ReadOnly)) {
+	    rndDev->open(QIODevice::ReadOnly)) {
 		printDebug("Randomizer: using /dev/random");
 		return;
 	}
@@ -71,7 +71,7 @@ Randomizer::Randomizer()
 	if (fn) {
 		rndDev->setName(fn);
 		if (rndDev->exists() &&
-		    rndDev->open(IO_ReadOnly)) {
+		    rndDev->open(QIODevice::ReadOnly)) {
 			printDebug(string("Randomizer: using $RANDFILE \"")
 				   + fn
 				   + "\" (aka EGD)");
diff --git a/pwmanager/pwmanager/rencatwnd.cpp b/pwmanager/pwmanager/rencatwnd.cpp
index 3c4de27..3ca758c 100644
--- a/pwmanager/pwmanager/rencatwnd.cpp
+++ b/pwmanager/pwmanager/rencatwnd.cpp
@@ -20,16 +20,19 @@
 #include "rencatwnd.h"
 
 #include <klocale.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
 
 RenCatWnd::RenCatWnd(QWidget *parent,
-		       const char *name, bool modal, WFlags f)
+		       const char *name, bool modal, Qt::WFlags f)
  : QDialog(parent, name, true, f)
 {
-	vbox1 = new QVBox(this);
+	vbox1 = new Q3VBox(this);
 	label = new QLabel(vbox1);
 	newName = new QLineEdit(vbox1);
-	hbox1 = new QHBox(vbox1);
+	hbox1 = new Q3HBox(vbox1);
 	okButton = new QPushButton(i18n("&Ok"), hbox1);
 	cancelButton = new QPushButton(i18n("&Cancel"), hbox1);
 
@@ -65,6 +68,6 @@ void RenCatWnd::cancelButton_slot()
 	done(2);
 }
 
-#ifndef PWM_EMBEDDED
-#include "rencatwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_rencatwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/rencatwnd.h b/pwmanager/pwmanager/rencatwnd.h
index 37b6725..1773136 100644
--- a/pwmanager/pwmanager/rencatwnd.h
+++ b/pwmanager/pwmanager/rencatwnd.h
@@ -20,13 +20,15 @@
 #ifndef RENCATWND_H
 #define RENCATWND_H
 
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
 
 /** rename category window */
@@ -35,7 +37,7 @@ class RenCatWnd : public QDialog
 	Q_OBJECT
 public:
 	RenCatWnd(QWidget *parent = 0, const char *name = 0,
-		    bool modal = FALSE, WFlags f = 0);
+		    bool modal = FALSE, Qt::WFlags f = 0);
 	~RenCatWnd();
 
 	QString getNewName()
@@ -46,8 +48,8 @@ protected slots:
 	void cancelButton_slot();
 
 protected:
-	QVBox *vbox1;
-	QHBox *hbox1;
+	Q3VBox *vbox1;
+	Q3HBox *hbox1;
 	QLabel *label;
 	QLineEdit *newName;
 	QPushButton *okButton;
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 507fa30..6c6512e 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -24,6 +24,8 @@
 #ifdef PWM_EMBEDDED
 #include <kglobal.h>
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3CString>
 #endif
 
 /* enable/disable serializer debugging (0/1) */
@@ -146,7 +148,7 @@ Serializer::Serializer()
 #endif
 }
 
-Serializer::Serializer(const QCString &buffer)
+Serializer::Serializer(const Q3CString &buffer)
 {
 	defaultLockStat = true;
 //US BUG: I needed to specify a document name. Otherwise impl will not be created for serializing
@@ -177,7 +179,7 @@ void Serializer::clear()
 	domDoc = new QDomDocument;
 }
 
-bool Serializer::parseXml(const QCString &buffer)
+bool Serializer::parseXml(const Q3CString &buffer)
 {
     //abort();
     //qDebug("parse %s ", buffer.data());
@@ -198,33 +200,33 @@ bool Serializer::parseXml(const QCString &buffer)
 	return true;
 }
 
-QCString Serializer::getXml()
+Q3CString Serializer::getXml()
 {
 	PWM_ASSERT(domDoc);
 
 #ifndef PWM_EMBEDDED
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
-	QCString tmp(domDoc->toCString(8));
+	Q3CString tmp(domDoc->toCString(8));
 	printDebug("<BEGIN Serializer::getXml() dump>\n");
 	cout << tmp << endl;
 	printDebug("<END Serializer::getXml() dump>");
 #endif // DEBUG
 
-	QCString ret(domDoc->toCString(0));
+	Q3CString ret(domDoc->toCString(0));
 	ret.replace('\n', "");
 	return ret;
 #else
 
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
-	QCString tmp("        " + domDoc->toCString());
+	Q3CString tmp("        " + domDoc->toCString());
 	printDebug("<BEGIN Serializer::getXml() dump>\n");
 	qDebug(tmp);
 	cout << tmp << endl;
 	printDebug("<END Serializer::getXml() dump>");
 #endif // DEBUG
 
-	QCString ret(domDoc->toCString());
-	ret.replace(QRegExp("\n"), "");
+	Q3CString ret(domDoc->toByteArray());
+	ret.replace("\n", "");
 	return ret;
 
 #endif
diff --git a/pwmanager/pwmanager/serializer.h b/pwmanager/pwmanager/serializer.h
index df50e42..e085ade 100644
--- a/pwmanager/pwmanager/serializer.h
+++ b/pwmanager/pwmanager/serializer.h
@@ -23,7 +23,7 @@
 
 #include "pwmdoc.h"
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdom.h>
 
 #include <vector>
@@ -40,16 +40,16 @@ public:
 	/** construct an empty serializer document */
 	Serializer();
 	/** construct a serializer document and parse "buffer" */
-	Serializer(const QCString &buffer);
+	Serializer(const Q3CString &buffer);
 	/** destructor */
 	virtual ~Serializer();
 
 	/** clears all data */
 	void clear();
 	/** parse the given data buffer */
-	bool parseXml(const QCString &buffer);
+	bool parseXml(const Q3CString &buffer);
 	/** returns the current XML data */
-	QCString getXml();
+	Q3CString getXml();
 	/** serialize "dta" and store it as XML data */
 	//US ENH: we need to serialize and deserialize not only categories, but also synctargets
 	bool serialize(PwMItem &dta);
diff --git a/pwmanager/pwmanager/setmasterpwwnd_emb.cpp b/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
index e6471e6..c5fd4e4 100644
--- a/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
+++ b/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
@@ -31,6 +31,9 @@ $Id$
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
 
 #include <klocale.h>
 
@@ -57,7 +60,7 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
     mainTab = new QTabWidget( page );
     pageLayout->addWidget( mainTab );
@@ -70,12 +73,12 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
     // This is the Password tab1
     tab = new QWidget( mainTab );
 
-    QGridLayout *layout = new QGridLayout( tab, 5, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( tab, 5, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
     QLabel* label = new QLabel( i18n( "Using a normal password-string to encrypt the data." ), tab );
-    label->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
+    label->setAlignment( int( Qt::WordBreak | Qt::AlignCenter ) );
     layout->addWidget(label, 0, 0);
 
     pwEdit_1 = new QLineEdit( tab, "pwEdit_1" );
@@ -99,16 +102,16 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
     // This is the Password tab2
     tab_2 = new QWidget( mainTab );
 
-    layout = new QGridLayout( tab_2, 5, 1 );
+    layout = new Q3GridLayout( tab_2, 5, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
     label = new QLabel( i18n( "Using a PwM key-card to encrypt the data." ), tab_2 );
-    label->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
+    label->setAlignment( int( Qt::WordBreak | Qt::AlignCenter ) );
     layout->addWidget(label, 0, 0);
 
     label = new QLabel( i18n( "selected card:" ), tab_2 );
-    label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
+    label->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) );
     layout->addWidget(label, 1, 0);
 
     selCardButton = new QPushButton( i18n( "&Select the currently inserted card as key-card" ), tab_2 );
diff --git a/pwmanager/pwmanager/setmasterpwwnd_emb.h b/pwmanager/pwmanager/setmasterpwwnd_emb.h
index c8ddec6..a070fea 100644
--- a/pwmanager/pwmanager/setmasterpwwnd_emb.h
+++ b/pwmanager/pwmanager/setmasterpwwnd_emb.h
@@ -27,6 +27,8 @@ $Id$
 #define SETMASTERPWWND_EMB_H
 
 #include <kdialogbase.h>
+//Added by qt3to4:
+#include <QLabel>
 
 class QLineEdit;
 class QPushButton;
diff --git a/pwmanager/pwmanager/setmasterpwwndimpl.cpp b/pwmanager/pwmanager/setmasterpwwndimpl.cpp
index 3482643..7041d2e 100644
--- a/pwmanager/pwmanager/setmasterpwwndimpl.cpp
+++ b/pwmanager/pwmanager/setmasterpwwndimpl.cpp
@@ -188,6 +188,6 @@ string SetMasterPwWndImpl::getPw(bool *useCard)
 	return "";
 }
 
-#ifndef PWM_EMBEDDED
-#include "setmasterpwwndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_setmasterpwwndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/waitwnd.cpp b/pwmanager/pwmanager/waitwnd.cpp
index a3f25cc..d4676a9 100644
--- a/pwmanager/pwmanager/waitwnd.cpp
+++ b/pwmanager/pwmanager/waitwnd.cpp
@@ -22,6 +22,10 @@
 #include "pwmexception.h"
 
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QCloseEvent>
+#include <QLabel>
 
 #include <klocale.h>
 
@@ -29,11 +33,11 @@
 WaitWnd::WaitWnd(QString caption, QString _staticText,
 		 bool showCancelButton, bool showGenericText,
 		 QWidget *parent,
-		 const char *name, bool modal, WFlags f)
+		 const char *name, bool modal, Qt::WFlags f)
  : QDialog(parent, name, modal, f)
 {
 	canClose = false;
-	vbox1 = new QVBox(this);
+	vbox1 = new Q3VBox(this);
 	staticText = new QLabel(vbox1);
 	if (showGenericText) {
 		genericText = new QLabel(vbox1);
@@ -89,6 +93,6 @@ void WaitWnd::updateGenericText(const QString &text)
 		genericText->setText(text);
 }
 
-#ifndef PWM_EMBEDDED
-#include "waitwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_waitwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/waitwnd.h b/pwmanager/pwmanager/waitwnd.h
index ae86c8b..6a619b9 100644
--- a/pwmanager/pwmanager/waitwnd.h
+++ b/pwmanager/pwmanager/waitwnd.h
@@ -20,11 +20,14 @@
 #ifndef WAITWND_H
 #define WAITWND_H
 
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QCloseEvent>
 
 /** window to ask the user to wait */
 class WaitWnd : public QDialog
@@ -34,7 +37,7 @@ public:
 	WaitWnd(QString caption, QString _staticText,
 		bool showCancelButton, bool showGenericText,
 		QWidget *parent = 0, const char *name = 0,
-		bool modal = FALSE, WFlags f = 0);
+		bool modal = FALSE, Qt::WFlags f = 0);
 	~WaitWnd();
 
 	void updateGenericText(const QString &text);
@@ -46,7 +49,7 @@ protected slots:
 	void cancel_slot();
 
 protected:
-	QVBox *vbox1;
+	Q3VBox *vbox1;
 	QLabel *staticText;
 	QLabel *genericText;
 	QPushButton *cancelButton;