From 5ce18e2a1998b78e643f68f2ff89c2959d3c200a Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 31 Jul 2015 19:13:13 -0700
Subject: [PATCH] SourceLayout: move CacheMgr typedef OBJH to mgr/forward.h

---
 src/CacheManager.h     | 15 +--------------
 src/SwapDir.h          |  1 +
 src/mgr/Registration.h |  1 -
 src/mgr/forward.h      |  8 ++++++++
 src/pconn.h            |  2 ++
 src/typedefs.h         |  1 -
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/CacheManager.h b/src/CacheManager.h
index 172e631a97..87d95edba1 100644
--- a/src/CacheManager.h
+++ b/src/CacheManager.h
@@ -14,25 +14,12 @@
 #include "mgr/ActionProfile.h"
 #include "mgr/Command.h"
 #include "mgr/forward.h"
-#include "typedefs.h"
 
 #include <vector>
 
-/**
- \defgroup CacheManagerAPI Cache Manager API
- \ingroup Components
- *
- \defgroup CacheManagerInternal Cache Manager intenal API (not for public use)
- \ingroup CacheManagerAPI
- */
-
 class HttpRequest;
-namespace Mgr
-{
-class ActionPasswordList;
-} //namespace Mgr
+
 /**
- \ingroup CacheManagerAPI
  * a CacheManager - the menu system for interacting with squid.
  * This is currently just an adapter to the global cachemgr* routines to
  * provide looser coupling between modules, but once fully transitioned,
diff --git a/src/SwapDir.h b/src/SwapDir.h
index c8ba516149..adb21dab76 100644
--- a/src/SwapDir.h
+++ b/src/SwapDir.h
@@ -9,6 +9,7 @@
 #ifndef SQUID_SWAPDIR_H
 #define SQUID_SWAPDIR_H
 
+#include "mgr/forward.h"
 #include "SquidConfig.h"
 #include "Store.h"
 #include "StoreIOState.h"
diff --git a/src/mgr/Registration.h b/src/mgr/Registration.h
index e0e27eb467..8825a1c3ff 100644
--- a/src/mgr/Registration.h
+++ b/src/mgr/Registration.h
@@ -12,7 +12,6 @@
 #define SQUID_MGR_REGISTRATION_H
 
 #include "mgr/forward.h"
-#include "typedefs.h"   /* for OBJH */
 
 namespace Mgr
 {
diff --git a/src/mgr/forward.h b/src/mgr/forward.h
index 574e193775..dcc4dee17d 100644
--- a/src/mgr/forward.h
+++ b/src/mgr/forward.h
@@ -13,11 +13,13 @@
 
 #include "base/RefCount.h"
 
+/// Cache Manager API
 namespace Mgr
 {
 
 class Action;
 class ActionCreator;
+class ActionPasswordList;
 class ActionProfile;
 class ActionWriter;
 class Command;
@@ -35,5 +37,11 @@ typedef ActionPointer (ClassActionCreationHandler)(const CommandPointer &cmd);
 
 } // namespace Mgr
 
+class StoreEntry;
+/**
+ * Handler for "dumping" out a cachemgr report to a StoreEntry
+ */
+typedef void OBJH(StoreEntry *);
+
 #endif /* SQUID_MGR_FORWARD_H */
 
diff --git a/src/pconn.h b/src/pconn.h
index 7b5cb6c86c..98fe36704e 100644
--- a/src/pconn.h
+++ b/src/pconn.h
@@ -10,6 +10,8 @@
 #define SQUID_PCONN_H
 
 #include "base/CbcPointer.h"
+#include "mgr/forward.h"
+
 #include <set>
 
 /**
diff --git a/src/typedefs.h b/src/typedefs.h
index ff61bc6c43..dd09773023 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -73,7 +73,6 @@ typedef int QS(const void *, const void *); /* qsort */
 typedef void STABH(void *);
 typedef void ERCB(int fd, void *, size_t);
 class StoreEntry;
-typedef void OBJH(StoreEntry *);
 typedef void SIGHDLR(int sig);
 typedef void STVLDCB(void *, int, int);
 typedef int HLPSAVAIL(void *);
-- 
2.47.3