From 55d56d9b7cf240fb426c58a62aad21a6997ee550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Fri, 27 Nov 2015 18:47:30 +0100
Subject: Replace hardcoded references to Okam Studio by Godot Engine

Since the engine development is now independent.
Fixes #2836.
---
 demos/gui/rich_text_bbcode/rich_text_bbcode.scn       | Bin 2373 -> 3288 bytes
 platform/windows/export/export.cpp                    |   2 +-
 platform/windows/godot_res.rc                         |   2 +-
 tools/Godot.app/Contents/Info.plist                   |   4 ++--
 .../godot_ios.xcodeproj/project.pbxproj               |   2 +-
 .../ios_xcode_template/godot_ios/godot_ios-Info.plist |   2 +-
 .../godot_iosTests/godot_iosTests-Info.plist          |   2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/demos/gui/rich_text_bbcode/rich_text_bbcode.scn b/demos/gui/rich_text_bbcode/rich_text_bbcode.scn
index ca02044bb8..081338fd91 100644
Binary files a/demos/gui/rich_text_bbcode/rich_text_bbcode.scn and b/demos/gui/rich_text_bbcode/rich_text_bbcode.scn differ
diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp
index 29f21bf227..9cfd475091 100644
--- a/platform/windows/export/export.cpp
+++ b/platform/windows/export/export.cpp
@@ -327,7 +327,7 @@ EditorExportPlatformWindows::EditorExportPlatformWindows() {
 	icon128=true;
 	icon256=true;
 	product_name="$genname";
-	company_name="Okam Studio";
+	company_name="Godot Engine";
 	file_description="Created With Godot Engine";
 	version_text="1.0";
 	OS::Date date = OS::get_singleton()->get_date();
diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc
index 73f36e5e59..f77182f909 100644
--- a/platform/windows/godot_res.rc
+++ b/platform/windows/godot_res.rc
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName",            "Okam Studio"
+            VALUE "CompanyName",            "Godot Engine"
             VALUE "FileDescription",        _MKSTR(VERSION_NAME) " Editor (" _MKSTR(VERSION_STATUS) ")"
             VALUE "FileVersion",            _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "."_MKSTR(VERSION_REVISION)
             VALUE "ProductName",            _MKSTR(VERSION_NAME)
diff --git a/tools/Godot.app/Contents/Info.plist b/tools/Godot.app/Contents/Info.plist
index 3a4b51e2fe..8a89993fb9 100755
--- a/tools/Godot.app/Contents/Info.plist
+++ b/tools/Godot.app/Contents/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Godot.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.okamstudio.godot</string>
+	<string>org.godotengine.godot</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -61,7 +61,7 @@
 			<true/>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>com.okamstudio.scn</string>
+				<string>org.godotengine.scn</string>
 			</array>
 		</dict>
 	</array>
diff --git a/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj b/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj
index 7cd4da0f4a..4ae1ec8a53 100644
--- a/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj
+++ b/tools/ios_xcode_template/godot_ios.xcodeproj/project.pbxproj
@@ -192,7 +192,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0500;
-				ORGANIZATIONNAME = Okam;
+				ORGANIZATIONNAME = GodotEngine;
 				TargetAttributes = {
 					D0BCFE5F18AEBDA3004A7AAE = {
 						TestTargetID = D0BCFE3318AEBDA2004A7AAE;
diff --git a/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist b/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist
index f34ebb97f0..357970920a 100644
--- a/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist
+++ b/tools/ios_xcode_template/godot_ios/godot_ios-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>godot_opt.iphone</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.okamstudios.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>org.godotengine.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist b/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist
index 3b3eec9a51..0f69aa80eb 100644
--- a/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist
+++ b/tools/ios_xcode_template/godot_iosTests/godot_iosTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.okamstudios.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>org.godotengine.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
-- 
cgit v1.2.3