From 300f694f042d5aa961a5b126084b4ffb10e5749d Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Thu, 18 Aug 2016 22:11:59 -0400
Subject: [PATCH] missed some

---
 include/xlnt/styles/base_format.hpp | 36 ++++++++++++++---------------
 include/xlnt/styles/format.hpp      |  6 ++---
 source/detail/format_impl.hpp       | 12 +++++-----
 source/detail/style_impl.hpp        | 12 +++++-----
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/include/xlnt/styles/base_format.hpp b/include/xlnt/styles/base_format.hpp
index 881a1bce..b4fad452 100644
--- a/include/xlnt/styles/base_format.hpp
+++ b/include/xlnt/styles/base_format.hpp
@@ -40,48 +40,48 @@ class XLNT_CLASS base_format
 {
 public:
     // Alignment
-    xlnt::alignment &alignment();
-    const xlnt::alignment &alignment() const;
+    class alignment &alignment();
+    const class alignment &alignment() const;
     void alignment(const xlnt::alignment &new_alignment, bool applied);
     bool alignment_applied() const;
     
     // Border
-	xlnt::border &border();
-    const xlnt::border &border() const;
+    class border &border();
+    const class border &border() const;
     void border(const xlnt::border &new_border, bool applied);
     bool border_applied() const;
     
     // Fill
-	xlnt::fill &fill();
-    const xlnt::fill &fill() const;
+    class fill &fill();
+    const class fill &fill() const;
     void fill(const xlnt::fill &new_fill, bool applied);
     bool fill_applied() const;
     
     // Font
-	xlnt::font &font();
-    const xlnt::font &font() const;
+    class font &font();
+    const class font &font() const;
     void font(const xlnt::font &new_font, bool applied);
     bool font_applied() const;
     
     // Number Format
-	virtual xlnt::number_format &number_format();
-    virtual const xlnt::number_format &number_format() const;
+    virtual class number_format &number_format();
+    virtual const class number_format &number_format() const;
     virtual void number_format(const xlnt::number_format &new_number_format, bool applied);
     bool number_format_applied() const;
     
     // Protection
-    xlnt::protection &protection();
-    const xlnt::protection &protection() const;
+    class protection &protection();
+    const class protection &protection() const;
     void protection(const xlnt::protection &new_protection, bool applied);
     bool protection_applied() const;
     
 protected:
-	xlnt::alignment alignment_;
-	xlnt::border border_;
-	xlnt::fill fill_;
-	xlnt::font font_;
-	xlnt::number_format number_format_;
-	xlnt::protection protection_;
+    class alignment alignment_;
+    class border border_;
+    class fill fill_;
+    class font font_;
+    class number_format number_format_;
+    class protection protection_;
     
     bool apply_alignment_ = false;
     bool apply_border_ = false;
diff --git a/include/xlnt/styles/format.hpp b/include/xlnt/styles/format.hpp
index 4c14788a..a97dc630 100644
--- a/include/xlnt/styles/format.hpp
+++ b/include/xlnt/styles/format.hpp
@@ -53,10 +53,10 @@ public:
 	bool has_style() const;
 	void style(const std::string &name);
 	void style(const xlnt::style &new_style);
-	const xlnt::style &style() const;
+	const class style &style() const;
 
-	xlnt::number_format &number_format() override;
-	const xlnt::number_format &number_format() const override;
+	class number_format &number_format() override;
+	const class number_format &number_format() const override;
 	void number_format(const xlnt::number_format &new_number_format, bool applied) override;
 
 	format &alignment_id(std::size_t id);
diff --git a/source/detail/format_impl.hpp b/source/detail/format_impl.hpp
index c65c76d0..bc1e6561 100644
--- a/source/detail/format_impl.hpp
+++ b/source/detail/format_impl.hpp
@@ -29,12 +29,12 @@ struct format_impl
 
 	std::size_t id;
 
-	optional<std::size_t> alignment;
-	optional<std::size_t> border;
-	optional<std::size_t> fill;
-	optional<std::size_t> font;
-	optional<std::size_t> number_format;
-	optional<std::size_t> protection;
+	optional<std::size_t> alignment_id;
+	optional<std::size_t> border_id;
+	optional<std::size_t> fill_id;
+	optional<std::size_t> font_id;
+	optional<std::size_t> number_format_id;
+	optional<std::size_t> protection_id;
 
 	optional<std::string> style;
 };
diff --git a/source/detail/style_impl.hpp b/source/detail/style_impl.hpp
index 41732baf..d1c71ff7 100644
--- a/source/detail/style_impl.hpp
+++ b/source/detail/style_impl.hpp
@@ -31,12 +31,12 @@ struct style_impl
 	optional<std::size_t> builtin_id;
 	optional<std::size_t> outline_style;
 
-	optional<alignment> alignment;
-	optional<border> border;
-	optional<fill> fill;
-	optional<font> font;
-	optional<number_format> number_format;
-	optional<protection> protection;
+	optional<class alignment> alignment;
+	optional<class border> border;
+	optional<class fill> fill;
+	optional<class font> font;
+	optional<class number_format> number_format;
+	optional<class protection> protection;
 };
 
 } // namespace detail