From 1a8665988f6038b6d886c0bc663c1753c880d7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sat, 28 Jun 2003 01:23:11 +0000 Subject: [PATCH] the doxygen patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7219 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 ++ sourcedoc/Doxyfile.in | 2 +- src/ChangeLog | 54 ++++++++++++++------ src/CutAndPaste.C | 6 ++- src/CutAndPaste.h | 5 +- src/buffer.C | 12 ++--- src/bufferlist.h | 2 +- src/converter.C | 9 +++- src/debug.C | 2 +- src/frontends/controllers/BCView.h | 6 +-- src/frontends/controllers/ButtonController.h | 3 +- src/frontends/controllers/ChangeLog | 17 +++++- src/frontends/controllers/ControlAboutlyx.h | 2 +- src/frontends/controllers/ControlErrorList.h | 6 +-- src/frontends/controllers/Dialog.h | 8 +-- src/frontends/controllers/Kernel.C | 2 +- src/frontends/controllers/Kernel.h | 2 +- src/frontends/gnome/ChangeLog | 6 ++- src/frontends/gnome/FileDialog.C | 4 +- src/frontends/qt2/BulletsModule.C | 2 +- src/frontends/qt2/ChangeLog | 29 +++++++---- src/frontends/qt2/QAboutDialog.C | 5 +- src/frontends/qt2/QBrowseBox.C | 6 +-- src/frontends/qt2/QBrowseBox.h | 6 +-- src/frontends/qt2/QDelimiterDialog.C | 10 ++-- src/frontends/qt2/QDelimiterDialog.h | 2 +- src/frontends/qt2/QLPopupMenu.C | 2 +- src/frontends/qt2/QMathDialog.C | 2 +- src/frontends/qt2/QRefDialog.h | 4 +- src/frontends/qt2/QSpellcheckerDialog.C | 4 +- src/frontends/xforms/ChangeLog | 19 ++++--- src/frontends/xforms/combox.h | 25 +++++---- src/frontends/xforms/freebrowser.h | 6 +-- src/importer.C | 2 +- src/insets/ChangeLog | 26 +++++++--- src/insets/ExternalTemplate.h | 2 +- src/insets/inset.C | 2 +- src/insets/insetbibitem.C | 2 +- src/insets/insetbibtex.C | 4 +- src/insets/insetbibtex.h | 4 +- src/insets/insetinclude.C | 2 +- src/insets/insetspace.h | 2 +- src/lyxlayout.h | 2 +- src/lyxtext.h | 8 +-- src/lyxvc.C | 2 +- src/mathed/ChangeLog | 16 ++++++ src/mathed/command_inset.h | 4 +- src/mathed/formula.h | 2 +- src/mathed/math_binaryopinset.C | 6 ++- src/mathed/math_data.C | 4 +- src/mathed/math_extern.C | 3 +- src/mathed/math_gridinset.C | 14 ++--- src/mathed/math_support.C | 5 +- src/mathed/math_symbolinset.C | 5 +- src/mathed/math_symbolinset.h | 6 +-- src/support/ChangeLog | 8 +++ src/support/LAssert.h | 2 +- src/support/boost-inst.C | 2 +- src/support/filetools.C | 2 +- src/support/filetools.h | 6 ++- src/support/lyxstring.C | 4 ++ src/text.C | 2 +- src/textcursor.C | 3 +- 63 files changed, 272 insertions(+), 155 deletions(-) diff --git a/ChangeLog b/ChangeLog index 625fad813a..068f9dac40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-06-28 Lars Gullik Bjønnes + + * sourcedoc/Doxyfile.in (EXCLUDE): exclude gnome and generated + files in qt dir. + 2003-06-23 Jean-Marc Lasgouttes * lyx.man: change env variable from foo_13x to foo_14x diff --git a/sourcedoc/Doxyfile.in b/sourcedoc/Doxyfile.in index ff5659d58b..24eb816ca1 100644 --- a/sourcedoc/Doxyfile.in +++ b/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. diff --git a/src/ChangeLog b/src/ChangeLog index bd94f766be..987d817830 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,27 @@ +2003-06-28 Lars Gullik Bjønnes + + * textcursor.C: add + + * 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 @@ -20,21 +44,21 @@ 2003-06-26 Alfredo Brauntein - * lyx_main.C (LyX): get full path of document loaded on the - command line + * lyx_main.C (LyX): get full path of document loaded on the + command line 2003-06-26 André Pönitz * lyxcursor.[Ch]: move rarely used operator==,!= out of line remove unused/broken operator>,<,>=. - + * text.C: remove only use of broken operator<= in an Assert(). 2003-06-24 Alfredo Brauntein - * BufferView.[Ch] (getErrorList): removed unneeded forward declare, + * BufferView.[Ch] (getErrorList): removed unneeded forward declare, moved errorlist_.clear to showErrorList - + 2003-06-24 Alfredo Brauntein * converter.C (scanLog, runLaTeX): @@ -47,7 +71,7 @@ namespace, the second to... * buffer_funcs (BufferFormat, parseErrors): added * errorlist.C (ErrorList(TeXErrors const &)): removed - + 2003-06-24 Jean-Marc Lasgouttes * ToolbarBackend.C (getIcon): complain when icon cannot be found @@ -65,28 +89,28 @@ 2003-06-22 Alfredo Braunstein * buffer.C: fix a bug just introduced - + 2003-06-21 Alfredo Braunstein - * buffer.[Ch]: added the parseError signal and use it, removed + * buffer.[Ch]: added the parseError signal and use it, removed sgmlError * BufferView.[Ch] (addError): moved to ... - * BufferView_pimpl.[Ch] (addError, loadLyXFile): ... here. Attach + * BufferView_pimpl.[Ch] (addError, loadLyXFile): ... here. Attach to the Buffer::parseError signal to catch (guess what) parse errors * lyx_main.[Ch] (printError,LyX): added gui-less parsing error feedback - + 2003-06-19 Alfredo Braunstein - * bufferlist.[Ch] (loadLyXFile, readFile, newFile): removed the - ability to create a buffer and to return an existing one from + * bufferlist.[Ch] (loadLyXFile, readFile, newFile): removed the + ability to create a buffer and to return an existing one from the list. Moved these functions to... * buffer_funcs.[Ch]: added * BufferView.[Ch] (loadLyXFile): added - * BufferView_pimpl.[Ch] (loadLyXFile): Added. Does the guessing + * BufferView_pimpl.[Ch] (loadLyXFile): Added. Does the guessing job removed from bufferlist::loadLyXFile. - * buffer.C (setReadOnly): make it work without view + * buffer.C (setReadOnly): make it work without view (i.e added an if (users)) - + 2003-06-19 Angus Leeming * lfuns.h: diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index f1057254e5..54ae59110b 100644 --- a/src/CutAndPaste.C +++ b/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 + +std::vector CutAndPaste::availableSelections(Buffer const & buffer) { vector selList; diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h index 615222ce2b..bb12c2d9dd 100644 --- a/src/CutAndPaste.h +++ b/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 */ diff --git a/src/buffer.C b/src/buffer.C index 658cc859c4..15d21658e1 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -282,10 +282,10 @@ int Buffer::readHeader(LyXLex & lex) } else { ++unknown_tokens; string const s = bformat(_("Unknown token: " - "%1$s %2$s\n"), - token, + "%1$s %2$s\n"), + token, lex.getString()); - parseError(ErrorItem(_("Header error"), s, + parseError(ErrorItem(_("Header error"), s, -1, 0, 0)); } } @@ -1119,7 +1119,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) ofs << " & list) const // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(vector > & keys) const +void Buffer::fillWithBibKeys(std::vector > & keys) const { /// if this is a child document and the parent is already loaded /// use the parent's list instead [ale990412] diff --git a/src/bufferlist.h b/src/bufferlist.h index a9f8768c1d..4cedb64c9b 100644 --- a/src/bufferlist.h +++ b/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. * diff --git a/src/converter.C b/src/converter.C index c93b39f3f6..5061d37218 100644 --- a/src/converter.C +++ b/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 const + +std::vector const Converters::intToFormat(std::vector const & input) { vector result(input.size()); @@ -616,6 +619,7 @@ Converters::getReachableTo(string const & target, bool clear_visited) return intToFormat(reachablesto); } + vector 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; diff --git a/src/debug.C b/src/debug.C index a40f6c45fe..9c7e8c58d0 100644 --- a/src/debug.C +++ b/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); } diff --git a/src/frontends/controllers/BCView.h b/src/frontends/controllers/BCView.h index b21baf1fe5..707192d27c 100644 --- a/src/frontends/controllers/BCView.h +++ b/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 @@ -32,7 +32,7 @@ class ButtonPolicy; * * Many widgets can be grouped together in the derived class if they * make a logical whole. E.g., an input and a choice widget that together - * are used to set a LyXLength can be interrogated together. + * are used to set a LyXLength can be interrogated together. */ struct CheckedWidget { /// @@ -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. * diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h index a5d44adc75..396a9f6068 100644 --- a/src/frontends/controllers/ButtonController.h +++ b/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. diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 93b3f5fcb3..ee0c3ee78f 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,6 +1,21 @@ +2003-06-28 Lars Gullik Bjønnes + + * 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 - * ControlDocument.C (classApply): removed the call to resetErrorList, + * ControlDocument.C (classApply): removed the call to resetErrorList, replaced setErrorList by parseErrors 2003-06-21 Alfredo Braunstein diff --git a/src/frontends/controllers/ControlAboutlyx.h b/src/frontends/controllers/ControlAboutlyx.h index acb7dc1b93..708df3bfc0 100644 --- a/src/frontends/controllers/ControlAboutlyx.h +++ b/src/frontends/controllers/ControlAboutlyx.h @@ -16,7 +16,7 @@ #include "Dialog.h" #include -/** \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: diff --git a/src/frontends/controllers/ControlErrorList.h b/src/frontends/controllers/ControlErrorList.h index 50b76fad77..3ed18213d9 100644 --- a/src/frontends/controllers/ControlErrorList.h +++ b/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); diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/controllers/Dialog.h index 53e1b5ad74..dd23f45ed4 100644 --- a/src/frontends/controllers/Dialog.h +++ b/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 { diff --git a/src/frontends/controllers/Kernel.C b/src/frontends/controllers/Kernel.C index ac4f4e51b1..30a7df946a 100644 --- a/src/frontends/controllers/Kernel.C +++ b/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. * diff --git a/src/frontends/controllers/Kernel.h b/src/frontends/controllers/Kernel.h index 60d7cfc47f..87d61ddee7 100644 --- a/src/frontends/controllers/Kernel.h +++ b/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 diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index 3924ef2b1c..d632f36592 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,7 @@ +2003-06-28 Lars Gullik Bjønnes + + * FileDialog.C: fix const type order + 2003-02-21 Angus Leeming * Timeout_pimpl.[Ch]: removed. @@ -11,7 +15,7 @@ 2003-02-14 John Levon * FileDialog.C: remove spurious allow/prohibitInput() - + 2003-02-12 Michael A. Koziarski * GChanges.C diff --git a/src/frontends/gnome/FileDialog.C b/src/frontends/gnome/FileDialog.C index 102577d651..8a0e554b3a 100644 --- a/src/frontends/gnome/FileDialog.C +++ b/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_filename(const string & filename) { sel_.set_filename(filename);} + void set_complete(string const & pattern) { sel_.complete(pattern); } + void set_filename(string const & filename) { sel_.set_filename(filename);} string const exec(); diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C index 7e83bfb8a5..4d2cb14b4f 100644 --- a/src/frontends/qt2/BulletsModule.C +++ b/src/frontends/qt2/BulletsModule.C @@ -27,7 +27,7 @@ #include #include -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) { diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 0e981e1286..2053ef2544 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,7 +1,18 @@ +2003-06-28 Lars Gullik Bjønnes + + * 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 * lyx_gui.C (start): use BufferView::loadLyXFile - + 2003-06-12 Jean-Marc Lasgouttes * Toolbar_pimpl.C (add): do not add unknown lfuns @@ -11,13 +22,13 @@ * QError.[Ch]: * QErrorDialog.[Ch]: * ui/QErrorDialogBase.ui: removed - * Makefile.am: - * Makefile.dialogs: + * Makefile.am: + * Makefile.dialogs: * Dialogs.C: adjust 2003-06-21 Alfredo Braunstein - * QDocumentDialog.C: header reordering to handle qt/boost "signals" + * QDocumentDialog.C: header reordering to handle qt/boost "signals" symbol clash 2003-06-20 Angus Leeming @@ -33,9 +44,9 @@ 2003-06-19 Alfredo Braunstein - * lyx_gui.C (start): call ::loadLyXFile instead + * lyx_gui.C (start): call ::loadLyXFile instead of BufferList::loadLyXFile - + 2003-06-19 Angus Leeming * Dialogs.C: @@ -70,7 +81,7 @@ * QMathMatrixDialog.[Ch]: store a QMathMatrix*, not a QMath*. * QMathDialog.C (delimiterClicked, matrixClicked): fix memory leaks. - + 2003-06-14 John Levon * ui/QPrintDialogBase.ui: make "OK" default @@ -235,12 +246,12 @@ 2003-05-20 Alfredo Braunstein - * QErrorList.[Ch]: small bugs fixed. + * QErrorList.[Ch]: small bugs fixed. 2003-05-17 Alfredo Braunstein * QErrorList.C (update_contents): replace TextBrowser::clear() by - TextBrowser::setText(QString()) + TextBrowser::setText(QString()) 2003-05-14 Juergen Spitzmueller diff --git a/src/frontends/qt2/QAboutDialog.C b/src/frontends/qt2/QAboutDialog.C index 7357fb4188..c5f0a4c281 100644 --- a/src/frontends/qt2/QAboutDialog.C +++ b/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() -{ -} +{} diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt2/QBrowseBox.C index 2f732e7431..701d8f8c4c 100644 --- a/src/frontends/qt2/QBrowseBox.C +++ b/src/frontends/qt2/QBrowseBox.C @@ -25,7 +25,7 @@ #include -QBrowseBox::QBrowseBox(int rows, int cols, QWidget* parent, const char* name, WFlags f) +QBrowseBox::QBrowseBox(int rows, int cols, QWidget* parent, const char * name, WFlags f) : QGridView(parent,name,f) { setNumRows(rows); @@ -103,13 +103,13 @@ QPixmap QBrowseBox::pixmap(int row, int col) } -int QBrowseBox::exec(const QPoint& pos) +int QBrowseBox::exec(const QPoint & pos) { return exec(pos.x(),pos.y()); } -int QBrowseBox::exec(const QWidget* trigger) +int QBrowseBox::exec(const QWidget * trigger) { QPoint globalpos = trigger->parentWidget()->mapToGlobal( trigger->pos()); // is there enough space to put the box below the trigger? diff --git a/src/frontends/qt2/QBrowseBox.h b/src/frontends/qt2/QBrowseBox.h index 0db6e018f2..32b87bb2e2 100644 --- a/src/frontends/qt2/QBrowseBox.h +++ b/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); diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C index 3a02bd7c67..abe09a7bba 100644 --- a/src/frontends/qt2/QDelimiterDialog.C +++ b/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; diff --git a/src/frontends/qt2/QDelimiterDialog.h b/src/frontends/qt2/QDelimiterDialog.h index 1953c0539c..c8b9984cce 100644 --- a/src/frontends/qt2/QDelimiterDialog.h +++ b/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_; diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C index 557dfd399f..f03836cc10 100644 --- a/src/frontends/qt2/QLPopupMenu.C +++ b/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. * diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C index 0943427005..c8a2885e7d 100644 --- a/src/frontends/qt2/QMathDialog.C +++ b/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); } diff --git a/src/frontends/qt2/QRefDialog.h b/src/frontends/qt2/QRefDialog.h index 7de9a1249f..bfc596fb23 100644 --- a/src/frontends/qt2/QRefDialog.h +++ b/src/frontends/qt2/QRefDialog.h @@ -28,8 +28,8 @@ public: public slots: void changed_adaptor(); void gotoClicked(); - void refHighlighted(QString const &); - void refSelected(QString const &); + void refHighlighted(const QString &); + void refSelected(const QString &); void sortToggled(bool); void updateClicked(); diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C index 01e8f7a174..5ebb70bc84 100644 --- a/src/frontends/qt2/QSpellcheckerDialog.C +++ b/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; diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 4d819e3017..9709ca3096 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,15 +1,20 @@ +2003-06-28 Lars Gullik Bjønnes + + * combox.h: fix some usage of \param + * freebrowser.h: ditto + 2003-06-27 Alfredo Braunstein * lyx_gui.C (start): use BufferView::loadLyXFile - + 2003-06-21 Alfredo Braunstein * FormError.[Ch]: * forms/form_error.fd: removed - * forms/Makefile.am: - * Makefile.am: adjust + * forms/Makefile.am: + * Makefile.am: adjust * Dialogs.C: adjust - + 2003-06-20 Angus Leeming * FormBibtex.C (input, update): changes due to changed controller @@ -19,9 +24,9 @@ 2003-06-19 Alfredo Braunstein - * lyx_gui.C (start): call ::loadLyXFile instead + * lyx_gui.C (start): call ::loadLyXFile instead of BufferList::loadLyXFile - + 2003-06-19 Angus Leeming * Dialogs.C: @@ -31,7 +36,7 @@ 2003-06-19 Juergen Spitzmueller - * forms/form_preferences.fd Revert Rob Lahaye's patch. + * forms/form_preferences.fd Revert Rob Lahaye's patch. Weird xforms sizing issues. 2003-06-17 Angus Leeming diff --git a/src/frontends/xforms/combox.h b/src/frontends/xforms/combox.h index 110c49fe36..5d14662d71 100644 --- a/src/frontends/xforms/combox.h +++ b/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 - * of the widget, relative to the parent form'd origin. - * \param w, \param h: the widget's dimensions. - * \param label: the widget's label as it appears on the GUI. + * \param x the x coordinate of the upper left hand corner of the widget, + * relative to the parent form'd origin. + * \param y the y coordinate of the upper left hand corner of the widget, + * 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, @@ -53,8 +56,8 @@ fl_create_combox(FL_COMBOX_TYPE type, * \see fl_create_combox() for an explanation of the argument list. */ FL_EXPORT FL_OBJECT * -fl_add_combox(FL_COMBOX_TYPE type, - FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h, +fl_add_combox(FL_COMBOX_TYPE type, + FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h, char const * label); /** The combox browser has a default height of 100 pixels. Adjust to suit. */ @@ -62,20 +65,20 @@ 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); -/** Add a line to the combox browser.*/ +/** Add a line to the combox browser. */ 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); diff --git a/src/frontends/xforms/freebrowser.h b/src/frontends/xforms/freebrowser.h index 3b9319d348..b70a664fbc 100644 --- a/src/frontends/xforms/freebrowser.h +++ b/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 *, diff --git a/src/importer.C b/src/importer.C index d5b6a60f02..fc260837f0 100644 --- a/src/importer.C +++ b/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. * diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 641a63bd4a..6b99359f4a 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,23 +1,35 @@ +2003-06-28 Lars Gullik Bjønnes + + * 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 * insettext.C: take care of removed LyXCursor::row_ member - + * insettext.[Ch]: use new TextCursor struct for sstate 2003-06-21 Alfredo Braunstein - * inseterror.[Ch]: removed - + * inseterror.[Ch]: removed + 2003-06-21 Alfredo Braunstein - * insetinclude.C (docbook): use parseError instead of sgmlError - + * insetinclude.C (docbook): use parseError instead of sgmlError + 2003-06-19 Alfredo Braunstein - * insetinclude.C (loadIfNeeded): call ::loadLyXFile instead + * insetinclude.C (loadIfNeeded): call ::loadLyXFile instead of BufferList::loadLyXFile - + 2003-06-18 Lars Gullik Bjønnes * insettext.C (update): simplify diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h index 151c26221f..c9be8f2e27 100644 --- a/src/insets/ExternalTemplate.h +++ b/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); diff --git a/src/insets/inset.C b/src/insets/inset.C index b8d7281569..50d287d9a3 100644 --- a/src/insets/inset.C +++ b/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); diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C index 17fcbc7edd..0a3eabb568 100644 --- a/src/insets/insetbibitem.C +++ b/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) diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C index f0f536f23c..2db291500a 100644 --- a/src/insets/insetbibtex.C +++ b/src/insets/insetbibtex.C @@ -183,8 +183,8 @@ vector const InsetBibtex::getFiles(Buffer const & buffer) const // This method returns a comma separated list of Bibtex entries -void InsetBibtex::fillWithBibKeys - (Buffer const * buffer, vector > & keys) const +void InsetBibtex::fillWithBibKeys(Buffer const * buffer, + std::vector > & keys) const { lyx::Assert(buffer); vector const files = getFiles(*buffer); diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h index f7827f6688..2c9fb6f13e 100644 --- a/src/insets/insetbibtex.h +++ b/src/insets/insetbibtex.h @@ -42,8 +42,8 @@ public: int latex(Buffer const *, std::ostream &, LatexRunParams const &) const; /// - void fillWithBibKeys(Buffer const *, - std::vector > &) const; + void fillWithBibKeys(Buffer const * buffer, + std::vector > & keys) const; /// std::vector const getFiles(Buffer const &) const; /// diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 774f333439..e3edbbab4d 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -501,7 +501,7 @@ void InsetInclude::getLabelList(std::vector & list) const } -void InsetInclude::fillWithBibKeys(vector > & keys) const +void InsetInclude::fillWithBibKeys(std::vector > & keys) const { if (loadIfNeeded()) { Buffer * tmp = bufferlist.getBuffer(getFileName()); diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h index 3b7f8c159d..0adab81fbb 100644 --- a/src/insets/insetspace.h +++ b/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. * diff --git a/src/lyxlayout.h b/src/lyxlayout.h index 1700811cf8..dae78e576b 100644 --- a/src/lyxlayout.h +++ b/src/lyxlayout.h @@ -119,7 +119,7 @@ public: /// LyXAlignment alignpossible; /// - char labeltype; // add approp. type + LYX_LABEL_TYPES labeltype; /// LYX_END_LABEL_TYPES endlabeltype; /// diff --git a/src/lyxtext.h b/src/lyxtext.h index fa5228e081..b3e9c49090 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -249,7 +249,7 @@ public: RowList::iterator getRow(LyXCursor const & cursor) const; /// convenience RowList::iterator cursorRow() const; - + /** returns a pointer to the row near the specified y-coordinate (relative to the whole text). y is set to the real beginning of this row @@ -272,7 +272,7 @@ public: return rowlist_; } - + /// need the selection cursor: void setSelection(); /// @@ -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; diff --git a/src/lyxvc.C b/src/lyxvc.C index 3e09e77d34..206250061b 100644 --- a/src/lyxvc.C +++ b/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(); diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 00e2f78c76..d812b9cb6a 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,19 @@ +2003-06-28 Lars Gullik Bjønnes + + * 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 * formulabase.C (localDiapatch): replace LFUN_MATH_PANEL with diff --git a/src/mathed/command_inset.h b/src/mathed/command_inset.h index a7107202c9..1a558495c1 100644 --- a/src/mathed/command_inset.h +++ b/src/mathed/command_inset.h @@ -32,8 +32,8 @@ public: void draw(PainterInfo & pi, int x, int y) const; /// void write(WriteStream & os) const; - /// - //void infoize(std::ostream & os) const; + // + // void infoize(std::ostream & os) const; /// dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos); /// diff --git a/src/mathed/formula.h b/src/mathed/formula.h index 946bb6dde1..c63abd8e5a 100644 --- a/src/mathed/formula.h +++ b/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 &); /// diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C index b8d05a6b5f..71ff00f4af 100644 --- a/src/mathed/math_binaryopinset.C +++ b/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 { diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C index 124097c15d..457a2ee918 100644 --- a/src/mathed/math_data.C +++ b/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); diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C index c122716678..899521bdb5 100644 --- a/src/mathed/math_extern.C +++ b/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; diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index eaa2e26a44..7306921301 100644 --- a/src/mathed/math_gridinset.C +++ b/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; } /// @@ -39,7 +39,7 @@ public: protected: InsetBase & inset() const { return inset_; } - MathGridInset & inset_; + MathGridInset & inset_; }; @@ -1031,7 +1031,7 @@ dispatch_result MathGridInset::dispatch //} return UNDISPATCHED; - case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_DIALOG_UPDATE: GridInsetMailer(*this).updateDialog(cmd.view()); return UNDISPATCHED; @@ -1096,25 +1096,25 @@ dispatch_result MathGridInset::dispatch else if (s == "append-row") for (int i = 0, n = extractInt(is); i < n; ++i) addRow(row(idx)); - else if (s == "delete-row") + else if (s == "delete-row") for (int i = 0, n = extractInt(is); i < n; ++i) { delRow(row(idx)); if (idx > nargs()) idx -= ncols(); } - else if (s == "copy-row") + else if (s == "copy-row") for (int i = 0, n = extractInt(is); i < n; ++i) copyRow(row(idx)); else if (s == "swap-row") swapRow(row(idx)); - else if (s == "append-column") + else if (s == "append-column") for (int i = 0, n = extractInt(is); i < n; ++i) { row_type r = row(idx); col_type c = col(idx); addCol(c); idx = index(r, c); } - else if (s == "delete-column") + else if (s == "delete-column") for (int i = 0, n = extractInt(is); i < n; ++i) { row_type r = row(idx); col_type c = col(idx); diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index b4798318ee..b154339045 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -1,4 +1,3 @@ - #include #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); } - - diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C index 85df4b3723..92de5abe8e 100644 --- a/src/mathed/math_symbolinset.C +++ b/src/mathed/math_symbolinset.C @@ -1,4 +1,3 @@ - #include #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) {} diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h index cb5a9d5915..482efee721 100644 --- a/src/mathed/math_symbolinset.h +++ b/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; /// diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 5c2aa416f8..80914fa050 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,11 @@ +2003-06-28 Lars Gullik Bjønnes + + * filetools.h: fix some \param issue + + * boost-inst.C: fix \file + + * LAssert.h: fix \file + 2003-06-20 Angus Leeming * filetools.[Ch] (NormalizePath): also change /foo//bar ==> /foo/bar. diff --git a/src/support/LAssert.h b/src/support/LAssert.h index 65b8618b87..73ad96b7cf 100644 --- a/src/support/LAssert.h +++ b/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. * diff --git a/src/support/boost-inst.C b/src/support/boost-inst.C index 2d6758cee1..27fba3da04 100644 --- a/src/support/boost-inst.C +++ b/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. * diff --git a/src/support/filetools.C b/src/support/filetools.C index c33023369d..712decbf19 100644 --- a/src/support/filetools.C +++ b/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)); diff --git a/src/support/filetools.h b/src/support/filetools.h index 509c4b04af..6dd1530ebf 100644 --- a/src/support/filetools.h +++ b/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 cmd_ret; diff --git a/src/support/lyxstring.C b/src/support/lyxstring.C index f106386048..2b3db80075 100644 --- a/src/support/lyxstring.C +++ b/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() diff --git a/src/text.C b/src/text.C index 4396e19894..eb7094f09c 100644 --- a/src/text.C +++ b/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; diff --git a/src/textcursor.C b/src/textcursor.C index 38ae302bd2..3d96366e83 100644 --- a/src/textcursor.C +++ b/src/textcursor.C @@ -1,3 +1,4 @@ +#include #include "textcursor.h" @@ -51,7 +52,7 @@ bool TextCursor::setSelection() if (selection.start.par() == selection.end.par() && selection.start.pos() == selection.end.pos()) selection.set(false); - + return lsel; }