Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in...

[inkscape.git] / src / xml / composite-node-observer.cpp

diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index b564da78da431d16e0e7e1489690745a40f9a3a6..36fe469de7053546441984e52a436976e38ded00 100644 (file)
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -12,7 +12,10 @@
  *
  */
 
-#include "algorithms/find-if-before.h"
+#include <cstring>
+#include <glib.h>
+
+#include "util/find-if-before.h"
 #include "xml/composite-node-observer.h"
 #include "xml/node-event-vector.h"
 #include "debug/event-tracker.h"
@@ -66,7 +69,7 @@ void CompositeNodeObserver::notifyChildOrderChanged(Node &node, Node &child,
 
 void CompositeNodeObserver::notifyContentChanged(
     Node &node,
-    Util::shared_ptr<char> old_content, Util::shared_ptr<char> new_content
+    Util::ptr_shared<char> old_content, Util::ptr_shared<char> new_content
 ) {
     _startIteration();
     for ( ObserverRecordList::iterator iter=_active.begin() ;
@@ -81,7 +84,7 @@ void CompositeNodeObserver::notifyContentChanged(
 
 void CompositeNodeObserver::notifyAttributeChanged(
     Node &node, GQuark name,
-    Util::shared_ptr<char> old_value, Util::shared_ptr<char> new_value
+    Util::ptr_shared<char> old_value, Util::ptr_shared<char> new_value
 ) {
     _startIteration();
     for ( ObserverRecordList::iterator iter=_active.begin() ;
@@ -130,13 +133,13 @@ public:
         }
     }
 
-    void notifyContentChanged(Node &node, Util::shared_ptr<char> old_content, Util::shared_ptr<char> new_content) {
+    void notifyContentChanged(Node &node, Util::ptr_shared<char> old_content, Util::ptr_shared<char> new_content) {
         if (vector.content_changed) {
             vector.content_changed(&node, old_content, new_content, data);
         }
     }
 
-    void notifyAttributeChanged(Node &node, GQuark name, Util::shared_ptr<char> old_value, Util::shared_ptr<char> new_value) {
+    void notifyAttributeChanged(Node &node, GQuark name, Util::ptr_shared<char> old_value, Util::ptr_shared<char> new_value) {
         if (vector.attr_changed) {
             vector.attr_changed(&node, g_quark_to_string(name), old_value, new_value, false, data);
         }
@@ -169,7 +172,7 @@ struct unmarked_record_satisfying {
 };
 
 template <typename Predicate>
-bool mark_one(ObserverRecordList &observers, unsigned &marked_count,
+bool mark_one(ObserverRecordList &observers, unsigned &/*marked_count*/,
               Predicate p)
 {
     ObserverRecordList::iterator found=std::find_if(
@@ -186,7 +189,7 @@ bool mark_one(ObserverRecordList &observers, unsigned &marked_count,
 }
 
 template <typename Predicate>
-bool remove_one(ObserverRecordList &observers, unsigned &marked_count,
+bool remove_one(ObserverRecordList &observers, unsigned &/*marked_count*/,
                 Predicate p)
 {
     if (observers.empty()) {
@@ -305,4 +308,4 @@ void CompositeNodeObserver::removeListenerByData(void *data) {
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :