Some cleanup

* Application.h: pimpl_ is now private

* GuiApplication.C: headers cleanup.

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

diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 64c34024735f2c62c76dd8e963b023570355f14c..50dd994a0b016abd29c8f50b6ad29f488bbe41e6 100644 (file)
--- a/src/frontends/Application.h
+++ b/src/frontends/Application.h
@@ -85,9 +85,8 @@ protected:
        /// FIXME: \todo use Gui::currentView() in the future
        BufferView * buffer_view_;
 
+private:
        /// Application private implementation.
-       /// FIXME: this should be private but LyXFunc construction
-       /// is still done in GuiApplication.
        Application_pimpl * pimpl_;
 
 }; // Application

diff --git a/src/frontends/qt4/GuiApplication.C b/src/frontends/qt4/GuiApplication.C
index 47877f8a660f8f60d8fe2870c97f9badb1364ac2..f9da2648fd72060c6931f042707880514856acdd 100644 (file)
--- a/src/frontends/qt4/GuiApplication.C
+++ b/src/frontends/qt4/GuiApplication.C
@@ -17,18 +17,13 @@
 #include "qt_helpers.h"
 #include "QLImage.h"
 
-#include "BufferView.h"
-
-// FIXME: this is needed for now because LyXFunc is still constructed
-// there.
-#include "frontends/Application_pimpl.h"
-
 #include "graphics/LoaderQueue.h"
 
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/package.h"
 
+#include "BufferView.h"
 #include "lyx_main.h"
 #include "lyxrc.h"
 #include "debug.h"