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
@@ -70 +70,3 @@ SOURCES += ../crypt/ath.c \
 #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
@@ -31,2 +31,4 @@ SOURCES += code-from-errno.c \
       #     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
@@ -42 +42,3 @@ SOURCES += mpi-add.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
@@ -36 +36,3 @@ SOURCES += adler32.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
@@ -31,3 +31,6 @@ $Id$
 #include <qtabwidget.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 #include <klocale.h>
@@ -36,3 +39,3 @@ $Id$
 #include <qpushbutton.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 
@@ -51,3 +54,3 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
@@ -60,3 +63,3 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
 
-    QGridLayout *layout = new QGridLayout( tab1, 3, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( tab1, 3, 1 );
     layout->setMargin( KDialogBase::marginHint() );
@@ -79,3 +82,3 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
     categoryComboBox->setEditable( TRUE );
-    categoryComboBox->setSizeLimit( 8 );
+    categoryComboBox->setMaxVisibleItems( 8 );
     categoryComboBox->setAutoCompletion( TRUE );
@@ -119,3 +122,3 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
 
-    layout = new QGridLayout( tab2, 3, 1 );
+    layout = new Q3GridLayout( tab2, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
@@ -124,3 +127,3 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
 
-    commentTextEdit = new QMultiLineEdit(tab2);
+    commentTextEdit = new Q3MultiLineEdit(tab2);
     layout->addMultiCellWidget( commentTextEdit, i, i, 0, 0 );
@@ -136,3 +139,3 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
 
-    layout = new QGridLayout( tab3, 3, 1 );
+    layout = new Q3GridLayout( tab3, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
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
@@ -29,7 +29,12 @@ $Id$
 #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;
@@ -39,4 +44,4 @@ class KComboBox;
 class QLabel;
-class QGroupBox;
-class QMultiLineEdit;
+class Q3GroupBox;
+class Q3MultiLineEdit;
 class PwMDoc;
@@ -63,3 +68,3 @@ public:
     QPushButton* revealButton;
-    QMultiLineEdit* commentTextEdit;
+    Q3MultiLineEdit* commentTextEdit;
     PwMDoc* doc;
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
@@ -198,3 +198,3 @@ void AddEntryWndImpl::switchComment(bool toAdvanced)
 
-		commentTextEdit = new QTextEdit(commentDummy);
+		commentTextEdit = new Q3TextEdit(commentDummy);
 		commentTextEdit->setTextFormat(Qt::PlainText);
@@ -218,4 +218,4 @@ void AddEntryWndImpl::editAdvCommentButton_slot()
 
-#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
@@ -25,3 +25,3 @@
 #include <qlineedit.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
 #include <qcombobox.h>
@@ -31,3 +31,3 @@
 #include <kcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include "addentrywnd_emb.h"
@@ -88,3 +88,3 @@ public slots:
 #ifndef PWM_EMBEDDED 
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 	/** OK button pressed */
@@ -93,3 +93,3 @@ public slots:
 	void cancelButton_slot();
-//MOC_SKIP_END
+#endif
 #else
@@ -112,3 +112,3 @@ protected:
 #ifndef PWM_EMBEDDED
-	QTextEdit *commentTextEdit;
+	Q3TextEdit *commentTextEdit;
 #else
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
@@ -23,3 +23,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.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
@@ -28,5 +28,5 @@
 #include <khtmlview.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif
@@ -139,3 +139,3 @@ void CommentBox::switchTo(commentBoxMode newMode)
 	case mode_text:
-		textDta = new QTextEdit(parentWidget);
+		textDta = new Q3TextEdit(parentWidget);
 		textDta->setTextFormat(Qt::PlainText);
@@ -231,3 +231,3 @@ QSize CommentBox::size()
 CommentBox::CommentBox(QWidget *_parentWidget)
-  : QTextBrowser(_parentWidget) 
+  : Q3TextBrowser(_parentWidget) 
 
@@ -235,3 +235,3 @@ CommentBox::CommentBox(QWidget *_parentWidget)
     //this->setReadOnly(true);
-  setFocusPolicy( QWidget::ClickFocus );
+  setFocusPolicy( Qt::ClickFocus );
 }
@@ -250,3 +250,3 @@ void CommentBox::setText(const QString &text)
 {
-	QTextBrowser::setText( text);
+	Q3TextBrowser::setText( text);
 	if (!isVisible())
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
@@ -25,3 +25,3 @@
 class QWidget;
-class QTextEdit;
+class Q3TextEdit;
 class KHTMLPart;
@@ -87,3 +87,3 @@ protected:
 	/** 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 */
@@ -93,3 +93,3 @@ protected:
 #else
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 /** Implementation of the advanced HTML comment box */
@@ -98,3 +98,3 @@ protected:
 
-class CommentBox : public QTextBrowser 
+class CommentBox : public Q3TextBrowser 
 {
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
@@ -25,2 +25,4 @@
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3CString>
 
@@ -44,3 +46,3 @@ bool Csv::importData(const QString &filepath,
 	QFile f(filepath);
-	if (!f.open(IO_ReadOnly)) {
+	if (!f.open(QIODevice::ReadOnly)) {
 		KMessageBox::error(parent,
@@ -91,3 +93,3 @@ bool Csv::doImport(const QByteArray &d,
 	int ret;
-	QCString s, curCat;
+	Q3CString s, curCat;
 	int fieldIndex = 0;
@@ -123,3 +125,3 @@ bool Csv::doImport(const QByteArray &d,
 			case 1:	// desc
-				di.desc = s;
+				di.desc = std::string(s);
 				++fieldIndex;
@@ -127,3 +129,3 @@ bool Csv::doImport(const QByteArray &d,
 			case 2: // name
-				di.name = s;
+				di.name = std::string(s);
 				++fieldIndex;
@@ -131,3 +133,3 @@ bool Csv::doImport(const QByteArray &d,
 			case 3: // pw
-				di.pw = s;
+				di.pw = std::string(s);
 				++fieldIndex;
@@ -135,3 +137,3 @@ bool Csv::doImport(const QByteArray &d,
 			case 4: // url
-				di.url = s;
+				di.url = std::string(s);
 				++fieldIndex;
@@ -139,3 +141,3 @@ bool Csv::doImport(const QByteArray &d,
 			case 5: // launcher
-				di.launcher = s;
+				di.launcher = std::string(s);
 				++fieldIndex;
@@ -143,3 +145,3 @@ bool Csv::doImport(const QByteArray &d,
 			case 6: // comment
-				di.comment = s;
+				di.comment = std::string(s);
 				++fieldIndex;
@@ -156,3 +158,3 @@ bool Csv::doImport(const QByteArray &d,
 			if (fieldIndex == 6)
-				di.comment = s;
+				di.comment = std::string(s);
 			inRecord = false;
@@ -177,3 +179,3 @@ bool Csv::doImport(const QByteArray &d,
 
-int Csv::nextField(QCString *ret,
+int Csv::nextField(Q3CString *ret,
 		   const QByteArray &in,
@@ -355,3 +357,3 @@ bool Csv::exportData(const QString &filepath,
 	QFile f(filepath);
-	if (!f.open(IO_ReadWrite)) {
+	if (!f.open(QIODevice::ReadWrite)) {
 		KMessageBox::error(parent,
@@ -378,3 +380,3 @@ bool Csv::doExport(QFile &f,
 	PwMDataItem d;
-	QCString s, catName;
+	Q3CString s, catName;
 	QByteArray b;
@@ -403,3 +405,3 @@ bool Csv::doExport(QFile &f,
 #ifndef PWM_EMBEDDED
-			b.resize(b.size() - 1, QGArray::SpeedOptim);
+			b.resize(b.size() - 1, Q3GArray::SpeedOptim);
 #else
@@ -414,7 +416,7 @@ bool Csv::doExport(QFile &f,
 
-QCString Csv::newField(QCString s)
+Q3CString Csv::newField(Q3CString s)
 {
 	if (s.isEmpty())
-		return QCString();
-	QCString ret("\"");
+		return Q3CString();
+	Q3CString ret("\"");
 #ifndef PWM_EMBEDDED
@@ -422,3 +424,3 @@ QCString Csv::newField(QCString s)
 #else
-	s.replace(QRegExp("\""), "\"\"");
+	s.replace("\"", "\"\"");
 #endif
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
@@ -23,3 +23,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qfile.h>
@@ -75,3 +75,3 @@ protected:
 	  */
-	int nextField(QCString *ret,
+	int nextField(Q3CString *ret,
 		      const QByteArray &in,
@@ -83,3 +83,3 @@ protected:
 	/** generate a new data field string. */
-	QCString newField(QCString s);
+	Q3CString newField(Q3CString s);
 
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
@@ -30,3 +30,5 @@ $Id$
 #include <qlabel.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <klocale.h>
@@ -57,3 +59,3 @@ 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() );
@@ -68,3 +70,3 @@ editCategoryWnd::editCategoryWnd( PwMDoc* d, QWidget* parent, const char* name)
     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
@@ -29,7 +29,12 @@ $Id$
 #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;
@@ -39,4 +44,4 @@ class KComboBox;
 class QLabel;
-class QGroupBox;
-class QMultiLineEdit;
+class Q3GroupBox;
+class Q3MultiLineEdit;
 class PwMDoc;
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
@@ -30,5 +30,7 @@ $Id$
 #include <qcheckbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <klineedit.h>
@@ -59,3 +61,3 @@ findWnd::findWnd( QWidget* parent, const char* name )
     QWidget *page = plainPage();
-    QVBoxLayout *layout = new QVBoxLayout( page );
+    Q3VBoxLayout *layout = new Q3VBoxLayout( page );
     layout->setMargin( KDialogBase::marginHint() );
@@ -70,3 +72,3 @@ findWnd::findWnd( QWidget* parent, const char* name )
 
-    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 );
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
@@ -135,4 +135,4 @@ void FindWndImpl::selectionChanged_slot()
 
-#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
@@ -23,2 +23,4 @@
 #include "globalstuff.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
@@ -160,3 +162,3 @@ GenPasswd::dynCharset_element * GenPasswd::selectNextCharset()
 		// 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
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
@@ -23,3 +23,3 @@
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
@@ -72,3 +72,3 @@ protected:
 	/** dynamic charset used for generating the password */
-	QPtrList<dynCharset_element> dynCharset;
+	Q3PtrList<dynCharset_element> dynCharset;
 };
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
@@ -22,2 +22,5 @@
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
@@ -27,8 +30,8 @@
 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);
@@ -64,4 +67,4 @@ void GetKeyCardWnd::okButton_slot()
 
-#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
@@ -22,4 +22,4 @@
 
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qdialog.h>
@@ -28,2 +28,4 @@
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
@@ -35,3 +37,3 @@ public:
 	GetKeyCardWnd(QWidget *parent = 0, const char *name = 0,
-		      bool modal = FALSE, WFlags f = 0);
+		      bool modal = FALSE, Qt::WFlags f = 0);
 	~GetKeyCardWnd();
@@ -42,4 +44,4 @@ protected slots:
 protected:
-	QVBox *vbox1;
-	QHBox *hbox1;
+	Q3VBox *vbox1;
+	Q3HBox *hbox1;
 	QLabel *text_label;
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
@@ -45,2 +45,5 @@ $Id$
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
@@ -56,3 +59,3 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
@@ -62,3 +65,3 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
     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);
@@ -78,3 +81,3 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
 
-    QGridLayout* numberLayout = new QGridLayout( numberBox, 4, 3 );
+    Q3GridLayout* numberLayout = new Q3GridLayout( numberBox, 4, 3 );
     numberLayout->setMargin( 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
@@ -57,4 +57,4 @@ void GetMasterPwWndImpl::slotOk()
 
-#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
@@ -36,3 +36,3 @@
 #include <qstring.h>
-#include <qtextstream.h>
+#include <QTextOStream>
 #endif
@@ -99,3 +99,3 @@ std::string tostr(const T &t)
   QString result;
-  QTextOStream(&result) << t;
+  QTextOStream tmp(&result); tmp << t;
   return result.latin1();
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
@@ -62,3 +62,3 @@ QString HtmlGen::escapeHtmlText(const QString &str)
 	for (i = 0; i < len; ++i) {
-		c = str.at(i);
+		c = str.at(i).toLatin1();
 		switch (c) {
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
@@ -30,3 +30,3 @@
 #else
-#include <qsocket.h>
+#include <q3socket.h>
 #endif
@@ -79,3 +79,3 @@ Ipc::Ipc()
 #endif
-	QSocket* qsock = new QSocket();
+	Q3Socket* qsock = new Q3Socket();
 	qsock->setSocket(sock[0]);
@@ -90,3 +90,3 @@ Ipc::Ipc()
 
-	qsock = new QSocket();
+	qsock = new Q3Socket();
 	qsock->setSocket(sock[0]);
@@ -154,3 +154,3 @@ Ipc::Ipc(const Ipc *ipc)
 
-	qSock = new QSocket();
+	qSock = new Q3Socket();
 	qSock->setSocket(sock[0]);
@@ -214,4 +214,4 @@ 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
@@ -31,3 +31,3 @@
 #else
-#include <qsocket.h>
+#include <q3socket.h>
 #endif
@@ -76,3 +76,3 @@ protected:
 #else
-	QSocket* qSock;
+	Q3Socket* qSock;
 	/** current receive buffer size */
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
@@ -24,2 +24,4 @@
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
@@ -44,3 +46,3 @@ KCMPwmConfig::KCMPwmConfig(QWidget *parent, const char *name )
 {
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   mConfigWidget = new PWMConfigWidget( (PWMPrefs*)getPreferences(), this, "mConfigWidget" );
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
@@ -24,4 +24,4 @@
 #include <qcheckbox.h>
-#include <qframe.h>
-#include <qgroupbox.h>
+#include <q3frame.h>
+#include <q3groupbox.h>
 #include <qlayout.h>
@@ -34,3 +34,6 @@
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
@@ -54,3 +57,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                             KDialog::spacingHint() );
@@ -63,3 +66,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   QWidget *windowStylePage = new QWidget( this );
-  QGridLayout *windowStyleLayout = new QGridLayout( windowStylePage, 3, 3);
+  Q3GridLayout *windowStyleLayout = new Q3GridLayout( windowStylePage, 3, 3);
   
@@ -100,3 +103,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   QWidget *filePage = new QWidget( this );
-  QGridLayout *fileLayout = new QGridLayout( filePage, 3, 2);
+  Q3GridLayout *fileLayout = new Q3GridLayout( filePage, 3, 2);
   
@@ -156,3 +159,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   QWidget *timeoutPage = new QWidget( this );
-  QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2);
+  Q3GridLayout *timeoutLayout = new Q3GridLayout( timeoutPage, 3, 2);
 
@@ -185,3 +188,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   QWidget *autostartPage = new QWidget( this );
-  QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2);
+  Q3GridLayout *autostartLayout = new Q3GridLayout( autostartPage, 3, 2);
 
@@ -205,3 +208,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   QWidget *externalappPage = new QWidget( this );
-  QGridLayout *externalappLayout = new QGridLayout( externalappPage, 3, 2);
+  Q3GridLayout *externalappLayout = new Q3GridLayout( externalappPage, 3, 2);
 
@@ -225,3 +228,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   QWidget *miscPage = new QWidget( this );
-  QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2);
+  Q3GridLayout *miscLayout = new Q3GridLayout( miscPage, 3, 2);
 
@@ -361,4 +364,4 @@ 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
@@ -22,2 +22,5 @@
 #include <klocale.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
@@ -26,10 +29,10 @@ ListObjSelectWnd::ListObjSelectWnd(const QString &caption, const QString &titleT
 				   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);
@@ -37,3 +40,3 @@ ListObjSelectWnd::ListObjSelectWnd(const QString &caption, const QString &titleT
 	}
-	hbox1 = new QHBox(vbox1);
+	hbox1 = new Q3HBox(vbox1);
 	okButton = new QPushButton(i18n("&Ok"), hbox1);
@@ -47,3 +50,3 @@ ListObjSelectWnd::ListObjSelectWnd(const QString &caption, const QString &titleT
 	if (multiSel) {
-		list->setSelectionMode(QListBox::Multi);
+		list->setSelectionMode(Q3ListBox::Multi);
 	}
@@ -128,4 +131,4 @@ void ListObjSelectWnd::setList(const QStringList &_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
@@ -23,8 +23,10 @@
 #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>
 
@@ -39,3 +41,3 @@ public:
 			 const char *name = 0,
-			 bool modal = FALSE, WFlags f = 0);
+			 bool modal = FALSE, Qt::WFlags f = 0);
 	~ListObjSelectWnd();
@@ -64,7 +66,7 @@ public:
 protected:
-	QVBox *vbox1;
-	QHBox *hbox1;
-	QHBox *hbox2;
+	Q3VBox *vbox1;
+	Q3HBox *hbox1;
+	Q3HBox *hbox2;
 	QLabel *title;
-	QListBox *list;
+	Q3ListBox *list;
 	QPushButton *okButton;
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
@@ -25,2 +25,5 @@
 #include <qpixmap.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QKeyEvent>
 
@@ -41,3 +44,3 @@ bool ListViewPwM::event(QEvent *e)
 {
-	if (e->type() == QEvent::LayoutHint)
+	if (e->type() == QEvent::LayoutRequest)
 		emit layoutChanged();
@@ -66,4 +69,4 @@ QPixmap * ListViewItemPwM::offPix = 0;
 
-ListViewItemPwM::ListViewItemPwM(QListView *parent)
- : QCheckListItem(parent, "", QCheckListItem::CheckBox)
+ListViewItemPwM::ListViewItemPwM(Q3ListView *parent)
+ : Q3CheckListItem(parent, "", Q3CheckListItem::CheckBox)
 {
@@ -99,3 +102,3 @@ void ListViewItemPwM::paintCell(QPainter *p, const QColorGroup &cg,
 	if (column != COLUMN_DESC) {
-		QCheckListItem::paintCell(p, cg, column, width, align);
+		Q3CheckListItem::paintCell(p, cg, column, width, align);
 		return;
@@ -122,3 +125,3 @@ void ListViewItemPwM::paintCell(QPainter *p, const QColorGroup &cg,
 #endif
-	QListViewItem::paintCell(p, cg, column, width - pixSpace, align);
+	Q3ListViewItem::paintCell(p, cg, column, width - pixSpace, align);
 
@@ -126,4 +129,4 @@ void ListViewItemPwM::paintCell(QPainter *p, const QColorGroup &cg,
 
-#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
@@ -23,2 +23,5 @@
 #include <klistview.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QPixmap>
 
@@ -43,6 +46,6 @@ protected:
 
-class ListViewItemPwM : public QCheckListItem
+class ListViewItemPwM : public Q3CheckListItem
 {
 public:
-	ListViewItemPwM(QListView *parent);
+	ListViewItemPwM(Q3ListView *parent);
 
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
@@ -144,2 +144,3 @@ int main(int argc, char *argv[])
 {
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
 	printDebugConfigureInfo();
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
@@ -17,3 +17,3 @@
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #include <qrect.h>
@@ -44,3 +44,3 @@ protected:
 	/** metrics */
-	QPaintDeviceMetrics *metrics;
+	Q3PaintDeviceMetrics *metrics;
 	/** left 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
@@ -28,3 +28,3 @@ $Id$
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qcheckbox.h>
@@ -34,2 +34,5 @@ $Id$
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
@@ -48,5 +51,5 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
     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:" ) );
@@ -55,3 +58,3 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
     groupBox1->layout()->setMargin( 11 );
-    QVBoxLayout* groupBox1Layout = new QVBoxLayout( groupBox1->layout() );
+    Q3VBoxLayout* groupBox1Layout = new Q3VBoxLayout( groupBox1->layout() );
     groupBox1Layout->setAlignment( Qt::AlignTop );
@@ -82,3 +85,3 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
 
-    QHBoxLayout* layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
+    Q3HBoxLayout* layout7 = new Q3HBoxLayout( 0, 0, 6, "layout7"); 
 
@@ -94,3 +97,3 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
 
-    QHBoxLayout* layout8 = new QHBoxLayout( 0, 0, 6, "layout8"); 
+    Q3HBoxLayout* layout8 = new Q3HBoxLayout( 0, 0, 6, "layout8"); 
 
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
@@ -36,3 +36,3 @@ PwGenWndImpl::PwGenWndImpl(QWidget *parent,
 			   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
@@ -35,3 +35,3 @@ public:
 		     bool modal = FALSE,
-		     WFlags fl = 0);
+		     Qt::WFlags fl = 0);
 #else
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
@@ -27,2 +27,8 @@
 #include <qstatusbar.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QHideEvent>
+#include <QFocusEvent>
+#include <QCloseEvent>
 
@@ -188,3 +194,3 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
 	setVirgin(virginity);
-	setFocusPolicy(QWidget::WheelFocus);
+	setFocusPolicy(Qt::WheelFocus);
 #ifndef PWM_EMBEDDED
@@ -242,9 +248,9 @@ void PwM::initMenubar()
 // "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,
@@ -252,6 +258,6 @@ void PwM::initMenubar()
 	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..."),
@@ -271,3 +277,3 @@ void PwM::initMenubar()
 #endif
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileexport", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileexport", KIcon::Small)),
 			      i18n("E&xport"), exportPopup,
@@ -285,3 +291,3 @@ void PwM::initMenubar()
 #endif
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileimport", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileimport", KIcon::Small)),
 			      i18n("I&mport"), importPopup,
@@ -290,3 +296,3 @@ void PwM::initMenubar()
 #if 0
-	filePopup->insertItem(QIconSet(picons->loadIcon("fileprint", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("fileprint", KIcon::Small)),
 			      i18n("&Print..."), this,
@@ -295,3 +301,3 @@ void PwM::initMenubar()
 #endif
-	filePopup->insertItem(QIconSet(picons->loadIcon("exit", KIcon::Small)),
+	filePopup->insertItem(QIcon(picons->loadIcon("exit", KIcon::Small)),
 			      i18n("&Quit"), this,
@@ -300,3 +306,3 @@ void PwM::initMenubar()
 // "manage" popup menu
-	managePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)),
+	managePopup->insertItem(QIcon(picons->loadIcon("pencil", KIcon::Small)),
 				i18n("&Add password"), this,
@@ -305,6 +311,6 @@ void PwM::initMenubar()
 	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()),
@@ -312,3 +318,3 @@ void PwM::initMenubar()
 	managePopup->insertSeparator();
-	managePopup->insertItem(QIconSet(picons->loadIcon("rotate", KIcon::Small)),
+	managePopup->insertItem(QIcon(picons->loadIcon("rotate", KIcon::Small)),
 				i18n("Change &Master Password"), this,
@@ -319,3 +325,3 @@ void PwM::initMenubar()
 #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,
@@ -323,3 +329,3 @@ void PwM::initMenubar()
 				  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,
@@ -327,3 +333,3 @@ void PwM::initMenubar()
 				  BUTTON_POPUP_CHIPCARD_DEL);
-	chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)),
+	chipcardPopup->insertItem(QIcon(picons->loadIcon("", KIcon::Small)),
 				  i18n("Read card-&ID"), this,
@@ -332,3 +338,3 @@ void PwM::initMenubar()
 	chipcardPopup->insertSeparator();
-	chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)),
+	chipcardPopup->insertItem(QIcon(picons->loadIcon("2rightarrow", KIcon::Small)),
 				  i18n("&Make card backup-image"), this,
@@ -336,3 +342,3 @@ void PwM::initMenubar()
 				  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,
@@ -343,3 +349,3 @@ void PwM::initMenubar()
 // "view" popup menu
-	viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)),
+	viewPopup->insertItem(QIcon(picons->loadIcon("find", KIcon::Small)),
 				i18n("&Find"), this,
@@ -347,3 +353,3 @@ void PwM::initMenubar()
 	viewPopup->insertSeparator();
-	viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)),
+	viewPopup->insertItem(QIcon(picons->loadIcon("halfencrypted", KIcon::Small)),
 				i18n("&Lock all entries"), this,
@@ -351,3 +357,3 @@ void PwM::initMenubar()
 				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,
@@ -355,3 +361,3 @@ void PwM::initMenubar()
 				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,
@@ -361,3 +367,3 @@ void PwM::initMenubar()
 // "options" popup menu
-	optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+	optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
 				 i18n("&Configure PwM/Pi..."), this,
@@ -365,3 +371,3 @@ void PwM::initMenubar()
 				 BUTTON_POPUP_OPTIONS_CONFIG);
-	optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+	optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
 				 i18n("Global Settings..."), this,
@@ -378,3 +384,3 @@ void PwM::initMenubar()
 #else
-	optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+	optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
 				 i18n("C&ategories..."), this,
@@ -924,8 +930,8 @@ void PwM::config_slot()
 
-	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();
@@ -1596,4 +1602,4 @@ void PwM::removeSyncInfo( QString syncProfile)
 
-#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
@@ -38,2 +38,7 @@
 #include <qglobal.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <QFocusEvent>
+#include <Q3PopupMenu>
+#include <QHideEvent>
 
@@ -52,5 +57,5 @@ class KSyncManager;
 #ifndef PWM_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwM : public KMainWindow
-//MOC_SKIP_END
+#endif
 #else
@@ -286,3 +291,3 @@ protected:
     // sync stuff!
-    QPopupMenu *syncPopup;
+    Q3PopupMenu *syncPopup;
     KSyncManager* syncManager;
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
@@ -13,4 +13,4 @@ LIBS += -L../libcrypt/
 LIBS += -L../../bin/
-LIBS += -lmicrokde
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokde
+LIBS += -lxmicrokdepim
 LIBS += -lzlib
@@ -177 +177,3 @@ 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
@@ -16,5 +16,5 @@ DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY
 LIBS += -L../libcrypt/$(PLATFORM)
-LIBS += -lmicrokde
+LIBS += -lxmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokdepim
 LIBS += -L$(QPEDIR)/lib
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index b58d7e2..9213360 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -50,2 +50,3 @@
 #include <qfile.h>
+#include  <QDesktopWidget>
 
@@ -483,3 +484,4 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
 			rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF);
-		tmpFileMoved = filename + "." + rnd_buf + ".mv";
+		tmpFileMoved = filename; tmpFileMoved += '.';
+		tmpFileMoved += rnd_buf; tmpFileMoved += ".mv";
 		if (!copyFile(filename, tmpFileMoved))
@@ -493,3 +495,3 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
 	f.setName(filename);
-	if (!f.open(IO_ReadWrite)) {
+	if (!f.open(QIODevice::ReadWrite)) {
 		ret = e_openFile;
@@ -636,3 +638,3 @@ PwMerror PwMDoc::openDoc(const QString *file, int openLocked)
 
-	if (!f.open(IO_ReadOnly))
+	if (!f.open(QIODevice::ReadOnly))
 		return e_openFile;
@@ -1005,6 +1007,6 @@ bool PwMDoc::copyFile(const QString &src, const QString &dst)
 	QFile srcFd(src);
-	if (!srcFd.open(IO_ReadOnly))
+	if (!srcFd.open(QIODevice::ReadOnly))
 		return false;
 	QFile dstFd(dst);
-	if (!dstFd.open(IO_ReadWrite)) {
+	if (!dstFd.open(QIODevice::ReadWrite)) {
 		srcFd.close();
@@ -1487,3 +1489,3 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
 
-	unsigned int cryptLen = f->size() - pos;
+	size_t cryptLen = f->size() - pos;
 	byte *encrypted = new byte[cryptLen];
@@ -1527,5 +1529,5 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
 		PwMerror err;
-		err = gc.decrypt(&decrypted,
+		err = gc.decrypt((unsigned char **)&decrypted,
 				 &cryptLen,
-				 encrypted,
+				 (unsigned char*)encrypted,
 				 cryptLen,
@@ -2435,3 +2437,3 @@ PwMerror PwMDoc::exportToText(const QString *file)
 	QFile f(*file);
-	if (!f.open(IO_ReadWrite))
+	if (!f.open(QIODevice::ReadWrite))
 		return e_openFile;
@@ -2709,3 +2711,3 @@ PwMerror PwMDoc::importText_PwM(const QString *file)
 	PwMDataItem currItem;
-	bool res = f.open(IO_ReadOnly);
+	bool res = f.open(QIODevice::ReadOnly);
 	if (res == false)
@@ -3631,4 +3633,4 @@ QStringList PwMDoc::getIDEntryList()
 
-#ifndef PWM_EMBEDDED
-#include "pwmdoc.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmdoc.cpp"
 #endif
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
@@ -214,3 +214,3 @@ struct PwMDataItem
 
-	bool PwMDataItem::operator==( const PwMDataItem &a ) const
+	bool operator==( const PwMDataItem &a ) const
 	{
@@ -229,3 +229,3 @@ struct PwMDataItem
   //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 )
   {
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
@@ -467,4 +467,4 @@ QString PwMDocUi::string_defaultTitle()
 
-#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
@@ -22,2 +22,4 @@
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -94,3 +96,3 @@ PwMInit::~PwMInit()
 	// close all open mainwnds
-	QValueList<PwM *>::iterator i = _mainWndList.begin(),
+	Q3ValueList<PwM *>::iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
@@ -99,3 +101,3 @@ PwMInit::~PwMInit()
 	// close all open mainwnds
-	QValueList<PwM *>::Iterator i = _mainWndList.begin(),
+	Q3ValueList<PwM *>::Iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
@@ -428,3 +430,3 @@ again:
 	// 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();
@@ -432,3 +434,3 @@ again:
 	// 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();
@@ -575,8 +577,8 @@ void PwMInit::minimizeAllMainWnd(bool toTray)
 #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();
@@ -626,3 +628,2 @@ PwMApplication::PwMApplication(int & argc, char ** argv)
 { 
-  setStyle( new QPlatinumStyle ());
   QString hdir = QDir::homeDirPath();
@@ -658,4 +659,4 @@ 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
@@ -22,3 +22,3 @@
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qobject.h>
@@ -32,3 +32,2 @@
 #include <qapplication.h>
-#include <qplatinumstyle.h>
 #endif //DESKTOP_VERSION
@@ -52,3 +51,3 @@ class PwMInit;
 #ifndef PWM_EMBEDDED 
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwMApplication : public KUniqueApplication
@@ -70,3 +69,3 @@ protected:
 };
-//MOC_SKIP_END
+#endif
 #else //PWM_EMBEDDED
@@ -156,3 +155,3 @@ public:
 	/** returns a list of all open main windows */
-	const QValueList<PwM *> * mainWndList()
+	const Q3ValueList<PwM *> * mainWndList()
 			{ return &_mainWndList; }
@@ -216,3 +215,3 @@ protected:
 	/** list of all open main windows */
-	QValueList<PwM *> _mainWndList;
+	Q3ValueList<PwM *> _mainWndList;
 	/** saved command line options. */
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
@@ -30,2 +30,4 @@
 #include <qsize.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
@@ -152,4 +154,4 @@ public:
   //US ENH
-  QValueList<int> mCommentSplitter;
-  QValueList<int> mCategorySplitter;
+  Q3ValueList<int> mCommentSplitter;
+  Q3ValueList<int> mCategorySplitter;
 
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
@@ -34,2 +34,5 @@
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QMouseEvent>
 
@@ -89,8 +92,8 @@ void ActiveTreeItem::execIt()
 			// 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();
@@ -180,3 +183,3 @@ void PwMTray::insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
 				   int docCategory, int docEntry,
-				   QValueList<int> *activeItemsList)
+				   Q3ValueList<int> *activeItemsList)
 {
@@ -198,3 +201,3 @@ void PwMTray::insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
 void PwMTray::rebuildTree(KPopupMenu *popup, PwMDoc *doc,
-			  QValueList<int> *activeItems)
+			  Q3ValueList<int> *activeItems)
 {
@@ -336,7 +339,7 @@ void PwMTray::updateTree(PwMDoc *document)
 		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
@@ -483,4 +486,4 @@ void PwMTray::undock()
 
-#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
@@ -29,3 +29,6 @@
 #include <qpainter.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QMenuItem>
 
@@ -38,4 +41,3 @@ class PwMTray;
 /* wrapper to workaround MOC problems */
-class __ActiveTreeItem : public QCustomMenuItem
-		       , public QObject
+class __ActiveTreeItem : public QMenuItem
 {
@@ -89,4 +91,4 @@ public:
 			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);
 		}
@@ -95,4 +97,4 @@ public:
 		{
-			return QFontMetrics(font).size(AlignLeft | AlignVCenter |
-						       ShowPrefix | DontClip,  text);
+			return QFontMetrics(font).size(Qt::AlignLeft | Qt::AlignVCenter |
+						       Qt::ShowPrefix | Qt::DontClip,  text);
 		}
@@ -124,3 +126,3 @@ protected:
 #ifndef PWM_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwMTray : public KSystemTray
@@ -136,3 +138,3 @@ class PwMTray : public KSystemTray
 		KPopupMenu *menu;
-		QValueList<int> activeItems; // ids of all active items
+		Q3ValueList<int> activeItems; // ids of all active items
 	};
@@ -172,3 +174,3 @@ protected:
 	  */
-	QValueList<struct treeItem> tree;
+	Q3ValueList<struct treeItem> tree;
 	/** pointer to init */
@@ -187,3 +189,3 @@ protected:
 	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.*/
@@ -196,3 +198,3 @@ protected:
 				  int docCategory, int docEntry,
-				  QValueList<int> *activeItemsList);
+				  Q3ValueList<int> *activeItemsList);
 	/** mouse event on icon */
@@ -204,3 +206,3 @@ protected:
 };
-//MOC_SKIP_END
+#endif
 #else
@@ -217,3 +219,3 @@ class PwMTray : public QWidget
 		KPopupMenu *menu;
-		QValueList<int> activeItems; // ids of all active items
+		Q3ValueList<int> activeItems; // ids of all active items
 	};
@@ -257,3 +259,3 @@ protected:
 	  */
-	QValueList<struct treeItem> tree;
+	Q3ValueList<struct treeItem> tree;
 	/** pointer to init */
@@ -272,3 +274,3 @@ protected:
 	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.*/
@@ -281,3 +283,3 @@ protected:
 				  int docCategory, int docEntry,
-				  QValueList<int> *activeItemsList);
+				  Q3ValueList<int> *activeItemsList);
 	/** mouse event on icon */
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
@@ -37,3 +37,11 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
@@ -78,3 +86,3 @@ void PwMView::initCtxMenu()
 {
-	ctxMenu = new QPopupMenu(this);
+	ctxMenu = new Q3PopupMenu(this);
 	ctxMenu->insertItem(i18n("&Add password"), mainClass, SLOT(addPwd_slot()));
@@ -108,3 +116,3 @@ void PwMView::resizeEvent(QResizeEvent *)
 
-void PwMView::refreshCommentTextEdit(QListViewItem *curItem)
+void PwMView::refreshCommentTextEdit(Q3ListViewItem *curItem)
 {
@@ -138,3 +146,3 @@ bool PwMView::getCurEntryIndex(unsigned int *index)
 {
-	QListViewItem *current = lv->currentItem();
+	Q3ListViewItem *current = lv->currentItem();
 	if (!current)
@@ -145,3 +153,3 @@ bool PwMView::getCurEntryIndex(unsigned int *index)
 bool PwMView::getDocEntryIndex(unsigned int *index,
-			       const QListViewItem *item)
+			       const Q3ListViewItem *item)
 {
@@ -168,3 +176,3 @@ bool PwMView::getDocEntryIndex(unsigned int *index,
 
-void PwMView::handleToggle(QListViewItem *item)
+void PwMView::handleToggle(Q3ListViewItem *item)
 {
@@ -173,3 +181,3 @@ void PwMView::handleToggle(QListViewItem *item)
 		return;
-	QCheckListItem *clItem = (QCheckListItem *)item;
+	Q3CheckListItem *clItem = (Q3CheckListItem *)item;
 	QString curCat(getCurrentCategory());
@@ -197,3 +205,3 @@ void PwMView::handleToggle(QListViewItem *item)
 
-void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int)
+void PwMView::handleRightClick(Q3ListViewItem *item, const QPoint &point, int)
 {
@@ -276,3 +284,3 @@ void PwMView::shiftToView()
 
-	QCheckListItem *newItem;
+	Q3CheckListItem *newItem;
 	vector<PwMDataItem>::iterator it = tmpSorted.begin(),
@@ -315,3 +323,3 @@ void PwMView::reorgLp()
 	PWM_ASSERT(!doc->isDocEmpty());
-	QListViewItem *currItem;
+	Q3ListViewItem *currItem;
 	vector<unsigned int> foundPos;
@@ -357,3 +365,3 @@ void PwMView::selAt(int index)
 {
-	QListViewItem *item = lv->itemAtIndex(index);
+	Q3ListViewItem *item = lv->itemAtIndex(index);
 	if (!item)
@@ -481,3 +489,3 @@ void PwMView::copyCommentToClip()
 PwMDataItemView::PwMDataItemView( QWidget *parent, const char *name )
-  : QTextBrowser( parent, name )
+  : Q3TextBrowser( parent, name )
 
@@ -568,9 +576,9 @@ PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool t
     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  );
@@ -578,6 +586,6 @@ PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool t
     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  );
@@ -585,3 +593,3 @@ PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool t
     if ( !takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     av = new PwMDataItemView( subframe );
@@ -620,4 +628,4 @@ 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
@@ -43,3 +43,7 @@
 #include <qobject.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QKeyEvent>
+#include <Q3PopupMenu>
 
@@ -79,3 +83,3 @@ public:
 	bool getDocEntryIndex(unsigned int *index,
-			      const QListViewItem *item);
+			      const Q3ListViewItem *item);
 
@@ -91,5 +95,5 @@ public slots:
 	/** 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" */
@@ -103,3 +107,3 @@ protected:
 	/** right-click context-menu */
-	QPopupMenu *ctxMenu;
+	Q3PopupMenu *ctxMenu;
 
@@ -126,3 +130,3 @@ 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 */
@@ -154,3 +158,3 @@ private:
 //But might be oif interest for other functionalities as well.
-class PwMDataItemView : public QTextBrowser
+class PwMDataItemView : public Q3TextBrowser
 {
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
@@ -63,3 +63,3 @@ PwMViewStyle::~PwMViewStyle()
 
-void PwMViewStyle::editPassWord( QListViewItem * i )
+void PwMViewStyle::editPassWord( Q3ListViewItem * i )
 {
@@ -95,12 +95,12 @@ void PwMViewStyle::initStyle(style_t style)
 	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()),
@@ -251,4 +251,4 @@ int PwMViewStyle::numCategories()
 
-#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
@@ -25,10 +25,10 @@
 #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
@@ -36,3 +36,3 @@
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qcombobox.h>
@@ -44,3 +44,3 @@ class PwMViewStyle_1;
 class PwMView;
-class QListViewItem;
+class Q3ListViewItem;
 class CommentBox;
@@ -96,3 +96,3 @@ protected:
 protected slots:
-    void editPassWord( QListViewItem * );
+    void editPassWord( Q3ListViewItem * );
 
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
@@ -28,2 +28,5 @@
 #include "pwmprefs.h"
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3ValueList>
 
@@ -32,5 +35,5 @@ PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
 {
-	vbox1 = new QVBox(view);
+	vbox1 = new Q3VBox(view);
 	vbox1->setSpacing(0);
-	hbox1 = new QHBox(vbox1);
+	hbox1 = new Q3HBox(vbox1);
 	hbox1->setSpacing(0);
@@ -48,4 +51,4 @@ PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
     delCatButton->setMinimumSize( maxsi, maxsi );
-    delCatButton->setFocusPolicy( QWidget::NoFocus );
-    renCatButton->setFocusPolicy( QWidget::NoFocus );
+    delCatButton->setFocusPolicy( Qt::NoFocus );
+    renCatButton->setFocusPolicy( Qt::NoFocus );
     
@@ -83,5 +86,5 @@ 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] );
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
@@ -22,10 +22,10 @@
 
-#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>
@@ -89,5 +89,5 @@ protected:
 	/** hbox1 for widget style */
-	QHBox *hbox1;
+	Q3HBox *hbox1;
 	/** vbox1 for widget style */
-	QVBox *vbox1;
+	Q3VBox *vbox1;
 	/** splitter for commentTextEdit */
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
@@ -31,2 +31,8 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3ValueList>
+#include <Q3Frame>
+#include <Q3PopupMenu>
 #endif
@@ -56,5 +62,5 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 
-	vbox1 = new QVBox(splitter);
+	vbox1 = new Q3VBox(splitter);
 	categoriesTitle = new QLabel(vbox1);
-	categoriesList = new QListBox(vbox1);
+	categoriesList = new Q3ListBox(vbox1);
 #ifndef PWM_EMBEDDED
@@ -72,3 +78,3 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 	//US	commentBox->resize(commentBox->size().width(), 60);
-	QValueList<int> sizes;
+	Q3ValueList<int> sizes;
 #ifndef PWM_EMBEDDED
@@ -83,3 +89,3 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 #ifndef PWM_EMBEDDED
-	categoriesTitle->setFrameShape(QFrame::MenuBarPanel);
+	categoriesTitle->setFrameShape(Q3Frame::MenuBarPanel);
 #else
@@ -88,3 +94,3 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 	categoriesTitle->setText(i18n("Category:"));
-	catCtxMenu = new QPopupMenu(view);
+	catCtxMenu = new Q3PopupMenu(view);
 	catCtxMenu->insertItem(i18n("&Rename"),
@@ -102,5 +108,5 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 	connect(categoriesList,
-		SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)),
+		SIGNAL(rightButtonClicked(Q3ListBoxItem *, const QPoint &)),
 		this,
-		SLOT(catRightClick(QListBoxItem *, const QPoint &)));
+		SLOT(catRightClick(Q3ListBoxItem *, const QPoint &)));
 
@@ -117,5 +123,5 @@ 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] );
@@ -132,3 +138,3 @@ void PwMViewStyle_1::toggleSplitter()
 
-void PwMViewStyle_1::catRightClick(QListBoxItem *item, const QPoint &point)
+void PwMViewStyle_1::catRightClick(Q3ListBoxItem *item, const QPoint &point)
 {
@@ -189,4 +195,4 @@ 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
@@ -22,9 +22,9 @@
 
-#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>
@@ -33,4 +33,4 @@
 #include <qlabel.h>
-#include <qlistbox.h>
-#include <qpopupmenu.h>
+#include <q3listbox.h>
+#include <q3popupmenu.h>
 
@@ -84,3 +84,3 @@ protected slots:
 	/** user clicked right button in category list */
-	void catRightClick(QListBoxItem *item, const QPoint &point);
+	void catRightClick(Q3ListBoxItem *item, const QPoint &point);
 
@@ -102,3 +102,3 @@ protected:
 	/** categories list-box */
-	QListBox *categoriesList;
+	Q3ListBox *categoriesList;
 	/** title string for the categories combo or list box */
@@ -106,3 +106,3 @@ protected:
 	/** hbox1 for widget style */
-	QVBox *vbox1;
+	Q3VBox *vbox1;
 	/** text-edit to display the comment */
@@ -110,3 +110,3 @@ protected:
 	/** category list context menu */
-	QPopupMenu *catCtxMenu;
+	Q3PopupMenu *catCtxMenu;
 };
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
@@ -55,3 +55,3 @@ Randomizer::Randomizer()
 	if (rndDev->exists() &&
-	    rndDev->open(IO_ReadOnly)) {
+	    rndDev->open(QIODevice::ReadOnly)) {
 		printDebug("Randomizer: using /dev/urandom");
@@ -63,3 +63,3 @@ Randomizer::Randomizer()
 	if (rndDev->exists() &&
-	    rndDev->open(IO_ReadOnly)) {
+	    rndDev->open(QIODevice::ReadOnly)) {
 		printDebug("Randomizer: using /dev/random");
@@ -73,3 +73,3 @@ Randomizer::Randomizer()
 		if (rndDev->exists() &&
-		    rndDev->open(IO_ReadOnly)) {
+		    rndDev->open(QIODevice::ReadOnly)) {
 			printDebug(string("Randomizer: using $RANDFILE \"")
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
@@ -22,2 +22,5 @@
 #include <klocale.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
@@ -25,9 +28,9 @@
 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);
@@ -67,4 +70,4 @@ void RenCatWnd::cancelButton_slot()
 
-#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
@@ -22,4 +22,4 @@
 
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qdialog.h>
@@ -29,2 +29,4 @@
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
@@ -37,3 +39,3 @@ public:
 	RenCatWnd(QWidget *parent = 0, const char *name = 0,
-		    bool modal = FALSE, WFlags f = 0);
+		    bool modal = FALSE, Qt::WFlags f = 0);
 	~RenCatWnd();
@@ -48,4 +50,4 @@ protected slots:
 protected:
-	QVBox *vbox1;
-	QHBox *hbox1;
+	Q3VBox *vbox1;
+	Q3HBox *hbox1;
 	QLabel *label;
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
@@ -26,2 +26,4 @@
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3CString>
 #endif
@@ -148,3 +150,3 @@ Serializer::Serializer()
 
-Serializer::Serializer(const QCString &buffer)
+Serializer::Serializer(const Q3CString &buffer)
 {
@@ -179,3 +181,3 @@ void Serializer::clear()
 
-bool Serializer::parseXml(const QCString &buffer)
+bool Serializer::parseXml(const Q3CString &buffer)
 {
@@ -200,3 +202,3 @@ bool Serializer::parseXml(const QCString &buffer)
 
-QCString Serializer::getXml()
+Q3CString Serializer::getXml()
 {
@@ -206,3 +208,3 @@ QCString Serializer::getXml()
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
-	QCString tmp(domDoc->toCString(8));
+	Q3CString tmp(domDoc->toCString(8));
 	printDebug("<BEGIN Serializer::getXml() dump>\n");
@@ -212,3 +214,3 @@ QCString Serializer::getXml()
 
-	QCString ret(domDoc->toCString(0));
+	Q3CString ret(domDoc->toCString(0));
 	ret.replace('\n', "");
@@ -218,3 +220,3 @@ QCString Serializer::getXml()
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
-	QCString tmp("        " + domDoc->toCString());
+	Q3CString tmp("        " + domDoc->toCString());
 	printDebug("<BEGIN Serializer::getXml() dump>\n");
@@ -225,4 +227,4 @@ QCString Serializer::getXml()
 
-	QCString ret(domDoc->toCString());
-	ret.replace(QRegExp("\n"), "");
+	Q3CString ret(domDoc->toByteArray());
+	ret.replace("\n", "");
 	return ret;
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
@@ -25,3 +25,3 @@
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdom.h>
@@ -42,3 +42,3 @@ public:
 	/** construct a serializer document and parse "buffer" */
-	Serializer(const QCString &buffer);
+	Serializer(const Q3CString &buffer);
 	/** destructor */
@@ -49,5 +49,5 @@ public:
 	/** 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 */
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
@@ -33,2 +33,5 @@ $Id$
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
 
@@ -59,3 +62,3 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
@@ -72,3 +75,3 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
 
-    QGridLayout *layout = new QGridLayout( tab, 5, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( tab, 5, 1 );
     layout->setMargin( KDialogBase::marginHint() );
@@ -77,3 +80,3 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
     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);
@@ -101,3 +104,3 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
 
-    layout = new QGridLayout( tab_2, 5, 1 );
+    layout = new Q3GridLayout( tab_2, 5, 1 );
     layout->setMargin( KDialogBase::marginHint() );
@@ -106,3 +109,3 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
     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);
@@ -110,3 +113,3 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
     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);
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
@@ -29,2 +29,4 @@ $Id$
 #include <kdialogbase.h>
+//Added by qt3to4:
+#include <QLabel>
 
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
@@ -190,4 +190,4 @@ string SetMasterPwWndImpl::getPw(bool *useCard)
 
-#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
@@ -24,2 +24,6 @@
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QCloseEvent>
+#include <QLabel>
 
@@ -31,3 +35,3 @@ WaitWnd::WaitWnd(QString caption, QString _staticText,
 		 QWidget *parent,
-		 const char *name, bool modal, WFlags f)
+		 const char *name, bool modal, Qt::WFlags f)
  : QDialog(parent, name, modal, f)
@@ -35,3 +39,3 @@ WaitWnd::WaitWnd(QString caption, QString _staticText,
 	canClose = false;
-	vbox1 = new QVBox(this);
+	vbox1 = new Q3VBox(this);
 	staticText = new QLabel(vbox1);
@@ -91,4 +95,4 @@ void WaitWnd::updateGenericText(const QString &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
@@ -22,3 +22,3 @@
 
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qdialog.h>
@@ -27,2 +27,5 @@
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QCloseEvent>
 
@@ -36,3 +39,3 @@ public:
 		QWidget *parent = 0, const char *name = 0,
-		bool modal = FALSE, WFlags f = 0);
+		bool modal = FALSE, Qt::WFlags f = 0);
 	~WaitWnd();
@@ -48,3 +51,3 @@ protected slots:
 protected:
-	QVBox *vbox1;
+	Q3VBox *vbox1;
 	QLabel *staticText;