From 9a65bc6bb7c8da1dfa5b101579e52845c75848ef Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 31 Mar 2008 01:17:59 +0000 Subject: [FIX] Member variables now use m_ prefix [FIX] Lots of minor fixes git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@95 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- general/ImageCache.cpp | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) (limited to 'general/ImageCache.cpp') diff --git a/general/ImageCache.cpp b/general/ImageCache.cpp index a5ce28f3..22f09a03 100644 --- a/general/ImageCache.cpp +++ b/general/ImageCache.cpp @@ -1,36 +1,33 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: general/ImageCache.h -// Purpose: Cache for quick image loading -// Author: Ben Boeckel -// Modified by: Ben Boeckel -// Created: Thu Jan 17 2008 13:42:44 -// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions -// Licence: -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program. If not, see . -///////////////////////////////////////////////////////////////////////////// +/* + * Copyright 2008 Ben Boeckel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ +// Qt includes #include #include +// Header include #include "ImageCache.h" -KPixmapCache ImageCache::cache("pokegen"); +KPixmapCache ImageCache::m_cache("pokegen"); -QPixmap ImageCache::open(const QString& fname) throw(OpenException) +QPixmap ImageCache::open(const QString& fileName) throw(OpenException) { - if (!QFile::exists(fname)) - throw(OpenException("ImageCache", fname)); - QPixmap pm(cache.loadFromFile(fname)); + if (!QFile::exists(fileName)) + throw(OpenException("ImageCache", fileName)); + QPixmap pm(m_cache.loadFromFile(fileName)); return pm; } -- cgit