From b83c86d8879eeac59b76d9d9ae0652b2cc9b375e Mon Sep 17 00:00:00 2001 From: lotodore Date: Tue, 22 May 2007 22:40:44 +0000 Subject: [PATCH] Do not globally use namespace std. --- src/config/configfile.cpp | 10 ++++++++++ src/config/configfile.h | 26 ++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 2c19f260..84c1c28e 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -28,6 +28,16 @@ #include #endif +#include +#include +#include +#include + +#include +#include + +using namespace std; + class QtToolsWrapper; diff --git a/src/config/configfile.h b/src/config/configfile.h index 429801de..2351b1ac 100644 --- a/src/config/configfile.h +++ b/src/config/configfile.h @@ -21,41 +21,31 @@ #define CONFIGFILE_H #include "tinyxml.h" -#include -#include -#include -#include -#include #include - -#include -#include +#include #include - -using namespace std; - enum ConfigState { NONEXISTING, OLD }; enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING }; class ConfigFile{ public: - ConfigFile(int, char **); + ConfigFile(int, char **); - ~ConfigFile(); + ~ConfigFile(); void fillBuffer(); void updateConfig(ConfigState); std::string readConfigString(std::string varName); - void writeConfigString(std::string varName, std::string varCont); - + void writeConfigString(std::string varName, std::string varCont); + int readConfigInt(std::string varName); void writeConfigInt(std::string varName, int varCont); - + private: @@ -68,8 +58,8 @@ private: std::string defaultValue; }; - vector configList; - vector configBufferList; + std::vector configList; + std::vector configBufferList; std::string configFileName; std::string logDir;