From ce91ef36ead190d6e038f75feee31b2ce1f9db56 Mon Sep 17 00:00:00 2001
From: graffy76 <monograff76@gmail.com>
Date: Sun, 10 Mar 2013 07:49:43 -0500
Subject: [PATCH] Fix for warnings on close, leaves all views open until a
 decision is made

---
 apps/opencs/view/doc/view.cpp        |  8 +------
 apps/opencs/view/doc/view.hpp        |  2 --
 apps/opencs/view/doc/viewmanager.cpp | 31 ++++++----------------------
 apps/opencs/view/doc/viewmanager.hpp |  4 ----
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 29aa471fd..51d4a5135 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -46,8 +46,7 @@ void CSVDoc::View::setupFileMenu()
     file->addAction(close);
 
     QAction *exit = new QAction (tr ("&Exit"), this);
-    connect (exit, SIGNAL (triggered()), this, SLOT (exitApplication()));
-    connect (this, SIGNAL (closeAllViews(View *)), &mViewManager, SLOT (closeAllViews(View *)));
+    connect (exit, SIGNAL (triggered()), QApplication::instance(), SLOT (closeAllWindows()));
 
     file->addAction(exit);
 }
@@ -254,8 +253,3 @@ CSVDoc::Operations *CSVDoc::View::getOperations() const
 {
     return mOperations;
 }
-
-void CSVDoc::View::exitApplication()
-{
-    emit closeAllViews (this);
-}
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index d6b6ad460..92c57fe9e 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -112,8 +112,6 @@ namespace CSVDoc
 
             void addGmstsSubView();
 
-            void exitApplication();
-
     };
 }
 
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index eb9744c11..5614aeda4 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -108,16 +108,13 @@ bool CSVDoc::ViewManager::closeRequest (View *view)
 
         CSMDoc::Document *document = view->getDocument();
 
-        if (last)
-        {
-            //notify user of saving in progress
-            if ( (document->getState() & CSMDoc::State_Saving) )
-                continueWithClose = showSaveInProgressMessageBox (iter);
+        //notify user of saving in progress
+        if ( (document->getState() & CSMDoc::State_Saving) )
+            continueWithClose = showSaveInProgressMessageBox (iter);
 
-            //notify user of unsaved changes and process response
-            else if ( document->getState() & CSMDoc::State_Modified)
-                continueWithClose = showModifiedDocumentMessageBox (iter);
-        }
+        //notify user of unsaved changes and process response
+        else if ( document->getState() & CSMDoc::State_Modified)
+            continueWithClose = showModifiedDocumentMessageBox (iter);
 
         if (continueWithClose)
         {
@@ -268,19 +265,3 @@ void CSVDoc::ViewManager::onCloseWarningHandler (int state, CSMDoc::Document *do
         }
     }
 }
-
-void CSVDoc::ViewManager::closeAllViews (View *lastView)
-{
-    //forces document views to close in an orderly manner
-    // the last view closed is the view from which the "Exit" action was triggered
-    while (mViews.size() > 1)
-    {
-        std::vector<View *>::iterator iter = mViews.begin();
-
-        if ((*iter) != lastView)
-            (*iter)->close();
-        else (*(++iter))->close();
-    }
-
-    lastView->close();
-}
diff --git a/apps/opencs/view/doc/viewmanager.hpp b/apps/opencs/view/doc/viewmanager.hpp
index 92df13785..82a8b5733 100644
--- a/apps/opencs/view/doc/viewmanager.hpp
+++ b/apps/opencs/view/doc/viewmanager.hpp
@@ -60,10 +60,6 @@ namespace CSVDoc
 
             void closeMessageBox();
 
-        public slots:
-
-            void closeAllViews (View *lastView);
-
         private slots:
 
             void documentStateChanged (int state, CSMDoc::Document *document);