IO refactor phase 1. Reduced dependencies, removed redundant classes.

Renamed pricipal APR classes in preparation for move to apr namespace.


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

4 files changed, 17 insertions, 65 deletions

diff --git a/cpp/src/qpid/framing/InputHandler.cpp b/cpp/src/qpid/framing/InputHandler.cpp
deleted file mode 100644
index accf68421a..0000000000
--- a/cpp/src/qpid/framing/InputHandler.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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/framing/InputHandler.h"
-
-qpid::framing::InputHandler::~InputHandler() {}
diff --git a/cpp/src/qpid/framing/InputHandler.h b/cpp/src/qpid/framing/InputHandler.h
index e2ad545993..8f56d176b8 100644
--- a/cpp/src/qpid/framing/InputHandler.h
+++ b/cpp/src/qpid/framing/InputHandler.h
@@ -1,3 +1,5 @@
+#ifndef _InputHandler_
+#define _InputHandler_
 /*
  *
  * Copyright (c) 2006 The Apache Software Foundation
@@ -15,24 +17,19 @@
  * limitations under the License.
  *
  */
-#include <string>
-
-#ifndef _InputHandler_
-#define _InputHandler_
 
+#include <qpid/SharedObject.h>
 #include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace framing {
 
-    class InputHandler{
-    public:
-        virtual ~InputHandler();
-	virtual void received(AMQFrame* frame) = 0;
-    };
+class InputHandler : public qpid::SharedObject<InputHandler> {
+  public:
+    virtual void received(AMQFrame* frame) = 0;
+};
 
-}
-}
+}}
 
 
 #endif
diff --git a/cpp/src/qpid/framing/OutputHandler.cpp b/cpp/src/qpid/framing/OutputHandler.cpp
deleted file mode 100644
index 22de39b82a..0000000000
--- a/cpp/src/qpid/framing/OutputHandler.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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/framing/OutputHandler.h"
-
-qpid::framing::OutputHandler::~OutputHandler() {}
diff --git a/cpp/src/qpid/framing/OutputHandler.h b/cpp/src/qpid/framing/OutputHandler.h
index ed38a321e5..16fb7e8afb 100644
--- a/cpp/src/qpid/framing/OutputHandler.h
+++ b/cpp/src/qpid/framing/OutputHandler.h
@@ -1,3 +1,6 @@
+#ifndef _OutputHandler_
+#define _OutputHandler_
+
 /*
  *
  * Copyright (c) 2006 The Apache Software Foundation
@@ -15,24 +18,18 @@
  * limitations under the License.
  *
  */
-#include <string>
-
-#ifndef _OutputHandler_
-#define _OutputHandler_
-
+#include <qpid/SharedObject.h>
 #include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace framing {
 
-    class OutputHandler{
-    public:
-        virtual ~OutputHandler();
-	virtual void send(AMQFrame* frame) = 0;
-    };
+class OutputHandler : public qpid::SharedObject<OutputHandler> {
+  public:
+    virtual void send(AMQFrame* frame) = 0;
+};
 
-}
-}
+}}
 
 
 #endif