From c6f97368923a6a0ace72176aae0abce8f0881e28 Mon Sep 17 00:00:00 2001
From: tho <tho@wiback.org>
Date: Thu, 18 Dec 2008 13:30:45 +0000
Subject: [PATCH] replaced some tabs with spaces
---
Packets/80211Bundle/RadiotapPacket.test.cc | 2 +-
Socket/Protocols/DVB/DVBConfigParser.hh | 54 +++++++++++-----------
2 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/Packets/80211Bundle/RadiotapPacket.test.cc b/Packets/80211Bundle/RadiotapPacket.test.cc
index b94efc47d..99aeb4afe 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 9a1f68442..da2a91a18 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 <string>
#include <vector>
@@ -34,10 +34,12 @@
#include <fstream>
#include <boost/tokenizer.hpp>
#include <linux/dvb/frontend.h>
+
namespace senf {
-class DVBConfigParser
-{
- struct DVBParams {
+
+ class DVBConfigParser
+ {
+ struct DVBParams {
std::map<std::string, fe_spectral_inversion_t> inversion;
std::map<std::string, fe_bandwidth_t> bandwidth;
std::map<std::string, fe_code_rate_t> code_rate;
@@ -45,29 +47,29 @@ class DVBConfigParser
std::map<std::string, fe_hierarchy_t> hierarchy;
std::map<std::string, fe_modulation_t> modulation;
std::map<std::string, fe_transmit_mode_t> transmit_mode;
- DVBParams(); };
- static const DVBParams params;
- typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+ DVBParams();
+ };
+ static const DVBParams params;
+ typedef boost::tokenizer<boost::char_separator<char> > 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
--
GitLab