From: Bo Peng Date: Wed, 25 Apr 2007 01:24:38 +0000 (+0000) Subject: Rename insets/insetxxx to insets/InsetXxx, part 1 X-Git-Tag: 1.6.10~10112 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b6a2a76700466b7ee712e2b733702da02c5ffd6b;p=features.git Rename insets/insetxxx to insets/InsetXxx, part 1 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17964 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/FORMAT b/development/FORMAT index 7dc61bb28e..9e4284805f 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -609,7 +609,7 @@ Paragraph text. 2002-10-24 Rob Lahaye - * insetgraphicsParams.h (scale): is now a float, not an unsigned int. + * InsetGraphicsParams.h (scale): is now a float, not an unsigned int. 2002-08-22 Rob Lahaye diff --git a/development/cmake/src/insets/CMakeLists.txt b/development/cmake/src/insets/CMakeLists.txt index c2fca4605e..5faf03a088 100644 --- a/development/cmake/src/insets/CMakeLists.txt +++ b/development/cmake/src/insets/CMakeLists.txt @@ -9,7 +9,7 @@ project(insets) file(GLOB insets_sources ${TOP_SRC_DIR}/src/insets/${LYX_CPP_FILES}) file(GLOB insets_headers ${TOP_SRC_DIR}/src/insets/${LYX_HPP_FILES}) -list(REMOVE_ITEM insets_sources ${TOP_SRC_DIR}/src/insets/insettheorem.C) +list(REMOVE_ITEM insets_sources ${TOP_SRC_DIR}/src/insets/InsetTheorem.cpp) lyx_add_msvc_pch(insets) diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 7678165305..9b85ecfbc7 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -323,54 +323,54 @@ src_insets_header_files = Split(''' ExternalSupport.h ExternalTemplate.h ExternalTransforms.h - inset.h - insetbase.h - insetbibitem.h - insetbibtex.h - insetbox.h - insetbranch.h - insetcaption.h - insetcharstyle.h - insetcite.h - insetcollapsable.h - insetcommand.h - insetcommandparams.h - insetenv.h - insetert.h - insetexternal.h - insetfloat.h - insetfloatlist.h - insetfoot.h - insetfootlike.h - insetgraphics.h - insetgraphicsParams.h - insethfill.h - insetinclude.h - insetindex.h - insetlabel.h - insetline.h - insetmarginal.h - insetnewline.h - insetnomencl.h - insetnote.h - insetoptarg.h - insetpagebreak.h - insetquotes.h - insetref.h - insetspace.h - insetspecialchar.h - insettabular.h - insettext.h - insettheorem.h - insettoc.h - inseturl.h - insetvspace.h - insetwrap.h - mailinset.h - render_base.h - render_button.h - render_graphic.h - render_preview.h + Inset.h + InsetBase.h + InsetBibitem.h + InsetBibtex.h + InsetBox.h + InsetBranch.h + InsetCaption.h + InsetCharStyle.h + InsetCite.h + InsetCollapsable.h + InsetCommand.h + InsetCommandParams.h + InsetEnv.h + InsetERT.h + InsetExternal.h + InsetFloat.h + InsetFloatList.h + InsetFoot.h + InsetFootlike.h + InsetGraphics.h + InsetGraphicsParams.h + InsetHFill.h + InsetInclude.h + InsetIndex.h + InsetLabel.h + InsetLine.h + InsetMarginal.h + InsetNewline.h + InsetNomencl.h + InsetNote.h + InsetOptArg.h + InsetPageBreak.h + InsetQuotes.h + InsetRef.h + InsetSpace.h + InsetSpecialChar.h + InsetTabular.h + InsetText.h + InsetTheorem.h + InsetTOC.h + InsetUrl.h + InsetVSpace.h + InsetWrap.h + MailInset.h + RenderBase.h + RenderButton.h + RenderGraphic.h + RenderPreview.h ''') @@ -378,52 +378,52 @@ src_insets_files = Split(''' ExternalSupport.C ExternalTemplate.C ExternalTransforms.C - inset.C - insetbase.C - insetbibitem.C - insetbibtex.C - insetbox.C - insetbranch.C - insetcaption.C - insetcharstyle.C - insetcite.C - insetcollapsable.C - insetcommand.C - insetcommandparams.C - insetenv.C - insetert.C - insetexternal.C - insetfloat.C - insetfloatlist.C - insetfoot.C - insetfootlike.C - insetgraphics.C - insetgraphicsParams.C - insethfill.C - insetinclude.C - insetindex.C - insetlabel.C - insetline.C - insetmarginal.C - insetnewline.C - insetnomencl.C - insetnote.C - insetoptarg.C - insetpagebreak.C - insetquotes.C - insetref.C - insetspace.C - insetspecialchar.C - insettabular.C - insettext.C - insettoc.C - inseturl.C - insetvspace.C - insetwrap.C - mailinset.C - render_button.C - render_graphic.C - render_preview.C + Inset.cpp + InsetBase.cpp + InsetBibitem.cpp + InsetBibtex.cpp + InsetBox.cpp + InsetBranch.cpp + InsetCaption.cpp + InsetCharStyle.cpp + InsetCite.cpp + InsetCollapsable.cpp + InsetCommand.cpp + InsetCommandParams.cpp + InsetEnv.cpp + InsetERT.cpp + InsetExternal.cpp + InsetFloat.cpp + InsetFloatList.cpp + InsetFoot.cpp + InsetFootlike.cpp + InsetGraphics.cpp + InsetGraphicsParams.cpp + InsetHFill.cpp + InsetInclude.cpp + InsetIndex.cpp + InsetLabel.cpp + InsetLine.cpp + InsetMarginal.cpp + InsetNewline.cpp + InsetNomencl.cpp + InsetNote.cpp + InsetOptArg.cpp + InsetPageBreak.cpp + InsetQuotes.cpp + InsetRef.cpp + InsetSpace.cpp + InsetSpecialChar.cpp + InsetTabular.cpp + InsetText.cpp + InsetTOC.cpp + InsetUrl.cpp + InsetVSpace.cpp + InsetWrap.cpp + MailInset.cpp + RenderButton.cpp + RenderGraphic.cpp + RenderPreview.cpp ''') diff --git a/po/POTFILES.in b/po/POTFILES.in index 521cab71b6..3f2a051a56 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -82,39 +82,39 @@ src/frontends/qt4/UrlView.C src/frontends/qt4/validators.C src/gettext.h src/importer.C -src/insets/insetbase.C -src/insets/insetbibtex.C -src/insets/insetbox.C -src/insets/insetbranch.C -src/insets/insetcaption.C -src/insets/insetcharstyle.C -src/insets/insetcommand.C -src/insets/insetcommandparams.C -src/insets/insetenv.C -src/insets/insetert.C -src/insets/insetexternal.C -src/insets/insetfloat.C -src/insets/insetfloatlist.C -src/insets/insetfoot.C -src/insets/insetgraphics.C -src/insets/insethfill.C -src/insets/insetinclude.C -src/insets/insetindex.C -src/insets/insetmarginal.C -src/insets/insetnomencl.C -src/insets/insetnote.C -src/insets/insetoptarg.C -src/insets/insetpagebreak.h -src/insets/insetref.C -src/insets/insettabular.C -src/insets/insettext.C -src/insets/insettheorem.C -src/insets/insettoc.C -src/insets/inseturl.C -src/insets/insetvspace.C -src/insets/insetwrap.C -src/insets/render_graphic.C -src/insets/render_preview.C +src/insets/InsetBase.cpp +src/insets/InsetBibtex.cpp +src/insets/InsetBox.cpp +src/insets/InsetBranch.cpp +src/insets/InsetCaption.cpp +src/insets/InsetCharStyle.cpp +src/insets/InsetCommand.cpp +src/insets/InsetCommandParams.cpp +src/insets/InsetEnv.cpp +src/insets/InsetERT.cpp +src/insets/InsetExternal.cpp +src/insets/InsetFloat.cpp +src/insets/InsetFloatList.cpp +src/insets/InsetFoot.cpp +src/insets/InsetGraphics.cpp +src/insets/InsetHFill.cpp +src/insets/InsetInclude.cpp +src/insets/InsetIndex.cpp +src/insets/InsetMarginal.cpp +src/insets/InsetNomencl.cpp +src/insets/InsetNote.cpp +src/insets/InsetOptArg.cpp +src/insets/InsetPageBreak.h +src/insets/InsetRef.cpp +src/insets/InsetTabular.cpp +src/insets/InsetText.cpp +src/insets/InsetTheorem.cpp +src/insets/InsetTOC.cpp +src/insets/InsetUrl.cpp +src/insets/InsetVSpace.cpp +src/insets/InsetWrap.cpp +src/insets/RenderGraphic.cpp +src/insets/RenderPreview.cpp src/ispell.C src/kbsequence.C src/lengthcommon.C diff --git a/src/BufferView.C b/src/BufferView.C index 2c4b7a36b0..ada0248648 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -55,10 +55,10 @@ #include "WordLangTuple.h" #include "metricsinfo.h" -#include "insets/insetbibtex.h" -#include "insets/insetcommand.h" // ChangeRefs -#include "insets/insetref.h" -#include "insets/insettext.h" +#include "insets/InsetBibtex.h" +#include "insets/InsetCommand.h" // ChangeRefs +#include "insets/InsetRef.h" +#include "insets/InsetText.h" #include "frontends/Alert.h" #include "frontends/FileDialog.h" diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index 00831851f0..20d7a46504 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -36,8 +36,8 @@ #include "pariterator.h" #include "undo.h" -#include "insets/insetcharstyle.h" -#include "insets/insettabular.h" +#include "insets/InsetCharStyle.h" +#include "insets/InsetTabular.h" #include "mathed/MathData.h" #include "mathed/InsetMath.h" diff --git a/src/InsetList.C b/src/InsetList.C index 22e9273ab6..e066a171da 100644 --- a/src/InsetList.C +++ b/src/InsetList.C @@ -18,7 +18,7 @@ #include "BranchList.h" #include "debug.h" -#include "insets/insetbranch.h" +#include "insets/InsetBranch.h" namespace lyx { diff --git a/src/ParagraphMetrics.C b/src/ParagraphMetrics.C index a028683961..7576bcc224 100644 --- a/src/ParagraphMetrics.C +++ b/src/ParagraphMetrics.C @@ -41,8 +41,8 @@ #include "frontends/FontMetrics.h" -#include "insets/insetbibitem.h" -#include "insets/insetoptarg.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetOptArg.h" #include "support/lstrings.h" #include "support/textutils.h" diff --git a/src/TextMetrics.C b/src/TextMetrics.C index 63a287a160..834a229cbb 100644 --- a/src/TextMetrics.C +++ b/src/TextMetrics.C @@ -201,7 +201,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) // redo insets // FIXME: We should always use getFont(), see documentation of - // noFontChange() in insetbase.h. + // noFontChange() in InsetBase.h. LyXFont const bufferfont = buffer.params().getFont(); InsetList::const_iterator ii = par.insetlist.begin(); InsetList::const_iterator iend = par.insetlist.end(); diff --git a/src/TocBackend.C b/src/TocBackend.C index 6b12ad2bee..04084ce27a 100644 --- a/src/TocBackend.C +++ b/src/TocBackend.C @@ -22,7 +22,7 @@ #include "paragraph.h" #include "debug.h" -#include "insets/insetoptarg.h" +#include "insets/InsetOptArg.h" #include "support/convert.h" diff --git a/src/buffer.C b/src/buffer.C index 345325a869..bc719884a8 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -50,10 +50,10 @@ #include "undo.h" #include "version.h" -#include "insets/insetbibitem.h" -#include "insets/insetbibtex.h" -#include "insets/insetinclude.h" -#include "insets/insettext.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetBibtex.h" +#include "insets/InsetInclude.h" +#include "insets/InsetText.h" #include "mathed/MathMacroTemplate.h" #include "mathed/MathMacroTable.h" diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C index 35e977fc2e..db543a018a 100644 --- a/src/buffer_funcs.C +++ b/src/buffer_funcs.C @@ -37,10 +37,10 @@ #include "frontends/Alert.h" -#include "insets/insetbibitem.h" -#include "insets/insetcaption.h" -#include "insets/insetinclude.h" -#include "insets/insettabular.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetCaption.h" +#include "insets/InsetInclude.h" +#include "insets/InsetTabular.h" #include "support/filetools.h" #include "support/fs_extras.h" diff --git a/src/bufferparams.h b/src/bufferparams.h index 720526e9bc..c87b335737 100644 --- a/src/bufferparams.h +++ b/src/bufferparams.h @@ -18,7 +18,7 @@ #include "lyxtextclass.h" #include "paper.h" -#include "insets/insetquotes.h" +#include "insets/InsetQuotes.h" #include "support/copied_ptr.h" #include "support/types.h" diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index 547f94962c..d0fa5b7d04 100644 --- a/src/bufferview_funcs.C +++ b/src/bufferview_funcs.C @@ -33,8 +33,8 @@ #include "frontends/Alert.h" -#include "insets/insetcommand.h" -#include "insets/insettext.h" +#include "insets/InsetCommand.h" +#include "insets/InsetText.h" #include "support/convert.h" diff --git a/src/coordcache.C b/src/coordcache.C index b55b296ef1..6ded325de5 100644 --- a/src/coordcache.C +++ b/src/coordcache.C @@ -14,7 +14,7 @@ #include "lyxtext.h" -#include "insets/insetbase.h" +#include "insets/InsetBase.h" #include diff --git a/src/cursor.C b/src/cursor.C index e1ff22f267..892f5b76fa 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -33,8 +33,8 @@ #include "paragraph_funcs.h" #include "pariterator.h" -#include "insets/insettabular.h" -#include "insets/insettext.h" +#include "insets/InsetTabular.h" +#include "insets/InsetText.h" #include "mathed/MathData.h" #include "mathed/InsetMath.h" diff --git a/src/cursor_slice.h b/src/cursor_slice.h index 651fb1c9dd..8b7200038f 100644 --- a/src/cursor_slice.h +++ b/src/cursor_slice.h @@ -17,7 +17,7 @@ #ifndef CURSORSLICE_H #define CURSORSLICE_H -#include "insets/insetbase.h" +#include "insets/InsetBase.h" #include "support/types.h" #include diff --git a/src/dociterator.C b/src/dociterator.C index 331915982f..9f753c357a 100644 --- a/src/dociterator.C +++ b/src/dociterator.C @@ -20,7 +20,7 @@ #include "mathed/MathData.h" #include "mathed/InsetMath.h" -#include "insets/insettabular.h" +#include "insets/InsetTabular.h" #include #include diff --git a/src/factory.C b/src/factory.C index 553b280fc9..50abb182bb 100644 --- a/src/factory.C +++ b/src/factory.C @@ -23,37 +23,37 @@ #include "lyx_main.h" #include "paragraph.h" -#include "insets/insetbibitem.h" -#include "insets/insetbibtex.h" -#include "insets/insetcaption.h" -#include "insets/insetcite.h" -#include "insets/insetcharstyle.h" -#include "insets/insetenv.h" -#include "insets/insetert.h" -#include "insets/insetexternal.h" -#include "insets/insetfloat.h" -#include "insets/insetfloatlist.h" -#include "insets/insetfoot.h" -#include "insets/insetgraphics.h" -#include "insets/insethfill.h" -#include "insets/insetinclude.h" -#include "insets/insetindex.h" -#include "insets/insetnomencl.h" -#include "insets/insetlabel.h" -#include "insets/insetline.h" -#include "insets/insetmarginal.h" -#include "insets/insetnote.h" -#include "insets/insetbox.h" -#include "insets/insetbranch.h" -#include "insets/insetoptarg.h" -#include "insets/insetpagebreak.h" -#include "insets/insetref.h" -#include "insets/insetspace.h" -#include "insets/insettabular.h" -#include "insets/insettoc.h" -#include "insets/inseturl.h" -#include "insets/insetvspace.h" -#include "insets/insetwrap.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetBibtex.h" +#include "insets/InsetCaption.h" +#include "insets/InsetCite.h" +#include "insets/InsetCharStyle.h" +#include "insets/InsetEnv.h" +#include "insets/InsetERT.h" +#include "insets/InsetExternal.h" +#include "insets/InsetFloat.h" +#include "insets/InsetFloatList.h" +#include "insets/InsetFoot.h" +#include "insets/InsetGraphics.h" +#include "insets/InsetHFill.h" +#include "insets/InsetInclude.h" +#include "insets/InsetIndex.h" +#include "insets/InsetNomencl.h" +#include "insets/InsetLabel.h" +#include "insets/InsetLine.h" +#include "insets/InsetMarginal.h" +#include "insets/InsetNote.h" +#include "insets/InsetBox.h" +#include "insets/InsetBranch.h" +#include "insets/InsetOptArg.h" +#include "insets/InsetPageBreak.h" +#include "insets/InsetRef.h" +#include "insets/InsetSpace.h" +#include "insets/InsetTabular.h" +#include "insets/InsetTOC.h" +#include "insets/InsetUrl.h" +#include "insets/InsetVSpace.h" +#include "insets/InsetWrap.h" #include "mathed/MathMacroTemplate.h" #include "mathed/InsetMathHull.h" diff --git a/src/frontends/controllers/ControlBox.C b/src/frontends/controllers/ControlBox.C index 1bbf1a998f..380b1c4e5c 100644 --- a/src/frontends/controllers/ControlBox.C +++ b/src/frontends/controllers/ControlBox.C @@ -12,7 +12,7 @@ #include "ControlBox.h" #include "funcrequest.h" -#include "insets/insetbox.h" +#include "insets/InsetBox.h" #include "gettext.h" diff --git a/src/frontends/controllers/ControlBranch.C b/src/frontends/controllers/ControlBranch.C index 1b656b542c..abfdb69f24 100644 --- a/src/frontends/controllers/ControlBranch.C +++ b/src/frontends/controllers/ControlBranch.C @@ -17,7 +17,7 @@ #include "bufferparams.h" #include "BranchList.h" #include "funcrequest.h" -#include "insets/insetbranch.h" +#include "insets/InsetBranch.h" using std::string; diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C index 20ceb87a0e..ff6d603e70 100644 --- a/src/frontends/controllers/ControlCommand.C +++ b/src/frontends/controllers/ControlCommand.C @@ -13,7 +13,7 @@ #include "ControlCommand.h" #include "funcrequest.h" -#include "insets/insetcommand.h" +#include "insets/InsetCommand.h" using std::string; diff --git a/src/frontends/controllers/ControlCommand.h b/src/frontends/controllers/ControlCommand.h index 6bb641c791..efad2ccf2e 100644 --- a/src/frontends/controllers/ControlCommand.h +++ b/src/frontends/controllers/ControlCommand.h @@ -17,7 +17,7 @@ #include "Dialog.h" -#include "insets/insetcommandparams.h" +#include "insets/InsetCommandParams.h" namespace lyx { namespace frontend { diff --git a/src/frontends/controllers/ControlERT.h b/src/frontends/controllers/ControlERT.h index a68078b33e..b2b0d28693 100644 --- a/src/frontends/controllers/ControlERT.h +++ b/src/frontends/controllers/ControlERT.h @@ -15,7 +15,7 @@ #include "Dialog.h" -#include "insets/insetert.h" // InsetERT::ERTStatus +#include "insets/InsetERT.h" // InsetERT::ERTStatus namespace lyx { namespace frontend { diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C index fccc440c59..aaf58008ad 100644 --- a/src/frontends/controllers/ControlExternal.C +++ b/src/frontends/controllers/ControlExternal.C @@ -23,7 +23,7 @@ #include "graphics/GraphicsCacheItem.h" #include "graphics/GraphicsImage.h" -#include "insets/insetexternal.h" +#include "insets/InsetExternal.h" #include "insets/ExternalSupport.h" #include "insets/ExternalTemplate.h" diff --git a/src/frontends/controllers/ControlFloat.C b/src/frontends/controllers/ControlFloat.C index 7e66324dcd..305346177d 100644 --- a/src/frontends/controllers/ControlFloat.C +++ b/src/frontends/controllers/ControlFloat.C @@ -12,7 +12,7 @@ #include "ControlFloat.h" #include "funcrequest.h" -#include "insets/insetfloat.h" +#include "insets/InsetFloat.h" using std::string; diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C index cb9b92e7bf..4bf3191569 100644 --- a/src/frontends/controllers/ControlGraphics.C +++ b/src/frontends/controllers/ControlGraphics.C @@ -23,7 +23,7 @@ #include "graphics/GraphicsCacheItem.h" #include "graphics/GraphicsImage.h" -#include "insets/insetgraphics.h" +#include "insets/InsetGraphics.h" #include "support/convert.h" #include "support/filefilterlist.h" diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C index e45206b90e..09784758e2 100644 --- a/src/frontends/controllers/ControlInclude.C +++ b/src/frontends/controllers/ControlInclude.C @@ -22,7 +22,7 @@ #include "gettext.h" #include "lyxrc.h" -#include "insets/insetinclude.h" +#include "insets/InsetInclude.h" #include "support/filefilterlist.h" #include "support/filetools.h" diff --git a/src/frontends/controllers/ControlInclude.h b/src/frontends/controllers/ControlInclude.h index 8b9074e3b1..983a30cefd 100644 --- a/src/frontends/controllers/ControlInclude.h +++ b/src/frontends/controllers/ControlInclude.h @@ -16,7 +16,7 @@ #include "Dialog.h" -#include "insets/insetcommandparams.h" +#include "insets/InsetCommandParams.h" #include "support/docstring.h" diff --git a/src/frontends/controllers/ControlNote.C b/src/frontends/controllers/ControlNote.C index 3d2bd460be..f5e4043035 100644 --- a/src/frontends/controllers/ControlNote.C +++ b/src/frontends/controllers/ControlNote.C @@ -12,7 +12,7 @@ #include "ControlNote.h" #include "funcrequest.h" -#include "insets/insetnote.h" +#include "insets/InsetNote.h" #include "gettext.h" diff --git a/src/frontends/controllers/ControlTabular.C b/src/frontends/controllers/ControlTabular.C index 513833f3fa..09c1928869 100644 --- a/src/frontends/controllers/ControlTabular.C +++ b/src/frontends/controllers/ControlTabular.C @@ -16,7 +16,7 @@ #include "funcrequest.h" #include "lyxrc.h" #include "paragraph.h" -#include "insets/insettabular.h" +#include "insets/InsetTabular.h" using std::string; diff --git a/src/frontends/controllers/ControlVSpace.C b/src/frontends/controllers/ControlVSpace.C index 4d5c643c0b..faf22af704 100644 --- a/src/frontends/controllers/ControlVSpace.C +++ b/src/frontends/controllers/ControlVSpace.C @@ -15,7 +15,7 @@ #include "ButtonController.h" #include "funcrequest.h" -#include "insets/insetvspace.h" +#include "insets/InsetVSpace.h" using std::istringstream; diff --git a/src/frontends/controllers/ControlWrap.C b/src/frontends/controllers/ControlWrap.C index fd3f1309ff..1fe33abb01 100644 --- a/src/frontends/controllers/ControlWrap.C +++ b/src/frontends/controllers/ControlWrap.C @@ -12,7 +12,7 @@ #include "ControlWrap.h" #include "funcrequest.h" -#include "insets/insetwrap.h" +#include "insets/InsetWrap.h" using std::string; diff --git a/src/frontends/qt4/FloatPlacement.C b/src/frontends/qt4/FloatPlacement.C index 1fc64e53ca..fdb1a34d68 100644 --- a/src/frontends/qt4/FloatPlacement.C +++ b/src/frontends/qt4/FloatPlacement.C @@ -14,7 +14,7 @@ #include "FloatPlacement.h" #include "qt_helpers.h" -#include "insets/insetfloat.h" +#include "insets/InsetFloat.h" #include "support/lstrings.h" using lyx::support::contains; diff --git a/src/frontends/qt4/QBox.C b/src/frontends/qt4/QBox.C index 4342e8f8a5..b4916170ad 100644 --- a/src/frontends/qt4/QBox.C +++ b/src/frontends/qt4/QBox.C @@ -25,7 +25,7 @@ #include "controllers/ControlBox.h" #include "controllers/helper_funcs.h" -#include "insets/insetbox.h" +#include "insets/InsetBox.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/QBranch.C b/src/frontends/qt4/QBranch.C index 2da8fa9261..4116eabdd8 100644 --- a/src/frontends/qt4/QBranch.C +++ b/src/frontends/qt4/QBranch.C @@ -19,7 +19,7 @@ #include "controllers/ControlBranch.h" -#include "insets/insetbranch.h" +#include "insets/InsetBranch.h" #include diff --git a/src/frontends/qt4/QExternal.C b/src/frontends/qt4/QExternal.C index 8784b4f3e1..a9ef8e02a8 100644 --- a/src/frontends/qt4/QExternal.C +++ b/src/frontends/qt4/QExternal.C @@ -19,7 +19,7 @@ #include "controllers/ControlExternal.h" #include "insets/ExternalTemplate.h" -#include "insets/insetexternal.h" +#include "insets/InsetExternal.h" #include "support/lstrings.h" #include "support/convert.h" diff --git a/src/frontends/qt4/QFloat.C b/src/frontends/qt4/QFloat.C index 0c10f09ef5..fb14eedc10 100644 --- a/src/frontends/qt4/QFloat.C +++ b/src/frontends/qt4/QFloat.C @@ -17,7 +17,7 @@ #include "controllers/ControlFloat.h" -#include "insets/insetfloat.h" +#include "insets/InsetFloat.h" #include diff --git a/src/frontends/qt4/QGraphics.C b/src/frontends/qt4/QGraphics.C index d8bd29f24e..da4b51c361 100644 --- a/src/frontends/qt4/QGraphics.C +++ b/src/frontends/qt4/QGraphics.C @@ -28,7 +28,7 @@ #include "controllers/ControlGraphics.h" #include "controllers/helper_funcs.h" -#include "insets/insetgraphicsParams.h" +#include "insets/InsetGraphicsParams.h" #include "support/convert.h" #include "support/lstrings.h" diff --git a/src/frontends/qt4/QGraphicsDialog.C b/src/frontends/qt4/QGraphicsDialog.C index 23b786ce0c..b0939ec093 100644 --- a/src/frontends/qt4/QGraphicsDialog.C +++ b/src/frontends/qt4/QGraphicsDialog.C @@ -24,7 +24,7 @@ #include "controllers/ControlGraphics.h" -#include "insets/insetgraphicsParams.h" +#include "insets/InsetGraphicsParams.h" #include #include diff --git a/src/frontends/qt4/QNote.C b/src/frontends/qt4/QNote.C index 7dd158f4e5..f7d9e19d01 100644 --- a/src/frontends/qt4/QNote.C +++ b/src/frontends/qt4/QNote.C @@ -16,7 +16,7 @@ #include "controllers/ControlNote.h" -#include "insets/insetnote.h" +#include "insets/InsetNote.h" #include #include diff --git a/src/frontends/qt4/QRef.C b/src/frontends/qt4/QRef.C index 5cdb5ca73b..4d3aa39ae7 100644 --- a/src/frontends/qt4/QRef.C +++ b/src/frontends/qt4/QRef.C @@ -19,7 +19,7 @@ #include "controllers/ButtonController.h" #include "controllers/ControlRef.h" -#include "insets/insetref.h" +#include "insets/InsetRef.h" #include #include diff --git a/src/frontends/qt4/QWrap.C b/src/frontends/qt4/QWrap.C index 83aad5327e..2a002cb746 100644 --- a/src/frontends/qt4/QWrap.C +++ b/src/frontends/qt4/QWrap.C @@ -18,7 +18,7 @@ #include "controllers/ControlWrap.h" -#include "insets/insetwrap.h" +#include "insets/InsetWrap.h" #include "support/convert.h" #include "support/lstrings.h" diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C index 34b7f862c7..b9cc288a01 100644 --- a/src/graphics/PreviewLoader.C +++ b/src/graphics/PreviewLoader.C @@ -26,7 +26,7 @@ #include "frontends/Application.h" // hexName -#include "insets/inset.h" +#include "insets/Inset.h" #include "support/filetools.h" #include "support/forkedcall.h" diff --git a/src/graphics/Previews.C b/src/graphics/Previews.C index efbae5070b..0525b9efb8 100644 --- a/src/graphics/Previews.C +++ b/src/graphics/Previews.C @@ -18,7 +18,7 @@ #include "lyxrc.h" #include "paragraph.h" -#include "insets/inset.h" +#include "insets/Inset.h" namespace lyx { diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C index 1f7669b704..83077029d6 100644 --- a/src/insets/ExternalSupport.C +++ b/src/insets/ExternalSupport.C @@ -14,7 +14,7 @@ #include "ExternalSupport.h" #include "ExternalTemplate.h" #include "ExternalTransforms.h" -#include "insetexternal.h" +#include "InsetExternal.h" #include "buffer.h" #include "converter.h" diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index 40038526f5..dad6f58824 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -4,118 +4,118 @@ noinst_LTLIBRARIES = libinsets.la EXTRA_DIST = \ pch.h \ - insettheorem.C \ - insettheorem.h + InsetTheorem.cpp \ + InsetTheorem.h BUILT_SOURCES = $(PCH_FILE) AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libinsets_la_SOURCES = \ - mailinset.C \ - mailinset.h \ + MailInset.cpp \ + MailInset.h \ ExternalSupport.C \ ExternalSupport.h \ ExternalTemplate.C \ ExternalTemplate.h \ ExternalTransforms.C \ ExternalTransforms.h \ - render_base.h \ - render_button.C \ - render_button.h \ - render_graphic.C \ - render_graphic.h \ - render_preview.C \ - render_preview.h \ - inset.C \ - inset.h \ - insetbase.h \ - insetbase.C \ - insetbibitem.C \ - insetbibitem.h \ - insetbibtex.C \ - insetbibtex.h \ - insetbox.C \ - insetbox.h \ - insetbranch.C \ - insetbranch.h \ - insetcaption.C \ - insetcaption.h \ - insetcharstyle.C \ - insetcharstyle.h \ - insetcite.C \ - insetcite.h \ - insetcollapsable.C \ - insetcollapsable.h \ - insetcommand.C \ - insetcommand.h \ - insetcommandparams.C \ - insetcommandparams.h \ - insetenv.C \ - insetenv.h \ - insetert.C \ - insetert.h \ - insetexternal.C \ - insetexternal.h \ - insetfloat.h \ - insetfloat.C \ - insetfloatlist.C \ - insetfloatlist.h \ - insetfoot.C \ - insetfoot.h \ - insetfootlike.C \ - insetfootlike.h \ - insetgraphicsParams.h \ - insetgraphicsParams.C \ - insetgraphics.C \ - insetgraphics.h \ - insethfill.C \ - insethfill.h \ - insetinclude.C \ - insetinclude.h \ - insetindex.C \ - insetindex.h \ - insetlabel.C \ - insetlabel.h \ - insetline.C \ - insetline.h \ - insetmarginal.h \ - insetmarginal.C \ - insetnewline.C \ - insetnewline.h \ - insetnomencl.C \ - insetnomencl.h \ - insetnote.C \ - insetnote.h \ - insetoptarg.C \ - insetoptarg.h \ - insetpagebreak.C \ - insetpagebreak.h \ - insetquotes.C \ - insetquotes.h \ - insetref.C \ - insetref.h \ - insetspace.C \ - insetspace.h \ - insetspecialchar.C \ - insetspecialchar.h \ - insettabular.C \ - insettabular.h \ - insettext.C \ - insettext.h \ - insettoc.C \ - insettoc.h \ - inseturl.C \ - inseturl.h \ - insetvspace.C \ - insetvspace.h \ - insetwrap.h \ - insetwrap.C + RenderBase.h \ + RenderButton.cpp \ + RenderButton.h \ + RenderGraphic.cpp \ + RenderGraphic.h \ + RenderPreview.cpp \ + RenderPreview.h \ + Inset.cpp \ + Inset.h \ + InsetBase.h \ + InsetBase.cpp \ + InsetBibitem.cpp \ + InsetBibitem.h \ + InsetBibtex.cpp \ + InsetBibtex.h \ + InsetBox.cpp \ + InsetBox.h \ + InsetBranch.cpp \ + InsetBranch.h \ + InsetCaption.cpp \ + InsetCaption.h \ + InsetCharStyle.cpp \ + InsetCharStyle.h \ + InsetCite.cpp \ + InsetCite.h \ + InsetCollapsable.cpp \ + InsetCollapsable.h \ + InsetCommand.cpp \ + InsetCommand.h \ + InsetCommandParams.cpp \ + InsetCommandParams.h \ + InsetEnv.cpp \ + InsetEnv.h \ + InsetERT.cpp \ + InsetERT.h \ + InsetExternal.cpp \ + InsetExternal.h \ + InsetFloat.h \ + InsetFloat.cpp \ + InsetFloatList.cpp \ + InsetFloatList.h \ + InsetFoot.cpp \ + InsetFoot.h \ + InsetFootlike.cpp \ + InsetFootlike.h \ + InsetGraphicsParams.h \ + InsetGraphicsParams.cpp \ + InsetGraphics.cpp \ + InsetGraphics.h \ + InsetHFill.cpp \ + InsetHFill.h \ + InsetInclude.cpp \ + InsetInclude.h \ + InsetIndex.cpp \ + InsetIndex.h \ + InsetLabel.cpp \ + InsetLabel.h \ + InsetLine.cpp \ + InsetLine.h \ + InsetMarginal.h \ + InsetMarginal.cpp \ + InsetNewline.cpp \ + InsetNewline.h \ + InsetNomencl.cpp \ + InsetNomencl.h \ + InsetNote.cpp \ + InsetNote.h \ + InsetOptArg.cpp \ + InsetOptArg.h \ + InsetPageBreak.cpp \ + InsetPageBreak.h \ + InsetQuotes.cpp \ + InsetQuotes.h \ + InsetRef.cpp \ + InsetRef.h \ + InsetSpace.cpp \ + InsetSpace.h \ + InsetSpecialChar.cpp \ + InsetSpecialChar.h \ + InsetTabular.cpp \ + InsetTabular.h \ + InsetText.cpp \ + InsetText.h \ + InsetTOC.cpp \ + InsetTOC.h \ + InsetUrl.cpp \ + InsetUrl.h \ + InsetVSpace.cpp \ + InsetVSpace.h \ + InsetWrap.h \ + InsetWrap.cpp # insetlist.C \ # insetlist.h \ # insetsection.h \ # insetsection.C \ -# insettheorem.C \ -# insettheorem.h +# InsetTheorem.cpp \ +# InsetTheorem.h diff --git a/src/insets/inset.C b/src/insets/inset.C index 21b91021ea..90f38b2647 100644 --- a/src/insets/inset.C +++ b/src/insets/inset.C @@ -1,5 +1,5 @@ /** - * \file inset.C + * \file Inset.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #include -#include "inset.h" +#include "Inset.h" #include "BufferView.h" #include "debug.h" diff --git a/src/insets/inset.h b/src/insets/inset.h index 73c8a4380f..36f107800f 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file inset.h + * \file Inset.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -15,7 +15,7 @@ #ifndef INSETOLD_H #define INSETOLD_H -#include "insetbase.h" +#include "InsetBase.h" namespace lyx { @@ -53,7 +53,7 @@ private: /** \c InsetBase_code is a wrapper for InsetBase::Code. * It can be forward-declared and passed as a function argument without - * having to expose inset.h. + * having to expose Inset.h. */ class InsetBase_code { InsetBase::Code val_; diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C index 64bdb67c2c..8bc297ccdc 100644 --- a/src/insets/insetbase.C +++ b/src/insets/insetbase.C @@ -1,5 +1,5 @@ /** - * \file insetbase.C + * \file InsetBase.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetbase.h" +#include "InsetBase.h" #include "buffer.h" #include "coordcache.h" diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h index 09990a217a..6a88a728b3 100644 --- a/src/insets/insetbase.h +++ b/src/insets/insetbase.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetbase.h + * \file InsetBase.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C index 0de266a2a7..bab36181fb 100644 --- a/src/insets/insetbibitem.C +++ b/src/insets/insetbibitem.C @@ -1,5 +1,5 @@ /** - * \file insetbibitem.C + * \file InsetBibitem.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetbibitem.h" +#include "InsetBibitem.h" #include "buffer.h" #include "BufferView.h" diff --git a/src/insets/insetbibitem.h b/src/insets/insetbibitem.h index 32f4574c22..6c9e32f909 100644 --- a/src/insets/insetbibitem.h +++ b/src/insets/insetbibitem.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetbibitem.h + * \file InsetBibitem.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_BIBITEM_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C index 883ee25a46..3eb2b99414 100644 --- a/src/insets/insetbibtex.C +++ b/src/insets/insetbibtex.C @@ -1,5 +1,5 @@ /** - * \file insetbibtex.C + * \file InsetBibtex.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetbibtex.h" +#include "InsetBibtex.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h index 3c461d73bb..59b61c5e82 100644 --- a/src/insets/insetbibtex.h +++ b/src/insets/insetbibtex.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetbibtex.h + * \file InsetBibtex.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #include -#include "insetcommand.h" +#include "InsetCommand.h" #include "support/filename.h" diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C index 6e07db2cac..eae86d0440 100644 --- a/src/insets/insetbox.C +++ b/src/insets/insetbox.C @@ -1,5 +1,5 @@ /** - * \file insetbox.C + * \file InsetBox.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "insetbox.h" +#include "InsetBox.h" #include "BufferView.h" #include "cursor.h" diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h index 77f1d3354a..70b15215f7 100644 --- a/src/insets/insetbox.h +++ b/src/insets/insetbox.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetbox.h + * \file InsetBox.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,9 +13,9 @@ #ifndef INSETBOX_H #define INSETBOX_H -#include "insetcollapsable.h" +#include "InsetCollapsable.h" #include "lyxlength.h" -#include "mailinset.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C index 3c28c079c6..2f75ae312d 100644 --- a/src/insets/insetbranch.C +++ b/src/insets/insetbranch.C @@ -1,5 +1,5 @@ /** - * \file insetbranch.C + * \file InsetBranch.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetbranch.h" +#include "InsetBranch.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h index a680772452..c8e3c47c51 100644 --- a/src/insets/insetbranch.h +++ b/src/insets/insetbranch.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetbranch.h + * \file InsetBranch.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,8 +12,8 @@ #ifndef INSETBRANCH_H #define INSETBRANCH_H -#include "insetcollapsable.h" -#include "mailinset.h" +#include "InsetCollapsable.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C index 8fcbcc4987..e719e9cbc2 100644 --- a/src/insets/insetcaption.C +++ b/src/insets/insetcaption.C @@ -1,5 +1,5 @@ /** - * \file insetcaption.C + * \file InsetCaption.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "insetcaption.h" -#include "insetfloat.h" -#include "insetwrap.h" +#include "InsetCaption.h" +#include "InsetFloat.h" +#include "InsetWrap.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetcaption.h b/src/insets/insetcaption.h index 45adb74e87..5b40c44133 100644 --- a/src/insets/insetcaption.h +++ b/src/insets/insetcaption.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetcaption.h + * \file InsetCaption.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSETCAPTION_H #define INSETCAPTION_H -#include "insettext.h" +#include "InsetText.h" #include "lyxtextclass.h" diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C index ed3566716b..d8eb17baa5 100644 --- a/src/insets/insetcharstyle.C +++ b/src/insets/insetcharstyle.C @@ -1,5 +1,5 @@ /** - * \file insetcharstyle.C + * \file InsetCharStyle.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "insetcharstyle.h" +#include "InsetCharStyle.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h index 5966a5de15..1bd423cf03 100644 --- a/src/insets/insetcharstyle.h +++ b/src/insets/insetcharstyle.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetcharstyle.h + * \file InsetCharStyle.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef INSETCHARSTYLE_H #define INSETCHARSTYLE_H -#include "insetcollapsable.h" +#include "InsetCollapsable.h" #include "lyxtextclass.h" diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C index f34b9023e7..df9704e538 100644 --- a/src/insets/insetcite.C +++ b/src/insets/insetcite.C @@ -1,5 +1,5 @@ /** - * \file insetcite.C + * \file InsetCite.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetcite.h" +#include "InsetCite.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetcite.h b/src/insets/insetcite.h index 36b083fdf2..8836c53352 100644 --- a/src/insets/insetcite.h +++ b/src/insets/insetcite.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetcite.h + * \file InsetCite.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #define INSET_CITE_H -#include "insetcommand.h" +#include "InsetCommand.h" #include "frontends/controllers/biblio.h" diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index 0c480765c7..ef68f6847e 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -1,5 +1,5 @@ /** - * \file insetcollapsable.C + * \file InsetCollapsable.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "insetcollapsable.h" +#include "InsetCollapsable.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 5bc909ea62..d0fcb46df0 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetcollapsable.h + * \file InsetCollapsable.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,8 +14,8 @@ #ifndef INSETCOLLAPSABLE_H #define INSETCOLLAPSABLE_H -#include "inset.h" -#include "insettext.h" +#include "Inset.h" +#include "InsetText.h" #include "box.h" #include "lyxfont.h" diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 359b4decd0..d3676497d9 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -1,5 +1,5 @@ /** - * \file insetcommand.C + * \file InsetCommand.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetcommand.h" +#include "InsetCommand.h" #include "BufferView.h" #include "dispatchresult.h" diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index a691582ed7..c849e0285e 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetcommand.h + * \file InsetCommand.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,10 +13,10 @@ #ifndef INSET_LATEXCOMMAND_H #define INSET_LATEXCOMMAND_H -#include "inset.h" -#include "insetcommandparams.h" -#include "render_button.h" -#include "mailinset.h" +#include "Inset.h" +#include "InsetCommandParams.h" +#include "RenderButton.h" +#include "MailInset.h" #include "cursor.h" diff --git a/src/insets/insetcommandparams.C b/src/insets/insetcommandparams.C index d96404f29e..24f2de9112 100644 --- a/src/insets/insetcommandparams.C +++ b/src/insets/insetcommandparams.C @@ -1,5 +1,5 @@ /** - * \file insetcommandparams.C + * \file InsetCommandParams.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetcommandparams.h" +#include "InsetCommandParams.h" #include "debug.h" #include "gettext.h" diff --git a/src/insets/insetcommandparams.h b/src/insets/insetcommandparams.h index 0584020c5e..c67360b571 100644 --- a/src/insets/insetcommandparams.h +++ b/src/insets/insetcommandparams.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetcommandparams.h + * \file InsetCommandParams.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C index 53926417e0..336090a1fc 100644 --- a/src/insets/insetenv.C +++ b/src/insets/insetenv.C @@ -1,5 +1,5 @@ /** - * \file insetenv.C + * \file InsetEnv.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetenv.h" +#include "InsetEnv.h" #include "bufferparams.h" #include "gettext.h" diff --git a/src/insets/insetenv.h b/src/insets/insetenv.h index 7104f3cb9d..d05d4d19d0 100644 --- a/src/insets/insetenv.h +++ b/src/insets/insetenv.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetenv.h + * \file InsetEnv.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSETENVIRONMENT_H #define INSETENVIRONMENT_H -#include "insettext.h" +#include "InsetText.h" #include "lyxlayout_ptr_fwd.h" diff --git a/src/insets/insetert.C b/src/insets/insetert.C index cb62a2579b..d87fdc77e8 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -1,5 +1,5 @@ /** - * \file insetert.C + * \file InsetERT.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetert.h" +#include "InsetERT.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetert.h b/src/insets/insetert.h index a91330b72b..e82fecdc2a 100644 --- a/src/insets/insetert.h +++ b/src/insets/insetert.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetert.h + * \file InsetERT.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,8 +13,8 @@ #ifndef INSETERT_H #define INSETERT_H -#include "insetcollapsable.h" -#include "mailinset.h" +#include "InsetCollapsable.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 588dabc399..f2be434e9b 100644 --- a/src/insets/insetexternal.C +++ b/src/insets/insetexternal.C @@ -1,5 +1,5 @@ /** - * \file insetexternal.C + * \file InsetExternal.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,12 +10,12 @@ #include -#include "insetexternal.h" +#include "InsetExternal.h" #include "insets/ExternalSupport.h" #include "insets/ExternalTemplate.h" -#include "insets/render_button.h" -#include "insets/render_graphic.h" -#include "insets/render_preview.h" +#include "insets/RenderButton.h" +#include "insets/RenderGraphic.h" +#include "insets/RenderPreview.h" #include "buffer.h" #include "cursor.h" diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h index 5ad4c1240e..783e5e46a6 100644 --- a/src/insets/insetexternal.h +++ b/src/insets/insetexternal.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetexternal.h + * \file InsetExternal.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSET_EXTERNAL_H #define INSET_EXTERNAL_H -#include "inset.h" +#include "Inset.h" #include "ExternalTransforms.h" #include "support/filename.h" @@ -21,7 +21,7 @@ #include #include -#include "mailinset.h" +#include "MailInset.h" /** No two InsetExternalParams variables can have the same temporary file. diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index b4be20c998..74c08f770e 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -1,5 +1,5 @@ /** - * \file insetfloat.C + * \file InsetFloat.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetfloat.h" +#include "InsetFloat.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h index 34f633c38a..1ed9cba014 100644 --- a/src/insets/insetfloat.h +++ b/src/insets/insetfloat.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetfloat.h + * \file InsetFloat.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,8 +13,8 @@ #ifndef INSETFLOAT_H #define INSETFLOAT_H -#include "insetcollapsable.h" -#include "mailinset.h" +#include "InsetCollapsable.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C index a5d9ae1969..e437f13575 100644 --- a/src/insets/insetfloatlist.C +++ b/src/insets/insetfloatlist.C @@ -1,5 +1,5 @@ /** - * \file insetfloatlist.C + * \file InsetFloatList.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetfloatlist.h" +#include "InsetFloatList.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetfloatlist.h b/src/insets/insetfloatlist.h index 7d9a236040..5e814726a3 100644 --- a/src/insets/insetfloatlist.h +++ b/src/insets/insetfloatlist.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetfloatlist.h + * \file InsetFloatList.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_FLOATLIST_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C index 9b698b2ff8..59c1de30f0 100644 --- a/src/insets/insetfoot.C +++ b/src/insets/insetfoot.C @@ -1,5 +1,5 @@ /** - * \file insetfoot.C + * \file InsetFoot.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetfoot.h" +#include "InsetFoot.h" #include "gettext.h" // the following are needed just to get the layout of the enclosing diff --git a/src/insets/insetfoot.h b/src/insets/insetfoot.h index b74ea35fb0..dddba1f115 100644 --- a/src/insets/insetfoot.h +++ b/src/insets/insetfoot.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetfoot.h + * \file InsetFoot.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef INSETFOOT_H #define INSETFOOT_H -#include "insetfootlike.h" +#include "InsetFootlike.h" namespace lyx { diff --git a/src/insets/insetfootlike.C b/src/insets/insetfootlike.C index 8aef1d25bd..954081b571 100644 --- a/src/insets/insetfootlike.C +++ b/src/insets/insetfootlike.C @@ -1,5 +1,5 @@ /** - * \file insetfootlike.C + * \file InsetFootlike.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetfootlike.h" +#include "InsetFootlike.h" #include "buffer.h" #include "BufferView.h" diff --git a/src/insets/insetfootlike.h b/src/insets/insetfootlike.h index 09e24ba420..bc1ce1ab91 100644 --- a/src/insets/insetfootlike.h +++ b/src/insets/insetfootlike.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetfootlike.h + * \file InsetFootlike.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSETFOOTLIKE_H #define INSETFOOTLIKE_H -#include "insetcollapsable.h" +#include "InsetCollapsable.h" namespace lyx { diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index beac36cdcf..0b0e9dc533 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -1,5 +1,5 @@ /** - * \file insetgraphics.C + * \file InsetGraphics.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -49,8 +49,8 @@ TODO #include -#include "insets/insetgraphics.h" -#include "insets/render_graphic.h" +#include "insets/InsetGraphics.h" +#include "insets/RenderGraphic.h" #include "buffer.h" #include "BufferView.h" diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h index 49811a2da6..478d0ad5f1 100644 --- a/src/insets/insetgraphics.h +++ b/src/insets/insetgraphics.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetgraphics.h + * \file InsetGraphics.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,9 +13,9 @@ #ifndef INSET_GRAPHICS_H #define INSET_GRAPHICS_H -#include "inset.h" -#include "insetgraphicsParams.h" -#include "mailinset.h" +#include "Inset.h" +#include "InsetGraphicsParams.h" +#include "MailInset.h" #include #include diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C index 0cb1d2c1d3..c75872522f 100644 --- a/src/insets/insetgraphicsParams.C +++ b/src/insets/insetgraphicsParams.C @@ -1,5 +1,5 @@ /** - * \file insetgraphicsParams.C + * \file InsetGraphicsParams.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetgraphicsParams.h" +#include "InsetGraphicsParams.h" #include "debug.h" #include "lyx_main.h" // for use_gui diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h index 8b2a628424..2f4ca6e57e 100644 --- a/src/insets/insetgraphicsParams.h +++ b/src/insets/insetgraphicsParams.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetgraphicsParams.h + * \file InsetGraphicsParams.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/insets/insethfill.C b/src/insets/insethfill.C index defc3c011b..c2e386d458 100644 --- a/src/insets/insethfill.C +++ b/src/insets/insethfill.C @@ -1,5 +1,5 @@ /** - * \file insethfill.C + * \file InsetHFill.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insethfill.h" +#include "InsetHFill.h" #include "gettext.h" #include "support/std_ostream.h" diff --git a/src/insets/insethfill.h b/src/insets/insethfill.h index 04e46e2d65..a1d777b706 100644 --- a/src/insets/insethfill.h +++ b/src/insets/insethfill.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insethfill.h + * \file InsetHFill.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_HFILL_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 213cb3ad63..42fd20a706 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -1,5 +1,5 @@ /** - * \file insetinclude.C + * \file InsetInclude.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetinclude.h" +#include "InsetInclude.h" #include "buffer.h" #include "buffer_funcs.h" @@ -38,7 +38,7 @@ #include "graphics/PreviewImage.h" #include "graphics/PreviewLoader.h" -#include "insets/render_preview.h" +#include "insets/RenderPreview.h" #include "support/filetools.h" #include "support/lstrings.h" // contains diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h index 8267e1b6cd..f260f0dcbb 100644 --- a/src/insets/insetinclude.h +++ b/src/insets/insetinclude.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetinclude.h + * \file InsetInclude.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,10 +12,10 @@ #ifndef INSET_INCLUDE_H #define INSET_INCLUDE_H -#include "inset.h" -#include "insetcommandparams.h" -#include "render_button.h" -#include "mailinset.h" +#include "Inset.h" +#include "InsetCommandParams.h" +#include "RenderButton.h" +#include "MailInset.h" #include "support/filename.h" diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C index c175cf1ffd..846aae07db 100644 --- a/src/insets/insetindex.C +++ b/src/insets/insetindex.C @@ -1,5 +1,5 @@ /** - * \file insetindex.C + * \file InsetIndex.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -9,7 +9,7 @@ */ #include -#include "insetindex.h" +#include "InsetIndex.h" #include "dispatchresult.h" #include "funcrequest.h" diff --git a/src/insets/insetindex.h b/src/insets/insetindex.h index 638825412c..9a60c5d757 100644 --- a/src/insets/insetindex.h +++ b/src/insets/insetindex.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetindex.h + * \file InsetIndex.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_INDEX_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C index bdac8f43a1..d1ad08336c 100644 --- a/src/insets/insetlabel.C +++ b/src/insets/insetlabel.C @@ -1,5 +1,5 @@ /** - * \file insetlabel.C + * \file InsetLabel.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetlabel.h" +#include "InsetLabel.h" #include "buffer.h" #include "BufferView.h" diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h index f02117cbde..ba1fe4a533 100644 --- a/src/insets/insetlabel.h +++ b/src/insets/insetlabel.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetlabel.h + * \file InsetLabel.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSET_LABEL_H #define INSET_LABEL_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetline.C b/src/insets/insetline.C index de2b9996a1..f01a720b0f 100644 --- a/src/insets/insetline.C +++ b/src/insets/insetline.C @@ -1,5 +1,5 @@ /** - * \file insetline.C + * \file InsetLine.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetline.h" +#include "InsetLine.h" #include "debug.h" #include "LColor.h" diff --git a/src/insets/insetline.h b/src/insets/insetline.h index a383b3f0d2..ec57739c6c 100644 --- a/src/insets/insetline.h +++ b/src/insets/insetline.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetline.h + * \file InsetLine.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_LINE_H -#include "inset.h" +#include "Inset.h" namespace lyx { diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C index 160d8b6d2c..87492b4de7 100644 --- a/src/insets/insetmarginal.C +++ b/src/insets/insetmarginal.C @@ -1,5 +1,5 @@ /** - * \file insetmarginal.C + * \file InsetMarginal.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetmarginal.h" +#include "InsetMarginal.h" #include "gettext.h" #include "paragraph.h" diff --git a/src/insets/insetmarginal.h b/src/insets/insetmarginal.h index e4331b9faa..6fce74306a 100644 --- a/src/insets/insetmarginal.h +++ b/src/insets/insetmarginal.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetmarginal.h + * \file InsetMarginal.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #define INSETMARGINAL_H -#include "insetfootlike.h" +#include "InsetFootlike.h" namespace lyx { diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C index 320570f94d..0bba9e2a5d 100644 --- a/src/insets/insetnewline.C +++ b/src/insets/insetnewline.C @@ -1,5 +1,5 @@ /** - * \file insetnewline.C + * \file InsetNewline.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetnewline.h" +#include "InsetNewline.h" #include "debug.h" #include "LColor.h" diff --git a/src/insets/insetnewline.h b/src/insets/insetnewline.h index d0b76b94ca..adf37d4aa3 100644 --- a/src/insets/insetnewline.h +++ b/src/insets/insetnewline.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetnewline.h + * \file InsetNewline.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_NEWLINE_H -#include "inset.h" +#include "Inset.h" namespace lyx { diff --git a/src/insets/insetnomencl.C b/src/insets/insetnomencl.C index 767ff22e53..8c733897e8 100644 --- a/src/insets/insetnomencl.C +++ b/src/insets/insetnomencl.C @@ -1,5 +1,5 @@ /** - * \file insetnomencl.C + * \file InsetNomencl.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ */ #include -#include "insetnomencl.h" -#include "insetnote.h" +#include "InsetNomencl.h" +#include "InsetNote.h" #include "buffer.h" #include "dispatchresult.h" diff --git a/src/insets/insetnomencl.h b/src/insets/insetnomencl.h index 093d199223..db09d60829 100644 --- a/src/insets/insetnomencl.h +++ b/src/insets/insetnomencl.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetnomencl.h + * \file InsetNomencl.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #define INSET_NOMENCL_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index f2cfd74779..f643ce8c37 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -1,5 +1,5 @@ /** - * \file insetnote.C + * \file InsetNote.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "insetnote.h" +#include "InsetNote.h" #include "BufferView.h" #include "cursor.h" diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h index f241725a66..45e2347a27 100644 --- a/src/insets/insetnote.h +++ b/src/insets/insetnote.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetnote.h + * \file InsetNote.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,8 +12,8 @@ #ifndef INSETNOTE_H #define INSETNOTE_H -#include "insetcollapsable.h" -#include "mailinset.h" +#include "InsetCollapsable.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C index d1ee34b50d..40e155ead6 100644 --- a/src/insets/insetoptarg.C +++ b/src/insets/insetoptarg.C @@ -1,5 +1,5 @@ /** - * \file insetoptarg.C + * \file InsetOptArg.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetoptarg.h" +#include "InsetOptArg.h" #include "debug.h" #include "gettext.h" diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h index 0c6e163a66..d12eb75a9c 100644 --- a/src/insets/insetoptarg.h +++ b/src/insets/insetoptarg.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetoptarg.h + * \file InsetOptArg.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSETOPTARG_H -#include "insetcollapsable.h" +#include "InsetCollapsable.h" namespace lyx { diff --git a/src/insets/insetpagebreak.C b/src/insets/insetpagebreak.C index c8a1ddeab1..f606e1fd31 100644 --- a/src/insets/insetpagebreak.C +++ b/src/insets/insetpagebreak.C @@ -1,5 +1,5 @@ /** - * \file insetpagebreak.C + * \file InsetPageBreak.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetpagebreak.h" +#include "InsetPageBreak.h" #include "debug.h" #include "gettext.h" diff --git a/src/insets/insetpagebreak.h b/src/insets/insetpagebreak.h index 758e6f2292..24d2240034 100644 --- a/src/insets/insetpagebreak.h +++ b/src/insets/insetpagebreak.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetpagebreak.h + * \file InsetPageBreak.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_PAGEBREAK_H -#include "inset.h" +#include "Inset.h" #include "gettext.h" diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index 779b78d9e4..82be45c294 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -1,5 +1,5 @@ /** - * \file insetquotes.C + * \file InsetQuotes.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetquotes.h" +#include "InsetQuotes.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h index cbd2f5dcbf..9d52b0b945 100644 --- a/src/insets/insetquotes.h +++ b/src/insets/insetquotes.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetquotes.h + * \file InsetQuotes.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_QUOTES_H -#include "inset.h" +#include "Inset.h" #include "support/types.h" diff --git a/src/insets/insetref.C b/src/insets/insetref.C index 85dca1c865..92db373c22 100644 --- a/src/insets/insetref.C +++ b/src/insets/insetref.C @@ -1,5 +1,5 @@ /** - * \file insetref.C + * \file InsetRef.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -9,7 +9,7 @@ */ #include -#include "insetref.h" +#include "InsetRef.h" #include "buffer.h" #include "cursor.h" diff --git a/src/insets/insetref.h b/src/insets/insetref.h index a616a08e28..3d2e5c4a23 100644 --- a/src/insets/insetref.h +++ b/src/insets/insetref.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetref.h + * \file InsetRef.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSET_REF_H #define INSET_REF_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C index 343133c0fe..aeb3dd697e 100644 --- a/src/insets/insetspace.C +++ b/src/insets/insetspace.C @@ -1,5 +1,5 @@ /** - * \file insetspace.C + * \file InsetSpace.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #include -#include "insetspace.h" +#include "InsetSpace.h" #include "debug.h" #include "LColor.h" diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h index b8bd438301..200996051b 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. * @@ -16,7 +16,7 @@ #define INSET_SPACE_H -#include "inset.h" +#include "Inset.h" namespace lyx { diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C index 98f07bcae0..361554628d 100644 --- a/src/insets/insetspecialchar.C +++ b/src/insets/insetspecialchar.C @@ -1,5 +1,5 @@ /** - * \file insetspecialchar.C + * \file InsetSpecialChar.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "insetspecialchar.h" +#include "InsetSpecialChar.h" #include "debug.h" #include "LaTeXFeatures.h" diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h index 91655f3cf9..967df46a9d 100644 --- a/src/insets/insetspecialchar.h +++ b/src/insets/insetspecialchar.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetspecialchar.h + * \file InsetSpecialChar.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -15,7 +15,7 @@ #define INSET_SPECIALCHAR_H -#include "inset.h" +#include "Inset.h" namespace lyx { diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 89a307d9e5..c1b140534c 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -1,5 +1,5 @@ /** - * \file insettabular.C + * \file InsetTabular.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insettabular.h" +#include "InsetTabular.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index 9678385732..537043b05b 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insettabular.h + * \file InsetTabular.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -32,9 +32,9 @@ #ifndef INSETTABULAR_H #define INSETTABULAR_H -#include "inset.h" +#include "Inset.h" #include "tabular.h" -#include "mailinset.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/insettext.C b/src/insets/insettext.C index a782cc56f5..e54771a656 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -1,5 +1,5 @@ /** - * \file insettext.C + * \file InsetText.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "insettext.h" -#include "insetnewline.h" +#include "InsetText.h" +#include "InsetNewline.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insettext.h b/src/insets/insettext.h index 3b21200f3d..48c72a85f2 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insettext.h + * \file InsetText.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSETTEXT_H #define INSETTEXT_H -#include "inset.h" +#include "Inset.h" #include "RowList_fwd.h" #include "lyxfont.h" #include "lyxtext.h" diff --git a/src/insets/insettheorem.C b/src/insets/insettheorem.C index 4273ffecf6..dddd660a11 100644 --- a/src/insets/insettheorem.C +++ b/src/insets/insettheorem.C @@ -1,5 +1,5 @@ /** - * \file insettheorem.C + * \file InsetTheorem.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "insettheorem.h" -#include "insets/insettext.h" +#include "InsetTheorem.h" +#include "insets/InsetText.h" #include "debug.h" #include "gettext.h" diff --git a/src/insets/insettheorem.h b/src/insets/insettheorem.h index 2e1d8d59b1..e125f70f66 100644 --- a/src/insets/insettheorem.h +++ b/src/insets/insettheorem.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insettheorem.h + * \file InsetTheorem.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define InsetTheorem_H -#include "insetcollapsable.h" +#include "InsetCollapsable.h" namespace lyx { diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C index bf4268674d..bb4367ed0c 100644 --- a/src/insets/insettoc.C +++ b/src/insets/insettoc.C @@ -1,5 +1,5 @@ /** - * \file insettoc.C + * \file InsetTOC.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insettoc.h" +#include "InsetTOC.h" #include "buffer.h" #include "dispatchresult.h" diff --git a/src/insets/insettoc.h b/src/insets/insettoc.h index 81b135c9b1..334a0a33e0 100644 --- a/src/insets/insettoc.h +++ b/src/insets/insettoc.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insettoc.h + * \file InsetTOC.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef INSET_TOC_H #define INSET_TOC_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C index eb67e6e117..8ad3a7ea2e 100644 --- a/src/insets/inseturl.C +++ b/src/insets/inseturl.C @@ -1,5 +1,5 @@ /** - * \file inseturl.C + * \file InsetUrl.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "inseturl.h" +#include "InsetUrl.h" #include "dispatchresult.h" #include "funcrequest.h" diff --git a/src/insets/inseturl.h b/src/insets/inseturl.h index 4209306459..f60b11cf39 100644 --- a/src/insets/inseturl.h +++ b/src/insets/inseturl.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file inseturl.h + * \file InsetUrl.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define INSET_URL_H -#include "insetcommand.h" +#include "InsetCommand.h" namespace lyx { diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C index 72e152d018..95b8b70b4c 100644 --- a/src/insets/insetvspace.C +++ b/src/insets/insetvspace.C @@ -1,5 +1,5 @@ /** - * \file insetvspace.C + * \file InsetVSpace.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "insetvspace.h" +#include "InsetVSpace.h" #include "buffer.h" #include "cursor.h" diff --git a/src/insets/insetvspace.h b/src/insets/insetvspace.h index abe4994809..12c6f12335 100644 --- a/src/insets/insetvspace.h +++ b/src/insets/insetvspace.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetvspace.h + * \file InsetVSpace.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,9 +13,9 @@ #define INSET_VSPACE_H -#include "inset.h" +#include "Inset.h" #include "vspace.h" -#include "mailinset.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C index 8bfec5a910..d15adbf3ec 100644 --- a/src/insets/insetwrap.C +++ b/src/insets/insetwrap.C @@ -1,5 +1,5 @@ /** - * \file insetwrap.C + * \file InsetWrap.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "insetwrap.h" +#include "InsetWrap.h" #include "buffer.h" #include "bufferparams.h" diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h index 3a6f8b3b8d..9bf84475e3 100644 --- a/src/insets/insetwrap.h +++ b/src/insets/insetwrap.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file insetwrap.h + * \file InsetWrap.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,9 +12,9 @@ #ifndef INSETWRAP_H #define INSETWRAP_H -#include "insetcollapsable.h" +#include "InsetCollapsable.h" #include "lyxlength.h" -#include "mailinset.h" +#include "MailInset.h" namespace lyx { diff --git a/src/insets/mailinset.C b/src/insets/mailinset.C index 22db2e8171..964228a923 100644 --- a/src/insets/mailinset.C +++ b/src/insets/mailinset.C @@ -1,5 +1,5 @@ /** - * \file mailinset.C + * \file MailInset.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "mailinset.h" +#include "MailInset.h" #include "BufferView.h" #include "debug.h" diff --git a/src/insets/mailinset.h b/src/insets/mailinset.h index 3d4459b92b..f19249b22f 100644 --- a/src/insets/mailinset.h +++ b/src/insets/mailinset.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file mailinset.h + * \file MailInset.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/insets/pch.h b/src/insets/pch.h index d04e6b08bc..c8f624adfe 100644 --- a/src/insets/pch.h +++ b/src/insets/pch.h @@ -1,6 +1,6 @@ #include -#include "insetbase.h" +#include "InsetBase.h" #include #include diff --git a/src/insets/render_base.h b/src/insets/render_base.h index 4aea454698..28876e45f5 100644 --- a/src/insets/render_base.h +++ b/src/insets/render_base.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file render_base.h + * \file RenderBase.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -9,8 +9,8 @@ * Full author contact details are available in file CREDITS. */ -#ifndef RENDER_BASE_H -#define RENDER_BASE_H +#ifndef RENDERBASE_H +#define RENDERBASE_H #include "dimension.h" @@ -64,4 +64,4 @@ protected: } // namespace lyx -#endif // NOT RENDER_BASE_H +#endif // NOT RENDERBASE_H diff --git a/src/insets/render_button.C b/src/insets/render_button.C index a20b378a90..efcc1e7a42 100644 --- a/src/insets/render_button.C +++ b/src/insets/render_button.C @@ -1,5 +1,5 @@ /** - * \file render_button.C + * \file RenderButton.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "render_button.h" +#include "RenderButton.h" #include "LColor.h" #include "metricsinfo.h" diff --git a/src/insets/render_button.h b/src/insets/render_button.h index 244180431b..a828054c82 100644 --- a/src/insets/render_button.h +++ b/src/insets/render_button.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file render_button.h + * \file RenderButton.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -9,10 +9,10 @@ * Full author contact details are available in file CREDITS. */ -#ifndef RENDER_BUTTON_H -#define RENDER_BUTTON_H +#ifndef RENDERBUTTON_H +#define RENDERBUTTON_H -#include "render_base.h" +#include "RenderBase.h" #include "box.h" #include "support/docstring.h" @@ -53,4 +53,4 @@ private: } // namespace lyx -#endif // NOT RENDER_BUTTON_H +#endif // NOT RENDERBUTTON_H diff --git a/src/insets/render_graphic.C b/src/insets/render_graphic.C index 513b602d18..c30a0741ce 100644 --- a/src/insets/render_graphic.C +++ b/src/insets/render_graphic.C @@ -1,5 +1,5 @@ /** - * \file render_graphic.C + * \file RenderGraphic.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "render_graphic.h" +#include "RenderGraphic.h" -#include "insets/inset.h" +#include "insets/Inset.h" #include "gettext.h" #include "LColor.h" diff --git a/src/insets/render_graphic.h b/src/insets/render_graphic.h index 182e02f2d3..0d0727b3b3 100644 --- a/src/insets/render_graphic.h +++ b/src/insets/render_graphic.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file render_graphic.h + * \file RenderGraphic.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -9,10 +9,10 @@ * Full author contact details are available in file CREDITS. */ -#ifndef RENDER_GRAPHIC_H -#define RENDER_GRAPHIC_H +#ifndef RENDERGRAPHIC_H +#define RENDERGRAPHIC_H -#include "render_base.h" +#include "RenderBase.h" #include "graphics/GraphicsLoader.h" #include "graphics/GraphicsParams.h" @@ -52,4 +52,4 @@ private: } // namespace lyx -#endif // NOT RENDER_GRAPHIC_H +#endif // NOT RENDERGRAPHIC_H diff --git a/src/insets/render_preview.C b/src/insets/render_preview.C index 5badea260d..54c0f7d7c4 100644 --- a/src/insets/render_preview.C +++ b/src/insets/render_preview.C @@ -1,5 +1,5 @@ /** - * \file render_preview.C + * \file RenderPreview.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "insets/render_preview.h" -#include "insets/inset.h" +#include "insets/RenderPreview.h" +#include "insets/Inset.h" #include "BufferView.h" #include "dimension.h" diff --git a/src/insets/render_preview.h b/src/insets/render_preview.h index 52bb7ffe04..dc0a723282 100644 --- a/src/insets/render_preview.h +++ b/src/insets/render_preview.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file render_preview.h + * \file RenderPreview.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,10 +13,10 @@ * methods. The Inset would own an instance of this daughter class. */ -#ifndef RENDER_PREVIEW_H -#define RENDER_PREVIEW_H +#ifndef RENDERPREVIEW_H +#define RENDERPREVIEW_H -#include "render_base.h" +#include "RenderBase.h" #include "support/FileMonitor.h" #include "support/docstring.h" diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 7a05ca4325..0f6588ebe9 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -61,18 +61,18 @@ #include "ParagraphParameters.h" #include "undo.h" -#include "insets/insetbox.h" -#include "insets/insetbranch.h" -#include "insets/insetcommand.h" -#include "insets/insetert.h" -#include "insets/insetexternal.h" -#include "insets/insetfloat.h" -#include "insets/insetgraphics.h" -#include "insets/insetinclude.h" -#include "insets/insetnote.h" -#include "insets/insettabular.h" -#include "insets/insetvspace.h" -#include "insets/insetwrap.h" +#include "insets/InsetBox.h" +#include "insets/InsetBranch.h" +#include "insets/InsetCommand.h" +#include "insets/InsetERT.h" +#include "insets/InsetExternal.h" +#include "insets/InsetFloat.h" +#include "insets/InsetGraphics.h" +#include "insets/InsetInclude.h" +#include "insets/InsetNote.h" +#include "insets/InsetTabular.h" +#include "insets/InsetVSpace.h" +#include "insets/InsetWrap.h" #include "frontends/Application.h" #include "frontends/Alert.h" diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h index 6602d98b9c..8e6988aadd 100644 --- a/src/mathed/InsetMath.h +++ b/src/mathed/InsetMath.h @@ -15,7 +15,7 @@ #include "MathData.h" -#include "insets/insetbase.h" +#include "insets/InsetBase.h" namespace lyx { diff --git a/src/mathed/InsetMathCommand.h b/src/mathed/InsetMathCommand.h index e2a114304d..d469f1e08e 100644 --- a/src/mathed/InsetMathCommand.h +++ b/src/mathed/InsetMathCommand.h @@ -15,7 +15,7 @@ #include "InsetMathNest.h" -#include "insets/render_button.h" +#include "insets/RenderButton.h" namespace lyx { diff --git a/src/mathed/InsetMathGrid.C b/src/mathed/InsetMathGrid.C index 23f0f6d70d..d88ebde294 100644 --- a/src/mathed/InsetMathGrid.C +++ b/src/mathed/InsetMathGrid.C @@ -28,7 +28,7 @@ #include "frontends/Clipboard.h" #include "frontends/Painter.h" -#include "insets/mailinset.h" +#include "insets/MailInset.h" #include "support/lstrings.h" diff --git a/src/mathed/InsetMathHull.C b/src/mathed/InsetMathHull.C index 60f622b0eb..0b91b78d47 100644 --- a/src/mathed/InsetMathHull.C +++ b/src/mathed/InsetMathHull.C @@ -46,8 +46,8 @@ #include "TextPainter.h" #include "undo.h" -#include "insets/render_preview.h" -#include "insets/insetlabel.h" +#include "insets/RenderPreview.h" +#include "insets/InsetLabel.h" #include "graphics/PreviewImage.h" #include "graphics/PreviewLoader.h" diff --git a/src/mathed/InsetMathRef.C b/src/mathed/InsetMathRef.C index 63afad169a..3b522fee9c 100644 --- a/src/mathed/InsetMathRef.C +++ b/src/mathed/InsetMathRef.C @@ -26,7 +26,7 @@ #include "outputparams.h" #include "sgml.h" -#include "insets/insetcommand.h" +#include "insets/InsetCommand.h" namespace lyx { diff --git a/src/mathed/MathFactory.C b/src/mathed/MathFactory.C index 62bcef30db..1d22a70cc1 100644 --- a/src/mathed/MathFactory.C +++ b/src/mathed/MathFactory.C @@ -56,7 +56,7 @@ #include "debug.h" -#include "insets/insetcommand.h" +#include "insets/InsetCommand.h" #include "support/filetools.h" // LibFileSearch #include "support/lstrings.h" diff --git a/src/output_docbook.C b/src/output_docbook.C index 2778dde86e..233fd42ef4 100644 --- a/src/output_docbook.C +++ b/src/output_docbook.C @@ -25,7 +25,7 @@ #include "ParagraphParameters.h" #include "sgml.h" -#include "insets/insetcommand.h" +#include "insets/InsetCommand.h" #include "support/lstrings.h" #include "support/lyxlib.h" diff --git a/src/output_latex.C b/src/output_latex.C index f1f43f48a5..0c8a07cbb2 100644 --- a/src/output_latex.C +++ b/src/output_latex.C @@ -25,8 +25,8 @@ #include "texrow.h" #include "vspace.h" -#include "insets/insetbibitem.h" -#include "insets/insetoptarg.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetOptArg.h" #include "support/lstrings.h" diff --git a/src/paragraph.C b/src/paragraph.C index ea5ab78684..6cf4e2380a 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -44,8 +44,8 @@ #include "frontends/FontMetrics.h" -#include "insets/insetbibitem.h" -#include "insets/insetoptarg.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetOptArg.h" #include "support/lstrings.h" #include "support/textutils.h" diff --git a/src/paragraph.h b/src/paragraph.h index 0e23ea727e..5d1658c7d0 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -22,7 +22,7 @@ #include "lyxlayout_ptr_fwd.h" #include "RowList_fwd.h" -#include "insets/insetbase.h" // only for InsetBase::Code +#include "insets/InsetBase.h" // only for InsetBase::Code namespace lyx { diff --git a/src/pariterator.C b/src/pariterator.C index 90a3a82b2f..ee5e07fd99 100644 --- a/src/pariterator.C +++ b/src/pariterator.C @@ -15,7 +15,7 @@ #include "paragraph.h" #include "lyxtext.h" -#include "insets/inset.h" +#include "insets/Inset.h" namespace lyx { diff --git a/src/rowpainter.C b/src/rowpainter.C index 8181a7a306..f6b572e7e7 100644 --- a/src/rowpainter.C +++ b/src/rowpainter.C @@ -36,7 +36,7 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" -#include "insets/insettext.h" +#include "insets/InsetText.h" #include "support/textutils.h" @@ -176,7 +176,7 @@ void RowPainter::paintInset(pos_type const pos, LyXFont const & font) BOOST_ASSERT(inset); PainterInfo pi(const_cast(&bv_), pain_); // FIXME: We should always use font, see documentation of - // noFontChange() in insetbase.h. + // noFontChange() in InsetBase.h. pi.base.font = inset->noFontChange() ? bv_.buffer()->params().getFont() : font; diff --git a/src/tabular.C b/src/tabular.C index 13873a5bfa..bf6c16618f 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -30,7 +30,7 @@ #include "paragraph.h" #include "paragraph_funcs.h" -#include "insets/insettabular.h" +#include "insets/InsetTabular.h" #include "support/lstrings.h" #include "support/convert.h" diff --git a/src/tabular.h b/src/tabular.h index b972d0aa3c..d460414511 100644 --- a/src/tabular.h +++ b/src/tabular.h @@ -16,7 +16,7 @@ #define TABULAR_H #include "lyxlength.h" -#include "insets/insettext.h" +#include "insets/InsetText.h" #include diff --git a/src/text.C b/src/text.C index d2826eb0cd..3a0f2d273b 100644 --- a/src/text.C +++ b/src/text.C @@ -54,17 +54,17 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" -#include "insets/insettext.h" -#include "insets/insetbibitem.h" -#include "insets/insetcaption.h" -#include "insets/insethfill.h" -#include "insets/insetline.h" -#include "insets/insetnewline.h" -#include "insets/insetpagebreak.h" -#include "insets/insetoptarg.h" -#include "insets/insetspace.h" -#include "insets/insetspecialchar.h" -#include "insets/insettabular.h" +#include "insets/InsetText.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetCaption.h" +#include "insets/InsetHFill.h" +#include "insets/InsetLine.h" +#include "insets/InsetNewline.h" +#include "insets/InsetPageBreak.h" +#include "insets/InsetOptArg.h" +#include "insets/InsetSpace.h" +#include "insets/InsetSpecialChar.h" +#include "insets/InsetTabular.h" #include "support/lstrings.h" #include "support/textutils.h" diff --git a/src/text2.C b/src/text2.C index d8a351fc3b..a570b387d4 100644 --- a/src/text2.C +++ b/src/text2.C @@ -53,7 +53,7 @@ #include "frontends/FontMetrics.h" -#include "insets/insetenv.h" +#include "insets/InsetEnv.h" #include "mathed/InsetMathHull.h" diff --git a/src/text3.C b/src/text3.C index 8cb97ba607..b94a12a2f6 100644 --- a/src/text3.C +++ b/src/text3.C @@ -51,12 +51,12 @@ #include "frontends/Clipboard.h" #include "frontends/Selection.h" -#include "insets/insetcommand.h" -#include "insets/insetfloatlist.h" -#include "insets/insetnewline.h" -#include "insets/insetquotes.h" -#include "insets/insetspecialchar.h" -#include "insets/insettext.h" +#include "insets/InsetCommand.h" +#include "insets/InsetFloatList.h" +#include "insets/InsetNewline.h" +#include "insets/InsetQuotes.h" +#include "insets/InsetSpecialChar.h" +#include "insets/InsetText.h" #include "support/lstrings.h" #include "support/lyxlib.h" diff --git a/src/undo.C b/src/undo.C index ed523a45ce..24fc399541 100644 --- a/src/undo.C +++ b/src/undo.C @@ -28,7 +28,7 @@ #include "mathed/MathSupport.h" #include "mathed/MathData.h" -#include "insets/inset.h" +#include "insets/Inset.h" #include