From b2891fe17c395b885b4fac8634fa8cca1a45fbb6 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sun, 26 Feb 2012 14:57:49 +0000
Subject: Dropped the KviTalPopupMenu layer, ported the involved code to
 QAction. This fixes most of the random crashes on osx, and is the base for a
 next change in the menubar. Addiotional fix: "disconnect" menu entry was
 broken since the 3.x era

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6072 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/channelsjoin/ChannelsJoinDialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/modules/channelsjoin/ChannelsJoinDialog.cpp')

diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index 4712b691f..71f3b9eb0 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -273,9 +273,9 @@ void ChannelsJoinDialogTreeWidget::mousePressEvent(QMouseEvent *e)
 		pDialog->itemSelected();
 		if(!m_pJoinPopup)
 		{
-			m_pJoinPopup = new KviTalPopupMenu(this);
-			m_pJoinPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Join)),__tr2qs("Join"),pDialog,SLOT(joinClicked()));
-			m_pJoinPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs("Delete"),pDialog,SLOT(deleteClicked()));
+			m_pJoinPopup = new QMenu(this);
+			m_pJoinPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Join)),__tr2qs("Join"),pDialog,SLOT(joinClicked()));
+			m_pJoinPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs("Delete"),pDialog,SLOT(deleteClicked()));
 		}
 
 		m_pJoinPopup->popup(QCursor::pos());
-- 
cgit v1.3.1-10-gc9f91