Beta 10008001: moved all Notify::Observer-s to base::Subscriber-s.

Telegram/SourceFiles/core/observer.cpp

@@ -21,99 +21,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include "stdafx.h"
 #include "core/observer.h"
 
-namespace Notify {
-namespace internal {
-namespace {
-
-struct StartCallbackData {
-	void *that;
-	StartCallback call;
-};
-struct FinishCallbackData {
-	void *that;
-	FinishCallback call;
-};
-struct UnregisterCallbackData {
-	void *that;
-	UnregisterCallback call;
-};
-using StartCallbacksList = QVector<StartCallbackData>;
-using FinishCallbacksList = QVector<FinishCallbackData>;
-NeverFreedPointer<StartCallbacksList> StartCallbacks;
-NeverFreedPointer<FinishCallbacksList> FinishCallbacks;
-UnregisterCallbackData UnregisterCallbacks[256]/* = { nullptr }*/;
-
-ObservedEvent LastRegisteredEvent/* = 0*/;
-
-} // namespace
-} // namespace internal
-
-void startObservers() {
-	if (!internal::StartCallbacks) return;
-
-	for (auto &callback : *internal::StartCallbacks) {
-		callback.call(callback.that);
-	}
-}
-
-void finishObservers() {
-	if (!internal::FinishCallbacks) return;
-
-	for (auto &callback : *internal::FinishCallbacks) {
-		callback.call(callback.that);
-	}
-	internal::StartCallbacks.clear();
-	internal::FinishCallbacks.clear();
-}
-
-namespace internal {
-
-BaseObservedEventRegistrator::BaseObservedEventRegistrator(void *that
-, StartCallback startCallback
-, FinishCallback finishCallback
-, UnregisterCallback unregisterCallback) {
-	_event = LastRegisteredEvent++;
-
-	StartCallbacks.makeIfNull();
-	StartCallbacks->push_back({ that, startCallback });
-
-	FinishCallbacks.makeIfNull();
-	FinishCallbacks->push_back({ that, finishCallback });
-
-	UnregisterCallbacks[_event] = { that, unregisterCallback };
-}
-
-} // namespace internal
-
-// Observer base interface.
-Observer::~Observer() {
-	for_const (auto connection, _connections) {
-		unregisterObserver(connection);
-	}
-}
-
-void Observer::observerRegistered(ConnectionId connection) {
-	_connections.push_back(connection);
-}
-
-void unregisterObserver(ConnectionId connection) {
-	auto event = static_cast<internal::ObservedEvent>(connection >> 24);
-	auto connectionIndex = int(connection & 0x00FFFFFFU) - 1;
-	auto &callback = internal::UnregisterCallbacks[event];
-	if (connectionIndex >= 0 && callback.call && callback.that) {
-		callback.call(callback.that, connectionIndex);
-	}
-}
-
-namespace internal {
-
-void observerRegisteredDefault(Observer *observer, ConnectionId connection) {
-	observer->observerRegistered(connection);
-}
-
-} // namespace internal
-} // namespace Notify
-
 namespace base {
 namespace internal {
 namespace {