Renamed ICAP source files from icap/ICAPFoo.{cc,h} to icap/Foo.{cc,h}.

[thirdparty/squid.git] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index dab47b810d5becac1bc2835e044de0d44b9a705b..87481b3a8e62513beff4bb6341608159a2bf6d42 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -77,7 +77,7 @@
 #endif
 
 #if ICAP_CLIENT
-#include "adaptation/icap/ICAPConfig.h"
+#include "adaptation/icap/Config.h"
 #endif
 #if USE_ECAP
 #include "adaptation/ecap/Config.h"
@@ -1050,8 +1050,8 @@ mainInitialize(void)
     // We can remove this dependency on specific adaptation mechanisms
     // if we create a generic Registry of such mechanisms. Should we?
 #if ICAP_CLIENT
-    TheICAPConfig.finalize();
-    enableAdaptation = TheICAPConfig.onoff || enableAdaptation;
+    Adaptation::Icap::TheConfig.finalize();
+    enableAdaptation = Adaptation::Icap::TheConfig.onoff || enableAdaptation;
 #endif
 #if USE_ECAP
     Ecap::TheConfig.finalize(); // must be after we load modules