From: tho Date: Thu, 18 Dec 2008 13:30:45 +0000 (+0000) Subject: replaced some tabs with spaces X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=bdcb3db7ad903521f6dd8365b4208f163e0e61f5;p=senf.git replaced some tabs with spaces git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1024 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Packets/80211Bundle/RadiotapPacket.test.cc b/Packets/80211Bundle/RadiotapPacket.test.cc index b94efc4..99aeb4a 100644 --- a/Packets/80211Bundle/RadiotapPacket.test.cc +++ b/Packets/80211Bundle/RadiotapPacket.test.cc @@ -34,7 +34,7 @@ BOOST_AUTO_UNIT_TEST(RadiotapPacket_packet) /* used madwifi 0.9.4 */ unsigned char data[] = { 0x00 ,0x00 ,0x1a ,0x00, 0x6f, 0x18, 0x00, 0x00, - 0x02, 0xe6, 0x8a, 0xdf, 0x12, 0x00, 0x00, 0x00, + 0x02, 0xe6, 0x8a, 0xdf, 0x12, 0x00, 0x00, 0x00, 0x12, 0x0c, 0xc8, 0x14, 0x40, 0x01, 0xc3, 0xa0, 0x02, 0x23 }; diff --git a/Socket/Protocols/DVB/DVBConfigParser.hh b/Socket/Protocols/DVB/DVBConfigParser.hh index 9a1f684..da2a91a 100644 --- a/Socket/Protocols/DVB/DVBConfigParser.hh +++ b/Socket/Protocols/DVB/DVBConfigParser.hh @@ -1,4 +1,4 @@ -// $Id: DVBConfigParser.hh 965 2008-11-18 16:04:20Z g0dil $ +// $Id$ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) @@ -23,8 +23,8 @@ /** \file \brief DVBDemuxHandles public header */ -#ifndef DVBCONFIGPARSER_HH_ -#define DVBCONFIGPARSER_HH_ +#ifndef HH_SENF_Socket_Protocols_DVB_DVBConfigParser_ +#define HH_SENF_Socket_Protocols_DVB_DVBConfigParser_ 1 #include #include @@ -34,10 +34,12 @@ #include #include #include + namespace senf { -class DVBConfigParser -{ - struct DVBParams { + + class DVBConfigParser + { + struct DVBParams { std::map inversion; std::map bandwidth; std::map code_rate; @@ -45,29 +47,29 @@ class DVBConfigParser std::map hierarchy; std::map modulation; std::map transmit_mode; - DVBParams(); }; - static const DVBParams params; - typedef boost::tokenizer > tokenizer; + DVBParams(); + }; + static const DVBParams params; + typedef boost::tokenizer > tokenizer; - -public: - DVBConfigParser(fe_type_t type_, const std::string & configFilePath = ""); - ~DVBConfigParser(); + public: + DVBConfigParser(fe_type_t type_, const std::string & configFilePath = ""); + ~DVBConfigParser(); - std::string getConfigLine(std::string channel); + std::string getConfigLine(std::string channel); - dvb_frontend_parameters getFrontendParam(std::string configLine); - -private: + dvb_frontend_parameters getFrontendParam(std::string configLine); - fe_type_t type; - std::ifstream configFile; - void initConfigFile(std::string _configFilePath); - - dvb_frontend_parameters getFrontendParamDVB_T( const tokenizer & tokens); - dvb_frontend_parameters getFrontendParamDVB_C( const tokenizer & tokens); - dvb_frontend_parameters getFrontendParamDVB_S( const tokenizer & tokens); + private: + fe_type_t type; + std::ifstream configFile; + void initConfigFile(std::string _configFilePath); + + dvb_frontend_parameters getFrontendParamDVB_T( const tokenizer & tokens); + dvb_frontend_parameters getFrontendParamDVB_C( const tokenizer & tokens); + dvb_frontend_parameters getFrontendParamDVB_S( const tokenizer & tokens); -}; + }; } -#endif /*DVBCONFIGPARSER_H_*/ + +#endif