aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2008-09-23 09:50:03 +0000
committerMax Horn2008-09-23 09:50:03 +0000
commit9216eeabce6181398435c68d5225205fbb4f7111 (patch)
tree57083620e7c5f78e77eeb8a8d99736bebe40ed02 /gui
parentc1c9c895a37e79fe679154f3c725402732ff6162 (diff)
downloadscummvm-rg350-9216eeabce6181398435c68d5225205fbb4f7111.tar.gz
scummvm-rg350-9216eeabce6181398435c68d5225205fbb4f7111.tar.bz2
scummvm-rg350-9216eeabce6181398435c68d5225205fbb4f7111.zip
Moved ZipArchive to namespace Common; moved unzip internals from unzip.h to unzip.cpp (to be cleaned up)
svn-id: r34632
Diffstat (limited to 'gui')
-rw-r--r--gui/theme.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/theme.cpp b/gui/theme.cpp
index df388d60ab..8928d2f467 100644
--- a/gui/theme.cpp
+++ b/gui/theme.cpp
@@ -70,7 +70,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) {
return font;
#ifdef USE_ZLIB
- ZipArchive zipArchive(_stylefile + ".zip");
+ Common::ZipArchive zipArchive(_stylefile + ".zip");
if (zipArchive.hasFile(cacheFilename)) {
Common::FilePtr stream(zipArchive.openFile(cacheFilename));
font = Graphics::NewFont::loadFromCache(*stream.get());
@@ -87,7 +87,7 @@ const Graphics::Font *Theme::loadFont(const char *filename) {
#ifdef USE_ZLIB
if (!font) {
- ZipArchive zipArchive(_stylefile + ".zip");
+ Common::ZipArchive zipArchive(_stylefile + ".zip");
if (zipArchive.hasFile(filename)) {
Common::FilePtr stream(zipArchive.openFile(filename));
font = Graphics::NewFont::loadFont(*stream.get());
@@ -138,7 +138,7 @@ bool Theme::loadConfigFile(const Common::String &stylefile) {
#ifdef USE_ZLIB
// Maybe find a nicer solution to this
- ZipArchive zipArchive(stylefile + ".zip");
+ Common::ZipArchive zipArchive(stylefile + ".zip");
if (zipArchive.hasFile(stylefile + ".ini")) {
Common::FilePtr stream(zipArchive.openFile(stylefile + ".ini"));
if (_configFile.loadFromStream(*stream.get()))
@@ -168,7 +168,7 @@ bool Theme::themeConfigUseable(const Common::String &stylefile, const Common::St
if (!file.open(stylefile + ".ini")) {
#ifdef USE_ZLIB
// Maybe find a nicer solution to this
- ZipArchive zipArchive(stylefile + ".zip");
+ Common::ZipArchive zipArchive(stylefile + ".zip");
if (zipArchive.hasFile(stylefile + ".ini")) {
if (!style.empty() || cStyle || cfg) {
Common::FilePtr stream(zipArchive.openFile(stylefile + ".ini"));