Skip to content

Commit

Permalink
Related to #5175, remove the unused MapEvent listeners from the layer…
Browse files Browse the repository at this point in the history
… classes. Since all layers are stored in the map root node now, the layer information is automatically discarded along with the host node.
  • Loading branch information
codereader committed Apr 16, 2020
1 parent 3e5f911 commit fd31ca4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
9 changes: 0 additions & 9 deletions radiant/layers/LayerManager.cpp
Expand Up @@ -490,13 +490,4 @@ int LayerManager::getLowestUnusedLayerID()
return -1;
}

void LayerManager::onMapEvent(IMap::MapEvent ev)
{
if (ev == IMap::MapUnloaded || ev == IMap::MapLoading)
{
// Purge layer info before map is loading or after it has been unloaded
reset();
}
}

} // namespace scene
2 changes: 0 additions & 2 deletions radiant/layers/LayerManager.h
Expand Up @@ -119,8 +119,6 @@ class LayerManager :
sigc::signal<void> signal_nodeMembershipChanged() override;

private:
void onMapEvent(IMap::MapEvent ev);

// Internal event emitter
void onLayersChanged();

Expand Down
10 changes: 1 addition & 9 deletions radiant/layers/LayerModule.cpp
Expand Up @@ -4,6 +4,7 @@
#include "icommandsystem.h"
#include "itextstream.h"
#include "imapinfofile.h"
#include "imap.h"

#include "modulesystem/StaticModule.h"
#include "LayerManager.h"
Expand Down Expand Up @@ -113,10 +114,6 @@ class LayerModule :
{ cmd::ARGTYPE_STRING | cmd::ARGTYPE_OPTIONAL });
GlobalEventManager().addCommand("CreateNewLayer", "CreateNewLayer");

GlobalMapModule().signal_mapEvent().connect(
sigc::mem_fun(*this, &LayerModule::onMapEvent)
);

GlobalMapInfoFileManager().registerInfoFileModule(
std::make_shared<LayerInfoFileModule>()
);
Expand All @@ -128,11 +125,6 @@ class LayerModule :
}

private:
void onMapEvent(IMap::MapEvent ev)
{
// TODO
}

// Command target
void createLayerCmd(const cmd::ArgumentList& args)
{
Expand Down

0 comments on commit fd31ca4

Please sign in to comment.