From 370612270d09fe557c13b97119b259b5c2eb4b45 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 27 Apr 2014 16:25:59 +0300
Subject: Remove depricated event and depricated listener.
---
src/CMakeLists.txt | 4 -
src/Makefile.am | 4 -
src/being/playerinfo.cpp | 1 -
src/depricatedevent.cpp | 149 -----------------------------------
src/depricatedevent.h | 104 ------------------------
src/listeners/depricatedlistener.cpp | 39 ---------
src/listeners/depricatedlistener.h | 40 ----------
7 files changed, 341 deletions(-)
delete mode 100644 src/depricatedevent.cpp
delete mode 100644 src/depricatedevent.h
delete mode 100644 src/listeners/depricatedlistener.cpp
delete mode 100644 src/listeners/depricatedlistener.h
(limited to 'src')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb6596f00..11e161a77 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -641,10 +641,6 @@ SET(SRCS
debug.h
defaults.cpp
defaults.h
- depricatedevent.cpp
- depricatedevent.h
- listeners/depricatedlistener.cpp
- listeners/depricatedlistener.h
dragdrop.h
effectmanager.cpp
effectmanager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ae44549a..0caeee76b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -725,10 +725,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
debug.h \
defaults.cpp \
defaults.h \
- depricatedevent.cpp \
- depricatedevent.h \
- listeners/depricatedlistener.cpp \
- listeners/depricatedlistener.h \
dragdrop.h \
dropshortcut.cpp \
dropshortcut.h \
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index ed52df6c0..8f91c16db 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -23,7 +23,6 @@
#include "client.h"
#include "configuration.h"
-#include "depricatedevent.h"
#include "inventory.h"
#include "itemsoundmanager.h"
diff --git a/src/depricatedevent.cpp b/src/depricatedevent.cpp
deleted file mode 100644
index 3f8abad00..000000000
--- a/src/depricatedevent.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2014 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "depricatedevent.h"
-
-#include "variabledata.h"
-
-#include "listeners/depricatedlistener.h"
-
-#include "utils/delete2.h"
-
-#include "debug.h"
-
-DepricatedListenMap DepricatedEvent::mBindings;
-
-DepricatedEvent::~DepricatedEvent()
-{
- VariableMap::iterator it = mData.begin();
- while (it != mData.end())
- {
- delete2(it->second);
- ++it;
- }
-}
-
-void DepricatedEvent::setInt(const std::string &key, const int value)
-{
- if (mData.find(key) != mData.end())
- delete mData[key];
-
- mData[key] = new IntData(value);
-}
-
-int DepricatedEvent::getInt(const std::string &key) const
-{
- const VariableMap::const_iterator it = mData.find(key);
- if (it == mData.end())
- return 0;
-
- const VariableData *const data = it->second;
- if (!data || data->getType() != VariableData::DATA_INT)
- return 0;
-
- return static_cast<const IntData *>(data)->getData();
-}
-
-void DepricatedEvent::setString(const std::string &key,
- const std::string &value)
-{
- if (mData.find(key) != mData.end())
- delete mData[key];
-
- mData[key] = new StringData(value);
-}
-
-const std::string DepricatedEvent::getString(const std::string &key) const
-{
- const VariableMap::const_iterator it = mData.find(key);
- if (it == mData.end())
- return "";
-
- const VariableData *const data = it->second;
- if (!data || data->getType() != VariableData::DATA_STRING)
- return "";
-
- return static_cast<const StringData *>(data)->getData();
-}
-
-
-void DepricatedEvent::setFloat(const std::string &key, const double value)
-{
- if (mData.find(key) != mData.end())
- delete mData[key];
-
- mData[key] = new FloatData(value);
-}
-
-double DepricatedEvent::getFloat(const std::string &key) const
-{
- const VariableMap::const_iterator it = mData.find(key);
- if (it == mData.end())
- return 0;
-
- const VariableData *const data = it->second;
- if (!data || data->getType() != VariableData::DATA_FLOAT)
- return 0;
-
- return static_cast<const FloatData *>(data)->getData();
-}
-
-void DepricatedEvent::trigger(const Channels channel,
- const DepricatedEvent &event)
-{
- const DepricatedListenMap::const_iterator it = mBindings.find(channel);
-
- // Make sure something is listening
- if (it == mBindings.end())
- return;
-
- // Loop though all listeners
- DepricatedListenerSet::const_iterator lit = it->second.begin();
- const DepricatedListenerSet::const_iterator lit_end = it->second.end();
- while (lit != lit_end)
- {
- if (*lit)
- (*lit)->processEvent(channel, event);
- ++lit;
- }
-}
-
-void DepricatedEvent::remove(DepricatedListener *const listener)
-{
- DepricatedListenMap::iterator it = mBindings.begin();
- while (it != mBindings.end())
- {
- it->second.erase(listener);
- ++it;
- }
-}
-
-void DepricatedEvent::bind(DepricatedListener *const listener,
- const Channels channel)
-{
- mBindings[channel].insert(listener);
-}
-
-void DepricatedEvent::unbind(DepricatedListener *const listener,
- const Channels channel)
-{
- mBindings[channel].erase(listener);
-}
diff --git a/src/depricatedevent.h b/src/depricatedevent.h
deleted file mode 100644
index 2ade91bd7..000000000
--- a/src/depricatedevent.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2014 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DEPRICATEDEVENT_H
-#define DEPRICATEDEVENT_H
-
-#include <map>
-#include <set>
-#include <string>
-
-#include "localconsts.h"
-
-enum Channels
-{
- CHANNEL_ATTRIBUTES = 0
-};
-
-enum DepricatedEvents
-{
- EVENT_UPDATEATTRIBUTE = 0,
- EVENT_UPDATESTAT
-};
-
-class DepricatedListener;
-class VariableData;
-typedef std::map<std::string, VariableData *> VariableMap;
-
-typedef std::set<DepricatedListener *> DepricatedListenerSet;
-typedef std::map<Channels, DepricatedListenerSet > DepricatedListenMap;
-
-class DepricatedEvent final
-{
- public:
- // String passed can be retivered with getName()
- // and is to used to identify what type of event
- // this is.
- explicit DepricatedEvent(const DepricatedEvents name) :
- mDepricatedEventName(name),
- mData()
- { }
-
- ~DepricatedEvent();
-
- DepricatedEvents getName() const A_WARN_UNUSED
- { return mDepricatedEventName; }
-
- // Sets or gets a interger with a key to identify
- void setInt(const std::string &key, const int value);
-
- int getInt(const std::string &key) const A_WARN_UNUSED;
-
- // Sets or gets a string with a key to identify
- void setString(const std::string &key,
- const std::string &value);
-
- const std::string getString(const std::string &key)
- const A_WARN_UNUSED;
-
- // Sets or gets a floating point number with key to identify
- void setFloat(const std::string &key, const double value);
-
- double getFloat(const std::string &key) const A_WARN_UNUSED;
-
- // Sends event to all listener on the channel
- static void trigger(const Channels channel,
- const DepricatedEvent &event);
-
- // Removes a listener from all channels
- static void remove(DepricatedListener *const listener);
-
- // Adds or removes a listener to a channel.
- static void bind(DepricatedListener *const listener,
- const Channels channel);
-
- static void unbind(DepricatedListener *const listener,
- const Channels channel);
-
- private:
- DepricatedEvents mDepricatedEventName;
-
- static DepricatedListenMap mBindings;
-
- VariableMap mData;
-};
-
-#endif // DEPRICATEDEVENT_H
diff --git a/src/listeners/depricatedlistener.cpp b/src/listeners/depricatedlistener.cpp
deleted file mode 100644
index c853c028d..000000000
--- a/src/listeners/depricatedlistener.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2014 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "listeners/depricatedlistener.h"
-
-#include "debug.h"
-
-DepricatedListener::~DepricatedListener()
-{
- DepricatedEvent::remove(this);
-}
-
-void DepricatedListener::listen(Channels channel)
-{
- DepricatedEvent::bind(this, channel);
-}
-
-void DepricatedListener::ignore(Channels channel)
-{
- DepricatedEvent::unbind(this, channel);
-}
diff --git a/src/listeners/depricatedlistener.h b/src/listeners/depricatedlistener.h
deleted file mode 100644
index 175eec74a..000000000
--- a/src/listeners/depricatedlistener.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2014 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef LISTENERS_DEPRICATEDLISTENER_H
-#define LISTENERS_DEPRICATEDLISTENER_H
-
-#include "depricatedevent.h"
-
-class DepricatedListener
-{
- public:
- virtual ~DepricatedListener();
-
- void listen(Channels channel);
-
- void ignore(Channels channel);
-
- virtual void processEvent(const Channels channel,
- const DepricatedEvent &event) = 0;
-};
-
-#endif // LISTENERS_DEPRICATEDLISTENER_H
--
cgit v1.2.3-70-g09d2