paysages : Small fix.

git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@472 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
This commit is contained in:
Michaël Lemaire 2012-12-06 14:04:04 +00:00 committed by ThunderK
parent 1b011672a2
commit 237040864d
8 changed files with 56 additions and 56 deletions

View file

@ -61,7 +61,7 @@ void BaseFormLayer::configChangeEvent()
{
if (_layers_modified)
{
layerApply(layersGetLayer(_layers_modified, currentLayer()));
layerWriteCurrentTo(layersGetLayer(_layers_modified, currentLayer()));
layersValidate(_layers_modified);
}
@ -137,7 +137,7 @@ void BaseFormLayer::layerSelectedEvent(int layer)
{
if (_layers_modified)
{
layerGetCopy(layersGetLayer(_layers_modified, layer));
layerReadCurrentFrom(layersGetLayer(_layers_modified, layer));
}
BaseForm::layerSelectedEvent(layer);

View file

@ -20,8 +20,8 @@ public slots:
protected:
void setLayers(Layers* layers);
virtual void layerGetCopy(void* layer_definition) = 0;
virtual void layerApply(void* layer_definition) = 0;
virtual void layerReadCurrentFrom(void* layer_definition) = 0;
virtual void layerWriteCurrentTo(void* layer_definition) = 0;
virtual void afterLayerAdded(void* layer_definition);
private:

View file

@ -204,15 +204,15 @@ void FormClouds::applyConfig()
void FormClouds::configChangeEvent()
{
cloudsLayerValidateDefinition(_layer);
BaseForm::configChangeEvent();
BaseFormLayer::configChangeEvent();
}
void FormClouds::layerGetCopy(void* layer_definition)
void FormClouds::layerReadCurrentFrom(void* layer_definition)
{
cloudsLayerCopyDefinition((CloudsLayerDefinition*)layer_definition, _layer);
}
void FormClouds::layerApply(void* layer_definition)
void FormClouds::layerWriteCurrentTo(void* layer_definition)
{
cloudsLayerCopyDefinition(_layer, (CloudsLayerDefinition*)layer_definition);
}

View file

@ -18,8 +18,8 @@ public slots:
virtual void applyConfig();
protected:
virtual void layerGetCopy(void* layer_definition);
virtual void layerApply(void* layer_definition);
virtual void layerReadCurrentFrom(void* layer_definition);
virtual void layerWriteCurrentTo(void* layer_definition);
virtual void autoPresetSelected(int preset);
protected slots:

View file

@ -82,12 +82,12 @@ FormTerrainCanvas::~FormTerrainCanvas()
terrainCanvasDelete(_definition);
}
void FormTerrainCanvas::layerGetCopy(void* layer_definition)
void FormTerrainCanvas::layerReadCurrentFrom(void* layer_definition)
{
terrainCanvasCopy((TerrainCanvas*)layer_definition, _definition);
}
void FormTerrainCanvas::layerApply(void* layer_definition)
void FormTerrainCanvas::layerWriteCurrentTo(void* layer_definition)
{
terrainCanvasCopy(_definition, (TerrainCanvas*)layer_definition);
}

View file

@ -15,8 +15,8 @@ public:
~FormTerrainCanvas();
protected:
virtual void layerGetCopy(void* layer_definition);
virtual void layerApply(void* layer_definition);
virtual void layerReadCurrentFrom(void* layer_definition);
virtual void layerWriteCurrentTo(void* layer_definition);
virtual void afterLayerAdded(void* layer_definition);
private:

View file

@ -177,7 +177,7 @@ void FormTextures::applyConfig()
scenerySetTextures(&_definition);
}
void FormTextures::layerGetCopy(void* layer_definition)
void FormTextures::layerReadCurrentFrom(void* layer_definition)
{
TextureLayerDefinition* source = (TextureLayerDefinition*)layer_definition;
texturesLayerCopyDefinition(source, _layer);
@ -186,7 +186,7 @@ void FormTextures::layerGetCopy(void* layer_definition)
zoneGetSlopeCurve(source->zone, _supp.slope_curve);
}
void FormTextures::layerApply(void* layer_definition)
void FormTextures::layerWriteCurrentTo(void* layer_definition)
{
TextureLayerDefinition* destination = (TextureLayerDefinition*)layer_definition;
texturesLayerCopyDefinition(_layer, destination);

View file

@ -19,8 +19,8 @@ public slots:
virtual void applyConfig();
protected:
virtual void layerGetCopy(void* layer_definition);
virtual void layerApply(void* layer_definition);
virtual void layerReadCurrentFrom(void* layer_definition);
virtual void layerWriteCurrentTo(void* layer_definition);
private:
TexturesDefinition _definition;