From: Joe Konno <joe.konno@intel.com>
Date: Wed, 18 Jul 2012 22:22:43 +0000 (-0700)
Subject: EFL: quick bubble refactor utilizing STL
X-Git-Tag: upstream/0.2.1~302
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b034ebc2cc0c7f3077f6d5a08b6cec9b6761f46;p=test%2Fgeneric%2Fwayland-fits.git

EFL: quick bubble refactor utilizing STL

Signed-off-by: Joe Konno <joe.konno@intel.com>
---

diff --git a/src/efl/test_bubble.cpp b/src/efl/test_bubble.cpp
index 5b56b84..230d8d0 100644
--- a/src/efl/test_bubble.cpp
+++ b/src/efl/test_bubble.cpp
@@ -1,10 +1,14 @@
 #include <Elementary.h>
 #include <boost/bind.hpp>
 
+#include <vector>
+
 #include "window.h"
 #include "evasobject.h"
 #include "elmtestharness.h"
 
+using std::vector;
+
 class BubblePosTest : public ElmTestHarness
 {
 public:
@@ -15,6 +19,15 @@ public:
 		, bubble_(elm_bubble_add(window_))
 	{
 		evas_object_resize(bubble_, 200, 100);
+
+		positions_.push_back(ELM_BUBBLE_POS_TOP_LEFT);
+		positions_.push_back(ELM_BUBBLE_POS_TOP_RIGHT);
+		positions_.push_back(ELM_BUBBLE_POS_TOP_LEFT);
+		positions_.push_back(ELM_BUBBLE_POS_BOTTOM_LEFT);
+		positions_.push_back(ELM_BUBBLE_POS_TOP_LEFT);
+		positions_.push_back(ELM_BUBBLE_POS_BOTTOM_RIGHT);
+		positions_.push_back(ELM_BUBBLE_POS_TOP_LEFT);
+
 		return;
 	}
 
@@ -23,21 +36,13 @@ public:
 		window_.show();
 		evas_object_show(bubble_);
 
-		Elm_Bubble_Pos pos[] = { ELM_BUBBLE_POS_TOP_LEFT,
-					 ELM_BUBBLE_POS_TOP_RIGHT,
-					 ELM_BUBBLE_POS_TOP_LEFT,
-					 ELM_BUBBLE_POS_BOTTOM_LEFT,
-					 ELM_BUBBLE_POS_TOP_LEFT,
-					 ELM_BUBBLE_POS_BOTTOM_RIGHT,
-					 ELM_BUBBLE_POS_TOP_LEFT
-				      };
-
-		for (int i = 0; i < (sizeof(pos) / sizeof(int)); ++i)
+		vector<Elm_Bubble_Pos>::iterator it;
+		for (it = positions_.begin(); it != positions_.end(); it++)
 		{
 			queueCallback(
 				ModifyCheckCallback(
-					boost::bind(&elm_bubble_pos_set, boost::ref(bubble_), pos[i]),
-					boost::bind(&BubblePosTest::checkPos, boost::ref(*this), pos[i])
+					boost::bind(&elm_bubble_pos_set, boost::ref(bubble_), *it),
+					boost::bind(&BubblePosTest::checkPos, boost::ref(*this), *it)
 				)
 			);
 		}
@@ -49,8 +54,9 @@ public:
 	}
 
 private:
-	Window		window_;
-	EvasObject	bubble_;
+	Window			window_;
+	EvasObject		bubble_;
+	vector<Elm_Bubble_Pos>	positions_;
 };
 
 class BubbleTextTest : public ElmTestHarness