r22903 by jghali - Remove unused MenuManager::generateKeyManList()

scribus-commit scribus-commit at lists.scribus.net
Sun Mar 17 19:10:57 UTC 2019


Author: jghali
Date: Sun Mar 17 19:10:57 2019
New Revision: 22903

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22903
Log:
Remove unused MenuManager::generateKeyManList()

Modified:
    trunk/Scribus/scribus/menumanager.cpp
    trunk/Scribus/scribus/menumanager.h

Modified: trunk/Scribus/scribus/menumanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22903&path=/trunk/Scribus/scribus/menumanager.cpp
==============================================================================
--- trunk/Scribus/scribus/menumanager.cpp	(original)
+++ trunk/Scribus/scribus/menumanager.cpp	Sun Mar 17 19:10:57 2019
@@ -297,40 +297,6 @@
 	*/
 }
 
-// Used to generate a list of entries from the menu system into the keyboard shortcut manager
-void MenuManager::generateKeyManList(QStringList *actionNames)
-{
-	if (actionNames)
-	{
-		if (scribusMenuBar)
-		{
-			/*
-			QMap<QString, ScrPopupMenu *>::Iterator menuListIt;
-			for (uint menuBarCount=0; menuBarCount<scribusMenuBar->count(); ++menuBarCount)
-			{
-				int menuBarMenuID=scribusMenuBar->idAt(menuBarCount);
-				bool menuBarItemFound=false;
-				for ( menuListIt = menuList.begin(); menuListIt!=menuList.end(); ++menuListIt)
-				{
-					if(menuListIt.value()->getMenuBarID()==menuBarMenuID)
-					{
-						menuBarItemFound=true;
-						break;
-					}
-				}
-				if (menuBarItemFound)
-				{
-					if (menuListIt.value())
-					{
-						ScrPopupMenu *currentMenu=menuListIt.value();
-						currentMenu->generateEntryList(actionNames);
-					}
-				}
-			}*/
-		}
-	}
-}
-
 bool MenuManager::empty()
 {
 	return menuStrings.empty();

Modified: trunk/Scribus/scribus/menumanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22903&path=/trunk/Scribus/scribus/menumanager.h
==============================================================================
--- trunk/Scribus/scribus/menumanager.h	(original)
+++ trunk/Scribus/scribus/menumanager.h	Sun Mar 17 19:10:57 2019
@@ -53,12 +53,9 @@
 		bool createMenu(const QString &menuName, const QString &menuText = QString::null, const QString& parent = QString::null, bool checkable = false, bool rememberMenu = false);
 		void removeMenuItem(const QString& s, ScrAction *menuAction, const QString &parent);
 		bool removeMenuItem(ScrAction *menuAction, const QString &parent);
-		void generateKeyManList(QStringList *actionNames);
 		void runMenuAtPos(const QString &, const QPoint);
 		void setMenuEnabled(const QString &menuName, const bool enabled);
 		void setText(const QString &menuName, const QString &menuText);
-
-
 
 		QMenu *getLocalPopupMenu(const QString &menuName);
 		bool addMenuStringToMenuBar(const QString &menuName, bool rememberMenu=false);
@@ -74,8 +71,9 @@
 		void addMenuItemStringsToMenuBar(const QString &menuName, const QMap<QString, QPointer<ScrAction> > &menuActions);
 		void clearMenuStrings(const QString &menuName);
 		void dumpMenuStrings();
-		QMenu *undoMenu() {return m_undoMenu;}
-		QMenu *redoMenu() {return m_redoMenu;}
+
+		QMenu *undoMenu() { return m_undoMenu; }
+		QMenu *redoMenu() { return m_redoMenu; }
 
 	public slots:
 		void languageChange();




More information about the scribus-commit mailing list