Remove GPL remnants, and naive base typedef

This commit is contained in:
2017-01-03 03:15:07 -08:00
parent ba92629900
commit e5715bbf8f
25 changed files with 294 additions and 375 deletions

View File

@@ -21,8 +21,6 @@ namespace io
*/
class ALTTPFileReader : protected MemoryCopyReader
{
MEMORYCOPYREADER_BASE();
public:
/*! \brief This constructor takes an existing buffer to read from.
*

View File

@@ -20,8 +20,6 @@ namespace io
*/
class ALTTPFileWriter : protected MemoryCopyWriter
{
MEMORYCOPYWRITER_BASE();
public:
/*! \brief This constructor takes an existing buffer to write to.
*

View File

@@ -20,7 +20,6 @@ namespace io
*/
class MCFileReader : public MemoryCopyReader
{
MEMORYCOPYREADER_BASE();
public:
/*!
* \brief This constructor takes an existing buffer to read from.

View File

@@ -21,7 +21,6 @@ namespace io
*/
class MCFileWriter : protected MemoryCopyWriter
{
MEMORYCOPYWRITER_BASE();
public:
/*!
* \brief This constructor takes an existing buffer to write to.

View File

@@ -121,18 +121,5 @@ protected:
} // io
} // Athena
#ifndef MEMORYREADER_BASE
#define MEMORYREADER_BASE() \
private: \
typedef athena::io::MemoryReader base
#endif // MEMORYREADER_BASE
#ifndef MEMORYCOPYREADER_BASE
#define MEMORYCOPYREADER_BASE() \
private: \
typedef athena::io::MemoryCopyReader base
#endif // MEMORYCOPYREADER_BASE
#endif // MEMORYREADER_HPP

View File

@@ -161,16 +161,4 @@ private:
}
}
#ifndef MEMORYWRITER_BASE
#define MEMORYWRITER_BASE() \
private: \
typedef athena::io::MemoryWriter base
#endif // BINARYWRITER_BASE
#ifndef MEMORYCOPYWRITER_BASE
#define MEMORYCOPYWRITER_BASE() \
private: \
typedef athena::io::MemoryCopyWriter base
#endif // BINARYWRITER_BASE
#endif // MEMORYWRITER_HPP

View File

@@ -10,7 +10,6 @@ namespace io
{
class SkywardSwordFileReader : public MemoryCopyReader
{
MEMORYCOPYREADER_BASE();
public:
SkywardSwordFileReader(atUint8* data, atUint64 length);

View File

@@ -12,7 +12,6 @@ namespace io
class SkywardSwordFileWriter : public MemoryCopyWriter
{
MEMORYCOPYWRITER_BASE();
public:
SkywardSwordFileWriter(atUint8* data, atUint64 len);
SkywardSwordFileWriter(const std::string& filename);

View File

@@ -15,7 +15,6 @@ namespace io
class SpriteFileReader : public MemoryCopyReader
{
MEMORYCOPYREADER_BASE();
public:
SpriteFileReader(atUint8* data, atUint64 length);
SpriteFileReader(const std::string& filepath);

View File

@@ -23,7 +23,6 @@ namespace io
*/
class WiiSaveReader : public MemoryCopyReader
{
MEMORYCOPYREADER_BASE();
public:
/*! \brief This constructor takes an existing buffer to read from.
*

View File

@@ -22,7 +22,6 @@ namespace io
*/
class WiiSaveWriter : protected MemoryCopyWriter
{
MEMORYCOPYWRITER_BASE();
public:
/*! \brief This constructor creates an instance from a file on disk.
*

View File

@@ -1,19 +1,4 @@
#ifndef ATHENA_NO_ZQUEST
// This file is part of libAthena.
//
// libAthena 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.
//
// libAthena 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 libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef ZQUEST_HPP
#define ZQUEST_HPP

View File

@@ -1,19 +1,4 @@
#ifndef ATHENA_NO_ZQUEST
// This file is part of libAthena.
//
// libAthena 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.
//
// libAthena 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 libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ZQUESTFILEREADER_HPP__
#define __ZQUESTFILEREADER_HPP__
@@ -31,7 +16,6 @@ namespace io
*/
class ZQuestFileReader : protected MemoryCopyReader
{
MEMORYCOPYREADER_BASE();
public:
/*!

View File

@@ -1,19 +1,4 @@
#ifndef ATHENA_NO_ZQUEST
// This file is part of libAthena.
//
// libAthena 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.
//
// libAthena 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 libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ZQUESTFILEWRITER_HPP__
#define __ZQUESTFILEWRITER_HPP__
@@ -31,8 +16,6 @@ namespace io
*/
class ZQuestFileWriter : protected MemoryCopyWriter
{
MEMORYCOPYWRITER_BASE();
public:
/*!
* \brief ZQuestFileWriter