the doxygen patch

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

ChangeLog

@@ -1,3 +1,8 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* sourcedoc/Doxyfile.in (EXCLUDE): exclude gnome and generated
+	files in qt dir.
+
 2003-06-23  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* lyx.man: change env variable from foo_13x to foo_14x

sourcedoc/Doxyfile.in

@@ -324,7 +324,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                =  ../src/frontends/gnome ../src/frontends/qt2/moc ../src/frontends/qt2/ui/moc
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
 # that are symbolic links (a Unix filesystem feature) are excluded from the input.

src/ChangeLog

@@ -1,3 +1,27 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* textcursor.C: add <config.h>
+
+	* text.C (getWord): remove const from word_location arg
+
+	* lyxvc.C (getLogFile): fix const type order
+
+	* lyxtext.h: remove const from word_location arg, add arg name
+
+	* lyxlayout.h: currect type on labeltype.
+
+	* importer.C: correct \file
+
+	* converter.C (intToFormat): use std:: on ret val, ws changes
+
+	* bufferlist.h: correct \file
+
+	* buffer.C (makeLinuxDocFile): fix const type order
+	(makeDocBookFile): ditto
+	(fillWithBibKeys): use std:: on stdlib args.
+
+	* CutAndPaste.C: fix authors.
+	(availableSelections): use std:: on return vector
 
 2003-06-27  André Pönitz  <poenitz@gmx.net>
 

src/CutAndPaste.C

@@ -2,8 +2,9 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jurgen Vigna
+ * \author Juergen Vigna
  * \author Lars Gullik Bjønnes
+ * \author Alfredo Braunstein
  *
  * Full author contact details are available in file CREDITS
  */
@@ -49,7 +50,8 @@ CutStack cuts(10);
 
 } // namespace anon
 
-vector<string>
+
+std::vector<string>
 CutAndPaste::availableSelections(Buffer const & buffer)
 {
 	vector<string> selList;

src/CutAndPaste.h

@@ -1,10 +1,11 @@
 // -*- C++ -*-
-/* \file CutAndPaste.C
+/* \file CutAndPaste.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jurgen Vigna
+ * \author Juergen Vigna
  * \author Lars Gullik Bjønnes
+ * \author Alfredo Braunstein
  *
  * Full author contact details are available in file CREDITS
  */

src/buffer.C

@@ -1119,7 +1119,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 		ofs << "<!doctype linuxdoc system";
 
 		string preamble = params.preamble;
-		const string name = nice ? ChangeExtension(filename_, ".sgml")
+		string const name = nice ? ChangeExtension(filename_, ".sgml")
 			 : fname;
 		preamble += features.getIncludedFiles(name);
 		preamble += features.getLyXSGMLEntities();
@@ -1553,7 +1553,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 		    << "  PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
 
 		string preamble = params.preamble;
-		const string name = nice ? ChangeExtension(filename_, ".sgml")
+		string const name = nice ? ChangeExtension(filename_, ".sgml")
 			 : fname;
 		preamble += features.getIncludedFiles(name);
 		preamble += features.getLyXSGMLEntities();
@@ -2008,7 +2008,7 @@ void Buffer::getLabelList(std::vector<string> & list) const
 
 
 // This is also a buffer property (ale)
-void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys) const
+void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const
 {
 	/// if this is a child document and the parent is already loaded
 	/// use the parent's list instead  [ale990412]

src/bufferlist.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file bufferlist.C
+ * \file bufferlist.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/converter.C

@@ -68,6 +68,7 @@ Converter::Converter(string const & f, string const & t, string const & c,
 			     original_dir(false), need_aux(false)
 {}
 
+
 void Converter::readFlags()
 {
 	string flag_list(flags);
@@ -581,6 +582,7 @@ string const Converters::dvipdfm_options(Buffer const * buffer)
 	return result;
 }
 
+
 void Converters::buildGraph()
 {
 	G_.init(formats.size());
@@ -593,7 +595,8 @@ void Converters::buildGraph()
 	}
 }
 
-vector<Format const *> const
+
+std::vector<Format const *> const
 Converters::intToFormat(std::vector<int> const & input)
 {
 	vector<Format const *> result(input.size());
@@ -616,6 +619,7 @@ Converters::getReachableTo(string const & target, bool clear_visited)
 	return intToFormat(reachablesto);
 }
 
+
 vector<Format const *> const
 Converters::getReachable(string const & from, bool only_viewable,
 	     bool clear_visited)
@@ -628,12 +632,14 @@ Converters::getReachable(string const & from, bool only_viewable,
 	return intToFormat(reachables);
 }
 
+
 bool Converters::isReachable(string const & from, string const & to)
 {
 	return G_.isReachable(formats.getNumber(from),
 			      formats.getNumber(to));
 }
 
+
 Graph::EdgePath const
 Converters::getPath(string const & from, string const & to)
 {
@@ -641,6 +647,7 @@ Converters::getPath(string const & from, string const & to)
 			  formats.getNumber(to));
 }
 
+
 /// The global instance
 Converters converters;
 

src/debug.C

@@ -105,7 +105,7 @@ void Debug::showLevel(ostream & os, Debug::type level)
 		    && errorTags[i].level != Debug::NONE
 		    && errorTags[i].level & level) {
 			// avoid _(...) re-entrance problem
-			const string s = _(errorTags[i].desc);
+			string const s = _(errorTags[i].desc);
 			os << bformat(_("Debugging `%1$s' (%2$s)"),
 					errorTags[i].name, s);
 		}

src/frontends/controllers/BCView.h

@@ -24,7 +24,7 @@ class ButtonController;
 class ButtonPolicy;
 
 
-/** \class CheckedWidget is an abstract base class that can be stored
+/** \c CheckedWidget is an abstract base class that can be stored
  *  in the button controller's view and can be interrogated by it
  *  when the activation state of the Ok, Apply buttons is refreshed.
  *  Ideally, the user will be prevented from returning invalid data
@@ -46,7 +46,7 @@ struct CheckedWidget {
 };
 
 
-/** \class BCView is the View to ButtonController's Controller. It
+/** \c BCView is the View to ButtonController's Controller. It
  *  stores the individual GUI widgets and sets their activation state
  *  upon receipt of instructions from the controller.
  *

src/frontends/controllers/ButtonController.h

@@ -22,7 +22,7 @@
 class BCView;
 
 
-/** \class ButtonController controls the activation of the OK, Apply and
+/** \c ButtonController controls the activation of the OK, Apply and
  *  Cancel buttons.
  *
  * It actually supports 4 buttons in all and it's up to the user to decide on
@@ -72,7 +72,6 @@ public:
 	 *  of the BC to reflect the read-only status of the underlying buffer.
 	 */
 	void refreshReadOnly() const;
-	//@}
 
 	/** Passthrough function -- returns its input value
 	 *  Tell the BC about the read-only status of the underlying buffer.

src/frontends/controllers/ChangeLog

@@ -1,3 +1,18 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* Kernel.h: fix some \class issues
+
+	* Kernel.C: fix \file
+
+	* Dialog.h: fix some \class issues
+
+	* ControlErrorList.h: correct const type order, remove some
+	ControlErrorList:: from declarations.
+
+	* BCView.h: fix usage of \class to \c
+	* ControlAboutlyx.h: ditto
+	* ButtonController.h: ditto + remove misplaced end doxy group tag
+
 2003-06-24  Alfredo Braunstein  <abraunst@libero.it>
 
 	* ControlDocument.C (classApply): removed the call to resetErrorList,

src/frontends/controllers/ControlAboutlyx.h

@@ -16,7 +16,7 @@
 #include "Dialog.h"
 #include <iosfwd>
 
-/** \class ControlAboutlyx is a controller for the "About LyX" dialogs.
+/** \c ControlAboutlyx is a controller for the "About LyX" dialogs.
  */
 class ControlAboutlyx : public Dialog::Controller {
 public:

src/frontends/controllers/ControlErrorList.h

@@ -29,11 +29,11 @@ public:
 	///
 	virtual bool isBufferDependent() const { return true; }
 	///
-	virtual bool initialiseParams(const string & params);
+	virtual bool initialiseParams(string const & params);
 	///
-	virtual void ControlErrorList::clearParams();
+	virtual void clearParams();
 	///
-	virtual void ControlErrorList::dispatchParams() {}
+	virtual void dispatchParams() {}
 
 	/// goto this error in the parent bv
 	void goTo(int item);

src/frontends/controllers/Dialog.h

@@ -23,12 +23,12 @@ class LyXView;
 class ButtonController;
 
 
-/** \class Dialog collects the different parts of a Model-Controller-View
+/** \c Dialog collects the different parts of a Model-Controller-View
  *  split of a generic dialog together.
  */
 class Dialog : boost::noncopyable {
 public:
-	/** \param name is the identifier given to the dialog by its parent
+	/** \param name the identifier given to the dialog by its parent
 	 *  container.
 	 */
 	Dialog(LyXView &, string const & name);
@@ -118,7 +118,7 @@ private:
 };
 
 
-/** \class Dialog::Controller is an abstract base class for the Controller
+/** \c Dialog::Controller is an abstract base class for the Controller
  *  of a Model-Controller-View split of a generic dialog.
  */
 class Dialog::Controller : boost::noncopyable {
@@ -174,7 +174,7 @@ private:
 };
 
 
-/** \class Dialog::View is an abstract base class to the View
+/** \c Dialog::View is an abstract base class to the View
  *  of a Model-Controller-View split of a generic dialog.
  */
 class Dialog::View : boost::noncopyable {

src/frontends/controllers/Kernel.C

@@ -1,5 +1,5 @@
 /**
- * \file Kernel.h
+ * \file Kernel.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/frontends/controllers/Kernel.h

@@ -22,7 +22,7 @@ class FuncRequest;
 class LyXView;
 
 
-/** \class Kernel is a wrapper making the LyX kernel available to the dialog.
+/** \c Kernel is a wrapper making the LyX kernel available to the dialog.
  * (Ie, it provides an interface to the Model part of the Model-Controller-
  *  View split.
  *  In an ideal world, it will shrink as more info is passed to the

src/frontends/gnome/ChangeLog

@@ -1,3 +1,7 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* FileDialog.C: fix const type order
+
 2003-02-21  Angus Leeming  <leeming@lyx.org>
 
 	* Timeout_pimpl.[Ch]: removed.

src/frontends/gnome/FileDialog.C

@@ -25,8 +25,8 @@ public:
 	Private(string const & title);
 
 	void set_modal(bool modal) { modal_ = modal; }
-	void set_complete(const string & pattern) { sel_.complete(pattern); }
+	void set_complete(string const & pattern) { sel_.complete(pattern); }
-	void set_filename(const string & filename) { sel_.set_filename(filename);}
+	void set_filename(string const & filename) { sel_.set_filename(filename);}
 
 	string const exec();
 

src/frontends/qt2/BulletsModule.C

@@ -27,7 +27,7 @@
 #include <qpushbutton.h>
 #include <qcombobox.h>
 
-BulletsModule::BulletsModule(QWidget * parent,  char const * name, WFlags fl)
+BulletsModule::BulletsModule(QWidget * parent,  const char * name, WFlags fl)
 	: BulletsModuleBase(parent, name, fl), tmpbulletset(0)
 {
 	for (int iter = 0; iter < 4; ++iter) {

src/frontends/qt2/ChangeLog

@@ -1,3 +1,14 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* QLPopupMenu.C: fix \file
+
+	* BulletsModule.C (BulletsModule): fix type const order (opposite
+	of everywhere else in the lyx code)
+	* QAboutDialog.C (QAboutDialog): ditto
+	* QBrowseBox.C (QBrowseBox): ditto
+	(exec): ditto
+	* and several more files the same...
+
 2003-06-27  Alfredo Braunstein  <abraunst@libero.it>
 
 	* lyx_gui.C (start): use BufferView::loadLyXFile

src/frontends/qt2/QAboutDialog.C

@@ -14,7 +14,7 @@
 #include "QAboutDialog.h"
 
 
-QAboutDialog::QAboutDialog(QWidget * parent, char const * name,
+QAboutDialog::QAboutDialog(QWidget * parent, const char * name,
 			   bool modal, WFlags fl)
     : QAboutDialogBase(parent, name, modal, fl)
 {
@@ -22,5 +22,4 @@ QAboutDialog::QAboutDialog(QWidget * parent, char const * name,
 
 
 QAboutDialog::~QAboutDialog()
-{
+{}
-}

src/frontends/qt2/QBrowseBox.h

@@ -26,16 +26,16 @@ class QBrowseBox : public QGridView
 {
 	Q_OBJECT
 public:
-	QBrowseBox(int rows, int cols, QWidget* parent=0, char const * name=0, WFlags f=0);
+	QBrowseBox(int rows, int cols, QWidget * parent = 0, const char * name = 0, WFlags f = 0);
 	~QBrowseBox();
 
 	void insertItem(QPixmap pixmap);
 
 	QPixmap pixmap(int row, int col);
 
-	int exec(QPoint const & pos);
+	int exec(const QPoint & pos);
 	int exec(int x, int y);
-	int exec(QWidget const * trigger);
+	int exec(const QWidget * trigger);
 
 signals:
 	void selected(int, int);

src/frontends/qt2/QDelimiterDialog.C

@@ -36,7 +36,7 @@ char const * delim[] = {
 };
 
 
-string do_match(string const & str)
+string do_match(const string & str)
 {
 	if (str == "(") return ")";
 	if (str == ")") return "(";
@@ -57,7 +57,7 @@ string do_match(string const & str)
 }
 
 
-string fix_name(string const & str)
+string fix_name(const string & str)
 {
 	if (str == "slash")
 		return "/";
@@ -100,7 +100,7 @@ void QDelimiterDialog::insertClicked()
 }
 
 
-void QDelimiterDialog::set_label(QLabel * label, string const & str)
+void QDelimiterDialog::set_label(QLabel * label, const string & str)
 {
 	label->setUpdatesEnabled(false);
 	label->setPixmap(QPixmap(toqstr(find_xpm(str))));
@@ -109,7 +109,7 @@ void QDelimiterDialog::set_label(QLabel * label, string const & str)
 }
 
 
-void QDelimiterDialog::ldelim_clicked(string const & str)
+void QDelimiterDialog::ldelim_clicked(const string & str)
 {
 	left_ = str;
 
@@ -121,7 +121,7 @@ void QDelimiterDialog::ldelim_clicked(string const & str)
 }
 
 
-void QDelimiterDialog::rdelim_clicked(string const & str)
+void QDelimiterDialog::rdelim_clicked(const string & str)
 {
 	right_ = str;
 

src/frontends/qt2/QDelimiterDialog.h

@@ -31,7 +31,7 @@ public slots:
 protected:
 	//needed ? virtual void closeEvent(QCloseEvent * e);
 private:
-	void set_label(QLabel * label, string const & str);
+	void set_label(QLabel * label, const string & str);
 
 	/// symbol of left delimiter
 	string left_;

src/frontends/qt2/QLPopupMenu.C

@@ -1,5 +1,5 @@
 /**
- * \file QLPopupMenu.h
+ * \file QLPopupMenu.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/frontends/qt2/QMathDialog.C

@@ -192,7 +192,7 @@ void QMathDialog::addPanel(int num)
 }
 
 
-void QMathDialog::symbol_clicked(string const & str)
+void QMathDialog::symbol_clicked(const string & str)
 {
 	form_->controller().dispatchInsert(str);
 }

src/frontends/qt2/QRefDialog.h

@@ -28,8 +28,8 @@ public:
 public slots:
 	void changed_adaptor();
 	void gotoClicked();
-	void refHighlighted(QString const &);
+	void refHighlighted(const QString &);
-	void refSelected(QString const &);
+	void refSelected(const QString &);
 	void sortToggled(bool);
 	void updateClicked();
 

src/frontends/qt2/QSpellcheckerDialog.C

@@ -54,7 +54,7 @@ void QSpellcheckerDialog::ignoreClicked()
 }
 
 
-void QSpellcheckerDialog::suggestionChanged(QString const & str)
+void QSpellcheckerDialog::suggestionChanged(const QString & str)
 {
 	if (replaceCO->count() != 0)
 		replaceCO->changeItem(str, 0);
@@ -65,7 +65,7 @@ void QSpellcheckerDialog::suggestionChanged(QString const & str)
 }
 
 
-void QSpellcheckerDialog::replaceChanged(QString const & str)
+void QSpellcheckerDialog::replaceChanged(const QString & str)
 {
 	if (suggestionsLB->currentText() == str)
 		return;

src/frontends/xforms/ChangeLog

@@ -1,3 +1,8 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* combox.h: fix some usage of \param
+	* freebrowser.h: ditto
+
 2003-06-27  Alfredo Braunstein  <abraunst@libero.it>
 
 	* lyx_gui.C (start): use BufferView::loadLyXFile

src/frontends/xforms/combox.h

@@ -39,10 +39,13 @@ typedef enum {
 
 /** A function to create a combox widget.
  *  \param type is, as yet, unused. there is only one type of combox.
- *  \param x, \param y: the x,y coordinates of the upper left hand corner
+ *  \param x the x coordinate of the upper left hand corner of the widget,
- *  of the widget, relative to the parent form'd origin.
+ *  relative to the parent form'd origin.
- *  \param w, \param h: the widget's dimensions.
+ *  \param y the y coordinate of the upper left hand corner of the widget,
- *  \param label: the widget's label as it appears on the GUI.
+ *  relative to the parent form'd origin.
+ *  \param w the widget's width
+ *  \param h the widget's height
+ *  \param label the widget's label as it appears on the GUI.
  */
 FL_EXPORT FL_OBJECT *
 fl_create_combox(FL_COMBOX_TYPE type,
@@ -62,12 +65,12 @@ FL_EXPORT void
 fl_set_combox_browser_height(FL_OBJECT * ob, int bh);
 
 /** The browser will be displayed either below or above the button,
- *  dependent upon \param position.
+ *  dependent upon \c position.
  */
 FL_EXPORT void
 fl_set_combox_position(FL_OBJECT * ob, FL_COMBOX_POSITION position);
 
-/** Empty the browser and the combox, \param ob. */
+/** Empty the browser and the combox. */
 FL_EXPORT void
 fl_clear_combox(FL_OBJECT * ob);
 
@@ -75,7 +78,7 @@ fl_clear_combox(FL_OBJECT * ob);
 FL_EXPORT void
 fl_addto_combox(FL_OBJECT * ob, char const * text);
 
-/** Set the combox to return line \param choice of the combox browser. */
+/** Set the combox to return line \c choice of the combox browser. */
 FL_EXPORT void
 fl_set_combox(FL_OBJECT * ob, int choice);
 
@@ -89,7 +92,7 @@ fl_get_combox(FL_OBJECT * ob);
 FL_EXPORT char const *
 fl_get_combox_text(FL_OBJECT * ob);
 
-/** \return the contents of \param line of the combox browser. */
+/** \return the contents of \c line of the combox browser. */
 FL_EXPORT char const *
 fl_get_combox_line(FL_OBJECT * ob, int line);
 

src/frontends/xforms/freebrowser.h

@@ -50,7 +50,7 @@ typedef struct fl_freebrowser_ {
 } FL_FREEBROWSER;
 
 
-/** A function to create a freebrowser widget, "owned" by \param parent. */
+/** A function to create a freebrowser widget, "owned" by \c parent. */
 FL_EXPORT FL_FREEBROWSER *
 fl_create_freebrowser(void * parent);
 
@@ -58,9 +58,9 @@ fl_create_freebrowser(void * parent);
 FL_EXPORT void
 fl_free_freebrowser(FL_FREEBROWSER * ptr);
 
-/** \param abs_x, \param abs_y are the coordinates of the top left corner
+/** \c abs_x, \c abs_y are the coordinates of the top left corner
  *  of the browser relative to the top left hand corner of the _screen_.
- *  \param w, \param h are the browser dimensions.
+ *  \c w, \c h are the browser dimensions.
  */
 FL_EXPORT void
 fl_show_freebrowser(FL_FREEBROWSER *,

src/importer.C

@@ -1,5 +1,5 @@
 /**
- * \file exporter.C
+ * \file importer.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/insets/ChangeLog

@@ -1,3 +1,15 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* insetspace.h: fix \file
+
+	* insetbibtex.C (fillWithBibKeys): use std:: on stdlib types
+	* insetinclude.C (fillWithBibKeys): ditto
+
+	* insetbibitem.C: fix type const order
+
+	* inset.C (getLyXText): add varname for arg
+
+	* ExternalTemplate.h: fix type const order
 
 2003-06-27  André Pönitz  <poenitz@gmx.net>
 

src/insets/ExternalTemplate.h

@@ -81,7 +81,7 @@ public:
 	Templates & getTemplates();
 	Templates const & getTemplates() const;
 	/// return the template by LyX name
-	ExternalTemplate const & getTemplateByName(const string & name);
+	ExternalTemplate const & getTemplateByName(string const & name);
 private:
 	ExternalTemplateManager();
 	void readTemplates(string const & path);

src/insets/inset.C

@@ -86,7 +86,7 @@ string const Inset::editMessage() const
 }
 
 
-LyXText * Inset::getLyXText(BufferView const * bv, bool const) const
+LyXText * Inset::getLyXText(BufferView const * bv, bool const recursive) const
 {
 	if (owner())
 		return owner()->getLyXText(bv, false);

src/insets/insetbibitem.C

@@ -25,7 +25,7 @@ using std::max;
 
 
 int InsetBibitem::key_counter = 0;
-const string key_prefix = "key-";
+string const key_prefix = "key-";
 
 
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)

src/insets/insetbibtex.C

@@ -183,8 +183,8 @@ vector<string> const InsetBibtex::getFiles(Buffer const & buffer) const
 
 
 // This method returns a comma separated list of Bibtex entries
-void InsetBibtex::fillWithBibKeys
+void InsetBibtex::fillWithBibKeys(Buffer const * buffer,
-	(Buffer const * buffer, vector<pair<string, string> > & keys) const
+				  std::vector<std::pair<string, string> > & keys) const
 {
 	lyx::Assert(buffer);
 	vector<string> const files = getFiles(*buffer);

src/insets/insetbibtex.h

@@ -42,8 +42,8 @@ public:
 	int latex(Buffer const *, std::ostream &,
 		  LatexRunParams const &) const;
 	///
-	void fillWithBibKeys(Buffer const *,
+	void fillWithBibKeys(Buffer const * buffer,
-		std::vector<std::pair<string,string> > &) const;
+		std::vector<std::pair<string,string> > & keys) const;
 	///
 	std::vector<string> const getFiles(Buffer const &) const;
 	///

src/insets/insetinclude.C

@@ -501,7 +501,7 @@ void InsetInclude::getLabelList(std::vector<string> & list) const
 }
 
 
-void InsetInclude::fillWithBibKeys(vector<pair<string,string> > & keys) const
+void InsetInclude::fillWithBibKeys(std::vector<std::pair<string,string> > & keys) const
 {
 	if (loadIfNeeded()) {
 		Buffer * tmp = bufferlist.getBuffer(getFileName());

src/insets/insetspace.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file InsetSpace.h
+ * \file insetspace.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/lyxlayout.h

@@ -119,7 +119,7 @@ public:
 	///
 	LyXAlignment alignpossible;
 	///
-	char labeltype; // add approp. type
+	LYX_LABEL_TYPES labeltype;
 	///
 	LYX_END_LABEL_TYPES endlabeltype;
 	///

src/lyxtext.h

@@ -280,9 +280,9 @@ public:
 
 	/// select the word we need depending on word_location
 	void getWord(LyXCursor & from, LyXCursor & to,
-		     word_location const);
+		     word_location loc);
 	/// just selects the word the cursor is in
-	void selectWord(word_location const);
+	void selectWord(word_location loc);
 	/// returns the inset at cursor (if it exists), 0 otherwise
 	Inset * getInset() const;
 

src/lyxvc.C

@@ -243,7 +243,7 @@ string const & LyXVC::locker() const
 }
 
 
-const string LyXVC::getLogFile() const
+string const LyXVC::getLogFile() const
 {
 	if (!vcs)
 		return string();

src/mathed/ChangeLog

@@ -1,3 +1,19 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* math_symbolinset.C (MathSymbolInset): fix type const order
+
+	* math_support.C (mathed_draw_deco): fix type const order
+
+	* math_gridinset.C (GrinInsetMailer::name): fix type const order
+
+	* math_extern.C (testString): fix type const order
+
+	* math_data.C (operator[]): fix arg type
+
+	* math_binaryopinset.C (metrics): comment out
+
+	* formula.h: fix type const order
+
 2003-06-19  Angus Leeming  <leeming@lyx.org>
 
 	* formulabase.C (localDiapatch): replace LFUN_MATH_PANEL with

src/mathed/command_inset.h

@@ -32,7 +32,7 @@ public:
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
 	void write(WriteStream & os) const;
-	///
+	//
 	// void infoize(std::ostream & os) const;
 	///
 	dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);

src/mathed/formula.h

@@ -29,7 +29,7 @@ public:
 	///
 	explicit InsetFormula(BufferView *);
 	///
-	explicit InsetFormula(const string & data);
+	explicit InsetFormula(string const & data);
 	///
 	InsetFormula(InsetFormula const &);
 	///

src/mathed/math_binaryopinset.C

@@ -28,6 +28,10 @@ int MathBinaryOpInset::opwidth() const
 }
 
 
+#warning Andre, have a look here. (Lgb)
+#if 0
+// That this is not declared in class MathBinaryOpInset makes
+// Doxygen give warnings. (Lgb)
 void MathBinaryOpInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	mi_ = mi;
@@ -37,7 +41,7 @@ void MathBinaryOpInset::metrics(MetricsInfo & mi, Dimension & dim) const
 	ascent_  = max(cell(0).ascent(),  cell(1).ascent());
 	descent_ = max(cell(0).descent(), cell(1).descent());
 }
-
+#endif
 
 void MathBinaryOpInset::draw(PainterInfo & pain, int x, int y) const
 {

src/mathed/math_data.C

@@ -39,14 +39,14 @@ void MathArray::substitute(MathMacro const & m)
 }
 
 
-MathAtom & MathArray::operator[](size_type pos)
+MathAtom & MathArray::operator[](pos_type pos)
 {
 	lyx::Assert(pos < size());
 	return base_type::operator[](pos);
 }
 
 
-MathAtom const & MathArray::operator[](size_type pos) const
+MathAtom const & MathArray::operator[](pos_type pos) const
 {
 	lyx::Assert(pos < size());
 	return base_type::operator[](pos);

src/mathed/math_extern.C

@@ -1,4 +1,3 @@
-
 // This file contains most of the magic that extracts "context
 // information" from the unstructered layout-oriented stuff in an
 // MathArray.
@@ -196,7 +195,7 @@ bool extractNumber(MathArray const & ar, double & d)
 }
 
 
-bool testString(MathAtom const & at, const string & str)
+bool testString(MathAtom const & at, string const & str)
 {
 	string s;
 	return extractString(at, s) && str == s;

src/mathed/math_gridinset.C

@@ -23,7 +23,7 @@ public:
 	///
 	virtual string const & name() const
 	{
-		static const string theName = "tabular";
+		static string const theName = "tabular";
 		return theName;
 	}
 	///

src/mathed/math_support.C

@@ -1,4 +1,3 @@
-
 #include <config.h>
 
 #include "math_support.h"
@@ -398,7 +397,7 @@ int mathed_string_width(LyXFont const & font, string const & s)
 
 
 void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
-	const string & name)
+	string const & name)
 {
 	if (name == ".") {
 		pi.pain.line(x + w/2, y, x + w/2, y + h,
@@ -694,5 +693,3 @@ void asArray(string const & str, MathArray & ar)
 {
 	mathed_parse_cell(ar, str);
 }
-
-

src/mathed/math_symbolinset.C

@@ -1,4 +1,3 @@
-
 #include <config.h>
 
 #include "math_symbolinset.h"
@@ -12,12 +11,12 @@
 #include "debug.h"
 
 
-MathSymbolInset::MathSymbolInset(const latexkeys * l)
+MathSymbolInset::MathSymbolInset(latexkeys const * l)
 	: sym_(l), h_(0)
 {}
 
 
-MathSymbolInset::MathSymbolInset(const char * name)
+MathSymbolInset::MathSymbolInset(char const * name)
 	: sym_(in_word_set(name)), h_(0)
 {}
 

src/mathed/math_symbolinset.h

@@ -13,11 +13,11 @@ struct latexkeys;
 class MathSymbolInset : public MathInset {
 public:
 	///
-	explicit MathSymbolInset(latexkeys const *);
+	explicit MathSymbolInset(latexkeys const * l);
 	///
-	explicit MathSymbolInset(char const *);
+	explicit MathSymbolInset(char const * name);
 	///
-	explicit MathSymbolInset(string const &);
+	explicit MathSymbolInset(string const & name);
 	///
 	InsetBase * clone() const;
 	///

src/support/ChangeLog

@@ -1,3 +1,11 @@
+2003-06-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* filetools.h: fix some \param issue
+
+	* boost-inst.C: fix \file
+
+	* LAssert.h: fix \file
+
 2003-06-20  Angus Leeming  <leeming@lyx.org>
 
 	* filetools.[Ch] (NormalizePath): also change /foo//bar ==> /foo/bar.

src/support/LAssert.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file LAssert.C
+ * \file LAssert.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/support/boost-inst.C

@@ -1,5 +1,5 @@
 /**
- * \file boost-inset.C
+ * \file boost-inst.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *

src/support/filetools.C

@@ -1332,7 +1332,7 @@ string const readBB_from_PSFile(string const & file)
 }
 
 
-string copyFileToDir(string const & path, string const & file_in)
+string const copyFileToDir(string const & path, string const & file_in)
 {
 	lyx::Assert(AbsolutePath(path));
 

src/support/filetools.h

@@ -207,12 +207,14 @@ void removeAutosaveFile(string const & filename);
 /// read the BoundingBox entry from a ps/eps/pdf-file
 string const readBB_from_PSFile(string const & file);
 
-/** Copy \param file to directory \param path. The file name is manipulated
+/** Copy \c file to directory \c path. The file name is manipulated
     so that eg some/path/to/file becomes some_path_to_file.
+    \param path where to put the file
+    \param file the file that is copied
     \returns this file name if the file is copied successfully, else
     \returns an empty string.
  */
-string copyFileToDir(string const & path, string const & file);
+string const copyFileToDir(string const & path, string const & file);
 
 typedef std::pair<int, string> cmd_ret;
 

src/support/lyxstring.C

@@ -448,10 +448,14 @@ lyxstring::lyxstring(size_type n, value_type c)
 }
 
 
+#warning lyxstring user, have a look here. (Lgb)
+#if 0
+// Commented out to avoid warnings from doxygen. (Lgb)
 lyxstring::lyxstring(const_iterator first, const_iterator last)
 {
 	rep = new Srep(last - first, first);
 }
+#endif
 
 
 lyxstring::~lyxstring()

src/text.C

@@ -2046,7 +2046,7 @@ void LyXText::cursorLeftOneWord(LyXCursor & cur)
 // Select current word. This depends on behaviour of
 // CursorLeftOneWord(), so it is patched as well.
 void LyXText::getWord(LyXCursor & from, LyXCursor & to,
-		      word_location const loc)
+		      word_location loc)
 {
 	// first put the cursor where we wana start to select the word
 	from = cursor;

src/textcursor.C

@@ -1,3 +1,4 @@
+#include <config.h>
 
 #include "textcursor.h"