some more #include cleanups

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1579 270642c3-0616-0410-b53a-bc976706d245

diff --git a/senf/Scheduler/ReadHelper.hh b/senf/Scheduler/ReadHelper.hh
index 1963a61..3271801 100644 (file)
--- a/senf/Scheduler/ReadHelper.hh
+++ b/senf/Scheduler/ReadHelper.hh
@@ -31,7 +31,7 @@
 #include <boost/scoped_ptr.hpp>
 
 #include <senf/Utils/intrusive_refcount.hh>
-#include "Scheduler.hh"
+#include "FdEvent.hh"
 
 //#include "ReadHelper.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/senf/Scheduler/WriteHelper.hh b/senf/Scheduler/WriteHelper.hh
index 407998b..56e1467 100644 (file)
--- a/senf/Scheduler/WriteHelper.hh
+++ b/senf/Scheduler/WriteHelper.hh
@@ -29,7 +29,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/function.hpp>
 #include <senf/Utils/intrusive_refcount.hh>
-#include "Scheduler.hh"
+#include "FdEvent.hh"
 
 //#include "WriteHelper.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/senf/Utils/Console/Config.hh b/senf/Utils/Console/Config.hh
index 412c61a..7c2b817 100644 (file)
--- a/senf/Utils/Console/Config.hh
+++ b/senf/Utils/Console/Config.hh
@@ -29,7 +29,6 @@
 // Custom includes
 #include <boost/utility.hpp>
 #include <list>
-#include "Parse.hh"
 #include "Executor.hh"
 
 //#include "Config.mpp"

diff --git a/senf/Utils/Console/ConfigFile.cc b/senf/Utils/Console/ConfigFile.cc
index dd22b58..0db231a 100644 (file)
--- a/senf/Utils/Console/ConfigFile.cc
+++ b/senf/Utils/Console/ConfigFile.cc
@@ -27,6 +27,7 @@
 #include "ConfigFile.ih"
 
 // Custom includes
+#include <boost/bind.hpp>
 
 //#include "ConfigFile.mpp"
 #define prefix_

diff --git a/senf/Utils/Console/FancyReader.hh b/senf/Utils/Console/FancyReader.hh
deleted file mode 100644 (file)
index dd799d2..0000000
--- a/senf/Utils/Console/FancyReader.hh
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-//
-// Copyright (C) 2008 
-// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-/** \file
-    \brief FancyReader public header */
-
-#ifndef HH_SENF_Scheduler_Console_FancyReader_
-#define HH_SENF_Scheduler_Console_FancyReader_ 1
-
-// Custom includes
-#include "Server.hh"
-
-//#include "FancyReader.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
-
-namespace senf {
-namespace console {
-namespace detail {
-
-    class FancyClientReader
-        : public ClientReader
-    {
-    };
-
-}}
-
-///////////////////////////////hh.e////////////////////////////////////////
-//#include "FancyReader.cci"
-//#include "FancyReader.ct"
-//#include "FancyReader.cti"
-#endif
-
-\f
-// Local Variables:
-// mode: c++
-// fill-column: 100
-// comment-column: 40
-// c-file-style: "senf"
-// indent-tabs-mode: nil
-// ispell-local-dictionary: "american"
-// compile-command: "scons -u test"
-// End:

diff --git a/senf/Utils/Console/LazyDirectory.cc b/senf/Utils/Console/LazyDirectory.cc
index 02f2e5d..39e54e2 100644 (file)
--- a/senf/Utils/Console/LazyDirectory.cc
+++ b/senf/Utils/Console/LazyDirectory.cc
@@ -27,7 +27,7 @@
 //#include "LazyDirectory.ih"
 
 // Custom includes
-#include "Console.hh"
+#include "ScopedDirectory.hh"
 
 //#include "LazyDirectory.mpp"
 #define prefix_

diff --git a/senf/Utils/Console/Node.cci b/senf/Utils/Console/Node.cci
index 21b38ee..c763271 100644 (file)
--- a/senf/Utils/Console/Node.cci
+++ b/senf/Utils/Console/Node.cci
@@ -26,7 +26,6 @@
 #include "Node.ih"
 
 // Custom includes
-#include <senf/Utils/senfassert.hh>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////

diff --git a/senf/Utils/Console/Node.hh b/senf/Utils/Console/Node.hh
index 7bf1882..66ba18f 100644 (file)
--- a/senf/Utils/Console/Node.hh
+++ b/senf/Utils/Console/Node.hh
@@ -209,10 +209,7 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/any.hpp>
 #include <senf/Utils/Exception.hh>
-#include <senf/Utils/mpl.hh>
 #include <senf/Utils/Logger/SenfLog.hh>
-#include <senf/Utils/type_traits.hh>
-#include "Parse.hh"
 
 //#include "Node.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/senf/Utils/Console/ScopedDirectory.cti b/senf/Utils/Console/ScopedDirectory.cti
index 8b18ff0..5b9e3dd 100644 (file)
--- a/senf/Utils/Console/ScopedDirectory.cti
+++ b/senf/Utils/Console/ScopedDirectory.cti
@@ -26,7 +26,6 @@
 //#include "ScopedDirectory.ih"
 
 // Custom includes
-#include <boost/bind.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////

diff --git a/senf/Utils/Console/Traits.hh b/senf/Utils/Console/Traits.hh
index a42893c..ea5ee11 100644 (file)
--- a/senf/Utils/Console/Traits.hh
+++ b/senf/Utils/Console/Traits.hh
@@ -32,7 +32,6 @@
 #include <boost/type_traits/is_same.hpp>
 #include <senf/Utils/intrusive_refcount.hh>
 #include "Parse.hh"
-#include "Node.hh"
 
 #include "Traits.ih"
 //#include "Traits.mpp"

diff --git a/senf/Utils/Console/Traits.ih b/senf/Utils/Console/Traits.ih
index c3d6127..a3a0d69 100644 (file)
--- a/senf/Utils/Console/Traits.ih
+++ b/senf/Utils/Console/Traits.ih
@@ -36,7 +36,6 @@
 #include <boost/assign/list_inserter.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/mpl/if.hpp>
-#include <senf/Utils/singleton.hh>
 
 ///////////////////////////////ih.p////////////////////////////////////////
 

diff --git a/senf/Utils/Console/UDPServer.hh b/senf/Utils/Console/UDPServer.hh
index 0cf3834..bcc8bc9 100644 (file)
--- a/senf/Utils/Console/UDPServer.hh
+++ b/senf/Utils/Console/UDPServer.hh
@@ -30,7 +30,7 @@
 #include <boost/utility.hpp>
 #include <senf/Socket/Protocols/INet/UDPSocketHandle.hh>
 #include <senf/Utils/Logger/SenfLog.hh>
-#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Scheduler/FdEvent.hh>
 #include "Parse.hh"
 #include "Executor.hh"
 

diff --git a/senf/Utils/Console/Utility.hh b/senf/Utils/Console/Utility.hh
index 79f95d4..0e30fb4 100644 (file)
--- a/senf/Utils/Console/Utility.hh
+++ b/senf/Utils/Console/Utility.hh
@@ -28,7 +28,6 @@
 
 // Custom includes
 #include "Parse.hh"
-#include "Traits.hh"
 
 //#include "Utility.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////

diff --git a/senf/Utils/Console/Variables.hh b/senf/Utils/Console/Variables.hh
index 92df05d..71ed3c1 100644 (file)
--- a/senf/Utils/Console/Variables.hh
+++ b/senf/Utils/Console/Variables.hh
@@ -30,7 +30,7 @@
 #include <boost/utility.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/ref.hpp>
-#include "ParsedCommand.hh"
+#include "Node.hh"
 
 #include "Variables.ih"
 //#include "Variables.mpp"

diff --git a/senf/Utils/Daemon/Daemon.ih b/senf/Utils/Daemon/Daemon.ih
index eec1bd4..fed8bf3 100644 (file)
--- a/senf/Utils/Daemon/Daemon.ih
+++ b/senf/Utils/Daemon/Daemon.ih
@@ -33,7 +33,7 @@
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
 #include <senf/Scheduler/Scheduler.hh>
-#include <senf/Scheduler/SignalEvent.hh>
+#include <senf/Scheduler/FdEvent.hh>
 
 ///////////////////////////////ih.p////////////////////////////////////////