small fixes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1851 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-03-29 11:24:08 +00:00
parent f1deec1c2a
commit 86de16951b
5 changed files with 22 additions and 27 deletions

View File

@ -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.

View File

@ -59,6 +59,5 @@ void ControlCitation::setDaughterParams()
biblio::InfoMap const & ControlCitation::bibkeysInfo() const
{
Assert(!bibkeysInfo_.empty());
return bibkeysInfo_;
}

View File

@ -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

View File

@ -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;

View File

@ -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) {