From 52bc957e0ecc42c6880def20bbd57a54650fda99 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Thu, 27 Jan 2022 11:25:08 +0800 Subject: [PATCH] Use ObjCpp for Mandarin Module --- .../OpenVanilla/Mandarin/{Mandarin.h => Mandarin.hh} | 2 +- .../Mandarin/{Mandarin.cpp => Mandarin.mm} | 4 ++-- Source/InputMethodController.h | 2 +- vChewing.xcodeproj/project.pbxproj | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) rename Source/3rdParty/OpenVanilla/Mandarin/{Mandarin.h => Mandarin.hh} (99%) rename Source/3rdParty/OpenVanilla/Mandarin/{Mandarin.cpp => Mandarin.mm} (99%) diff --git a/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.h b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.hh similarity index 99% rename from Source/3rdParty/OpenVanilla/Mandarin/Mandarin.h rename to Source/3rdParty/OpenVanilla/Mandarin/Mandarin.hh index 8cac6dcd..102c19ef 100644 --- a/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.h +++ b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.hh @@ -1,5 +1,5 @@ /* - * Mandarin.h + * Mandarin.hh * * Copyright 2011-2022 OpenVanilla Project (MIT License). * All rights reserved. See "LICENSE.TXT" for details. diff --git a/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.cpp b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.mm similarity index 99% rename from Source/3rdParty/OpenVanilla/Mandarin/Mandarin.cpp rename to Source/3rdParty/OpenVanilla/Mandarin/Mandarin.mm index 5c0881ff..8e7494f9 100644 --- a/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.cpp +++ b/Source/3rdParty/OpenVanilla/Mandarin/Mandarin.mm @@ -1,5 +1,5 @@ /* - * Mandarin.cpp + * Mandarin.mm * * Copyright 2011-2022 OpenVanilla Project (MIT License). * All rights reserved. See "LICENSE.TXT" for details. @@ -7,7 +7,7 @@ #include #include -#include "Mandarin.h" +#include "Mandarin.hh" #include "OVUTF8Helper.h" #include "OVWildcard.h" diff --git a/Source/InputMethodController.h b/Source/InputMethodController.h index 31403854..75987ec2 100644 --- a/Source/InputMethodController.h +++ b/Source/InputMethodController.h @@ -8,7 +8,7 @@ #import #import -#import "Mandarin.h" +#import "Mandarin.hh" #import "Gramambular.h" #import "vChewingLM.h" #import "UserOverrideModel.h" diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index 82d8da37..1bbc670a 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -55,7 +55,7 @@ 6A0D4ED315FC0D6400ABF4B3 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A0D4EC815FC0D6400ABF4B3 /* main.swift */; }; 6A0D4F0815FC0DA600ABF4B3 /* Bopomofo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4EEF15FC0DA600ABF4B3 /* Bopomofo.tiff */; }; 6A0D4F0915FC0DA600ABF4B3 /* Bopomofo@2x.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4EF015FC0DA600ABF4B3 /* Bopomofo@2x.tiff */; }; - 6A0D4F4515FC0EB100ABF4B3 /* Mandarin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A0D4F2015FC0EB100ABF4B3 /* Mandarin.cpp */; }; + 6A0D4F4515FC0EB100ABF4B3 /* Mandarin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6A0D4F2015FC0EB100ABF4B3 /* Mandarin.mm */; }; 6A0D4F5315FC0EE100ABF4B3 /* preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4F4E15FC0EE100ABF4B3 /* preferences.xib */; }; 6A0D4F5715FC0EF900ABF4B3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4F4815FC0EE100ABF4B3 /* InfoPlist.strings */; }; 6A0D4F5815FC0EF900ABF4B3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4F4A15FC0EE100ABF4B3 /* Localizable.strings */; }; @@ -195,8 +195,8 @@ 6A0D4F1C15FC0EB100ABF4B3 /* Span.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Span.h; sourceTree = ""; }; 6A0D4F1D15FC0EB100ABF4B3 /* Unigram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unigram.h; sourceTree = ""; }; 6A0D4F1E15FC0EB100ABF4B3 /* Walker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Walker.h; sourceTree = ""; }; - 6A0D4F2015FC0EB100ABF4B3 /* Mandarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mandarin.cpp; sourceTree = ""; }; - 6A0D4F2115FC0EB100ABF4B3 /* Mandarin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mandarin.h; sourceTree = ""; }; + 6A0D4F2015FC0EB100ABF4B3 /* Mandarin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Mandarin.mm; sourceTree = ""; }; + 6A0D4F2115FC0EB100ABF4B3 /* Mandarin.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Mandarin.hh; sourceTree = ""; }; 6A0D4F4115FC0EB100ABF4B3 /* OVUTF8Helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OVUTF8Helper.h; sourceTree = ""; }; 6A0D4F4215FC0EB100ABF4B3 /* OVWildcard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OVWildcard.h; sourceTree = ""; }; 6A0D4F4915FC0EE100ABF4B3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Source/en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -476,8 +476,8 @@ 6A0D4F1F15FC0EB100ABF4B3 /* Mandarin */ = { isa = PBXGroup; children = ( - 6A0D4F2015FC0EB100ABF4B3 /* Mandarin.cpp */, - 6A0D4F2115FC0EB100ABF4B3 /* Mandarin.h */, + 6A0D4F2015FC0EB100ABF4B3 /* Mandarin.mm */, + 6A0D4F2115FC0EB100ABF4B3 /* Mandarin.hh */, ); path = Mandarin; sourceTree = ""; @@ -726,7 +726,7 @@ 5BDD25F7279D6D1200AA18F8 /* unzip.m in Sources */, 5BD0D1A4279463510008F48E /* clsOOBEDefaults.swift in Sources */, D427A9C125ED28CC005D43E0 /* OpenCCBridge.swift in Sources */, - 6A0D4F4515FC0EB100ABF4B3 /* Mandarin.cpp in Sources */, + 6A0D4F4515FC0EB100ABF4B3 /* Mandarin.mm in Sources */, 5B6797B52794822C004AC7CE /* PhraseReplacementMap.h in Sources */, 6A0421A815FEF3F50061ED63 /* FastLM.cpp in Sources */, 5BDF2D012791C03B00838ADB /* PreferencesWindowController.swift in Sources */,