From ae120af5b55eb462fcbec7b77d3cc2fd1282ec3b Mon Sep 17 00:00:00 2001
From: dfighter1985 <devnull@localhost>
Date: Fri, 11 Jul 2014 20:47:24 +0200
Subject: [PATCH] Changed property to p, property is a reserved word in VS.

---
 .../src/plugins/world_editor/property_editor_widget.cpp       | 4 ++--
 code/studio/src/plugins/world_editor/property_editor_widget.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/studio/src/plugins/world_editor/property_editor_widget.cpp b/code/studio/src/plugins/world_editor/property_editor_widget.cpp
index e3e9f0884..17be420cb 100644
--- a/code/studio/src/plugins/world_editor/property_editor_widget.cpp
+++ b/code/studio/src/plugins/world_editor/property_editor_widget.cpp
@@ -195,9 +195,9 @@ void PropertyEditorWidget::updateSelection(Node *node)
 	blockSignalsOfProperties(false);
 }
 
-void PropertyEditorWidget::propertyChanged(QtProperty *property)
+void PropertyEditorWidget::propertyChanged(QtProperty *p)
 {
-	nlinfo(QString("property %1 changed").arg(property->propertyName()).toUtf8().constData());
+	nlinfo(QString("property %1 changed").arg(p->propertyName()).toUtf8().constData());
 }
 
 void PropertyEditorWidget::resetProperty(QtProperty *property)
diff --git a/code/studio/src/plugins/world_editor/property_editor_widget.h b/code/studio/src/plugins/world_editor/property_editor_widget.h
index 81a8ad008..4152eec0a 100644
--- a/code/studio/src/plugins/world_editor/property_editor_widget.h
+++ b/code/studio/src/plugins/world_editor/property_editor_widget.h
@@ -57,7 +57,7 @@ public Q_SLOTS:
 	/// Update of selections
 	void updateSelection(Node *node);
 
-	void propertyChanged(QtProperty *property);
+	void propertyChanged(QtProperty *p);
 	void resetProperty(QtProperty *property);
 
 private: