File reference-nonmutable-0.8.0.2.patch of Package k3d

Overview Repositories Revisions Requests Users Attributes Meta

File reference-nonmutable-0.8.0.2.patch of Package k3d

Index: k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
===================================================================
--- k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
+++ k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
@@ -114,7 +114,7 @@ namespace detail {
     template <typename T2, typename Op>
     struct reduce_bind1 {
         const T2& _t2;
-        mutable Op&  _op;
+        Op&  _op;
 
         typedef typename Op::result_type result_type;
 
@@ -127,7 +127,7 @@ namespace detail {
     struct reduce_bind2 {
         const Bits1& _bits1;
         std::size_t _index1;
-        mutable Op&  _op;
+        Op&  _op;
 
         typedef typename Op::result_type result_type;
 
Index: k3d-source-0.8.0.2/k3dsdk/data.h
===================================================================
--- k3d-source-0.8.0.2.orig/k3dsdk/data.h
+++ k3d-source-0.8.0.2/k3dsdk/data.h
@@ -580,7 +580,7 @@ public:
 
 		try
 		{
-			set_value(boost::lexical_cast<value_t>(*new_value), Hint);
+			this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
 			return true;
 		}
 		catch(...)
@@ -865,7 +865,7 @@ public:
 
 		try
 		{
-			set_value(boost::lexical_cast<value_t>(*new_value), Hint);
+			this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
 			return true;
 		}
 		catch(...)
@@ -1011,7 +1011,7 @@ public:
 
 		try
 		{
-			set_value(boost::lexical_cast<value_t>(*new_value), Hint);
+			this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
 			return true;
 		}
 		catch(...)
@@ -1146,7 +1146,7 @@ public:
 		if(!new_value)
 			return false;
 
-		set_value(*new_value, Hint);
+		this->set_value(*new_value, Hint);
 		return true;
 	}
 
@@ -1671,7 +1671,7 @@ protected:
 	/// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy
 	void internal_set_value(const value_t& Value, ihint* const Hint)
 	{
-		set_value(Value, Hint);
+		this->set_value(Value, Hint);
 	}
 };
 
@@ -1711,7 +1711,7 @@ protected:
 	/// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy
 	void internal_set_value(const value_t& Value, ihint* const Hint)
 	{
-		set_value(Value, Hint);
+		this->set_value(Value, Hint);
 	}
 
 	void set_value(const value_t& Value, ihint* const Hint = 0)
Index: k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp
===================================================================
--- k3d-source-0.8.0.2.orig/k3dsdk/ngui/main_document_window.cpp
+++ k3d-source-0.8.0.2/k3dsdk/ngui/main_document_window.cpp
@@ -1347,7 +1347,7 @@ private:
 		}
 
 		import_export_columns columns;
-		Glib::RefPtr<Gtk::ListStore> model = Gtk::ListStore::create(columns);
+		Glib::RefPtr<Gtk::TreeModel> model = Gtk::ListStore::create(columns);
 
 		Gtk::TreeRow row = *model->append();
 		row[columns.factory] = 0;

Places

File reference-nonmutable-0.8.0.2.patch of Package k3d

Places