From 86de16951b4e86ecbedfbfa1f5e3c08af658ec81 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Thu, 29 Mar 2001 11:24:08 +0000
Subject: [PATCH] small fixes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1851 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/controllers/ChangeLog          |  8 +++++++
 src/frontends/controllers/ControlCitation.C  |  1 -
 src/frontends/controllers/ControlCopyright.h | 25 --------------------
 src/frontends/controllers/GUI.h              | 14 +++++++++++
 src/frontends/controllers/biblio.C           |  1 -
 5 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 317cd585ee..5c43d0ecc6 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-29  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* ControlCitation.C (bibkeysInfo): removed Assert.
+
+	* ControlCopyright.h: moved GUICopyright into GUI.h
+
+	* GUI.h: see above.
+
 2001-03-28  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* ControlInset.h (clearDaughterParams): is empty by default, not pure.
diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index aa929d9410..6b0dd13966 100644
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -59,6 +59,5 @@ void ControlCitation::setDaughterParams()
 
 biblio::InfoMap const & ControlCitation::bibkeysInfo() const
 {
-	Assert(!bibkeysInfo_.empty());
 	return bibkeysInfo_;
 }
diff --git a/src/frontends/controllers/ControlCopyright.h b/src/frontends/controllers/ControlCopyright.h
index ef26fcb627..3725422574 100644
--- a/src/frontends/controllers/ControlCopyright.h
+++ b/src/frontends/controllers/ControlCopyright.h
@@ -35,30 +35,5 @@ private:
 	virtual void apply() {}
 };
 
-/** This class instantiates and makes available the GUI-specific
-    ButtonController and View.
- */
-template <class GUIview, class GUIbc>
-class GUICopyright : public ControlCopyright {
-public:
-	///
-	GUICopyright(LyXView &, Dialogs &);
-	///
-	virtual ButtonControllerBase & bc() { return bc_; }
-	///
-	virtual ViewBase & view() { return view_; }
-
-private:
-	///
-	ButtonController<OkCancelPolicy, GUIbc> bc_;
-	///
-	GUIview view_;
-};
-
-template <class GUIview, class GUIbc>
-GUICopyright<GUIview, GUIbc>::GUICopyright(LyXView & lv, Dialogs & d)
-	: ControlCopyright(lv, d),
-	  view_(*this)
-{}
 #endif // CONTROLCOPYRIGHT_H
 
diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h
index 5cc09a24c6..c4557e80f3 100644
--- a/src/frontends/controllers/GUI.h
+++ b/src/frontends/controllers/GUI.h
@@ -112,6 +112,20 @@ public:
 };
 
 
+/** Specialization for Copyright dialog
+ */
+class ControlCopyright;
+
+template <class GUIview, class GUIbc>
+class GUICopyright :
+	public GUI<ControlCopyright, GUIview, OkCancelPolicy, GUIbc> {
+public:
+	///
+	GUICopyright(LyXView & lv, Dialogs & d)
+		: GUI<ControlCopyright, GUIview, OkCancelPolicy, GUIbc>(lv, d) {}
+};
+
+
 /** Specialization for Credits dialog
  */
 class ControlCredits;
diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index 984bccf442..d878b4d362 100644
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -54,7 +54,6 @@ vector<string> const getKeys(InfoMap const & map)
 {
 	vector<string> bibkeys;
 
-
 	typedef std::map<string, string>::value_type InfoMapValue;
 
 	for (InfoMap::const_iterator it = map.begin(); it != map.end(); ++it) {
-- 
2.39.2