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/objects/KvsObject_toolButton.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/modules/objects/KvsObject_toolButton.cpp')

diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index 84d05560f..a37e8b0d8 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -29,7 +29,7 @@
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
-#include "KviTalPopupMenu.h"
+#include "QMenu.h"
 /*
 	@doc:	toolbutton
 	@keyterms:
@@ -273,7 +273,7 @@ KVSO_CLASS_FUNCTION(toolButton,setPopup)
 		c->warning(__tr2qs_ctx("Can't add a non-popupmenu object","objects"));
 		return true;
 	}
-	((QToolButton *)widget())->setMenu(((KviTalPopupMenu  *)(ob->object())));
+	((QToolButton *)widget())->setMenu(((QMenu  *)(ob->object())));
 	return true;
 }
 
-- 
cgit v1.3.1-10-gc9f91