Commit de6eb1da authored by sm's avatar sm

New version 0.2

- Jason Turner, C++ Weekly Ep.154, eliminate empty destructors
- Add virtual destructor to interfaces
- Improve LevelBlock and listeners API
- libstmm-games: create util subfolder
- add TileCoords class
parent cf64e40b
stmm-games (0.2) unstable; urgency=low
* Jason Turner, C++ Weekly Ep.154, eliminate empty destructors
* Add virtual destructor to interfaces
* Improve LevelBlock and listeners API
* libstmm-games: create util subfolder
* Improve deb package creation script
* Increase minor version
-- Stefano Marsili <efanomars@gmx.ch> Tue, 12 Feb 2018 19:29:39 +0100
stmm-games (0.1) unstable; urgency=low
* Initial release
......
......@@ -95,8 +95,8 @@ public:
void boardPostInsert(Direction::VALUE eDir, NRect oRect) override;
void boardPreDestroy(const Coords& oCoords) override;
void boardPostDestroy(const Coords& oCoords) override;
void boardPreModify(NRect oArea, const shared_ptr<TileRect>& refTiles) override;
void boardPostModify(NRect oArea) override;
void boardPreModify(const TileCoords& oTileCoords) override;
void boardPostModify(const Coords& oCoords) override;
enum {
LISTENER_GROUP_CANNOT_PLACE = 10
......
......@@ -138,16 +138,15 @@ public:
struct BoardPreModify : public Called
{
NRect m_oArea;
shared_ptr<TileRect> m_refTiles;
TileCoords m_oTileCoords;
};
void boardPreModify(NRect oArea, const shared_ptr<TileRect>& refTiles) override;
void boardPreModify(const TileCoords& oTileCoords) override;
struct BoardPostModify : public Called
{
NRect m_oArea;
Coords m_oCoords;
};
void boardPostModify(NRect oArea) override;
void boardPostModify(const Coords& oCoords) override;
struct BlockPreAdd : public Called
{
......
......@@ -330,10 +330,10 @@ void DumbBlockEvent::boardPreDestroy(const Coords& /*oCoords*/)
void DumbBlockEvent::boardPostDestroy(const Coords& /*oCoords*/)
{
}
void DumbBlockEvent::boardPreModify(NRect /*oArea*/, const shared_ptr<TileRect>& /*refTiles*/)
void DumbBlockEvent::boardPreModify(const TileCoords& /*oTileCoords*/)
{
}
void DumbBlockEvent::boardPostModify(NRect /*oArea*/)
void DumbBlockEvent::boardPostModify(const Coords& /*oCoords*/)
{
}
......
......@@ -129,17 +129,16 @@ void FakeLevelView::boardPostDestroy(const Coords& oCoords)
refCalled->m_oCoords = oCoords;
m_oAllCalls.push_back(std::move(refCalled));
}
void FakeLevelView::boardPreModify(NRect oArea, const shared_ptr<TileRect>& refTiles)
void FakeLevelView::boardPreModify(const TileCoords& oTileCoords)
{
auto refCalled = make_unique<BoardPreModify>();
refCalled->m_oArea = oArea;
refCalled->m_refTiles = refTiles;
refCalled->m_oTileCoords = oTileCoords;
m_oAllCalls.push_back(std::move(refCalled));
}
void FakeLevelView::boardPostModify(NRect oArea)
void FakeLevelView::boardPostModify(const Coords& oCoords)
{
auto refCalled = make_unique<BoardPostModify>();
refCalled->m_oArea = oArea;
refCalled->m_oCoords = oCoords;
m_oAllCalls.push_back(std::move(refCalled));
}
void FakeLevelView::blockPreAdd(const LevelBlock& oBlock)
......
......@@ -20,12 +20,12 @@
# MINOR is REVISION (implementation of interface)
# AGE is always 0
set(STMM_GAMES_FAKE_MAJOR_VERSION 0)
set(STMM_GAMES_FAKE_MINOR_VERSION 1)
set(STMM_GAMES_FAKE_MINOR_VERSION 2)
set(STMM_GAMES_FAKE_VERSION "${STMM_GAMES_FAKE_MAJOR_VERSION}.${STMM_GAMES_FAKE_MINOR_VERSION}.0")
# required stmm-games version
set(STMM_GAMES_FAKE_REQ_STMM_GAMES_MAJOR_VERSION 0)
set(STMM_GAMES_FAKE_REQ_STMM_GAMES_MINOR_VERSION 1)
set(STMM_GAMES_FAKE_REQ_STMM_GAMES_MINOR_VERSION 2)
set(STMM_GAMES_FAKE_REQ_STMM_GAMES_VERSION "${STMM_GAMES_FAKE_REQ_STMM_GAMES_MAJOR_VERSION}.${STMM_GAMES_FAKE_REQ_STMM_GAMES_MINOR_VERSION}")
include("${PROJECT_SOURCE_DIR}/../libstmm-games/stmm-games-defs.cmake")
......
......@@ -20,7 +20,7 @@
#ifndef STMG_CACHED_SURFACES_H
#define STMG_CACHED_SURFACES_H
#include <stmm-games/basictypes.h>
#include <stmm-games/util/basictypes.h>
#include <cairomm/context.h>
#include <glibmm/refptr.h>
......
......@@ -20,7 +20,7 @@
#ifndef STMG_COMMON_THEME_H
#define STMG_COMMON_THEME_H
#include <stmm-games/basictypes.h>
#include <stmm-games/util/basictypes.h>
#include <glibmm/refptr.h>
#include <pangomm/layout.h>
......
......@@ -22,8 +22,8 @@
#include "image.h"
#include <stmm-games/basictypes.h>
#include <stmm-games/randomparts.h>
#include <stmm-games/util/basictypes.h>
#include <stmm-games/util/randomparts.h>
#include <memory>
......
......@@ -35,6 +35,8 @@ namespace stmg
class GameLoader
{
public:
virtual ~GameLoader() = default;
struct GameInfo
{
File m_oGameFile; /**< The file where the game is defined, if available. Can be undefined. */
......@@ -93,8 +95,6 @@ public:
virtual std::pair<shared_ptr<Game>, bool> getNewGame(const std::string& sGameName, GameOwner& oGameOwner
, const shared_ptr<AppPreferences>& refAppPreferences, const Named& oThemeNamed
, const shared_ptr<Highscore>& refHighscore) = 0;
virtual ~GameLoader() = default;
};
} // namespace stmg
......
......@@ -23,7 +23,7 @@
#include "cachedsurfaces.h"
#include "file.h"
#include <stmm-games/basictypes.h>
#include <stmm-games/util/basictypes.h>
#include <librsvg/rsvg.h>
#include <gdkmm.h>
......@@ -58,7 +58,9 @@ public:
* @param nSubH The rectangle's h within the master image in pixels. Must be positive.
*/
Image(const shared_ptr<Image>& refImage, int32_t nSubX, int32_t nSubY, int32_t nSubW, int32_t nSubH);
virtual ~Image();
/** Non virtual destructor.
*/
~Image();
/** Draws the image within a rectangle.
* The image is loaded if necessary.
* The image is stretched over the rectangle.
......
......@@ -36,7 +36,7 @@
#include <stmm-games/named.h>
#include <stmm-games/tileselector.h>
#include <stmm-games/recycler.h>
#include <stmm-games/util/recycler.h>
#include <cairomm/context.h>
#include <glibmm/refptr.h>
......
......@@ -34,16 +34,16 @@ using std::shared_ptr;
class StdTheme;
class StdThemeContext;
/** Base class for THemeAnimation factories.
/** Base class for ThemeAnimation factories.
*/
class StdThemeAnimationFactory
{
public:
virtual ~StdThemeAnimationFactory() = default;
/** Constructor.
* @param p1Owner The owner theme. Cannot be null.
*/
explicit StdThemeAnimationFactory(StdTheme* p1Owner);
virtual ~StdThemeAnimationFactory() = default;
/** Tells whether the factory supports the model animation.
* Tells whether the class of the model (not the actual model instance) is supported.
......
......@@ -43,11 +43,11 @@ class ThemeLayout;
class StdThemeWidgetFactory
{
public:
virtual ~StdThemeWidgetFactory() = default;
/** Constructor.
* @param p1Owner The owner. Cannot be null.
*/
explicit StdThemeWidgetFactory(StdTheme* p1Owner);
virtual ~StdThemeWidgetFactory() = default;
/** Creates a theme widget for a game widget.
* @param refGameWidget The model. Cannot be null.
* @param fTileWHRatio The tile weight to height ratio.
......
......@@ -20,7 +20,7 @@
#ifndef STMG_THEME_ANIMATION_H
#define STMG_THEME_ANIMATION_H
#include <stmm-games/basictypes.h>
#include <stmm-games/util/basictypes.h>
#include <cairomm/context.h>
......
......@@ -39,6 +39,8 @@ class Theme;
class ThemeLoader
{
public:
virtual ~ThemeLoader() = default;
struct ThemeInfo
{
File m_oThemeFile; /**< The file where the theme is defined, if available. Can be undefined. */
......@@ -74,8 +76,6 @@ public:
* @return The theme name. Can be empty.
*/
virtual const std::string& getDefaultThemeName() = 0;
virtual ~ThemeLoader() = default;
};
} // namespace stmg
......
......@@ -22,7 +22,7 @@
#include "image.h"
#include <stmm-games/randomparts.h>
#include <stmm-games/util/randomparts.h>
#include <memory>
......
......@@ -20,7 +20,7 @@
#ifndef STMG_TILE_SIZING_H
#define STMG_TILE_SIZING_H
#include <stmm-games/basictypes.h>
#include <stmm-games/util/basictypes.h>
namespace stmg
{
......
......@@ -58,7 +58,7 @@ Image::Image(const shared_ptr<Image>& refImage, const NRect& oSubRect)
Image::~Image()
{
if (m_pHandle) {
g_object_unref(m_pHandle);
::g_object_unref(m_pHandle);
}
}
bool Image::isLoaded() const
......
......@@ -21,7 +21,7 @@
#include "inputstrings.h"
#include <stmm-games/util.h>
#include <stmm-games/util/util.h>
#include <stmm-games/stdpreferences.h>
#include <stmm-games/option.h>
......
......@@ -21,9 +21,9 @@
#include "stdview.h"
#include <stmm-games/animations/explosionanimation.h>
#include <stmm-games/recycler.h>
#include <stmm-games/coords.h>
#include <stmm-games/util.h>
#include <stmm-games/util/recycler.h>
#include <stmm-games/util/coords.h>
#include <stmm-games/util/util.h>
#include <gtkmm.h>
......@@ -1000,20 +1000,16 @@ void StdLevelView::boardInsertRedrawAndRemove(const Cairo::RefPtr<Cairo::Context
//#endif //NDEBUG
}
void StdLevelView::boardPreModify(NRect /*oArea*/, const shared_ptr<TileRect>& /*refTiles*/)
void StdLevelView::boardPreModify(const TileCoords& /*oTileCoords*/)
{
}
void StdLevelView::boardPostModify(NRect oArea)
void StdLevelView::boardPostModify(const Coords& oCoords)
{
//std::cout << "StdLevelView::boardPostModify(" << oArea.m_nX << "," << oArea.m_nY << "," << oArea.m_nW << "," << oArea.m_nH << ")" << '\n';
// assert(isReady());
const int32_t nNToX = oArea.m_nX + oArea.m_nW;
const int32_t nNToY = oArea.m_nY + oArea.m_nH;
for (int32_t nX = oArea.m_nX; nX < nNToX; ++nX) {
for (int32_t nY = oArea.m_nY; nY < nNToY; ++nY) {
redrawBoardPos(nX, nY);
}
const auto itEnd = oCoords.end();
for (auto it = oCoords.begin(); it != itEnd; it.next()) {
redrawBoardPos(it.x(), it.y());
}
}
void StdLevelView::redrawBoardPos(int32_t nX, int32_t nY)
......
......@@ -46,7 +46,6 @@ class StdLevelView : public LevelView
{
public:
StdLevelView();
virtual ~StdLevelView() = default;
void reInit(bool bSubshows, const std::vector< shared_ptr<LevelShowThemeWidget> >& aLevelShows
, shared_ptr<Game>& refGame, int32_t nLevel, shared_ptr<Theme>& refTheme
......@@ -82,8 +81,8 @@ public:
void boardPreInsert(Direction::VALUE eDir, NRect oArea, const shared_ptr<TileRect>& refTiles) override;
void boardPostInsert(Direction::VALUE eDir, NRect oArea) override;
void boardPreModify(NRect oArea, const shared_ptr<TileRect>& refTiles) override;
void boardPostModify(NRect oArea) override;
void boardPreModify(const TileCoords& oTileCoords) override;
void boardPostModify(const Coords& oCoords) override;
void boardPreDestroy(const Coords& oCoords) override;
void boardPostDestroy(const Coords& oCoords) override;
......
......@@ -19,7 +19,7 @@
#include "stdtheme.h"
#include "util.h"
#include <stmm-games/util/util.h>
#include <glibmm/miscutils.h>
......
......@@ -21,8 +21,8 @@
#include "game.h"
#include "stdlevelview.h"
#include <stmm-games/coords.h>
#include <stmm-games/util.h>
#include <stmm-games/util/coords.h>
#include <stmm-games/util/util.h>
#include <gtkmm.h>
......
......@@ -22,7 +22,6 @@
#include "stdtheme.h"
#include "stdthemecontext.h"
//#include <stmm-games/util.h>
#include <stmm-input/event.h>
namespace stmg
......
......@@ -22,8 +22,6 @@
#include "stdtheme.h"
#include "stdthemecontext.h"
//#include <stmm-games/util.h>
namespace stmg
{
......@@ -54,7 +52,6 @@ shared_ptr<ThemeWidget> PreviewThWidgetFactory::create(const shared_ptr<GameWidg
}
shared_ptr<PreviewTWidget> refWidget;
m_oPreviewTWidgets.create(refWidget, this, refGameWidget, p0PreviewWidget, refFontLayout, fTileWHRatio);
// refWidget->reInit(this, refGameWidget, p0PreviewWidget, refFontLayout, fTileWHRatio);
return refWidget;
}
const int32_t PreviewThWidgetFactory::PreviewTWidget::s_nPixCanvasMinSizeW = 15;
......
......@@ -23,7 +23,6 @@
#include "stdthemecontext.h"
#include <stmm-games/variable.h>
//#include <stmm-games/util.h>
namespace stmg
{
......
......@@ -20,15 +20,15 @@
# MINOR is REVISION (implementation of interface)
# AGE is always 0
set(STMM_GAMES_GTK_MAJOR_VERSION 0)
set(STMM_GAMES_GTK_MINOR_VERSION 1)
set(STMM_GAMES_GTK_MINOR_VERSION 2)
set(STMM_GAMES_GTK_VERSION "${STMM_GAMES_GTK_MAJOR_VERSION}.${STMM_GAMES_GTK_MINOR_VERSION}.0")
set(STMM_GAMES_GTK_REQ_STMM_GAMES_MAJOR_VERSION 0)
set(STMM_GAMES_GTK_REQ_STMM_GAMES_MINOR_VERSION 1)
set(STMM_GAMES_GTK_REQ_STMM_GAMES_MINOR_VERSION 2)
set(STMM_GAMES_GTK_REQ_STMM_GAMES_VERSION "${STMM_GAMES_GTK_REQ_STMM_GAMES_MAJOR_VERSION}.${STMM_GAMES_GTK_REQ_STMM_GAMES_MINOR_VERSION}")
set(STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_MAJOR_VERSION "0")
set(STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_MINOR_VERSION "1")
set(STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_MAJOR_VERSION 0)
set(STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_MINOR_VERSION 1)
set(STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_VERSION "${STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_MAJOR_VERSION}.${STMM_GAMES_GTK_REQ_STMM_INPUT_GTK_MINOR_VERSION}")
set(STMM_GAMES_GTK_REQ_GTKMM_VERSION "3.22")
......
......@@ -260,16 +260,6 @@ set(STMMI_DATA_FILES
${STMMI_DATA_DIR}/themes/simple.thm/images/squareplayer2.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/squareplayer3.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/squareplayer4.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperleftplayer0.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperleftplayer1.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperleftplayer2.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperleftplayer3.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperleftplayer4.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperrightplayer0.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperrightplayer1.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperrightplayer2.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperrightplayer3.svg
${STMMI_DATA_DIR}/themes/simple.thm/images/swapperrightplayer4.svg
#
${STMMI_DATA_DIR}/themes/simple.thm/theme.xml
)
......
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper left no player</desc>
<path fill="none" stroke="black" stroke-width="4"
d="M 98,2 L 2,2 2,98 98,98"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper left player 1</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 100,5 L 5,5 5,95 100,95"/>
<path fill="none" stroke="black" stroke-width="6"
d="M 100,5 L 5,5 5,95 100,95"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper left player 2</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 100,5 L 5,5 5,95 100,95"/>
<path fill="none" stroke="white" stroke-width="6"
d="M 100,5 L 5,5 5,95 100,95"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper left player 3</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 100,5 L 5,5 5,95 100,95"/>
<path fill="none" stroke="red" stroke-width="6"
d="M 100,5 L 5,5 5,95 100,95"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper left player 4</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 100,5 L 5,5 5,95 100,95"/>
<path fill="none" stroke="lightgreen" stroke-width="6"
d="M 100,5 L 5,5 5,95 100,95"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper right no player</desc>
<path fill="none" stroke="black" stroke-width="4"
d="M 2,2 L 98,2 98,98 2,98"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper right player 1</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 0,5 L 95,5 95,95 0,95"/>
<path fill="none" stroke="black" stroke-width="6"
d="M 0,5 L 95,5 95,95 0,95"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper right player 2</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 0,5 L 95,5 95,95 0,95"/>
<path fill="none" stroke="white" stroke-width="6"
d="M 0,5 L 95,5 95,95 0,95"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper right player 3</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 0,5 L 95,5 95,95 0,95"/>
<path fill="none" stroke="red" stroke-width="6"
d="M 0,5 L 95,5 95,95 0,95"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100px" height="100px" version="1.1"
xmlns="http://www.w3.org/2000/svg">
<desc>Swapper right player 4</desc>
<path fill="none" stroke="black" stroke-width="10"
d="M 0,5 L 95,5 95,95 0,95"/>
<path fill="none" stroke="lightgreen" stroke-width="6"
d="M 0,5 L 95,5 95,95 0,95"/>
</svg>
......@@ -43,8 +43,6 @@
</Images>
<ImageArrays>
<FileArray arrayId="squareP" imgFile="squareplayer%%.svg" sobstStr="%%" fromInt="1" toInt="4"/>
<FileArray arrayId="swapperLP" imgFile="swapperleftplayer%%.svg" sobstStr="%%" fromInt="0" toInt="4"/>
<FileArray arrayId="swapperRP" imgFile="swapperrightplayer%%.svg" sobstStr="%%" fromInt="0" toInt="4"/>
</ImageArrays>
<Animations>
<PlainText name="Plain" center="true" colorName="black"/>
......@@ -105,14 +103,6 @@
<Assign idAss="squareP" arrayId="squareP" imgFromIdx="0">
<Players fromPlayer="0" toPlayer="3"/>
</Assign>
<Assign idAss="swapperLP" arrayId="swapperLP">
<Chars charName="SWAPPER:LEFT"/>
<Players fromPlayer="-1" toPlayer="3"/>
</Assign>
<Assign idAss="swapperRP" arrayId="swapperRP">
<Chars charName="SWAPPER:RIGHT"/>
<Players fromPlayer="-1" toPlayer="3"/>
</Assign>
<Assign idAss="squarsorP" arrayId="squareP">
<Chars charName="SQUARSOR:SEL"/>
<Players fromPlayer="-1" toPlayer="2"/>
......@@ -121,14 +111,8 @@
</Assigns>
<DrawTile>
<Conditional>
<If><Char charNames="SWAPPER:LEFT,SWAPPER:RIGHT,SQUARSOR:SEL"/></If>
<If><Char charNames="SQUARSOR:SEL"/></If>
<Select>
<Case idAss="swapperLP">
<SelectedImage/>
</Case>
<Case idAss="swapperRP">
<SelectedImage/>
</Case>
<Case idAss="squarsorP">
<SelectedImage/>
</Case>
......
......@@ -20,7 +20,7 @@
#ifndef STMG_PARSER_CTX_H
#define STMG_PARSER_CTX_H
#include <stmm-games/util.h>
#include <stmm-games/util/util.h>
#include <stmm-games/named.h>
#include <stmm-games/apppreferences.h>
......
......@@ -22,7 +22,7 @@
#include "parserctx.h"
#include <stmm-games/util.h>
#include <stmm-games/util/util.h>
#include <libxml++/libxml++.h>
......
......@@ -24,7 +24,7 @@
#include "xmlcommonerrors.h"
#include <stmm-games/tile.h>
#include <stmm-games/intset.h>
#include <stmm-games/util/intset.h>
#include <libxml++/libxml++.h>
......
......@@ -73,7 +73,7 @@ private:
};
////////////////////////////////////////////////////////////////////////////////
class XmlConditionalParser //: private XmlCommonParser
class XmlConditionalParser
{
private:
friend class ConditionalCtx;
......
......@@ -41,11 +41,11 @@ class XmlGameParser;
class XmlEventParser
{
public:
virtual ~XmlEventParser() = default;
/** Constructor.
* @param sEventName The event name. Cannot be empty.