Reformatting code using Kernighan & Ritchie style, tabs, tab width=4.
Command line: astyle --style=kr --indent=force-tab=4 --lineend=linux -n -r <file names>
This commit is contained in:
lotodore
+158
-148
@@ -43,15 +43,14 @@ using namespace std;
|
||||
CleanerConfig::CleanerConfig()
|
||||
{
|
||||
// !!!! Revisionsnummer der Configdefaults !!!!!
|
||||
configRev = 8;
|
||||
|
||||
configRev = 8;
|
||||
|
||||
// Pfad und Dateinamen setzen
|
||||
#ifdef _WIN32
|
||||
const char *appDataPath = getenv("AppData");
|
||||
if (appDataPath && appDataPath[0] != 0) {
|
||||
configFileName = appDataPath;
|
||||
}
|
||||
else {
|
||||
configFileName = appDataPath;
|
||||
} else {
|
||||
const int MaxPathSize = 1024;
|
||||
char curDir[MaxPathSize + 1];
|
||||
curDir[0] = 0;
|
||||
@@ -67,8 +66,7 @@ CleanerConfig::CleanerConfig()
|
||||
// Datei wieder loeschen.
|
||||
tmpFile.close();
|
||||
remove((configFileName + "\\" + tmpFileName).c_str());
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Fehlgeschlagen, Verzeichnis nicht beschreibbar
|
||||
curDir[0] = 0;
|
||||
GetTempPathA(MaxPathSize, curDir);
|
||||
@@ -81,12 +79,12 @@ CleanerConfig::CleanerConfig()
|
||||
////define log-dir
|
||||
// logDir = configFileName;
|
||||
// logDir += "log-files\\";
|
||||
|
||||
|
||||
//create directories on first start of app
|
||||
mkdir(configFileName.c_str());
|
||||
// mkdir(logDir.c_str());
|
||||
|
||||
|
||||
|
||||
|
||||
#else
|
||||
//define app-dir
|
||||
const char *homePath = getenv("HOME");
|
||||
@@ -99,9 +97,9 @@ CleanerConfig::CleanerConfig()
|
||||
//create directories on first start of app
|
||||
mkdir(configFileName.c_str(), MODUS) ;
|
||||
// mkdir(logDir.c_str(), MODUS);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
string userDir = configFileName.c_str();
|
||||
@@ -116,15 +114,15 @@ CleanerConfig::CleanerConfig()
|
||||
configList.push_back(ConfigInfo("DefaultListenPort", CONFIG_TYPE_STRING, "4327"));
|
||||
configList.push_back(ConfigInfo("ClientAuthString", CONFIG_TYPE_STRING, ""));
|
||||
configList.push_back(ConfigInfo("ServerAuthString", CONFIG_TYPE_STRING, ""));
|
||||
|
||||
|
||||
configList.push_back(ConfigInfo("WarnLevelToKick", CONFIG_TYPE_INT, "2"));
|
||||
configList.push_back(ConfigInfo("TextFloodLevelToTrigger", CONFIG_TYPE_INT, "3"));
|
||||
configList.push_back(ConfigInfo("CapsFloodCapsNumberToTrigger", CONFIG_TYPE_INT, "10"));
|
||||
configList.push_back(ConfigInfo("LetterRepeatingNumberToTrigger", CONFIG_TYPE_INT, "10"));
|
||||
|
||||
configList.push_back(ConfigInfo("KickNumberToBan", CONFIG_TYPE_INT, "2"));
|
||||
configList.push_back(ConfigInfo("SecondsToForgetAboutKick", CONFIG_TYPE_INT, "1800"));
|
||||
|
||||
configList.push_back(ConfigInfo("KickNumberToBan", CONFIG_TYPE_INT, "2"));
|
||||
configList.push_back(ConfigInfo("SecondsToForgetAboutKick", CONFIG_TYPE_INT, "1800"));
|
||||
|
||||
list<string> badWordsList;
|
||||
badWordsList.push_back("arsch");
|
||||
badWordsList.push_back("asshole");
|
||||
@@ -169,38 +167,39 @@ CleanerConfig::CleanerConfig()
|
||||
urlStringsList.push_back(".org");
|
||||
urlStringsList.push_back(".de");
|
||||
configList.push_back(ConfigInfo("UrlStringsList", CONFIG_TYPE_STRING_LIST, "UrlStrings", urlStringsList));
|
||||
|
||||
|
||||
list<string> urlExceptionStringsList;
|
||||
urlExceptionStringsList.push_back("http://www.esl.");
|
||||
urlExceptionStringsList.push_back("http://www.pokerth.net");
|
||||
urlExceptionStringsList.push_back("pokerth.net");
|
||||
configList.push_back(ConfigInfo("UrlExceptionStringsList", CONFIG_TYPE_STRING_LIST, "UrlExceptionStrings", urlExceptionStringsList));
|
||||
|
||||
|
||||
//fill tempList firstTime
|
||||
configBufferList = configList;
|
||||
|
||||
configFileName += "cleanerconfig.xml";
|
||||
|
||||
//Prüfen ob Configfile existiert --> sonst anlegen
|
||||
TiXmlDocument doc(configFileName);
|
||||
if(!doc.LoadFile()){
|
||||
myConfigState = NONEXISTING;
|
||||
updateConfig(myConfigState);
|
||||
}
|
||||
else {
|
||||
//Check if config revision is ok. Otherwise --> update()
|
||||
int tempRevision = 0;
|
||||
|
||||
TiXmlHandle docHandle( &doc );
|
||||
TiXmlElement* confRevision = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( "ConfigRevision" ).ToElement();
|
||||
if ( confRevision ) { confRevision->QueryIntAttribute("value", &tempRevision ); }
|
||||
|
||||
if (tempRevision < configRev ) { /*löschen()*/
|
||||
//Prüfen ob Configfile existiert --> sonst anlegen
|
||||
TiXmlDocument doc(configFileName);
|
||||
if(!doc.LoadFile()) {
|
||||
myConfigState = NONEXISTING;
|
||||
updateConfig(myConfigState);
|
||||
} else {
|
||||
//Check if config revision is ok. Otherwise --> update()
|
||||
int tempRevision = 0;
|
||||
|
||||
TiXmlHandle docHandle( &doc );
|
||||
TiXmlElement* confRevision = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( "ConfigRevision" ).ToElement();
|
||||
if ( confRevision ) {
|
||||
confRevision->QueryIntAttribute("value", &tempRevision );
|
||||
}
|
||||
|
||||
if (tempRevision < configRev ) { /*löschen()*/
|
||||
myConfigState = OLD;
|
||||
updateConfig(myConfigState) ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
fillBuffer();
|
||||
}
|
||||
@@ -211,20 +210,21 @@ CleanerConfig::~CleanerConfig()
|
||||
}
|
||||
|
||||
|
||||
void CleanerConfig::fillBuffer() {
|
||||
void CleanerConfig::fillBuffer()
|
||||
{
|
||||
|
||||
string tempString1("");
|
||||
string tempString2("");
|
||||
|
||||
TiXmlDocument doc(configFileName);
|
||||
|
||||
TiXmlDocument doc(configFileName);
|
||||
|
||||
if(doc.LoadFile()) {
|
||||
TiXmlHandle docHandle( &doc );
|
||||
TiXmlHandle docHandle( &doc );
|
||||
|
||||
for (size_t i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
|
||||
TiXmlElement* conf = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
|
||||
|
||||
|
||||
if ( conf ) {
|
||||
|
||||
const char *tmpStr1 = conf->Attribute("value");
|
||||
@@ -233,38 +233,40 @@ void CleanerConfig::fillBuffer() {
|
||||
|
||||
const char *tmpStr2 = conf->Attribute("type");
|
||||
if (tmpStr2) {
|
||||
tempString2 = tmpStr2;
|
||||
tempString2 = tmpStr2;
|
||||
if(tempString2 == "list") {
|
||||
|
||||
|
||||
list<string> tempStringList2;
|
||||
|
||||
TiXmlElement* confList = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).FirstChild().ToElement();
|
||||
|
||||
|
||||
for( ; confList; confList=confList->NextSiblingElement()) {
|
||||
tempStringList2.push_back(confList->Attribute("value"));
|
||||
}
|
||||
|
||||
|
||||
configBufferList[i].defaultListValue = tempStringList2;
|
||||
}
|
||||
}
|
||||
}
|
||||
else { qDebug("Could not find the root element in the config file!"); }
|
||||
} else {
|
||||
qDebug("Could not find the root element in the config file!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CleanerConfig::writeBuffer() const {
|
||||
void CleanerConfig::writeBuffer() const
|
||||
{
|
||||
|
||||
TiXmlDocument doc;
|
||||
TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", "");
|
||||
doc.LinkEndChild( decl );
|
||||
|
||||
TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );
|
||||
doc.LinkEndChild( root );
|
||||
|
||||
TiXmlDocument doc;
|
||||
TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", "");
|
||||
doc.LinkEndChild( decl );
|
||||
|
||||
TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );
|
||||
doc.LinkEndChild( root );
|
||||
|
||||
TiXmlElement * config;
|
||||
config = new TiXmlElement( "Configuration" );
|
||||
root->LinkEndChild( config );
|
||||
config = new TiXmlElement( "Configuration" );
|
||||
root->LinkEndChild( config );
|
||||
|
||||
size_t i;
|
||||
|
||||
@@ -272,42 +274,43 @@ void CleanerConfig::writeBuffer() const {
|
||||
TiXmlElement *tmpElement = new TiXmlElement(configBufferList[i].name);
|
||||
config->LinkEndChild( tmpElement );
|
||||
tmpElement->SetAttribute("value", configBufferList[i].defaultValue);
|
||||
|
||||
|
||||
if(configBufferList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) {
|
||||
|
||||
tmpElement->SetAttribute("type", "list");
|
||||
list<string> tempList = configBufferList[i].defaultListValue;
|
||||
list<string>::iterator it;
|
||||
for(it = tempList.begin(); it != tempList.end(); ++it) {
|
||||
|
||||
|
||||
TiXmlElement *tmpSubElement = new TiXmlElement(configBufferList[i].defaultValue);
|
||||
tmpElement->LinkEndChild( tmpSubElement );
|
||||
tmpSubElement->SetAttribute("value", *it);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
doc.SaveFile( configFileName );
|
||||
|
||||
}
|
||||
|
||||
void CleanerConfig::updateConfig(ConfigState myConfigState) {
|
||||
void CleanerConfig::updateConfig(ConfigState myConfigState)
|
||||
{
|
||||
|
||||
size_t i;
|
||||
|
||||
|
||||
if(myConfigState == NONEXISTING) {
|
||||
|
||||
|
||||
//Create a new ConfigFile!
|
||||
TiXmlDocument doc;
|
||||
TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", "");
|
||||
doc.LinkEndChild( decl );
|
||||
|
||||
TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );
|
||||
doc.LinkEndChild( root );
|
||||
|
||||
TiXmlDocument doc;
|
||||
TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", "");
|
||||
doc.LinkEndChild( decl );
|
||||
|
||||
TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );
|
||||
doc.LinkEndChild( root );
|
||||
|
||||
TiXmlElement * config;
|
||||
config = new TiXmlElement( "Configuration" );
|
||||
root->LinkEndChild( config );
|
||||
config = new TiXmlElement( "Configuration" );
|
||||
root->LinkEndChild( config );
|
||||
|
||||
for (i=0; i<configList.size(); i++) {
|
||||
TiXmlElement *tmpElement = new TiXmlElement(configList[i].name);
|
||||
@@ -320,7 +323,7 @@ void CleanerConfig::updateConfig(ConfigState myConfigState) {
|
||||
list<string> tempList = configList[i].defaultListValue;
|
||||
list<string>::iterator it;
|
||||
for(it = tempList.begin(); it != tempList.end(); ++it) {
|
||||
|
||||
|
||||
TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
|
||||
tmpElement->LinkEndChild( tmpSubElement );
|
||||
tmpSubElement->SetAttribute("value", *it);
|
||||
@@ -328,77 +331,77 @@ void CleanerConfig::updateConfig(ConfigState myConfigState) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
doc.SaveFile( configFileName );
|
||||
}
|
||||
|
||||
|
||||
if(myConfigState == OLD) {
|
||||
|
||||
TiXmlDocument oldDoc(configFileName);
|
||||
|
||||
|
||||
TiXmlDocument oldDoc(configFileName);
|
||||
|
||||
//load the old one
|
||||
if(oldDoc.LoadFile()) {
|
||||
|
||||
string tempString1("");
|
||||
string tempString2("");
|
||||
|
||||
TiXmlDocument newDoc;
|
||||
|
||||
//Create the new one
|
||||
TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", "");
|
||||
newDoc.LinkEndChild( decl );
|
||||
|
||||
TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );
|
||||
newDoc.LinkEndChild( root );
|
||||
|
||||
TiXmlElement * config;
|
||||
config = new TiXmlElement( "Configuration" );
|
||||
root->LinkEndChild( config );
|
||||
|
||||
//change configRev and AppDataPath
|
||||
TiXmlElement * confElement0 = new TiXmlElement( "ConfigRevision" );
|
||||
string tempString1("");
|
||||
string tempString2("");
|
||||
|
||||
TiXmlDocument newDoc;
|
||||
|
||||
//Create the new one
|
||||
TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", "");
|
||||
newDoc.LinkEndChild( decl );
|
||||
|
||||
TiXmlElement * root = new TiXmlElement( "PokerTHCleaner" );
|
||||
newDoc.LinkEndChild( root );
|
||||
|
||||
TiXmlElement * config;
|
||||
config = new TiXmlElement( "Configuration" );
|
||||
root->LinkEndChild( config );
|
||||
|
||||
//change configRev and AppDataPath
|
||||
TiXmlElement * confElement0 = new TiXmlElement( "ConfigRevision" );
|
||||
config->LinkEndChild( confElement0 );
|
||||
confElement0->SetAttribute("value", configRev);
|
||||
|
||||
TiXmlHandle oldDocHandle( &oldDoc );
|
||||
TiXmlHandle oldDocHandle( &oldDoc );
|
||||
|
||||
for (i=0; i<configList.size(); i++) {
|
||||
for (i=0; i<configList.size(); i++) {
|
||||
|
||||
TiXmlElement* oldConf = oldDocHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
|
||||
|
||||
|
||||
if ( oldConf ) {
|
||||
// if element is already there --> take over the saved values
|
||||
|
||||
// if element is already there --> take over the saved values
|
||||
|
||||
if(configList[i].name != "ConfigRevision") {
|
||||
// dont update ConfigRevision because it was already set ^
|
||||
|
||||
// dont update ConfigRevision because it was already set ^
|
||||
|
||||
TiXmlElement *tmpElement = new TiXmlElement(configList[i].name);
|
||||
config->LinkEndChild( tmpElement );
|
||||
|
||||
|
||||
const char *tmpStr1 = oldConf->Attribute("value");
|
||||
if (tmpStr1) tempString1 = tmpStr1;
|
||||
tmpElement->SetAttribute("value", tempString1);
|
||||
|
||||
|
||||
//for lists copy elements
|
||||
const char *tmpStr2 = oldConf->Attribute("type");
|
||||
if (tmpStr2) {
|
||||
tempString2 = tmpStr2;
|
||||
tempString2 = tmpStr2;
|
||||
if(tempString2 == "list") {
|
||||
|
||||
|
||||
list<string> tempStringList2;
|
||||
|
||||
|
||||
TiXmlElement* oldConfList = oldDocHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).FirstChild().ToElement();
|
||||
|
||||
|
||||
for( ; oldConfList; oldConfList=oldConfList->NextSiblingElement()) {
|
||||
tempStringList2.push_back(oldConfList->Attribute("value"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
tmpElement->SetAttribute("type", "list");
|
||||
list<string> tempList = tempStringList2;
|
||||
list<string>::iterator it;
|
||||
for(it = tempList.begin(); it != tempList.end(); ++it) {
|
||||
|
||||
|
||||
TiXmlElement *tmpSubElement = new TiXmlElement(tempString1);
|
||||
tmpElement->LinkEndChild( tmpSubElement );
|
||||
tmpSubElement->SetAttribute("value", *it);
|
||||
@@ -406,32 +409,32 @@ void CleanerConfig::updateConfig(ConfigState myConfigState) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// if element is not there --> set it with defaultValue
|
||||
TiXmlElement *tmpElement = new TiXmlElement(configList[i].name);
|
||||
config->LinkEndChild( tmpElement );
|
||||
tmpElement->SetAttribute("value", stringToUtf8(configList[i].defaultValue));
|
||||
|
||||
|
||||
if(configList[i].type == CONFIG_TYPE_INT_LIST || configList[i].type == CONFIG_TYPE_STRING_LIST) {
|
||||
|
||||
|
||||
tmpElement->SetAttribute("type", "list");
|
||||
list<string> tempList = configList[i].defaultListValue;
|
||||
list<string>::iterator it;
|
||||
for(it = tempList.begin(); it != tempList.end(); ++it) {
|
||||
|
||||
|
||||
TiXmlElement *tmpSubElement = new TiXmlElement(configList[i].defaultValue);
|
||||
tmpElement->LinkEndChild( tmpSubElement );
|
||||
tmpSubElement->SetAttribute("value", *it);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
newDoc.SaveFile( configFileName );
|
||||
} else {
|
||||
qDebug("Cannot update config file: Unable to load configuration.");
|
||||
}
|
||||
else { qDebug("Cannot update config file: Unable to load configuration."); }
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -441,15 +444,15 @@ string CleanerConfig::readConfigString(string varName) const
|
||||
size_t i;
|
||||
string tempString("");
|
||||
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
if (configBufferList[i].name == varName) {
|
||||
tempString = configBufferList[i].defaultValue;
|
||||
tempString = configBufferList[i].defaultValue;
|
||||
}
|
||||
}
|
||||
|
||||
return tempString;
|
||||
}
|
||||
}
|
||||
|
||||
int CleanerConfig::readConfigInt(string varName) const
|
||||
{
|
||||
@@ -458,35 +461,35 @@ int CleanerConfig::readConfigInt(string varName) const
|
||||
string tempString("");
|
||||
int tempInt=0;
|
||||
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
if (configBufferList[i].name == varName) {
|
||||
tempString = configBufferList[i].defaultValue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
istringstream isst;
|
||||
isst.str (tempString);
|
||||
isst >> tempInt;
|
||||
|
||||
|
||||
return tempInt;
|
||||
}
|
||||
|
||||
list<string> CleanerConfig::readConfigStringList(string varName) const
|
||||
{
|
||||
|
||||
size_t i;
|
||||
size_t i;
|
||||
list<string> tempStringList;
|
||||
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
if (configBufferList[i].name == varName) {
|
||||
tempStringList = configBufferList[i].defaultListValue;
|
||||
tempStringList = configBufferList[i].defaultListValue;
|
||||
}
|
||||
}
|
||||
|
||||
return tempStringList;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
list<int> CleanerConfig::readConfigIntList(string varName) const
|
||||
@@ -496,19 +499,19 @@ list<int> CleanerConfig::readConfigIntList(string varName) const
|
||||
list<string> tempStringList;
|
||||
list<int> tempIntList;
|
||||
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
if (configBufferList[i].name == varName) {
|
||||
tempStringList = configBufferList[i].defaultListValue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
istringstream isst;
|
||||
string tempString;
|
||||
int tempInt;
|
||||
list<string>::iterator it;
|
||||
for(it = tempStringList.begin(); it != tempStringList.end(); ++it) {
|
||||
|
||||
|
||||
isst.str(*it);
|
||||
isst >> tempInt;
|
||||
tempIntList.push_back(tempInt);
|
||||
@@ -527,11 +530,11 @@ void CleanerConfig::writeConfigInt(string varName, int varCont)
|
||||
string tempString;
|
||||
ostringstream intToString;
|
||||
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
if (configBufferList[i].name == varName) {
|
||||
intToString << varCont;
|
||||
configBufferList[i].defaultValue = intToString.str();
|
||||
configBufferList[i].defaultValue = intToString.str();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -544,20 +547,20 @@ void CleanerConfig::writeConfigIntList(string varName, list<int> varCont)
|
||||
ostringstream intToString;
|
||||
list<string> stringList;
|
||||
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
if (configBufferList[i].name == varName) {
|
||||
string tempString;
|
||||
list<int>::iterator it;
|
||||
for(it = varCont.begin(); it != varCont.end(); ++it) {
|
||||
|
||||
intToString << (*it);
|
||||
|
||||
intToString << (*it);
|
||||
stringList.push_back(intToString.str());
|
||||
intToString.str("");
|
||||
intToString.clear();
|
||||
}
|
||||
|
||||
configBufferList[i].defaultListValue = stringList;
|
||||
|
||||
configBufferList[i].defaultListValue = stringList;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -568,11 +571,11 @@ void CleanerConfig::writeConfigStringList(string varName, list<string> varCont)
|
||||
size_t i;
|
||||
list<string> stringList;
|
||||
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
|
||||
if (configBufferList[i].name == varName) {
|
||||
|
||||
configBufferList[i].defaultListValue = varCont;
|
||||
|
||||
configBufferList[i].defaultListValue = varCont;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -581,23 +584,30 @@ void CleanerConfig::writeConfigString(string varName, string varCont)
|
||||
{
|
||||
|
||||
size_t i;
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
if (configBufferList[i].name == varName) { configBufferList[i].defaultValue = varCont; }
|
||||
for (i=0; i<configBufferList.size(); i++) {
|
||||
if (configBufferList[i].name == varName) {
|
||||
configBufferList[i].defaultValue = varCont;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
std::string CleanerConfig::stringToUtf8(const std::string &myString) {
|
||||
std::string CleanerConfig::stringToUtf8(const std::string &myString)
|
||||
{
|
||||
|
||||
QString tmpString = QString::fromStdString(myString);
|
||||
std::string myUtf8String = tmpString.toUtf8().constData();
|
||||
|
||||
|
||||
return myUtf8String;
|
||||
}
|
||||
|
||||
std::string CleanerConfig::stringFromUtf8(const std::string &myString) {
|
||||
std::string CleanerConfig::stringFromUtf8(const std::string &myString)
|
||||
{
|
||||
QString tmpString = QString::fromUtf8(myString.c_str());
|
||||
|
||||
|
||||
return tmpString.toStdString();
|
||||
}
|
||||
|
||||
std::string CleanerConfig::getDefaultLanguage() { return QLocale::system().name().toStdString(); }
|
||||
std::string CleanerConfig::getDefaultLanguage()
|
||||
{
|
||||
return QLocale::system().name().toStdString();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user