From 82a83d7ae6eee25e1182c713a726b17037844ffb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 11 Mar 2002 22:47:41 +0000 Subject: [PATCH] doxygen fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3717 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/ChangeLog | 4 + src/frontends/Timeout.h | 3 +- src/frontends/controllers/ControlAboutlyx.h | 2 +- src/frontends/gnome/ChangeLog | 4 + src/frontends/gnome/FormError.h | 15 +- src/frontends/gnome/FormToc.h | 148 ++++++++++---------- src/frontends/gnome/Timeout_pimpl.C | 2 +- src/frontends/gnome/Timeout_pimpl.h | 2 +- src/frontends/qt2/Alert_pimpl.C | 2 +- src/frontends/qt2/ChangeLog | 4 + src/frontends/qt2/Dialogs.C | 2 +- src/frontends/qt2/FileDialog.C | 2 +- src/frontends/qt2/GUIRunTime.C | 2 +- src/frontends/qt2/QParagraphDialog.C | 80 ++++++----- src/frontends/qt2/QParagraphDialog.h | 22 +-- src/frontends/qt2/Qt2Base.h | 12 +- src/frontends/qt2/Timeout_pimpl.C | 2 +- src/frontends/qt2/Timeout_pimpl.h | 4 +- src/frontends/xforms/Alert_pimpl.C | 2 +- src/frontends/xforms/ChangeLog | 4 + src/frontends/xforms/Dialogs.C | 2 +- src/frontends/xforms/FileDialog.C | 2 +- src/frontends/xforms/FormBaseDeprecated.h | 2 +- src/frontends/xforms/FormCitation.C | 2 +- src/frontends/xforms/FormCitation.h | 2 +- src/frontends/xforms/FormERT.C | 2 +- src/frontends/xforms/FormERT.h | 2 +- src/frontends/xforms/FormError.h | 2 +- src/frontends/xforms/FormIndex.C | 2 +- src/frontends/xforms/FormIndex.h | 2 +- src/frontends/xforms/FormParagraph.C | 7 +- src/frontends/xforms/FormPrint.C | 2 +- src/frontends/xforms/FormPrint.h | 2 +- src/frontends/xforms/FormRef.C | 2 +- src/frontends/xforms/FormRef.h | 2 +- src/frontends/xforms/FormTabularCreate.C | 2 +- src/frontends/xforms/FormTabularCreate.h | 2 +- src/frontends/xforms/FormThesaurus.C | 3 +- src/frontends/xforms/FormThesaurus.h | 4 +- src/frontends/xforms/FormToc.C | 2 +- src/frontends/xforms/FormToc.h | 2 +- src/frontends/xforms/FormUrl.C | 2 +- src/frontends/xforms/FormUrl.h | 2 +- src/frontends/xforms/GUIRunTime.C | 4 +- src/frontends/xforms/Timeout_pimpl.C | 2 +- src/frontends/xforms/Timeout_pimpl.h | 2 +- src/frontends/xforms/Toolbar_pimpl.C | 2 +- 47 files changed, 210 insertions(+), 172 deletions(-) diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 06069bc438..5ec83aed73 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2002-03-11 Lars Gullik Bjønnes + + * doxygen fixes. + 2002-03-08 Angus Leeming * Dialogs.[Ch]: add static signal toggleTooltips and diff --git a/src/frontends/Timeout.h b/src/frontends/Timeout.h index 3fe96c0344..5c0061abbc 100644 --- a/src/frontends/Timeout.h +++ b/src/frontends/Timeout.h @@ -50,11 +50,12 @@ public: Timeout & setTimeout(unsigned int msec); private: + /// struct Pimpl; + /// friend struct Pimpl; /// implementation Pimpl * pimpl_; - /// one-shot or repeating Type type; /// timeout value in milliseconds diff --git a/src/frontends/controllers/ControlAboutlyx.h b/src/frontends/controllers/ControlAboutlyx.h index 1b921b67ee..3f0b33b720 100644 --- a/src/frontends/controllers/ControlAboutlyx.h +++ b/src/frontends/controllers/ControlAboutlyx.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file ControlAboutLyX.h + * \file ControlAboutlyx.h * Copyright 2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index 104c238f9c..c115f1cbba 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,7 @@ +2002-03-11 Lars Gullik Bjønnes + + * docygen fixes. + 2002-03-05 Angus Leeming * GUIRunTime.C (initialiseGraphics): use the xforms image loader if diff --git a/src/frontends/gnome/FormError.h b/src/frontends/gnome/FormError.h index 0b193e1a00..2a01a1ab54 100644 --- a/src/frontends/gnome/FormError.h +++ b/src/frontends/gnome/FormError.h @@ -22,8 +22,10 @@ #include "GnomeBase.h" namespace Gtk { + class Button; class Text; + } /** @@ -34,9 +36,10 @@ public: /// FormError(ControlError & c); /// - ~FormError() {}; - - void apply() {}; + ~FormError() {} + /// + void apply() {} + /// void update(); private: @@ -44,17 +47,15 @@ private: void build(); /// Returns true if the dialog input is in a valid state. - bool validate() const {return true;}; - + bool validate() const { return true; } + /// void CloseClicked() { CancelButton(); } - /// generated by accessors.py Gtk::Button * button_close() const; /// generated by accessors.py Gtk::Text * textarea() const; - }; #endif diff --git a/src/frontends/gnome/FormToc.h b/src/frontends/gnome/FormToc.h index 944b0e2c14..562f5af545 100644 --- a/src/frontends/gnome/FormToc.h +++ b/src/frontends/gnome/FormToc.h @@ -1,91 +1,91 @@ // -*- C++ -*- // THIS FILE IS NOT IN USE DUE TO API CHANGES. #include "frontends/xforms/FormToc.h" -#if 0 -// -*- C++ -*- -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 2000 The LyX Team. - * - * ====================================================== - */ +// #if 0 +// // -*- C++ -*- +// /* This file is part of +// * ====================================================== +// * +// * LyX, The Document Processor +// * +// * Copyright 2000 The LyX Team. +// * +// * ====================================================== +// */ -#ifndef FORMTOC_H -#define FORMTOC_H +// #ifndef FORMTOC_H +// #define FORMTOC_H -#ifdef __GNUG__ -#pragma interface -#endif +// #ifdef __GNUG__ +// #pragma interface +// #endif -#include "DialogBase.h" -#include "LString.h" -#include "insets/insetcommand.h" -#include "buffer.h" +// #include "DialogBase.h" +// #include "LString.h" +// #include "insets/insetcommand.h" +// #include "buffer.h" -#include -#include -#include +// #include +// #include +// #include -/** This class provides an Gnome implementation of the FormToc Dialog. - */ -class FormToc : public DialogBase { -public: - /// - FormToc(LyXView *, Dialogs *); - /// - ~FormToc(); -private: - /// Slot launching dialog to (possibly) create a new inset - void createInset( string const & ); - /// Slot launching dialog to an existing inset - void showInset( InsetCommand * const ); +// /** This class provides an Gnome implementation of the FormToc Dialog. +// */ +// class FormToc : public DialogBase { +// public: +// /// +// FormToc(LyXView *, Dialogs *); +// /// +// ~FormToc(); +// private: +// /// Slot launching dialog to (possibly) create a new inset +// void createInset( string const & ); +// /// Slot launching dialog to an existing inset +// void showInset( InsetCommand * const ); - /// Update dialog before showing it - virtual void update() { } - virtual void updateSlot(bool = false); - /// Explicitly free the dialog. - void free(); - /// Create the dialog if necessary, update it and display it. - void show(); - /// Hide the dialog. - void hide(); - /// move cursor in LyXView - void apply(Buffer::TocItem); - /// change type of the list - void changeList(Buffer::TocType); +// /// Update dialog before showing it +// virtual void update() { } +// virtual void updateSlot(bool = false); +// /// Explicitly free the dialog. +// void free(); +// /// Create the dialog if necessary, update it and display it. +// void show(); +// /// Hide the dialog. +// void hide(); +// /// move cursor in LyXView +// void apply(Buffer::TocItem); +// /// change type of the list +// void changeList(Buffer::TocType); - /** Which LyXFunc do we use? - We could modify Dialogs to have a visible LyXFunc* instead and - save a couple of bytes per dialog. - */ - LyXView * lv_; - /** Which Dialogs do we belong to? - Used so we can get at the signals we have to connect to. - */ - Dialogs * d_; - /// pointer to the inset passed through showInset (if any) - InsetCommand * inset_; - /// the nitty-griity. What is modified and passed back - InsetCommandParams params; - /// Update connection. - Connection u_; - /// Hide connection. - Connection h_; - /// inset::hide connection. - Connection ih_; +// /** Which LyXFunc do we use? +// We could modify Dialogs to have a visible LyXFunc* instead and +// save a couple of bytes per dialog. +// */ +// LyXView * lv_; +// /** Which Dialogs do we belong to? +// Used so we can get at the signals we have to connect to. +// */ +// Dialogs * d_; +// /// pointer to the inset passed through showInset (if any) +// InsetCommand * inset_; +// /// the nitty-griity. What is modified and passed back +// InsetCommandParams params; +// /// Update connection. +// Connection u_; +// /// Hide connection. +// Connection h_; +// /// inset::hide connection. +// Connection ih_; - /// Real GUI implementation. - Gnome::Dialog * dialog_; +// /// Real GUI implementation. +// Gnome::Dialog * dialog_; - Gtk::OptionMenu * choice_; +// Gtk::OptionMenu * choice_; - Gtk::List * list_; +// Gtk::List * list_; - bool ignore_callback_; -}; +// bool ignore_callback_; +// }; #endif #endif diff --git a/src/frontends/gnome/Timeout_pimpl.C b/src/frontends/gnome/Timeout_pimpl.C index ba31cc2207..808976e5d9 100644 --- a/src/frontends/gnome/Timeout_pimpl.C +++ b/src/frontends/gnome/Timeout_pimpl.C @@ -1,5 +1,5 @@ /** - * \file Timeout_pimpl.C + * \file gnome/Timeout_pimpl.C * Copyright 2001 LyX Team * Read COPYING * diff --git a/src/frontends/gnome/Timeout_pimpl.h b/src/frontends/gnome/Timeout_pimpl.h index 42c6ee9069..f5bfd0a09c 100644 --- a/src/frontends/gnome/Timeout_pimpl.h +++ b/src/frontends/gnome/Timeout_pimpl.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file Timeout_pimpl.h + * \file gnome/Timeout_pimpl.h * Copyright 2001 LyX Team * Read COPYING * diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C index 4da68f2ac7..2be46343b9 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -1,5 +1,5 @@ /** - * \file Alert_pimpl.C + * \file qt2/Alert_pimpl.C * Copyright 2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index bf01b83fae..219be1c548 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-03-11 Lars Gullik Bjønnes + + * docygen fixes. + 2002-03-05 Angus Leeming * GUIRunTime.C (initialiseGraphics): use the xforms image loader if diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index 401d460dc6..fb92b5691d 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -1,5 +1,5 @@ /** - * \file Dialogs.C + * \file qt2/Dialogs.C * Copyright 2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C index 6c0a3d1b5b..2afa3e2a80 100644 --- a/src/frontends/qt2/FileDialog.C +++ b/src/frontends/qt2/FileDialog.C @@ -1,5 +1,5 @@ /** - * \file FileDialog.C + * \file qt2/FileDialog.C * Copyright 2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/qt2/GUIRunTime.C b/src/frontends/qt2/GUIRunTime.C index 7b9aeab955..dd9dea9184 100644 --- a/src/frontends/qt2/GUIRunTime.C +++ b/src/frontends/qt2/GUIRunTime.C @@ -1,5 +1,5 @@ /** - * \file GUIRunTime.C + * \file qt2/GUIRunTime.C * Copyright 2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/qt2/QParagraphDialog.C b/src/frontends/qt2/QParagraphDialog.C index c13e9d05e9..58da428a36 100644 --- a/src/frontends/qt2/QParagraphDialog.C +++ b/src/frontends/qt2/QParagraphDialog.C @@ -26,9 +26,10 @@ using std::endl; -QParagraphDialog::QParagraphDialog(QParagraph * form, QWidget * parent, const char * name, bool modal, WFlags fl) +QParagraphDialog::QParagraphDialog(QParagraph * form, QWidget * parent, + char const * name, bool modal, WFlags fl) : QParagraphDialogBase(parent, name, modal, fl), - form_(form) + form_(form) { setCaption(name); } @@ -49,7 +50,7 @@ void QParagraphDialog::setReadOnly(bool readonly) } -void QParagraphDialog::setLabelWidth(const char *text) +void QParagraphDialog::setLabelWidth(char const * text) { // FIXME: should be cleverer here if (!strcmp(_("Senseless with this layout!"),text)) { @@ -64,20 +65,22 @@ void QParagraphDialog::setLabelWidth(const char *text) void QParagraphDialog::setAlign(int type) { - int item=0; + int item = 0; switch (type) { - case LYX_ALIGN_BLOCK : item=0; break; - case LYX_ALIGN_LEFT : item=1; break; - case LYX_ALIGN_RIGHT : item=2; break; - case LYX_ALIGN_CENTER : item=3; break; + case LYX_ALIGN_BLOCK: item = 0; break; + case LYX_ALIGN_LEFT: item = 1; break; + case LYX_ALIGN_RIGHT: item = 2; break; + case LYX_ALIGN_CENTER: item = 3; break; default: - item=0; + item = 0; + break; } alignment->setCurrentItem(item); } -void QParagraphDialog::setChecks(bool labove, bool lbelow, bool pabove, bool pbelow, bool noindent) +void QParagraphDialog::setChecks(bool labove, bool lbelow, bool pabove, + bool pbelow, bool noindent) { lineAbove->setChecked(labove); lineBelow->setChecked(lbelow); @@ -87,9 +90,11 @@ void QParagraphDialog::setChecks(bool labove, bool lbelow, bool pabove, bool pbe } -void QParagraphDialog::setSpace(VSpace::vspace_kind kindabove, VSpace::vspace_kind kindbelow, bool keepabove, bool keepbelow) +void QParagraphDialog::setSpace(VSpace::vspace_kind kindabove, + VSpace::vspace_kind kindbelow, + bool keepabove, bool keepbelow) { - int item=0; + int item = 0; switch (kindabove) { case VSpace::NONE: item = 0; break; @@ -126,9 +131,11 @@ void QParagraphDialog::setSpace(VSpace::vspace_kind kindabove, VSpace::vspace_ki void QParagraphDialog::setAboveLength(float val, float plus, float minus, - LyXLength::UNIT vunit, LyXLength::UNIT punit, LyXLength::UNIT munit) + LyXLength::UNIT vunit, + LyXLength::UNIT punit, + LyXLength::UNIT munit) { - if (vunit==LyXLength::UNIT_NONE) { + if (vunit == LyXLength::UNIT_NONE) { spacingAboveValue->setText(""); spacingAbovePlus->setText(""); spacingAboveMinus->setText(""); @@ -146,9 +153,11 @@ void QParagraphDialog::setAboveLength(float val, float plus, float minus, void QParagraphDialog::setBelowLength(float val, float plus, float minus, - LyXLength::UNIT vunit, LyXLength::UNIT punit, LyXLength::UNIT munit) + LyXLength::UNIT vunit, + LyXLength::UNIT punit, + LyXLength::UNIT munit) { - if (vunit==LyXLength::UNIT_NONE) { + if (vunit == LyXLength::UNIT_NONE) { spacingBelowValue->setText(""); spacingBelowPlus->setText(""); spacingBelowMinus->setText(""); @@ -164,11 +173,15 @@ void QParagraphDialog::setBelowLength(float val, float plus, float minus, } -void QParagraphDialog::setExtra(float widthval, LyXLength::UNIT units, const string percent, int align, - bool hfill, bool startminipage, Paragraph::PEXTRA_TYPE type) +void QParagraphDialog::setExtra(float widthval, LyXLength::UNIT units, + string const & percent, int align, + bool hfill, bool startminipage, + Paragraph::PEXTRA_TYPE type) { - if (type!=Paragraph::PEXTRA_NONE) { - lyxerr[Debug::GUI] << "percent : $" << percent << "$ widthval " << widthval << " unit " << long(units) << endl; + if (type != Paragraph::PEXTRA_NONE) { + lyxerr[Debug::GUI] << "percent : $" << percent << "$ widthval " + << widthval << " unit " << long(units) + << endl; if (percent != "") { extraWidth->setText(percent.c_str()); extraUnit->setCurrentItem(11); @@ -245,7 +258,7 @@ LyXGlueLength QParagraphDialog::getBelowLength() const LyXLength QParagraphDialog::getExtraWidth() const { - if (extraUnit->currentItem()!=11) { + if (extraUnit->currentItem() != 11) { LyXLength len( (extraWidth->text()).toDouble(), getLyXLength(extraUnit->currentItem()) @@ -269,7 +282,7 @@ string QParagraphDialog::getExtraWidthPercent() const } -const char * QParagraphDialog::getLabelWidth() const +char const * QParagraphDialog::getLabelWidth() const { return labelWidth->text(); } @@ -387,7 +400,8 @@ VSpace::vspace_kind QParagraphDialog::getSpaceKind(int val) const case 5: return VSpace::VFILL; case 6: return VSpace::LENGTH; default: - lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << std::endl; + lyxerr[Debug::GUI] << "Unknown kind combo entry " + << val << std::endl; } return VSpace::NONE; } @@ -408,7 +422,8 @@ LyXLength::UNIT QParagraphDialog::getLyXLength(int val) const case 9: return LyXLength::DD; case 10: return LyXLength::CC; default: - lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << std::endl; + lyxerr[Debug::GUI] << "Unknown kind combo entry " + << val << std::endl; } return LyXLength::UNIT_NONE; } @@ -416,7 +431,7 @@ LyXLength::UNIT QParagraphDialog::getLyXLength(int val) const int QParagraphDialog::getItem(LyXLength::UNIT unit) const { - int item=0; + int item = 0; switch (unit) { case LyXLength::CM: item = 0; break; case LyXLength::IN: item = 1; break; @@ -432,7 +447,8 @@ int QParagraphDialog::getItem(LyXLength::UNIT unit) const case LyXLength::MU: item = 0; break; case LyXLength::UNIT_NONE: item = 0; break; default: - lyxerr[Debug::GUI] << "Unknown unit " << long(unit) << endl; + lyxerr[Debug::GUI] << "Unknown unit " << long(unit) + << endl; } return item; } @@ -440,7 +456,7 @@ int QParagraphDialog::getItem(LyXLength::UNIT unit) const void QParagraphDialog::enable_extraOptions(int item) { - bool const enable = (item!=0); + bool const enable = (item != 0); extraWidth->setEnabled(enable); extraWidthL->setEnabled(enable); extraUnit->setEnabled(enable); @@ -450,13 +466,13 @@ void QParagraphDialog::enable_extraOptions(int item) void QParagraphDialog::enable_minipageOptions(int item) { - minipageOptions->setEnabled( item==1 ); + minipageOptions->setEnabled( item == 1 ); } void QParagraphDialog::enable_spacingAbove(int item) { - bool const enable = (item==6); + bool const enable = (item == 6); spacingAboveValue->setEnabled(enable); spacingAbovePlus->setEnabled(enable); spacingAboveMinus->setEnabled(enable); @@ -464,7 +480,7 @@ void QParagraphDialog::enable_spacingAbove(int item) spacingAbovePlusUnit->setEnabled(enable); spacingAboveMinusUnit->setEnabled(enable); spacingAboveUnitsL->setEnabled(enable); - bool const enablel = ( (item==6) || (item!=6 && spacingBelow->currentItem()==6) ); + bool const enablel = ( (item == 6) || (item != 6 && spacingBelow->currentItem() == 6) ); spacingValueL->setEnabled(enablel); spacingPlusL->setEnabled(enablel); spacingMinusL->setEnabled(enablel); @@ -473,7 +489,7 @@ void QParagraphDialog::enable_spacingAbove(int item) void QParagraphDialog::enable_spacingBelow(int item) { - bool const enable = (item==6); + bool const enable = (item == 6); spacingBelowValue->setEnabled(enable); spacingBelowPlus->setEnabled(enable); spacingBelowMinus->setEnabled(enable); @@ -481,7 +497,7 @@ void QParagraphDialog::enable_spacingBelow(int item) spacingBelowPlusUnit->setEnabled(enable); spacingBelowMinusUnit->setEnabled(enable); spacingBelowUnitsL->setEnabled(enable); - bool const enablel = ( (item==6) || (item!=6 && spacingAbove->currentItem()==6) ); + bool const enablel = ( (item == 6) || (item!=6 && spacingAbove->currentItem() == 6) ); spacingValueL->setEnabled(enablel); spacingPlusL->setEnabled(enablel); spacingMinusL->setEnabled(enablel); diff --git a/src/frontends/qt2/QParagraphDialog.h b/src/frontends/qt2/QParagraphDialog.h index a448ea8a17..67f1d04f62 100644 --- a/src/frontends/qt2/QParagraphDialog.h +++ b/src/frontends/qt2/QParagraphDialog.h @@ -1,3 +1,4 @@ +// -*- C++ -*- /** * \file QParagraphDialog.h * Copyright 2001 LyX Team @@ -25,23 +26,28 @@ class QParagraphDialog : public QParagraphDialogBase { Q_OBJECT public: - QParagraphDialog(QParagraph * form, QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags fl = 0); + QParagraphDialog(QParagraph * form, QWidget * parent = 0, + char const * name = 0, bool modal = FALSE, + WFlags fl = 0); ~QParagraphDialog(); void setReadOnly(bool); - void setLabelWidth(const char *); + void setLabelWidth(char const *); void setAlign(int); void setChecks(bool, bool, bool, bool, bool); void setSpace(VSpace::vspace_kind, VSpace::vspace_kind, bool, bool); - void setAboveLength(float, float, float, LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT); - void setBelowLength(float, float, float, LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT); - void setExtra(float, LyXLength::UNIT, const string, int, bool, bool, Paragraph::PEXTRA_TYPE); + void setAboveLength(float, float, float, + LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT); + void setBelowLength(float, float, float, + LyXLength::UNIT, LyXLength::UNIT, LyXLength::UNIT); + void setExtra(float, LyXLength::UNIT, + string const &, int, bool, bool, Paragraph::PEXTRA_TYPE); LyXGlueLength getAboveLength() const; LyXGlueLength getBelowLength() const; LyXLength getExtraWidth() const; string getExtraWidthPercent() const; // FIXME: return a std::string ! - const char * getLabelWidth() const; + char const * getLabelWidth() const; LyXAlignment getAlign() const; bool getAboveKeep() const; bool getBelowKeep() const; @@ -56,17 +62,13 @@ public: Paragraph::MINIPAGE_ALIGNMENT getExtraAlign() const; bool getHfillBetween() const; bool getStartNewMinipage() const; - protected: void closeEvent (QCloseEvent * e); - private: QParagraph * form_; VSpace::vspace_kind getSpaceKind(int val) const; LyXLength::UNIT getLyXLength(int val) const; int getItem(LyXLength::UNIT unit) const; - - protected slots: void apply_adaptor(); void cancel_adaptor(); diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index 2bdc6ad7be..272c504ac2 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -42,7 +42,7 @@ class Qt2Base : public QObject, public ViewBC Q_OBJECT public: /// - Qt2Base(ControlButtons &, const QString &); + Qt2Base(ControlButtons &, QString const &); /// virtual ~Qt2Base() {} @@ -83,7 +83,7 @@ protected slots: private: /// Pointer to the actual instantiation of xform's form - virtual QDialog* form() const = 0; + virtual QDialog * form() const = 0; private: /// dialog title, displayed by WM. @@ -95,7 +95,7 @@ template class Qt2DB: public Qt2Base { protected: - Qt2DB(ControlButtons &, const QString &); + Qt2DB(ControlButtons &, QString const &); /// update the dialog virtual void update(); @@ -113,7 +113,7 @@ protected: template -Qt2DB::Qt2DB(ControlButtons & c, const QString & t) +Qt2DB::Qt2DB(ControlButtons & c, QString const & t) : Qt2Base(c, t) {} @@ -166,14 +166,14 @@ public: protected: /// - Qt2CB(ControlButtons &, const QString&); + Qt2CB(ControlButtons &, QString const &); /// The parent controller Controller & controller() const; }; template -Qt2CB::Qt2CB(ControlButtons & c, const QString& t) +Qt2CB::Qt2CB(ControlButtons & c, QString const & t) : Base(c, t) {} diff --git a/src/frontends/qt2/Timeout_pimpl.C b/src/frontends/qt2/Timeout_pimpl.C index cd538ff5c6..41bde71e8c 100644 --- a/src/frontends/qt2/Timeout_pimpl.C +++ b/src/frontends/qt2/Timeout_pimpl.C @@ -1,5 +1,5 @@ /** - * \file Timeout_pimpl.C + * \file qt2/Timeout_pimpl.C * Copyright 2001 LyX Team * Read COPYING * diff --git a/src/frontends/qt2/Timeout_pimpl.h b/src/frontends/qt2/Timeout_pimpl.h index 5d94ff9b33..cfaf13f737 100644 --- a/src/frontends/qt2/Timeout_pimpl.h +++ b/src/frontends/qt2/Timeout_pimpl.h @@ -1,10 +1,12 @@ +// -*- C++ -*- /** - * \file Timeout_pimpl.h + * \file qt2/Timeout_pimpl.h * Copyright 2001 LyX Team * Read COPYING * * \author John Levon */ + #ifndef TIMEOUTPIMPL_H #define TIMEOUTPIMPL_H diff --git a/src/frontends/xforms/Alert_pimpl.C b/src/frontends/xforms/Alert_pimpl.C index 033b185124..58bc23dd31 100644 --- a/src/frontends/xforms/Alert_pimpl.C +++ b/src/frontends/xforms/Alert_pimpl.C @@ -1,5 +1,5 @@ /** - * \file Alert_pimpl.C + * \file xforms/Alert_pimpl.C * Copyright 2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 49e746c87d..f4e75063d9 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2002-03-11 Lars Gullik Bjønnes + + * doxygen fixes. + 2002-03-09 Angus Leeming * FeedbackController.C: improve a comment. diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C index 7d8e7bfd35..dd327660d7 100644 --- a/src/frontends/xforms/Dialogs.C +++ b/src/frontends/xforms/Dialogs.C @@ -1,5 +1,5 @@ /** - * \file Dialogs.C + * \file xforms/Dialogs.C * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * See the file COPYING. diff --git a/src/frontends/xforms/FileDialog.C b/src/frontends/xforms/FileDialog.C index 0e42bb4f31..6dad5b4e9b 100644 --- a/src/frontends/xforms/FileDialog.C +++ b/src/frontends/xforms/FileDialog.C @@ -1,5 +1,5 @@ /** - * \file FileDialog.C + * \file xforms/FileDialog.C * Copyright 2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormBaseDeprecated.h b/src/frontends/xforms/FormBaseDeprecated.h index 33958833db..d274cca8ed 100644 --- a/src/frontends/xforms/FormBaseDeprecated.h +++ b/src/frontends/xforms/FormBaseDeprecated.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormBase.h + * \file FormBaseDeprecated.h * Copyright 2000-2002 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C index 2f583c1bab..dc6a40a6bc 100644 --- a/src/frontends/xforms/FormCitation.C +++ b/src/frontends/xforms/FormCitation.C @@ -1,5 +1,5 @@ /** - * \file FormCitation.C + * \file xforms/FormCitation.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormCitation.h b/src/frontends/xforms/FormCitation.h index 2d40374d2f..1797c13e05 100644 --- a/src/frontends/xforms/FormCitation.h +++ b/src/frontends/xforms/FormCitation.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormCitation.h + * \file xforms/FormCitation.h * Copyright 2000-2002 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormERT.C b/src/frontends/xforms/FormERT.C index 73e46a214a..d418c0629f 100644 --- a/src/frontends/xforms/FormERT.C +++ b/src/frontends/xforms/FormERT.C @@ -1,5 +1,5 @@ /** - * \file FormERT.C + * \file xforms/FormERT.C * Copyright 2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormERT.h b/src/frontends/xforms/FormERT.h index 9d943da098..c90cc4fbfc 100644 --- a/src/frontends/xforms/FormERT.h +++ b/src/frontends/xforms/FormERT.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormERT.h + * \file xforms/FormERT.h * Copyright 2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormError.h b/src/frontends/xforms/FormError.h index cedc1f917c..78ae1f95ef 100644 --- a/src/frontends/xforms/FormError.h +++ b/src/frontends/xforms/FormError.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormError.h + * \file xforms/FormError.h * Copyright 2000-2002 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C index 7c09d69658..8679e52a59 100644 --- a/src/frontends/xforms/FormIndex.C +++ b/src/frontends/xforms/FormIndex.C @@ -1,5 +1,5 @@ /** - * \file FormIndex.C + * \file xforms/FormIndex.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormIndex.h b/src/frontends/xforms/FormIndex.h index 5901908284..2cec8d2464 100644 --- a/src/frontends/xforms/FormIndex.h +++ b/src/frontends/xforms/FormIndex.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormIndex.h + * \file xforms/FormIndex.h * Copyright 2000-2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index c489de5156..dd5c4bb315 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -78,9 +78,9 @@ void FormParagraph::changedParagraph() Paragraph const * const p = getCurrentParagraph(); if (p == 0 || p == par_) return; -#ifdef WITH_WARNINGS -#warning Please someone of you GUII people have a look at this! -#endif + + // OBS FIX LOOK HERE + // shouldn't we chage the par_ pointer too? // anyway for me the below function does just nothing! // (Jug 20020108) @@ -133,7 +133,6 @@ void FormParagraph::build() // Create the contents of the unit choices // Don't include the "%" terms... -#warning A bit dangerous... (Lgb) vector units_vec = getLatexUnits(); #if 0 for (vector::iterator it = units_vec.begin(); diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C index 2b3db0e10d..859e19f6a7 100644 --- a/src/frontends/xforms/FormPrint.C +++ b/src/frontends/xforms/FormPrint.C @@ -1,5 +1,5 @@ /* - * \file FormPrint.C + * \file xforms/FormPrint.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormPrint.h b/src/frontends/xforms/FormPrint.h index c250772e95..92efbb5487 100644 --- a/src/frontends/xforms/FormPrint.h +++ b/src/frontends/xforms/FormPrint.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormPrint.h + * \file xforms/FormPrint.h * Copyright 2002 the LyX Team * Copyright 1999-2001 Allan Rae * Read the file COPYING diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C index f88f08e565..8a0f6f1efa 100644 --- a/src/frontends/xforms/FormRef.C +++ b/src/frontends/xforms/FormRef.C @@ -1,5 +1,5 @@ /** - * \file FormRef.C + * \file xforms/FormRef.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormRef.h b/src/frontends/xforms/FormRef.h index 0170f6fd24..e69e8d1e17 100644 --- a/src/frontends/xforms/FormRef.h +++ b/src/frontends/xforms/FormRef.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormRef.h + * \file xforms/FormRef.h * Copyright 2000-2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C index 738e8aaebf..822f38d0ae 100644 --- a/src/frontends/xforms/FormTabularCreate.C +++ b/src/frontends/xforms/FormTabularCreate.C @@ -1,5 +1,5 @@ /** - * \file FormTabularCreate.C + * \file xforms/FormTabularCreate.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormTabularCreate.h b/src/frontends/xforms/FormTabularCreate.h index 9e339147e3..254e047a1c 100644 --- a/src/frontends/xforms/FormTabularCreate.h +++ b/src/frontends/xforms/FormTabularCreate.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormTabularCreate.h + * \file xforms/FormTabularCreate.h * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 the LyX Team * Read the file COPYING diff --git a/src/frontends/xforms/FormThesaurus.C b/src/frontends/xforms/FormThesaurus.C index 8cdcff3aff..4f2b097ea7 100644 --- a/src/frontends/xforms/FormThesaurus.C +++ b/src/frontends/xforms/FormThesaurus.C @@ -27,9 +27,10 @@ using std::vector; typedef FormCB > base_class; + FormThesaurus::FormThesaurus(ControlThesaurus & c) : base_class(c, _("LyX: Thesaurus"), false), - clickline_(-1) + clickline_(-1) { } diff --git a/src/frontends/xforms/FormThesaurus.h b/src/frontends/xforms/FormThesaurus.h index cba55d52e0..a4a93fda8f 100644 --- a/src/frontends/xforms/FormThesaurus.h +++ b/src/frontends/xforms/FormThesaurus.h @@ -43,10 +43,10 @@ private: FD_form_thesaurus * build_thesaurus(); /// set the replace word properly - void setReplace(const string & templ, const string & nstr); + void setReplace(string const & templ, string const & nstr); /// update browser entries - void updateMeanings(const string & str); + void updateMeanings(string const & str); /// Filter the inputs virtual ButtonPolicy::SMInput input(FL_OBJECT *, long); diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C index a0ad95bf15..cffdfc48c9 100644 --- a/src/frontends/xforms/FormToc.C +++ b/src/frontends/xforms/FormToc.C @@ -1,5 +1,5 @@ /** - * \file FormToc.C + * \file xforms/FormToc.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormToc.h b/src/frontends/xforms/FormToc.h index f44b039455..079d5d986e 100644 --- a/src/frontends/xforms/FormToc.h +++ b/src/frontends/xforms/FormToc.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormToc.h + * \file xforms/FormToc.h * Copyright 2000-2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C index a190a463b1..9cfffb616f 100644 --- a/src/frontends/xforms/FormUrl.C +++ b/src/frontends/xforms/FormUrl.C @@ -1,5 +1,5 @@ /** - * \file FormUrl.C + * \file xforms/FormUrl.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * diff --git a/src/frontends/xforms/FormUrl.h b/src/frontends/xforms/FormUrl.h index 37319eede7..23c984d75f 100644 --- a/src/frontends/xforms/FormUrl.h +++ b/src/frontends/xforms/FormUrl.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file FormUrl.h + * \file xforms/FormUrl.h * Copyright 2000-2001 the LyX Team * Read the file COPYING * diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C index c047bac63a..47fc03db29 100644 --- a/src/frontends/xforms/GUIRunTime.C +++ b/src/frontends/xforms/GUIRunTime.C @@ -1,5 +1,5 @@ /** - * \file GUIRunTime.C + * \file xforms/GUIRunTime.C * Copyright 2000-2001 The LyX Team. * See the file COPYING. * @@ -46,7 +46,7 @@ int const xforms_include_version = FL_INCLUDE_VERSION; } // namespace anon -int GUIRunTime::initApplication(int &, char **) +int GUIRunTime::initApplication(int &, char * []) { // Check the XForms version in the forms.h header against // the one in the libforms. If they don't match quit the diff --git a/src/frontends/xforms/Timeout_pimpl.C b/src/frontends/xforms/Timeout_pimpl.C index 1cd764b241..3c45d6d1ac 100644 --- a/src/frontends/xforms/Timeout_pimpl.C +++ b/src/frontends/xforms/Timeout_pimpl.C @@ -1,5 +1,5 @@ /** - * \file Timeout_pimpl.C + * \file xforms/Timeout_pimpl.C * Copyright 2001 LyX Team * Read COPYING * diff --git a/src/frontends/xforms/Timeout_pimpl.h b/src/frontends/xforms/Timeout_pimpl.h index cf4306a46c..c4dd835f9f 100644 --- a/src/frontends/xforms/Timeout_pimpl.h +++ b/src/frontends/xforms/Timeout_pimpl.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file Timeout_pimpl.h + * \file xforms/Timeout_pimpl.h * Copyright 2001 LyX Team * Read COPYING * diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C index cae74b7fef..da2f72979b 100644 --- a/src/frontends/xforms/Toolbar_pimpl.C +++ b/src/frontends/xforms/Toolbar_pimpl.C @@ -1,5 +1,5 @@ /** - * \file FormBase.C + * \file Toolbar_pimpl.C * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * Copyright 1996-1998 Lars Gullik Bjønnes -- 2.39.2