Move Color::color enum to ColorCode.h

[lyx.git] / src / frontends / Dialogs.cpp

diff --git a/src/frontends/Dialogs.cpp b/src/frontends/Dialogs.cpp
index 452b7ccbbf6ecd99c62124f271152d63b2e23835..3032f0d9013a6d01b0323feaad656037076eddc0 100644 (file)
--- a/src/frontends/Dialogs.cpp
+++ b/src/frontends/Dialogs.cpp
@@ -13,10 +13,7 @@
 #include <config.h>
 
 #include "Dialogs.h"
-
-#include "callback.h"
-
-#include "controllers/Dialog.h"
+#include "Dialog.h"
 
 #include <boost/signal.hpp>
 #include <boost/bind.hpp>
@@ -25,6 +22,8 @@ using std::string;
 
 namespace lyx {
 
+extern bool quitting;
+
 namespace frontend {
 
 Dialogs::Dialogs(LyXView & lyxview)
@@ -66,8 +65,7 @@ void Dialogs::show(string const & name, string const & data, Inset * inset)
 
 bool Dialogs::visible(string const & name) const
 {
-       std::map<string, DialogPtr>::const_iterator it =
-               dialogs_.find(name);
+       std::map<string, DialogPtr>::const_iterator it = dialogs_.find(name);
        if (it == dialogs_.end())
                return false;
        return it->second.get()->isVisibleView();
@@ -76,8 +74,7 @@ bool Dialogs::visible(string const & name) const
 
 void Dialogs::update(string const & name, string const & data)
 {
-       std::map<string, DialogPtr>::const_iterator it =
-               dialogs_.find(name);
+       std::map<string, DialogPtr>::const_iterator it = dialogs_.find(name);
        if (it == dialogs_.end())
                return;
 
@@ -149,7 +146,7 @@ void Dialogs::hideBufferDependent() const
 
        for(; it != end; ++it) {
                Dialog * dialog = it->second.get();
-               if (dialog->controller().isBufferDependent())
+               if (dialog->isBufferDependent())
                        dialog->hide();
        }
 }
@@ -162,8 +159,8 @@ void Dialogs::updateBufferDependent(bool switched) const
 
        for(; it != end; ++it) {
                Dialog * dialog = it->second.get();
-               if (switched && dialog->controller().isBufferDependent()) {
-                       if (dialog->isVisibleView() && dialog->controller().initialiseParams(""))
+               if (switched && dialog->isBufferDependent()) {
+                       if (dialog->isVisibleView() && dialog->initialiseParams(""))
                                dialog->updateView();
                        else
                                dialog->hide();
@@ -194,7 +191,7 @@ void Dialogs::checkStatus()
 
        for(; it != end; ++it) {
                Dialog * const dialog = it->second.get();
-               if (dialog->isVisibleView())
+               if (dialog && dialog->isVisibleView())
                        dialog->checkStatus();
        }
 }