default smart pointer type switched to intrusive_ptr

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@337 0fc631ac-6414-0410-93d0-97cfa31319b6

src/render/card/viewer.cpp

@@ -22,6 +22,8 @@ DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA StyleP>);
 
 // ----------------------------------------------------------------------------- : DataViewer
 
+DataViewer::DataViewer() : drawing(false) {}
+DataViewer::~DataViewer() {}
 
 // ----------------------------------------------------------------------------- : Drawing
 
@@ -84,10 +86,11 @@ Rotation DataViewer::getRotation() const {
 
 void DataViewer::setCard(const CardP& card, bool refresh) {
 	if (!card) return; // TODO: clear viewer?
-	if (!refresh && this->card == card && this->stylesheet == set->stylesheetFor(card)) return; // already set
+	StyleSheetP new_stylesheet = set->stylesheetForP(card);
+	if (!refresh && this->card == card && this->stylesheet == new_stylesheet) return; // already set
 	assert(set);
 	this->card = card;
-	stylesheet = set->stylesheetFor(card);
+	stylesheet = new_stylesheet;
 	setStyles(stylesheet, stylesheet->card_style);
 	setData(card->data);
 	onChangeSize();

src/render/card/viewer.hpp

@@ -22,7 +22,8 @@ class Context;
 /// A viewer can generate an image of some values, usually a card.
 class DataViewer : public SetView {
   public:	
-	DataViewer() : drawing(false) {}
+	DataViewer();
+	~DataViewer();
 	
 	// --------------------------------------------------- : Drawing
 	
@@ -57,7 +58,7 @@ class DataViewer : public SetView {
 	/// The rotation to use
 	virtual Rotation getRotation() const;
 	/// The card we are viewing
-	inline CardP getCard() const { return card; }
+	inline const CardP& getCard() const { return card; }
 	/// Invalidate and redraw (the area of) a single value viewer
 	virtual void redraw(const ValueViewer&) {}