straight copy of qt4 branch over to trunk, merge refused to work

git-svn-id: svn://svn.code.sf.net/p/qjoypad/code/trunk@95 c05e91a0-76c8-4ec0-b377-ef19ce7cc080

src/icon.h

@@ -1,27 +1,25 @@
 #ifndef JOY_ICON_H
 #define JOY_ICON_H
 
-//for creating a floating icon in notray mode  :)
-#include <qdialog.h>
-//the pixmap to load
-#include <qpixmap.h>
+#include <QDialog>
+#include <QMenu>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QCloseEvent>
 
 #include "constant.h"
 
-//A quirk in QT forbids me from simply including qpopupmenu.h
-class QPopupMenu;
-
 class FloatingIcon : public QDialog {
 	Q_OBJECT
 	public:
-		FloatingIcon( const QPixmap &icon, QPopupMenu *popup = 0, QWidget *parent = 0, const char *name = 0);
+		FloatingIcon( const QPixmap &icon, QMenu *popup = 0, QWidget *parent = 0, const char *name = 0);
 	signals:
 		void closed();
 		void clicked();
 	protected:
 		void mousePressEvent( QMouseEvent* e );
 		void closeEvent( QCloseEvent* e );
-		QPopupMenu* pop;
+		QMenu* pop;
 };
 
 #endif