Diffstat (limited to 'pwmanager/pwmanager/pwmtray.h') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | pwmanager/pwmanager/pwmtray.h | 36 |
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 @@ -28,5 +28,8 @@ #include <qpainter.h> -#include <qvaluelist.h> +#include <q3valuelist.h> +//Added by qt3to4: +#include <QMouseEvent> +#include <QMenuItem> //#include "pwmexception.h" @@ -37,6 +40,5 @@ class PwMTray; /* wrapper to workaround MOC problems */ -class __ActiveTreeItem : public QCustomMenuItem - , public QObject +class __ActiveTreeItem : public QMenuItem { public: @@ -88,12 +90,12 @@ 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); } QSize sizeHint() { - return QFontMetrics(font).size(AlignLeft | AlignVCenter | - ShowPrefix | DontClip, text); + return QFontMetrics(font).size(Qt::AlignLeft | Qt::AlignVCenter | + Qt::ShowPrefix | Qt::DontClip, text); } @@ -123,5 +125,5 @@ protected: /** tray icon implementation */ #ifndef PWM_EMBEDDED -//MOC_SKIP_BEGIN +#ifndef Q_MOC_RUN class PwMTray : public KSystemTray { @@ -135,5 +137,5 @@ class PwMTray : public KSystemTray PwMDoc *doc; KPopupMenu *menu; - QValueList<int> activeItems; // ids of all active items + Q3ValueList<int> activeItems; // ids of all active items }; @@ -171,5 +173,5 @@ protected: * its menuIDs */ - QValueList<struct treeItem> tree; + Q3ValueList<struct treeItem> tree; /** pointer to init */ PwMInit *init; @@ -186,5 +188,5 @@ protected: /** 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); @@ -195,5 +197,5 @@ protected: ActiveTreeItem::Task task, PwMDoc *doc, int docCategory, int docEntry, - QValueList<int> *activeItemsList); + Q3ValueList<int> *activeItemsList); /** mouse event on icon */ void mouseReleaseEvent(QMouseEvent *e); @@ -203,5 +205,5 @@ protected: void insertMainWndCtrl(KPopupMenu *menu, PwMDoc *doc); }; -//MOC_SKIP_END +#endif #else class PwMTray : public QWidget @@ -216,5 +218,5 @@ class PwMTray : public QWidget PwMDoc *doc; KPopupMenu *menu; - QValueList<int> activeItems; // ids of all active items + Q3ValueList<int> activeItems; // ids of all active items }; @@ -256,5 +258,5 @@ protected: * its menuIDs */ - QValueList<struct treeItem> tree; + Q3ValueList<struct treeItem> tree; /** pointer to init */ PwMInit *init; @@ -271,5 +273,5 @@ protected: /** 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); @@ -280,5 +282,5 @@ protected: ActiveTreeItem::Task task, PwMDoc *doc, int docCategory, int docEntry, - QValueList<int> *activeItemsList); + Q3ValueList<int> *activeItemsList); /** mouse event on icon */ void mouseReleaseEvent(QMouseEvent *e); |