From d1e7c7e0ab32d40afd85caa3c2673ddac7b0d70a Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 3 Oct 2006 08:43:32 +0000
Subject: [PATCH] Integrate Application_pimpl into Application.C.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15206 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/scons/scons_manifest.py |  1 -
 src/frontends/Application.C         | 19 +++++++++++++-
 src/frontends/Application_pimpl.h   | 40 -----------------------------
 src/frontends/Makefile.am           |  1 -
 4 files changed, 18 insertions(+), 43 deletions(-)
 delete mode 100644 src/frontends/Application_pimpl.h

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 9289f6741d..e7aaf9671f 100644
--- 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 9ee4e79fb1..66fcbfbd7c 100644
--- 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
index 127707b2ee..0000000000
--- 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 30daea585f..fd9d691e93 100644
--- 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 \