1 files changed, 28 insertions, 20 deletions

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