Changeset 8f15b2767f118e46fbe06dd1a54566a656ce89a3

Timestamp:

01/06/07 23:56:42 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

774f0f8fd0e0da7827ba65e5075e6c4e9e78f153

Children:

990094824987f571e7c4a20b1dfe67c17f167fdd

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:56:42Z+0000

Message:

[project @ Temporary adjustments for document template parameter in document info]

Original author: Armin Burgmeier <armin@…>
Date: 2006-01-30 11:52:22+00:00

Files:

• inc/chat.hpp (modified) (1 diff)
• inc/document.hpp (modified) (2 diffs)
• inc/documentlist.hpp (modified) (1 diff)
• inc/docwindow.hpp (modified) (1 diff)
• inc/folder.hpp (modified) (2 diffs)
• inc/statusbar.hpp (modified) (1 diff)
• inc/userlist.hpp (modified) (2 diffs)
• src/chat.cpp (modified) (1 diff)
• src/document.cpp (modified) (2 diffs)
• src/documentlist.cpp (modified) (7 diffs)
• src/docwindow.cpp (modified) (1 diff)
• src/folder.cpp (modified) (6 diffs)
• src/statusbar.cpp (modified) (1 diff)
• src/userlist.cpp (modified) (5 diffs)
• src/window.cpp (modified) (2 diffs)

inc/chat.hpp

@@ -47 +47 @@
         void obby_user_join(const obby::user& user);
         void obby_user_part(const obby::user& user);
-        void obby_document_insert(obby::local_document_info& document);
-        void obby_document_remove(obby::local_document_info& document);
+        void obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& document);
+        void obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& document);
 
         //void obby_message(const obby::user& user, const Glib::ustring& message);

inc/document.hpp

@@ -41 +41 @@
         typedef sigc::signal<void> signal_language_changed_type;
 
-        Document(obby::local_document_info& doc, const Folder& folder,
+        Document(obby::basic_local_document_info<obby::document, net6::selector>& doc, const Folder& folder,
                  const Preferences& preferences);
 
-        const obby::local_document_info& get_document() const;
-        obby::local_document_info& get_document();
+        const obby::basic_local_document_info<obby::document, net6::selector>& get_document() const;
+        obby::basic_local_document_info<obby::document, net6::selector>& get_document();
 
         /** Writes the current cursor position into row and col.
@@ -193 +193 @@
         /** The underlaying obby document info.
          */
-        obby::local_document_info& m_doc;
+        obby::basic_local_document_info<obby::document, net6::selector>& m_doc;
 
         /** Preferences for this document.

inc/documentlist.hpp

@@ -58 +58 @@
         virtual void obby_user_part(const obby::user& user);
         virtual void obby_user_colour(const obby::user& user);
-        virtual void obby_document_insert(obby::local_document_info& info);
-        virtual void obby_document_remove(obby::local_document_info& info);
+        virtual void obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& info);
+        virtual void obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& info);
 protected:
-        Gtk::TreeIter find_iter(const obby::local_document_info& info) const;
+        Gtk::TreeIter find_iter(const obby::basic_local_document_info<obby::document, net6::selector>& info) const;
 
         virtual void on_user_subscribe(const obby::user& user,
-                                       const obby::local_document_info& info);
+                                       const obby::basic_local_document_info<obby::document, net6::selector>& info);
         virtual void on_user_unsubscribe(const obby::user& user,
-                                         const obby::local_document_info& info);
+                                         const obby::basic_local_document_info<obby::document, net6::selector>& info);
 
         virtual void on_subscribe();

inc/docwindow.hpp

@@ -40 +40 @@
                 signal_language_changed_type;
 
-        DocWindow(obby::local_document_info& doc, const Folder& folder,
+        DocWindow(obby::basic_local_document_info<obby::document, net6::selector>& doc, const Folder& folder,
                   const Preferences& preferences);
         virtual ~DocWindow();

inc/folder.hpp

@@ -99 +99 @@
         void obby_user_part(const obby::user& user);
         void obby_user_colour(const obby::user& user);
-        void obby_document_insert(obby::local_document_info& document);
-        void obby_document_remove(obby::local_document_info& document);
+        void obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& document);
+        void obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& document);
 
         /** Signal which will be emitted if a document has been added to the
@@ -157 +157 @@
 
         void on_document_subscribe(const obby::user& user,
-                                   obby::local_document_info& info);
+                                   obby::basic_local_document_info<obby::document, net6::selector>& info);
         void on_document_unsubscribe(const obby::user& user,
-                                     obby::local_document_info& info);
+                                     obby::basic_local_document_info<obby::document, net6::selector>& info);
 
         // Called by on_document_subscribe/unsubscribe if the (un)subscribing
         // user is the local one.
-        void on_self_subscribe(obby::local_document_info& info);
-        void on_self_unsubscribe(obby::local_document_info& info);
+        void on_self_subscribe(obby::basic_local_document_info<obby::document, net6::selector>& info);
+        void on_self_unsubscribe(obby::basic_local_document_info<obby::document, net6::selector>& info);
 
         void on_document_modified_changed(DocWindow& window);

inc/statusbar.hpp

@@ -52 +52 @@
         void obby_user_join(const obby::user& user);
         void obby_user_part(const obby::user& user);
-        void obby_document_insert(obby::local_document_info& document);
-        void obby_document_remove(obby::local_document_info& document);
+        void obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& document);
+        void obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& document);
 
         virtual void on_show();

inc/userlist.hpp

@@ -58 +58 @@
         virtual void obby_user_part(const obby::user& user);
         virtual void obby_user_colour(const obby::user& user);
-        virtual void obby_document_insert(obby::local_document_info& info);
-        virtual void obby_document_remove(obby::local_document_info& info);
+        virtual void obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& info);
+        virtual void obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& info);
 protected:
         Gtk::TreeIter find_iter(const Gtk::TreeIter& parent,
@@ -66 +66 @@
 
         void on_user_subscribe(const obby::user& user,
-                               const obby::local_document_info& info);
+                               const obby::basic_local_document_info<obby::document, net6::selector>& info);
         void on_user_unsubscribe(const obby::user& user,
-                                 const obby::local_document_info& info);
+                                 const obby::basic_local_document_info<obby::document, net6::selector>& info);
 
         Header& m_header;

src/chat.cpp

@@ -146 +146 @@
 }
 
-void Gobby::Chat::obby_document_insert(obby::local_document_info& document)
-{
-}
-
-void Gobby::Chat::obby_document_remove(obby::local_document_info& document)
+void Gobby::Chat::obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& document)
+{
+}
+
+void Gobby::Chat::obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& document)
 {
 }

src/document.cpp

@@ -23 +23 @@
 #include "folder.hpp"
 
-Gobby::Document::Document(obby::local_document_info& doc, const Folder& folder,
+Gobby::Document::Document(obby::basic_local_document_info<obby::document, net6::selector>& doc, const Folder& folder,
                           const Preferences& preferences)
  : Gtk::SourceView(),
@@ -171 +171 @@
 }
 
-const obby::local_document_info& Gobby::Document::get_document() const
+const obby::basic_local_document_info<obby::document, net6::selector>& Gobby::Document::get_document() const
 {
         return m_doc;
 }
 
-obby::local_document_info& Gobby::Document::get_document()
+obby::basic_local_document_info<obby::document, net6::selector>& Gobby::Document::get_document()
 {
         return m_doc;

src/documentlist.cpp

@@ -128 +128 @@
 }
 
-void Gobby::DocumentList::obby_document_insert(obby::local_document_info& info)
+void Gobby::DocumentList::obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         info.subscribe_event().connect(
@@ -155 +155 @@
         (*new_doc)[m_tree_cols.text] = info.get_title();
         (*new_doc)[m_tree_cols.color] =
-                info.is_subscribed(info.get_buffer().get_self() ) ?
-                        COLOR_SUBSCRIBED : COLOR_UNSUBSCRIBED;
+                info.is_subscribed() ? COLOR_SUBSCRIBED : COLOR_UNSUBSCRIBED;
         (*new_doc)[m_tree_cols.data] = static_cast<void*>(&info);
 }
 
-void Gobby::DocumentList::obby_document_remove(obby::local_document_info& info)
+void Gobby::DocumentList::obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         Gtk::TreeIter iter = find_iter(info);
@@ -175 +174 @@
 void
 Gobby::DocumentList::on_user_subscribe(const obby::user& user,
-                                       const obby::local_document_info& info)
+                                       const obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         if(&user == &info.get_buffer().get_self() )
@@ -190 +189 @@
 void
 Gobby::DocumentList::on_user_unsubscribe(const obby::user& user,
-                                         const obby::local_document_info& info)
+                                         const obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         if(&user == &info.get_buffer().get_self() )
@@ -204 +203 @@
 
 Gtk::TreeIter
-Gobby::DocumentList::find_iter(const obby::local_document_info& info) const
+Gobby::DocumentList::find_iter(const obby::basic_local_document_info<obby::document, net6::selector>& info) const
 {
         const Gtk::TreeNodeChildren& list = m_tree_data->children();
@@ -229 +228 @@
         {
                 Gtk::TreeIter tree_iter = m_tree_data->get_iter(*iter);
-                obby::local_document_info* info =
-                        static_cast<obby::local_document_info*>(
+                obby::basic_local_document_info<obby::document, net6::selector>* info =
+                        static_cast<obby::basic_local_document_info<obby::document, net6::selector>*>(
                                 static_cast<void*>(
                                         (*tree_iter)[m_tree_cols.data]
@@ -250 +249 @@
         {
                 Gtk::TreeIter tree_iter = m_tree_data->get_iter(*iter);
-                const obby::local_document_info* info =
-                        static_cast<const obby::local_document_info*>(
+                const obby::basic_local_document_info<obby::document, net6::selector>* info =
+                        static_cast<const obby::basic_local_document_info<obby::document, net6::selector>*>(
                                 static_cast<const void*>(
                                         (*tree_iter)[m_tree_cols.data]

src/docwindow.cpp

@@ -19 +19 @@
 #include "docwindow.hpp"
 
-Gobby::DocWindow::DocWindow(obby::local_document_info& doc,
+Gobby::DocWindow::DocWindow(obby::basic_local_document_info<obby::document, net6::selector>& doc,
                             const Folder& folder,
                             const Preferences& preferences)

src/folder.cpp

@@ -194 +194 @@
 }
 
-void Gobby::Folder::obby_document_insert(obby::local_document_info& document)
+void Gobby::Folder::obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& document)
 {
         // Document subscription handling
@@ -212 +212 @@
 }
 
-void Gobby::Folder::obby_document_remove(obby::local_document_info& document)
+void Gobby::Folder::obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& document)
 {
         // Nothing to do, the unsubscription signal handler has already removed
@@ -315 +315 @@
 
 void Gobby::Folder::on_document_subscribe(const obby::user& user,
-                                          obby::local_document_info& info)
+                                          obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         if(&info.get_buffer().get_self() == &user)
@@ -321 +321 @@
 }
 
-void Gobby::Folder::on_self_subscribe(obby::local_document_info& info)
+void Gobby::Folder::on_self_subscribe(obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         // Create new document
@@ -398 +398 @@
 
 void Gobby::Folder::on_document_unsubscribe(const obby::user& user,
-                                            obby::local_document_info& info)
+                                            obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         if(&info.get_buffer().get_self() == &user)
@@ -404 +404 @@
 }
 
-void Gobby::Folder::on_self_unsubscribe(obby::local_document_info& info)
+void Gobby::Folder::on_self_unsubscribe(obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         DocWindow* wnd = NULL;

src/statusbar.cpp

@@ -110 +110 @@
 }
 
-void Gobby::StatusBar::obby_document_insert(obby::local_document_info& document)
+void Gobby::StatusBar::obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& document)
 {
 }
 
-void Gobby::StatusBar::obby_document_remove(obby::local_document_info& document)
+void Gobby::StatusBar::obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& document)
 {
         // Last document that is closed?

src/userlist.cpp

@@ -173 +173 @@
                         on_user_subscribe(
                                 user,
-                                dynamic_cast<const obby::local_document_info&>(
+                                dynamic_cast<const obby::basic_local_document_info<obby::document, net6::selector>&>(
                                         *iter
                                 )
@@ -215 +215 @@
 }
 
-void Gobby::UserList::obby_document_insert(obby::local_document_info& info)
+void Gobby::UserList::obby_document_insert(obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         info.subscribe_event().connect(
@@ -232 +232 @@
 }
 
-void Gobby::UserList::obby_document_remove(obby::local_document_info& info)
+void Gobby::UserList::obby_document_remove(obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         // Do nothing here because unsubscrption signal will be emitted for all
@@ -239 +239 @@
 
 void Gobby::UserList::on_user_subscribe(const obby::user& user,
-                                        const obby::local_document_info& info)
+                                        const obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         Gtk::TreeIter iter = find_iter(m_iter_online, user.get_name() );
@@ -255 +255 @@
 
 void Gobby::UserList::on_user_unsubscribe(const obby::user& user,
-                                          const obby::local_document_info& info)
+                                          const obby::basic_local_document_info<obby::document, net6::selector>& info)
 {
         Gtk::TreeIter user_iter = find_iter(m_iter_online, user.get_name() );

src/window.cpp

@@ -950 +950 @@
 void Gobby::Window::on_obby_document_insert(obby::basic_document_info<obby::document, net6::selector>& document)
 {
-        obby::local_document_info& local_doc =
-                dynamic_cast<obby::local_document_info&>(document);
+        obby::basic_local_document_info<obby::document, net6::selector>& local_doc =
+                dynamic_cast<obby::basic_local_document_info<obby::document, net6::selector>&>(document);
 
         m_folder.obby_document_insert(local_doc);
@@ -962 +962 @@
 void Gobby::Window::on_obby_document_remove(obby::basic_document_info<obby::document, net6::selector>& document)
 {
-        obby::local_document_info& local_doc =
-                dynamic_cast<obby::local_document_info&>(document);
+        obby::basic_local_document_info<obby::document, net6::selector>& local_doc =
+                dynamic_cast<obby::basic_local_document_info<obby::document, net6::selector>&>(document);
 
         m_folder.obby_document_remove(local_doc);