paperbox r250 - in trunk: . src
- From: markoa svn gnome org
- To: svn-commits-list gnome org
- Subject: paperbox r250 - in trunk: . src
- Date: Sat, 27 Dec 2008 22:13:14 +0000 (UTC)
Author: markoa
Date: Sat Dec 27 22:13:13 2008
New Revision: 250
URL: http://svn.gnome.org/viewvc/paperbox?rev=250&view=rev
Log:
Dropped boost, increased version
Added:
trunk/src/noncopyable.hh
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/src/browser.cc
trunk/src/browser.hh
trunk/src/category-editor-model.cc
trunk/src/category-editor-model.hh
trunk/src/category-editor.cc
trunk/src/category-editor.hh
trunk/src/category-factory.cc
trunk/src/category-factory.hh
trunk/src/category-view.hh
trunk/src/category.cc
trunk/src/category.hh
trunk/src/config.cc
trunk/src/config.hh
trunk/src/dialog-entry.hh
trunk/src/dialog-properties.cc
trunk/src/dialog-properties.hh
trunk/src/document-tag-cloud-model.cc
trunk/src/document-tag-cloud-model.hh
trunk/src/document-tile-view.cc
trunk/src/document-tile-view.hh
trunk/src/document-tile.cc
trunk/src/document-tile.hh
trunk/src/main-window.cc
trunk/src/main-window.hh
trunk/src/tag-cloud-model.cc
trunk/src/tag-cloud-model.hh
trunk/src/tag-cloud.cc
trunk/src/tag-cloud.hh
trunk/src/thumbnailer.cc
trunk/src/thumbnailer.hh
trunk/src/tile-set.cc
trunk/src/tile-set.hh
trunk/src/tracker-phone.cc
trunk/src/tracker-phone.hh
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Dec 27 22:13:13 2008
@@ -1,6 +1,6 @@
### Copyright (C) 2007, 2008 Marko Anastasov
-AC_INIT([Paperbox], [0.4.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=paperbox], [paperbox])
+AC_INIT([Paperbox], [0.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=paperbox], [paperbox])
AC_PREREQ(2.59)
AC_CONFIG_SRCDIR([src/main.cc])
@@ -93,10 +93,6 @@
# *************************************
# Library checks
# *************************************
-AC_CHECK_HEADERS([boost/variant.hpp],
- [],
- [AC_MSG_ERROR([Please install boost development headers])])
-
PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.12.0 libglademm-2.4 >= 2.6.0])
AC_SUBST([GTKMM_CFLAGS])
AC_SUBST([GTKMM_LIBS])
Modified: trunk/src/browser.cc
==============================================================================
--- trunk/src/browser.cc (original)
+++ trunk/src/browser.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - browser.cc
+ * Paperbox - browser.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -22,7 +20,6 @@
#include <algorithm>
#include <iostream>
-#include <boost/bind.hpp>
#include <glibmm/fileutils.h>
#include <glibmm/main.h>
#include <glibmm-utils/log-stream-utils.h>
@@ -33,7 +30,7 @@
using std::auto_ptr;
using std::list;
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
using Glib::ustring;
///
@@ -157,16 +154,6 @@
sigc::mem_fun(*this, &Browser::on_idle_initial_document_retrieval));
}
- void
- Browser::dump_document_data()
- {
- std::for_each(docs_.begin(),
- docs_.end(),
- boost::bind(
- &Document::print,
- boost::bind(&doc_map::value_type::second, _1)));
- }
-
bool
Browser::on_idle_initial_document_retrieval()
{
Modified: trunk/src/browser.hh
==============================================================================
--- trunk/src/browser.hh (original)
+++ trunk/src/browser.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - browser.hh
+ * Paperbox - browser.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -20,22 +18,22 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_BROWSER__
-#define __PAPER_BOX_BROWSER__
+#ifndef __PAPERBOX_BROWSER__
+#define __PAPERBOX_BROWSER__
#include <map>
#include <memory>
+#include <tr1/memory>
#include <queue>
#include <vector>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <sigc++/sigc++.h>
#include "document.hh"
+#include "noncopyable.hh"
#include "tracker-phone.hh"
namespace paperbox {
- typedef std::vector<boost::shared_ptr<Document> > doc_vector;
+ typedef std::vector<std::tr1::shared_ptr<Document> > doc_vector;
enum DocumentSorting {
DOCUMENT_SORTING_NONE,
@@ -44,10 +42,10 @@
DOCUMENT_SORTING_BY_DATE_DESC
};
- class Browser : public sigc::trackable, private boost::noncopyable
+ class Browser : public sigc::trackable, private NonCopyable
{
public:
- typedef sigc::signal<void, const boost::shared_ptr<Document>& >
+ typedef sigc::signal<void, const std::tr1::shared_ptr<Document>& >
SignalNewDocument;
/*
@@ -92,8 +90,6 @@
const std::vector<Glib::ustring>& tags,
doc_vector& docs);
- void dump_document_data();
-
sigc::signal<void>& signal_retrieval_started();
sigc::signal<void>& signal_retrieval_finished();
@@ -101,7 +97,7 @@
SignalTagsChanged& signal_tags_changed();
protected:
- typedef std::map<std::string, boost::shared_ptr<Document> > doc_map;
+ typedef std::map<std::string, std::tr1::shared_ptr<Document> > doc_map;
explicit Browser();
@@ -117,7 +113,7 @@
void on_tags_removed(const Glib::ustring& uri,
const std::vector<Glib::ustring>& tags);
- boost::shared_ptr<TrackerPhone> tracker_client_;
+ std::tr1::shared_ptr<TrackerPhone> tracker_client_;
std::queue<Glib::ustring> uri_queue_;
doc_map docs_;
@@ -132,4 +128,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_BROWSER__
+#endif // __PAPERBOX_BROWSER__
Modified: trunk/src/category-editor-model.cc
==============================================================================
--- trunk/src/category-editor-model.cc (original)
+++ trunk/src/category-editor-model.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category-editor-model.cc
+ * Paperbox - category-editor-model.cc
*
* Copyright (C) 2008 Marko Anastasov
*
@@ -31,10 +29,10 @@
using std::list;
using std::map;
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
typedef map<Glib::ustring,
- boost::shared_ptr<CategoryEditorData> >::iterator
+ shared_ptr<CategoryEditorData> >::iterator
model_data_iter;
///
@@ -86,7 +84,7 @@
return data;
}
- boost::shared_ptr<CategoryEditorData>
+ shared_ptr<CategoryEditorData>
CategoryEditorModel::new_category(const Glib::ustring& name)
{
CategoryEditorData* data = 0;
Modified: trunk/src/category-editor-model.hh
==============================================================================
--- trunk/src/category-editor-model.hh (original)
+++ trunk/src/category-editor-model.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category-editor-model.hh
+ * Paperbox - category-editor-model.hh
*
* Copyright (C) 2008 Marko Anastasov
*
@@ -20,26 +18,25 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_CATEGORY_EDITOR_MODEL_HH__
-#define __PAPER_BOX_CATEGORY_EDITOR_MODEL_HH__
+#ifndef __PAPERBOX_CATEGORY_EDITOR_MODEL_HH__
+#define __PAPERBOX_CATEGORY_EDITOR_MODEL_HH__
#include <map>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <gtkmm/textbuffer.h>
#include "category.hh"
#include "category-factory.hh"
namespace paperbox {
- class CategoryEditorData : public boost::noncopyable
+ class CategoryEditorData : public NonCopyable
{
public:
explicit CategoryEditorData(const Glib::ustring& name);
- explicit CategoryEditorData(boost::shared_ptr<Category>& cat);
+ explicit CategoryEditorData(std::tr1::shared_ptr<Category>& cat);
~CategoryEditorData() {}
- boost::shared_ptr<Category> category;
+ std::tr1::shared_ptr<Category> category;
Glib::RefPtr<Gtk::TextBuffer> buffer;
bool dirty;
};
@@ -50,13 +47,13 @@
explicit CategoryEditorModel();
~CategoryEditorModel();
- std::list<boost::shared_ptr<CategoryEditorData> > load_category_data();
+ std::list<std::tr1::shared_ptr<CategoryEditorData> > load_category_data();
// throws CategoryExists, propagated from CategoryFactory
- boost::shared_ptr<CategoryEditorData> new_category(const Glib::ustring& name);
+ std::tr1::shared_ptr<CategoryEditorData> new_category(const Glib::ustring& name);
// check for pointer, might return null
- boost::shared_ptr<CategoryEditorData> get_category(const Glib::ustring& name);
+ std::tr1::shared_ptr<CategoryEditorData> get_category(const Glib::ustring& name);
void save_category(const Glib::ustring& name);
@@ -65,9 +62,9 @@
protected:
std::map<Glib::ustring,
- boost::shared_ptr<CategoryEditorData> > model_data_;
+ std::tr1::shared_ptr<CategoryEditorData> > model_data_;
};
} // namespace paperbox
-#endif // __PAPER_BOX_CATEGORY_EDITOR_MODEL_HH__
+#endif // __PAPERBOX_CATEGORY_EDITOR_MODEL_HH__
Modified: trunk/src/category-editor.cc
==============================================================================
--- trunk/src/category-editor.cc (original)
+++ trunk/src/category-editor.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category-editor.cc
+ * Paperbox - category-editor.cc
*
* Copyright (C) 2008 Marko Anastasov
*
@@ -37,7 +35,7 @@
using std::list;
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
const int DEFAULT_WIDTH = 500;
const int DEFAULT_HEIGHT = 375; // try to keep the ratio 4:3
Modified: trunk/src/category-editor.hh
==============================================================================
--- trunk/src/category-editor.hh (original)
+++ trunk/src/category-editor.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category-editor.hh
+ * Paperbox - category-editor.hh
*
* Copyright (C) 2008 Marko Anastasov
*
@@ -20,10 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_CATEGORY_EDITOR_HH__
-#define __PAPER_BOX_CATEGORY_EDITOR_HH__
+#ifndef __PAPERBOX_CATEGORY_EDITOR_HH__
+#define __PAPERBOX_CATEGORY_EDITOR_HH__
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <gtkmm/button.h>
#include <gtkmm/dialog.h>
#include <gtkmm/label.h>
@@ -58,7 +56,7 @@
void load_tags();
void load_categories();
- void add_new_row(boost::shared_ptr<CategoryEditorData>& data);
+ void add_new_row(std::tr1::shared_ptr<CategoryEditorData>& data);
void check_buffer_status();
@@ -69,7 +67,7 @@
const Gtk::TreeModel::Path& path,
bool path_selected);
bool on_key_release_event(GdkEventKey* key);
- void on_new_document(const boost::shared_ptr<Document>& doc);
+ void on_new_document(const std::tr1::shared_ptr<Document>& doc);
void on_tag_clicked(const Glib::ustring& tag);
virtual bool on_expose_event(GdkEventExpose* event);
@@ -81,7 +79,7 @@
Gtk::VBox* vbox_right_;
Gtk::HBox* hbox_contents_;
- boost::shared_ptr<CategoryView> category_view_;
+ std::tr1::shared_ptr<CategoryView> category_view_;
Glib::ustring selected_name_;
Gtk::Button button_new_;
Gtk::Button button_delete_;
@@ -94,13 +92,13 @@
// tag cloud
Gtk::VBox tag_box_;
TagCloud tag_cloud_;
- boost::shared_ptr<TagCloudModel> tag_cloud_model_;
+ std::tr1::shared_ptr<TagCloudModel> tag_cloud_model_;
bool initial_tag_load_complete_;
// the data model
- boost::shared_ptr<CategoryEditorModel> model_;
+ std::tr1::shared_ptr<CategoryEditorModel> model_;
};
} // namespace paperbox
-#endif // __PAPER_BOX_CATEGORY_EDITOR_HH__
+#endif // __PAPERBOX_CATEGORY_EDITOR_HH__
Modified: trunk/src/category-factory.cc
==============================================================================
--- trunk/src/category-factory.cc (original)
+++ trunk/src/category-factory.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category-factory.cc
+ * Paperbox - category-factory.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -33,7 +31,7 @@
using std::list;
using std::string;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
struct category_name_compare
: public std::binary_function<shared_ptr<Category>,
Modified: trunk/src/category-factory.hh
==============================================================================
--- trunk/src/category-factory.hh (original)
+++ trunk/src/category-factory.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category-factory.hh
+ * Paperbox - category-factory.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -20,14 +18,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_CATEGORY_FACTORY_HH__
-#define __PAPER_BOX_CATEGORY_FACTORY_HH__
+#ifndef __PAPERBOX_CATEGORY_FACTORY_HH__
+#define __PAPERBOX_CATEGORY_FACTORY_HH__
#include <exception>
#include <list>
#include <string>
+#include <tr1/memory>
#include <glibmm/ustring.h>
-#include <boost/shared_ptr.hpp>
#include "category.hh"
namespace paperbox {
@@ -48,12 +46,12 @@
{
public:
// throws CategoryExists
- static boost::shared_ptr<Category> create_category(const Glib::ustring& name);
+ static std::tr1::shared_ptr<Category> create_category(const Glib::ustring& name);
// throws CategoryNotFound
- static boost::shared_ptr<Category> get_category(const Glib::ustring& name);
+ static std::tr1::shared_ptr<Category> get_category(const Glib::ustring& name);
- static std::list<boost::shared_ptr<Category> > load_categories();
+ static std::list<std::tr1::shared_ptr<Category> > load_categories();
// throws CategoryNotFound
static void delete_category(const Glib::ustring& name);
@@ -66,4 +64,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_CATEGORY_FACTORY_HH__
+#endif // __PAPERBOX_CATEGORY_FACTORY_HH__
Modified: trunk/src/category-view.hh
==============================================================================
--- trunk/src/category-view.hh (original)
+++ trunk/src/category-view.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category-view.hh
+ * Paperbox - category-view.hh
*
* Copyright (C) 2008 Marko Anastasov
*
@@ -20,15 +18,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_CATEGORY_VIEW__
-#define __PAPER_BOX_CATEGORY_VIEW__
+#ifndef __PAPERBOX_CATEGORY_VIEW__
+#define __PAPERBOX_CATEGORY_VIEW__
-#include <boost/noncopyable.hpp>
#include <gtkmm/box.h>
#include <gtkmm/label.h>
#include <gtkmm/liststore.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/treeview.h>
+#include "noncopyable.hh"
namespace paperbox {
@@ -43,7 +41,7 @@
};
/// common treeview setup for categories
- class CategoryView : private boost::noncopyable
+ class CategoryView : private NonCopyable
{
public:
explicit CategoryView(Gtk::Box* parent, bool edit_enabled = true);
@@ -64,4 +62,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_CATEGORY_VIEW__
+#endif // __PAPERBOX_CATEGORY_VIEW__
Modified: trunk/src/category.cc
==============================================================================
--- trunk/src/category.cc (original)
+++ trunk/src/category.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category.cc
+ * Paperbox - category.cc
*
* Copyright (C) 2007 Marko Anastasov
*
Modified: trunk/src/category.hh
==============================================================================
--- trunk/src/category.hh (original)
+++ trunk/src/category.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - category.hh
+ * Paperbox - category.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -25,15 +23,15 @@
#include <string>
#include <vector>
-#include <boost/noncopyable.hpp>
#include <glibmm/ustring.h>
#include <giomm/file.h>
+#include "noncopyable.hh"
namespace paperbox {
const std::string CATEGORY_DIR = "categories";
- class Category : private boost::noncopyable
+ class Category : private NonCopyable
{
public:
explicit Category(const Glib::ustring& name);
Modified: trunk/src/config.cc
==============================================================================
--- trunk/src/config.cc (original)
+++ trunk/src/config.cc Sat Dec 27 22:13:13 2008
@@ -30,7 +30,7 @@
namespace paperbox {
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
using Glib::ustring;
const ustring UI_GROUP = "UI";
Modified: trunk/src/config.hh
==============================================================================
--- trunk/src/config.hh (original)
+++ trunk/src/config.hh Sat Dec 27 22:13:13 2008
@@ -18,10 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_CONFIG__
-#define __PAPER_BOX_CONFIG__
+#ifndef __PAPERBOX_CONFIG__
+#define __PAPERBOX_CONFIG__
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <glibmm/miscutils.h>
#include <glibmm/keyfile.h>
@@ -47,7 +47,7 @@
virtual void save() = 0;
};
- boost::shared_ptr<Config> get_default_config();
+ std::tr1::shared_ptr<Config> get_default_config();
void init_config_dirs();
@@ -84,4 +84,4 @@
};
}
-#endif // __PAPER_BOX_CONFIG__
+#endif // __PAPERBOX_CONFIG__
Modified: trunk/src/dialog-entry.hh
==============================================================================
--- trunk/src/dialog-entry.hh (original)
+++ trunk/src/dialog-entry.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - dialog-entry.hh
+ * Paperbox - dialog-entry.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -20,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_DIALOG_ENTRY_HH__
-#define __PAPER_BOX_DIALOG_ENTRY_HH__
+#ifndef __PAPERBOX_DIALOG_ENTRY_HH__
+#define __PAPERBOX_DIALOG_ENTRY_HH__
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
@@ -51,4 +49,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_DIALOG_ENTRY_HH__
+#endif // __PAPER_BOXDIALOG_ENTRY_HH__
Modified: trunk/src/dialog-properties.cc
==============================================================================
--- trunk/src/dialog-properties.cc (original)
+++ trunk/src/dialog-properties.cc Sat Dec 27 22:13:13 2008
@@ -65,7 +65,7 @@
}
int
- DialogProperties::run(boost::shared_ptr<Document>& doc)
+ DialogProperties::run(std::tr1::shared_ptr<Document>& doc)
{
if (! doc->get_subject().empty()) {
set_title(doc->get_subject());
Modified: trunk/src/dialog-properties.hh
==============================================================================
--- trunk/src/dialog-properties.hh (original)
+++ trunk/src/dialog-properties.hh Sat Dec 27 22:13:13 2008
@@ -18,10 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_DIALOG_PROPERTIES_HH__
-#define __PAPER_BOX_DIALOG_PROPERTIES_HH__
+#ifndef __PAPERBOX_DIALOG_PROPERTIES_HH__
+#define __PAPERBOX_DIALOG_PROPERTIES_HH__
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <gtkmm/dialog.h>
#include <gtkmm/label.h>
#include <libglademm/xml.h>
@@ -39,7 +39,7 @@
static DialogProperties* create();
- int run(boost::shared_ptr<Document>& doc);
+ int run(std::tr1::shared_ptr<Document>& doc);
protected:
Glib::RefPtr<Gnome::Glade::Xml> glade_;
@@ -52,4 +52,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_DIALOG_PROPERTIES_HH__
+#endif // __PAPERBOX_DIALOG_PROPERTIES_HH__
Modified: trunk/src/document-tag-cloud-model.cc
==============================================================================
--- trunk/src/document-tag-cloud-model.cc (original)
+++ trunk/src/document-tag-cloud-model.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - document-tag-cloud-model.cc
+ * Paperbox - document-tag-cloud-model.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -28,7 +26,7 @@
namespace paperbox {
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
DocumentTagCloudModel::DocumentTagCloudModel(int min_font_size,
int max_font_size)
Modified: trunk/src/document-tag-cloud-model.hh
==============================================================================
--- trunk/src/document-tag-cloud-model.hh (original)
+++ trunk/src/document-tag-cloud-model.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - document-tag-cloud-model.hh
+ * Paperbox - document-tag-cloud-model.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -21,12 +19,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __PAPER_BOX_DOCUMENT_TAG_CLOUD_MODEL_H__
-#define __PAPER_BOX_DOCUMENT_TAG_CLOUD_MODEL_H__
+#ifndef __PAPERBOX_DOCUMENT_TAG_CLOUD_MODEL_H__
+#define __PAPERBOX_DOCUMENT_TAG_CLOUD_MODEL_H__
#include <string>
+#include <tr1/memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <glibmm/ustring.h>
#include "tag-cloud-model.hh"
@@ -40,7 +38,7 @@
explicit DocumentTagCloudModel(int min_font_size, int max_font_size);
virtual ~DocumentTagCloudModel();
- virtual void update_tags(const boost::shared_ptr<Document>& doc);
+ virtual void update_tags(const std::tr1::shared_ptr<Document>& doc);
protected:
void on_tags_changed(const std::string& uri,
@@ -50,4 +48,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_DOCUMENT_TAG_CLOUD_MODEL_H__
+#endif // __PAPER_BOXDOCUMENT_TAG_CLOUD_MODEL_H__
Modified: trunk/src/document-tile-view.cc
==============================================================================
--- trunk/src/document-tile-view.cc (original)
+++ trunk/src/document-tile-view.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - document-tile-view.cc
+ * Paperbox - document-tile-view.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -27,7 +25,7 @@
namespace paperbox {
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
typedef vector<shared_ptr<Document> > doc_vector;
Modified: trunk/src/document-tile-view.hh
==============================================================================
--- trunk/src/document-tile-view.hh (original)
+++ trunk/src/document-tile-view.hh Sat Dec 27 22:13:13 2008
@@ -1,5 +1,5 @@
/*
- * PaperBox - document-tile-view.hh
+ * Paperbox - document-tile-view.hh
*
* Copyright (C) 2007-2008 Marko Anastasov
*
@@ -18,12 +18,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_DOCUMENT_TILE_VIEW_HH__
-#define __PAPER_BOX_DOCUMENT_TILE_VIEW_HH__
+#ifndef __PAPERBOX_DOCUMENT_TILE_VIEW_HH__
+#define __PAPERBOX_DOCUMENT_TILE_VIEW_HH__
-#include <gtkmm-utils/tile-view.h>
#include <vector>
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
+#include <gtkmm-utils/tile-view.h>
#include "document-tile.hh"
namespace paperbox {
@@ -43,7 +43,7 @@
virtual void add_tile(Gtk::Util::Tile* tile);
virtual void get_displayed_documents(
- std::vector<boost::shared_ptr<Document> >& docs);
+ std::vector<std::tr1::shared_ptr<Document> >& docs);
// Signal propagated from individual DocumentTileView widgets
SignalTagClicked& signal_tag_clicked() { return signal_tag_clicked_; }
@@ -60,11 +60,11 @@
virtual void on_tag_selected(const Glib::ustring& tag);
virtual void tile_walker(Gtk::Util::Tile& tile,
- std::vector<boost::shared_ptr<Document> >* current_docs);
+ std::vector<std::tr1::shared_ptr<Document> >* current_docs);
SignalTagClicked signal_tag_clicked_;
};
}
-#endif // __PAPER_BOX_DOCUMENT_TILE_VIEW_HH__
+#endif // __PAPERBOX_DOCUMENT_TILE_VIEW_HH__
Modified: trunk/src/document-tile.cc
==============================================================================
--- trunk/src/document-tile.cc (original)
+++ trunk/src/document-tile.cc Sat Dec 27 22:13:13 2008
@@ -1,5 +1,5 @@
/*
- * PaperBox - document-tile.cc
+ * Paperbox - document-tile.cc
*
* Copyright (C) 2007-2008 Marko Anastasov
*
@@ -31,7 +31,7 @@
using std::string;
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
using Glib::ustring;
const unsigned int TITLE_BREAK = 50;
Modified: trunk/src/document-tile.hh
==============================================================================
--- trunk/src/document-tile.hh (original)
+++ trunk/src/document-tile.hh Sat Dec 27 22:13:13 2008
@@ -1,5 +1,5 @@
/*
- * PaperBox - document-tile.hh
+ * Paperbox - document-tile.hh
*
* Copyright (C) 2007-2008 Marko Anastasov
*
@@ -18,12 +18,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_DOCUMENT_TILE_HH__
-#define __PAPER_BOX_DOCUMENT_TILE_HH__
+#ifndef __PAPERBOX_DOCUMENT_TILE_HH__
+#define __PAPERBOX_DOCUMENT_TILE_HH__
#include <map>
#include <string>
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <gtkmm/button.h>
#include <gtkmm/image.h>
#include <gtkmm/label.h>
@@ -38,7 +38,7 @@
// Definition of the hash map where we'll store dynamically created
// tag link widgets. We use one widget per tag.
typedef std::map<std::string,
- boost::shared_ptr<Gtk::Widget>,
+ std::tr1::shared_ptr<Gtk::Widget>,
std::less<std::string> >
tag_link_map;
@@ -51,13 +51,13 @@
typedef sigc::signal<void, const Glib::ustring&> SignalTagClicked;
explicit DocumentTile(Thumbnailer& thumbnailer,
- const boost::shared_ptr<Document>& doc);
+ const std::tr1::shared_ptr<Document>& doc);
~DocumentTile();
virtual Glib::ustring get_document_uri() const;
virtual std::string get_document_uri_raw() const;
- virtual boost::shared_ptr<Document> get_document();
+ virtual std::tr1::shared_ptr<Document> get_document();
// The signal that forwards the event of clicking on a tag
// within the tile to the view (DocumentTileView).
@@ -116,7 +116,7 @@
virtual void restore_title();
Glib::ustring uri_;
- boost::shared_ptr<Document> doc_;
+ std::tr1::shared_ptr<Document> doc_;
SignalTagClicked signal_tag_clicked_;
@@ -142,4 +142,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_DOCUMENT_TILE_HH__
+#endif // __PAPERBOX_DOCUMENT_TILE_HH__
Modified: trunk/src/main-window.cc
==============================================================================
--- trunk/src/main-window.cc (original)
+++ trunk/src/main-window.cc Sat Dec 27 22:13:13 2008
@@ -45,7 +45,7 @@
using std::list;
using std::map;
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
///
@@ -544,7 +544,7 @@
// Invoked from Browser during idle time.
// All this should be re-thought when we get xesam dbus api in tracker.
void
- MainWindow::on_new_document(const boost::shared_ptr<Document>& doc)
+ MainWindow::on_new_document(const shared_ptr<Document>& doc)
{
shared_ptr<DocumentTile> tile(new DocumentTile(thumbnailer_, doc));
Modified: trunk/src/main-window.hh
==============================================================================
--- trunk/src/main-window.hh (original)
+++ trunk/src/main-window.hh Sat Dec 27 22:13:13 2008
@@ -18,10 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_MAIN_WINDOW__
-#define __PAPER_BOX_MAIN_WINDOW__
+#ifndef __PAPERBOX_MAIN_WINDOW__
+#define __PAPERBOX_MAIN_WINDOW__
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <gtkmm/box.h>
#include <gtkmm/paned.h>
#include <gtkmm/window.h>
@@ -57,7 +57,7 @@
static MainWindow* create();
protected:
- void init_gui(const boost::shared_ptr<Config>& cfg);
+ void init_gui(const std::tr1::shared_ptr<Config>& cfg);
void get_widgets_from_ui_file();
void init_toolbar();
@@ -70,10 +70,10 @@
void reload_category_view();
void render_new_tile_set(
- const std::vector<boost::shared_ptr<Document> >& docs);
+ const std::vector<std::tr1::shared_ptr<Document> >& docs);
void render_documents(
- const std::vector<boost::shared_ptr<Document> > docs);
+ const std::vector<std::tr1::shared_ptr<Document> > docs);
/*** Signal handlers ***/
void on_menu_document_open();
@@ -86,7 +86,7 @@
void on_retrieval_finished();
- void on_new_document(const boost::shared_ptr<Document>& doc);
+ void on_new_document(const std::tr1::shared_ptr<Document>& doc);
void on_document_tile_selected(/*Document*/Gtk::Util::Tile& t);
@@ -106,7 +106,7 @@
void hide_widgets_in_retrieval();
void show_widgets_after_retrieval();
- void sort_documents(std::vector<boost::shared_ptr<Document> >& docs);
+ void sort_documents(std::vector<std::tr1::shared_ptr<Document> >& docs);
/*** Members ***/
Browser* browser_;
@@ -129,7 +129,7 @@
Gtk::ComboBoxText sorting_combo_;
DocumentTileView* tile_view_;
- boost::shared_ptr<TileSet> tiles_;
+ std::tr1::shared_ptr<TileSet> tiles_;
// ~right side~
Gtk::VBox* right_top_vbox_;
@@ -138,18 +138,18 @@
// categories
Gtk::VBox* category_vbox_;
- boost::shared_ptr<CategoryView> category_view_;
+ std::tr1::shared_ptr<CategoryView> category_view_;
Glib::ustring selected_cat_name_;
Gtk::HBox* category_buttons_hbox_;
- boost::shared_ptr<CategoryModel> category_model_;
+ std::tr1::shared_ptr<CategoryModel> category_model_;
// tag cloud
Gtk::VBox* tag_cloud_vbox_;
Gtk::Label label_tags_;
- boost::shared_ptr<TagCloudModel> model_;
+ std::tr1::shared_ptr<TagCloudModel> model_;
TagCloud tag_cloud_;
Gtk::VBox tag_box_;
@@ -163,4 +163,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_MAIN_WINDOW__
+#endif // __PAPER_BOXMAIN_WINDOW__
Added: trunk/src/noncopyable.hh
==============================================================================
--- (empty file)
+++ trunk/src/noncopyable.hh Sat Dec 27 22:13:13 2008
@@ -0,0 +1,39 @@
+/*
+ * Paperbox - noncopyable.hh
+ *
+ * Copyright (C) 2008 Marko Anastasov
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __PAPERBOX_NONCOPYABLE__
+#define __PAPERBOX_NONCOPYABLE__
+
+namespace paperbox {
+
+ class NonCopyable
+ {
+ protected:
+ NonCopyable() {}
+ ~NonCopyable() {}
+
+ private:
+ NonCopyable(const NonCopyable& );
+ const NonCopyable& operator=(const NonCopyable& );
+ };
+
+} // namespace paperbox
+
+#endif // __PAPERBOX_NONCOPYABLE__
Modified: trunk/src/tag-cloud-model.cc
==============================================================================
--- trunk/src/tag-cloud-model.cc (original)
+++ trunk/src/tag-cloud-model.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tag-cloud-model.cc
+ * Paperbox - tag-cloud-model.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -25,7 +23,7 @@
#include "tag-cloud-model.hh"
using std::map;
-using boost::shared_ptr;
+using std::tr1::shared_ptr;
class CloudStats
{
Modified: trunk/src/tag-cloud-model.hh
==============================================================================
--- trunk/src/tag-cloud-model.hh (original)
+++ trunk/src/tag-cloud-model.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tag-cloud-model.hh
+ * Paperbox - tag-cloud-model.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -21,11 +19,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __TAG_CLOUD_MODEL_H__
-#define __TAG_CLOUD_MODEL_H__
+#ifndef __PAPERBOX_TAG_CLOUD_MODEL__
+#define __PAPERBOX_TAG_CLOUD_MODEL__
#include <map>
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <glibmm/ustring.h>
#include <sigc++/signal.h>
@@ -44,7 +42,7 @@
class CloudStats;
struct TagData;
-typedef std::map<Glib::ustring, boost::shared_ptr<TagData>, lt_ustring>
+typedef std::map<Glib::ustring, std::tr1::shared_ptr<TagData>, lt_ustring>
tag_map;
class TagCloudModel : public sigc::trackable
@@ -76,7 +74,7 @@
int min_font_size_;
int max_font_size_;
- boost::shared_ptr<CloudStats> stats_;
+ std::tr1::shared_ptr<CloudStats> stats_;
tag_map tags_;
@@ -85,4 +83,4 @@
TagCloudModel& operator=(const TagCloudModel& );
};
-#endif // __TAG_CLOUD_MODEL_H__
+#endif // __PAPERBOX_TAG_CLOUD_MODEL__
Modified: trunk/src/tag-cloud.cc
==============================================================================
--- trunk/src/tag-cloud.cc (original)
+++ trunk/src/tag-cloud.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tag-cloud.cc
+ * Paperbox - tag-cloud.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -31,7 +29,7 @@
using std::list;
using std::map;
-using boost::shared_ptr;
+using std::tr1::shared_ptr;
static const guint32 TAG_SPACING = 8;
static const guint32 TAG_BORDER_MIN = 5;
Modified: trunk/src/tag-cloud.hh
==============================================================================
--- trunk/src/tag-cloud.hh (original)
+++ trunk/src/tag-cloud.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tag-cloud.hh
+ * Paperbox - tag-cloud.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -26,8 +24,8 @@
#include <list>
#include <map>
+#include <tr1/memory>
#include <glib/grand.h>
-#include <boost/shared_ptr.hpp>
#include <gtkmm.h>
#include "tag-cloud-model.hh"
@@ -44,7 +42,7 @@
explicit TagCloud();
virtual ~TagCloud();
- void set_model(boost::shared_ptr<TagCloudModel> model);
+ void set_model(std::tr1::shared_ptr<TagCloudModel> model);
void set_use_random_line_borders(bool randomize = true)
{ randomize_borders_ = randomize; }
@@ -84,8 +82,8 @@
SignalTagClicked signal_tag_clicked_;
Gtk::Widget* canvas_;
- std::list<boost::shared_ptr<TagItem> > text_items_;
- boost::shared_ptr<TagCloudModel> model_;
+ std::list<std::tr1::shared_ptr<TagItem> > text_items_;
+ std::tr1::shared_ptr<TagCloudModel> model_;
TagItem* selection_;
Glib::ustring selection_string_;
Modified: trunk/src/thumbnailer.cc
==============================================================================
--- trunk/src/thumbnailer.cc (original)
+++ trunk/src/thumbnailer.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - thumbnailer.cc
+ * Paperbox - thumbnailer.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -132,7 +130,7 @@
using std::map;
using std::queue;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
/* ThumbnailPixbufData */
Modified: trunk/src/thumbnailer.hh
==============================================================================
--- trunk/src/thumbnailer.hh (original)
+++ trunk/src/thumbnailer.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - thumbnailer.hh
+ * Paperbox - thumbnailer.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -20,10 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPERBOX_THUMBNAILER_H__
-#define __PAPERBOX_THUMBNAILER_H__
+#ifndef __PAPERBOX_THUMBNAILER__
+#define __PAPERBOX_THUMBNAILER__
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include <gdkmm/pixbuf.h>
namespace paperbox {
@@ -49,9 +47,9 @@
protected:
struct Private;
- boost::shared_ptr<Private> priv_;
+ std::tr1::shared_ptr<Private> priv_;
};
} // namespace paperbox
-#endif // __PAPERBOX_THUMBNAILER_H__
+#endif // __PAPERBOX_THUMBNAILER__
Modified: trunk/src/tile-set.cc
==============================================================================
--- trunk/src/tile-set.cc (original)
+++ trunk/src/tile-set.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tile-set.cc
+ * Paperbox - tile-set.cc
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -25,7 +23,7 @@
namespace paperbox {
using std::string;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
TileSet::TileSet() {}
TileSet::~TileSet() {}
Modified: trunk/src/tile-set.hh
==============================================================================
--- trunk/src/tile-set.hh (original)
+++ trunk/src/tile-set.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tile-set.hh
+ * Paperbox - tile-set.hh
*
* Copyright (C) 2007 Marko Anastasov
*
@@ -20,33 +18,33 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_TILE_SET_HH__
-#define __PAPER_BOX_TILE_SET_HH__
+#ifndef __PAPERBOX_TILE_SET_HH__
+#define __PAPERBOX_TILE_SET_HH__
#include <map>
#include <string>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <tr1/memory>
#include "document-tile.hh"
+#include "noncopyable.hh"
namespace paperbox {
/**
* Data about displayed document tiles
*/
- class TileSet : private boost::noncopyable
+ class TileSet : private NonCopyable
{
public:
explicit TileSet();
~TileSet();
- bool add(boost::shared_ptr<DocumentTile>& tile);
+ bool add(std::tr1::shared_ptr<DocumentTile>& tile);
- boost::shared_ptr<DocumentTile> get_tile(const std::string& uri);
+ std::tr1::shared_ptr<DocumentTile> get_tile(const std::string& uri);
protected:
typedef std::map<std::string,
- boost::shared_ptr<DocumentTile>,
+ std::tr1::shared_ptr<DocumentTile>,
std::less<std::string> >
tile_map;
Modified: trunk/src/tracker-phone.cc
==============================================================================
--- trunk/src/tracker-phone.cc (original)
+++ trunk/src/tracker-phone.cc Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tracker-client.cc
+ * Paperbox - tracker-client.cc
*
* Copyright (C) 2007-2008 Marko Anastasov
*
@@ -211,7 +209,7 @@
namespace paperbox {
using std::vector;
- using boost::shared_ptr;
+ using std::tr1::shared_ptr;
TrackerPhone::TrackerPhone() throw (std::runtime_error)
:
Modified: trunk/src/tracker-phone.hh
==============================================================================
--- trunk/src/tracker-phone.hh (original)
+++ trunk/src/tracker-phone.hh Sat Dec 27 22:13:13 2008
@@ -1,7 +1,5 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
/*
- * PaperBox - tracker-phone.hh
+ * Paperbox - tracker-phone.hh
*
* Copyright (C) 2007-2008 Marko Anastasov
*
@@ -20,25 +18,25 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PAPER_BOX_TRACKER_PHONE__
-#define __PAPER_BOX_TRACKER_PHONE__
+#ifndef __PAPERBOX_TRACKER_PHONE__
+#define __PAPERBOX_TRACKER_PHONE__
#include <queue>
#include <stdexcept>
+#include <tr1/memory>
#include <vector>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <glibmm/ustring.h>
#include <sigc++/sigc++.h>
#include <tracker.h>
#include "document.hh"
+#include "noncopyable.hh"
namespace paperbox {
// It's not called TrackerClient because
// libtracker defines a TrackerClient struct.
- class TrackerPhone : private boost::noncopyable
+ class TrackerPhone : private NonCopyable
{
public:
typedef sigc::signal<void,
@@ -58,7 +56,7 @@
void request_all_documents();
void get_document(const Glib::ustring& uri,
- boost::shared_ptr<Document>& document);
+ std::tr1::shared_ptr<Document>& document);
void add_tags(const Glib::ustring& uri,
const std::vector<Glib::ustring> tags);
@@ -77,9 +75,9 @@
void prepare_document(const Glib::ustring& uri,
char** keys,
- boost::shared_ptr<Document>& document);
+ std::tr1::shared_ptr<Document>& document);
- void attach_tags(boost::shared_ptr<Document>& document);
+ void attach_tags(std::tr1::shared_ptr<Document>& document);
TrackerClient* tracker_connection_;
DBusGConnection* bus_;
@@ -92,4 +90,4 @@
} // namespace paperbox
-#endif // __PAPER_BOX_TRACKER_PHONE__
+#endif // __PAPERBOX_TRACKER_PHONE__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
