diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000000..3bc16bb683 --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,3 @@ +Mathed +André Pönitz +poenitz@HTWM.de diff --git a/boost/ChangeLog b/boost/ChangeLog index 95f6ed04b6..6709b8f2c5 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,7 @@ +2001-03-15 Lars Gullik Bjønnes + + * boost/utility.hpp: remove lyx specific modifications. + 2001-02-20 Angus Leeming * .cvsignore: added various files diff --git a/boost/boost/utility.hpp b/boost/boost/utility.hpp index 7d3503aa82..82a7d13219 100644 --- a/boost/boost/utility.hpp +++ b/boost/boost/utility.hpp @@ -26,9 +26,8 @@ #include // for size_t #include // for std::pair -// LGB -//namespace boost -//{ +namespace boost +{ // next() and prior() template functions -----------------------------------// @@ -91,11 +90,7 @@ template inline tied tie(A& a, B& b) { return tied(a, b); } -// LGB -//} // namespace boost +} // namespace boost #endif // BOOST_UTILITY_HPP - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 2b487fe1df..12461f08a5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -13,6 +13,7 @@ src/exporter.C src/ext_l10n.h src/FontLoader.C src/form1.C +src/frontends/controllers/ButtonController.h src/frontends/gnome/FormCitation.C src/frontends/gnome/FormCopyright.C src/frontends/gnome/FormError.C @@ -72,56 +73,54 @@ src/frontends/qt2/FormTabularCreate.C src/frontends/qt2/paragraphdlgimpl.C src/frontends/qt2/tabularcreatedlgimpl.C src/frontends/xforms/FileDialog.C -src/frontends/xforms/FormBase.h -src/frontends/xforms/FormBibitem.C src/frontends/xforms/form_bibitem.C -src/frontends/xforms/FormBibtex.C +src/frontends/xforms/FormBibitem.C src/frontends/xforms/form_bibtex.C +src/frontends/xforms/FormBibtex.C src/frontends/xforms/form_browser.C -src/frontends/xforms/FormCharacter.C src/frontends/xforms/form_character.C -src/frontends/xforms/FormCitation.C +src/frontends/xforms/FormCharacter.C src/frontends/xforms/form_citation.C -src/frontends/xforms/FormCopyright.C +src/frontends/xforms/FormCitation.C src/frontends/xforms/form_copyright.C -src/frontends/xforms/FormCredits.C +src/frontends/xforms/FormCopyright.C src/frontends/xforms/form_credits.C -src/frontends/xforms/FormDocument.C +src/frontends/xforms/FormCredits.C src/frontends/xforms/form_document.C -src/frontends/xforms/FormError.C +src/frontends/xforms/FormDocument.C src/frontends/xforms/form_error.C -src/frontends/xforms/FormExternal.C +src/frontends/xforms/FormError.C src/frontends/xforms/form_external.C -src/frontends/xforms/FormFiledialog.C +src/frontends/xforms/FormExternal.C src/frontends/xforms/form_filedialog.C -src/frontends/xforms/FormGraphics.C +src/frontends/xforms/FormFiledialog.C src/frontends/xforms/form_graphics.C -src/frontends/xforms/FormInclude.C +src/frontends/xforms/FormGraphics.C src/frontends/xforms/form_include.C -src/frontends/xforms/FormIndex.C +src/frontends/xforms/FormInclude.C src/frontends/xforms/form_index.C -src/frontends/xforms/FormInset.h +src/frontends/xforms/FormIndex.C src/frontends/xforms/FormLog.C -src/frontends/xforms/FormParagraph.C src/frontends/xforms/form_paragraph.C -src/frontends/xforms/FormPreamble.C +src/frontends/xforms/FormParagraph.C src/frontends/xforms/form_preamble.C -src/frontends/xforms/FormPreferences.C +src/frontends/xforms/FormPreamble.C src/frontends/xforms/form_preferences.C -src/frontends/xforms/FormPrint.C +src/frontends/xforms/FormPreferences.C src/frontends/xforms/form_print.C -src/frontends/xforms/FormRef.C +src/frontends/xforms/FormPrint.C src/frontends/xforms/form_ref.C -src/frontends/xforms/FormSearch.C +src/frontends/xforms/FormRef.C src/frontends/xforms/form_search.C -src/frontends/xforms/FormTabular.C +src/frontends/xforms/FormSearch.C src/frontends/xforms/form_tabular.C -src/frontends/xforms/FormTabularCreate.C +src/frontends/xforms/FormTabular.C src/frontends/xforms/form_tabular_create.C -src/frontends/xforms/FormToc.C +src/frontends/xforms/FormTabularCreate.C src/frontends/xforms/form_toc.C -src/frontends/xforms/FormUrl.C +src/frontends/xforms/FormToc.C src/frontends/xforms/form_url.C +src/frontends/xforms/FormUrl.C src/frontends/xforms/FormVCLog.C src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C diff --git a/src/BufferView.h b/src/BufferView.h index bb524e3026..56cafa50c6 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -31,7 +31,7 @@ class WorkArea; class Language; /// -class BufferView : public noncopyable { +class BufferView : public boost::noncopyable { public: /// enum UpdateCodes { diff --git a/src/ChangeLog b/src/ChangeLog index 5aa46f5da9..786f593da8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,19 @@ +2001-03-15 Lars Gullik Bjønnes + + * buffer.C (pop_tag): tie is in namespace boost + + * BufferView.h: noncopyable is in namespace boost + * lyxlex.h: ditto + * lyx_main.h: ditto + * lyx_gui.h: ditto + * layout.h: ditto + * lastfiles.h: ditto + * bufferlist.h: ditto + * ShareContainer.h: ditto + * LyXView.h: ditto + * LyXAction.h: ditto + * LaTeX.h: ditto + 2001-03-14 Angus Leeming * Merging changes from BRANCH_MVC back into HEAD. diff --git a/src/LaTeX.h b/src/LaTeX.h index 0fa5d78206..161322d866 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -97,7 +97,7 @@ bool operator!=(Aux_Info const & a, Aux_Info const & o) /// -class LaTeX : public noncopyable { +class LaTeX : public boost::noncopyable { public: /** Return values from scanLogFile() and run() (to come) diff --git a/src/LyXAction.h b/src/LyXAction.h index 3ec318a596..84db87abd8 100644 --- a/src/LyXAction.h +++ b/src/LyXAction.h @@ -14,7 +14,7 @@ /** This class encapsulates LyX action and user command operations. */ -class LyXAction : public noncopyable { +class LyXAction : public boost::noncopyable { private: /// struct func_info { diff --git a/src/LyXView.h b/src/LyXView.h index e4d4746b2b..220e3cb1b7 100644 --- a/src/LyXView.h +++ b/src/LyXView.h @@ -44,7 +44,7 @@ using SigC::Object; view is supposed (at least IMHO) to be another class, that shows its output in one or more LyXView's. */ -class LyXView : public Object, public noncopyable { +class LyXView : public Object, public boost::noncopyable { public: /// constructor LyXView(int w, int h); diff --git a/src/ShareContainer.h b/src/ShareContainer.h index 70b4ad9fc0..83e373c305 100644 --- a/src/ShareContainer.h +++ b/src/ShareContainer.h @@ -17,7 +17,7 @@ \author Lars Gullik Bjønnes */ template -class ShareContainer : public noncopyable { +class ShareContainer : public boost::noncopyable { public: /// typedef std::vector > Params; diff --git a/src/buffer.C b/src/buffer.C index 90a4b8f53f..4e85329a02 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -3642,7 +3642,8 @@ Buffer::Lists const Buffer::getLists() const #ifdef NEW_INSETS bool found; LyXTextClassList::size_type cap; - tie(found, cap) = textclasslist.NumberOfLayout(params.textclass, "Caption"); + boost::tie(found, cap) = textclasslist + .NumberOfLayout(params.textclass, "Caption"); #endif while (par) { diff --git a/src/bufferlist.h b/src/bufferlist.h index 0b4efadfae..efd76c486d 100644 --- a/src/bufferlist.h +++ b/src/bufferlist.h @@ -30,7 +30,7 @@ This class should ideally be enclosed inside class BufferList, but that gave me an "internal gcc error". */ -class BufferStorage : public noncopyable { +class BufferStorage : public boost::noncopyable { public: /// typedef std::vector Container; @@ -68,7 +68,7 @@ private: /** The class govern all open buffers. */ -class BufferList : public noncopyable { +class BufferList : public boost::noncopyable { public: /// BufferList(); diff --git a/src/frontends/ButtonPolicies.h b/src/frontends/ButtonPolicies.h index 2bbcbb4cd4..a3603b67b3 100644 --- a/src/frontends/ButtonPolicies.h +++ b/src/frontends/ButtonPolicies.h @@ -66,7 +66,7 @@ The IgnorantPolicy is a special case that allows anything. */ -class ButtonPolicy : public noncopyable { +class ButtonPolicy : public boost::noncopyable { public: /// virtual ~ButtonPolicy() {} diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 438eebe666..67c03dcd79 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,9 @@ +2001-03-15 Lars Gullik Bjønnes + + * ButtonPolicies.h: noncopyable is in namespace boost + * Dialogs.h (noncopyable): ditto + * DialogBase.h (noncopyable): ditto + 2001-03-14 Angus Leeming * Merging changes from BRANCH_MVC back into HEAD. diff --git a/src/frontends/DialogBase.h b/src/frontends/DialogBase.h index c30da3a0c3..457824a4a4 100644 --- a/src/frontends/DialogBase.h +++ b/src/frontends/DialogBase.h @@ -35,7 +35,7 @@ using SigC::Object; satisfy that request. Thus a dialog will have to "pull" the necessary details from the core of the program. */ -class DialogBase : public Object, public noncopyable +class DialogBase : public Object, public boost::noncopyable { public: /**@name Constructors and Deconstructors */ diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h index 3007748b63..edccd8f9b9 100644 --- a/src/frontends/Dialogs.h +++ b/src/frontends/Dialogs.h @@ -49,7 +49,7 @@ class InsetCommand; The list of dialog signals isn't comprehensive but should be a good guide for any future additions. Remember don't go overboard -- think minimal. */ -class Dialogs : public noncopyable +class Dialogs : public boost::noncopyable { public: /// diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h index 73dae9f694..97d4ee0f86 100644 --- a/src/frontends/controllers/ButtonController.h +++ b/src/frontends/controllers/ButtonController.h @@ -33,7 +33,7 @@ * This abstract base class stripped of xforms-specific code by * Angus Leeming */ -class ButtonControllerBase : public noncopyable +class ButtonControllerBase : public boost::noncopyable { public: /** Constructor. diff --git a/src/frontends/controllers/ButtonPolicies.h b/src/frontends/controllers/ButtonPolicies.h index e8bf22b93a..3282305833 100644 --- a/src/frontends/controllers/ButtonPolicies.h +++ b/src/frontends/controllers/ButtonPolicies.h @@ -66,7 +66,7 @@ The IgnorantPolicy is a special case that allows anything. */ -class ButtonPolicy : public noncopyable { +class ButtonPolicy : public boost::noncopyable { public: /// virtual ~ButtonPolicy() {} diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index cbce26aaab..316cdf5bd3 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2001-03-15 Lars Gullik Bjønnes + + * ButtonController.h: noncopyable is in namespace boost + * ButtonPolicies.h: ditto + 2001-03-14 Angus Leeming * Merging changes from BRANCH_MVC back into HEAD. diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index 1bdbd213c4..b3d99f3501 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,9 @@ +2001-03-15 Lars Gullik Bjønnes + + * GraphicsCache.h: noncopyable is in namespace boost + * ImageLoader.h: ditto + * GraphicsCacheItem.h: ditto + 2001-03-07 Baruch Even * GraphicsCache.C (d-tor): Removed the assert, the assumption it carried diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h index 240157992b..37eb8d1f08 100644 --- a/src/graphics/GraphicsCache.h +++ b/src/graphics/GraphicsCache.h @@ -31,7 +31,7 @@ class GraphicsCacheItem; GraphicsCache is a singleton class, there should be only one instance of it at any moment. */ -class GraphicsCache : public noncopyable { +class GraphicsCache : public boost::noncopyable { public: /// Get the instance of the class. static GraphicsCache & getInstance(); diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h index 266b70d723..89f5eccfa6 100644 --- a/src/graphics/GraphicsCacheItem.h +++ b/src/graphics/GraphicsCacheItem.h @@ -33,7 +33,7 @@ using SigC::Signal0; class LyXImage; /// A GraphicsCache item holder. -class GraphicsCacheItem : public noncopyable { +class GraphicsCacheItem : public boost::noncopyable { public: /// c-tor GraphicsCacheItem(string const & filename); diff --git a/src/graphics/ImageLoader.h b/src/graphics/ImageLoader.h index 3a45f1269f..e2fe8b31b2 100644 --- a/src/graphics/ImageLoader.h +++ b/src/graphics/ImageLoader.h @@ -29,7 +29,7 @@ class LyXImage; * * @Author Baruch Even, */ -class ImageLoader : public noncopyable { +class ImageLoader : public boost::noncopyable { public: /// Errors that can be returned from this class. enum Result { diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 0953cd30d1..f14c61a7a4 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,9 @@ +2001-03-15 Lars Gullik Bjønnes + + * ExternalTemplate.h: noncopyable is in namespace boost + * insetinclude.h: ditto + * insetcommand.h: ditto + 2001-03-14 Angus Leeming * insettext.C (Edit): #else# -> #else. diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h index c02cd865a1..505365d224 100644 --- a/src/insets/ExternalTemplate.h +++ b/src/insets/ExternalTemplate.h @@ -72,7 +72,7 @@ struct ExternalTemplate { /** A singleton class that manages the external inset templates */ -class ExternalTemplateManager : public noncopyable { +class ExternalTemplateManager : public boost::noncopyable { public: /// Map from the LyX name of the template to the template structure typedef std::map Templates; diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index d0fb7a5c9f..d7225cda3e 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -78,7 +78,7 @@ private: /// -class InsetCommand : public InsetButton, public noncopyable { +class InsetCommand : public InsetButton, public boost::noncopyable { public: /// explicit diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h index 83dd627147..539cbe9d65 100644 --- a/src/insets/insetinclude.h +++ b/src/insets/insetinclude.h @@ -24,7 +24,7 @@ struct LaTeXFeatures; /** Used to include files */ -class InsetInclude: public InsetButton, public noncopyable { +class InsetInclude: public InsetButton, public boost::noncopyable { public: /// the type of inclusion enum IncludeFlags { diff --git a/src/lastfiles.h b/src/lastfiles.h index a5816204ca..2161903da4 100644 --- a/src/lastfiles.h +++ b/src/lastfiles.h @@ -27,7 +27,7 @@ kept are user defined, but defaults to four. @author Lars Gullik Bjønnes */ -class LastFiles : public noncopyable { +class LastFiles : public boost::noncopyable { public: /// typedef std::deque Files; diff --git a/src/layout.h b/src/layout.h index 723401e81b..9cfe9098e6 100644 --- a/src/layout.h +++ b/src/layout.h @@ -547,7 +547,7 @@ std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p); /// -class LyXTextClassList : public noncopyable { +class LyXTextClassList : public boost::noncopyable { public: /// typedef std::vector ClassList; diff --git a/src/lyx_gui.h b/src/lyx_gui.h index 98fd4c19e1..6068dd3c40 100644 --- a/src/lyx_gui.h +++ b/src/lyx_gui.h @@ -28,7 +28,7 @@ class Buffer; have not clearly figured out how this class is going to be, suggestions are welcome. (Lgb) */ -class LyXGUI : public noncopyable { +class LyXGUI : public boost::noncopyable { public: /** The only constructor allowed. If gui is false, LyX will operate in non-X mode diff --git a/src/lyx_main.h b/src/lyx_main.h index ba840c422f..e6e1a1e01c 100644 --- a/src/lyx_main.h +++ b/src/lyx_main.h @@ -44,7 +44,7 @@ extern LastFiles * lastfiles; /* we should hopefully be able to move this /** This is the main LyX object it encapsulates most of the other objects. */ -class LyX : public noncopyable { +class LyX : public boost::noncopyable { public: /// the only allowed constructor LyX(int * argc, char * argv[]); // constructor diff --git a/src/lyxlex.h b/src/lyxlex.h index 5b2f85e54e..c65b24724b 100644 --- a/src/lyxlex.h +++ b/src/lyxlex.h @@ -29,7 +29,7 @@ struct keyword_item { texclass and others to come. @see lyxrc.C for an example of usage. */ -class LyXLex : public noncopyable { +class LyXLex : public boost::noncopyable { public: /// LyXLex (keyword_item *, int); diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 9ff1e4090c..39788c167a 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,9 @@ +2001-03-15 Lars Gullik Bjønnes + + * math_macrotable.h: noncopyable is in namespace boost + * math_macrotemplate.h: ditto + + * math_rowst.h: make MathedRowContainer::iterator public. 2001-03-15 André Pönitz diff --git a/src/mathed/math_macrotable.h b/src/mathed/math_macrotable.h index cbf848659a..5da3a0940c 100644 --- a/src/mathed/math_macrotable.h +++ b/src/mathed/math_macrotable.h @@ -16,7 +16,7 @@ class MathMacroTemplate; class MathMacro; /// -class MathMacroTable : noncopyable { +class MathMacroTable : boost::noncopyable { public: /// void addTemplate(boost::shared_ptr const &); diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h index 9edcf4fb1c..e000e0aa67 100644 --- a/src/mathed/math_macrotemplate.h +++ b/src/mathed/math_macrotemplate.h @@ -19,7 +19,7 @@ class MathMacro; /** This class contains the macro definition \author Alejandro Aguilar Sierra */ -class MathMacroTemplate : public MathParInset, public noncopyable { +class MathMacroTemplate : public MathParInset, public boost::noncopyable { public: friend class MathMacro; diff --git a/src/mathed/math_rowst.h b/src/mathed/math_rowst.h index f93dc1d8fb..2832203c6f 100644 --- a/src/mathed/math_rowst.h +++ b/src/mathed/math_rowst.h @@ -61,7 +61,7 @@ protected: class MathedRowContainer { -private: +public: /// typedef std::vector data_type; /// diff --git a/src/support/ChangeLog b/src/support/ChangeLog index c26727af2c..6cab81fbfd 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2001-03-15 Lars Gullik Bjønnes + + * FileInfo.h: noncopyable is in namespace boost + * path.h: ditto + 2001-02-16 John Levon * syscontr.h: fix header include diff --git a/src/support/FileInfo.h b/src/support/FileInfo.h index 8223c15c7d..41063a9ba5 100644 --- a/src/support/FileInfo.h +++ b/src/support/FileInfo.h @@ -26,7 +26,7 @@ /** Use objects of this class to get information about files. */ -class FileInfo : public noncopyable { +class FileInfo : public boost::noncopyable { public: /// FileInfo(); diff --git a/src/support/path.h b/src/support/path.h index 9e8f67ba8e..2ff6f05f8d 100644 --- a/src/support/path.h +++ b/src/support/path.h @@ -12,7 +12,7 @@ #endif /// -class Path : public noncopyable { +class Path : public boost::noncopyable { public: /// explicit