From e1f0b53997023b4c32f05e9db8e5be9c88c44932 Mon Sep 17 00:00:00 2001 From: halx99 Date: Sat, 26 Aug 2023 15:54:55 +0800 Subject: [PATCH] Use utf-8 for source code --- 3rdParty/lua/wrapper/DMLua.cpp | 64 ++-- 3rdParty/lua/wrapper/DMLua.h | 22 +- CMakeLists.txt | 3 - DMMultSingletonT.h | 22 +- DmMain/inc/Common/ActiveX/DMActiveXBase.h | 18 +- DmMain/inc/Common/ActiveX/DMActiveXHelper.h | 4 +- DmMain/inc/Common/Bundle/DMBundleImpl.h | 6 +- DmMain/inc/Common/DMBundle.h | 30 +- DmMain/inc/Common/DMColor.h | 32 +- DmMain/inc/Common/DMDC.h | 4 +- DmMain/inc/Common/DMDIBHelper.h | 58 ++-- DmMain/inc/Common/DMDateTime.h | 4 +- DmMain/inc/Common/DMDef.h | 2 +- DmMain/inc/Common/DMDelegate.h | 6 +- DmMain/inc/Common/DMError.h | 62 ++-- DmMain/inc/Common/DMGifParse.h | 88 ++--- DmMain/inc/Common/DMHWndHelper.h | 76 ++--- DmMain/inc/Common/DMHelper.h | 10 +- DmMain/inc/Common/DMMemDispatch.h | 30 +- DmMain/inc/Common/DMMisc.h | 14 +- DmMain/inc/Common/DMRefNum.h | 38 +-- DmMain/inc/Common/DMSpyTool.h | 30 +- DmMain/inc/Common/DMVersion.h | 6 +- DmMain/inc/Common/DMXmlParse.h | 198 +++++------ DmMain/inc/Common/DUIWindowHelper.h | 186 +++++------ DmMain/inc/Common/Plugins/DMDynLib.h | 20 +- DmMain/inc/Common/Plugins/DMDynLibMgr.h | 12 +- DmMain/inc/Common/Plugins/DMPluginsTool.h | 26 +- DmMain/inc/Common/Template/DMAllocT.h | 82 ++--- DmMain/inc/Common/Template/DMArrayT.h | 88 ++--- DmMain/inc/Common/Template/DMAutoResetT.h | 26 +- DmMain/inc/Common/Template/DMLock.h | 22 +- DmMain/inc/Common/Template/DMMapT.h | 78 ++--- DmMain/inc/Common/Template/DMSingletonT.h | 16 +- DmMain/inc/Common/Template/DMSmartPtrT.h | 40 +-- DmMain/inc/Common/Template/DMStringT.h | 20 +- DmMain/inc/Common/Template/DMTaskT.h | 44 +-- DmMain/inc/Common/Template/DMTreeT.h | 104 +++--- DmMain/inc/Core/DMApp.h | 266 +++++++-------- DmMain/inc/Core/DMAppData.h | 86 ++--- DmMain/inc/Core/DMBase.h | 76 ++--- DmMain/inc/Core/DMCWnd.h | 46 +-- DmMain/inc/Core/DMCWndBase.h | 16 +- DmMain/inc/Core/DMContainerImpl.h | 16 +- DmMain/inc/Core/DMDispatch.h | 10 +- DmMain/inc/Core/DMDragWnd.h | 10 +- DmMain/inc/Core/DMDropWnd.h | 20 +- DmMain/inc/Core/DMHDialog.h | 8 +- DmMain/inc/Core/DMRegMgr.h | 18 +- DmMain/inc/Core/Dui/DUIAccel.h | 36 +- DmMain/inc/Core/Dui/DUIDropTargetDispatch.h | 20 +- DmMain/inc/Core/Dui/DUIFocusMgr.h | 54 +-- DmMain/inc/Core/Dui/DUIFontPool.h | 18 +- DmMain/inc/Core/Dui/DUISkinPool.h | 88 ++--- DmMain/inc/Core/Dui/DUIStylePool.h | 44 +-- DmMain/inc/Core/Dui/DUITimer.h | 20 +- DmMain/inc/Core/Dui/DUIWndPool.h | 46 +-- DmMain/inc/Core/Event/DMEventMgr.h | 34 +- DmMain/inc/Core/Event/DMEventSubscriber.h | 8 +- DmMain/inc/Core/Event/DMEvents.h | 156 ++++----- DmMain/inc/Core/Msg/DMEventCrack.h | 16 +- DmMain/inc/Core/Msg/DMMsgCrack.h | 26 +- DmMain/inc/Core/Msg/DMMsgLoop.h | 62 ++-- DmMain/inc/Core/Msg/DMMsgThunk.h | 14 +- DmMain/inc/Core/Msg/DMXmlCrack.h | 88 ++--- DmMain/inc/Core/Msg/DUIMsgCrack.h | 6 +- DmMain/inc/DmMainAfx.h | 12 +- DmMain/inc/DmMainOutput.h | 32 +- DmMain/inc/IDmMain/IDMAnimate.h | 22 +- DmMain/inc/IDmMain/IDMAttribute.h | 18 +- DmMain/inc/IDmMain/IDMContainer.h | 66 ++-- DmMain/inc/IDmMain/IDMDraw.h | 28 +- DmMain/inc/IDmMain/IDMImgDecoder.h | 44 +-- DmMain/inc/IDmMain/IDMLayout.h | 10 +- DmMain/inc/IDmMain/IDMLog.h | 34 +- DmMain/inc/IDmMain/IDMMsg.h | 12 +- DmMain/inc/IDmMain/IDMPlugin.h | 24 +- DmMain/inc/IDmMain/IDMRegT.h | 28 +- DmMain/inc/IDmMain/IDMRender.h | 190 +++++------ DmMain/inc/IDmMain/IDMRes.h | 72 ++-- DmMain/inc/IDmMain/IDMScript.h | 14 +- DmMain/inc/IDmMain/IDMSkin.h | 26 +- DmMain/inc/IDmMain/IDMStyle.h | 42 +-- DmMain/inc/IDmMain/IDMTaskRunner.h | 50 +-- DmMain/inc/IDmMain/IDMToolTip.h | 32 +- DmMain/inc/IDmMain/IDMTrans.h | 42 +-- DmMain/inc/Modules/DMAttributeImpl.h | 2 +- DmMain/inc/Modules/DMDrawImpl.h | 14 +- DmMain/inc/Modules/DMImgDecoderImpl.h | 12 +- DmMain/inc/Modules/DMLayoutImpl.h | 98 +++--- DmMain/inc/Modules/DMLogImpl.h | 2 +- DmMain/inc/Modules/DMPluginImpl.h | 4 +- DmMain/inc/Modules/DMResFolderImpl.h | 30 +- DmMain/inc/Modules/DMResHelper.h | 22 +- DmMain/inc/Modules/DMStyleImpl.h | 106 +++--- DmMain/inc/Modules/DMTaskRunnerImpl.h | 4 +- DmMain/inc/Modules/DMTooltipImpl.h | 22 +- DmMain/inc/Modules/DMTransHelper.h | 8 +- DmMain/inc/Modules/DMTransImpl.h | 12 +- DmMain/inc/Modules/Render/DMBitmapImpl.h | 4 +- DmMain/inc/Modules/Render/DMBrushImpl.h | 2 +- DmMain/inc/Modules/Render/DMCanvasImpl.h | 30 +- DmMain/inc/Modules/Render/DMFontImpl.h | 12 +- DmMain/inc/Modules/Render/DMPenImpl.h | 4 +- DmMain/inc/Modules/Render/DMRegionImpl.h | 4 +- DmMain/inc/Modules/Render/DMRenderImpl.h | 2 +- DmMain/inc/Modules/Skin/DMImg9SkinImpl.h | 8 +- DmMain/inc/Modules/Skin/DMImgListSkinImpl.h | 30 +- DmMain/inc/Modules/Skin/DMScrollBarSkinImpl.h | 14 +- DmMain/inc/Modules/Task/DMEventSlot.h | 18 +- DmMain/inc/Modules/Task/DMEventSlotEx.h | 10 +- DmMain/inc/Modules/Task/DMUITaskHandler.h | 6 +- DmMain/inc/Modules/Task/DMWorkTaskHandler.h | 30 +- DmMain/inc/Widgets/DMWidgetDef.h | 26 +- DmMain/inc/Widgets/DUIActiveX.h | 20 +- DmMain/inc/Widgets/DUIAnimate.h | 14 +- DmMain/inc/Widgets/DUIAnimateHelper.h | 16 +- DmMain/inc/Widgets/DUIButton.h | 42 +-- DmMain/inc/Widgets/DUICheckBox.h | 30 +- DmMain/inc/Widgets/DUIComboBox.h | 18 +- DmMain/inc/Widgets/DUIComboBoxHelper.h | 78 ++--- DmMain/inc/Widgets/DUIDateTimeCtrl.h | 6 +- DmMain/inc/Widgets/DUIEdit.h | 122 +++---- DmMain/inc/Widgets/DUIEditHelper.h | 26 +- DmMain/inc/Widgets/DUIFlash.h | 14 +- DmMain/inc/Widgets/DUIFlowLayout.h | 70 ++-- DmMain/inc/Widgets/DUIGif.h | 50 +-- DmMain/inc/Widgets/DUIGroup.h | 24 +- DmMain/inc/Widgets/DUIHeaderCtrl.h | 88 ++--- DmMain/inc/Widgets/DUIHotKeyCtrl.h | 22 +- DmMain/inc/Widgets/DUIIE.h | 114 +++---- DmMain/inc/Widgets/DUIItemPanel.h | 56 ++-- DmMain/inc/Widgets/DUILabel.h | 14 +- DmMain/inc/Widgets/DUILink.h | 18 +- DmMain/inc/Widgets/DUIListBox.h | 72 ++-- DmMain/inc/Widgets/DUIListBoxEx.h | 60 ++-- DmMain/inc/Widgets/DUIListCtrlEx.h | 70 ++-- DmMain/inc/Widgets/DUIMenu.h | 26 +- DmMain/inc/Widgets/DUIMenuHelper.h | 158 ++++----- DmMain/inc/Widgets/DUIMonthCalCtrl.h | 186 +++++------ DmMain/inc/Widgets/DUIPAddressCtrl.h | 22 +- DmMain/inc/Widgets/DUIPngGif.h | 14 +- DmMain/inc/Widgets/DUIProcessCtrl.h | 44 +-- DmMain/inc/Widgets/DUIRadioButton.h | 28 +- DmMain/inc/Widgets/DUIRectTracker.h | 100 +++--- DmMain/inc/Widgets/DUIScrollBase.h | 146 ++++---- DmMain/inc/Widgets/DUIScrollWnd.h | 20 +- DmMain/inc/Widgets/DUISliderCtrl.h | 58 ++-- DmMain/inc/Widgets/DUITabCtrl.h | 70 ++-- DmMain/inc/Widgets/DUITreeCtrl.h | 132 ++++---- DmMain/inc/Widgets/DUITreeCtrlEx.h | 148 ++++----- DmMain/inc/Widgets/DUIWindow.h | 314 +++++++++--------- DmMain/inc/Widgets/IDUIRealWnd.h | 22 +- DmMain/inc/Widgets/IDUIWeb.h | 112 +++---- DmMain/src/Common/ActiveX/DMActiveXBase.cpp | 4 +- DmMain/src/Common/ActiveX/DMActiveXHelper.cpp | 2 +- DmMain/src/Common/Bundle/DMBundleImpl.cpp | 4 +- DmMain/src/Common/DMBundle.cpp | 2 +- DmMain/src/Common/DMColor.cpp | 2 +- DmMain/src/Common/DMDC.cpp | 6 +- DmMain/src/Common/DMDIBHelper.cpp | 60 ++-- DmMain/src/Common/DMDateTime.cpp | 2 +- DmMain/src/Common/DMGifParse.cpp | 114 +++---- DmMain/src/Common/DMHWndHelper.cpp | 10 +- DmMain/src/Common/DMHelper.cpp | 8 +- DmMain/src/Common/DMMemDispatch.cpp | 2 +- DmMain/src/Common/DMSpyTool.cpp | 34 +- DmMain/src/Common/DMXmlParse.cpp | 24 +- DmMain/src/Common/DUIWindowHelper.cpp | 6 +- DmMain/src/Common/Plugins/DMDynLib.cpp | 4 +- DmMain/src/Common/Plugins/DMDynLibMgr.cpp | 2 +- DmMain/src/Common/Plugins/DMPluginsTool.cpp | 20 +- DmMain/src/Core/DMApp.cpp | 14 +- DmMain/src/Core/DMAppData.cpp | 76 ++--- DmMain/src/Core/DMBase.cpp | 6 +- DmMain/src/Core/DMCWnd.cpp | 24 +- DmMain/src/Core/DMCWndBase.cpp | 4 +- DmMain/src/Core/DMContainerImpl.cpp | 82 ++--- DmMain/src/Core/DMDispatch.cpp | 4 +- DmMain/src/Core/DMDragWnd.cpp | 10 +- DmMain/src/Core/DMDropWnd.cpp | 20 +- DmMain/src/Core/DMHDialog.cpp | 14 +- DmMain/src/Core/DMHWnd.cpp | 178 +++++----- DmMain/src/Core/DMRegMgr.cpp | 12 +- DmMain/src/Core/Dui/DUIAccel.cpp | 4 +- DmMain/src/Core/Dui/DUIDropTargetDispatch.cpp | 8 +- DmMain/src/Core/Dui/DUIFocusMgr.cpp | 48 +-- DmMain/src/Core/Dui/DUIFontPool.cpp | 34 +- DmMain/src/Core/Dui/DUISkinPool.cpp | 32 +- DmMain/src/Core/Dui/DUIStylePool.cpp | 6 +- DmMain/src/Core/Dui/DUITimer.cpp | 2 +- DmMain/src/Core/Dui/DUIWndPool.cpp | 20 +- DmMain/src/Core/Event/DMEventMgr.cpp | 2 +- DmMain/src/Core/Event/DMEventSubscriber.cpp | 2 +- DmMain/src/Core/Event/DMEvents.cpp | 4 +- DmMain/src/Core/Msg/DMMsgLoop.cpp | 14 +- DmMain/src/Core/Msg/DMMsgThunk.cpp | 8 +- DmMain/src/DmMainAfx.cpp | 2 +- DmMain/src/Modules/DMAttributeImpl.cpp | 14 +- DmMain/src/Modules/DMDrawImpl.cpp | 106 +++--- DmMain/src/Modules/DMImgDecoderImpl.cpp | 42 +-- DmMain/src/Modules/DMLayoutImpl.cpp | 70 ++-- DmMain/src/Modules/DMLogImpl.cpp | 14 +- DmMain/src/Modules/DMPluginImpl.cpp | 58 ++-- DmMain/src/Modules/DMResHelper.cpp | 2 +- DmMain/src/Modules/DMStyleImpl.cpp | 24 +- DmMain/src/Modules/DMTaskRunnerImpl.cpp | 2 +- DmMain/src/Modules/DMTooltipImpl.cpp | 22 +- DmMain/src/Modules/DMTransHelper.cpp | 2 +- DmMain/src/Modules/DMTransImpl.cpp | 48 +-- DmMain/src/Modules/Render/DMBitmapImpl.cpp | 2 +- DmMain/src/Modules/Render/DMBrushImpl.cpp | 2 +- DmMain/src/Modules/Render/DMCanvasImpl.cpp | 104 +++--- DmMain/src/Modules/Render/DMFontImpl.cpp | 2 +- DmMain/src/Modules/Render/DMPenImpl.cpp | 2 +- DmMain/src/Modules/Render/DMRegionImpl.cpp | 4 +- DmMain/src/Modules/Render/DMRenderImpl.cpp | 2 +- DmMain/src/Modules/Skin/DMImg9SkinImpl.cpp | 6 +- DmMain/src/Modules/Skin/DMImgListSkinImpl.cpp | 16 +- .../src/Modules/Skin/DMScrollBarSkinImpl.cpp | 14 +- DmMain/src/Modules/Task/DMEventSlot.cpp | 12 +- DmMain/src/Modules/Task/DMEventSlotEx.cpp | 2 +- DmMain/src/Modules/Task/DMUITaskHandler.cpp | 2 +- DmMain/src/Modules/Task/DMWorkTaskHandler.cpp | 42 +-- DmMain/src/Widgets/DUIActiveX.cpp | 14 +- DmMain/src/Widgets/DUIAnimate.cpp | 16 +- DmMain/src/Widgets/DUIAnimateHelper.cpp | 2 +- DmMain/src/Widgets/DUIButton.cpp | 42 +-- DmMain/src/Widgets/DUICheckBox.cpp | 32 +- DmMain/src/Widgets/DUIComboBox.cpp | 22 +- DmMain/src/Widgets/DUIComboBoxHelper.cpp | 58 ++-- DmMain/src/Widgets/DUIDateTimeCtrl.cpp | 2 +- DmMain/src/Widgets/DUIEdit.cpp | 94 +++--- DmMain/src/Widgets/DUIEditHelper.cpp | 32 +- DmMain/src/Widgets/DUIFlash.cpp | 20 +- DmMain/src/Widgets/DUIFlowLayout.cpp | 156 ++++----- DmMain/src/Widgets/DUIGif.cpp | 70 ++-- DmMain/src/Widgets/DUIGroup.cpp | 6 +- DmMain/src/Widgets/DUIHeaderCtrl.cpp | 54 +-- DmMain/src/Widgets/DUIHotKeyCtrl.cpp | 14 +- DmMain/src/Widgets/DUIIE.cpp | 34 +- DmMain/src/Widgets/DUIItemPanel.cpp | 10 +- DmMain/src/Widgets/DUILabel.cpp | 2 +- DmMain/src/Widgets/DUILink.cpp | 30 +- DmMain/src/Widgets/DUIListBox.cpp | 42 +-- DmMain/src/Widgets/DUIListBoxEx.cpp | 48 +-- DmMain/src/Widgets/DUIListCtrlEx.cpp | 86 ++--- DmMain/src/Widgets/DUIMenu.cpp | 34 +- DmMain/src/Widgets/DUIMenuHelper.cpp | 34 +- DmMain/src/Widgets/DUIMonthCalCtrl.cpp | 96 +++--- DmMain/src/Widgets/DUIPAddressCtrl.cpp | 4 +- DmMain/src/Widgets/DUIPngGif.cpp | 8 +- DmMain/src/Widgets/DUIProcessCtrl.cpp | 14 +- DmMain/src/Widgets/DUIRadioButton.cpp | 26 +- DmMain/src/Widgets/DUIRectTracker.cpp | 26 +- DmMain/src/Widgets/DUIScrollBase.cpp | 172 +++++----- DmMain/src/Widgets/DUIScrollWnd.cpp | 34 +- DmMain/src/Widgets/DUISliderCtrl.cpp | 12 +- DmMain/src/Widgets/DUITabCtrl.cpp | 42 +-- DmMain/src/Widgets/DUITreeCtrl.cpp | 74 ++--- DmMain/src/Widgets/DUITreeCtrlEx.cpp | 100 +++--- DmMain/src/Widgets/DUIWindow.cpp | 266 +++++++-------- DmMain/src/Widgets/IDUIRealWnd.cpp | 8 +- Docs/TestData/QQRes/layout/lua/test.lua | 20 +- Docs/TestData/UTRes/UTTest/lua/sample1.lua | 2 +- Docs/TestData/UTRes/UTTest/lua/sample2.lua | 2 +- Docs/TestData/UTRes/UTTest/lua/sample3.lua | 2 +- Docs/TestData/UTRes/UTTest/lua/sample4.lua | 2 +- Docs/TestData/UTRes/UTTest/lua/sample5.lua | 2 +- Docs/TestData/UTRes/UTTest/lua/sample6.lua | 2 +- Docs/TestData/UTRes/UTTest/lua/sample7.lua | 2 +- PlugIns/Plugin_Designer/inc/Plugin_Designer.h | 2 +- .../Plugin_Designer/inc/Plugin_DesignerAfx.h | 4 +- .../Plugin_Designer/src/Plugin_Designer.cpp | 2 +- .../src/Plugin_DesignerAfx.cpp | 2 +- .../src/Plugin_DesignerExp.cpp | 2 +- .../inc/Animate/3d/3dTransform.h | 14 +- PlugIns/Plugin_Expand/inc/Animate/3d/3dlib.h | 134 ++++---- .../Plugin_Expand/inc/Animate/3d/3dmatrix.h | 2 +- .../inc/Animate/3d/PerspectiveTransform.h | 32 +- .../Plugin_Expand/inc/Animate/DM3dAnimate.h | 12 +- .../inc/Animate/DMAnimateWndBase.h | 16 +- .../Plugin_Expand/inc/Animate/DMLineAnimate.h | 2 +- .../inc/Animate/DMScreenAnimate.h | 6 +- PlugIns/Plugin_Expand/inc/Plugin_Expand.h | 2 +- PlugIns/Plugin_Expand/inc/Plugin_ExpandAfx.h | 4 +- .../inc/Render/DMSkiaBitmapImpl.h | 8 +- .../inc/Render/DMSkiaBrushImpl.h | 4 +- .../inc/Render/DMSkiaCanvasImpl.h | 32 +- .../Plugin_Expand/inc/Render/DMSkiaFontImpl.h | 18 +- .../Plugin_Expand/inc/Render/DMSkiaHelper.h | 14 +- .../Plugin_Expand/inc/Render/DMSkiaPenImpl.h | 4 +- .../inc/Render/DMSkiaRegionImpl.h | 8 +- .../inc/Render/DMSkiaRenderImpl.h | 2 +- .../Plugin_Expand/inc/Res/DMResMultZipImpl.h | 2 +- .../Plugin_Expand/inc/Res/DMResZipHelper.h | 20 +- PlugIns/Plugin_Expand/inc/Res/DMResZipImpl.h | 34 +- PlugIns/Plugin_Expand/inc/Res/DMResZipParam.h | 8 +- PlugIns/Plugin_Expand/inc/Res/DMZipHelper.h | 6 +- .../Plugin_Expand/src/Animate/3d/3dlib.cpp | 2 +- .../Plugin_Expand/src/Animate/3d/3dmatrix.cpp | 2 +- .../src/Animate/3d/3dtransform.cpp | 88 ++--- .../Plugin_Expand/src/Animate/DM3dAnimate.cpp | 10 +- .../Plugin_Expand/src/DMAnimateWndBase.cpp | 6 +- PlugIns/Plugin_Expand/src/DMLineAnimate.cpp | 2 +- PlugIns/Plugin_Expand/src/DMScreenAnimate.cpp | 10 +- PlugIns/Plugin_Expand/src/Plugin_Expand.cpp | 8 +- .../Plugin_Expand/src/Plugin_ExpandAfx.cpp | 2 +- .../Plugin_Expand/src/Plugin_ExpandExp.cpp | 2 +- .../src/Render/DMSkiaBitmapImpl.cpp | 8 +- .../src/Render/DMSkiaBrushImpl.cpp | 2 +- .../src/Render/DMSkiaCanvasImpl.cpp | 104 +++--- .../src/Render/DMSkiaFontImpl.cpp | 10 +- .../Plugin_Expand/src/Render/DMSkiaHelper.cpp | 34 +- .../src/Render/DMSkiaPenImpl.cpp | 2 +- .../src/Render/DMSkiaRegionImpl.cpp | 4 +- .../src/Render/DMSkiaRenderImpl.cpp | 2 +- .../src/Res/DMResMultZipImpl.cpp | 12 +- .../Plugin_Expand/src/Res/DMResZipHelper.cpp | 2 +- .../Plugin_Expand/src/Res/DMResZipImpl.cpp | 72 ++-- PlugIns/Plugin_Expand/src/Res/DMZipHelper.cpp | 20 +- Samples/DMDemo/inc/AttributeTestWnd.h | 8 +- Samples/DMDemo/inc/DMDemoAfx.h | 6 +- Samples/DMDemo/inc/DMWebkit.h | 14 +- Samples/DMDemo/inc/DUIRealWnd.h | 4 +- Samples/DMDemo/inc/DUIWebkit.h | 10 +- Samples/DMDemo/inc/IEWnd.h | 4 +- Samples/DMDemo/inc/MainWnd.h | 26 +- Samples/DMDemo/inc/SkinWnd.h | 8 +- Samples/DMDemo/src/AttributeTestWnd.cpp | 14 +- Samples/DMDemo/src/DMDemo.cpp | 24 +- Samples/DMDemo/src/DMDemoAfx.cpp | 2 +- Samples/DMDemo/src/DUIRealWnd.cpp | 2 +- Samples/DMDemo/src/DUIWebkit.cpp | 14 +- Samples/DMDemo/src/IEWnd.cpp | 2 +- Samples/DMDemo/src/MainWnd.cpp | 24 +- Samples/DMDemo/src/SkinWnd.cpp | 4 +- Samples/DMDesigner/inc/Common/ActionSlot.h | 6 +- Samples/DMDesigner/inc/Common/ActionSlotMgr.h | 46 +-- Samples/DMDesigner/inc/Common/Data.h | 30 +- Samples/DMDesigner/inc/Common/Events.h | 34 +- Samples/DMDesigner/inc/Core/AddXml.h | 6 +- Samples/DMDesigner/inc/Core/AttrBase.h | 12 +- Samples/DMDesigner/inc/Core/HostAttr.h | 8 +- Samples/DMDesigner/inc/Core/NameAttr.h | 6 +- Samples/DMDesigner/inc/Core/ObjXml.h | 24 +- Samples/DMDesigner/inc/Core/PosAttr.h | 2 +- Samples/DMDesigner/inc/Core/ProjXml.h | 32 +- Samples/DMDesigner/inc/Core/RightXml.h | 8 +- Samples/DMDesigner/inc/Core/WidgetAttr.h | 8 +- Samples/DMDesigner/inc/DMDesignerAfx.h | 6 +- Samples/DMDesigner/inc/DMDesignerWnd.h | 8 +- Samples/DMDesigner/inc/Modules/Draw.h | 16 +- Samples/DMDesigner/inc/Modules/Layout.h | 102 +++--- Samples/DMDesigner/inc/Modules/Plugin.h | 4 +- Samples/DMDesigner/inc/Modules/ResFolder.h | 30 +- Samples/DMDesigner/inc/Modules/ResHelper.h | 22 +- .../DMDesigner/inc/Modules/ResMultFolder.h | 6 +- Samples/DMDesigner/inc/Modules/TipsImpl.h | 18 +- Samples/DMDesigner/inc/Widgets/AddExpandWnd.h | 4 +- .../DMDesigner/inc/Widgets/AttrExpandWnd.h | 4 +- Samples/DMDesigner/inc/Widgets/DUIDragFrame.h | 56 ++-- Samples/DMDesigner/inc/Widgets/DUILimitEdit.h | 22 +- Samples/DMDesigner/inc/Widgets/DUIList.h | 82 ++--- Samples/DMDesigner/inc/Widgets/DUIObjEditor.h | 18 +- Samples/DMDesigner/inc/Widgets/DUIPos.h | 20 +- Samples/DMDesigner/inc/Widgets/DUIPropCtrl.h | 78 ++--- .../inc/Widgets/DUIPropCtrlHelper.h | 76 ++--- Samples/DMDesigner/inc/Widgets/DUIRect.h | 20 +- Samples/DMDesigner/inc/Widgets/DUIRoot.h | 20 +- Samples/DMDesigner/inc/Widgets/DUISize.h | 20 +- Samples/DMDesigner/inc/Widgets/DUITreeEx.h | 184 +++++----- Samples/DMDesigner/inc/Widgets/DUImgEditor.h | 6 +- Samples/DMDesigner/inc/Widgets/IProp.h | 46 +-- Samples/DMDesigner/inc/Widgets/ImgDlg.h | 10 +- Samples/DMDesigner/inc/Widgets/ImgTypeDlg.h | 4 +- Samples/DMDesigner/inc/Widgets/LayoutDlg.h | 6 +- Samples/DMDesigner/inc/Widgets/MsgBox.h | 4 +- Samples/DMDesigner/inc/Widgets/NewResDlg.h | 10 +- Samples/DMDesigner/inc/Widgets/ObjTree.h | 4 +- Samples/DMDesigner/inc/Widgets/PoolDlg.h | 4 +- Samples/DMDesigner/inc/Widgets/PreHWnd.h | 6 +- Samples/DMDesigner/inc/Widgets/ProjTree.h | 2 +- Samples/DMDesigner/inc/Widgets/ScanDlg.h | 4 +- Samples/DMDesigner/inc/Widgets/SkinDlg.h | 6 +- Samples/DMDesigner/inc/Widgets/StyleDlg.h | 6 +- Samples/DMDesigner/inc/Widgets/ThemeDlg.h | 2 +- Samples/DMDesigner/inc/Widgets/TipWnd.h | 4 +- Samples/DMDesigner/inc/Widgets/XmlEditor.h | 24 +- Samples/DMDesigner/resource.h | 2 +- Samples/DMDesigner/src/Common/ActionSlot.cpp | 6 +- Samples/DMDesigner/src/Common/Data.cpp | 4 +- Samples/DMDesigner/src/Common/Helper.cpp | 66 ++-- Samples/DMDesigner/src/Core/AddXml.cpp | 6 +- Samples/DMDesigner/src/Core/AttrBase.cpp | 8 +- Samples/DMDesigner/src/Core/HostAttr.cpp | 56 ++-- Samples/DMDesigner/src/Core/NameAttr.cpp | 16 +- Samples/DMDesigner/src/Core/PosAttr.cpp | 8 +- Samples/DMDesigner/src/Core/RightXml.cpp | 28 +- Samples/DMDesigner/src/DMDesigner.cpp | 10 +- Samples/DMDesigner/src/DMDesignerAfx.cpp | 2 +- Samples/DMDesigner/src/Modules/Draw.cpp | 106 +++--- Samples/DMDesigner/src/Modules/Layout.cpp | 102 +++--- Samples/DMDesigner/src/Modules/Plugin.cpp | 2 +- Samples/DMDesigner/src/Modules/ResHelper.cpp | 2 +- .../DMDesigner/src/Modules/ResMultFolder.cpp | 8 +- .../DMDesigner/src/Widgets/AddExpandWnd.cpp | 4 +- .../DMDesigner/src/Widgets/AttrExpandWnd.cpp | 6 +- .../DMDesigner/src/Widgets/DUIDragFrame.cpp | 46 +-- .../DMDesigner/src/Widgets/DUILimitEdit.cpp | 4 +- .../DMDesigner/src/Widgets/DUIObjEditor.cpp | 16 +- .../DMDesigner/src/Widgets/DUIPropCtrl.cpp | 42 +-- .../src/Widgets/DUIPropCtrlHelper.cpp | 76 ++--- Samples/DMDesigner/src/Widgets/DUIRect.cpp | 4 +- .../DMDesigner/src/Widgets/DUImgEditor.cpp | 26 +- Samples/DMDesigner/src/Widgets/NewResDlg.cpp | 26 +- Samples/DMDesigner/src/Widgets/ObjTree.cpp | 4 +- Samples/DMDesigner/src/Widgets/ProjTree.cpp | 6 +- Samples/DMDesigner/src/Widgets/XmlEditor.cpp | 80 ++--- Samples/DMUnitTest/DMUintTestAfx.cpp | 2 +- Samples/DMUnitTest/DMUintTestAfx.h | 8 +- Samples/DMUnitTest/main.cpp | 8 +- Samples/DMUnitTest/main.h | 6 +- Samples/QQDemo/inc/DMResZipParam.h | 8 +- Samples/QQDemo/inc/DMTipsImpl.h | 30 +- Samples/QQDemo/inc/DMTrayIconImpl.h | 34 +- Samples/QQDemo/inc/QQDemoAfx.h | 6 +- Samples/QQDemo/inc/QQMainWnd.h | 14 +- Samples/QQDemo/inc/SkinPreview.h | 6 +- Samples/QQDemo/inc/SkinWnd.h | 10 +- Samples/QQDemo/inc/TrayIconWndMgr.h | 20 +- Samples/QQDemo/inc/WndShadow.h | 2 +- Samples/QQDemo/inc/script/DMScriptHelper.h | 12 +- Samples/QQDemo/inc/script/DMScriptImpl.h | 6 +- Samples/QQDemo/inc/spy/SpyFindBtn.h | 10 +- Samples/QQDemo/inc/spy/SpyWnd.h | 14 +- Samples/QQDemo/inc/widget/AttributeTestWnd.h | 8 +- Samples/QQDemo/inc/widget/ComboBox_Test.h | 2 +- Samples/QQDemo/inc/widget/DMWebkit.h | 14 +- Samples/QQDemo/inc/widget/DUISplitter.h | 30 +- Samples/QQDemo/inc/widget/DUIWebkit.h | 10 +- Samples/QQDemo/inc/widget/Gif_Test.h | 2 +- Samples/QQDemo/inc/widget/IEWnd.h | 4 +- Samples/QQDemo/inc/widget/IE_Test.h | 2 +- Samples/QQDemo/inc/widget/ListBox_Test.h | 2 +- Samples/QQDemo/inc/widget/TabCtrl_Test.h | 2 +- Samples/QQDemo/inc/widget/WidgetWnd.h | 18 +- Samples/QQDemo/resource.h | 2 +- Samples/QQDemo/src/DMTipsImpl.cpp | 54 +-- Samples/QQDemo/src/QQDemo.cpp | 30 +- Samples/QQDemo/src/QQDemoAfx.cpp | 2 +- Samples/QQDemo/src/QQMainWnd.cpp | 52 +-- Samples/QQDemo/src/SkinPreview.cpp | 6 +- Samples/QQDemo/src/SkinWnd.cpp | 14 +- Samples/QQDemo/src/TrayIconWndMgr.cpp | 8 +- Samples/QQDemo/src/WndShadow.cpp | 2 +- Samples/QQDemo/src/script/DMScriptHelper.cpp | 8 +- Samples/QQDemo/src/script/DMScriptImpl.cpp | 52 +-- Samples/QQDemo/src/spy/SpyFindBtn.cpp | 20 +- Samples/QQDemo/src/spy/SpyWnd.cpp | 36 +- .../QQDemo/src/widget/AttributeTestWnd.cpp | 14 +- Samples/QQDemo/src/widget/ComboBox_Test.cpp | 4 +- Samples/QQDemo/src/widget/DUIWebkit.cpp | 14 +- Samples/QQDemo/src/widget/Gif_Test.cpp | 2 +- Samples/QQDemo/src/widget/IEWnd.cpp | 4 +- Samples/QQDemo/src/widget/IE_Test.cpp | 10 +- Samples/QQDemo/src/widget/ListBox_Test.cpp | 2 +- Samples/QQDemo/src/widget/TabCtrl_Test.cpp | 10 +- Samples/QQDemo/src/widget/WidgetWnd.cpp | 46 +-- Samples/TGPDemo/inc/Menu/TGPMenu.h | 18 +- Samples/TGPDemo/inc/Res/DMResZipParam.h | 8 +- Samples/TGPDemo/inc/TGPComboboxEx.h | 14 +- Samples/TGPDemo/inc/TGPDemoAfx.h | 6 +- Samples/TGPDemo/inc/TGPListBoxEx.h | 82 ++--- Samples/TGPDemo/inc/TGPLoginWnd.h | 10 +- Samples/TGPDemo/inc/TGPMainWnd.h | 10 +- Samples/TGPDemo/inc/TGPTipsImpl.h | 30 +- Samples/TGPDemo/resource.h | 2 +- Samples/TGPDemo/src/Menu/TGPMenu.cpp | 16 +- Samples/TGPDemo/src/TGPComboboxEx.cpp | 24 +- Samples/TGPDemo/src/TGPDemo.cpp | 38 +-- Samples/TGPDemo/src/TGPDemoAfx.cpp | 2 +- Samples/TGPDemo/src/TGPListBoxEx.cpp | 64 ++-- Samples/TGPDemo/src/TGPLoginWnd.cpp | 4 +- Samples/TGPDemo/src/TGPMainWnd.cpp | 4 +- Samples/TGPDemo/src/TGPTipsImpl.cpp | 58 ++-- Tools/MacroTool/DMMacro/inc/MacroHelper.h | 12 +- Tools/MacroTool/DMMacro/inc/MainWnd.h | 10 +- Tools/MacroTool/DMMacro/inc/StdAfx.h | 4 +- Tools/MacroTool/DMMacro/src/DMMacro.cpp | 10 +- Tools/MacroTool/DMMacro/src/MacroHelper.cpp | 26 +- Tools/MacroTool/DMMacro/src/MainWnd.cpp | 8 +- Tools/MacroTool/DMMacro/src/StdAfx.cpp | 2 +- 493 files changed, 7182 insertions(+), 7185 deletions(-) diff --git a/3rdParty/lua/wrapper/DMLua.cpp b/3rdParty/lua/wrapper/DMLua.cpp index 594d7b4b..f8bd02b7 100644 --- a/3rdParty/lua/wrapper/DMLua.cpp +++ b/3rdParty/lua/wrapper/DMLua.cpp @@ -1,4 +1,4 @@ -extern "C" { +锘縠xtern "C" { #include "lua.h" #include "lualib.h" #include "lauxlib.h" @@ -7,7 +7,7 @@ extern "C" { #include "DMLua.h" namespace DMLUA { - // 辅助函数 + // 杈呭姪鍑芥暟 static int tostring_s64(lua_State *L) { char temp[64]; @@ -137,7 +137,7 @@ namespace DMLUA lua_pushcclosure(L, tostring_u64, 0); lua_rawset(L, -3); - // 比较只会两边元表都是相同的元素才会进入比较 + // 姣旇緝鍙細涓よ竟鍏冭〃閮芥槸鐩稿悓鐨勫厓绱犳墠浼氳繘鍏ユ瘮杈 lua_pushstring(L, "__eq"); lua_pushcclosure(L, eq_u64, 0); lua_rawset(L, -3); @@ -161,7 +161,7 @@ namespace DMLUA void close(lua_State *L) { - //销毁指定 Lua 状态机中的所有对象(如果有垃圾收集相关的元方法的话,会调用它们),并且释放状态机中使用的所有动态内存 + //閿姣佹寚瀹 Lua 鐘舵佹満涓殑鎵鏈夊璞★紙濡傛灉鏈夊瀮鍦炬敹闆嗙浉鍏崇殑鍏冩柟娉曠殑璇濓紝浼氳皟鐢ㄥ畠浠),骞朵笖閲婃斁鐘舵佹満涓娇鐢ㄧ殑鎵鏈夊姩鎬佸唴瀛 lua_close(L); } @@ -689,92 +689,92 @@ namespace DMLUA // -------------------------------------------------------- int meta_get(lua_State *L) { - // 传入表 和 索引参数 - // stack: 1.类(userdata) 2.变量(string) + // 浼犲叆琛 鍜 绱㈠紩鍙傛暟 + // stack: 1.绫(userdata) 2.鍙橀噺(string) lua_getmetatable(L,1); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) lua_pushvalue(L,2); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.变量(string) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.鍙橀噺(string) lua_rawget(L,-2); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.meta[变量]value值(userdata) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.meta[鍙橀噺]value鍊(userdata) - // 如果存在userdata 存在该变量 + // 濡傛灉瀛樺湪userdata 瀛樺湪璇ュ彉閲 if(lua_isuserdata(L,-1)) { user2type::invoke(L,-1)->get(L); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.meta[变量]value值(userdata) 5.实际值 + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.meta[鍙橀噺]value鍊(userdata) 5.瀹為檯鍊 lua_remove(L, -2); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.实际值 + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.瀹為檯鍊 } else if(lua_isnil(L,-1)) { - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.nil + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.nil lua_remove(L,-1); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) invoke_parent(L); // fix bug by fergus - // 调用父类也需调用get + // 璋冪敤鐖剁被涔熼渶璋冪敤get if(lua_isuserdata(L,-1)) { - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.父类中的变量(userdata) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.鐖剁被涓殑鍙橀噺(userdata) user2type::invoke(L,-1)->get(L); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.父类中的变量(userdata) 5.实际值 + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.鐖剁被涓殑鍙橀噺(userdata) 5.瀹為檯鍊 lua_remove(L, -2); - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.实际值 + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.瀹為檯鍊 } else if(lua_isnil(L,-1)) { - // stack: 1.类(userdata) 2.变量(string) 3.meta(table) 4.nil + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.meta(table) 4.nil lua_pushfstring(L, "can't find '%s' class variable. (forgot registering class variable ?)", lua_tostring(L, 2)); lua_error(L); } } lua_remove(L,-2); - // stack: 1.类(userdata) 2.变量(string) 3.实际值 + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瀹為檯鍊 return 1; } int meta_set(lua_State *L) { - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 lua_getmetatable(L,1); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) lua_pushvalue(L,2); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.变量(string) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.鍙橀噺(string) lua_rawget(L,-2); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.meta[变量](userdata mem_var指针) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.meta[鍙橀噺](userdata mem_var鎸囬拡) if(lua_isuserdata(L,-1)) { user2type::invoke(L,-1)->set(L); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.meta[变量](userdata mem_var指针) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.meta[鍙橀噺](userdata mem_var鎸囬拡) } else if(lua_isnil(L, -1)) { - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.nil + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.nil lua_remove(L,-1); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) lua_pushvalue(L,2); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.变量(string) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.鍙橀噺(string) lua_pushvalue(L,4); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.变量(string) 6.类meta(table) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.鍙橀噺(string) 6.绫籱eta(table) invoke_parent(L); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.变量(string) 6.类meta(table) 7.获取到父类的变量(userdata mem_var指针) + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.鍙橀噺(string) 6.绫籱eta(table) 7.鑾峰彇鍒扮埗绫荤殑鍙橀噺(userdata mem_var鎸囬拡) if(lua_isuserdata(L,-1)) { user2type::invoke(L,-1)->set(L); } else if(lua_isnil(L,-1)) { - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 4.类meta(table) 5.变量(string) 6.类meta(table) 7.nil + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 4.绫籱eta(table) 5.鍙橀噺(string) 6.绫籱eta(table) 7.nil lua_pushfstring(L, "can't find '%s' class variable. (forgot registering class variable ?)", lua_tostring(L, 2)); lua_error(L); } } lua_settop(L, 3); - // stack: 1.类(userdata) 2.变量(string) 3.要赋的值 + // stack: 1.绫(userdata) 2.鍙橀噺(string) 3.瑕佽祴鐨勫 return 0; } diff --git a/3rdParty/lua/wrapper/DMLua.h b/3rdParty/lua/wrapper/DMLua.h index 41dddd2e..29804a05 100644 --- a/3rdParty/lua/wrapper/DMLua.h +++ b/3rdParty/lua/wrapper/DMLua.h @@ -1,10 +1,10 @@ -// ---------------------------------------------------------------- +锘// ---------------------------------------------------------------- // Copyright (c) tencent // All rights reserved. // // File name: DMLua.h -// File mark: 资料:https://github.com/zfengzhen/lua_tinker_5.2.git/ -// File summary:重新整理代码 +// File mark: 璧勬枡:https://github.com/zfengzhen/lua_tinker_5.2.git/ +// File summary:閲嶆柊鏁寸悊浠g爜 // Author: guoyouhuang // Edition: 1.0 @@ -26,7 +26,7 @@ namespace DMLUA { /// ------------------------------------------------- - /// @brief 初始化lua + /// @brief 鍒濆鍖杔ua /// @param[in] L /// @remark /// @return @@ -35,14 +35,14 @@ namespace DMLUA void init_u64(lua_State *L); /// ------------------------------------------------- - /// @brief 创建/关闭一个Lua状态机 + /// @brief 鍒涘缓/鍏抽棴涓涓狶ua鐘舵佹満 /// @remark - /// @return Lua状态机 + /// @return Lua鐘舵佹満 lua_State *open(); void close(lua_State *L); /// ------------------------------------------------- - /// @brief 开启基础库、字符串库、数学库、协程库、操作系统库 + /// @brief 寮鍚熀纭搴撱佸瓧绗︿覆搴撱佹暟瀛﹀簱銆佸崗绋嬪簱銆佹搷浣滅郴缁熷簱 /// @param[in] L /// @remark /// @return @@ -53,7 +53,7 @@ namespace DMLUA void open_os(lua_State *L); /// ------------------------------------------------- - /// @brief 三种执行方式 + /// @brief 涓夌鎵ц鏂瑰紡 /// @param[in] L /// @param[in] buff /// @remark @@ -64,7 +64,7 @@ namespace DMLUA /// ------------------------------------------------- - /// @brief 打印错误 + /// @brief 鎵撳嵃閿欒 /// @param[in] L /// @remark /// @return @@ -78,7 +78,7 @@ namespace DMLUA void push_meta(lua_State* L, const char* name); /// - /// 动态类型扩展 + /// 鍔ㄦ佺被鍨嬫墿灞 /// class lua_value { @@ -1096,7 +1096,7 @@ namespace DMLUA /// - /// 简单的封装 + /// 绠鍗曠殑灏佽 /// class lua_context { diff --git a/CMakeLists.txt b/CMakeLists.txt index 979117da..7d9ef8b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,6 @@ PROJECT(DM) message(STATUS "CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}") -add_compile_options("$<$:/utf-8>") -add_compile_options("$<$:/utf-8>") - # 鏀寔绠鐗坕f else set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) diff --git a/DMMultSingletonT.h b/DMMultSingletonT.h index 88205bbf..435ce21a 100644 --- a/DMMultSingletonT.h +++ b/DMMultSingletonT.h @@ -1,10 +1,10 @@ - +锘 //------------------------------------------------------- // Copyright (c) DuiMagic // All rights reserved. // // File Name: DMSingletonT.h -// File Des: 单例模式 +// File Des: 鍗曚緥妯″紡 // File Summary: // Cur Version: 1.0 // Author: @@ -12,7 +12,7 @@ // History: //