Use nullptr instead of 0 for pointers

[libs/gltk.git] / source / text.h

diff --git a/source/text.h b/source/text.h
index f688d4936d90d6354a56d07bac9163da74b52ccb..6de3573fc6dfda35495b40d303065d412413a599 100644 (file)
--- a/source/text.h
+++ b/source/text.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "mspgltk_api.h"
 #include "state.h"
 
 namespace Msp {
@@ -16,20 +17,21 @@ class Style;
 /**
 Stores and renders text.  Supports multiline text.
 */
-class Text
+class MSPGLTK_API Text
 {
 private:
        struct Line
        {
-               unsigned start;
-               unsigned length;
-               unsigned width;
+               unsigned start = 0;
+               unsigned bytes = 0;
+               unsigned length = 0;
+               unsigned width = 0;
        };
 
        struct RenderData;
        struct CoordsToGeomData;
 
-       const Style *style;
+       const Style *style = nullptr;
        std::string text;
        std::vector<Line> lines;
 
@@ -49,7 +51,9 @@ public:
        const std::string &get() const { return text; }
        unsigned size() const { return text.size(); }
        unsigned get_n_lines() const { return lines.size(); }
+       unsigned get_visible_lines(const Part &, const Geometry &, unsigned *) const;
        unsigned get_line_length(unsigned) const;
+       unsigned move_offset(unsigned, int) const;
        void offset_to_coords(unsigned, unsigned &, unsigned &) const;
        unsigned coords_to_offset(unsigned, unsigned) const;
        Geometry coords_to_geometry(const Part &, const Geometry &, unsigned, unsigned, unsigned) const;
@@ -60,9 +64,11 @@ public:
        Text &operator=(const std::string &);
 private:
        void find_lines();
+       unsigned count_characters(unsigned, unsigned) const;
+       void check_alignment(unsigned) const;
 
-       template<typename T, void (Text::*)(unsigned, const Geometry &, T &) const>
-       void process_lines(const Part &, const Geometry &, unsigned, T &) const;
+       template<typename T>
+       void process_lines(const Part &, const Geometry &, unsigned, void (Text::*)(unsigned, const Geometry &, T &) const, T &) const;
 
        void build_line(unsigned, const Geometry &, RenderData &) const;
        void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;