r18468 by craig - Clean up commit 18466. Fixes broken context menu with Qt5. Stops OSX/Cocoa complaining about the submenu being used twice

[scribus-commit]

Author: craig
Date: Mon Sep  9 18:48:16 2013
New Revision: 18468

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18468
Log:
Clean up commit 18466. Fixes broken context menu with Qt5. Stops OSX/Cocoa complaining about the submenu being used twice

Modified:
    trunk/Scribus/scribus/ui/contextmenu.cpp

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18468&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Mon Sep  9 18:48:16 2013
@@ -350,8 +350,6 @@
 		QAction *actL = addMenu(menuLocking);
 		actL->setText( ScribusView::tr("Locking"));
 
-		//menuSendTo->addAction(m_AP->scrActions["itemSendToScrapbook"]);
-
 		QAction *actST = addMenu(menuSendTo);
 		actST->setText( ScribusView::tr("Send to"));
 		QAction *actScr = menuSendTo->addMenu(menuScrapbook);
@@ -365,15 +363,8 @@
 		{
 			ScrAction *act = new ScrAction( ScrAction::DataInt, QPixmap(), QPixmap(), scrapNames[i], QKeySequence(), this, i);
 			menuScrapbook->addAction(act);
-			//scrScrapActions.insert(scrapNames[i], act);
-			//scrMenuMgr->addMenuItem(act, "itemSendToScrapbook", true);
 			connect(act, SIGNAL(triggeredData(int)), m_ScMW, SLOT(PutScrap(int)));
 		}
-		//QAction *actSl = addMenu(m_AP->scrMenuMgr->getLocalPopupMenu("Locking"));
-		//actSl->setText( ScribusView::tr("Locking"));
-		//QAction *actSc = addMenu(m_AP->scrMenuMgr->getLocalPopupMenu("SendTo"));
-		//actSc->setText( ScribusView::tr("Send to"));
-		//<-- Add Layer Items
 
 		if (m_doc->layerCount() > 1)
 		{