jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace CardInfo* and Carset* with smart pointers (#3053)

Browse source 
* Replace CardInfo* and Carset* with smart pointers

* fixes to help memory & c++11 stuff
This commit is contained in:
ctrlaltca 2018-02-02 18:52:47 +01:00 • committed by Zach H
parent 3e418ba3c6
commit 517420cccb
37 changed files with 409 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/carddatabase/carddatabase_test.cpp
View file

@ -19,10 +19,7 @@ CardDatabaseSettings& SettingsCache::cardDatabase() const { return *cardDatabase
SettingsCache *settingsCache;
void PictureLoader::clearPixmapCache(CardInfo * /* card */) { }
// include out main header file _after_ the hack is complete
#include "../../cockatrice/src/carddatabase.h"
void PictureLoader::clearPixmapCache(CardInfoPtr /* card */) { }
namespace {

5
tests/carddatabase/carddatabase_test.h
View file

@ -6,6 +6,8 @@
#include <QObject>
#include <QString>
#include "../../cockatrice/src/carddatabase.h"
#define SETTINGSCACHE_H
class CardDatabaseSettings
@ -38,8 +40,7 @@ signals:
#define PICTURELOADER_H
class CardInfo;
class PictureLoader {
void clearPixmapCache(CardInfo *card);
void clearPixmapCache(CardInfoPtr card);
};