Formatting

(bzr r13341.1.199)

2 files changed, 66 insertions, 43 deletions

diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index bdd966144..21ab3ed02 100644
--- a/src/display/nr-svgfonts.h
+++ b/src/display/nr-svgfonts.h
@@ -12,7 +12,7 @@
  * Read the file 'COPYING' for more information.
  */
 
-#include "cairo.h"
+#include <cairo.h>
 #include <sigc++/connection.h>
 
 class SvgFont;
@@ -26,33 +26,44 @@ namespace Gtk {
 class Widget;
 }
 
-class UserFont{
+class UserFont {
 public:
-UserFont(SvgFont* instance);
-cairo_font_face_t* face;
+    UserFont(SvgFont* instance);
+    cairo_font_face_t* face;
 };
 
-class SvgFont{
+class SvgFont {
 public:
-SvgFont(SPFont* spfont);
-void refresh();
-cairo_font_face_t* get_font_face();
-cairo_status_t scaled_font_init (cairo_scaled_font_t *scaled_font, cairo_font_extents_t *metrics);
-cairo_status_t scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font, const char	*utf8, int utf8_len, cairo_glyph_t **glyphs, int *num_glyphs, cairo_text_cluster_t **clusters, int *num_clusters, cairo_text_cluster_flags_t *flags);
-cairo_status_t scaled_font_render_glyph (cairo_scaled_font_t *scaled_font, unsigned long glyph, cairo_t *cr, cairo_text_extents_t *metrics);
+    SvgFont(SPFont* spfont);
+    void refresh();
+    cairo_font_face_t* get_font_face();
+    cairo_status_t scaled_font_init (cairo_scaled_font_t *scaled_font, cairo_font_extents_t *metrics);
+    cairo_status_t scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font, const char *utf8, int utf8_len, cairo_glyph_t **glyphs, int *num_glyphs, cairo_text_cluster_t **clusters, int *num_clusters, cairo_text_cluster_flags_t *flags);
+    cairo_status_t scaled_font_render_glyph (cairo_scaled_font_t *scaled_font, unsigned long glyph, cairo_t *cr, cairo_text_extents_t *metrics);
 
-Geom::PathVector flip_coordinate_system(SPFont* spfont, Geom::PathVector pathv);
-void render_glyph_path(cairo_t* cr, Geom::PathVector* pathv);
-void glyph_modified(SPObject *, unsigned int);
+    Geom::PathVector flip_coordinate_system(SPFont* spfont, Geom::PathVector pathv);
+    void render_glyph_path(cairo_t* cr, Geom::PathVector* pathv);
+    void glyph_modified(SPObject *, unsigned int);
 
 private:
-SPFont* font;
-UserFont* userfont;
-std::vector<SPGlyph*> glyphs;
-SPMissingGlyph* missingglyph;
-sigc::connection glyph_modified_connection;
+    SPFont* font;
+    UserFont* userfont;
+    std::vector<SPGlyph*> glyphs;
+    SPMissingGlyph* missingglyph;
+    sigc::connection glyph_modified_connection;
 
-bool drawing_expose_cb (Gtk::Widget *widget, GdkEventExpose *event, gpointer data);
+    bool drawing_expose_cb (Gtk::Widget *widget, GdkEventExpose *event, void* data);
 };
 
 #endif //#ifndef NR_SVGFONTS_H_SEEN
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 :
diff --git a/src/xml/helper-observer.h b/src/xml/helper-observer.h
index c076b3e2c..b4c0aba41 100644
--- a/src/xml/helper-observer.h
+++ b/src/xml/helper-observer.h
@@ -9,29 +9,41 @@
 #include "sp-object.h"
 
 namespace Inkscape {
-    namespace XML {
-        class Node;
-
-		// Very simple observer that just emits a signal if anything happens to a node
-		class SignalObserver : public NodeObserver
-		{
-		public:
-			SignalObserver();
-			~SignalObserver();
-
-			// Add this observer to the SPObject and remove it from any previous object
-			void set(SPObject* o);
-			void notifyChildAdded(Node&, Node&, Node*);
-			void notifyChildRemoved(Node&, Node&, Node*);
-			void notifyChildOrderChanged(Node&, Node&, Node*, Node*);
-			void notifyContentChanged(Node&, Util::ptr_shared<char>, Util::ptr_shared<char>);
-			void notifyAttributeChanged(Node&, GQuark, Util::ptr_shared<char>, Util::ptr_shared<char>);
-			sigc::signal<void>& signal_changed();
-		private:
-			sigc::signal<void> _signal_changed;
-			SPObject* _oldsel;
-		};
-	}
+namespace XML {
+
+class Node;
+
+// Very simple observer that just emits a signal if anything happens to a node
+class SignalObserver : public NodeObserver {
+public:
+    SignalObserver();
+    ~SignalObserver();
+
+    // Add this observer to the SPObject and remove it from any previous object
+    void set(SPObject* o);
+    void notifyChildAdded(Node&, Node&, Node*);
+    void notifyChildRemoved(Node&, Node&, Node*);
+    void notifyChildOrderChanged(Node&, Node&, Node*, Node*);
+    void notifyContentChanged(Node&, Util::ptr_shared<char>, Util::ptr_shared<char>);
+    void notifyAttributeChanged(Node&, GQuark, Util::ptr_shared<char>, Util::ptr_shared<char>);
+    sigc::signal<void>& signal_changed();
+private:
+    sigc::signal<void> _signal_changed;
+    SPObject* _oldsel;
+};
+
+}
 }
 
 #endif //#ifndef __XML_HELPER_OBSERVER__
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 :