initial public commit of qt4 portp1

1 files changed, 19 insertions, 17 deletions

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
@@ -18,35 +18,37 @@
  **************************************************************************/  
 
 #ifndef __PWMTRAY_H
 #define __PWMTRAY_H
 
 #ifndef PWM_EMBEDDED
 #include <ksystemtray.h>
 #endif
 
 #include <kpopupmenu.h>
 
 #include <qpainter.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QMenuItem>
 
 //#include "pwmexception.h"
 
 class PwMInit;
 class PwMDoc;
 class PwMTray;
 
 /* wrapper to workaround MOC problems */
-class __ActiveTreeItem : public QCustomMenuItem
-		       , public QObject
+class __ActiveTreeItem : public QMenuItem
 {
 public:
 	__ActiveTreeItem() {}
 };
 
 /** implements the "active" part of the tree */
 class ActiveTreeItem : public __ActiveTreeItem
 {
 	Q_OBJECT
 
 public:
 	enum Task
@@ -78,32 +80,32 @@ public:
 	 , category (_category)
 	 , entry (_entry)
 	 , tray (_tray)
 	 	{ }
 
 /*	~ActiveTreeItem()
 		{ cout << "deleted \"" << text << "\"" << endl; } */
 
 	void paint(QPainter *p, const QColorGroup & /*cg*/, bool /*act*/,
 		   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
 			{ return false; }
 
 	bool isSeparator() const
 			{ return false; }
 
 	void setFont(const QFont &f)
 			{ font = f; }
 
 public slots:
@@ -113,37 +115,37 @@ public slots:
 protected:
 	QString text;
 	QFont font;
 	Task task;
 	PwMDoc *doc;
 	int category;
 	int entry;
 	PwMTray *tray;
 };
 
 /** tray icon implementation */
 #ifndef PWM_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwMTray : public KSystemTray
 {
 	Q_OBJECT
 
 	friend class ActiveTreeItem;
 
 	struct treeItem
 	{
 		int menuId;
 		PwMDoc *doc;
 		KPopupMenu *menu;
-		QValueList<int> activeItems; // ids of all active items
+		Q3ValueList<int> activeItems; // ids of all active items
 	};
 
 public: 
 	PwMTray(PwMInit *_init, QWidget* parent = 0, const char* name = 0);
 	~PwMTray();
 
 	/** connect all signals for this document to the tray */
 	void connectDocToTray(PwMDoc *doc);
 
 public slots:
 	/** for update-notification from all open documents */
 	void updateTree(PwMDoc *document);
@@ -161,70 +163,70 @@ protected slots:
 	void undock();
 
 signals:
 	/** this icon got deleted */
 	void closed(PwMTray *);
 	/** the user clicked on the tray icon */
 	void clickedIcon(PwMTray *);
 
 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;
 
 protected:
 	/** search if an entry with for the given document
 	  * exists and resturn its ID and a pointer to the main
 	  * KPopupMenu. If no item is found,
 	  * it returns -1 as ID and a NULL-pointer.
 	  */
 	int findTreeEntry(PwMDoc *doc, KPopupMenu **menu, int *treeItem);
 	/** build the main menu-items */
 	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 */
 	void removeTreeEntry(int menuId, int treeItem, KPopupMenu **menu);
 	/** inserts a new active-tree-item into the given tree entry */
 	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
 	  * into the popup menu.
 	  */
 	void insertMainWndCtrl(KPopupMenu *menu, PwMDoc *doc);
 };
-//MOC_SKIP_END
+#endif
 #else
 class PwMTray : public QWidget 
 {
 	Q_OBJECT
 
 	friend class ActiveTreeItem;
 
 	struct treeItem
 	{
 		int menuId;
 		PwMDoc *doc;
 		KPopupMenu *menu;
-		QValueList<int> activeItems; // ids of all active items
+		Q3ValueList<int> activeItems; // ids of all active items
 	};
 
 public: 
 	PwMTray(PwMInit *_init, QWidget* parent = 0, const char* name = 0);
 	~PwMTray();
 
 	//US ENH needed for embedde version.
 	KPopupMenu* contextMenu();
 	KPopupMenu* m_ctxMenu;
 
 	/** connect all signals for this document to the tray */
 	void connectDocToTray(PwMDoc *doc);
@@ -246,47 +248,47 @@ protected slots:
 	void undock();
 
 signals:
 	/** this icon got deleted */
 	void closed(PwMTray *);
 	/** the user clicked on the tray icon */
 	void clickedIcon(PwMTray *);
 
 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;
 
 protected:
 	/** search if an entry with for the given document
 	  * exists and resturn its ID and a pointer to the main
 	  * KPopupMenu. If no item is found,
 	  * it returns -1 as ID and a NULL-pointer.
 	  */
 	int findTreeEntry(PwMDoc *doc, KPopupMenu **menu, int *treeItem);
 	/** build the main menu-items */
 	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 */
 	void removeTreeEntry(int menuId, int treeItem, KPopupMenu **menu);
 	/** inserts a new active-tree-item into the given tree entry */
 	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
 	  * into the popup menu.
 	  */
 	void insertMainWndCtrl(KPopupMenu *menu, PwMDoc *doc);
 };
 #endif
 
 #endif