From e36fba33abc2e80599b164d91e90e1558225576d Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Sat, 28 Apr 2007 20:44:46 +0000 Subject: [PATCH] Last (?) batch of renames: src/frontends/Alert.h src/frontends/alert.h src/frontends/Alert.cpp src/frontends/alert.cpp src/frontends/Alert_pimpl.cpp src/frontends/alert_pimpl.cpp src/frontends/qt4/Alert_pimpl.cpp src/frontends/qt4/alert_pimpl.cpp src/frontends/controllers/ButtonPolicies.cpp src/frontends/controllers/ButtonPolicy.cpp src/frontends/controllers/ButtonPolicies.h src/frontends/controllers/ButtonPolicy.h src/insets/InsetEnv.cpp src/insets/InsetEnvironment.cpp src/insets/InsetEnv.h src/insets/InsetEnvironment.h src/mathed/MathMacroTable.h src/mathed/MacroTable.h src/mathed/MathMacroTable.cpp src/mathed/MacroTable.cpp src/lyx_cb.h src/callback.h src/lyx_cb.cpp src/callback.cpp src/UpdateFlags.h src/update_flags.h git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18076 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/scons_manifest.py | 24 +++++++++---------- po/POTFILES.in | 6 ++--- src/Buffer.cpp | 4 ++-- src/BufferList.cpp | 4 ++-- src/BufferParams.cpp | 2 +- src/BufferView.cpp | 4 ++-- src/BufferView.h | 2 +- src/Converter.cpp | 2 +- src/Cursor.cpp | 2 +- src/DispatchResult.h | 2 +- src/Exporter.cpp | 2 +- src/Format.cpp | 2 +- src/Importer.cpp | 4 ++-- src/LyX.cpp | 4 ++-- src/LyXFunc.cpp | 4 ++-- src/LyXVC.cpp | 2 +- src/Makefile.am | 6 ++--- src/buffer_funcs.cpp | 2 +- src/bufferview_funcs.cpp | 2 +- src/{lyx_cb.cpp => callback.cpp} | 6 ++--- src/{lyx_cb.h => callback.h} | 6 ++--- src/factory.cpp | 4 ++-- src/frontends/Dialogs.cpp | 2 +- src/frontends/LyXView.cpp | 2 +- src/frontends/Makefile.am | 4 ++-- src/frontends/{Alert.cpp => alert.cpp} | 4 ++-- src/frontends/{Alert.h => alert.h} | 2 +- src/frontends/controllers/BCView.tmpl | 2 +- src/frontends/controllers/ButtonController.h | 2 +- .../{ButtonPolicies.cpp => ButtonPolicy.cpp} | 4 ++-- .../{ButtonPolicies.h => ButtonPolicy.h} | 6 ++--- .../controllers/ControlSpellchecker.cpp | 2 +- src/frontends/controllers/Makefile.am | 4 ++-- .../controllers/frontend_helpers.cpp | 2 +- src/frontends/qt4/Action.cpp | 2 +- src/frontends/qt4/GuiView.cpp | 2 +- src/frontends/qt4/Makefile.am | 2 +- src/frontends/qt4/QBibtex.cpp | 2 +- src/frontends/qt4/QPrefs.cpp | 2 +- src/frontends/qt4/Validator.cpp | 2 +- .../qt4/{Alert_pimpl.cpp => alert_pimpl.cpp} | 4 ++-- src/insets/InsetBibtex.cpp | 2 +- src/insets/InsetERT.cpp | 2 +- .../{InsetEnv.cpp => InsetEnvironment.cpp} | 4 ++-- src/insets/{InsetEnv.h => InsetEnvironment.h} | 2 +- src/insets/InsetGraphics.cpp | 2 +- src/insets/InsetInclude.cpp | 2 +- src/insets/InsetTabular.cpp | 4 ++-- src/insets/InsetText.cpp | 2 +- src/insets/Makefile.am | 4 ++-- src/lyxfind.cpp | 2 +- src/mathed/InsetFormulaMacro.cpp | 2 +- .../{MathMacroTable.cpp => MacroTable.cpp} | 4 ++-- src/mathed/{MathMacroTable.h => MacroTable.h} | 2 +- src/mathed/Makefile.am | 4 ++-- src/mathed/MathData.cpp | 2 +- src/mathed/MathFactory.cpp | 2 +- src/mathed/MathMacro.h | 2 +- src/mathed/MathMacroTemplate.h | 2 +- src/output.cpp | 2 +- src/text2.cpp | 2 +- src/{UpdateFlags.h => update_flags.h} | 2 +- 62 files changed, 100 insertions(+), 100 deletions(-) rename src/{lyx_cb.cpp => callback.cpp} (99%) rename src/{lyx_cb.h => callback.h} (94%) rename src/frontends/{Alert.cpp => alert.cpp} (98%) rename src/frontends/{Alert.h => alert.h} (99%) rename src/frontends/controllers/{ButtonPolicies.cpp => ButtonPolicy.cpp} (99%) rename src/frontends/controllers/{ButtonPolicies.h => ButtonPolicy.h} (99%) rename src/frontends/qt4/{Alert_pimpl.cpp => alert_pimpl.cpp} (98%) rename src/insets/{InsetEnv.cpp => InsetEnvironment.cpp} (97%) rename src/insets/{InsetEnv.h => InsetEnvironment.h} (98%) rename src/mathed/{MathMacroTable.cpp => MacroTable.cpp} (98%) rename src/mathed/{MathMacroTable.h => MacroTable.h} (98%) rename src/{UpdateFlags.h => update_flags.h} (96%) diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index c8d1c9948f..ee7c7514b3 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -234,7 +234,7 @@ src_mathed_header_files = Split(''' MathFactory.h MathGridInfo.h MathMacroArgument.h - MathMacroTable.h + MacroTable.h MathMacroTemplate.h MathParser.h ReplaceData.h @@ -314,7 +314,7 @@ src_mathed_files = Split(''' MathExtern.cpp MathFactory.cpp MathMacroArgument.cpp - MathMacroTable.cpp + MacroTable.cpp MathMacroTemplate.cpp MathParser.cpp MathStream.cpp @@ -339,7 +339,7 @@ src_insets_header_files = Split(''' InsetCollapsable.h InsetCommand.h InsetCommandParams.h - InsetEnv.h + InsetEnvironment.h InsetERT.h InsetExternal.h InsetFloat.h @@ -397,7 +397,7 @@ src_insets_files = Split(''' InsetCollapsable.cpp InsetCommand.cpp InsetCommandParams.cpp - InsetEnv.cpp + InsetEnvironment.cpp InsetERT.cpp InsetExternal.cpp InsetFloat.cpp @@ -435,7 +435,7 @@ src_insets_files = Split(''' src_frontends_header_files = Split(''' - Alert.h + alert.h Alert_pimpl.h Application.h Clipboard.h @@ -460,7 +460,7 @@ src_frontends_header_files = Split(''' src_frontends_files = Split(''' - Alert.cpp + alert.cpp Application.cpp Dialogs.cpp LyXView.cpp @@ -504,7 +504,7 @@ src_graphics_files = Split(''' src_frontends_controllers_header_files = Split(''' BCView.h ButtonController.h - ButtonPolicies.h + ButtonPolicy.h ControlAboutlyx.h ControlBibtex.h ControlBox.h @@ -549,7 +549,7 @@ src_frontends_controllers_header_files = Split(''' src_frontends_controllers_files = Split(''' BCView.cpp ButtonController.cpp - ButtonPolicies.cpp + ButtonPolicy.cpp ControlAboutlyx.cpp ControlBibtex.cpp ControlBox.cpp @@ -825,7 +825,7 @@ src_frontends_qt4_header_files = Split(''' src_frontends_qt4_files = Split(''' Action.cpp - Alert_pimpl.cpp + alert_pimpl.cpp BulletsModule.cpp ColorCache.cpp Dialogs.cpp @@ -996,7 +996,7 @@ src_header_files = Split(''' Thesaurus.h TocBackend.h ToolbarBackend.h - UpdateFlags.h + update_flags.h Variables.h WordLangTuple.h ASpell_local.h @@ -1035,7 +1035,7 @@ src_header_files = Split(''' layout.h lengthcommon.h lfuns.h - lyx_cb.h + callback.h LyX.h lyx_sty.h lyxfind.h @@ -1138,7 +1138,7 @@ src_pre_files = Split(''' KeySequence.cpp Language.cpp lengthcommon.cpp - lyx_cb.cpp + callback.cpp LyX.cpp lyx_sty.cpp lyxfind.cpp diff --git a/po/POTFILES.in b/po/POTFILES.in index a50bff47cc..335c38ccca 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -41,7 +41,7 @@ src/frontends/controllers/ControlPrint.cpp src/frontends/controllers/ControlSpellchecker.cpp src/frontends/controllers/ControlToc.cpp src/frontends/controllers/frontend_helpers.cpp -src/frontends/qt4/Alert_pimpl.cpp +src/frontends/qt4/alert_pimpl.cpp src/frontends/qt4/BulletsModule.cpp src/frontends/qt4/Dialogs.cpp src/frontends/qt4/FileDialog.cpp @@ -93,7 +93,7 @@ src/insets/InsetCharStyle.cpp src/insets/InsetCommand.cpp src/insets/InsetCommandParams.cpp src/insets/InsetERT.cpp -src/insets/InsetEnv.cpp +src/insets/InsetEnvironment.cpp src/insets/InsetExternal.cpp src/insets/InsetFloat.cpp src/insets/InsetFloatList.cpp @@ -118,7 +118,7 @@ src/insets/InsetWrap.cpp src/insets/RenderGraphic.cpp src/insets/RenderPreview.cpp src/lengthcommon.cpp -src/lyx_cb.cpp +src/callback.cpp src/lyxfind.cpp src/mathed/InsetFormulaMacro.cpp src/mathed/InsetMathAMSArray.cpp diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 2216084ed1..1ab2f17814 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -56,10 +56,10 @@ #include "insets/InsetText.h" #include "mathed/MathMacroTemplate.h" -#include "mathed/MathMacroTable.h" +#include "mathed/MacroTable.h" #include "mathed/MathSupport.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "graphics/Previews.h" diff --git a/src/BufferList.cpp b/src/BufferList.cpp index 0a776240e6..bdcfc55b67 100644 --- a/src/BufferList.cpp +++ b/src/BufferList.cpp @@ -18,13 +18,13 @@ #include "debug.h" #include "gettext.h" #include "Session.h" -#include "lyx_cb.h" +#include "callback.h" #include "LyX.h" #include "output_latex.h" #include "Paragraph.h" #include "ParagraphList.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/filetools.h" #include "support/Package.h" diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index fd8d964a18..dad14ae1d7 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -36,7 +36,7 @@ #include "TexRow.h" #include "VSpace.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/lyxalgo.h" // for lyx::count #include "support/convert.h" diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 6a1d0da6a4..62b91fae76 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -35,7 +35,7 @@ #include "InsetIterator.h" #include "Language.h" #include "LaTeXFeatures.h" -#include "lyx_cb.h" // added for Dispatch functions +#include "callback.h" // added for Dispatch functions #include "LyX.h" #include "lyxfind.h" #include "LyXFunc.h" @@ -60,7 +60,7 @@ #include "insets/InsetRef.h" #include "insets/InsetText.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/FileDialog.h" #include "frontends/FontMetrics.h" diff --git a/src/BufferView.h b/src/BufferView.h index 5ef1af2db1..3929c68892 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -19,7 +19,7 @@ #include "Cursor.h" #include "MetricsInfo.h" #include "TextMetrics.h" -#include "UpdateFlags.h" +#include "update_flags.h" #include "support/types.h" diff --git a/src/Converter.cpp b/src/Converter.cpp index 523be646f5..cd6ec60146 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -23,7 +23,7 @@ #include "LaTeX.h" #include "Mover.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/filetools.h" #include "support/lyxlib.h" diff --git a/src/Cursor.cpp b/src/Cursor.cpp index 7c6e64c903..134017e865 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -39,7 +39,7 @@ #include "mathed/MathData.h" #include "mathed/InsetMath.h" #include "mathed/InsetMathScript.h" -#include "mathed/MathMacroTable.h" +#include "mathed/MacroTable.h" #include "support/limited_stack.h" diff --git a/src/DispatchResult.h b/src/DispatchResult.h index 560fc0d1bc..3ce0c54065 100644 --- a/src/DispatchResult.h +++ b/src/DispatchResult.h @@ -13,7 +13,7 @@ #ifndef DISPATCH_RESULT_H #define DISPATCH_RESULT_H -#include "UpdateFlags.h" +#include "update_flags.h" namespace lyx { diff --git a/src/Exporter.cpp b/src/Exporter.cpp index f8bd191af8..0cf67d4785 100644 --- a/src/Exporter.cpp +++ b/src/Exporter.cpp @@ -28,7 +28,7 @@ #include "Mover.h" #include "output_plaintext.h" #include "OutputParams.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/filetools.h" #include "support/lyxlib.h" diff --git a/src/Format.cpp b/src/Format.cpp index bddaf0948e..989e190023 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -19,7 +19,7 @@ #include "LyXServerSocket.h" #include "frontends/Application.h" -#include "frontends/Alert.h" //to be removed? +#include "frontends/alert.h" //to be removed? #include "support/filetools.h" #include "support/lstrings.h" diff --git a/src/Importer.cpp b/src/Importer.cpp index 63c92a4a28..8bd7bccb64 100644 --- a/src/Importer.cpp +++ b/src/Importer.cpp @@ -17,11 +17,11 @@ #include "Format.h" #include "frontends/LyXView.h" #include "FuncRequest.h" -#include "lyx_cb.h" +#include "callback.h" #include "support/filetools.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "gettext.h" #include "BufferView.h" diff --git a/src/LyX.cpp b/src/LyX.cpp index 1a65c497b9..77d5b179e1 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -31,7 +31,7 @@ #include "Language.h" #include "Session.h" #include "Color.h" -#include "lyx_cb.h" +#include "callback.h" #include "LyXAction.h" #include "LyXFunc.h" #include "Lexer.h" @@ -44,7 +44,7 @@ #include "Mover.h" #include "ToolbarBackend.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/Application.h" #include "frontends/Gui.h" #include "frontends/LyXView.h" diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp index 1ea7b4acfc..f13a2970dc 100644 --- a/src/LyXFunc.cpp +++ b/src/LyXFunc.cpp @@ -47,7 +47,7 @@ #include "Color.h" #include "Session.h" #include "LyX.h" -#include "lyx_cb.h" +#include "callback.h" #include "LyXAction.h" #include "lyxfind.h" #include "Lexer.h" @@ -75,7 +75,7 @@ #include "insets/InsetWrap.h" #include "frontends/Application.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/Dialogs.h" #include "frontends/FileDialog.h" #include "frontends/FontLoader.h" diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 8d72962ed4..cb82337f72 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -21,7 +21,7 @@ #include "Buffer.h" #include "gettext.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/filetools.h" #include "support/lyxlib.h" diff --git a/src/Makefile.am b/src/Makefile.am index 8301b89135..deee6c157d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -167,8 +167,8 @@ lyx_SOURCES = \ lfuns.h \ LyXAction.cpp \ LyXAction.h \ - lyx_cb.cpp \ - lyx_cb.h \ + callback.cpp \ + callback.h \ LyX.cpp \ lyxfind.cpp \ lyxfind.h \ @@ -265,7 +265,7 @@ lyx_SOURCES = \ TransState.h \ Undo.cpp \ Undo.h \ - UpdateFlags.h \ + update_flags.h \ VCBackend.cpp \ VCBackend.h \ version.C \ diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp index aa15b8963f..7578bc997e 100644 --- a/src/buffer_funcs.cpp +++ b/src/buffer_funcs.cpp @@ -35,7 +35,7 @@ #include "TocBackend.h" #include "VCBackend.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "insets/InsetBibitem.h" #include "insets/InsetCaption.h" diff --git a/src/bufferview_funcs.cpp b/src/bufferview_funcs.cpp index 86a1f17b97..b8358ab8ad 100644 --- a/src/bufferview_funcs.cpp +++ b/src/bufferview_funcs.cpp @@ -31,7 +31,7 @@ #include "ParagraphParameters.h" #include "ParIterator.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "insets/InsetCommand.h" #include "insets/InsetText.h" diff --git a/src/lyx_cb.cpp b/src/callback.cpp similarity index 99% rename from src/lyx_cb.cpp rename to src/callback.cpp index 447498316b..2a51d3ae00 100644 --- a/src/lyx_cb.cpp +++ b/src/callback.cpp @@ -1,5 +1,5 @@ /** - * \file lyx_cb.cpp + * \file callback.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #include -#include "lyx_cb.h" +#include "callback.h" #include "Buffer.h" #include "BufferList.h" @@ -33,7 +33,7 @@ #include "Paragraph.h" #include "Undo.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/Application.h" #include "frontends/FileDialog.h" #include "frontends/LyXView.h" diff --git a/src/lyx_cb.h b/src/callback.h similarity index 94% rename from src/lyx_cb.h rename to src/callback.h index f320a1ffe0..6ce3858b72 100644 --- a/src/lyx_cb.h +++ b/src/callback.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file lyx_cb.h + * \file callback.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 LYX_CB_H -#define LYX_CB_H +#ifndef CALLBACK_H +#define CALLBACK_H #include "support/docstring.h" diff --git a/src/factory.cpp b/src/factory.cpp index 3337399431..1343dfb50b 100644 --- a/src/factory.cpp +++ b/src/factory.cpp @@ -28,7 +28,7 @@ #include "insets/InsetCaption.h" #include "insets/InsetCitation.h" #include "insets/InsetCharStyle.h" -#include "insets/InsetEnv.h" +#include "insets/InsetEnvironment.h" #include "insets/InsetERT.h" #include "insets/InsetExternal.h" #include "insets/InsetFloat.h" @@ -58,7 +58,7 @@ #include "mathed/MathMacroTemplate.h" #include "mathed/InsetMathHull.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/lstrings.h" #include "support/ExceptionMessage.h" diff --git a/src/frontends/Dialogs.cpp b/src/frontends/Dialogs.cpp index 05d0128dec..13132814e5 100644 --- a/src/frontends/Dialogs.cpp +++ b/src/frontends/Dialogs.cpp @@ -14,7 +14,7 @@ #include "Dialogs.h" -#include "lyx_cb.h" +#include "callback.h" #include "controllers/Dialog.h" diff --git a/src/frontends/LyXView.cpp b/src/frontends/LyXView.cpp index 378425dc53..64712c23b0 100644 --- a/src/frontends/LyXView.cpp +++ b/src/frontends/LyXView.cpp @@ -29,7 +29,7 @@ #include "FuncRequest.h" #include "gettext.h" #include "Intl.h" -#include "lyx_cb.h" +#include "callback.h" #include "LyXFunc.h" #include "LyXRC.h" #include "LyXText.h" diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index a8b4a6024a..257b303e66 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -13,8 +13,8 @@ noinst_LTLIBRARIES = libfrontends.la AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libfrontends_la_SOURCES = \ - Alert.cpp \ - Alert.h \ + alert.cpp \ + alert.h \ Alert_pimpl.h \ Application.cpp \ Application.h \ diff --git a/src/frontends/Alert.cpp b/src/frontends/alert.cpp similarity index 98% rename from src/frontends/Alert.cpp rename to src/frontends/alert.cpp index 4822bd76dc..69ac6c849c 100644 --- a/src/frontends/Alert.cpp +++ b/src/frontends/alert.cpp @@ -1,5 +1,5 @@ /** - * \file Alert.cpp + * \file alert.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 "Alert.h" +#include "alert.h" #include "Alert_pimpl.h" #include "debug.h" diff --git a/src/frontends/Alert.h b/src/frontends/alert.h similarity index 99% rename from src/frontends/Alert.h rename to src/frontends/alert.h index 7bd81ebe4c..a163caf69a 100644 --- a/src/frontends/Alert.h +++ b/src/frontends/alert.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file Alert.h + * \file alert.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/frontends/controllers/BCView.tmpl b/src/frontends/controllers/BCView.tmpl index c8567f01d4..0e1aa800c7 100644 --- a/src/frontends/controllers/BCView.tmpl +++ b/src/frontends/controllers/BCView.tmpl @@ -15,7 +15,7 @@ */ #include "BCView.h" -#include "ButtonPolicies.h" +#include "ButtonPolicy.h" #include "debug.h" namespace lyx { diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h index 2e48a81547..8c454537de 100644 --- a/src/frontends/controllers/ButtonController.h +++ b/src/frontends/controllers/ButtonController.h @@ -12,7 +12,7 @@ #ifndef BUTTONCONTROLLER_H #define BUTTONCONTROLLER_H -#include "ButtonPolicies.h" +#include "ButtonPolicy.h" #include namespace lyx { diff --git a/src/frontends/controllers/ButtonPolicies.cpp b/src/frontends/controllers/ButtonPolicy.cpp similarity index 99% rename from src/frontends/controllers/ButtonPolicies.cpp rename to src/frontends/controllers/ButtonPolicy.cpp index c14b0729b2..b76d636081 100644 --- a/src/frontends/controllers/ButtonPolicies.cpp +++ b/src/frontends/controllers/ButtonPolicy.cpp @@ -1,5 +1,5 @@ /** - * \file ButtonPolicies.cpp + * \file ButtonPolicy.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 "ButtonPolicies.h" +#include "ButtonPolicy.h" #include "debug.h" #include diff --git a/src/frontends/controllers/ButtonPolicies.h b/src/frontends/controllers/ButtonPolicy.h similarity index 99% rename from src/frontends/controllers/ButtonPolicies.h rename to src/frontends/controllers/ButtonPolicy.h index 3300c9a208..6591b85fb2 100644 --- a/src/frontends/controllers/ButtonPolicies.h +++ b/src/frontends/controllers/ButtonPolicy.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file ButtonPolicies.h + * \file ButtonPolicy.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,8 +12,8 @@ * used by the dialogs. */ -#ifndef BUTTONPOLICIES_H -#define BUTTONPOLICIES_H +#ifndef BUTTONPOLICY_H +#define BUTTONPOLICY_H #include diff --git a/src/frontends/controllers/ControlSpellchecker.cpp b/src/frontends/controllers/ControlSpellchecker.cpp index ac9f063a3f..e62bb01959 100644 --- a/src/frontends/controllers/ControlSpellchecker.cpp +++ b/src/frontends/controllers/ControlSpellchecker.cpp @@ -39,7 +39,7 @@ #include "support/convert.h" #include "support/docstring.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" // FIXME: those two headers are needed because of the // WorkArea::redraw() call below. #include "frontends/LyXView.h" diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am index 67e4395b11..563e2b298e 100644 --- a/src/frontends/controllers/Makefile.am +++ b/src/frontends/controllers/Makefile.am @@ -19,8 +19,8 @@ libcontrollers_la_SOURCES= \ BCView.cpp \ ButtonController.cpp \ ButtonController.h \ - ButtonPolicies.cpp \ - ButtonPolicies.h \ + ButtonPolicy.cpp \ + ButtonPolicy.h \ ControlAboutlyx.cpp \ ControlAboutlyx.h \ ControlBibtex.cpp \ diff --git a/src/frontends/controllers/frontend_helpers.cpp b/src/frontends/controllers/frontend_helpers.cpp index 4acc4acf29..7708e9d1f5 100644 --- a/src/frontends/controllers/frontend_helpers.cpp +++ b/src/frontends/controllers/frontend_helpers.cpp @@ -28,7 +28,7 @@ #include "Color.h" #include "frontends/FileDialog.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/filetools.h" #include "support/lstrings.h" #include "support/Package.h" diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp index bbca50deb1..2cbe3d8e58 100644 --- a/src/frontends/qt4/Action.cpp +++ b/src/frontends/qt4/Action.cpp @@ -15,7 +15,7 @@ #include "GuiView.h" #include "qt_helpers.h" -#include "lyx_cb.h" +#include "callback.h" #include "LyXFunc.h" #include "FuncStatus.h" #include "debug.h" diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index d0b6771b34..bb7c89e747 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -35,7 +35,7 @@ #include "BufferList.h" #include "debug.h" #include "FuncRequest.h" -#include "lyx_cb.h" +#include "callback.h" #include "LyXRC.h" #include "LyX.h" #include "Session.h" diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 092d2968fb..8af7fafb56 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -30,7 +30,7 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/src/frontends/controllers libqt4_la_SOURCES = \ - Alert_pimpl.cpp \ + alert_pimpl.cpp \ ColorCache.h ColorCache.cpp \ DockView.h \ Dialogs.cpp \ diff --git a/src/frontends/qt4/QBibtex.cpp b/src/frontends/qt4/QBibtex.cpp index 8fa5eb9e4f..bb85f9c45a 100644 --- a/src/frontends/qt4/QBibtex.cpp +++ b/src/frontends/qt4/QBibtex.cpp @@ -22,7 +22,7 @@ #include "CheckedLineEdit.h" #include "controllers/ControlBibtex.h" -#include "controllers/ButtonPolicies.h" +#include "controllers/ButtonPolicy.h" #include "controllers/ControlBibtex.h" diff --git a/src/frontends/qt4/QPrefs.cpp b/src/frontends/qt4/QPrefs.cpp index 3ebc19e20b..f08c2dd61c 100644 --- a/src/frontends/qt4/QPrefs.cpp +++ b/src/frontends/qt4/QPrefs.cpp @@ -30,7 +30,7 @@ #include "controllers/ControlPrefs.h" #include "controllers/frontend_helpers.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/Application.h" #include diff --git a/src/frontends/qt4/Validator.cpp b/src/frontends/qt4/Validator.cpp index b73e06ef2e..e8e393a689 100644 --- a/src/frontends/qt4/Validator.cpp +++ b/src/frontends/qt4/Validator.cpp @@ -18,7 +18,7 @@ #include "gettext.h" #include "LyXRC.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/controllers/Dialog.h" diff --git a/src/frontends/qt4/Alert_pimpl.cpp b/src/frontends/qt4/alert_pimpl.cpp similarity index 98% rename from src/frontends/qt4/Alert_pimpl.cpp rename to src/frontends/qt4/alert_pimpl.cpp index 6bf50fc152..dbc9f77640 100644 --- a/src/frontends/qt4/Alert_pimpl.cpp +++ b/src/frontends/qt4/alert_pimpl.cpp @@ -1,5 +1,5 @@ /** - * \file qt4/Alert_pimpl.cpp + * \file qt4/alert_pimpl.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 "Alert_pimpl.h" -#include "Alert.h" +#include "alert.h" #include "ui/AskForTextUi.h" #include "qt_helpers.h" diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index a92e44590a..9bd9f1d79d 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -23,7 +23,7 @@ #include "MetricsInfo.h" #include "OutputParams.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/filetools.h" #include "support/lstrings.h" diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp index f87b1c7b35..8ca6a4511a 100644 --- a/src/insets/InsetERT.cpp +++ b/src/insets/InsetERT.cpp @@ -31,7 +31,7 @@ #include "ParagraphParameters.h" #include "Paragraph.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include diff --git a/src/insets/InsetEnv.cpp b/src/insets/InsetEnvironment.cpp similarity index 97% rename from src/insets/InsetEnv.cpp rename to src/insets/InsetEnvironment.cpp index 01f4aed774..01015f74f1 100644 --- a/src/insets/InsetEnv.cpp +++ b/src/insets/InsetEnvironment.cpp @@ -1,5 +1,5 @@ /** - * \file InsetEnv.cpp + * \file InsetEnvironment.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 "InsetEnvironment.h" #include "BufferParams.h" #include "gettext.h" diff --git a/src/insets/InsetEnv.h b/src/insets/InsetEnvironment.h similarity index 98% rename from src/insets/InsetEnv.h rename to src/insets/InsetEnvironment.h index 8084c90a89..5564f3ab6d 100644 --- a/src/insets/InsetEnv.h +++ b/src/insets/InsetEnvironment.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file InsetEnv.h + * \file InsetEnvironment.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index d921b12a76..d44fa89c2f 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -71,7 +71,7 @@ TODO #include "OutputParams.h" #include "sgml.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/convert.h" #include "support/filetools.h" diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 51f9143cd8..f0d497adbb 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -32,7 +32,7 @@ #include "OutputParams.h" #include "TocBackend.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/Painter.h" #include "graphics/PreviewImage.h" diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index adb374719b..40f74627e7 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -34,7 +34,7 @@ #include "Language.h" #include "LaTeXFeatures.h" #include "Color.h" -#include "lyx_cb.h" +#include "callback.h" #include "Lexer.h" #include "MetricsInfo.h" #include "OutputParams.h" @@ -46,7 +46,7 @@ #include "support/convert.h" #include "support/lstrings.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/Clipboard.h" #include "frontends/Painter.h" #include "frontends/Selection.h" diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index f9b90bc682..977d5289ff 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -44,7 +44,7 @@ #include "TexRow.h" #include "Undo.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "frontends/Painter.h" #include "support/lyxalgo.h" // count diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index aab94712b1..ea03ac15a4 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -51,8 +51,8 @@ libinsets_la_SOURCES = \ InsetCommand.h \ InsetCommandParams.cpp \ InsetCommandParams.h \ - InsetEnv.cpp \ - InsetEnv.h \ + InsetEnvironment.cpp \ + InsetEnvironment.h \ InsetERT.cpp \ InsetERT.h \ InsetExternal.cpp \ diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index f0d9e96c44..8aa3175ab6 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -28,7 +28,7 @@ #include "ParIterator.h" #include "Undo.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/convert.h" #include "support/docstream.h" diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp index 91195646f1..cbf2058aaa 100644 --- a/src/mathed/InsetFormulaMacro.cpp +++ b/src/mathed/InsetFormulaMacro.cpp @@ -12,7 +12,7 @@ #include #include "InsetFormulaMacro.h" -#include "MathMacroTable.h" +#include "MacroTable.h" #include "MathMacroTemplate.h" #include "BufferView.h" diff --git a/src/mathed/MathMacroTable.cpp b/src/mathed/MacroTable.cpp similarity index 98% rename from src/mathed/MathMacroTable.cpp rename to src/mathed/MacroTable.cpp index 0a60ee44a2..871dc6edb6 100644 --- a/src/mathed/MathMacroTable.cpp +++ b/src/mathed/MacroTable.cpp @@ -1,5 +1,5 @@ /** - * \file MathMacroTable.cpp + * \file MacroTable.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 "MathMacroTable.h" +#include "MacroTable.h" #include "MathMacroTemplate.h" #include "MathMacroArgument.h" #include "MathSupport.h" diff --git a/src/mathed/MathMacroTable.h b/src/mathed/MacroTable.h similarity index 98% rename from src/mathed/MathMacroTable.h rename to src/mathed/MacroTable.h index 5525beed1c..7bc220a7e2 100644 --- a/src/mathed/MathMacroTable.h +++ b/src/mathed/MacroTable.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file MathMacroTable.h + * \file MacroTable.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index d856a8cb53..356fa40cec 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -140,8 +140,8 @@ libmathed_la_SOURCES = \ MathGridInfo.h \ MathMacroArgument.cpp \ MathMacroArgument.h \ - MathMacroTable.cpp \ - MathMacroTable.h \ + MacroTable.cpp \ + MacroTable.h \ MathMacroTemplate.cpp \ MathMacroTemplate.h \ MathParser.cpp \ diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp index 806e61e89d..a911cc839a 100644 --- a/src/mathed/MathData.cpp +++ b/src/mathed/MathData.cpp @@ -14,7 +14,7 @@ #include "InsetMathFont.h" #include "InsetMathScript.h" #include "MathMacro.h" -#include "MathMacroTable.h" +#include "MacroTable.h" #include "MathStream.h" #include "MathSupport.h" #include "ReplaceData.h" diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index 1ae36429c7..70244a7006 100644 --- a/src/mathed/MathFactory.cpp +++ b/src/mathed/MathFactory.cpp @@ -50,7 +50,7 @@ #include "InsetMathXArrow.h" #include "InsetMathXYMatrix.h" #include "MathMacroArgument.h" -#include "MathMacroTable.h" +#include "MacroTable.h" #include "MathParser.h" #include "MathSupport.h" diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h index 2c455e44c0..e5d4196b97 100644 --- a/src/mathed/MathMacro.h +++ b/src/mathed/MathMacro.h @@ -16,7 +16,7 @@ #include "InsetMathNest.h" #include "MathData.h" #include "InsetMathNest.h" -#include "MathMacroTable.h" +#include "MacroTable.h" namespace lyx { diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h index 2ed8e87bf5..b657ea4793 100644 --- a/src/mathed/MathMacroTemplate.h +++ b/src/mathed/MathMacroTemplate.h @@ -14,7 +14,7 @@ #define MATH_MACROTEMPLATE_H #include "MathData.h" -#include "MathMacroTable.h" +#include "MacroTable.h" #include "InsetMathNest.h" #include "support/types.h" diff --git a/src/output.cpp b/src/output.cpp index 4e0890db19..0a9e86ee82 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -14,7 +14,7 @@ #include "gettext.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" #include "support/filetools.h" diff --git a/src/text2.cpp b/src/text2.cpp index 8ee99e8c7c..3cc575ea98 100644 --- a/src/text2.cpp +++ b/src/text2.cpp @@ -53,7 +53,7 @@ #include "frontends/FontMetrics.h" -#include "insets/InsetEnv.h" +#include "insets/InsetEnvironment.h" #include "mathed/InsetMathHull.h" diff --git a/src/UpdateFlags.h b/src/update_flags.h similarity index 96% rename from src/UpdateFlags.h rename to src/update_flags.h index d092e74b3e..b18cabcb1b 100644 --- a/src/UpdateFlags.h +++ b/src/update_flags.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file UpdateFlags.h + * \file update_flags.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * -- 2.39.5