Changeset 196 in pacpusframework


Ignore:
Timestamp:
Oct 25, 2013, 11:12:25 AM (11 years ago)
Author:
Marek Kurdej
Message:

Fixed: using auto-generated PacpusLibConfig.h instead of pacpus.h.

Location:
trunk/include/Pacpus/kernel
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/Pacpus/kernel/ComponentBase.h

    r195 r196  
    2727// InputOutputInterface.h must be included, otherwise we could not use addInput, addOutput template methods
    2828#include <Pacpus/kernel/InputOutputInterface.h>
    29 #include <Pacpus/kernel/pacpus.h>
     29#include <Pacpus/kernel/PacpusLibConfig.h>
    3030#include <Pacpus/kernel/XmlComponentConfig.h>
    3131

  • trunk/include/Pacpus/kernel/ComponentFactoryBase.h

    r89 r196  
    1616#define DEF_PACPUS_COMPONENTFACTORYBASE_H
    1717
    18 #include <Pacpus/kernel/pacpus.h>
     18#include <Pacpus/kernel/PacpusLibConfig.h>
    1919
    2020class QString;

  • trunk/include/Pacpus/kernel/ConnectionBase.h

    r182 r196  
    22#define CONNECTIONBASE_H
    33
    4 #include <Pacpus/kernel/pacpus.h>
     4#include <Pacpus/kernel/PacpusLibConfig.h>
    55
    66namespace pacpus {
    … …  
    1414    virtual ~ConnectionBase();
    1515
    16     AbstractInterface *  getInterface() const;
     16    AbstractInterface * getInterface() const;
    1717    int getPriority() const;
    1818    bool operator==(ConnectionBase const & c);

  • trunk/include/Pacpus/kernel/Log.h

    r176 r196  
    1515#define DEF_PACPUS_LOG_H
    1616
    17 // Includes, pacpus.
    18 #include <Pacpus/kernel/pacpus.h>
     17#include <Pacpus/kernel/PacpusLibConfig.h>
    1918
    2019namespace pacpus {

  • trunk/include/Pacpus/kernel/PacpusEvent.h

    r153 r196  
    22#define PACPUS_EVENT_H
    33
     4#include <Pacpus/kernel/PacpusLibConfig.h>
     5#include <Pacpus/kernel/road_time.h>
     6
    47#include <algorithm>
    5 #include <Pacpus/kernel/road_time.h>
    6 #include <Pacpus/kernel/pacpus.h>
    78#include <QDataStream>
    89#include <QEvent>

  • trunk/include/Pacpus/kernel/XmlComponentConfig.h

    r176 r196  
    1616#define DEF_PACPUS_XMLCOMPONENTCONFIG_H
    1717
    18 #include <Pacpus/kernel/pacpus.h>
     18#include <Pacpus/kernel/PacpusLibConfig.h>
    1919
    2020#include <QDomElement>

  • trunk/include/Pacpus/kernel/pacpus.h

    r181 r196  
    2323#ifndef PACPUS_PI
    2424#   define PACPUS_PI       3.1415926
    25 #endif
    26 
    27 /// Export macro for PacpusLib DLL for Windows only
    28 #ifdef WIN32
    29 #   ifdef PACPUSLIB_EXPORTS
    30 //  make DLL
    31 #       define PACPUSLIB_API __declspec(dllexport)
    32 #   else
    33 //      use DLL
    34 #       define PACPUSLIB_API __declspec(dllimport)
    35 #   endif
    36 #else
    37 //  On other platforms, simply ignore this
    38 #   define PACPUSLIB_API
    3925#endif
    4026
Note: See TracChangeset for help on using the changeset viewer.