[niepce] * Remove boost::array and use tr1 instead.



commit 5c8d69bf254314b366d626255bd04c044748b8a4
Author: Hubert Figuiere <hub figuiere net>
Date:   Sat May 2 14:23:29 2009 -0400

    	* Remove boost::array and use tr1 instead.
---
 ChangeLog                                   |    2 ++
 src/engine/library/commands.cpp             |    5 +++--
 src/fwk/utils/geometry.h                    |    4 ++--
 src/niepce/ui/imageliststore.cpp            |    2 +-
 src/niepce/ui/librarymainviewcontroller.cpp |    2 +-
 src/niepce/ui/workspacecontroller.h         |    4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e348d2..cace6c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-05-02  Hubert Figuiere  <hub figuiere net>
 
+	* Remove boost::array and use tr1 instead.
+
 	* Remove boost::shared_ptr and weak_ptr and use tr1
 	instead.
 
diff --git a/src/engine/library/commands.cpp b/src/engine/library/commands.cpp
index 914cd66..f0cd706 100644
--- a/src/engine/library/commands.cpp
+++ b/src/engine/library/commands.cpp
@@ -18,9 +18,10 @@
  */
 
 
+#include <tr1/array>
+
 #include <boost/any.hpp>
 #include <boost/bind.hpp>
-#include <boost/array.hpp>
 #include <boost/filesystem/path.hpp>
 
 
@@ -124,7 +125,7 @@ void Commands::cmdRequestMetadata(const db::Library::Ptr & lib,
 void Commands::cmdSetMetadata(const db::Library::Ptr & lib,
                               int file_id, int meta, int value)
 {
-    boost::array<int, 3> m;
+    std::tr1::array<int, 3> m;
     m[0] = file_id;
     m[1] = meta;
     m[2] = value;
diff --git a/src/fwk/utils/geometry.h b/src/fwk/utils/geometry.h
index 18d8cf2..f21b00a 100644
--- a/src/fwk/utils/geometry.h
+++ b/src/fwk/utils/geometry.h
@@ -21,7 +21,7 @@
 #ifndef __UTILS_GEOMETRY_H__
 #define __UTILS_GEOMETRY_H__
 
-#include <boost/array.hpp>
+#include <tr1/array>
 #include <string>
 
 namespace utils {
@@ -69,7 +69,7 @@ private:
         W,
         H			
     };
-    boost::array<int, 4> _r;
+    std::tr1::array<int, 4> _r;
 };
 
 }
diff --git a/src/niepce/ui/imageliststore.cpp b/src/niepce/ui/imageliststore.cpp
index 80f8731..8229413 100644
--- a/src/niepce/ui/imageliststore.cpp
+++ b/src/niepce/ui/imageliststore.cpp
@@ -99,7 +99,7 @@ void ImageListStore::on_lib_notification(const fwk::Notification::Ptr &n)
         }
         case db::Library::NOTIFY_METADATA_CHANGED:
         {
-            boost::array<int, 3> m = boost::any_cast<boost::array<int, 3> >(ln.param);
+            std::tr1::array<int, 3> m = boost::any_cast<std::tr1::array<int, 3> >(ln.param);
             DBG_OUT("metadata changed");
             Gtk::TreeRow row;
             std::map<int, Gtk::TreeIter>::const_iterator iter = m_idmap.find(m[0]);
diff --git a/src/niepce/ui/librarymainviewcontroller.cpp b/src/niepce/ui/librarymainviewcontroller.cpp
index c60f1e2..81bda95 100644
--- a/src/niepce/ui/librarymainviewcontroller.cpp
+++ b/src/niepce/ui/librarymainviewcontroller.cpp
@@ -56,7 +56,7 @@ void LibraryMainViewController::on_lib_notification(const fwk::Notification::Ptr
         case db::Library::NOTIFY_METADATA_CHANGED:
         {
             DBG_OUT("metadata changed");
-            boost::array<int, 3> m = boost::any_cast<boost::array<int, 3> >(ln.param);
+            std::tr1::array<int, 3> m = boost::any_cast<std::tr1::array<int, 3> >(ln.param);
             if(m[0] == m_metapanecontroller->displayed_file()) {
                 // FIXME: actually just update the metadata
                 getLibraryClient()->requestMetadata(m[0]);
diff --git a/src/niepce/ui/workspacecontroller.h b/src/niepce/ui/workspacecontroller.h
index 9948f4f..8de14a4 100644
--- a/src/niepce/ui/workspacecontroller.h
+++ b/src/niepce/ui/workspacecontroller.h
@@ -22,7 +22,7 @@
 #ifndef __UI_WORKSPACECONTROLLER_H__
 #define __UI_WORKSPACECONTROLLER_H__
 
-#include <boost/array.hpp>
+#include <tr1/array>
 
 #include <glibmm/ustring.h>
 
@@ -112,7 +112,7 @@ namespace ui {
 			ICON_KEYWORD,
 			_ICON_SIZE
 		};
-		boost::array< Glib::RefPtr<Gdk::Pixbuf>, _ICON_SIZE > m_icons;
+		std::tr1::array< Glib::RefPtr<Gdk::Pixbuf>, _ICON_SIZE > m_icons;
 		WorkspaceTreeColumns           m_librarycolumns;
 		Gtk::VBox                      m_vbox;
 		Gtk::Label                     m_label;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]