Various small cleanup.

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

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 5d3dc132b53620b328f1089b17f730b44c57b297..626d2079c1516d2fc6e78ba8ebdf6da4d376c872 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include <vector>
 
 #include "LyXFunc.h"
 
@@ -56,7 +55,6 @@
 #include "Server.h"
 #include "Session.h"
 #include "TextClassList.h"
-#include "ToolbarBackend.h"
 
 #include "insets/InsetBox.h"
 #include "insets/InsetBranch.h"
@@ -91,6 +89,7 @@
 #include "support/os.h"
 
 #include <sstream>
+#include <vector>
 
 using namespace std;
 using namespace lyx::support;
@@ -101,9 +100,6 @@ using frontend::LyXView;
 
 namespace Alert = frontend::Alert;
 
-extern bool quitting;
-extern bool use_gui;
-
 namespace {
 
 

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index ef3f5b7933dd2c190f6d4d5ace81079a10d183b2..fdf02687a673b92fefeae12afca54e8cf2a7f2e4 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -100,9 +100,6 @@ using namespace std;
 using namespace lyx::support;
 
 namespace lyx {
-
-extern bool quitting;
-
 namespace frontend {
 
 namespace {

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 0cfb10cdd3e074dd2057529624b56f83a2b2a4e6..fe5b1a7f26bbca89a724415f5765b22efca11391 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -25,10 +25,10 @@
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "LyX.h" // quitting
+#include "MetricsInfo.h"
 #include "Text.h"
 #include "TextClass.h"
-#include "MetricsInfo.h"
-#include "MetricsInfo.h"
 
 #include "frontends/Painter.h"
 #include "frontends/Application.h"
@@ -43,8 +43,6 @@ using namespace std;
 
 namespace lyx {
 
-extern bool quitting;
-
 class InsetName {
 public:
        InsetName(string const & n, InsetCode c) : name(n), code(c) {}

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 3efc70a6bfd761303787475e9c65dddafe0d8fcc..a532a267a9f2d4541e7b16cc36fcd7586cb4b642 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -25,6 +25,7 @@
 #include "FuncRequest.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "LyX.h" // use_gui
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
@@ -64,8 +65,6 @@ namespace lyx {
 
 namespace Alert = frontend::Alert;
 
-extern bool use_gui;
-
 namespace external {
 
 TempName::TempName()