QPID-4905: Tidy up broker::Connection

- Clean up code for accounting for sent frames
- merged Connection and ConnectionState into Connection

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1494639 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 55 deletions

diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
deleted file mode 100644
index 053f47df49..0000000000
--- a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef QPID_SYS_CONNECTIONOUTPUTHANDLERPTR_H
-#define QPID_SYS_CONNECTIONOUTPUTHANDLERPTR_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include "qpid/sys/ConnectionOutputHandler.h"
-
-namespace qpid {
-namespace sys {
-
-/**
- * A ConnectionOutputHandler that delegates to another
- * ConnectionOutputHandler.  Allows the "real" ConnectionOutputHandler
- * to be changed without updating all the pointers/references
- * using the ConnectionOutputHandlerPtr
- */
-class ConnectionOutputHandlerPtr : public ConnectionOutputHandler
-{
-  public:
-    ConnectionOutputHandlerPtr(ConnectionOutputHandler* p) : next(p) { assert(next); }
-    void set(ConnectionOutputHandler* p) { next = p; assert(next); }
-    ConnectionOutputHandler* get() { return next; }
-    const ConnectionOutputHandler* get() const { return next; }
-
-    void close() { next->close(); }
-    void abort() { next->abort(); }
-    void connectionEstablished() { next->connectionEstablished(); }
-    void activateOutput() { next->activateOutput(); }
-    void handle(framing::AMQFrame& f) { next->handle(f); }
-
-  private:
-    ConnectionOutputHandler* next;
-};
-}} // namespace qpid::sys
-
-#endif  /*!QPID_SYS_CONNECTIONOUTPUTHANDLERPTR_H*/