Get rid of GuiApplication::view_ids_

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24904 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index dd071e9773c778a84cc6393076d5bd6aacb494ad..874ee04e0288f7e37304075aff4a4d5fcf24b3db 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -369,9 +369,7 @@ struct GuiApplication::Private
        * object is handled by Qt when the view is closed
        * \sa Qt::WA_DeleteOnClose attribute.
        */
-       std::map<int, GuiView *> views_;
-       ///
-       std::vector<int> view_ids_;
+       map<int, GuiView *> views_;
 
        /// Only used on mac.
        GlobalMenuBar * global_menubar_;
@@ -497,7 +495,7 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
        switch(cmd.action) {
 
        case LFUN_WINDOW_CLOSE:
-               enable = d->view_ids_.size() > 0;
+               enable = d->views_.size() > 0;
                break;
 
        case LFUN_BUFFER_NEW:
@@ -647,15 +645,6 @@ void GuiApplication::resetGui()
 }
 
 
-static void updateIds(map<int, GuiView *> const & stdmap, vector<int> & ids)
-{
-       ids.clear();
-       map<int, GuiView *>::const_iterator it;
-       for (it = stdmap.begin(); it != stdmap.end(); ++it)
-               ids.push_back(it->first);
-}
-
-
 void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
 {
        // release the keyboard which might have been grabed by the global
@@ -664,7 +653,6 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
                d->global_menubar_->releaseKeyboard();
 
        // create new view
-       updateIds(d->views_, d->view_ids_);
        int id = 0;
        while (d->views_.find(id) != d->views_.end())
                id++;
@@ -676,7 +664,6 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
 
        // register view
        d->views_[id] = view;
-       updateIds(d->views_, d->view_ids_);
 
        if (autoShow) {
                view->show();
@@ -733,15 +720,21 @@ Menus & GuiApplication::menus()
 
 size_t GuiApplication::viewCount() const
 {
-       return d->view_ids_.size();
+       return d->views_.size();
 }
 
 
-vector<int> const & GuiApplication::viewIds()
+QVector<int> GuiApplication::viewIds()
 {
-       return d->view_ids_;
+       QVector<int> ids;
+       map<int, GuiView *>::const_iterator end = d->views_.end();
+       map<int, GuiView *>::const_iterator it = d->views_.begin();
+       for (; it != end; ++it)
+               ids.push_back(it->first);
+       return ids;
 }
 
+
 ColorCache & GuiApplication::colorCache()
 {
        return d->color_cache_;
@@ -991,7 +984,6 @@ void GuiApplication::commitData(QSessionManager & sm)
 
 bool GuiApplication::unregisterView(int id)
 {
-       updateIds(d->views_, d->view_ids_);
        LASSERT(d->views_.find(id) != d->views_.end(), /**/);
        LASSERT(d->views_[id], /**/);
 
@@ -1002,14 +994,13 @@ bool GuiApplication::unregisterView(int id)
                        break;
                }
        }
-       updateIds(d->views_, d->view_ids_);
+
        return true;
 }
 
 
 bool GuiApplication::closeAllViews()
 {
-       updateIds(d->views_, d->view_ids_);
        if (d->views_.empty())
                return true;
 
@@ -1021,7 +1012,6 @@ bool GuiApplication::closeAllViews()
        }
 
        d->views_.clear();
-       d->view_ids_.clear();
        return true;
 }
 
@@ -1035,21 +1025,18 @@ GuiView & GuiApplication::view(int id) const
 
 void GuiApplication::hideDialogs(string const & name, Inset * inset) const
 {
-       vector<int>::const_iterator it = d->view_ids_.begin();
-       vector<int>::const_iterator const end = d->view_ids_.end();
-       for (; it != end; ++it)
-               view(*it).hideDialog(name, inset);
+       map<int, GuiView *>::iterator end = d->views_.end();
+       for (map<int, GuiView *>::iterator it = d->views_.begin(); it != end; ++it)
+               it->second->hideDialog(name, inset);
 }
 
 
 Buffer const * GuiApplication::updateInset(Inset const * inset) const
 {
        Buffer const * buffer_ = 0;
-       vector<int>::const_iterator it = d->view_ids_.begin();
-       vector<int>::const_iterator const end = d->view_ids_.end();
-       for (; it != end; ++it) {
-               Buffer const * ptr = view(*it).updateInset(inset);
-               if (ptr)
+       map<int, GuiView *>::iterator end = d->views_.end();
+       for (map<int, GuiView *>::iterator it = d->views_.begin(); it != end; ++it) {
+               if (Buffer const * ptr = it->second->updateInset(inset))
                        buffer_ = ptr;
        }
        return buffer_;

diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index 1f214680f1210ba56c22c18971dc84c23430db08..97b6c4622a4a865839d81f819b7d83c1c74823cf 100644 (file)
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -15,10 +15,9 @@
 
 #include "frontends/Application.h"
 
-#include <QObject>
 #include <QApplication>
-
-#include <vector>
+#include <QObject>
+#include <QVector>
 
 class QSessionManager;
 class QAbstractItemModel;
@@ -97,7 +96,7 @@ public:
        ///
        size_t viewCount() const;
        ///
-       std::vector<int> const & viewIds();
+       QVector<int> viewIds();
 
        ///
        ColorCache & colorCache();

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index a3782948bf923563f239e97ee3d92711eb835a47..63bd54ec63c476087b971512b96e55f65fe1eb06 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -403,8 +403,8 @@ void GuiView::closeEvent(QCloseEvent * close_event)
                        continue;
                }
 
-               std::vector<int> const & ids = guiApp->viewIds();
-               for (size_type i = 0; i != ids.size(); ++i) {
+               QVector<int> const ids = guiApp->viewIds();
+               for (int i = 0; i != ids.size(); ++i) {
                        if (id_ == ids[i])
                                continue;
                        if (guiApp->view(ids[i]).workArea(*b)) {