small fixes.

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

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 317cd585ee930b7ca658dd4f9fce7bbc6ac8ac5c..5c43d0ecc6774cee7769cec14ca8fe8ab5f1072a 100644 (file)
--- 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 aa929d9410d0d47a637fe9823dbae2fa1220da6a..6b0dd13966cca295593ab88e9498f131708c1830 100644 (file)
--- 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 ef26fcb627df93ce4db196f395f101e028d422fd..3725422574c0b6bd6b015a92158ab6fc348beb6e 100644 (file)
--- 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 5cc09a24c6d832f1434dadcdf8e28b59fab8f19a..c4557e80f39e6c0e5459dc195436c64018caf626 100644 (file)
--- 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 984bccf442aa2fc13735db0a67aebd79ca86d945..d878b4d3624609f3d2f154eca95ad6641b914ed3 100644 (file)
--- 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) {