[aseprite] 46/196: Rename she::System::loadBitmapFont -> loadSpriteSheetFont

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit d49d37302c67afa91e7482f0f91e4344b874333a
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Mar 7 17:48:35 2016 -0300

    Rename she::System::loadBitmapFont -> loadSpriteSheetFont
---
 src/app/ui/skin/skin_theme.cpp | 4 ++--
 src/she/common/system.h        | 2 +-
 src/she/system.h               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 0e62a25..9fe68b3 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -2017,7 +2017,7 @@ she::Font* SkinTheme::loadFont(const std::string& userFont, const std::string& t
   // Try to load the font
   while (rf.next()) {
     try {
-      she::Font* f = she::instance()->loadBitmapFont(rf.filename().c_str(), guiscale());
+      she::Font* f = she::instance()->loadSpriteSheetFont(rf.filename().c_str(), guiscale());
       if (f->isScalable())
         f->setSize(8);
       return f;
diff --git a/src/she/common/system.h b/src/she/common/system.h
index 8a3267d..f23a772 100644
--- a/src/she/common/system.h
+++ b/src/she/common/system.h
@@ -70,7 +70,7 @@ public:
 #endif
   }
 
-  Font* loadBitmapFont(const char* filename, int scale) override {
+  Font* loadSpriteSheetFont(const char* filename, int scale) override {
     Surface* sheet = loadRgbaSurface(filename);
     Font* font = nullptr;
     if (sheet) {
diff --git a/src/she/system.h b/src/she/system.h
index 339a2ad..a93c9d7 100644
--- a/src/she/system.h
+++ b/src/she/system.h
@@ -46,7 +46,7 @@ namespace she {
     virtual Surface* createRgbaSurface(int width, int height) = 0;
     virtual Surface* loadSurface(const char* filename) = 0;
     virtual Surface* loadRgbaSurface(const char* filename) = 0;
-    virtual Font* loadBitmapFont(const char* filename, int scale = 1) = 0;
+    virtual Font* loadSpriteSheetFont(const char* filename, int scale = 1) = 0;
     virtual Clipboard* createClipboard() = 0;
   };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git