1 files changed, 64 insertions, 37 deletions

@@ -8,43 +8,70 @@
 namespace twitter {
   
   class configuration {
-    public:
-      enum class resizetype {
-        fit,
-        crop
-      };
-      
-      struct photosize {
-        size_t height;
-        size_t width;
-        resizetype resize;
-      };
-      
-      configuration();
-      configuration(std::string data);
-      
-      size_t getCharactersReservedPerMedia() const;
-      size_t getDirectMessageCharacterLimit() const;
-      size_t getMaxMediaPerUpload() const;
-      size_t getPhotoSizeLimit() const;
-      std::map<std::string, photosize> getPhotoSizes() const;
-      size_t getShortUrlLength() const;
-      size_t getShortHttpsUrlLength() const;
-      std::set<std::string> getNonUsernamePaths() const;
-      
-      operator bool() const;
-      
-    private:
-      bool _valid = false;
-      
-      size_t _characters_reserved_per_media;
-      size_t _dm_text_character_limit;
-      size_t _max_media_per_upload;
-      size_t _photo_size_limit;
-      std::map<std::string, photosize> _photo_sizes;
-      size_t _short_url_length;
-      size_t _short_https_url_length;
-      std::set<std::string> _non_username_paths;
+  public:
+    enum class resizetype {
+      fit,
+      crop
+    };
+    
+    struct photosize {
+      size_t height;
+      size_t width;
+      resizetype resize;
+    };
+    
+    explicit configuration(std::string data);
+    
+    size_t getCharactersReservedPerMedia() const
+    {
+      return _characters_reserved_per_media;
+    }
+    
+    size_t getDirectMessageCharacterLimit() const
+    {
+      return _dm_text_character_limit;
+    }
+    
+    size_t getMaxMediaPerUpload() const
+    {
+      return _max_media_per_upload;
+    }
+    
+    size_t getPhotoSizeLimit() const
+    {
+      return _photo_size_limit;
+    }
+    
+    const std::map<std::string, photosize>& getPhotoSizes() const
+    {
+      return _photo_sizes;
+    }
+    
+    size_t getShortUrlLength() const
+    {
+      return _short_url_length;
+    }
+    
+    size_t getShortHttpsUrlLength() const
+    {
+      return _short_https_url_length;
+    }
+    
+    const std::set<std::string>& getNonUsernamePaths() const
+    {
+      return _non_username_paths;
+    }
+    
+  private:
+    
+    size_t _characters_reserved_per_media;
+    size_t _dm_text_character_limit;
+    size_t _max_media_per_upload;
+    size_t _photo_size_limit;
+    std::map<std::string, photosize> _photo_sizes;
+    size_t _short_url_length;
+    size_t _short_https_url_length;
+    std::set<std::string> _non_username_paths;
   };
   
 };