Merge branch 'master' into kitsune-gtad

1 files changed, 0 insertions, 69 deletions

diff --git a/state.cpp b/state.cpp
deleted file mode 100644
index 59a3b007..00000000
--- a/state.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "state.h"
-
-#include "events/event.h"
-
-using namespace QMatrixClient;
-
-class State::Private
-{
-    public:
-        Event* event;
-        QString stateKey;
-        QString replacesState;
-};
-
-
-State::State(Event* event)
-    : d(new Private)
-{
-    d->event = event;
-}
-
-State::~State()
-{
-    delete d;
-}
-
-Event* State::event() const
-{
-    return d->event;
-}
-
-QString State::stateKey() const
-{
-    return d->stateKey;
-}
-
-QString State::replacesState() const
-{
-    return d->replacesState;
-}
-
-State* State::fromJson(const QJsonObject& obj)
-{
-    Event* event = Event::fromJson(obj);
-    if( !event )
-        return nullptr;
-    State* state = new State(event);
-    state->d->stateKey = obj.value("state_key").toString();
-    state->d->replacesState = obj.value("replaces_state").toString();
-    return state;
-}