Integrate Application_pimpl into Application.C.

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 9289f6741d311afa5d61a217866da103dab337f2..e7aaf9671f5190f3607bb231a2c881186bbbfc09 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -428,7 +428,6 @@ src_insets_files = Split('''
 src_frontends_header_files = Split('''
     Alert.h
     Alert_pimpl.h
-       Application_pimpl.h
     Application.h
     Clipboard.h
     Dialogs.h

diff --git a/src/frontends/Application.C b/src/frontends/Application.C
index 9ee4e79fb1fec6ee502734ef7ee2d9298068ff31..66fcbfbd7c280bda1f329a85594253b5a8fb29ba 100644 (file)
--- a/src/frontends/Application.C
+++ b/src/frontends/Application.C
@@ -12,14 +12,17 @@
 
 #include "Application.h"
 
-#include "Application_pimpl.h"
 #include "Gui.h"
 #include "LyXView.h"
 #include "WorkArea.h"
 
+#include "bufferlist.h"
+#include "funcrequest.h"
 #include "LyXAction.h"
 #include "lyxfunc.h"
 #include "lyxrc.h"
+#include "lyxserver.h"
+#include "lyxsocket.h"
 
 #include "support/lstrings.h"
 #include "support/os.h"
@@ -31,6 +34,20 @@ using lyx::support::package;
 namespace lyx {
 namespace frontend {
 
+/// The main application class private implementation.
+struct Application_pimpl 
+{
+       ///
+       BufferList buffer_list_;
+       /// our function handler
+       boost::scoped_ptr<LyXFunc> lyxfunc_;
+       ///
+       boost::scoped_ptr<LyXServer> lyx_server_;
+       ///
+       boost::scoped_ptr<LyXServerSocket> lyx_socket_;
+};
+
+
 Application::Application(int &, char **)
 {
        pimpl_ = new Application_pimpl;

diff --git a/src/frontends/Application_pimpl.h b/src/frontends/Application_pimpl.h
deleted file mode 100644 (file)
index 127707b..0000000
--- a/src/frontends/Application_pimpl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * \file frontend/Application_pimpl.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Abdelrazak Younes
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef LYX_APPLICATION_PIMPL_H
-#define LYX_APPLICATION_PIMPL_H
-
-#include "bufferlist.h"
-#include "funcrequest.h"
-#include "lyxserver.h"
-#include "lyxsocket.h"
-
-#include <boost/scoped_ptr.hpp>
-
-namespace lyx {
-namespace frontend {
-
-/// The main application class private implementation.
-struct Application_pimpl 
-{
-       ///
-       BufferList buffer_list_;
-       /// our function handler
-       boost::scoped_ptr<LyXFunc> lyxfunc_;
-       ///
-       boost::scoped_ptr<LyXServer> lyx_server_;
-       ///
-       boost::scoped_ptr<LyXServerSocket> lyx_socket_;
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // LYX_APPLICATION_PIMPL_H

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 30daea585fc68a38628cca3dff2fe4b07d92b713..fd9d691e931ab2c7003feb448efc6fa971639143 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -16,7 +16,6 @@ libfrontends_la_SOURCES = \
        Alert.C \
        Alert.h \
        Alert_pimpl.h \
-       Application_pimpl.h \
        Application.C \
        Application.h \
        Dialogs.C \