4 files changed, 17 insertions, 15 deletions
diff --git a/src/modules/dockwidget/libkvidockwidget.cpp b/src/modules/dockwidget/libkvidockwidget.cpp
index 9a4775918..b15842c46 100644
--- a/src/modules/dockwidget/libkvidockwidget.cpp
+++ b/src/modules/dockwidget/libkvidockwidget.cpp
@@ -45,10 +45,12 @@
 	#include <kwin.h>
 	#include <kpopupmenu.h>
 #else
-	#include <qpopupmenu.h>
 	#include <qlabel.h>
 #endif
 
+#include "kvi_tal_popupmenu.h"
+
+
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qtimer.h>
@@ -129,13 +131,13 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
 	m_pTip = new KviDynamicToolTip(this,"dock_tooltip");
 	connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
 	
-	m_pAwayPopup = new QPopupMenu(this);
+	m_pAwayPopup = new KviTalPopupMenu(this);
 	
 #ifdef COMPILE_KDE_SUPPORT
 	m_pContextPopup = new KPopupMenu(this);
 	m_pContextPopup->insertTitle(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("KVIrc"));
 #else
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 	QLabel * l = new QLabel(__tr2qs("KVIrc"),m_pContextPopup);
 	l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
 	m_pContextPopup->insertItem(l);
diff --git a/src/modules/dockwidget/libkvidockwidget.h b/src/modules/dockwidget/libkvidockwidget.h
index 343b18be3..4a8a25d36 100644
--- a/src/modules/dockwidget/libkvidockwidget.h
+++ b/src/modules/dockwidget/libkvidockwidget.h
@@ -26,7 +26,7 @@
 #ifdef COMPILE_KDE_SUPPORT
 	class KPopupMenu;
 #else
-	class QPopupMenu;
+	class KviTalPopupMenu;
 #endif
 class QPixmap;
 class QTimer;
@@ -46,9 +46,9 @@ protected:
 #ifdef COMPILE_KDE_SUPPORT
 	KPopupMenu        * m_pContextPopup;
 #else
-	QPopupMenu        * m_pContextPopup;
+	KviTalPopupMenu        * m_pContextPopup;
 #endif
-	QPopupMenu        * m_pAwayPopup;
+	KviTalPopupMenu        * m_pAwayPopup;
 	int m_iToggleFrame;
 	int m_iAwayMenuId;
 
diff --git a/src/modules/dockwidget/trayicon.cpp b/src/modules/dockwidget/trayicon.cpp
index de8b590d2..cf2e46d8d 100644
--- a/src/modules/dockwidget/trayicon.cpp
+++ b/src/modules/dockwidget/trayicon.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "trayicon.h"
-#include "qpopupmenu.h"
+#include "kvi_tal_popupmenu.h"
 
 /*!
   \class TrayIcon qtrayicon.h
@@ -45,7 +45,7 @@ TrayIcon::TrayIcon( QObject *parent, const char *name )
 
   \sa show
 */
-TrayIcon::TrayIcon( const QPixmap &icon, const QString &tooltip, QPopupMenu *popup, QObject *parent, const char *name )
+TrayIcon::TrayIcon( const QPixmap &icon, const QString &tooltip, KviTalPopupMenu *popup, QObject *parent, const char *name )
 : QObject(parent, name), pop(popup), pm(icon), tip(tooltip), d(0)
 {
 	v_isWMDock = FALSE;
@@ -79,7 +79,7 @@ void TrayIcon::newTrayOwner()
   Sets the context menu to \a popup. The context menu will pop up when the
   user clicks the system tray entry with the right mouse button.
 */
-void TrayIcon::setPopup( QPopupMenu* popup )
+void TrayIcon::setPopup( KviTalPopupMenu* popup )
 {
     pop = popup;
 }
@@ -89,7 +89,7 @@ void TrayIcon::setPopup( QPopupMenu* popup )
 
   \sa setPopup
 */
-QPopupMenu* TrayIcon::popup() const
+KviTalPopupMenu* TrayIcon::popup() const
 {
     return pop;
 }
diff --git a/src/modules/dockwidget/trayicon.h b/src/modules/dockwidget/trayicon.h
index b0ef7c087..f730d2aa5 100644
--- a/src/modules/dockwidget/trayicon.h
+++ b/src/modules/dockwidget/trayicon.h
@@ -26,7 +26,7 @@
 #include <qobject.h>
 #include <qimage.h>
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class TrayIcon : public QObject
 {
@@ -37,7 +37,7 @@ class TrayIcon : public QObject
 
 public:
 	TrayIcon( QObject *parent = 0, const char *name = 0 );
-	TrayIcon( const QPixmap &, const QString &, QPopupMenu *popup = 0, QObject *parent = 0, const char *name = 0 );
+	TrayIcon( const QPixmap &, const QString &, KviTalPopupMenu *popup = 0, QObject *parent = 0, const char *name = 0 );
 	~TrayIcon();
 
 	// use WindowMaker dock mode.  ignored on non-X11 platforms
@@ -45,8 +45,8 @@ public:
 	bool isWMDock() { return v_isWMDock; }
 
 	// Set a popup menu to handle RMB
-	void setPopup( QPopupMenu * );
-	QPopupMenu* popup() const;
+	void setPopup( KviTalPopupMenu * );
+	KviTalPopupMenu* popup() const;
 
 	QPixmap icon() const;
 	QString toolTip() const;
@@ -75,7 +75,7 @@ protected:
 	virtual void mouseDoubleClickEvent( QMouseEvent *e );
 
 private:
-	QPopupMenu *pop;
+	KviTalPopupMenu *pop;
 	QPixmap pm;
 	QString tip;
 	bool v_isWMDock;