diff options
| -rw-r--r-- | gtk/deps.mak | 180 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 27 | ||||
| -rw-r--r-- | include/SString.h | 289 | ||||
| -rw-r--r-- | win32/deps.mak | 146 | ||||
| -rw-r--r-- | win32/makefile | 4 | ||||
| -rw-r--r-- | win32/scintilla.mak | 27 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 27 |
7 files changed, 202 insertions, 498 deletions
diff --git a/gtk/deps.mak b/gtk/deps.mak index 7fd47aab7..27b40bed4 100644 --- a/gtk/deps.mak +++ b/gtk/deps.mak @@ -3,18 +3,18 @@ PlatGTK.o: PlatGTK.cxx \ ../src/UniConversion.h ../src/XPM.h Converter.h ScintillaGTK.o: ScintillaGTK.cxx \ ../include/Scintilla.h ../include/ScintillaWidget.h \ - ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ + ../include/SciLexer.h ../include/PropSet.h \ ../include/Accessor.h ../include/KeyWords.h ../src/SVector.h \ ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \ ../src/ContractionState.h ../src/CellBuffer.h ../src/CallTip.h \ ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/AutoComplete.h ../src/ViewStyle.h \ ../src/Decoration.h ../src/CharClassify.h ../src/Document.h \ - ../src/PositionCache.h ../src/Editor.h ../include/SString.h \ + ../src/PositionCache.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/UniConversion.h scintilla-marshal.h \ ../src/ExternalLexer.h Converter.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ @@ -28,7 +28,7 @@ Decoration.o: ../src/Decoration.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/Decoration.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/DocumentAccessor.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../include/Scintilla.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h @@ -45,280 +45,279 @@ Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Document.h ../src/PositionCache.h ../src/Editor.h ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/KeyMap.h KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAbaqus.o: ../src/LexAbaqus.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \ - ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \ - ../include/KeyWords.h ../include/SciLexer.h ../include/SString.h + ../src/StyleContext.h ../include/PropSet.h \ + ../include/KeyWords.h ../include/SciLexer.h LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsn1.o: ../src/LexAsn1.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexASY.o: ../src/LexASY.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/CharacterSet.h LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/CharacterSet.h LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCOBOL.o: ../src/LexCOBOL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/CharacterSet.h LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexD.o: ../src/LexD.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexForth.o: ../src/LexForth.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexGAP.o: ../src/LexGAP.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexHaskell.o: ../src/LexHaskell.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/CharacterSet.h LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/CharacterSet.h LexMagik.o: ../src/LexMagik.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ - ../include/Scintilla.h ../include/SciLexer.h ../include/SString.h + ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexMySQL.o: ../src/LexMySQL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexNimrod.o: ../src/LexNimrod.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexOpal.o: ../src/LexOpal.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h ../src/CharacterSet.h LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/CharacterSet.h LexPLM.o: ../src/LexPLM.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPowerPro.o: ../src/LexPowerPro.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h ../src/CharacterSet.h LexPowerShell.o: ../src/LexPowerShell.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexProgress.o: ../src/LexProgress.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexR.o: ../src/LexR.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexRebol.o: ../src/LexRebol.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexSmalltalk.o: ../src/LexSmalltalk.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexSML.o: ../src/LexSML.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexSorcus.o: ../src/LexSorcus.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexSpice.o: ../src/LexSpice.cxx ../include/Platform.h \ ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \ - ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h \ - ../include/SString.h + ../include/KeyWords.h ../include/SciLexer.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTACL.o: ../src/LexTACL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexTAL.o: ../src/LexTAL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexVHDL.o: ../src/LexVHDL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h @@ -331,14 +330,13 @@ PositionCache.o: ../src/PositionCache.cxx ../include/Platform.h \ ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ ../src/Decoration.h ../src/Document.h ../src/PositionCache.h -PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../include/SciLexer.h ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/ContractionState.h ../src/CellBuffer.h \ @@ -348,7 +346,7 @@ ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/Document.h ../src/PositionCache.h ../src/Editor.h \ ../src/ScintillaBase.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h @@ -358,6 +356,6 @@ ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index 78634aaae..39dd20a9d 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -309,11 +309,11 @@ $(DIR_O)\ScintillaGTKS.obj: ScintillaGTK.cxx # All lexers depend on this set of headers LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ + ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h @@ -333,7 +333,7 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ ../src/Document.h ../src/RESearch.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/PropSet.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/CellBuffer.h ../include/Scintilla.h \ ../src/CharClassify.h ../src/Document.h @@ -347,7 +347,7 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ @@ -358,7 +358,7 @@ $(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintill ../src/KeyMap.h $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate @@ -534,8 +534,7 @@ $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/S ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h -$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h $(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h @@ -544,7 +543,7 @@ $(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ ../src/RunStyles.h $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -553,7 +552,7 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -562,7 +561,7 @@ $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaGTK.obj: ScintillaGTK.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -571,7 +570,7 @@ $(DIR_O)\ScintillaGTK.obj: ScintillaGTK.cxx ../include/Platform.h \ ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaGTKL.obj: ScintillaGTK.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -580,7 +579,7 @@ $(DIR_O)\ScintillaGTKL.obj: ScintillaGTK.cxx ../include/Platform.h \ ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaGTKS.obj: ScintillaGTK.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -595,7 +594,7 @@ $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla. ../src/Style.h $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h @@ -606,7 +605,7 @@ $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/Style.h ../src/ViewStyle.h $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/include/SString.h b/include/SString.h deleted file mode 100644 index b770afebe..000000000 --- a/include/SString.h +++ /dev/null @@ -1,289 +0,0 @@ -// SciTE - Scintilla based Text Editor -/** @file SString.h - ** A simple string class. - **/ -// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org> -// The License.txt file describes the conditions under which this software may be distributed. - -#ifndef SSTRING_H -#define SSTRING_H - - -// These functions are implemented because each platform calls them something different. -int CompareCaseInsensitive(const char *a, const char *b); -int CompareNCaseInsensitive(const char *a, const char *b, size_t len); -bool EqualCaseInsensitive(const char *a, const char *b); - -#ifdef SCI_NAMESPACE -namespace Scintilla { -#endif - -// Define another string class. -// While it would be 'better' to use std::string, that doubles the executable size. -// An SString may contain embedded nul characters. - -/** - * Base class from which the two other classes (SBuffer & SString) - * are derived. - */ -class SContainer { -public: - /** Type of string lengths (sizes) and positions (indexes). */ - typedef size_t lenpos_t; - /** Out of bounds value indicating that the string argument should be measured. */ - enum { measure_length=0xffffffffU}; - -protected: - char *s; ///< The C string - lenpos_t sSize; ///< The size of the buffer, less 1: ie. the maximum size of the string - - SContainer() : s(0), sSize(0) {} - ~SContainer() { - delete []s; // Suppose it was allocated using StringAllocate - s = 0; - sSize = 0; - } - /** Size of buffer. */ - lenpos_t size() const { - if (s) { - return sSize; - } else { - return 0; - } - } -public: - /** - * Allocate uninitialized memory big enough to fit a string of the given length. - * @return the pointer to the new string - */ - static char *StringAllocate(lenpos_t len); - /** - * Duplicate a buffer/C string. - * Allocate memory of the given size, or big enough to fit the string if length isn't given; - * then copy the given string in the allocated memory. - * @return the pointer to the new string - */ - static char *StringAllocate( - const char *s, ///< The string to duplicate - lenpos_t len=measure_length); ///< The length of memory to allocate. Optional. -}; - - -/** - * @brief A string buffer class. - * - * Main use is to ask an API the length of a string it can provide, - * then to allocate a buffer of the given size, and to provide this buffer - * to the API to put the string. - * This class is intended to be shortlived, to be transformed as SString - * as soon as it holds the string, so it has little members. - * Note: we assume the buffer is filled by the API. If the length can be shorter, - * we should set sLen to strlen(sb.ptr()) in related SString constructor and assignment. - */ -class SBuffer : protected SContainer { -public: - SBuffer(lenpos_t len) { - s = StringAllocate(len); - if (s) { - *s = '\0'; - sSize = len; - } else { - sSize = 0; - } - } -private: - /// Copy constructor - // Here only to be on the safe size, user should avoid returning SBuffer values. - SBuffer(const SBuffer &source) : SContainer() { - s = StringAllocate(source.s, source.sSize); - sSize = (s) ? source.sSize : 0; - } - /// Default assignment operator - // Same here, shouldn't be used - SBuffer &operator=(const SBuffer &source) { - if (this != &source) { - delete []s; - s = StringAllocate(source.s, source.sSize); - sSize = (s) ? source.sSize : 0; - } - return *this; - } -public: - /** Provide direct read/write access to buffer. */ - char *ptr() { - return s; - } - /** Ownership of the buffer have been taken, so release it. */ - void reset() { - s = 0; - sSize = 0; - } - /** Size of buffer. */ - lenpos_t size() const { - return SContainer::size(); - } -}; - - -/** - * @brief A simple string class. - * - * Hold the length of the string for quick operations, - * can have a buffer bigger than the string to avoid too many memory allocations and copies. - * May have embedded zeroes as a result of @a substitute, but relies too heavily on C string - * functions to allow reliable manipulations of these strings, other than simple appends, etc. - */ -class SString : protected SContainer { - lenpos_t sLen; ///< The size of the string in s - lenpos_t sizeGrowth; ///< Minimum growth size when appending strings - enum { sizeGrowthDefault = 64 }; - - bool grow(lenpos_t lenNew); - SString &assign(const char *sOther, lenpos_t sSize_=measure_length); - -public: - SString() : sLen(0), sizeGrowth(sizeGrowthDefault) {} - SString(const SString &source) : SContainer(), sizeGrowth(sizeGrowthDefault) { - s = StringAllocate(source.s, source.sLen); - sSize = sLen = (s) ? source.sLen : 0; - } - SString(const char *s_) : sizeGrowth(sizeGrowthDefault) { - s = StringAllocate(s_); - sSize = sLen = (s) ? strlen(s) : 0; - } - SString(SBuffer &buf) : sizeGrowth(sizeGrowthDefault) { - s = buf.ptr(); - sSize = sLen = buf.size(); - // Consumes the given buffer! - buf.reset(); - } - SString(const char *s_, lenpos_t first, lenpos_t last) : sizeGrowth(sizeGrowthDefault) { - // note: expects the "last" argument to point one beyond the range end (a la STL iterators) - s = StringAllocate(s_ + first, last - first); - sSize = sLen = (s) ? last - first : 0; - } - SString(int i); - SString(double d, int precision); - ~SString() { - sLen = 0; - } - void clear() { - if (s) { - *s = '\0'; - } - sLen = 0; - } - /** Size of buffer. */ - lenpos_t size() const { - return SContainer::size(); - } - /** Size of string in buffer. */ - lenpos_t length() const { - return sLen; - } - /** Read access to a character of the string. */ - char operator[](lenpos_t i) const { - return (s && i < sSize) ? s[i] : '\0'; - } - SString &operator=(const char *source) { - return assign(source); - } - SString &operator=(const SString &source) { - if (this != &source) { - assign(source.s, source.sLen); - } - return *this; - } - bool operator==(const SString &sOther) const; - bool operator!=(const SString &sOther) const { - return !operator==(sOther); - } - bool operator==(const char *sOther) const; - bool operator!=(const char *sOther) const { - return !operator==(sOther); - } - bool contains(char ch) const { - return (s && *s) ? strchr(s, ch) != 0 : false; - } - void setsizegrowth(lenpos_t sizeGrowth_) { - sizeGrowth = sizeGrowth_; - } - const char *c_str() const { - return s ? s : ""; - } - /** Give ownership of buffer to caller which must use delete[] to free buffer. */ - char *detach() { - char *sRet = s; - s = 0; - sSize = 0; - sLen = 0; - return sRet; - } - SString substr(lenpos_t subPos, lenpos_t subLen=measure_length) const; - SString &lowercase(lenpos_t subPos = 0, lenpos_t subLen=measure_length); - SString &uppercase(lenpos_t subPos = 0, lenpos_t subLen=measure_length); - SString &append(const char *sOther, lenpos_t sLenOther=measure_length, char sep = '\0'); - SString &operator+=(const char *sOther) { - return append(sOther, static_cast<lenpos_t>(measure_length)); - } - SString &operator+=(const SString &sOther) { - return append(sOther.s, sOther.sLen); - } - SString &operator+=(char ch) { - return append(&ch, 1); - } - SString &appendwithseparator(const char *sOther, char sep) { - return append(sOther, strlen(sOther), sep); - } - SString &insert(lenpos_t pos, const char *sOther, lenpos_t sLenOther=measure_length); - - /** - * Remove @a len characters from the @a pos position, included. - * Characters at pos + len and beyond replace characters at pos. - * If @a len is 0, or greater than the length of the string - * starting at @a pos, the string is just truncated at @a pos. - */ - void remove(lenpos_t pos, lenpos_t len); - - SString &change(lenpos_t pos, char ch) { - if (pos < sLen) { // character changed must be in string bounds - *(s + pos) = ch; - } - return *this; - } - /** Read an integral numeric value from the string. */ - int value() const { - return s ? atoi(s) : 0; - } - bool startswith(const char *prefix); - bool endswith(const char *suffix); - int search(const char *sFind, lenpos_t start=0) const; - bool contains(const char *sFind) const { - return search(sFind) >= 0; - } - int substitute(char chFind, char chReplace); - int substitute(const char *sFind, const char *sReplace); - int remove(const char *sFind) { - return substitute(sFind, ""); - } -}; - - -/** - * Duplicate a C string. - * Allocate memory of the given size, or big enough to fit the string if length isn't given; - * then copy the given string in the allocated memory. - * @return the pointer to the new string - */ -inline char *StringDup( - const char *s, ///< The string to duplicate - SContainer::lenpos_t len=SContainer::measure_length) ///< The length of memory to allocate. Optional. -{ - return SContainer::StringAllocate(s, len); -} - -#ifdef SCI_NAMESPACE -} -#endif - -#endif diff --git a/win32/deps.mak b/win32/deps.mak index d41c20a13..ff9610bc8 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -1,7 +1,7 @@ PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ../src/UniConversion.h ../src/XPM.h ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -9,7 +9,7 @@ ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/UniConversion.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ @@ -27,7 +27,7 @@ Document.o: ../src/Document.cxx ../include/Platform.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ ../src/RESearch.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/PropSet.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ @@ -40,228 +40,226 @@ Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/KeyMap.h KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \ - ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \ - ../include/KeyWords.h ../include/SciLexer.h ../include/SString.h + ../src/StyleContext.h ../include/PropSet.h \ + ../include/KeyWords.h ../include/SciLexer.h LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsn1.o: ../src/LexAsn1.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexD.o: ../src/LexD.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexForth.o: ../src/LexForth.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexHaskell.o: ../src/LexHaskell.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ - ../include/Scintilla.h ../include/SciLexer.h ../include/SString.h + ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexOpal.o: ../src/LexOpal.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexRebol.o: ../src/LexRebol.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ../src/StyleContext.h LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexSmalltalk.o: ../src/LexSmalltalk.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexSpice.o: ../src/LexSpice.cxx ../include/Platform.h \ ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \ - ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h \ - ../include/SString.h + ../include/KeyWords.h ../include/SciLexer.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h LexVHDL.o: ../src/LexVHDL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h -PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -271,7 +269,7 @@ ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ @@ -279,6 +277,6 @@ ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/win32/makefile b/win32/makefile index 5f495c7a4..79761a38c 100644 --- a/win32/makefile +++ b/win32/makefile @@ -90,12 +90,12 @@ include deps.mak ScintillaBaseL.o: ScintillaBase.cxx Platform.h Scintilla.h SciLexer.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \ - ScintillaBase.h PropSet.h SString.h Accessor.h DocumentAccessor.h \ + ScintillaBase.h PropSet.h Accessor.h DocumentAccessor.h \ KeyWords.h ExternalLexer.h PerLine.h ScintillaWinL.o: ScintillaWin.cxx Platform.h Scintilla.h SciLexer.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \ - ScintillaBase.h PropSet.h SString.h Accessor.h KeyWords.h \ + ScintillaBase.h PropSet.h Accessor.h KeyWords.h \ ExternalLexer.h UniConversion.h PerLine.h ScintillaWinS.o: ScintillaWin.cxx Platform.h Scintilla.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index ad8fa150c..f78c9f775 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -269,11 +269,11 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx # All lexers depend on this set of headers LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ + ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \ @@ -291,7 +291,7 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ ../src/RESearch.h ../src/PerLine.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/PropSet.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ @@ -304,14 +304,14 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h $(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/KeyMap.h $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate @@ -487,14 +487,13 @@ $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/S ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h -$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h $(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h $(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -502,7 +501,7 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -510,7 +509,7 @@ $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -518,7 +517,7 @@ $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -526,7 +525,7 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -538,7 +537,7 @@ $(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h ../include/Sc $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ @@ -546,6 +545,6 @@ $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index b21cdc742..d160c38a0 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -271,11 +271,11 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx # All lexers depend on this set of headers LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ + ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../src/AutoComplete.h $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \ @@ -293,7 +293,7 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ ../src/RESearch.h ../src/PerLine.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/PropSet.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ @@ -306,14 +306,14 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/Accessor.h ../src/DocumentAccessor.h \ ../include/KeyWords.h ../src/ExternalLexer.h $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h $(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/KeyMap.h $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate @@ -489,14 +489,13 @@ $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/S ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/PositionCache.h -$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h $(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h $(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -504,7 +503,7 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/Scintilla.h ../include/PropSet.h \ ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ @@ -512,7 +511,7 @@ $(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ ../src/Document.h ../src/Editor.h ../src/Selection.h ../src/ScintillaBase.h $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -520,7 +519,7 @@ $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -528,7 +527,7 @@ $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ ../src/Decoration.h ../src/Document.h ../src/Editor.h \ ../src/ScintillaBase.h ../src/Selection.h ../src/UniConversion.h $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../include/Scintilla.h ../src/ContractionState.h \ ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ @@ -540,7 +539,7 @@ $(DIR_O)\Selection.obj: ../src/Selection.cxx ../include/Platform.h ../include/Sc $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../src/StyleContext.h $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ @@ -548,6 +547,6 @@ $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ../src/Style.h ../src/ViewStyle.h $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/PropSet.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h |