paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 11:56:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate wrappers for LazUTF8 functions in LCLProc.

Browse Source 
git-svn-id: trunk@47604 -
This commit is contained in:
juha 2015-02-06 18:25:31 +00:00
parent 23756279f4
commit abf9a845da
87 changed files with 232 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/ideintf/stringspropeditdlg.pas
View File

@ -16,8 +16,8 @@ unit StringsPropEditDlg;
interface
uses
Classes, SysUtils, LCLProc, Forms, Controls, Buttons, Dialogs, StdCtrls,
TextTools, ObjInspStrConsts, ExtCtrls, ButtonPanel;
Classes, SysUtils, Forms, Controls, Buttons, Dialogs, StdCtrls,
TextTools, ObjInspStrConsts, ExtCtrls, ButtonPanel, LazUTF8;
type

2
components/lazdebuggergdbmi/debugutils.pp
View File

@ -35,7 +35,7 @@ unit DebugUtils;
interface
uses
DbgIntfBaseTypes, Classes, LCLProc;
DbgIntfBaseTypes, Classes, LCLProc, LazUTF8;
type

4
components/lazdebuggergdbmi/gdbmidebugger.pp
View File

@ -45,8 +45,8 @@ uses
{$IFDEF UNIX}
Unix,BaseUnix,termio,
{$ENDIF}
Classes, SysUtils, strutils, Controls, Maps, Variants, FileUtil, Dialogs,
BaseIDEIntf, LCLProc, LazClasses, LazLoggerBase, math,
Classes, SysUtils, strutils, math, Controls, Maps, Variants, FileUtil, Dialogs,
BaseIDEIntf, LCLProc, LazUTF8, LazClasses, LazLoggerBase,
DebugUtils, GDBTypeInfo, GDBMIDebugInstructions, GDBMIMiscClasses,
DbgIntfBaseTypes, DbgIntfDebuggerBase, GdbmiStringConstants,
Forms;

2
components/lazreport/source/lr_e_txt.pas
View File

@ -15,7 +15,7 @@ interface
{$I lr_vers.inc}
uses
Classes, SysUtils, LCLProc, LResources, Graphics, GraphType, Controls, Forms,
Classes, SysUtils, LazUTF8, LResources, Graphics, GraphType, Controls, Forms,
Dialogs, LCLType, LCLIntf, LR_Class;
type

4
components/lazreport/source/lr_utils.pas
View File

@ -16,11 +16,11 @@ interface
uses
SysUtils, Classes, Graphics, Controls,
LR_DBRel, Forms, StdCtrls, ClipBrd, Menus,db,
LR_DBRel, Forms, StdCtrls, ClipBrd, Menus, db,
{$IFDEF WIN32}
Windows,
{$ENDIF}
LCLType,LCLIntf,LCLProc,LConvEncoding;
LCLType, LCLIntf, LazUTF8, LConvEncoding;
type
TUTF8Item=packed record

5
components/lazreport/source/lr_view.pas
View File

@ -24,9 +24,8 @@ interface
{$I LR_Vers.inc}
uses
Classes, SysUtils, LResources,LMessages, Forms, Controls, Graphics, Dialogs,
ExtCtrls, Buttons, StdCtrls,Menus, GraphType,LCLType,LCLIntf,LCLProc,
Classes, SysUtils, LResources, LMessages, Forms, Controls, Graphics, Dialogs,
ExtCtrls, Buttons, StdCtrls, Menus, GraphType, LCLType, LCLIntf, LazUTF8,
LR_Const, PrintersDlgs;
type

5
components/pochecker/pocheckermain.pp
View File

@ -25,8 +25,8 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
StdCtrls, LCLProc, CheckLst, Buttons, ExtCtrls, ComCtrls, Types,
LCLType, Translations,
StdCtrls, CheckLst, Buttons, ExtCtrls, ComCtrls, Types,
LCLType, LazUTF8, Translations,
{$IFnDEF POCHECKERSTANDALONE}
IDEIntf, MenuIntf,
{$ENDIF}
@ -741,6 +741,7 @@ begin
end;
FPoCheckerSettings.SaveConfig;
end;
function ListSortFunc(List: TStringList; Index1, Index2: Integer): Integer;
begin
Result := Utf8CompareText(List.Strings[Index1], List.Strings[Index2]);

2
components/synedit/lazsynimm.pas
View File

@ -7,7 +7,7 @@ unit LazSynIMM;
interface
uses
windows, imm, Classes, SysUtils, LazLoggerBase, LCLType, LCLProc, Controls,
windows, imm, Classes, SysUtils, Controls, LazLoggerBase, LCLType, LazUTF8,
Graphics, SynEditMiscClasses, SynTextDrawer, SynEditPointClasses, SynEditMarkupSelection,
SynEditMarkup, SynEditTypes, SynEditKeyCmds, LazSynEditText;

4
components/synedit/syncompletion.pas
View File

@ -44,10 +44,10 @@ unit SynCompletion;
interface
uses
LCLProc, LCLIntf, LCLType, LMessages, Classes, Graphics, Forms,
LCLProc, LCLIntf, LCLType, LazUTF8, LMessages, Classes, Graphics, Forms,
Controls, StdCtrls, ExtCtrls, Menus, SysUtils, types,
SynEditMiscProcs, SynEditKeyCmds, SynEdit, SynEditTypes, SynEditPlugins
{$IF FPC_FULLVERSION >= 20701}, character, LazUTF8{$ENDIF};
{$IF FPC_FULLVERSION >= 20701}, character{$ENDIF};
type
TSynBaseCompletionPaintItem =

2
components/synedit/syneditmarkuphighall.pp
View File

@ -28,7 +28,7 @@ interface
uses
Classes, SysUtils, ExtCtrls, SynEditMarkup, SynEditTypes, SynEditSearch,
SynEditMiscClasses, Controls, LCLProc, SynEditHighlighter, SynEditPointClasses,
SynEditMiscProcs, SynEditFoldedView, SynEditTextBase, LazClasses;
SynEditMiscProcs, SynEditFoldedView, SynEditTextBase, LazClasses, LazUTF8;
type

6
components/synedit/syneditsearch.pp
View File

@ -42,7 +42,8 @@ unit SynEditSearch;
interface
uses
Classes, LCLProc, SynRegExpr, SynEditMiscProcs, SynEditTypes;
Classes, SysUtils,
LCLIntf, LCLType, LCLProc, LazUTF8, SynRegExpr, SynEditMiscProcs, SynEditTypes;
procedure MakeCompTable;
@ -131,9 +132,6 @@ function AdjustPositionAfterReplace(const p, ReplaceStart, ReplaceEnd: TPoint;
implementation
uses
LCLIntf, LCLType, SysUtils;
var
CompTableSensitive: TByteArray256;
CompTableNoneSensitive: TByteArray256;

2
components/synedit/synhighlightertex.pas
View File

@ -42,7 +42,7 @@ interface
uses
SysUtils, Classes,
LCLProc, LCLIntf, LCLType,
LCLIntf, LCLType, LazUTF8,
Controls, Graphics,
SynEditTypes, SynEditHighlighter;

4
components/synedit/synpluginsyncroedit.pp
View File

@ -26,9 +26,9 @@ unit SynPluginSyncroEdit;
interface
uses
Classes, Controls, SysUtils, LCLProc, Forms, Graphics, SynEditMiscClasses,
Classes, Controls, SysUtils, Forms, Graphics, SynEditMiscClasses,
LCLType, SynEdit, SynPluginSyncronizedEditBase, LazSynEditText, SynEditMiscProcs,
SynEditMouseCmds, SynEditKeyCmds, SynEditTypes, LCLIntf;
SynEditMouseCmds, SynEditKeyCmds, SynEditTypes, LCLIntf, LazUTF8;
type

4
components/turbopower_ipro/iphtml.pas
View File

@ -53,8 +53,8 @@ uses
{$IFDEF IP_LAZARUS}
//MemCheck,
Types, contnrs,
LCLType, LCLPRoc, GraphType, LCLIntf, LResources, LMessages, LCLMemManager,
Translations, FileUtil, LConvEncoding,
LCLType, GraphType, LCLProc, LCLIntf, LResources, LMessages, LCLMemManager,
Translations, FileUtil, LConvEncoding, LazUTF8,
IpHtmlTabList,
{$ELSE}
Windows,

2
converter/missingpropertiesdlg.pas
View File

@ -35,7 +35,7 @@ uses
// FCL+LCL
Classes, SysUtils, Math, LCLProc, Forms, Controls, Grids, LResources,
LConvEncoding, Graphics, Dialogs, Buttons, StdCtrls, ExtCtrls, contnrs,
FileUtil, LazUTF8Classes, LCLType,
FileUtil, LazUTF8Classes, LCLType, LazUTF8,
// components
SynHighlighterLFM, SynEdit, SynEditMiscClasses, LFMTrees,
// codetools

10
doceditor/freditor.pp
View File

@ -27,9 +27,11 @@ unit freditor;
interface
uses SysUtils, Classes, DOM, xmlread, xmlwrite, Forms, Controls, ExtCtrls,
StdCtrls, Dialogs, Menus, fpdeutil, Lazdemsg, Lazdeopts,
GraphType, ActnList, LResources, Buttons;
uses
SysUtils, Classes, StrUtils,
Forms, Controls, ExtCtrls, Buttons, StdCtrls, Dialogs, Menus,
DOM, xmlread, xmlwrite, fpdeutil, Lazdemsg, Lazdeopts,
GraphType, ActnList, LResources, LazUTF8;
Type
@ -154,7 +156,7 @@ Type
implementation
uses frmexample, frmLink, StrUtils, LCLProc, FrmMain;
uses frmexample, frmLink, FrmMain;
Function JoinLinkText(lblShortDescr,T : String): String;
begin

2
ide/allcompileroptions.pas
View File

@ -7,7 +7,7 @@ interface
uses
Classes, SysUtils, math, contnrs,
Forms, Controls, StdCtrls, Buttons, ButtonPanel, EditBtn, ExtCtrls,
LCLProc, Compiler, LazarusIDEStrConsts;
LCLProc, LazUTF8, Compiler, LazarusIDEStrConsts;
type

5
ide/charactermapdlg.pas
View File

@ -38,9 +38,8 @@ interface
uses
Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
StdCtrls, LCLType, LCLProc, LCLUnicodeData, GraphType, Grids, ButtonPanel,
ComCtrls,
IDEHelpIntf,
StdCtrls, LCLType, LCLUnicodeData, GraphType, Grids, ButtonPanel, ComCtrls,
IDEHelpIntf, LazUTF8,
LazarusIDEStrConsts, EditorOptions, EnvironmentOpts;
type

2
ide/codehelp.pas
View File

@ -40,7 +40,7 @@ interface
uses
Classes, SysUtils, LazFileCache, LCLProc, Forms, Controls, FileUtil, Dialogs,
AvgLvlTree, LCLType,
AvgLvlTree, LCLType, LazUTF8,
Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
// codetools
CodeAtom, CodeTree, CodeToolManager, FindDeclarationTool, BasicCodeTools,

2
ide/codemacroprompt.pas
View File

@ -34,7 +34,7 @@ uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs,
BasicCodeTools, CodeToolManager,
SynEditAutoComplete, SynPluginTemplateEdit, SynPluginSyncronizedEditBase, SynEdit,
MacroIntf, LazIDEIntf, SrcEditorIntf;
MacroIntf, LazIDEIntf, SrcEditorIntf, LazUTF8;
type
TCodeMacroPromptDlg = class(TForm)

2
ide/compiler.pp
View File

@ -39,7 +39,7 @@ interface
uses
Classes, SysUtils, Process, LCLProc, Forms, Controls, contnrs, strutils, FileUtil,
IDEExternToolIntf, IDEMsgIntf, CompOptsIntf, LazIDEIntf,
IDEExternToolIntf, IDEMsgIntf, CompOptsIntf, LazIDEIntf, LazUTF8,
IDECmdLine, LazarusIDEStrConsts, CompilerOptions, Project,
DefineTemplates, TransferMacros, EnvironmentOpts, LazFileUtils;

4
ide/debugmanager.pas
View File

@ -41,8 +41,8 @@ uses
MemCheck,
{$ENDIF}
// LCL
Classes, SysUtils, Forms, Controls, Dialogs, ExtCtrls, FileUtil, LCLProc,
LCLType, LCLIntf, LazLoggerBase, Laz2_XMLCfg, LazFileCache,
Classes, SysUtils, Forms, Controls, Dialogs, ExtCtrls, FileUtil,
LCLType, LCLIntf, LazLoggerBase, Laz2_XMLCfg, LazFileCache, LazUTF8,
// codetools
CodeCache, CodeToolManager, PascalParserTool, CodeTree,
// IDEIntf

2
ide/editoroptions.pp
View File

@ -43,7 +43,7 @@ uses
Classes, SysUtils, resource,
// LCL
Controls, ExtCtrls, Graphics, LCLProc, FileUtil, Laz2_XMLCfg, lazutf8classes,
LazClasses, LazFileUtils, LResources, Forms, Dialogs, ComCtrls, LCLType,
LazClasses, LazFileUtils, LResources, Forms, Dialogs, ComCtrls, LCLType, LazUTF8,
// Synedit
SynEdit, SynEditAutoComplete, SynEditKeyCmds, SynEditTypes,
SynEditMiscClasses, SynBeautifier, SynEditTextTrimmer, SynEditMouseCmds,

4
ide/encloseselectiondlg.pas
View File

@ -35,9 +35,9 @@ unit EncloseSelectionDlg;
interface
uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs, Buttons,
Classes, SysUtils, Forms, Controls, Graphics, Dialogs, Buttons,
ExtCtrls, BasicCodeTools, CodeToolManager, SourceChanger,
LazarusIDEStrConsts, LazConf, IDEProcs, ButtonPanel;
LazarusIDEStrConsts, LazConf, LazUTF8, IDEProcs, ButtonPanel;
type
TEncloseSelectionType = (

2
ide/frames/compiler_other_options.pas
View File

@ -29,7 +29,7 @@ interface
uses
Classes, SysUtils, math, AVL_Tree, LazLogger, Forms, Controls, Graphics,
Dialogs, StdCtrls, LCLProc, ComCtrls, LCLType, ExtCtrls, Buttons,
Dialogs, StdCtrls, ComCtrls, ExtCtrls, Buttons, LCLType, LazUTF8,
CodeToolsCfgScript, KeywordFuncLists, LazarusIDEStrConsts,
IDEOptionsIntf, CompOptsIntf, IDECommands, LazIDEIntf, Project, PackageDefs,
CompilerOptions, Compiler, AllCompilerOptions, CustomDefines,

2
ide/frames/editor_color_options.pas
View File

@ -26,7 +26,7 @@ interface
uses
Classes, Controls, math, types, typinfo, sysutils, Laz2_XMLCfg, LazFileUtils,
LCLProc, LCLType, LCLIntf, StdCtrls, ExtCtrls, Graphics, GraphUtil, ColorBox,
LCLProc, LCLType, LCLIntf, LazUTF8, StdCtrls, ExtCtrls, Graphics, GraphUtil, ColorBox,
ComCtrls, Dialogs, Menus, Spin, maskedit, SynEdit, SynEditMiscClasses,
SynGutterCodeFolding, SynGutterLineNumber, SynEditTypes, SynGutterChanges,
SynEditMouseCmds, SynEditHighlighter, SynTextDrawer, SynColorAttribEditor,

2
ide/frames/editor_keymapping_options.pas
View File

@ -26,7 +26,7 @@ interface
uses
Classes, SysUtils, FileUtil, TreeFilterEdit, Forms, StdCtrls, ComCtrls,
Controls, Dialogs, LCLType, LCLProc, Menus, Buttons, Clipbrd, EditorOptions,
Controls, Dialogs, LCLType, LazUTF8, Menus, Buttons, Clipbrd, EditorOptions,
LazarusIDEStrConsts, IDEOptionsIntf, IDEImagesIntf, editor_general_options,
KeymapSchemeDlg, KeyMapping, IDECommands, KeyMapShortCutDlg, SrcEditorIntf,
EditBtn, ExtCtrls;

4
ide/frames/editor_mouseaction_options_advanced.pas
View File

@ -26,9 +26,9 @@ interface
uses
EditorOptions, LazarusIDEStrConsts, IDEOptionsIntf, sysutils, StdCtrls,
ExtCtrls, Classes, Controls, LCLProc, Grids, ComCtrls, Dialogs,
ExtCtrls, Classes, Controls, Grids, ComCtrls, Dialogs,
SynEditMouseCmds, Laz2_XMLCfg, MouseActionDialog, math, KeyMapping,
IDEImagesIntf, IDEDialogs;
IDEImagesIntf, IDEDialogs, LazUTF8;
type

2
ide/frames/project_resources_options.pas
View File

@ -8,7 +8,7 @@ interface
uses
Classes, SysUtils, FileUtil, Graphics, Forms, Controls, ComCtrls, Dialogs,
LCLProc, LCLType,
LCLType, LazUTF8,
IDEOptionsIntf, IDEImagesIntf, IDEDialogs, Project,
ProjectUserResources, LCLStrConsts, ExtCtrls, StdCtrls, LazarusIDEStrConsts;

2
ide/frames/project_versioninfo_options.pas
View File

@ -6,7 +6,7 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
Spin, Buttons, Grids, CheckLst, LCLProc,
Spin, Buttons, Grids, CheckLst, LazUTF8,
Project, IDEOptionsIntf, LazarusIDEStrConsts, W32VersionInfo;
type

4
ide/idetranslations.pas
View File

@ -32,7 +32,7 @@ unit IDETranslations;
interface
uses
Classes, SysUtils, GetText, LCLProc, Translations,
Classes, SysUtils, GetText, LazUTF8, Translations,
IDEProcs, FileProcs, avl_tree,
CodeToolManager, DirectoryCacher, CodeCache,
LazarusIDEStrConsts;
@ -512,7 +512,7 @@ end;
initialization
LazarusTranslations:=nil;
LCLGetLanguageIDs(SystemLanguageID1,SystemLanguageID2);
LazGetLanguageIDs(SystemLanguageID1,SystemLanguageID2);
finalization
FreeAndNil(LazarusTranslations);

2
ide/inputhistory.pas
View File

@ -37,7 +37,7 @@ interface
uses
Classes, SysUtils, FileUtil, FileProcs, DiffPatch, IDEProcs, AvgLvlTree,
Laz2_XMLCfg, SynEditTypes, LazConf, Dialogs, LCLProc, IDEDialogs, ProjectIntf;
Laz2_XMLCfg, SynEditTypes, LazConf, Dialogs, LazUTF8, IDEDialogs, ProjectIntf;
{$ifdef Windows}
{$define CaseInsensitiveFilenames}

4
ide/jumphistoryview.pas
View File

@ -25,9 +25,9 @@ unit JumpHistoryView;
interface
uses
Classes, SysUtils, Forms, Controls, StdCtrls, Menus, LCLProc,
Classes, SysUtils, Forms, Controls, StdCtrls, Menus,
CodeToolManager, CodeCache,
IDEOptionDefs, EnvironmentOpts, IDEProcs, LazarusIDEStrConsts,
IDEOptionDefs, EnvironmentOpts, IDEProcs, LazarusIDEStrConsts, LazUTF8,
Project, ProjectDefs;
type

4
ide/newdialog.pas
View File

@ -39,10 +39,10 @@ unit NewDialog;
interface
uses
Buttons, SysUtils, Classes, LCLProc, ComCtrls, Controls, Dialogs,
Buttons, SysUtils, Classes, ComCtrls, Controls, Dialogs,
Forms, StdCtrls, ExtCtrls, FileProcs, ButtonPanel,
IDEWindowIntf, IDEImagesIntf, NewItemIntf, PackageIntf, ProjectIntf,
LazIDEIntf, IDEHelpIntf, IDEDialogs,
LazIDEIntf, IDEHelpIntf, IDEDialogs, LazUTF8,
InputHistory, LazarusIDEStrConsts, Project, MainIntf;
type

2
ide/projectdefs.pas
View File

@ -38,7 +38,7 @@ interface
uses
Classes, SysUtils,
Controls, Forms, SynRegExpr, FileProcs, Laz2_XMLCfg, LCLProc,
Controls, Forms, SynRegExpr, FileProcs, Laz2_XMLCfg, LazUTF8,
CompOptsIntf, ProjectIntf, LazIDEIntf,
ProjectResourcesIntf,
frmCustomApplicationOptions, PublishModule, IDEProcs, LazarusIDEStrConsts;

2
ide/searchresultview.pp
View File

@ -37,7 +37,7 @@ unit SearchResultView;
interface
uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, ComCtrls, LCLType, LCLIntf,
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, ComCtrls, LCLType, LCLIntf, LazUTF8,
Menus, strutils, IDEOptionDefs, LazarusIDEStrConsts, EnvironmentOpts, InputHistory,
IDEProcs, Project, MainIntf, Clipbrd, ActnList, IDECommands, TreeFilterEdit;

2
ide/sourceeditor.pp
View File

@ -46,7 +46,7 @@ uses
LCLProc, LCLType, LResources, LCLIntf, FileUtil, Forms, ComCtrls, Dialogs,
StdCtrls, Graphics, Translations, ClipBrd, types, Extctrls, Menus, HelpIntfs,
LConvEncoding, Messages, LazLoggerBase, lazutf8classes, LazLogger, AvgLvlTree,
LazFileCache,
LazFileCache, LazUTF8,
// codetools
BasicCodeTools, CodeBeautifier, CodeToolManager, CodeCache, SourceLog,
LinkScanner, CodeTree,

2
ide/transfermacros.pp
View File

@ -38,7 +38,7 @@ unit TransferMacros;
interface
uses Classes, SysUtils, LCLProc, FileUtil, FileProcs, LazarusIDEStrConsts,
uses Classes, SysUtils, LazUTF8, FileUtil, FileProcs, LazarusIDEStrConsts,
MacroIntf, MacroDefIntf;
type

2
lcl/comctrls.pp
View File

@ -30,7 +30,7 @@ interface
uses
SysUtils, Types, Classes, Math,
AvgLvlTree, LazUTF8Classes,
AvgLvlTree, LazUTF8, LazUTF8Classes,
LCLStrConsts, LResources, LCLIntf, LCLType,
FileUtil, LCLProc, LMessages, ImgList, ActnList, GraphType,
Graphics, Menus, Controls, Forms, StdCtrls, ExtCtrls, ToolWin, Buttons,

2
lcl/dbgrids.pas
View File

@ -33,7 +33,7 @@ interface
uses
Classes, SysUtils, Math, FileUtil, DB,
LCLStrConsts, LCLIntf, LCLProc, LCLType, LMessages, LResources,
LazUTF8, LCLStrConsts, LCLIntf, LCLProc, LCLType, LMessages, LResources,
Controls, StdCtrls, Graphics, Grids, Dialogs, Themes, Variants, Clipbrd;
{$if FPC_FULLVERSION<20701}

2
lcl/grids.pas
View File

@ -35,7 +35,7 @@ uses
Types, Classes, SysUtils, Math, Maps, LCLStrConsts, LCLProc, LCLType, LCLIntf,
FileUtil, FPCanvas, Controls, GraphType, Graphics, Forms, DynamicArray,
LMessages, StdCtrls, LResources, MaskEdit, Buttons, Clipbrd, Themes,
LazUtf8Classes, Laz2_XMLCfg; // <-- replaces XMLConf (part of FPC libs)
LazUTF8, LazUtf8Classes, Laz2_XMLCfg; // <-- replaces XMLConf (part of FPC libs)
const
//GRIDFILEVERSION = 1; // Original

2
lcl/include/application.inc
View File

@ -115,7 +115,7 @@ begin
RegisterFindGlobalComponentProc(@FindApplicationComponent);
{$ifndef wince}// remove ifdef when gettext is fixed
LCLGetLanguageIDs(LangDefault, LangFallback);
LazGetLanguageIDs(LangDefault, LangFallback);
if LangDefault <> '' then
FBidiMode := Direction(LangDefault)
else

2
lcl/interfacebase.pp
View File

@ -28,7 +28,7 @@ interface
uses
Types, Classes, SysUtils, Math, LCLStrConsts, LCLType, LCLProc, LMessages,
FPImage, GraphType, GraphMath, IntfGraphics, Themes;
FPImage, GraphType, GraphMath, IntfGraphics, Themes, LazUTF8;
type
PEventHandler = type Pointer;

2
lcl/interfaces/gtk2/gtk2int.pas
View File

@ -40,7 +40,7 @@ uses
gdk2pixbuf, gtk2, gdk2, glib2, Pango,
// LCL
Maps, FileUtil, Dialogs, Controls, Forms, LCLStrConsts,
LMessages, LCLProc, LCLIntf, LCLType, DynHashArray, GraphType, GraphMath,
LMessages, LCLProc, LazUTF8, LCLIntf, LCLType, DynHashArray, GraphType, GraphMath,
Graphics, Menus, Themes, WSLCLClasses,
Buttons, StdCtrls, CheckLst,

2
lcl/interfaces/gtk2/gtk2proc.pp
View File

@ -43,7 +43,7 @@ uses
{$endif}
// Other units
Math, // Math after gtk to get the correct Float type
LMessages, LCLProc, LCLIntf, LCLType, DynHashArray, Masks,
LMessages, LCLProc, LazUTF8, LCLIntf, LCLType, DynHashArray, Masks,
GraphType, Graphics, LResources, Controls, Forms,
Buttons, Menus, StdCtrls, ComCtrls, ExtCtrls, Dialogs, ExtDlgs,
FileUtil, ImgList, Gtk2FontCache, Gtk2Globals, Gtk2Def, Gtk2Extra, {%H-}Gtk2Debug,

2
lcl/interfaces/qt/qtint.pp
View File

@ -38,7 +38,7 @@ uses
// FPC
Classes, SysUtils, Math, Types, maps,
// LCL
InterfaceBase, LCLProc, LCLType, LMessages, LCLMessageGlue, LCLStrConsts,
InterfaceBase, LCLProc, LazUTF8, LCLType, LMessages, LCLMessageGlue, LCLStrConsts,
Controls, ExtCtrls, Forms,
Dialogs, StdCtrls, LCLIntf, GraphType, GraphUtil, Themes,
// WS

4
lcl/interfaces/qt/qtobjects.pas
View File

@ -27,8 +27,8 @@ uses
// Free Pascal
Classes, SysUtils, Types,
// LCL
LCLType, LCLIntf, Menus, LCLProc, Graphics, ClipBrd, ExtCtrls, Interfacebase,
maps;
LCLType, LCLIntf, LCLProc, LazUTF8, Menus, Graphics, ClipBrd, ExtCtrls,
Interfacebase, maps;
type
// forward declarations

2
lcl/interfaces/qt/qtprivate.pp
View File

@ -33,7 +33,7 @@ uses
// Free Pascal
Classes, SysUtils,
// LCL
Forms, Controls, LCLType, LCLProc, ExtCtrls, StdCtrls, LazUtf8Classes,
Forms, Controls, LCLType, LazUTF8, ExtCtrls, StdCtrls, LazUtf8Classes,
//Widgetset
QtWidgets, qtproc;

2
lcl/interfaces/qt/qtproc.pp
View File

@ -29,7 +29,7 @@ uses
InterfaceBase,
qt4,
GraphType,
LCLProc;
LazUTF8;
const
EVE_IO_READ = 1;

6
lcl/interfaces/qt/qtsystemtrayicon.pas
View File

@ -19,8 +19,9 @@ unit qtsystemtrayicon;
interface
{$i qtdefines.inc}
uses Classes, Controls, ExtCtrls, Graphics, Forms, types, LCLType, qtobjects, qt4,
qtproc;
uses
Classes, Controls, ExtCtrls, Graphics, Forms, types, LCLType, LazUTF8, LCLProc,
qtobjects, qt4, qtproc, qtint;
type
TSysTrayIconPaintData = record
@ -67,7 +68,6 @@ type
end;
implementation
uses qtint, LCLProc;
{ TQtSystemTrayIcon }

2
lcl/interfaces/qt/qtwidgets.pas
View File

@ -28,7 +28,7 @@ uses
// Free Pascal
Classes, SysUtils, Types,
// LCL
LCLType, LCLProc, LCLIntf, LMessages, Graphics, Forms, Controls,
LCLType, LCLProc, LazUTF8, LCLIntf, LMessages, Graphics, Forms, Controls,
ComCtrls, ExtCtrls, StdCtrls, Menus, Dialogs, ImgList;
type

2
lcl/interfaces/qt/qtwscontrols.pp
View File

@ -27,7 +27,7 @@ uses
qt4,
qtwidgets, qtobjects, qtproc, qtint,
// LCL
SysUtils, Classes, Types, Controls, LCLType, LCLProc, Forms, Graphics,
SysUtils, Classes, Types, Controls, LCLType, LazUTF8, Forms, Graphics,
// Widgetset
InterfaceBase, WSProc, WSControls, WSLCLClasses;

2
lcl/interfaces/qt/qtwsdialogs.pp
View File

@ -27,7 +27,7 @@ uses
qt4,
qtobjects, qtwidgets, qtproc,
// RTL + LCL
SysUtils, Classes, LCLType, LCLProc, Dialogs, Controls, Forms, Graphics,
SysUtils, Classes, LCLType, LazUTF8, Dialogs, Controls, Forms, Graphics,
// Widgetset
WSDialogs, WSLCLClasses;

3
lcl/interfaces/qt/qtwsextctrls.pp
View File

@ -27,8 +27,7 @@ uses
qt4,
qtwidgets, qtobjects, qtproc, QtWSControls,
// LCL
LCLProc,
SysUtils, Classes, Controls, Graphics, Forms, ExtCtrls, LCLType,
SysUtils, Classes, Controls, Graphics, Forms, ExtCtrls, LCLType, LazUTF8,
// Widgetset
WSExtCtrls, WSLCLClasses;

2
lcl/interfaces/win32/win32int.pp
View File

@ -31,7 +31,7 @@ uses
Windows, // keep as first
ActiveX, Classes,
Translations, ComCtrls, Controls, Buttons,
Forms, Dialogs, GraphMath, GraphType, InterfaceBase, LCLIntf,
Forms, Dialogs, GraphMath, GraphType, InterfaceBase, LCLIntf, LazUTF8,
LCLType, LMessages, StdCtrls, SysUtils, Win32Def, Graphics, Menus, CommCtrl,
MultiMon, Themes{, Win32Debug};

3
lcl/interfaces/win32/win32proc.pp
View File

@ -23,7 +23,8 @@ interface
uses
Windows, Win32Extra, Classes, SysUtils,
LMessages, LCLType, LCLProc, LCLMessageGlue,Controls, Forms, Menus, GraphType, IntfGraphics;
LMessages, LCLType, LCLProc, LCLMessageGlue, LazUTF8, Controls, Forms, Menus,
GraphType, IntfGraphics;
const
LV_DISP_INFO_COUNT = 2;

2
lcl/interfaces/win32/win32themes.pas
View File

@ -11,7 +11,7 @@ uses
// rtl
Classes, SysUtils,
// lcl
Controls, Graphics, Themes, LCLProc, LCLType;
Controls, Graphics, Themes, LCLType, LazUTF8;
type

2
lcl/interfaces/win32/win32wsbuttons.pp
View File

@ -29,7 +29,7 @@ uses
// uncomment only when needed for registration
////////////////////////////////////////////////////
Windows, CommCtrl, Classes, Buttons, Graphics, GraphType, Controls,
LCLType, LCLProc, LCLMessageGlue, LMessages, Themes,
LCLType, LCLMessageGlue, LMessages, LazUTF8, Themes,
////////////////////////////////////////////////////
WSProc, WSButtons, Win32WSControls, Win32WSImgList,
UxTheme, Win32Themes;

4
lcl/interfaces/win32/win32wschecklst.pp
View File

@ -27,8 +27,8 @@ uses
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
Windows, Classes, Controls, CheckLst, StdCtrls, Themes, Graphics, LCLType, LCLProc,
LMessages, LCLMessageGlue,
Windows, Classes, Controls, CheckLst, StdCtrls, Themes, Graphics, LCLType,
LazUTF8, LMessages, LCLMessageGlue,
////////////////////////////////////////////////////
WSCheckLst, WSLCLClasses, Win32Int, Win32Proc, Win32WSControls, Win32WSStdCtrls;

3
lcl/interfaces/win32/win32wscomctrls.pp
View File

@ -24,11 +24,10 @@ interface
uses
// FCL
CommCtrl, Windows, Classes, SysUtils, Math, Win32Extra,
ShellAPI,
// LCL
ComCtrls, LCLType, Controls, Graphics, Themes,
ImgList, StdCtrls, Forms, LCLIntf,
LMessages, LCLProc, LCLMessageGlue, InterfaceBase,
LMessages, LazUTF8, LCLMessageGlue, InterfaceBase,
// widgetset
WSComCtrls, WSLCLClasses, WSControls, WSProc,
// win32 widgetset

2
lcl/interfaces/win32/win32wscontrols.pp
View File

@ -32,7 +32,7 @@ uses
////////////////////////////////////////////////////
WSControls, WSLCLClasses, SysUtils, Win32Proc, Win32Extra, WSProc,
{ LCL }
InterfaceBase, LCLType, LCLIntf, LCLProc, Themes, Forms;
InterfaceBase, LCLType, LCLIntf, LCLProc, LazUTF8, Themes, Forms;
type
{ TWin32WSDragImageList }

2
lcl/interfaces/win32/win32wsdialogs.pp
View File

@ -32,7 +32,7 @@ uses
Windows, shlobj, ShellApi, ActiveX, SysUtils, Classes,
CommDlg,
// lcl
LCLProc, LCLType, Dialogs, Controls, Graphics, Forms, FileUtil, Themes, Masks,
LCLProc, LCLType, LazUTF8, Dialogs, Controls, Graphics, Forms, FileUtil, Themes, Masks,
// ws
WSDialogs, WSLCLClasses, Win32Extra, Win32Int, InterfaceBase,
Win32Proc;

2
lcl/interfaces/win32/win32wsextctrls.pp
View File

@ -30,7 +30,7 @@ uses
// rtl
Windows, CommCtrl, SysUtils, Classes,
// lcl
ExtCtrls, Controls, ImgList, LCLType, LCLIntf, LCLProc, Themes, LCLMessageGlue, ComCtrls, WSComCtrls,
ExtCtrls, Controls, ImgList, LCLType, LCLIntf, LazUTF8, Themes, LCLMessageGlue, ComCtrls, WSComCtrls,
// ws
WSControls, WSExtCtrls, WSLCLClasses, WSProc, Win32Extra, Win32Int, Win32Proc,
InterfaceBase, Win32WSControls;

2
lcl/interfaces/win32/win32wsgrids.pp
View File

@ -29,7 +29,7 @@ uses
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
Windows, LCLType, LCLProc, Controls, Win32Proc,
Windows, LCLType, LazUTF8, Controls, Win32Proc,
////////////////////////////////////////////////////
WSGrids;

2
lcl/interfaces/win32/win32wsmenus.pp
View File

@ -32,7 +32,7 @@ uses
////////////////////////////////////////////////////
WSMenus, WSLCLClasses, WSProc,
Windows, Controls, Classes, SysUtils, Win32Int, Win32Proc, Win32WSImgList,
InterfaceBase, LCLProc, Themes, UxTheme, Win32Themes, Win32Extra,
InterfaceBase, LCLProc, LazUTF8, Themes, UxTheme, Win32Themes, Win32Extra,
FileUtil;
type

2
lcl/interfaces/win32/win32wsspin.pp
View File

@ -29,7 +29,7 @@ uses
// uncomment only when needed for registration
////////////////////////////////////////////////////
CommCtrl, Windows, Win32Extra,
Spin, Controls, StdCtrls, LCLType, LCLProc, LMessages,
Spin, Controls, StdCtrls, LCLType, LMessages, LazUTF8,
////////////////////////////////////////////////////
WSSpin, WSLCLClasses, WSProc,
Win32Int, Win32Proc, Win32WSStdCtrls, Win32WSControls;

4
lcl/interfaces/win32/win32wsstdctrls.pp
View File

@ -31,8 +31,8 @@ uses
Classes, SysUtils, CommCtrl,
StdCtrls, Controls, Graphics, Forms, Themes,
////////////////////////////////////////////////////
WSControls, WSStdCtrls, WSLCLClasses, WSProc, Windows, LCLType, LCLProc, LazUtf8Classes,
InterfaceBase, LMessages, LCLMessageGlue,
WSControls, WSStdCtrls, WSLCLClasses, WSProc, Windows, LCLType,
LazUTF8, LazUtf8Classes, InterfaceBase, LMessages, LCLMessageGlue,
Win32Int, Win32Proc, Win32WSControls, Win32Extra, Win32Themes;
type

2
lcl/interfaces/wince/winceint.pp
View File

@ -44,7 +44,7 @@ uses
Windows,
// RTL, LCL
Classes, ComCtrls, Controls, Buttons, Dialogs, DynHashArray,
ExtCtrls, Forms, GraphMath, GraphType, InterfaceBase, LCLIntf, LCLType,
ExtCtrls, Forms, GraphMath, GraphType, InterfaceBase, LCLIntf, LCLType, LazUTF8,
LMessages, StdCtrls, SysUtils, Graphics, Menus,
// Widgetset
WinCEProc, WinCEExtra, WinExt, WinCEDef, Themes;

2
lcl/interfaces/wince/winceproc.pp
View File

@ -14,7 +14,7 @@ uses
{$endif}
// compatibility
// RTL, LCL
Classes, LMessages, LCLType, LCLProc, Controls, Forms, Menus,
Classes, LMessages, LCLType, LCLProc, LazUTF8, Controls, Forms, Menus,
WinCEExtra, GraphType, LCLMessageGlue;
type

2
lcl/interfaces/wince/wincewsbuttons.pp
View File

@ -26,7 +26,7 @@ uses
// RTL
SysUtils, Classes,
// LCL
Controls, Buttons, Graphics, GraphType, LCLType, LCLProc,
Controls, Buttons, Graphics, GraphType, LCLType, LCLProc, LazUTF8,
// Widgetset
WSButtons, WSLCLClasses, WinCEWSControls, WinCEWSImgList, WinCEProc;

2
lcl/interfaces/wince/wincewscomctrls.pp
View File

@ -27,7 +27,7 @@ uses
// LCL
ComCtrls, LCLType, Controls, Graphics,
ImgList, StdCtrls, Math, LCLIntf, ExtCtrls,
LCLProc, InterfaceBase, LMessages, LCLMessageGlue,
LazUTF8, InterfaceBase, LMessages, LCLMessageGlue,
// widgetset
WSComCtrls, WSLCLClasses, WSProc, WsControls,
WinCEInt, WinCEProc, WinCEWSControls, WinCEExtra;

3
lcl/interfaces/wince/wincewscontrols.pp
View File

@ -25,8 +25,7 @@ uses
Windows,
commctrl,
// RTL, LCL
Classes, LCLProc,
LCLType, Controls, Forms, Graphics,
Classes, LCLProc, LazUTF8, LCLType, Controls, Forms, Graphics,
// Widgetset
winceproc, WinCEInt, Sysutils, WSProc,
WSLCLClasses, WSImgList, WSControls,

2
lcl/interfaces/wince/wincewsextctrls.pp
View File

@ -27,7 +27,7 @@ uses
{$ifdef Win32}win32compat,{$endif}
// LCL
ExtCtrls, Classes, Controls, ImgList, Forms, LCLType, LCLIntf, LCLMessageGlue,
LCLProc,
LazUTF8,
// widgetset
WSControls, WSExtCtrls, WSLCLClasses, WinCEInt, WinCEProc, InterfaceBase,
WinCEWSControls, WSProc;

2
lcl/interfaces/wince/wincewsgrids.pp
View File

@ -24,7 +24,7 @@ uses
// RTL, FCL
Windows,
// LCL
LCLType, LCLProc, Controls,
LCLType, LazUTF8, Controls,
// Widgetset
WSGrids, WinCEWSControls, WinCEInt;

2
lcl/interfaces/wince/wincewsmenus.pp
View File

@ -22,7 +22,7 @@ interface
uses
// LCL
Graphics, GraphType, ImgList, Menus, Forms, LCLIntf, {keep before Windows }
Controls, InterfaceBase, LCLProc,
Controls, InterfaceBase, LCLProc, LazUTF8,
// RTL, FCL
Windows, Classes, SysUtils,
commctrl,

2
lcl/interfaces/wince/wincewsspin.pp
View File

@ -24,7 +24,7 @@ uses
commctrl,
Windows,
// LCL
Spin, Controls, StdCtrls, LCLType, LCLProc,
Spin, Controls, StdCtrls, LCLType, LazUTF8,
// Widgetset
WSSpin, WSLCLClasses, WinCEInt, WinCEProc,
WinCEWSStdCtrls, WinCEWSControls;

2
lcl/interfaces/wince/wincewsstdctrls.pp
View File

@ -28,7 +28,7 @@ uses
{$ifdef Win32}win32compat,{$endif}
// RTL, FCL, LCL
SysUtils, LCLType, Classes, StdCtrls, Controls, Graphics, Forms, WinCEProc,
InterfaceBase, LMessages, LCLMessageGlue, LCLProc, LazUtf8Classes,
InterfaceBase, LMessages, LCLMessageGlue, LazUTF8, LazUtf8Classes,
// Widgetset
WSControls, WSStdCtrls, WSLCLClasses, WinCEInt, WinCEWSControls, WinCEExtra,
WSProc;

2
lcl/lazhelpintf.pas
View File

@ -26,7 +26,7 @@ interface
uses
Classes, SysUtils, LCLProc, FileUtil, LCLStrConsts, Dialogs,
LazConfigStorage, HelpIntfs, Masks, LazFileUtils;
LazConfigStorage, HelpIntfs, Masks, LazFileUtils, LazUTF8;
type
{ THelpQueryItem }

2
lcl/lclintf.pas
View File

@ -47,7 +47,7 @@ uses
{$IFDEF UNIX}Unix, {$ENDIF}
{$IFDEF Darwin}MacOSAll, {$ENDIF}
Types, Math, Classes, SysUtils, LCLType, LCLProc, GraphType, InterfaceBase,
LResources, FileUtil, UTF8Process, Maps, LMessages, lazutf8sysutils, LCLStrConsts;
LResources, FileUtil, UTF8Process, Maps, LMessages, LazUTF8, lazutf8sysutils, LCLStrConsts;
{$ifdef Trace}
{$ASSERTIONS ON}

230
lcl/lclproc.pas
View File

@ -319,10 +319,6 @@ function StringCase(const AString: String; const ACase: array of String; const A
function ClassCase(const AClass: TClass; const ACase: array of TClass {; const ADescendant: Boolean = True}): Integer; overload;
function ClassCase(const AClass: TClass; const ACase: array of TClass; const ADecendant: Boolean): Integer; overload;
// UTF-8 Routines in LCLProc are provided only for backwards compatibility,
// use the routines from LazUTF8 instead
// MWE: define (missing) UTF16string similar to UTF8
// strictly spoken, a widestring <> utf16string
// todo: use it in existing functions
@ -330,36 +326,6 @@ type
UTF16String = type UnicodeString;
PUTF16String = ^UTF16String;
function UTF8CharacterLength(p: PChar): integer; inline;
function UTF8Length(const s: string): PtrInt;
function UTF8Length(p: PChar; ByteCount: PtrInt): PtrInt; inline;
function UTF8CharacterToUnicode(p: PChar; out CharLen: integer): Cardinal; inline;
function UnicodeToUTF8(u: cardinal; Buf: PChar): integer; inline;
function UnicodeToUTF8SkipErrors(u: cardinal; Buf: PChar): integer; inline;
function UnicodeToUTF8(u: cardinal): shortstring; inline;
function UTF8ToDoubleByteString(const s: string): string; inline;
function UTF8ToDoubleByte(UTF8Str: PChar; Len: PtrInt; DBStr: PByte): PtrInt; inline;
function UTF8FindNearestCharStart(UTF8Str: PChar; Len: integer;
BytePos: integer): integer; inline;
// find the n-th UTF8 character, ignoring BIDI
function UTF8CharStart(UTF8Str: PChar; Len, CharIndex: PtrInt): PChar; inline;
// find the byte index of the n-th UTF8 character, ignoring BIDI (byte len of substr)
function UTF8CharToByteIndex(UTF8Str: PChar; Len, CharIndex: PtrInt): PtrInt; inline;
procedure UTF8FixBroken(P: PChar); inline;
function UTF8CharacterStrictLength(P: PChar): integer; inline;
function UTF8CStringToUTF8String(SourceStart: PChar; SourceLen: PtrInt) : string; inline;
function UTF8Pos(const SearchForText, SearchInText: string): PtrInt; inline;
function UTF8Copy(const s: string; StartCharIndex, CharCount: PtrInt): string; inline;
procedure UTF8Delete(var s: String; StartCharIndex, CharCount: PtrInt); inline;
procedure UTF8Insert(const source: String; var s: string; StartCharIndex: PtrInt); inline;
function UTF8LowerCase(const s: String): String;
function UTF8UpperCase(const s: String): String;
function FindInvalidUTF8Character(p: PChar; Count: PtrInt;
StopOnNonASCII: Boolean = true): PtrInt; inline;
function ValidUTF8String(const s: String): String; inline;
procedure AssignUTF8ListToAnsi(UTF8List, AnsiList: TStrings);
// Felipe: Don't substitute with calls to lazutf16 because lazutf16 includes
// some initialization code and tables, which are not necessary for the LCL
function UTF16CharacterLength(p: PWideChar): integer;
@ -368,30 +334,61 @@ function UTF16Length(p: PWideChar; WordCount: PtrInt): PtrInt;
function UTF16CharacterToUnicode(p: PWideChar; out CharLen: integer): Cardinal;
function UnicodeToUTF16(u: cardinal): UTF16String;
{$IFnDEF NoLazUTF8Wrappers}
function UTF8CharacterLength(p: PChar): integer; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8Length(const s: string): PtrInt; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8Length(p: PChar; ByteCount: PtrInt): PtrInt; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8CharacterToUnicode(p: PChar; out CharLen: integer): Cardinal; inline; deprecated 'Use the function in LazUTF8 unit';
function UnicodeToUTF8(u: cardinal; Buf: PChar): integer; inline; deprecated 'Use the function in LazUTF8 unit';
function UnicodeToUTF8SkipErrors(u: cardinal; Buf: PChar): integer; inline; deprecated 'Use the function in LazUTF8 unit';
function UnicodeToUTF8(u: cardinal): shortstring; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8ToDoubleByteString(const s: string): string; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8ToDoubleByte(UTF8Str: PChar; Len: PtrInt; DBStr: PByte): PtrInt; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8FindNearestCharStart(UTF8Str: PChar; Len: integer;
BytePos: integer): integer; inline; deprecated 'Use the function in LazUTF8 unit';
// find the n-th UTF8 character, ignoring BIDI
function UTF8CharStart(UTF8Str: PChar; Len, CharIndex: PtrInt): PChar; inline; deprecated 'Use the function in LazUTF8 unit';
// find the byte index of the n-th UTF8 character, ignoring BIDI (byte len of substr)
function UTF8CharToByteIndex(UTF8Str: PChar; Len, CharIndex: PtrInt): PtrInt; inline; deprecated 'Use the function in LazUTF8 unit';
procedure UTF8FixBroken(P: PChar); inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8CharacterStrictLength(P: PChar): integer; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8CStringToUTF8String(SourceStart: PChar; SourceLen: PtrInt) : string; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8Pos(const SearchForText, SearchInText: string): PtrInt; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8Copy(const s: string; StartCharIndex, CharCount: PtrInt): string; inline; deprecated 'Use the function in LazUTF8 unit';
procedure UTF8Delete(var s: String; StartCharIndex, CharCount: PtrInt); inline; deprecated 'Use the function in LazUTF8 unit';
procedure UTF8Insert(const source: String; var s: string; StartCharIndex: PtrInt); inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8LowerCase(const s: String): String; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8UpperCase(const s: String): String; inline; deprecated 'Use the function in LazUTF8 unit';
function FindInvalidUTF8Character(p: PChar; Count: PtrInt;
StopOnNonASCII: Boolean = true): PtrInt; inline; deprecated 'Use the function in LazUTF8 unit';
function ValidUTF8String(const s: String): String; inline; deprecated 'Use the function in LazUTF8 unit';
procedure AssignUTF8ListToAnsi(UTF8List, AnsiList: TStrings); inline; deprecated 'Use the function in LazUTF8 unit';
//compare functions
function UTF8CompareStr(const S1, S2: String): Integer;
function UTF8CompareText(const S1, S2: String): Integer;
function UTF8CompareStr(const S1, S2: String): Integer; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8CompareText(const S1, S2: String): Integer; inline; deprecated 'Use the function in LazUTF8 unit';
type
TConvertResult = LazUTF8.TConvertResult;
TConvertOption = LazUTF8.TConvertOption;
TConvertOptions = LazUTF8.TConvertOptions;
function ConvertUTF8ToUTF16(Dest: PWideChar; DestWideCharCount: SizeUInt;
Src: PChar; SrcCharCount: SizeUInt; Options: TConvertOptions;
out ActualWideCharCount: SizeUInt): TConvertResult;
out ActualWideCharCount: SizeUInt): TConvertResult; inline; deprecated 'Use the function in LazUTF8 unit';
function ConvertUTF16ToUTF8(Dest: PChar; DestCharCount: SizeUInt;
Src: PWideChar; SrcWideCharCount: SizeUInt; Options: TConvertOptions;
out ActualCharCount: SizeUInt): TConvertResult;
out ActualCharCount: SizeUInt): TConvertResult; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF8ToUTF16(const S: AnsiString): UTF16String;
function UTF16ToUTF8(const S: UTF16String): AnsiString;
function UTF8ToUTF16(const S: AnsiString): UTF16String; inline; deprecated 'Use the function in LazUTF8 unit';
function UTF16ToUTF8(const S: UTF16String): AnsiString; inline; deprecated 'Use the function in LazUTF8 unit';
// locale
procedure LCLGetLanguageIDs(var Lang, FallbackLang: String);
procedure LCLGetLanguageIDs(var Lang, FallbackLang: String); inline; deprecated 'Use the function in LazUTF8 unit';
{$ENDIF}
// identifier
function CreateFirstIdentifier(const Identifier: string): string;
@ -2635,6 +2632,80 @@ begin
Result := -1;
end;
function UTF16CharacterLength(p: PWideChar): integer;
// returns length of UTF16 character in number of words
// The endianess of the machine will be taken.
begin
if p<>nil then begin
if (ord(p[0]) < $D800) or (ord(p[0]) > $DFFF) then
Result:=1
else
Result:=2;
end else begin
Result:=0;
end;
end;
function UTF16Length(const s: UTF16String): PtrInt;
begin
Result:=UTF16Length(PWideChar(s),length(s));
end;
function UTF16Length(p: PWideChar; WordCount: PtrInt): PtrInt;
var
CharLen: LongInt;
begin
Result:=0;
while (WordCount>0) do begin
inc(Result);
CharLen:=UTF16CharacterLength(p);
inc(p,CharLen);
dec(WordCount,CharLen);
end;
end;
function UTF16CharacterToUnicode(p: PWideChar; out CharLen: integer): Cardinal;
var
w1: cardinal;
w2: Cardinal;
begin
if p<>nil then begin
w1:=ord(p[0]);
if (w1 < $D800) or (w1 > $DFFF) then begin
// is 1 word character
Result:=w1;
CharLen:=1;
end else begin
// could be 2 word character
w2:=ord(p[1]);
if (w2>=$DC00) then begin
// is 2 word character
Result:=(w1-$D800) shl 10 + (w2-$DC00) + $10000;
CharLen:=2;
end else begin
// invalid character
Result:=w1;
CharLen:=1;
end;
end;
end else begin
Result:=0;
CharLen:=0;
end;
end;
function UnicodeToUTF16(u: cardinal): UTF16String;
begin
// u should be <= $10FFFF to fit into UTF-16
if u < $10000 then
// Note: codepoints $D800 - $DFFF are reserved
Result:=system.widechar(u)
else
Result:=system.widechar($D800+((u - $10000) shr 10))+system.widechar($DC00+((u - $10000) and $3ff));
end;
{$IFnDEF NoLazUTF8Wrappers}
function UTF8CharacterLength(p: PChar): integer;
begin
Result := LazUTF8.UTF8CharacterLength(p);
@ -2767,80 +2838,6 @@ begin
LazUTF8.AssignUTF8ListToAnsi(UTF8List, AnsiList);
end;
function UTF16CharacterLength(p: PWideChar): integer;
// returns length of UTF16 character in number of words
// The endianess of the machine will be taken.
begin
if p<>nil then begin
if (ord(p[0]) < $D800) or (ord(p[0]) > $DFFF) then
Result:=1
else
Result:=2;
end else begin
Result:=0;
end;
end;
function UTF16Length(const s: UTF16String): PtrInt;
begin
Result:=UTF16Length(PWideChar(s),length(s));
end;
function UTF16Length(p: PWideChar; WordCount: PtrInt): PtrInt;
var
CharLen: LongInt;
begin
Result:=0;
while (WordCount>0) do begin
inc(Result);
CharLen:=UTF16CharacterLength(p);
inc(p,CharLen);
dec(WordCount,CharLen);
end;
end;
function UTF16CharacterToUnicode(p: PWideChar; out CharLen: integer): Cardinal;
var
w1: cardinal;
w2: Cardinal;
begin
if p<>nil then begin
w1:=ord(p[0]);
if (w1 < $D800) or (w1 > $DFFF) then begin
// is 1 word character
Result:=w1;
CharLen:=1;
end else begin
// could be 2 word character
w2:=ord(p[1]);
if (w2>=$DC00) then begin
// is 2 word character
Result:=(w1-$D800) shl 10 + (w2-$DC00) + $10000;
CharLen:=2;
end else begin
// invalid character
Result:=w1;
CharLen:=1;
end;
end;
end else begin
Result:=0;
CharLen:=0;
end;
end;
function UnicodeToUTF16(u: cardinal): UTF16String;
begin
// u should be <= $10FFFF to fit into UTF-16
if u < $10000 then
// Note: codepoints $D800 - $DFFF are reserved
Result:=system.widechar(u)
else
Result:=system.widechar($D800+((u - $10000) shr 10))+system.widechar($DC00+((u - $10000) and $3ff));
end;
{------------------------------------------------------------------------------
Name: UTF8CompareStr
Params: S1, S2 - UTF8 encoded strings
@ -2955,6 +2952,7 @@ procedure LCLGetLanguageIDs(var Lang, FallbackLang: String);
begin
LazUTF8.LazGetLanguageIDs(Lang, FallbackLang);
end;
{$ENDIF}
function CreateFirstIdentifier(const Identifier: string): string;
// example: Ident59 becomes Ident1

6
lcl/lcltranslator.pas
View File

@ -35,8 +35,8 @@ in directory where your program translation files are placed.
interface
uses
Classes, SysUtils, LResources, GetText, Controls, typinfo, FileUtil, LCLProc,
Translations, Forms;
Classes, SysUtils, LResources, GetText, Controls, typinfo, FileUtil,
Translations, Forms, LazUTF8;
type
@ -234,7 +234,7 @@ begin
Lang := GetEnvironmentVariableUTF8('LANG');
if Lang = '' then
LCLGetLanguageIDs(Lang, T);
LazGetLanguageIDs(Lang, T);
Result := GetLocaleFileName(Lang, LCExt, Dir);
if Result <> '' then

2
lcl/lresources.pp
View File

@ -34,7 +34,7 @@ uses
Windows,
{$ENDIF}
Classes, SysUtils, Types, RtlConsts, FPCAdds, TypInfo, FileUtil, DynQueue,
LCLProc, LCLStrConsts, LazConfigStorage, LazUTF8Classes;
LCLProc, LCLStrConsts, LazConfigStorage, LazUTF8, LazUTF8Classes;
{$DEFINE UseLRS}
{$DEFINE UseRES}

4
lcl/postscriptcanvas.pas
View File

@ -42,9 +42,9 @@ unit PostScriptCanvas;
interface
uses
Classes, SysUtils, strutils, FileUtil, LazUTF8Classes, Math, Types, Graphics,
Classes, SysUtils, strutils, FileUtil, Math, Types, Graphics,
Forms, GraphMath, GraphType, FPImage, IntfGraphics, Printers, LCLType,
LCLIntf, LCLProc, PostScriptUnicode;
LCLIntf, LCLProc, PostScriptUnicode, LazUTF8, LazUTF8Classes;
Type

2
lcl/stdctrls.pp
View File

@ -25,7 +25,7 @@ interface
uses
Classes, SysUtils, types, LCLStrConsts, LCLType, LCLProc, LMessages, Graphics,
ExtendedStrings, LCLIntf, ActnList, Controls, TextStrings,
ExtendedStrings, LCLIntf, ActnList, Controls, TextStrings, LazUTF8,
Forms, Menus, LResources;
type

2
lcl/translations.pas
View File

@ -87,7 +87,7 @@ interface
uses
Classes, SysUtils, LCLProc, FileUtil, StringHashList, AvgLvlTree,
LConvEncoding, LazUTF8Classes, jsonparser, fpjson;
LConvEncoding, LazUTF8, LazUTF8Classes, jsonparser, fpjson;
type
TStringsType = (

4
lcl/widgetset/wsgrids.pp
View File

@ -39,7 +39,7 @@ uses
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
LCLType, Controls, StdCtrls, Grids,
LCLType, Controls, StdCtrls, Grids, LazUTF8,
////////////////////////////////////////////////////
WSLCLClasses, WSControls, WSFactory;
@ -59,7 +59,7 @@ type
implementation
uses
LCLIntf, LCLProc;
LCLIntf;
{ TWSCustomGrid }

2
packager/pkgmanager.pas
View File

@ -46,7 +46,7 @@ uses
MemCheck,
{$ENDIF}
// FCL, LCL
TypInfo, math, Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, Menus,
TypInfo, math, Classes, SysUtils, LCLProc, LazUTF8, Forms, Controls, Dialogs, Menus,
contnrs, StringHashList, Translations, LResources, ComCtrls,
// codetools
CodeToolsConfig, CodeToolManager, CodeCache, CodeToolsStructs, BasicCodeTools,