mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 12:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Layer::get/set_name to Layer::get/setName.

Browse Source
This commit is contained in:
David Capello 2010-09-19 00:03:32 -03:00
parent e810b1452b
commit 4874f455f1
14 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/cmd_duplicate_layer.cpp
View File

@ -85,7 +85,7 @@ static Layer* duplicate_layer(Sprite* sprite)
layer_copy->set_background(false);
layer_copy->set_moveable(true);
layer_copy->set_name(layer_copy->get_name() + " Copy");
layer_copy->setName(layer_copy->getName() + " Copy");
/* add the new layer in the sprite */
if (undo_is_enabled(sprite->getUndo()))

4
src/commands/cmd_goto_layer.cpp
View File

@ -74,7 +74,7 @@ void GotoPreviousLayerCommand::onExecute(Context* context)
app_get_statusbar()
->setStatusText(1000, "Layer `%s' selected",
sprite->getCurrentLayer()->get_name().c_str());
sprite->getCurrentLayer()->getName().c_str());
}
//////////////////////////////////////////////////////////////////////
@ -123,7 +123,7 @@ void GotoNextLayerCommand::onExecute(Context* context)
app_get_statusbar()
->setStatusText(1000, "Layer `%s' selected",
sprite->getCurrentLayer()->get_name().c_str());
sprite->getCurrentLayer()->getName().c_str());
}
//////////////////////////////////////////////////////////////////////

4
src/commands/cmd_layer_properties.cpp
View File

@ -70,7 +70,7 @@ void LayerPropertiesCommand::onExecute(Context* context)
Widget* box2 = jbox_new(JI_HORIZONTAL);
Widget* box3 = jbox_new(JI_HORIZONTAL + JI_HOMOGENEOUS);
Widget* label_name = new Label("Name:");
Widget* entry_name = jentry_new(256, layer->get_name().c_str());
Widget* entry_name = jentry_new(256, layer->getName().c_str());
Button* button_ok = new Button("&OK");
Button* button_cancel = new Button("&Cancel");
@ -128,7 +128,7 @@ void LayerPropertiesCommand::onExecute(Context* context)
window->open_window_fg();
if (window->get_killer() == button_ok) {
layer->set_name(entry_name->getText());
layer->setName(entry_name->getText());
if (with_blend_modes)
static_cast<LayerImage*>(layer)->set_blend_mode(jlistbox_get_selected_index(list_bm));

6
src/commands/cmd_new_layer.cpp
View File

@ -109,7 +109,7 @@ void NewLayerCommand::onExecute(Context* context)
layer = undoable.new_layer();
undoable.commit();
}
layer->set_name(name);
layer->setName(name);
update_screen_for_sprite(sprite);
app_get_statusbar()->dirty();
@ -127,8 +127,8 @@ static int get_max_layer_num(Layer* layer)
{
int max = 0;
if (strncmp(layer->get_name().c_str(), "Layer ", 6) == 0)
max = strtol(layer->get_name().c_str()+6, NULL, 10);
if (strncmp(layer->getName().c_str(), "Layer ", 6) == 0)
max = strtol(layer->getName().c_str()+6, NULL, 10);
if (layer->is_folder()) {
LayerIterator it = static_cast<LayerFolder*>(layer)->get_layer_begin();

2
src/commands/cmd_new_layer_set.cpp
View File

@ -68,7 +68,7 @@ void NewLayerSetCommand::onExecute(Context* context)
const char *name = jwidget_find_name(window, "name")->getText();
Layer* layer = new LayerFolder(sprite);
layer->set_name(name);
layer->setName(name);
sprite->getFolder()->add_layer(layer);
sprite->setCurrentLayer(layer);

2
src/commands/cmd_remove_layer.cpp
View File

@ -66,7 +66,7 @@ void RemoveLayerCommand::onExecute(Context* context)
{
Undoable undoable(sprite, "Remove Layer");
layer_name = sprite->getCurrentLayer()->get_name();
layer_name = sprite->getCurrentLayer()->getName();
undoable.remove_layer(sprite->getCurrentLayer());
undoable.commit();

4
src/dialogs/aniedit.cpp
View File

@ -1099,7 +1099,7 @@ static void anieditor_draw_layer(JWidget widget, JRect clip, int layer_index)
u += ICONBORDER+icon2->w+ICONBORDER+ICONSEP;
/* draw the layer's name */
jdraw_text(ji_screen, widget->getFont(), layer->get_name().c_str(),
jdraw_text(ji_screen, widget->getFont(), layer->getName().c_str(),
u, y_mid - ji_font_get_size(widget->getFont())/2,
fg, bg, true, jguiscale());
@ -1108,7 +1108,7 @@ static void anieditor_draw_layer(JWidget widget, JRect clip, int layer_index)
hline(ji_screen,
u,
y_mid - ji_font_get_size(widget->getFont())/2 + ji_font_get_size(widget->getFont()) + 1,
u + text_length(widget->getFont(), layer->get_name().c_str()),
u + text_length(widget->getFont(), layer->getName().c_str()),
fg);
}

4
src/file/ase_format.cpp
View File

@ -669,7 +669,7 @@ static Layer *ase_file_read_layer_chunk(FILE *f, Sprite *sprite, Layer **previou
*layer->flags_addr() = flags;
// name
layer->set_name(name.c_str());
layer->setName(name.c_str());
// child level...
if (child_level == *current_level)
@ -714,7 +714,7 @@ static void ase_file_write_layer_chunk(FILE *f, Layer *layer)
ase_file_write_padding(f, 4);
/* layer name */
ase_file_write_string(f, layer->get_name());
ase_file_write_string(f, layer->getName());
ase_file_write_close_chunk(f);

8
src/raster/layer.cpp
View File

@ -42,7 +42,7 @@ Layer::Layer(GfxObjType type, Sprite* sprite)
{
ASSERT(type == GFXOBJ_LAYER_IMAGE || type == GFXOBJ_LAYER_FOLDER);
set_name("Layer");
setName("Layer");
m_sprite = sprite;
m_parent = NULL;
@ -60,7 +60,7 @@ Layer::Layer(const Layer* src_layer, Sprite* dst_sprite)
LAYER_IS_READABLE |
LAYER_IS_WRITABLE;
set_name(src_layer->get_name());
setName(src_layer->getName());
m_flags = src_layer->m_flags;
}
@ -253,7 +253,7 @@ void LayerImage::configure_as_background()
ASSERT(getSprite()->getBackgroundLayer() == NULL);
*flags_addr() |= LAYER_IS_LOCKMOVE | LAYER_IS_BACKGROUND;
set_name("Background");
setName("Background");
getSprite()->getFolder()->move_layer(this, NULL);
}
@ -264,7 +264,7 @@ void LayerImage::configure_as_background()
LayerFolder::LayerFolder(Sprite* sprite)
: Layer(GFXOBJ_LAYER_FOLDER, sprite)
{
set_name("Layer Set");
setName("Layer Set");
}
LayerFolder::LayerFolder(const LayerFolder* src_layer, Sprite* dst_sprite)

4
src/raster/layer.h
View File

@ -53,8 +53,8 @@ protected:
public:
virtual ~Layer();
std::string get_name() const { return m_name; }
void set_name(const std::string& name) { m_name = name; }
std::string getName() const { return m_name; }
void setName(const std::string& name) { m_name = name; }
Sprite* getSprite() const { return m_sprite; }
LayerFolder* get_parent() const { return m_parent; }

2
src/raster/sprite.cpp
View File

@ -1056,7 +1056,7 @@ Sprite* Sprite::createWithLayer(int imgtype, int width, int height, int ncolors)
image_clear(image, 0);
/* configure the first transparent layer */
layer->set_name("Layer 1");
layer->setName("Layer 1");
layer->set_blend_mode(BLEND_MODE_NORMAL);
/* add image in the layer stock */

10
src/raster/undo.cpp
View File

@ -1143,7 +1143,7 @@ void undo_set_layer_name(Undo* undo, Layer* layer)
static void chunk_set_layer_name_new(UndoStream* stream, Layer *layer)
{
std::string layer_name = layer->get_name();
std::string layer_name = layer->getName();
UndoChunkSetLayerName* chunk = (UndoChunkSetLayerName*)
undo_chunk_new(stream,
@ -1170,7 +1170,7 @@ static void chunk_set_layer_name_invert(UndoStream* stream, UndoChunkSetLayerNam
for (int c=0; c<chunk->name_length; c++)
layer_name.push_back(chunk->name_text[c]);
layer->set_name(layer_name.c_str());
layer->setName(layer_name.c_str());
}
}
@ -2242,7 +2242,7 @@ static Layer* read_raw_layer(ase_uint8* raw_data)
}
if (layer != NULL) {
layer->set_name(&name[0]);
layer->setName(&name[0]);
*layer->flags_addr() = flags;
layer->_setGfxObjId(layer_id);
@ -2255,7 +2255,7 @@ static ase_uint8* write_raw_layer(ase_uint8* raw_data, Layer* layer)
{
ase_uint32 dword;
ase_uint16 word;
std::string name = layer->get_name();
std::string name = layer->getName();
write_raw_uint32(layer->getId()); /* ID */
@ -2311,7 +2311,7 @@ static ase_uint8* write_raw_layer(ase_uint8* raw_data, Layer* layer)
static int get_raw_layer_size(Layer* layer)
{
int size = 4+2+layer->get_name().size()+1+2+4;
int size = 4+2+layer->getName().size()+1+2+4;
switch (layer->getType()) {

2
src/undoable.cpp
View File

@ -501,7 +501,7 @@ void Undoable::layer_from_background()
m_sprite->getCurrentLayer()->set_background(false);
m_sprite->getCurrentLayer()->set_moveable(true);
m_sprite->getCurrentLayer()->set_name("Layer 0");
m_sprite->getCurrentLayer()->setName("Layer 0");
}
void Undoable::flatten_layers(int bgcolor)

2
src/widgets/statebar.cpp
View File

@ -522,7 +522,7 @@ bool StatusBar::onProcessMessage(JMessage msg)
theme->get_button_normal_face_color());
if (count == 1)
uszprintf(buf, sizeof(buf), "%s", (*it)->get_name().c_str());
uszprintf(buf, sizeof(buf), "%s", (*it)->getName().c_str());
else
{
if (c+'A' <= 'Z')