From kde-commits Fri Sep 21 19:51:22 2018 From: =?utf-8?b?UmVuw6kgSi5WLiBCZXJ0aW4=?= Date: Fri, 21 Sep 2018 19:51:22 +0000 To: kde-commits Subject: [kdevelop/5.3] plugins/customscript: Companion change for the customscript plugin to match #a0992d31 Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153756062812507 Git commit ee092ebbadfcd30c0b64f9b3802d9129f0bcc513 by Ren=C3=A9 J.V. Berti= n. Committed on 21/09/2018 at 19:48. Pushed by rjvbb into branch '5.3'. Companion change for the customscript plugin to match #a0992d3166 Without this the Source Formatter KCM would show entries for ObjC/++ (Custom Script Formatter) and Objective-C/++ (Artistic Formatter). M +4 -1 plugins/customscript/customscript_plugin.cpp https://commits.kde.org/kdevelop/ee092ebbadfcd30c0b64f9b3802d9129f0bcc513 diff --git a/plugins/customscript/customscript_plugin.cpp b/plugins/customs= cript/customscript_plugin.cpp index ac4686696d..aed5ee3950 100644 --- a/plugins/customscript/customscript_plugin.cpp +++ b/plugins/customscript/customscript_plugin.cpp @@ -273,7 +273,10 @@ KDevelop::SourceFormatterStyle CustomScriptPlugin::pre= definedStyle(const QString {QStringLiteral("text/x-c++hdr"), QStringLiteral("C++")}, {QStringLiteral("text/x-csrc"), QStringLiteral("C")}, {QStringLiteral("text/x-java"), QStringLiteral("Java")}, - {QStringLiteral("text/x-csharp"), QStringLiteral("C#")} + {QStringLiteral("text/x-csharp"), QStringLiteral("C#")}, + {QStringLiteral("text/x-objcsrc"), QStringLiteral("Objective-C")}, + {QStringLiteral("text/x-objc++src"), QStringLiteral("Objective-C++= ")}, + {QStringLiteral("text/x-objchdr"), QStringLiteral("Objective-C")}, }); return result; }