update

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27535 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/qmake/lyx.pro b/development/qmake/lyx.pro
index 99af9436ac1c3e76a7389bc1be00a84a423f5db0..a30ae20609a5519e9e57d7bb46d9bff69e597910 100644 (file)
--- a/development/qmake/lyx.pro
+++ b/development/qmake/lyx.pro
@@ -58,55 +58,55 @@ SOURCES += \
 ../../src/Font.cpp \
 ../../src/BufferParams.cpp \
 ../../src/sgml.cpp \
-../../src/insets/RenderButton.cpp \
-../../src/insets/RenderPreview.cpp \
-../../src/insets/InsetNewline.cpp \
-../../src/insets/InsetIndex.cpp \
-../../src/insets/InsetCitation.cpp \
-../../src/insets/InsetFootlike.cpp \
-../../src/insets/InsetVSpace.cpp \
-../../src/insets/InsetBibtex.cpp \
-../../src/insets/InsetLayout.cpp \
-../../src/insets/InsetGraphics.cpp \
-../../src/insets/InsetNewpage.cpp \
-../../src/insets/InsetERT.cpp \
-../../src/insets/InsetListingsParams.cpp \
-../../src/insets/RenderGraphic.cpp \
-../../src/insets/InsetMarginal.cpp \
-../../src/insets/InsetFoot.cpp \
-../../src/insets/InsetHyperlink.cpp \
 ../../src/insets/ExternalSupport.cpp \
+../../src/insets/ExternalTemplate.cpp \
 ../../src/insets/ExternalTransforms.cpp \
 ../../src/insets/InsetBibitem.cpp \
+../../src/insets/InsetBibtex.cpp \
+../../src/insets/InsetBox.cpp \
+../../src/insets/InsetBranch.cpp \
+../../src/insets/InsetCaption.cpp \
+../../src/insets/InsetCitation.cpp \
+../../src/insets/InsetCollapsable.cpp \
+../../src/insets/InsetCommand.cpp \
+../../src/insets/InsetCommandParams.cpp \
 ../../src/insets/Inset.cpp \
-../../src/insets/InsetListings.cpp \
-../../src/insets/InsetNote.cpp \
-../../src/insets/InsetOptArg.cpp \
+../../src/insets/InsetERT.cpp \
+../../src/insets/InsetExternal.cpp \
 ../../src/insets/InsetFlex.cpp \
-../../src/insets/ExternalTemplate.cpp \
-../../src/insets/InsetRef.cpp \
+../../src/insets/InsetFloat.cpp \
 ../../src/insets/InsetFloatList.cpp \
-../../src/insets/InsetCommandParams.cpp \
-../../src/insets/InsetCommand.cpp \
-../../src/insets/InsetCaption.cpp \
-../../src/insets/InsetExternal.cpp \
+../../src/insets/InsetFoot.cpp \
+../../src/insets/InsetFootlike.cpp \
+../../src/insets/InsetGraphics.cpp \
+../../src/insets/InsetGraphicsParams.cpp \
+../../src/insets/InsetHyperlink.cpp \
+../../src/insets/InsetInclude.cpp \
+../../src/insets/InsetIndex.cpp \
+../../src/insets/InsetInfo.cpp \
 ../../src/insets/InsetLabel.cpp \
-../../src/insets/InsetText.cpp \
-../../src/insets/InsetTOC.cpp \
-../../src/insets/InsetBranch.cpp \
-../../src/insets/InsetBox.cpp \
+../../src/insets/InsetLayout.cpp \
+../../src/insets/InsetLine.cpp \
+../../src/insets/InsetListings.cpp \
+../../src/insets/InsetListingsParams.cpp \
+../../src/insets/InsetMarginal.cpp \
+../../src/insets/InsetNewline.cpp \
+../../src/insets/InsetNewpage.cpp \
 ../../src/insets/InsetNomencl.cpp \
-../../src/insets/InsetTabular.cpp \
+../../src/insets/InsetNote.cpp \
+../../src/insets/InsetOptArg.cpp \
 ../../src/insets/InsetQuotes.cpp \
-../../src/insets/InsetInclude.cpp \
-../../src/insets/InsetGraphicsParams.cpp \
-../../src/insets/InsetLine.cpp \
+../../src/insets/InsetRef.cpp \
 ../../src/insets/InsetSpace.cpp \
 ../../src/insets/InsetSpecialChar.cpp \
-../../src/insets/InsetCollapsable.cpp \
-../../src/insets/InsetInfo.cpp \
-../../src/insets/InsetFloat.cpp \
+../../src/insets/InsetTabular.cpp \
+../../src/insets/InsetText.cpp \
+../../src/insets/InsetTOC.cpp \
+../../src/insets/InsetVSpace.cpp \
 ../../src/insets/InsetWrap.cpp \
+../../src/insets/RenderButton.cpp \
+../../src/insets/RenderGraphic.cpp \
+../../src/insets/RenderPreview.cpp \
 ../../src/Color.cpp \
 ../../src/graphics/PreviewLoader.cpp \
 ../../src/graphics/Previews.cpp \
@@ -116,7 +116,6 @@ SOURCES += \
 ../../src/graphics/GraphicsCacheItem.cpp \
 ../../src/graphics/PreviewImage.cpp \
 ../../src/graphics/GraphicsCache.cpp \
-../../src/ISpell.cpp \
 ../../src/version.cpp \
 ../../src/Box.cpp \
 ../../src/Server.cpp \
@@ -284,6 +283,7 @@ SOURCES += \
 ../../src/frontends/qt4/Dialog.cpp \
 ../../src/frontends/qt4/EmptyTable.cpp \
 ../../src/frontends/qt4/FileDialog.cpp \
+../../src/frontends/qt4/FindAndReplace.cpp \
 ../../src/frontends/qt4/FloatPlacement.cpp \
 ../../src/frontends/qt4/GuiAbout.cpp \
 ../../src/frontends/qt4/GuiAlert.cpp \
@@ -380,7 +380,6 @@ HEADERS += \
 ../../src/support/SignalSlotPrivate.h \
 ../../src/PrinterParams.h \
 ../../src/sgml.h \
-../../src/ISpell.h \
 ../../src/LayoutEnums.h \
 ../../src/Text.h \
 ../../src/Graph.h \
@@ -445,11 +444,6 @@ HEADERS += \
 ../../src/insets/RenderButton.h \
 ../../src/insets/RenderGraphic.h \
 ../../src/insets/RenderPreview.h \
-../../src/output.h \
-../../src/lyxfind.h \
-../../src/LaTeX.h \
-../../src/paragraph_funcs.h \
-../../src/WordLangTuple.h \
 ../../src/graphics/GraphicsCacheItem.h \
 ../../src/graphics/PreviewImage.h \
 ../../src/graphics/GraphicsImage.h \
@@ -460,76 +454,81 @@ HEADERS += \
 ../../src/graphics/PreviewLoader.h \
 ../../src/graphics/GraphicsTypes.h \
 ../../src/graphics/Previews.h \
-../../src/Font.h \
-../../src/TexRow.h \
-../../src/DocIterator.h \
+../../src/BiblioInfo.h \
+../../src/BufferView.h \
+../../src/ColorCode.h \
+../../src/CompletionList.h \
+../../src/Cursor.h \
 ../../src/CutAndPaste.h \
-../../src/Exporter.h \
 ../../src/Dimension.h \
-../../src/ColorCode.h \
-../../src/FontList.h \
-../../src/MetricsInfo.h \
-../../src/update_flags.h \
-../../src/paper.h \
-../../src/BiblioInfo.h \
-../../src/ParagraphMetrics.h \
-../../src/Paragraph.h \
-../../src/FuncStatus.h \
+../../src/DispatchResult.h \
+../../src/DocIterator.h \
+../../src/Exporter.h \
 ../../src/factory.h \
+../../src/Floating.h \
+../../src/Font.h \
+../../src/FontList.h \
 ../../src/FuncRequest.h \
-../../src/CompletionList.h \
-../../src/BufferView.h \
+../../src/FuncStatus.h \
+../../src/Intl.h \
+../../src/LaTeX.h \
 ../../src/LayoutFile.h \
-../../src/Floating.h \
-../../src/SpellBase.h \
+../../src/lyxfind.h \
+../../src/MetricsInfo.h \
+../../src/output.h \
 ../../src/output_plaintext.h \
+../../src/paper.h \
+../../src/paragraph_funcs.h \
+../../src/Paragraph.h \
+../../src/ParagraphMetrics.h \
 ../../src/ParagraphParameters.h \
-../../src/Intl.h \
-../../src/Cursor.h \
+../../src/SpellBase.h \
+../../src/TexRow.h \
 ../../src/Trans.h \
-../../src/DispatchResult.h \
-../../src/support/filetools.h \
-../../src/support/textutils.h \
-../../src/support/socktools.h \
-../../src/support/unicode.h \
-../../src/support/lassert.h \
+../../src/update_flags.h \
+../../src/WordLangTuple.h \
+../../src/support/convert.h \
+../../src/support/copied_ptr.h \
+../../src/support/debug.h \
+../../src/support/docstream.h \
+../../src/support/docstring.h \
 ../../src/support/docstring_list.h \
-../../src/support/Translator.h \
-../../src/support/linkback/LinkBackProxy.h \
-../../src/support/linkback/LinkBack.h \
-../../src/support/linkback/LinkBackServer.h \
 ../../src/support/environment.h \
-../../src/support/lyxalgo.h \
 ../../src/support/ExceptionMessage.h \
-../../src/support/Systemcall.h \
-../../src/support/convert.h \
-../../src/support/docstream.h \
-../../src/support/lyxlib.h \
+../../src/support/FileMonitor.h \
+../../src/support/FileName.h \
 ../../src/support/FileNameList.h \
-../../src/support/Path.h \
-../../src/support/types.h \
-../../src/support/userinfo.h \
+../../src/support/filetools.h \
 ../../src/support/foreach.h \
-../../src/support/lstrings.h \
+../../src/support/ForkedCalls.h \
 ../../src/support/gettext.h \
-../../src/support/docstring.h \
-../../src/support/Messages.h \
-../../src/support/copied_ptr.h \
-../../src/support/FileName.h \
+../../src/support/gzstream.h \
+../../src/support/lassert.h \
 ../../src/support/limited_stack.h \
-../../src/support/Timeout.h \
-../../src/support/os_win32.h \
+../../src/support/linkback/LinkBack.h \
+../../src/support/linkback/LinkBackProxy.h \
+../../src/support/linkback/LinkBackServer.h \
+../../src/support/lstrings.h \
+../../src/support/lyxalgo.h \
+../../src/support/lyxlib.h \
+../../src/support/lyxtime.h \
+../../src/support/Messages.h \
 ../../src/support/os.h \
-../../src/support/debug.h \
-../../src/support/ForkedCalls.h \
-../../src/support/RandomAccessList.h \
-../../src/support/gzstream.h \
+../../src/support/os_win32.h \
 ../../src/support/Package.h \
+../../src/support/Path.h \
+../../src/support/qstring_helpers.h \
+../../src/support/RandomAccessList.h \
+../../src/support/socktools.h \
 ../../src/support/strfwd.h \
-../../src/support/FileMonitor.h \
+../../src/support/Systemcall.h \
+../../src/support/textutils.h \
+../../src/support/Timeout.h \
+../../src/support/Translator.h \
+../../src/support/types.h \
+../../src/support/unicode.h \
+../../src/support/userinfo.h \
 ../../src/support/weighted_btree.h \
-../../src/support/qstring_helpers.h \
-../../src/support/lyxtime.h \
 ../../src/DepTable.h \
 ../../src/Mover.h \
 ../../src/Citation.h \
@@ -649,94 +648,95 @@ HEADERS += \
 ../../src/frontends/alert.h \
 ../../src/frontends/Clipboard.h \
 ../../src/frontends/KeyModifier.h \
-../../src/frontends/qt4/GuiCompleter.h \
-../../src/frontends/qt4/GuiInfo.h \
-../../src/frontends/qt4/GuiImage.h \
-../../src/frontends/qt4/GuiBibitem.h \
-../../src/frontends/qt4/Dialog.h \
-../../src/frontends/qt4/GuiCommandBuffer.h \
-../../src/frontends/qt4/GuiTabularCreate.h \
-../../src/frontends/qt4/GuiMathMatrix.h \
-../../src/frontends/qt4/GuiHyperlink.h \
-../../src/frontends/qt4/qt_helpers.h \
-../../src/frontends/qt4/GuiKeySymbol.h \
-../../src/frontends/qt4/GuiLabel.h \
-../../src/frontends/qt4/GuiClipboard.h \
+../../src/frontends/qt4/Action.h \
+../../src/frontends/qt4/BulletsModule.h \
+../../src/frontends/qt4/ButtonController.h \
 ../../src/frontends/qt4/ButtonPolicy.h \
-../../src/frontends/qt4/GuiTexinfo.h \
-../../src/frontends/qt4/GuiCitation.h \
-../../src/frontends/qt4/GuiRef.h \
-../../src/frontends/qt4/GuiNomencl.h \
-../../src/frontends/qt4/TocModel.h \
-../../src/frontends/qt4/GuiBranch.h \
-../../src/frontends/qt4/PanelStack.h \
-../../src/frontends/qt4/Menus.h \
-../../src/frontends/qt4/LyXFileDialog.h \
+../../src/frontends/qt4/ColorCache.h \
 ../../src/frontends/qt4/CustomizedWidgets.h \
-../../src/frontends/qt4/GuiToc.h \
+../../src/frontends/qt4/Dialog.h \
+../../src/frontends/qt4/DialogView.h \
 ../../src/frontends/qt4/DockView.h \
-../../src/frontends/qt4/GuiViewSource.h \
+../../src/frontends/qt4/EmptyTable.h \
+../../src/frontends/qt4/FileDialog.h \
+../../src/frontends/qt4/FindAndReplace.h \
+../../src/frontends/qt4/FloatPlacement.h \
+../../src/frontends/qt4/GuiAbout.h \
+../../src/frontends/qt4/GuiApplication.h \
+../../src/frontends/qt4/GuiBibitem.h \
 ../../src/frontends/qt4/GuiBibtex.h \
-../../src/frontends/qt4/ButtonController.h \
-../../src/frontends/qt4/GuiView.h \
-../../src/frontends/qt4/GuiCommandEdit.h \
-../../src/frontends/qt4/GuiPrint.h \
-../../src/frontends/qt4/GuiThesaurus.h \
-../../src/frontends/qt4/GuiLog.h \
-../../src/frontends/qt4/GuiGraphics.h \
-../../src/frontends/qt4/GuiShowFile.h \
+../../src/frontends/qt4/GuiBox.h \
 ../../src/frontends/qt4/GuiBranches.h \
-../../src/frontends/qt4/GuiFloat.h \
-../../src/frontends/qt4/GuiToolbar.h \
-../../src/frontends/qt4/LengthCombo.h \
-../../src/frontends/qt4/GuiFontMetrics.h \
-../../src/frontends/qt4/GuiVSpace.h \
-../../src/frontends/qt4/GuiCharacter.h \
-../../src/frontends/qt4/GuiSpellchecker.h \
-../../src/frontends/qt4/GuiApplication.h \
-../../src/frontends/qt4/GuiTabular.h \
-../../src/frontends/qt4/TocWidget.h \
-../../src/frontends/qt4/GuiSelection.h \
-../../src/frontends/qt4/Validator.h \
+../../src/frontends/qt4/GuiBranch.h \
 ../../src/frontends/qt4/GuiChanges.h \
-../../src/frontends/qt4/FileDialog.h \
-../../src/frontends/qt4/Toolbars.h \
-../../src/frontends/qt4/BulletsModule.h \
-../../src/frontends/qt4/GuiExternal.h \
-../../src/frontends/qt4/GuiSymbols.h \
+../../src/frontends/qt4/GuiCharacter.h \
+../../src/frontends/qt4/GuiCitation.h \
+../../src/frontends/qt4/GuiClipboard.h \
+../../src/frontends/qt4/GuiCommandBuffer.h \
+../../src/frontends/qt4/GuiCommandEdit.h \
+../../src/frontends/qt4/GuiCompleter.h \
+../../src/frontends/qt4/GuiDelimiter.h \
+../../src/frontends/qt4/GuiDialog.h \
 ../../src/frontends/qt4/GuiDocument.h \
-../../src/frontends/qt4/GuiHSpace.h \
-../../src/frontends/qt4/GuiBox.h \
+../../src/frontends/qt4/GuiErrorList.h \
 ../../src/frontends/qt4/GuiERT.h \
-../../src/frontends/qt4/qt_i18n.h \
-../../src/frontends/qt4/ColorCache.h \
-../../src/frontends/qt4/IconPalette.h \
-../../src/frontends/qt4/DialogView.h \
-../../src/frontends/qt4/GuiSelectionManager.h \
-../../src/frontends/qt4/GuiAbout.h \
-../../src/frontends/qt4/GuiListings.h \
-../../src/frontends/qt4/LaTeXHighlighter.h \
-../../src/frontends/qt4/GuiDelimiter.h \
-../../src/frontends/qt4/GuiParagraph.h \
-../../src/frontends/qt4/GuiWrap.h \
+../../src/frontends/qt4/GuiExternal.h \
+../../src/frontends/qt4/GuiFloat.h \
 ../../src/frontends/qt4/GuiFontExample.h \
-../../src/frontends/qt4/GuiNote.h \
-../../src/frontends/qt4/FloatPlacement.h \
+../../src/frontends/qt4/GuiFontLoader.h \
+../../src/frontends/qt4/GuiFontMetrics.h \
+../../src/frontends/qt4/GuiGraphics.h \
+../../src/frontends/qt4/GuiGraphicsUi.h \
+../../src/frontends/qt4/GuiHSpace.h \
+../../src/frontends/qt4/GuiHyperlink.h \
 ../../src/frontends/qt4/GuiIdListModel.h \
-../../src/frontends/qt4/Action.h \
+../../src/frontends/qt4/GuiImage.h \
 ../../src/frontends/qt4/GuiInclude.h \
-../../src/frontends/qt4/GuiSearch.h \
+../../src/frontends/qt4/GuiInfo.h \
+../../src/frontends/qt4/GuiKeySymbol.h \
+../../src/frontends/qt4/GuiLabel.h \
+../../src/frontends/qt4/GuiListings.h \
+../../src/frontends/qt4/GuiLog.h \
+../../src/frontends/qt4/GuiMathMatrix.h \
+../../src/frontends/qt4/GuiNomencl.h \
+../../src/frontends/qt4/GuiNote.h \
+../../src/frontends/qt4/GuiPainter.h \
+../../src/frontends/qt4/GuiParagraph.h \
 ../../src/frontends/qt4/GuiPrefs.h \
+../../src/frontends/qt4/GuiPrint.h \
+../../src/frontends/qt4/GuiRef.h \
+../../src/frontends/qt4/GuiSearch.h \
+../../src/frontends/qt4/GuiSelection.h \
+../../src/frontends/qt4/GuiSelectionManager.h \
 ../../src/frontends/qt4/GuiSendto.h \
-../../src/frontends/qt4/GuiFontLoader.h \
 ../../src/frontends/qt4/GuiSetBorder.h \
+../../src/frontends/qt4/GuiShowFile.h \
+../../src/frontends/qt4/GuiSpellchecker.h \
+../../src/frontends/qt4/GuiSymbols.h \
+../../src/frontends/qt4/GuiTabularCreate.h \
+../../src/frontends/qt4/GuiTabular.h \
+../../src/frontends/qt4/GuiTexinfo.h \
+../../src/frontends/qt4/GuiThesaurus.h \
+../../src/frontends/qt4/GuiToc.h \
+../../src/frontends/qt4/GuiToolbar.h \
+../../src/frontends/qt4/GuiView.h \
+../../src/frontends/qt4/GuiViewSource.h \
+../../src/frontends/qt4/GuiVSpace.h \
 ../../src/frontends/qt4/GuiWorkArea.h \
-../../src/frontends/qt4/GuiPainter.h \
+../../src/frontends/qt4/GuiWrap.h \
+../../src/frontends/qt4/IconPalette.h \
 ../../src/frontends/qt4/InsertTableWidget.h \
-../../src/frontends/qt4/EmptyTable.h \
-../../src/frontends/qt4/GuiGraphicsUi.h \
-../../src/frontends/qt4/GuiErrorList.h \
-../../src/frontends/qt4/GuiDialog.h \
+../../src/frontends/qt4/LaTeXHighlighter.h \
+../../src/frontends/qt4/LengthCombo.h \
+../../src/frontends/qt4/LyXFileDialog.h \
+../../src/frontends/qt4/Menus.h \
+../../src/frontends/qt4/PanelStack.h \
+../../src/frontends/qt4/qt_helpers.h \
+../../src/frontends/qt4/qt_i18n.h \
+../../src/frontends/qt4/TocModel.h \
+../../src/frontends/qt4/TocWidget.h \
+../../src/frontends/qt4/Toolbars.h \
+../../src/frontends/qt4/Validator.h \
 ../../src/frontends/WorkArea.h \
 ../../src/frontends/FontLoader.h \
 ../../src/frontends/mouse_state.h \
@@ -776,6 +776,7 @@ FORMS = \
 ../../src/frontends/qt4/ui/ErrorListUi.ui \
 ../../src/frontends/qt4/ui/ERTUi.ui \
 ../../src/frontends/qt4/ui/ExternalUi.ui \
+../../src/frontends/qt4/ui/FindAndReplaceUi.ui \
 ../../src/frontends/qt4/ui/FloatPlacementUi.ui \
 ../../src/frontends/qt4/ui/FloatUi.ui \
 ../../src/frontends/qt4/ui/FontUi.ui \
@@ -842,8 +843,3 @@ RESOURCES += $$PWD/Resources.qrc
 aspell {
 SOURCES += ../../src/ASpell.cpp 
 }
-
-pspell {
-SOURCES += ../../src/PSpell.cpp 
-HEADERS += ../../src/PSpell.h
-}