Changeset 9098f9 for src


Ignore:
Timestamp:
Dec 22, 2010, 10:32:46 AM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
70672e3
Parents:
115378
Message:

All include files go into folder CodePatterns.

  • therefore all local includes are now without path.
  • INCLUDES in Makefile.am ascertains that includes are still found.
Location:
src
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • src/Helpers/Assert.hpp

    r115378 r9098f9  
    1515#include<map>
    1616
    17 #include "Helpers/toString.hpp"
     17#include "toString.hpp"
    1818
    1919/**

  • src/Helpers/errorlogger.cpp

    r115378 r9098f9  
    2424#include "errorlogger.hpp"
    2525#include "Verbose.hpp"
    26 #include "Patterns/Singleton_impl.hpp"
     26#include "Singleton_impl.hpp"
    2727
    2828int errorLogger::verbosity = 2;

  • src/Helpers/errorlogger.hpp

    r115378 r9098f9  
    1111#include <iosfwd>
    1212
    13 #include "Patterns/Singleton.hpp"
     13#include "Singleton.hpp"
    1414
    1515using namespace std;

  • src/Helpers/logger.cpp

    r115378 r9098f9  
    2424#include "logger.hpp"
    2525#include "Verbose.hpp"
    26 #include "Patterns/Singleton_impl.hpp"
     26#include "Singleton_impl.hpp"
    2727
    2828

  • src/Helpers/logger.hpp

    r115378 r9098f9  
    1111#include <iosfwd>
    1212
    13 #include "Patterns/Singleton.hpp"
     13#include "Singleton.hpp"
    1414
    1515using namespace std;

  • src/Makefile.am

    r115378 r9098f9  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    66AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
    … …  
    2929
    3030### PATTERNS ###
    31 
    32 nobase_include_HEADERS = $(PATTERNSOURCE) $(PATTERNHEADER)
    3331
    3432PATTERNSOURCE = \
    … …  
    106104## configuration header file is generated at configure time and should not be
    107105## shipped with the source tarball.
    108 libCodePatterns_libincludedir = $(includedir)/Helpers/
     106libCodePatterns_libincludedir = $(includedir)/CodePatterns/
    109107#-$(CODEPATTERNS_API_VERSION)
    110 nodist_libCodePatterns_libinclude_HEADERS = $(HELPERSHEADER) $(top_builddir)/libCodePatterns_config.h
     108libCodePatterns_libinclude_HEADERS = $(HELPERSHEADER) $(PATTERNSOURCE) $(PATTERNHEADER) $(top_builddir)/libCodePatterns_config.h
    111109
    112110## Install the generated pkg-config file (.pc) into the expected location for

  • src/Patterns/Cacheable.hpp

    r115378 r9098f9  
    99#define CACHEABLE_HPP_
    1010
    11 #include "Patterns/Observer.hpp"
     11#include "Observer.hpp"
    1212#include <boost/function.hpp>
    1313#include <boost/shared_ptr.hpp>
    1414
    15 #include "Helpers/Assert.hpp"
     15#include "Assert.hpp"
    1616
    1717#ifndef NO_CACHING

  • src/Patterns/ObservedContainer.hpp

    r115378 r9098f9  
    1212
    1313#include <utility>
    14 #include "Patterns/ObservedIterator.hpp"
     14#include "ObservedIterator.hpp"
    1515#include "Descriptors/SelectiveIterator.hpp"
    1616

  • src/Patterns/ObservedContainer_impl.hpp

    r115378 r9098f9  
    99#define OBSERVEDCONTAINER_IMPL_HPP_
    1010
    11 #include "Patterns/ObservedContainer.hpp"
     11#include "ObservedContainer.hpp"
    1212
    1313template <class Container>

  • src/Patterns/ObservedIterator.hpp

    r115378 r9098f9  
    99#define OBSERVEDITERATOR_HPP_
    1010
    11 #include "Patterns/Observer.hpp"
     11#include "Observer.hpp"
    1212
    1313#include <iterator>

  • src/Patterns/Observer.cpp

    r115378 r9098f9  
    1818#endif
    1919
    20 #include "Helpers/MemDebug.hpp"
     20#include "MemDebug.hpp"
    2121
    2222#include "Observer.hpp"
    … …  
    2424#include <iostream>
    2525
    26 #include "Helpers/Assert.hpp"
    27 #include "Helpers/MemDebug.hpp"
     26#include "Assert.hpp"
     27#include "MemDebug.hpp"
    2828
    2929using namespace std;

  • src/Patterns/Registry_impl.hpp

    r115378 r9098f9  
    99#define REGISTRY_IMPL_HPP_
    1010
    11 #include "Helpers/MemDebug.hpp"
     11#include "MemDebug.hpp"
    1212
    13 #include "Patterns/Registry.hpp"
    14 #include "Patterns/Singleton_impl.hpp"
     13#include "Registry.hpp"
     14#include "Singleton_impl.hpp"
    1515
    16 #include "Helpers/Assert.hpp"
     16#include "Assert.hpp"
    1717#include <iostream>
    1818

  • src/Patterns/Singleton.hpp

    r115378 r9098f9  
    1111#include <boost/thread.hpp>
    1212
    13 #include "Helpers/Assert.hpp"
     13#include "Assert.hpp"
    1414
    1515/**
    … …  
    104104 *    @endcode
    105105 *
    106  * - include the file "Patterns/Singleton_impl.hpp" that carries the implementation details of
     106 * - include the file "Singleton_impl.hpp" that carries the implementation details of
    107107 *   the singleton functions in your implementation file of the class.
    108108 * - make the compiler construct the template instantiations. For this you can use the defined

  • src/Patterns/Singleton_impl.hpp

    r115378 r9098f9  
    99#define SINGLETON_IMPL_HPP_
    1010
    11 #include "Helpers/Assert.hpp"
    12 #include "Patterns/Singleton.hpp"
     11#include "Assert.hpp"
     12#include "Singleton.hpp"
    1313
    1414/****** Static instance Variables of the template *******/

  • src/Patterns/unittests/CacheableUnitTest.cpp

    r115378 r9098f9  
    2626#include <boost/bind.hpp>
    2727
    28 #include "Patterns/Cacheable.hpp"
     28#include "Cacheable.hpp"
    2929
    3030#ifdef HAVE_TESTRUNNER

  • src/Patterns/unittests/Makefile.am

    r115378 r9098f9  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    66AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl

  • src/Patterns/unittests/ObserverUnitTest.cpp

    r115378 r9098f9  
    2323#include <set>
    2424
    25 #include "Patterns/Observer.hpp"
    26 #include "Patterns/ObservedIterator.hpp"
    27 #include "Helpers/Assert.hpp"
     25#include "Observer.hpp"
     26#include "ObservedIterator.hpp"
     27#include "Assert.hpp"
    2828
    2929#include <iostream>

  • src/Patterns/unittests/SingletonUnitTest.cpp

    r115378 r9098f9  
    2525#include <iostream>
    2626
    27 #include "Patterns/Singleton.hpp"
    28 #include "Patterns/Singleton_impl.hpp"
     27#include "Singleton.hpp"
     28#include "Singleton_impl.hpp"
    2929
    3030#ifdef HAVE_TESTRUNNER

  • src/unittests/InfoUnitTest.cpp

    r115378 r9098f9  
    2727#include <stdio.h>
    2828
    29 #include "Helpers/Info.hpp"
    30 #include "Helpers/Log.hpp"
     29#include "Info.hpp"
     30#include "Log.hpp"
    3131
    3232#include "InfoUnitTest.hpp"

  • src/unittests/LogUnitTest.cpp

    r115378 r9098f9  
    2222#include <cppunit/ui/text/TestRunner.h>
    2323
    24 #include "Helpers/Log.hpp"
    25 #include "Helpers/Verbose.hpp"
     24#include "Log.hpp"
     25#include "Verbose.hpp"
    2626
    2727#include "LogUnitTest.hpp"

  • src/unittests/Makefile.am

    r115378 r9098f9  
    55        ../Patterns/unittests
    66
    7 INCLUDES = -I$(top_srcdir)/src
     7INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    88
    99AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl

  • src/unittests/TestRunnerMain.cpp

    r115378 r9098f9  
    2727#else
    2828
    29 #include "unittests/UnitTestMain.cpp"
     29#include "UnitTestMain.cpp"
    3030
    3131#endif /* HAVE_ECUT */
Note: See TracChangeset for help on using the changeset viewer.