From 4eedb8abd6c47f0d985b9bfbd359688313d4e02c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= <poenitz@gmx.net>
Date: Fri, 28 Sep 2007 23:26:59 +0000
Subject: [PATCH] cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20574 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiMenubar.cpp | 20 ++++++--------------
 src/frontends/qt4/GuiMenubar.h   | 18 +++++++-----------
 src/frontends/qt4/GuiView.cpp    |  4 ++--
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/frontends/qt4/GuiMenubar.cpp b/src/frontends/qt4/GuiMenubar.cpp
index 13254c2046..0bfd6a2fd6 100644
--- a/src/frontends/qt4/GuiMenubar.cpp
+++ b/src/frontends/qt4/GuiMenubar.cpp
@@ -85,11 +85,7 @@ GuiMenubar::GuiMenubar(LyXView * view, MenuBackend & mbe)
 		GuiPopupMenu * qMenu = new GuiPopupMenu(this, *m, true);
 		owner_->menuBar()->addMenu(qMenu);
 
-		pair<NameMap::iterator, bool> I = name_map_.insert(make_pair(name, qMenu));
-		if (!I.second) {
-			LYXERR(Debug::GUI) << "\tERROR: " << to_utf8(name)
-				<< " submenu is already there!" << endl;
-		}
+		name_map_[toqstr(name)] = qMenu;
 /*
 		QObject::connect(qMenu, SIGNAL(aboutToShow()), this, SLOT(update()));
 		QObject::connect(qMenu, SIGNAL(triggered(QAction *)), this, SLOT(update()));
@@ -99,15 +95,11 @@ GuiMenubar::GuiMenubar(LyXView * view, MenuBackend & mbe)
 	//QObject::connect(owner_->menuBar(), SIGNAL(triggered()), this, SLOT(update()));
 }
 
-void GuiMenubar::openByName(docstring const & name)
-{
-	NameMap::const_iterator const cit = name_map_.find(name);
-	if (cit == name_map_.end())
-		return;
 
-	// I (Abdel) don't understand this comment:
-	// this will have to do I'm afraid.
-	cit->second->exec(QCursor::pos());
+void GuiMenubar::openByName(QString const & name)
+{
+	if (QMenu * menu = name_map_.value(name))
+		menu->exec(QCursor::pos());
 }
 
 
@@ -137,7 +129,7 @@ void GuiMenubar::openByName(docstring const & name)
 QMenuBar * GuiMenubar::menuBar() const
 {
 #ifdef Q_WS_MACX
-	return mac_menubar_.get();
+	return mac_menubar_;
 #else
 	return owner_->menuBar();
 #endif
diff --git a/src/frontends/qt4/GuiMenubar.h b/src/frontends/qt4/GuiMenubar.h
index 2ccacc322a..dbcb632d90 100644
--- a/src/frontends/qt4/GuiMenubar.h
+++ b/src/frontends/qt4/GuiMenubar.h
@@ -13,23 +13,19 @@
 #ifndef GUIMENUBAR_H
 #define GUIMENUBAR_H
 
-#include "GuiPopupMenu.h"
-
-#include <map>
-#include <boost/scoped_ptr.hpp>
-
 #include <QObject>
-#include <QMenuBar>
+#include <QHash>
+
+class QMenuBar;
 
 namespace lyx {
 
 class MenuBackend;
-class Menu;
-class MenuItem;
 
 namespace frontend {
 
 class GuiViewBase;
+class GuiPopupMenu;
 class LyXView;
 
 class GuiMenubar : public QObject
@@ -39,7 +35,7 @@ public:
 	GuiMenubar(LyXView *, MenuBackend &);
 
 	/// opens a top-level submenu given its name
-	void openByName(docstring const &);
+	void openByName(QString const & name);
 
 	/// return the owning view
 	GuiViewBase * view() { return owner_; }
@@ -63,13 +59,13 @@ private:
 	/// menu controller
 	MenuBackend & menubackend_;
 
-	typedef std::map<docstring, GuiPopupMenu *> NameMap;
+	typedef QHash<QString, GuiPopupMenu *> NameMap;
 
 	/// name to menu for openByName
 	NameMap name_map_;
 
 	/// MACOS X special menubar.
-	boost::scoped_ptr<QMenuBar> mac_menubar_;
+	QMenuBar * mac_menubar_;
 };
 
 } // namespace frontend
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 448b1c2e92..10ab0f87f2 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -52,7 +52,7 @@
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <QList>
-#include <QMimeData>
+#include <QMenu>
 #include <QPainter>
 #include <QPixmap>
 #include <QPushButton>
@@ -931,7 +931,7 @@ void GuiViewBase::showMiniBuffer(bool visible)
 
 void GuiViewBase::openMenu(docstring const & name)
 {
-	d.menubar_->openByName(name);
+	d.menubar_->openByName(toqstr(name));
 }
 
 } // namespace frontend
-- 
2.39.2