From 1d02365417654ba7cb3ef3702d7aa1bf9d22c76d Mon Sep 17 00:00:00 2001 From: Cyril Deguet Date: Sat, 25 Mar 2006 11:01:03 +0000 Subject: [PATCH] * attribute "nbFrames" of element Bitmap is now "nbframes", as said in the documentation (and the old name was inconsistent with other attribute names) Sorry for the compatibility break... --- modules/gui/skins2/parser/skin_parser.cpp | 8 ++++---- share/skins2/skin.dtd | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp index c6dff7d84b..21699b62b8 100644 --- a/modules/gui/skins2/parser/skin_parser.cpp +++ b/modules/gui/skins2/parser/skin_parser.cpp @@ -91,13 +91,13 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) RequireDefault( "id" ); RequireDefault( "file" ); RequireDefault( "alphacolor" ); - CheckDefault( "nbFrames", "1" ); + CheckDefault( "nbframes", "1" ); CheckDefault( "fps", "4" ); m_curBitmapId = uniqueId( attr["id"] ); const BuilderData::Bitmap bitmap( m_curBitmapId, attr["file"], convertColor( attr["alphacolor"] ), - atoi( attr["nbFrames"] ), atoi( attr["fps"] ) ); + atoi( attr["nbframes"] ), atoi( attr["fps"] ) ); m_pData->m_listBitmap.push_back( bitmap ); } @@ -108,13 +108,13 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) RequireDefault( "y" ); RequireDefault( "width" ); RequireDefault( "height" ); - CheckDefault( "nbFrames", "1" ); + CheckDefault( "nbframes", "1" ); CheckDefault( "fps", "4" ); const BuilderData::SubBitmap bitmap( attr["id"], m_curBitmapId, atoi( attr["x"] ), atoi( attr["y"] ), atoi( attr["width"] ), atoi( attr["height"] ), - atoi( attr["nbFrames"] ), atoi( attr["fps"] ) ); + atoi( attr["nbframes"] ), atoi( attr["fps"] ) ); m_pData->m_listSubBitmap.push_back( bitmap ); } diff --git a/share/skins2/skin.dtd b/share/skins2/skin.dtd index 13ab27ffb9..687824087c 100644 --- a/share/skins2/skin.dtd +++ b/share/skins2/skin.dtd @@ -21,7 +21,7 @@ id CDATA #REQUIRED file CDATA #REQUIRED alphacolor CDATA #REQUIRED - nbFrames CDATA "1" + nbframes CDATA "1" fps CDATA "0" > @@ -31,7 +31,7 @@ y CDATA #REQUIRED width CDATA #REQUIRED height CDATA #REQUIRED - nbFrames CDATA "1" + nbframes CDATA "1" fps CDATA "0" > -- 2.39.5