various minor bits

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

diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C
index 0c5d73d7dda0b8c20efb2d30a3d7998826687a75..445c589de5d33a671e6bc821c5a87fd2d2e08efb 100644 (file)
--- a/src/frontends/controllers/ControlCharacter.C
+++ b/src/frontends/controllers/ControlCharacter.C
@@ -31,8 +31,8 @@ ControlCharacter::ControlCharacter(LyXView & lv, Dialogs & d)
        : ControlDialog<ControlConnectBD>(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 bbbba2169c612f8fb815a23dc17fa9b7b843aec4..eeae7230f1031d5cbf2fee73773c14bf3bf072de 100644 (file)
--- 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 6b19448f10c72a9bdba292f44253f82ac92ae16f..66a3241e7799a40f8dca76434aadad740f4ed9b1 100644 (file)
--- 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 493b12ff511fdcc3c38f955d96e17af2e5f3bc4a..648fea5c0246090bb7c220dd5e260674651ad887 100644 (file)
--- 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 541470f2d246092d3a41f79edc0bc71653fc9f69..a353636ecd2897c6c376b324ebf9934b1f71af1b 100644 (file)
--- 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 1a42f0d6f1f1cb7d7eb2a83e05b68beee83f64ee..08f132cccbb4cd78fbd20756df1f6b904cf5fe6c 100644 (file)
--- 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 bf888b76d94b9998f1bbedfdbb0fce4441f38a31..2f5d2fc8942ff1c73f4cddf213db2062f795c42a 100644 (file)
--- 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 e2f9a7b457aa309fabfda8aa5e230400f5f145c0..8904d86258c634b0f82531e86980d6e0c2ea3ff5 100644 (file)
--- 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 883f5fc60526456e2c1ff1fa70a771ee3fda5fc6..2cd2442ee50dcc44460aeaeb39c8d9091283616c 100644 (file)
--- 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 f848258a742500ea840a91e0dc88448664d6bb10..ee43a0a6e55e8687744a5e5a551a0e16656651f3 100644 (file)
--- 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<FD_form_preamble> dialog_;

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index 235ce4c6b15962f216bf480ccdf84268e0889a33..8e84d6f0870836339aec0e7464af6da137403eec 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -100,7 +100,7 @@ private:
                     std::pair<string,string> const & dir1,
                     std::pair<string,string> 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 bd6a84b2f39b6fae9e58f188afee98ab418dd98e..0b71e28ef4641edbcfbd9f6b8ea41ef39d4dfe72 100644 (file)
--- a/src/frontends/xforms/FormRef.h
+++ b/src/frontends/xforms/FormRef.h
@@ -42,7 +42,8 @@ private:
 
        ///
        void updateBrowser(std::vector<string> 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 cfe875115734e205255a0ee3766e580225760c60..220c07cb062872264ffbb2aa156d2c087840a2a0 100644 (file)
--- 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."