Cleanup|libgui: Use as/is methods for casting

skyjake · Mar 17, 2014 · 9ec5501 · 9ec5501
1 parent e31b64c
commit 9ec5501
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/doomsday/libdeng2/include/de/data/bank.h b/doomsday/libdeng2/include/de/data/bank.h
@@ -149,6 +149,8 @@ class DENG2_PUBLIC Bank
         virtual Time modifiedAt() const {
             return Time::invalidTime();
         }
+
+        DENG2_AS_IS_METHODS()
     };
 
     /**
@@ -168,6 +170,8 @@ class DENG2_PUBLIC Bank
 
         /// Called to notify the data that it is leaving the memory cache.
         virtual void aboutToUnload() {}
+
+        DENG2_AS_IS_METHODS()
     };
 
     typedef std::set<String> Names; // alphabetical order

diff --git a/doomsday/libgui/src/colorbank.cpp b/doomsday/libgui/src/colorbank.cpp
@@ -92,7 +92,7 @@ ColorBank::Color ColorBank::color(DotPath const &path) const
 ColorBank::Colorf ColorBank::colorf(DotPath const &path) const
 {
     if(path.isEmpty()) return Colorf();
-    Vector4d clamped = static_cast<Instance::ColorData &>(data(path)).color;
+    Vector4d clamped = data(path).as<Instance::ColorData>().color;
     clamped = clamped.max(Vector4d(0, 0, 0, 0)).min(Vector4d(1, 1, 1, 1));
     return Colorf(float(clamped.x), float(clamped.y), float(clamped.z), float(clamped.w));
 }
@@ -104,7 +104,7 @@ Bank::ISource *ColorBank::newSourceFromInfo(String const &id)
 
 Bank::IData *ColorBank::loadFromSource(ISource &source)
 {
-    return new Instance::ColorData(static_cast<Instance::ColorSource &>(source).load());
+    return new Instance::ColorData(source.as<Instance::ColorSource>().load());
 }
 
 } // namespace de
diff --git a/doomsday/libgui/src/fontbank.cpp b/doomsday/libgui/src/fontbank.cpp
@@ -94,7 +94,7 @@ void FontBank::addFromInfo(File const &file)
 
 Font const &FontBank::font(DotPath const &path) const
 {
-    return *static_cast<Instance::FontData &>(data(path)).font;
+    return *data(path).as<Instance::FontData>().font;
 }
 
 void FontBank::setFontSizeFactor(float sizeFactor)
@@ -109,7 +109,7 @@ Bank::ISource *FontBank::newSourceFromInfo(String const &id)
 
 Bank::IData *FontBank::loadFromSource(ISource &source)
 {
-    return new Instance::FontData(static_cast<Instance::FontSource &>(source).load());
+    return new Instance::FontData(source.as<Instance::FontSource>().load());
 }
 
 } // namespace de
diff --git a/doomsday/libgui/src/glshaderbank.cpp b/doomsday/libgui/src/glshaderbank.cpp
@@ -149,7 +149,7 @@ void GLShaderBank::addFromInfo(File const &file)
 
 GLShader &GLShaderBank::shader(DotPath const &path, GLShader::Type type) const
 {
-    Instance::Data &i = static_cast<Instance::Data &>(data(path));
+    Instance::Data &i = data(path).as<Instance::Data>();
 
     if(type == GLShader::Vertex)
     {
@@ -163,7 +163,7 @@ GLShader &GLShaderBank::shader(DotPath const &path, GLShader::Type type) const
 
 GLProgram &GLShaderBank::build(GLProgram &program, DotPath const &path) const
 {
-    Instance::Data &i = static_cast<Instance::Data &>(data(path));
+    Instance::Data &i = data(path).as<Instance::Data>();
     program.build(i.vertex, i.fragment);
     return program;
 }
@@ -211,8 +211,7 @@ Bank::ISource *GLShaderBank::newSourceFromInfo(String const &id)
 
 Bank::IData *GLShaderBank::loadFromSource(ISource &source)
 {
-    Instance::Source &src = static_cast<Instance::Source &>(source);
-
+    Instance::Source &src = source.as<Instance::Source>();
     return new Instance::Data(src.load(GLShader::Vertex),
                               src.load(GLShader::Fragment));
 }

diff --git a/doomsday/libgui/src/imagebank.cpp b/doomsday/libgui/src/imagebank.cpp
@@ -40,7 +40,7 @@ DENG2_PIMPL_NOREF(ImageBank)
         {
             Block imageData;
             App::rootFolder().locate<File const>(filePath) >> imageData;
-            return QImage::fromData(imageData);
+            return Image::fromData(imageData);
         }
     };
 
@@ -83,7 +83,7 @@ void ImageBank::addFromInfo(File const &file)
 
 Image &ImageBank::image(DotPath const &path) const
 {
-    return static_cast<Instance::ImageData &>(data(path)).image;
+    return data(path).as<Instance::ImageData>().image;
 }
 
 Bank::ISource *ImageBank::newSourceFromInfo(String const &id)
@@ -94,7 +94,7 @@ Bank::ISource *ImageBank::newSourceFromInfo(String const &id)
 
 Bank::IData *ImageBank::loadFromSource(ISource &source)
 {
-    return new Instance::ImageData(static_cast<Instance::ImageSource &>(source).load());
+    return new Instance::ImageData(source.as<Instance::ImageSource>().load());
 }
 
 Bank::IData *ImageBank::newData()