From 833bd378438db00036983641d6a1ee26437a5300 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 27 Mar 2001 10:44:14 +0000 Subject: [PATCH] various minor bits git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1834 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ControlCharacter.C | 4 ++-- src/frontends/xforms/FormBibitem.h | 2 +- src/frontends/xforms/FormBibtex.h | 3 ++- src/frontends/xforms/FormCharacter.h | 2 +- src/frontends/xforms/FormCitation.h | 2 +- src/frontends/xforms/FormCopyright.C | 2 +- src/frontends/xforms/FormDocument.h | 2 +- src/frontends/xforms/FormInclude.h | 3 ++- src/frontends/xforms/FormParagraph.h | 2 +- src/frontends/xforms/FormPreamble.h | 4 ++-- src/frontends/xforms/FormPreferences.h | 2 +- src/frontends/xforms/FormRef.h | 3 ++- src/frontends/xforms/forms/makefile | 4 ++-- 13 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C index 0c5d73d7dd..445c589de5 100644 --- a/src/frontends/controllers/ControlCharacter.C +++ b/src/frontends/controllers/ControlCharacter.C @@ -31,8 +31,8 @@ ControlCharacter::ControlCharacter(LyXView & lv, Dialogs & d) : ControlDialog(lv, d), font_(0), toggleall_(false) { - d.showLayoutCharacter.connect(slot(this, &ControlCharacter::show)); - d.setUserFreeFont.connect(slot(this, &ControlCharacter::apply)); + d_.showLayoutCharacter.connect(slot(this, &ControlCharacter::show)); + d_.setUserFreeFont.connect(slot(this, &ControlCharacter::apply)); } diff --git a/src/frontends/xforms/FormBibitem.h b/src/frontends/xforms/FormBibitem.h index bbbba2169c..eeae7230f1 100644 --- a/src/frontends/xforms/FormBibitem.h +++ b/src/frontends/xforms/FormBibitem.h @@ -37,7 +37,7 @@ private: /// Filter the inputs on callback from xforms virtual ButtonPolicy::SMInput input(FL_OBJECT *, long); - /// Type definition from the fdesign produced header file. + /// Fdesign generated method FD_form_bibitem * build_bibitem(); }; diff --git a/src/frontends/xforms/FormBibtex.h b/src/frontends/xforms/FormBibtex.h index 6b19448f10..66a3241e77 100644 --- a/src/frontends/xforms/FormBibtex.h +++ b/src/frontends/xforms/FormBibtex.h @@ -37,7 +37,8 @@ private: virtual void update(); /// Filter the inputs on callback from xforms virtual ButtonPolicy::SMInput input(FL_OBJECT *, long); - /// + + /// Fdesign generated method FD_form_bibtex * build_bibtex(); }; diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h index 493b12ff51..648fea5c02 100644 --- a/src/frontends/xforms/FormCharacter.h +++ b/src/frontends/xforms/FormCharacter.h @@ -49,7 +49,7 @@ private: combox is changed */ static void ComboInputCB(int, void *, Combox *); - /// Type definition from the fdesign produced header file. + /// Fdesign generated method FD_form_character * build_character(); /// diff --git a/src/frontends/xforms/FormCitation.h b/src/frontends/xforms/FormCitation.h index 541470f2d2..a353636ecd 100644 --- a/src/frontends/xforms/FormCitation.h +++ b/src/frontends/xforms/FormCitation.h @@ -50,7 +50,7 @@ private: /// Filter the inputs on callback from xforms virtual ButtonPolicy::SMInput input(FL_OBJECT *, long); - /// Type definition from the fdesign produced header file. + /// Fdesign generated method FD_form_citation * build_citation(); /// diff --git a/src/frontends/xforms/FormCopyright.C b/src/frontends/xforms/FormCopyright.C index 1a42f0d6f1..08f132cccb 100644 --- a/src/frontends/xforms/FormCopyright.C +++ b/src/frontends/xforms/FormCopyright.C @@ -3,7 +3,7 @@ * Copyright 2000-2001 The LyX Team. * See the file COPYING. * - * \author Allan Rae + * \author Allan Rae, rae@lyx.org * \author Angus Leeming, a.leeming@.ac.uk */ diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h index bf888b76d9..2f5d2fc894 100644 --- a/src/frontends/xforms/FormDocument.h +++ b/src/frontends/xforms/FormDocument.h @@ -138,7 +138,7 @@ private: /// void bullets_apply(); - /// Typedefinitions from the fdesign produced Header file + /// Fdesign generated methods FD_form_tabbed_document * build_tabbed_document(); /// FD_form_doc_paper * build_doc_paper(); diff --git a/src/frontends/xforms/FormInclude.h b/src/frontends/xforms/FormInclude.h index e2f9a7b457..8904d86258 100644 --- a/src/frontends/xforms/FormInclude.h +++ b/src/frontends/xforms/FormInclude.h @@ -39,7 +39,8 @@ private: /// ButtonPolicy::SMInput inputBrowse(); - /// Type definition from the fdesign produced header file. + + /// Fdesign generated method FD_form_include * build_include(); }; diff --git a/src/frontends/xforms/FormParagraph.h b/src/frontends/xforms/FormParagraph.h index 883f5fc605..2cd2442ee5 100644 --- a/src/frontends/xforms/FormParagraph.h +++ b/src/frontends/xforms/FormParagraph.h @@ -65,7 +65,7 @@ private: /// void extra_apply(); #endif - /// Typedefinitions from the fdesign produced Header file + /// Fdesign generated methods FD_form_tabbed_paragraph * build_tabbed_paragraph(); /// FD_form_paragraph_general * build_paragraph_general(); diff --git a/src/frontends/xforms/FormPreamble.h b/src/frontends/xforms/FormPreamble.h index f848258a74..ee43a0a6e5 100644 --- a/src/frontends/xforms/FormPreamble.h +++ b/src/frontends/xforms/FormPreamble.h @@ -42,8 +42,8 @@ private: /// virtual FL_FORM * form() const; - /// Typedefinitions from the fdesign produced Header file - FD_form_preamble * build_preamble(); + /// Fdesign generated method + FD_form_preamble * build_preamble(); /// Real GUI implementation. boost::scoped_ptr dialog_; diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h index 235ce4c6b1..8e84d6f087 100644 --- a/src/frontends/xforms/FormPreferences.h +++ b/src/frontends/xforms/FormPreferences.h @@ -100,7 +100,7 @@ private: std::pair const & dir1, std::pair const & dir2 ); - /// Type definitions from the fdesign produced header file. + /// Fdesign generated methods FD_form_preferences * build_preferences(); /// FD_form_outer_tab * build_outer_tab(); diff --git a/src/frontends/xforms/FormRef.h b/src/frontends/xforms/FormRef.h index bd6a84b2f3..0b71e28ef4 100644 --- a/src/frontends/xforms/FormRef.h +++ b/src/frontends/xforms/FormRef.h @@ -42,7 +42,8 @@ private: /// void updateBrowser(std::vector const &) const; - /// Type definition from the fdesign produced header file. + + /// Fdesign generated method FD_form_ref * build_ref(); /// diff --git a/src/frontends/xforms/forms/makefile b/src/frontends/xforms/forms/makefile index cfe8751157..220c07cb06 100644 --- a/src/frontends/xforms/forms/makefile +++ b/src/frontends/xforms/forms/makefile @@ -17,7 +17,7 @@ SHELL = /bin/sh .SUFFIXES: .fd .c -SRCS := form_bibitem.fd \ +SRCS = form_bibitem.fd \ form_bibtex.fd \ form_browser.fd \ form_character.fd \ @@ -49,7 +49,7 @@ SRCS := form_bibitem.fd \ form_toc.fd \ form_url.fd -OBJS := $(SRCS:.fd=.C) +OBJS = $(SRCS:.fd=.C) all: @echo "This is a makefile intended for the maintainer only." -- 2.39.2