From 579237d6140a39aa227d3d3d5488bdf82529ac4d Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Fri, 11 Apr 2014 00:28:29 -0500
Subject: [PATCH] Renaming Profile.h due to conflicts with ImageMagick. Mac
 builds are working again now.

---
 include/OpenShot.h                | 2 +-
 include/{Profile.h => Profiles.h} | 0
 src/CMakeLists.txt                | 2 +-
 src/{Profile.cpp => Profiles.cpp} | 2 +-
 src/bindings/python/openshot.i    | 4 ++--
 src/bindings/ruby/openshot.i      | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename include/{Profile.h => Profiles.h} (100%)
 rename src/{Profile.cpp => Profiles.cpp} (99%)

diff --git a/include/OpenShot.h b/include/OpenShot.h
index d268e123..782d6567 100644
--- a/include/OpenShot.h
+++ b/include/OpenShot.h
@@ -138,7 +138,7 @@
 #include "KeyFrame.h"
 #include "PlayerBase.h"
 #include "Point.h"
-#include "Profile.h"
+#include "Profiles.h"
 #include "SDLPlayer.h"
 #include "Sleep.h"
 #include "TextReader.h"
diff --git a/include/Profile.h b/include/Profiles.h
similarity index 100%
rename from include/Profile.h
rename to include/Profiles.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f75d123..f4d4ae3c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -175,7 +175,7 @@ SET ( OPENSHOT_SOURCE_FILES
 		ImageReader.cpp
 		PlayerBase.cpp
 		Point.cpp
-		Profile.cpp
+		Profiles.cpp
 		SDLPlayer.cpp
 		QtPlayer.cpp
 		TextReader.cpp
diff --git a/src/Profile.cpp b/src/Profiles.cpp
similarity index 99%
rename from src/Profile.cpp
rename to src/Profiles.cpp
index dae97240..1436f385 100644
--- a/src/Profile.cpp
+++ b/src/Profiles.cpp
@@ -38,7 +38,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Profile.h"
+#include "../include/Profiles.h"
 
 using namespace openshot;
 
diff --git a/src/bindings/python/openshot.i b/src/bindings/python/openshot.i
index 2bbf367a..3c02bf31 100644
--- a/src/bindings/python/openshot.i
+++ b/src/bindings/python/openshot.i
@@ -85,7 +85,7 @@
 #include "../../../include/ImageReader.h"
 #include "../../../include/PlayerBase.h"
 #include "../../../include/Point.h"
-#include "../../../include/Profile.h"
+#include "../../../include/Profiles.h"
 #include "../../../include/QtPlayer.h"
 #include "../../../include/KeyFrame.h"
 #include "../../../include/RendererBase.h"
@@ -128,7 +128,7 @@
 %include "../../../include/ImageReader.h"
 %include "../../../include/PlayerBase.h"
 %include "../../../include/Point.h"
-%include "../../../include/Profile.h"
+%include "../../../include/Profiles.h"
 %include "../../../include/QtPlayer.h"
 %include "../../../include/KeyFrame.h"
 %include "../../../include/RendererBase.h"
diff --git a/src/bindings/ruby/openshot.i b/src/bindings/ruby/openshot.i
index fd017b0e..66ad22a6 100644
--- a/src/bindings/ruby/openshot.i
+++ b/src/bindings/ruby/openshot.i
@@ -91,7 +91,7 @@ namespace tr1
 #include "../../../include/ImageReader.h"
 #include "../../../include/PlayerBase.h"
 #include "../../../include/Point.h"
-#include "../../../include/Profile.h"
+#include "../../../include/Profiles.h"
 #include "../../../include/QtPlayer.h"
 #include "../../../include/KeyFrame.h"
 #include "../../../include/RendererBase.h"
@@ -134,7 +134,7 @@ namespace tr1
 %include "../../../include/ImageReader.h"
 %include "../../../include/PlayerBase.h"
 %include "../../../include/Point.h"
-%include "../../../include/Profile.h"
+%include "../../../include/Profiles.h"
 %include "../../../include/QtPlayer.h"
 %include "../../../include/KeyFrame.h"
 %include "../../../include/RendererBase.h"