Changeset 9b8fa4 for src/Patterns


Ignore:
Timestamp:
Dec 13, 2011, 1:09:40 PM (14 years ago)
Author:
Frederik Heber <heber@…>
Children:
c7ac70
Parents:
3324cf
git-author:
Frederik Heber <heber@…> (12/11/11 14:49:06)
git-committer:
Frederik Heber <heber@…> (12/13/11 13:09:40)
Message:

Huge update of file structure to place installation header files into right folder.

  • The problem ist that we desire use as include "CodePatterns/...". For this to work, especially with the new Observer subfolder structure, it has been necessary to place all header files away from their source files into a distinct folder called CodePatterns. This emulates the later, after make install present structure.
  • essentially all source and header files had to be changed to adapt the include.
  • all Makefile.am's had to be changed.
  • nobase_ ... was removed such that header files are installed flat and not creating their subfolder along the process.
  • We placed Observer into its own convenience library and own folder Observer away from Patterns.

Some other changes:

  • FIX: MemDebug.hpp inclusion has been removed in all stubs.
Location:
src/Patterns
Files:
2 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • src/Patterns/Makefile.am

    r3324cf r9b8fa4  
    33
    44
    5 INCLUDES = -I$(top_srcdir)/src/Helpers
     5INCLUDES = -I$(top_srcdir)/src/
    66
    77AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    88AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
    99
    10 OBSERVERSOURCE = \
    11         Observer/Channels.cpp \
    12         Observer/Notification.cpp \
    13         Observer/Observable.cpp \
    14         Observer/Observer.cpp \
    15         Observer/Relay.cpp
     10PATTERNSOURCE =
    1611
    17 OBSERVERDEBUGSOURCE = \
    18         $(OBSERVERSOURCE) \
    19         Observer/ObserverLog.cpp
    20                                  
    21 OBSERVERHEADER = \
    22         Observer/all.hpp \
    23         Observer/Channels.hpp \
    24         Observer/defs.hpp \
    25         Observer/Notification.hpp \
    26         Observer/Observable.hpp \
    27         Observer/Observer.hpp \
    28         Observer/ObservedContainer.hpp \
    29         Observer/ObserverLog.hpp \
    30         Observer/ObservedIterator.hpp \
    31         Observer/ObservedContainer_impl.hpp \
    32         Observer/Relay.hpp
     12PATTERNDEBUGSOURCE =
    3313
    3414PATTERNHEADER = \
    35         Cacheable.hpp \
    36         Clone.hpp \
    37         Creator.hpp \
    38         Factory.hpp \
    39         Factory_impl.hpp \
    40         FactoryTypeList.hpp \
    41         ManipulableClone.hpp \
    42         ManipulablePrototypeFactory.hpp \
    43         ManipulablePrototypeFactory_impl.hpp \
    44         Registry_impl.hpp \
    45         Singleton_impl.hpp \
    46         PrototypeFactory.hpp \
    47         PrototypeFactory_impl.hpp \
    48         Registry.hpp \
    49         Singleton.hpp
     15        $(top_srcdir)/src/CodePatterns/Cacheable.hpp \
     16        $(top_srcdir)/src/CodePatterns/Clone.hpp \
     17        $(top_srcdir)/src/CodePatterns/Creator.hpp \
     18        $(top_srcdir)/src/CodePatterns/Factory.hpp \
     19        $(top_srcdir)/src/CodePatterns/Factory_impl.hpp \
     20        $(top_srcdir)/src/CodePatterns/FactoryTypeList.hpp \
     21        $(top_srcdir)/src/CodePatterns/ManipulableClone.hpp \
     22        $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory.hpp \
     23        $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory_impl.hpp \
     24        $(top_srcdir)/src/CodePatterns/Registry_impl.hpp \
     25        $(top_srcdir)/src/CodePatterns/Singleton_impl.hpp \
     26        $(top_srcdir)/src/CodePatterns/PrototypeFactory.hpp \
     27        $(top_srcdir)/src/CodePatterns/PrototypeFactory_impl.hpp \
     28        $(top_srcdir)/src/CodePatterns/Registry.hpp \
     29        $(top_srcdir)/src/CodePatterns/Singleton.hpp
    5030
     31PATTERNDEBUGHEADER =
    5132
    5233noinst_LTLIBRARIES = libCodePatterns-Patterns.la libCodePatterns-Patterns-debug.la
    … …  
    6142libCodePatterns_Patterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS)
    6243
    63 nobase_libCodePatterns_Patterns_la_include_HEADERS = $(OBSERVERHEADER)
    64 nobase_libCodePatterns_Patterns_debug_la_include_HEADERS = $(PATTERNHEADER) $(OBSERVERHEADER)
     44libCodePatterns_Patterns_la_include_HEADERS = $(PATTERNHEADER)
     45libCodePatterns_Patterns_debug_la_include_HEADERS = $(PATTERNDEBUGHEADER)
    6546
    6647## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
    … …  
    7253## from each source file.  Note that it is not necessary to list header files
    7354## which are already listed elsewhere in a _HEADERS variable assignment.
    74 libCodePatterns_Patterns_la_SOURCES = $(OBSERVERSOURCE)
    75 libCodePatterns_Patterns_debug_la_SOURCES = $(OBSERVERDEBUGSOURCE)
     55libCodePatterns_Patterns_la_SOURCES = $(PATTERNSOURCE)
     56libCodePatterns_Patterns_debug_la_SOURCES = $(PATTERNDEBUGSOURCE)
    7657
    7758#Observer/all.hpp: FORCE

  • src/Patterns/unittests/CacheableUnitTest.cpp

    r3324cf r9b8fa4  
    2626#include <boost/bind.hpp>
    2727
    28 #include "Cacheable.hpp"
     28#include "CodePatterns/Cacheable.hpp"
    2929
    3030#ifdef HAVE_TESTRUNNER

  • src/Patterns/unittests/CloneUnitTest.cpp

    r3324cf r9b8fa4  
    2222#include <cppunit/ui/text/TestRunner.h>
    2323
    24 #include "Assert.hpp"
     24#include "CodePatterns/Assert.hpp"
    2525
    26 #include "Clone.hpp"
     26#include "CodePatterns/Clone.hpp"
    2727#include "stubs/CloneStub.hpp"
    2828

  • src/Patterns/unittests/CreatorUnitTest.cpp

    r3324cf r9b8fa4  
    2222#include <cppunit/ui/text/TestRunner.h>
    2323
    24 #include "Assert.hpp"
     24#include "CodePatterns/Assert.hpp"
    2525
    2626#include <typeinfo>

  • src/Patterns/unittests/FactoryUnitTest.cpp

    r3324cf r9b8fa4  
    1818#include <cppunit/extensions/TestFactoryRegistry.h>
    1919#include <cppunit/ui/text/TestRunner.h>
    20 #include "Assert.hpp"
     20#include "CodePatterns/Assert.hpp"
    2121
    2222#include "FactoryUnitTest.hpp"

  • src/Patterns/unittests/Makefile.am

    r3324cf r9b8fa4  
    55
    66TESTS += \
    7   CacheableUnitTest \
    8   CloneUnitTest \
    9   CreatorUnitTest \
    10   FactoryUnitTest \
    11   ManipulableCloneUnitTest \
    12   ManipulablePrototypeFactoryUnitTest \
    13   PrototypeFactoryUnitTest \
    14   RegistryUnitTest \
    15   SingletonUnitTest
     7        CacheableUnitTest \
     8        CloneUnitTest \
     9        CreatorUnitTest \
     10        FactoryUnitTest \
     11        ManipulableCloneUnitTest \
     12        ManipulablePrototypeFactoryUnitTest \
     13        PrototypeFactoryUnitTest \
     14        RegistryUnitTest \
     15        SingletonUnitTest
    1616
    1717TESTSOURCES += \
    18   ../Patterns/unittests/CacheableUnitTest.cpp \
    19   ../Patterns/unittests/CloneUnitTest.cpp \
    20   ../Patterns/unittests/CreatorUnitTest.cpp \
    21   ../Patterns/unittests/FactoryUnitTest.cpp \
    22   ../Patterns/unittests/ManipulableCloneUnitTest.cpp \
    23   ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
    24   ../Patterns/unittests/PrototypeFactoryUnitTest.cpp \
    25   ../Patterns/unittests/RegistryUnitTest.cpp \
    26   ../Patterns/unittests/SingletonUnitTest.cpp \
    27   ../Patterns/unittests/stubs/CloneStub.cpp \
    28   ../Patterns/unittests/stubs/CommonStub.cpp \
    29   ../Patterns/unittests/stubs/CommonNamedStub.cpp \
    30   ../Patterns/unittests/stubs/FactoryStub.cpp \
    31   ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
    32   ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
    33   ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
    34   ../Patterns/unittests/stubs/RegistryStub.cpp
     18        ../Patterns/unittests/CacheableUnitTest.cpp \
     19        ../Patterns/unittests/CloneUnitTest.cpp \
     20        ../Patterns/unittests/CreatorUnitTest.cpp \
     21        ../Patterns/unittests/FactoryUnitTest.cpp \
     22        ../Patterns/unittests/ManipulableCloneUnitTest.cpp \
     23        ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
     24        ../Patterns/unittests/PrototypeFactoryUnitTest.cpp \
     25        ../Patterns/unittests/RegistryUnitTest.cpp \
     26        ../Patterns/unittests/SingletonUnitTest.cpp \
     27        ../Patterns/unittests/stubs/CloneStub.cpp \
     28        ../Patterns/unittests/stubs/CommonStub.cpp \
     29        ../Patterns/unittests/stubs/CommonNamedStub.cpp \
     30        ../Patterns/unittests/stubs/FactoryStub.cpp \
     31        ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     32        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
     33        ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
     34        ../Patterns/unittests/stubs/RegistryStub.cpp
    3535
    3636TESTHEADERS += \
    37   ../Patterns/unittests/stubs/Observer/ObserverStub.hpp \
    38   ../Patterns/unittests/CacheableUnitTest.hpp \
    39   ../Patterns/unittests/CloneUnitTest.hpp \
    40   ../Patterns/unittests/CreatorUnitTest.hpp \
    41   ../Patterns/unittests/FactoryUnitTest.hpp \
    42   ../Patterns/unittests/ManipulableCloneUnitTest.hpp \
    43   ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
    44   ../Patterns/unittests/PrototypeFactoryUnitTest.hpp \
    45   ../Patterns/unittests/RegistryUnitTest.hpp \
    46   ../Patterns/unittests/SingletonUnitTest.hpp \
    47   ../Patterns/unittests/stubs/CloneStub.hpp \
    48   ../Patterns/unittests/stubs/CommonStub.hpp \
    49   ../Patterns/unittests/stubs/CommonNamedStub.hpp \
    50   ../Patterns/unittests/stubs/CommonParametersStub.hpp \
    51   ../Patterns/unittests/stubs/CreatorStub.hpp \
    52   ../Patterns/unittests/stubs/FactoryStub.hpp \
    53   ../Patterns/unittests/stubs/ManipulableCloneStub.hpp \
    54   ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
    55   ../Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
    56   ../Patterns/unittests/stubs/FactoryStub.def \
    57   ../Patterns/unittests/stubs/FactoryStub.undef \
    58   ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
    59   ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
    60   ../Patterns/unittests/stubs/PrototypeFactoryStub.def \
    61   ../Patterns/unittests/stubs/PrototypeFactoryStub.undef \
    62   ../Patterns/unittests/stubs/RegistryStub.hpp
     37        ../Patterns/unittests/CacheableUnitTest.hpp \
     38        ../Patterns/unittests/CloneUnitTest.hpp \
     39        ../Patterns/unittests/CreatorUnitTest.hpp \
     40        ../Patterns/unittests/FactoryUnitTest.hpp \
     41        ../Patterns/unittests/ManipulableCloneUnitTest.hpp \
     42        ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
     43        ../Patterns/unittests/PrototypeFactoryUnitTest.hpp \
     44        ../Patterns/unittests/RegistryUnitTest.hpp \
     45        ../Patterns/unittests/SingletonUnitTest.hpp \
     46        ../Patterns/unittests/stubs/CloneStub.hpp \
     47        ../Patterns/unittests/stubs/CommonStub.hpp \
     48        ../Patterns/unittests/stubs/CommonNamedStub.hpp \
     49        ../Patterns/unittests/stubs/CommonParametersStub.hpp \
     50        ../Patterns/unittests/stubs/CreatorStub.hpp \
     51        ../Patterns/unittests/stubs/FactoryStub.hpp \
     52        ../Patterns/unittests/stubs/ManipulableCloneStub.hpp \
     53        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
     54        ../Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
     55        ../Patterns/unittests/stubs/FactoryStub.def \
     56        ../Patterns/unittests/stubs/FactoryStub.undef \
     57        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
     58        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
     59        ../Patterns/unittests/stubs/PrototypeFactoryStub.def \
     60        ../Patterns/unittests/stubs/PrototypeFactoryStub.undef \
     61        ../Patterns/unittests/stubs/RegistryStub.hpp
    6362
    6463check_PROGRAMS += $(TESTS)
    … …  
    6968        ../Patterns/unittests/CacheableUnitTest.hpp
    7069nodist_CacheableUnitTest_SOURCES = \
    71         ../Patterns/Cachable.hpp \
    72         ../Patterns/Observer.hpp \
    73         ../Patterns/ObserverIterator.hpp
     70        $(top_srcdir)/src/CodePatterns/Cachable.hpp \
     71        $(top_srcdir)/src/CodePatterns/Observer/Observer.hpp \
     72        $(top_srcdir)/src/CodePatterns/Observer/ObserverIterator.hpp
    7473CacheableUnitTest_LDADD = \
     74        ../Observer/libCodePatterns-Observer-debug.la \
    7575        ../Patterns/libCodePatterns-Patterns-debug.la \
    7676        ../Helpers/libCodePatterns-Helpers-debug.la \
    … …  
    8585        ../Patterns/unittests/stubs/CloneStub.hpp
    8686nodist_CloneUnitTest_SOURCES = \
    87         ../Patterns/Clone.hpp
     87        $(top_srcdir)/src/CodePatterns/Clone.hpp
    8888CloneUnitTest_LDADD = \
    8989        ../Helpers/libCodePatterns-Helpers-debug.la
    … …  
    9696        ../Patterns/unittests/stubs/CreatorStub.hpp
    9797nodist_CreatorUnitTest_SOURCES = \
    98         ../Patterns/Creator.hpp
     98        $(top_srcdir)/src/CodePatterns/Creator.hpp
    9999CreatorUnitTest_LDADD = \
    100100        ../Helpers/libCodePatterns-Helpers-debug.la
    … …  
    109109        ../Patterns/unittests/stubs/FactoryStub.cpp
    110110nodist_FactoryUnitTest_SOURCES = \
    111         ../Patterns/Factory.hpp \
    112         ../Patterns/FactoryTypeList.hpp \
    113         ../Patterns/Factory_impl.hpp
     111        $(top_srcdir)/src/CodePatterns/Factory.hpp \
     112        $(top_srcdir)/src/CodePatterns/FactoryTypeList.hpp \
     113        $(top_srcdir)/src/CodePatterns/Factory_impl.hpp
    114114FactoryUnitTest_LDADD = \
    115115        ../Helpers/libCodePatterns-Helpers-debug.la
    … …  
    123123        ../Patterns/unittests/stubs/ManipulableCloneStub.hpp
    124124nodist_ManipulableCloneUnitTest_SOURCES = \
    125         ../Patterns/ManipulableClone.hpp
     125        $(top_srcdir)/src/CodePatterns/ManipulableClone.hpp
    126126ManipulableCloneUnitTest_LDADD = \
    127127        ../Helpers/libCodePatterns-Helpers-debug.la
    … …  
    137137        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp
    138138nodist_ManipulablePrototypeFactoryUnitTest_SOURCES = \
    139         ../Patterns/ManipulablePrototypeFactory.hpp \
    140         ../Patterns/FactoryTypeList.hpp \
    141         ../Patterns/ManipulablePrototypeFactory_impl.hpp
     139        $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory.hpp \
     140        $(top_srcdir)/src/CodePatterns/FactoryTypeList.hpp \
     141        $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory_impl.hpp
    142142ManipulablePrototypeFactoryUnitTest_LDADD = \
    143143        ../Helpers/libCodePatterns-Helpers-debug.la
    … …  
    153153        ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp
    154154nodist_PrototypeFactoryUnitTest_SOURCES = \
    155         ../Patterns/PrototypeFactory.hpp \
    156         ../Patterns/FactoryTypeList.hpp \
    157         ../Patterns/PrototypeFactory_impl.hpp
     155        $(top_srcdir)/src/CodePatterns/PrototypeFactory.hpp \
     156        $(top_srcdir)/src/CodePatterns/FactoryTypeList.hpp \
     157        $(top_srcdir)/src/CodePatterns/PrototypeFactory_impl.hpp
    158158PrototypeFactoryUnitTest_LDADD = \
    159159        ../Helpers/libCodePatterns-Helpers-debug.la
    … …  
    167167        ../Patterns/unittests/stubs/RegistryStub.hpp
    168168nodist_RegistryUnitTest_SOURCES = \
    169         ../Patterns/unittests/Registry.hpp \
    170         ../Patterns/unittests/Registry_impl.hpp
     169        $(top_srcdir)/src/CodePatterns/Registry.hpp \
     170        $(top_srcdir)/src/CodePatterns/Registry_impl.hpp
    171171RegistryUnitTest_LDADD = \
    172172        ../Helpers/libCodePatterns-Helpers-debug.la

  • src/Patterns/unittests/ManipulableCloneUnitTest.cpp

    r3324cf r9b8fa4  
    2222#include <cppunit/ui/text/TestRunner.h>
    2323
    24 #include "Assert.hpp"
     24#include "CodePatterns/Assert.hpp"
    2525
    26 #include "ManipulableClone.hpp"
     26#include "CodePatterns/ManipulableClone.hpp"
    2727#include "stubs/ManipulableCloneStub.hpp"
    2828#include "stubs/CommonParametersStub.hpp"

  • src/Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp

    r3324cf r9b8fa4  
    1818#include <cppunit/extensions/TestFactoryRegistry.h>
    1919#include <cppunit/ui/text/TestRunner.h>
    20 #include "Assert.hpp"
     20#include "CodePatterns/Assert.hpp"
    2121
    2222#include "ManipulablePrototypeFactoryUnitTest.hpp"

  • src/Patterns/unittests/PrototypeFactoryUnitTest.cpp

    r3324cf r9b8fa4  
    1818#include <cppunit/extensions/TestFactoryRegistry.h>
    1919#include <cppunit/ui/text/TestRunner.h>
    20 #include "Assert.hpp"
     20#include "CodePatterns/Assert.hpp"
    2121
    2222#include "PrototypeFactoryUnitTest.hpp"

  • src/Patterns/unittests/RegistryUnitTest.cpp

    r3324cf r9b8fa4  
    2727#include "stubs/RegistryStub.hpp"
    2828
    29 #include "Assert.hpp"
     29#include "CodePatterns/Assert.hpp"
    3030
    3131#include "RegistryUnitTest.hpp"

  • src/Patterns/unittests/SingletonUnitTest.cpp

    r3324cf r9b8fa4  
    2525#include <iostream>
    2626
    27 #include "Singleton.hpp"
    28 #include "Singleton_impl.hpp"
     27#include "CodePatterns/Singleton.hpp"
     28#include "CodePatterns/Singleton_impl.hpp"
    2929
    3030#ifdef HAVE_TESTRUNNER

  • src/Patterns/unittests/stubs/CloneStub.hpp

    r3324cf r9b8fa4  
    1414#endif
    1515
    16 #include "Clone.hpp"
     16#include "CodePatterns/Clone.hpp"
    1717
    1818struct IPrototype

  • src/Patterns/unittests/stubs/CreatorStub.hpp

    r3324cf r9b8fa4  
    1616#include <typeinfo>
    1717
    18 #include "Creator.hpp"
     18#include "CodePatterns/Creator.hpp"
    1919
    2020class ICreatorStub {

  • src/Patterns/unittests/stubs/FactoryStub.cpp

    r3324cf r9b8fa4  
    1818#endif
    1919
    20 #include "Singleton_impl.hpp"
     20#include "CodePatterns/Singleton_impl.hpp"
    2121
    2222#include "CommonStub.hpp"
    … …  
    2525// has to be included BEFORE Factory_impl.hpp!
    2626#include "FactoryStub.def"
    27 #include "Factory_impl.hpp"
     27#include "CodePatterns/Factory_impl.hpp"
    2828
    2929

  • src/Patterns/unittests/stubs/FactoryStub.hpp

    r3324cf r9b8fa4  
    1818// triple has to be appear BEFORE Factory.hpp is included!
    1919#include "FactoryStub.def"
    20 #include "FactoryTypeList.hpp"
     20#include "CodePatterns/FactoryTypeList.hpp"
    2121#include "FactoryStub.undef"
    2222
    23 #include "Factory.hpp"
     23#include "CodePatterns/Factory.hpp"
    2424
    25 #include "Singleton.hpp"
     25#include "CodePatterns/Singleton.hpp"
    2626
    2727class FactoryStub :

  • src/Patterns/unittests/stubs/ManipulableCloneStub.hpp

    r3324cf r9b8fa4  
    1414#endif
    1515
    16 #include "ManipulableClone.hpp"
     16#include "CodePatterns/ManipulableClone.hpp"
    1717
    1818struct IManipulablePrototype

  • src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp

    r3324cf r9b8fa4  
    1818#endif
    1919
    20 #include "Singleton_impl.hpp"
     20#include "CodePatterns/Singleton_impl.hpp"
    2121
    2222#include "CommonStub.hpp"
    … …  
    2626// has to be included BEFORE ManipulablePrototypeFactory_impl.hpp!
    2727#include "ManipulablePrototypeFactoryStub.def"
    28 #include "ManipulablePrototypeFactory_impl.hpp"
     28#include "CodePatterns/ManipulablePrototypeFactory_impl.hpp"
    2929
    3030

  • src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp

    r3324cf r9b8fa4  
    2020// triple has to be appear BEFORE ManipulablePrototypeFactory.hpp is included!
    2121#include "ManipulablePrototypeFactoryStub.def"
    22 #include "FactoryTypeList.hpp"
     22#include "CodePatterns/FactoryTypeList.hpp"
    2323#include "ManipulablePrototypeFactoryStub.undef"
    2424
    25 #include "ManipulablePrototypeFactory.hpp"
     25#include "CodePatterns/ManipulablePrototypeFactory.hpp"
    2626
    27 #include "Singleton.hpp"
     27#include "CodePatterns/Singleton.hpp"
    2828
    2929class ManipulablePrototypeFactoryStub :

  • src/Patterns/unittests/stubs/PrototypeFactoryStub.cpp

    r3324cf r9b8fa4  
    1818#endif
    1919
    20 #include "Singleton_impl.hpp"
     20#include "CodePatterns/Singleton_impl.hpp"
    2121
    2222#include "CommonStub.hpp"
    … …  
    2525// has to be included BEFORE PrototypeFactory_impl.hpp!
    2626#include "PrototypeFactoryStub.def"
    27 #include "PrototypeFactory_impl.hpp"
     27#include "CodePatterns/PrototypeFactory_impl.hpp"
    2828
    2929

  • src/Patterns/unittests/stubs/PrototypeFactoryStub.hpp

    r3324cf r9b8fa4  
    1818// triple has to be appear BEFORE PrototypeFactory.hpp is included!
    1919#include "PrototypeFactoryStub.def"
    20 #include "FactoryTypeList.hpp"
     20#include "CodePatterns/FactoryTypeList.hpp"
    2121#include "PrototypeFactoryStub.undef"
    2222
    23 #include "PrototypeFactory.hpp"
     23#include "CodePatterns/PrototypeFactory.hpp"
    2424
    25 #include "Singleton.hpp"
     25#include "CodePatterns/Singleton.hpp"
    2626
    2727class PrototypeFactoryStub :

  • src/Patterns/unittests/stubs/RegistryStub.cpp

    r3324cf r9b8fa4  
    2121#include "RegistryStub.hpp"
    2222
    23 #include "Registry_impl.hpp"
     23#include "CodePatterns/Registry_impl.hpp"
    2424
    2525RegistryStub::RegistryStub()

  • src/Patterns/unittests/stubs/RegistryStub.hpp

    r3324cf r9b8fa4  
    1010
    1111#include "CommonNamedStub.hpp"
    12 #include "Registry.hpp"
     12#include "CodePatterns/Registry.hpp"
    1313
    1414class RegistryStub : public Registry<teststubs::INamedclass>
Note: See TracChangeset for help on using the changeset viewer.