changes according to coding conventions

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCGlobalMergerComponent.h

diff --git a/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h b/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h
index 9ce9786c3acc45e320da2b9dd8d21b96ad69139d..97722c95ba14904e135958615edc51504a64e650 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h
+++ b/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h
@@ -25,8 +25,8 @@ class AliHLTTPCGlobalMergerComponent : public AliHLTProcessor
        // These functions are required for the registration process
 
        const char* GetComponentID();
-       void GetInputDataTypes( vector<AliHLTComponent_DataType>& list);
-       AliHLTComponent_DataType GetOutputDataType();
+       void GetInputDataTypes( vector<AliHLTComponentDataType>& list);
+       AliHLTComponentDataType GetOutputDataType();
        virtual void GetOutputDataSize( unsigned long& constBase, double& inputMultiplier );
        AliHLTComponent* Spawn();
        
@@ -41,9 +41,9 @@ class AliHLTTPCGlobalMergerComponent : public AliHLTProcessor
 
        int DoInit( int argc, const char** argv );
        int DoDeinit();
-       int DoEvent( const AliHLTComponent_EventData& evtData, const AliHLTComponent_BlockData* blocks, 
-                    AliHLTComponent_TriggerData& trigData, AliHLTUInt8_t* outputPtr, 
-                    AliHLTUInt32_t& size, vector<AliHLTComponent_BlockData>& outputBlocks );
+       int DoEvent( const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks, 
+                    AliHLTComponentTriggerData& trigData, AliHLTUInt8_t* outputPtr, 
+                    AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks );
        
     private:
 
@@ -53,9 +53,9 @@ class AliHLTTPCGlobalMergerComponent : public AliHLTProcessor
        struct SliceData
            {
                int fSlice;
-               const AliHLTComponent_BlockData* fVertexBlock;
+               const AliHLTComponentBlockData* fVertexBlock;
                unsigned fVertexBlockIndex;
-               const AliHLTComponent_BlockData* fTrackletBlock;
+               const AliHLTComponentBlockData* fTrackletBlock;
                unsigned fTrackletBlockIndex;
            };