From 60a2ed8ee8aa994c83d382af2ec477e171beb950 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 9 Jun 2008 00:50:59 +0000 Subject: [FIX] All modules now use their own namespace git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@201 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemodr/MapUI.cpp | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'pokemodr/MapUI.cpp') diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp index df05db97..1d09bce0 100644 --- a/pokemodr/MapUI.cpp +++ b/pokemodr/MapUI.cpp @@ -18,7 +18,7 @@ // Header include #include "MapUI.h" -// PokeModr includes +// Pokemodr includes #include "TilemapModel.h" // Pokemod includes @@ -30,133 +30,133 @@ // Qt includes #include -MapUI::MapUI(Map* map, QWidget* parent) : +Pokemodr::MapUI::MapUI(Pokemod::Map* map, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(map, new Map(*map)); + setObjects(map, new Pokemod::Map(*map)); } -MapUI::~MapUI() +Pokemodr::MapUI::~MapUI() { } -void MapUI::initGui() +void Pokemodr::MapUI::initGui() { - varType->addItems(Map::TypeStr); + varType->addItems(Pokemod::Map::TypeStr); varTilemap->horizontalHeader()->setResizeMode(QHeaderView::Fixed); varTilemap->verticalHeader()->setResizeMode(QHeaderView::Fixed); varTilemap->horizontalHeader()->setDefaultSectionSize(64); varTilemap->verticalHeader()->setDefaultSectionSize(64); - varTilemap->setModel(new TilemapModel(static_cast(modified())->map(), pokemod())); + varTilemap->setModel(new TilemapModel(static_cast(modified())->map(), pokemod())); } -void MapUI::refreshGui() +void Pokemodr::MapUI::refreshGui() { varFlyWarp->clear(); - for (int i = 0; i < static_cast(original())->warpCount(); ++i) + for (int i = 0; i < static_cast(original())->warpCount(); ++i) { - const MapWarp* warp = static_cast(original())->warp(i); + const Pokemod::MapWarp* warp = static_cast(original())->warp(i); varFlyWarp->addItem(warp->name(), warp->id()); } varTile->clear(); for (int i = 0; i < pokemod()->tileCount(); ++i) { - const Tile* tile = pokemod()->tile(i); + const Pokemod::Tile* tile = pokemod()->tile(i); varTile->addItem(tile->sprite(), tile->name(), tile->id()); } varTile->setEnabled(false); } -void MapUI::setGui() +void Pokemodr::MapUI::setGui() { - varName->setText(static_cast(modified())->name()); - boxFlyWarp->setChecked((static_cast(modified())->flyWarp() == INT_MAX) ? Qt::Unchecked : Qt::Checked); -// varFlyWarp->setCurrentIndex(varFlyWarp->findData(static_cast(modified())->flyWarp())); - varType->setCurrentIndex(static_cast(modified())->type()); + varName->setText(static_cast(modified())->name()); + boxFlyWarp->setChecked((static_cast(modified())->flyWarp() == INT_MAX) ? Qt::Unchecked : Qt::Checked); +// varFlyWarp->setCurrentIndex(varFlyWarp->findData(static_cast(modified())->flyWarp())); + varType->setCurrentIndex(static_cast(modified())->type()); // buttonDeleteColumn->setEnabled(0 < m_model->columnCount()); // buttonDeleteRow->setEnabled(0 < m_model->rowCount()); } -void MapUI::apply() +void Pokemodr::MapUI::apply() { - *static_cast(original()) = *static_cast(modified()); + *static_cast(original()) = *static_cast(modified()); emit(changed(false)); } -void MapUI::discard() +void Pokemodr::MapUI::discard() { - *static_cast(modified()) = *static_cast(original()); + *static_cast(modified()) = *static_cast(original()); setGui(); emit(changed(false)); } -void MapUI::on_varName_textChanged(const QString& name) +void Pokemodr::MapUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast(modified())->setName(name); + static_cast(modified())->setName(name); varName->setCursorPosition(cursor); } -void MapUI::on_boxFlyWarp_toggled() +void Pokemodr::MapUI::on_boxFlyWarp_toggled() { - static_cast(modified())->setFlyWarp(-1); + static_cast(modified())->setFlyWarp(-1); } -void MapUI::on_varFlyWarp_activated(const int flyWarp) +void Pokemodr::MapUI::on_varFlyWarp_activated(const int flyWarp) { - static_cast(modified())->setFlyWarp(varFlyWarp->itemData(flyWarp).toInt()); + static_cast(modified())->setFlyWarp(varFlyWarp->itemData(flyWarp).toInt()); } -void MapUI::on_varType_activated(const int type) +void Pokemodr::MapUI::on_varType_activated(const int type) { - static_cast(modified())->setType(type); + static_cast(modified())->setType(type); } -void MapUI::on_varTilemap_clicked(const QModelIndex& index) +void Pokemodr::MapUI::on_varTilemap_clicked(const QModelIndex& index) { m_index = index; varTile->setEnabled(true); varTile->setCurrentIndex(varTile->findData(varTilemap->model()->data(m_index, Qt::EditRole))); } -void MapUI::on_buttonAddColumn_pressed() +void Pokemodr::MapUI::on_buttonAddColumn_pressed() { varTilemap->model()->insertColumns(varTilemap->model()->columnCount(), 1); emit(changed(true)); } -void MapUI::on_buttonAddRow_pressed() +void Pokemodr::MapUI::on_buttonAddRow_pressed() { varTilemap->model()->insertRows(varTilemap->model()->rowCount(), 1); emit(changed(true)); } -void MapUI::on_buttonDeleteColumn_pressed() +void Pokemodr::MapUI::on_buttonDeleteColumn_pressed() { varTilemap->model()->removeColumns(m_index.column(), 1); emit(changed(true)); } -void MapUI::on_buttonDeleteRow_pressed() +void Pokemodr::MapUI::on_buttonDeleteRow_pressed() { varTilemap->model()->removeRows(m_index.row(), 1); emit(changed(true)); } -void MapUI::on_buttonInsertColumn_pressed() +void Pokemodr::MapUI::on_buttonInsertColumn_pressed() { varTilemap->model()->insertColumns(m_index.column(), 1); emit(changed(true)); } -void MapUI::on_buttonInsertRow_pressed() +void Pokemodr::MapUI::on_buttonInsertRow_pressed() { varTilemap->model()->insertRows(m_index.row(), 1); emit(changed(true)); } -void MapUI::on_varTile_activated(const int tile) +void Pokemodr::MapUI::on_varTile_activated(const int tile) { varTilemap->model()->setData(m_index, varTile->itemData(tile), Qt::EditRole); emit(changed(true)); -- cgit