From: Angus Leeming <leeming@lyx.org>
Date: Thu, 26 Apr 2001 18:58:49 +0000 (+0000)
Subject: make controllers subdir before xforms
X-Git-Tag: 1.6.10~21277
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0ea6558157340e7b374c75e98b9378b6013a93ef;p=features.git

make controllers subdir before xforms
move Dialogs::add, Dialogs::destroySplash out-of-line


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

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index f7889c3ed7..671e722a2d 100644
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-26  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* Makefile.am: make controllers subdir before xforms.
+
+	* Dialogs.h: (add, destroySplash): moved out of line and into Dialogs.C.
+
+	* Dialogs.C: new file, instantiating the add, destroySplash methods.
+
 2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* Liason.[Ch] (setMinibuffer): change second arg to string
diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
new file mode 100644
index 0000000000..e3c1687c86
--- /dev/null
+++ b/src/frontends/Dialogs.C
@@ -0,0 +1,35 @@
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
+ *
+ * ======================================================
+ *
+ * \file Dialogs.C
+ * \author Angus Leeming <a.leeming@ic.ac.uk>
+ *
+ * Methods common to all frontends' Dialogs that should not be inline
+ */
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "Dialogs.h"
+#include "support/LAssert.h"
+
+void Dialogs::add(DialogBase * ptr)
+{
+	lyx::Assert(ptr);
+	dialogs_.push_back(db_ptr(ptr));
+}
+
+void Dialogs::destroySplash()
+{
+	splash_.reset();
+}
diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 294306860a..12de971bf4 100644
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -30,7 +30,6 @@
 #endif
 
 #include "DialogBase.h"
-#include "support/LAssert.h"
 
 // Maybe this should be a UIFunc modelled on LyXFunc
 class LyXView;
@@ -173,15 +172,4 @@ private:
 	boost::scoped_ptr<DialogBase> splash_;
 };
 
-inline void Dialogs::add(DialogBase * ptr)
-{
-	lyx::Assert(ptr);
-	dialogs_.push_back(db_ptr(ptr));
-}
-
-inline void Dialogs::destroySplash()
-{
-	splash_.reset();
-}
-
 #endif