Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: adchpp: [94] adchpp/trunk
|
From: <arn...@us...> - 2007-11-18 20:59:02
|
Revision: 94
http://adchpp.svn.sourceforge.net/adchpp/?rev=94&view=rev
Author: arnetheduck
Date: 2007-11-18 12:58:59 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Remove StringDefs etc in preparation for gettext
Modified Paths:
--------------
adchpp/trunk/SConstruct
adchpp/trunk/adchpp/CID.h
adchpp/trunk/adchpp/ClientManager.cpp
adchpp/trunk/adchpp/ClientManager.h
adchpp/trunk/adchpp/File.h
adchpp/trunk/adchpp/SettingsManager.cpp
adchpp/trunk/adchpp/SettingsManager.h
adchpp/trunk/adchpp/Util.cpp
adchpp/trunk/adchpp/Util.h
adchpp/trunk/adchpp/adchpp.cpp
adchpp/trunk/swig/adchpp.i
adchpp/trunk/swig/lua.i
Removed Paths:
-------------
adchpp/trunk/adchpp/ResourceManager.cpp
adchpp/trunk/adchpp/ResourceManager.h
adchpp/trunk/adchpp/StringDefs.cpp
adchpp/trunk/adchpp/StringDefs.h
adchpp/trunk/makedefs.py
Property Changed:
----------------
adchpp/trunk/
adchpp/trunk/plugins/Bloom/src/
adchpp/trunk/plugins/Script/src/
Property changes on: adchpp/trunk
___________________________________________________________________
Name: svn:ignore
- build
STLport
.*
+ build
STLport
.*
custom.py
Modified: adchpp/trunk/SConstruct
===================================================================
--- adchpp/trunk/SConstruct 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/SConstruct 2007-11-18 20:58:59 UTC (rev 94)
@@ -2,17 +2,6 @@
from build_util import Dev
-opts = Options('custom.py', ARGUMENTS)
-
-opts.AddOptions(
- EnumOption('tools', 'Toolset to compile with, default = platform default (msvc under windows)', 'mingw', ['mingw', 'default']),
- EnumOption('mode', 'Compile mode', 'debug', ['debug', 'release']),
- BoolOption('nativestl', 'Use native STL instead of STLPort', 'yes'),
- BoolOption('verbose', 'Show verbose command lines', 'no'),
- BoolOption('savetemps', 'Save intermediate compilation files (assembly output)', 'no'),
- ('prefix', 'Prefix to use when cross compiling', 'i386-mingw32-')
-)
-
gcc_flags = {
'common': ['-ggdb', '-Wall', '-Wextra', '-pipe', '-Wno-unused-parameter', '-Wno-missing-field-initializers', '-fexceptions'],
'debug': [],
@@ -67,6 +56,21 @@
import os,sys
+plugins = filter(lambda x: os.path.isfile(os.path.join('plugins', x, 'SConscript')), os.listdir('plugins'))
+
+opts = Options('custom.py', ARGUMENTS)
+
+opts.AddOptions(
+ EnumOption('tools', 'Toolset to compile with, default = platform default (msvc under windows)', 'mingw', ['mingw', 'default']),
+ EnumOption('mode', 'Compile mode', 'debug', ['debug', 'release']),
+ ListOption('plugins', 'The plugins to compile', 'all', plugins),
+ BoolOption('nativestl', 'Use native STL instead of STLPort', 'yes'),
+ BoolOption('verbose', 'Show verbose command lines', 'no'),
+ BoolOption('savetemps', 'Save intermediate compilation files (assembly output)', 'no'),
+ ('prefix', 'Prefix to use when cross compiling', 'i386-mingw32-')
+)
+
+
if sys.platform == 'win32':
tooldef = 'mingw'
else:
@@ -174,6 +178,6 @@
dev.build('swig/')
# Plugins
-dev.build('plugins/Script/')
-dev.build('plugins/Bloom/')
+for plugin in env['plugins']:
+ dev.build('plugins/' + plugin + '/')
Modified: adchpp/trunk/adchpp/CID.h
===================================================================
--- adchpp/trunk/adchpp/CID.h 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/CID.h 2007-11-18 20:58:59 UTC (rev 94)
@@ -19,6 +19,7 @@
#ifndef ADCHPP_CID_H
#define ADCHPP_CID_H
+#include "Util.h"
#include "Encoder.h"
namespace adchpp {
@@ -29,10 +30,6 @@
enum { BASE32_SIZE = 39 };
struct Hash {
-#if _MSC_VER >= 1300
- static const size_t bucket_size = 4;
- static const size_t min_buckets = 8;
-#endif
size_t operator()(const CID& c) const { return c.toHash(); }
bool operator()(const CID& a, const CID& b) const { return a < b; }
};
Modified: adchpp/trunk/adchpp/ClientManager.cpp
===================================================================
--- adchpp/trunk/adchpp/ClientManager.cpp 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/ClientManager.cpp 2007-11-18 20:58:59 UTC (rev 94)
@@ -373,7 +373,7 @@
if(j != clients.end()) {
j->second->send("\n");
}
- c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_CID_TAKEN, STRING(CID_TAKEN)));
+ c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_CID_TAKEN, "CID taken, please try again later"));
c.disconnect(Util::REASON_CID_TAKEN);
return false;
}
@@ -396,7 +396,7 @@
dcdebug("%s verifying nick\n", AdcCommand::fromSID(c.getSID()).c_str());
for(string::size_type i = 0; i < strtmp.length(); ++i) {
if((uint8_t)strtmp[i] < 33) {
- c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_NICK_INVALID, STRING(NICK_INVALID)));
+ c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_NICK_INVALID, "Invalid character in nick"));
c.disconnect(Util::REASON_NICK_INVALID);
return false;
}
@@ -406,7 +406,7 @@
nicks.erase(oldNick);
if(nicks.find(strtmp) != nicks.end()) {
- c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_NICK_TAKEN, STRING(NICK_TAKEN)));
+ c.send(AdcCommand(AdcCommand::SEV_FATAL, AdcCommand::ERROR_NICK_TAKEN, "Nick taken, please pick another one"));
c.disconnect(Util::REASON_NICK_TAKEN);
return false;
}
Modified: adchpp/trunk/adchpp/ClientManager.h
===================================================================
--- adchpp/trunk/adchpp/ClientManager.h 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/ClientManager.h 2007-11-18 20:58:59 UTC (rev 94)
@@ -19,11 +19,11 @@
#ifndef ADCHPP_CLIENTMANAGER_H
#define ADCHPP_CLIENTMANAGER_H
-#include "Util.h"
#include "CID.h"
#include "AdcCommand.h"
#include "Signal.h"
#include "Client.h"
+#include "Singleton.h"
namespace adchpp {
Modified: adchpp/trunk/adchpp/File.h
===================================================================
--- adchpp/trunk/adchpp/File.h 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/File.h 2007-11-18 20:58:59 UTC (rev 94)
@@ -21,7 +21,6 @@
#include "Exception.h"
#include "Util.h"
-#include "ResourceManager.h"
#ifndef _WIN32
#include <sys/stat.h>
@@ -150,7 +149,7 @@
if(x == -1)
throw FileException(Util::translateError(errno));
if(x < (ssize_t)len)
- throw FileException(STRING(DISK_FULL));
+ throw FileException("Unable to write, disk full?");
}
/**
Deleted: adchpp/trunk/adchpp/ResourceManager.cpp
===================================================================
--- adchpp/trunk/adchpp/ResourceManager.cpp 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/ResourceManager.cpp 2007-11-18 20:58:59 UTC (rev 94)
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Jacek Sieka, arnetheduck on gmail point com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "adchpp.h"
-
-#include "ResourceManager.h"
-
-#include "SimpleXML.h"
-#include "File.h"
-#include "LogManager.h"
-
-namespace adchpp {
-
-using namespace std;
-using namespace std::tr1;
-
-ResourceManager* ResourceManager::instance = 0;
-const string ResourceManager::className = "ResourceManager";
-
-void ResourceManager::loadLanguage(const string& aFile) {
- try {
- File f(aFile, File::READ, File::OPEN);
- SimpleXML xml;
- xml.fromXML(f.read());
-
- unordered_map<string, int> h;
-
- for(int i = 0; i < LAST; ++i) {
- h[names[i]] = i;
- }
-
- if(xml.findChild("Language")) {
- xml.stepIn();
- if(xml.findChild("Strings")) {
- xml.stepIn();
-
- while(xml.findChild("String")) {
- unordered_map<string, int>::iterator j = h.find(xml.getChildAttrib("Name"));
-
- if(j != h.end()) {
- strings[j->second] = xml.getChildData();
- }
- }
- }
- }
- } catch(const Exception& e) {
- LOGDT(className, "Failed to load language file: " + e.getError());
- }
-}
-
-}
Deleted: adchpp/trunk/adchpp/ResourceManager.h
===================================================================
--- adchpp/trunk/adchpp/ResourceManager.h 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/ResourceManager.h 2007-11-18 20:58:59 UTC (rev 94)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Jacek Sieka, arnetheduck on gmail point com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ADCHPP_RESOURCEMANAGER_H
-#define ADCHPP_RESOURCEMANAGER_H
-
-#include "Singleton.h"
-
-namespace adchpp {
-
-/**
- * This class takes care of internationalization, providing the correct strings.
- */
-class ResourceManager : public Singleton<ResourceManager> {
-public:
-
-#include "StringDefs.h"
-
- void loadLanguage(const std::string& aFile);
- const std::string& getString(Strings x) const { return strings[x]; }
-
-private:
-
- friend class Singleton<ResourceManager>;
-
- ADCHPP_DLL static ResourceManager* instance;
-
- ResourceManager() throw() { }
- virtual ~ResourceManager() throw() { }
-
- ADCHPP_DLL static std::string strings[LAST];
- static std::string names[LAST];
-
- static const std::string className;
-};
-
-#define STRING(x) ResourceManager::getInstance()->getString(ResourceManager::x)
-#define CSTRING(x) ResourceManager::getInstance()->getString(ResourceManager::x).c_str()
-
-}
-
-#endif // RESOURCEMANAGER_H
Modified: adchpp/trunk/adchpp/SettingsManager.cpp
===================================================================
--- adchpp/trunk/adchpp/SettingsManager.cpp 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/SettingsManager.cpp 2007-11-18 20:58:59 UTC (rev 94)
@@ -36,7 +36,6 @@
{
// Strings
"HubName", "ServerIp", "LogFile", "Description",
- "LanguageFile",
"SENTRY",
// Ints
"ServerPort", "Log", "KeepSlowUsers",
@@ -57,7 +56,6 @@
// set(SERVER_IP, "");
set(LOG_FILE, "logs/adchpp%Y%m.log");
set(DESCRIPTION, versionString);
- // set(LANGUAGE_FILE, "Example.adchpp.xml");
set(SERVER_PORT, 2780);
set(LOG, 1);
set(KEEP_SLOW_USERS, 0);
@@ -73,7 +71,7 @@
}
bool SettingsManager::getType(const char* name, int& n, int& type) {
- for(n = 0; n < INT64_LAST; n++) {
+ for(n = 0; n < SETTINGS_LAST; n++) {
if(strcmp(settingTags[n].c_str(), name) == 0) {
if(n < STR_LAST) {
type = TYPE_STRING;
@@ -81,9 +79,6 @@
} else if(n < INT_LAST) {
type = TYPE_INT;
return true;
- } else {
- type = TYPE_INT64;
- return true;
}
}
}
@@ -127,16 +122,6 @@
LOGDT(className, attr + " missing from settings, using default");
xml.resetCurrentChild();
}
- for(i=INT64_FIRST; i<INT64_LAST; i++) {
- attr = settingTags[i];
- dcassert(attr.find("SENTRY") == string::npos);
-
- if(xml.findChild(attr))
- set(Int64Setting(i), Util::toInt64(xml.getChildData()));
- else
- LOGDT(className, attr + " missing from settings, using default");
- xml.resetCurrentChild();
- }
xml.stepOut();
Modified: adchpp/trunk/adchpp/SettingsManager.h
===================================================================
--- adchpp/trunk/adchpp/SettingsManager.h 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/SettingsManager.h 2007-11-18 20:58:59 UTC (rev 94)
@@ -21,6 +21,7 @@
#include "Util.h"
#include "Signal.h"
+#include "Singleton.h"
namespace adchpp {
@@ -45,11 +46,8 @@
MAX_SEND_SIZE, MAX_BUFFER_SIZE, BUFFER_SIZE, MAX_COMMAND_SIZE,
OVERFLOW_TIMEOUT, DISCONNECT_TIMEOUT, FLOOD_ADD, FLOOD_THRESHOLD,
LOGIN_TIMEOUT,
- INT_LAST };
+ INT_LAST, SETTINGS_LAST = INT_LAST };
- enum Int64Setting { INT64_FIRST = INT_LAST + 1,
- INT64_LAST = INT64_FIRST, SETTINGS_LAST = INT64_LAST };
-
/**
* Get the type of setting based on its name. By using the type info you can
* convert the n to the proper enum type and get the setting.
@@ -72,9 +70,6 @@
int get(IntSetting key) const {
return intSettings[key - INT_FIRST];
}
- int64_t get(Int64Setting key) const {
- return int64Settings[key - INT64_FIRST];
- }
bool getBool(IntSetting key) const {
return (get(key) > 0);
@@ -92,17 +87,6 @@
intSettings[key - INT_FIRST] = Util::toInt(value);
}
- void set(Int64Setting key, int64_t value) {
- int64Settings[key - INT64_FIRST] = value;
- }
- void set(Int64Setting key, int value) {
- int64Settings[key - INT64_FIRST] = value;
- }
-
- template<typename T> void set(Int64Setting key, const T& value) {
- int64Settings[key - INT64_FIRST] = Util::toInt64(value);
- }
-
void set(IntSetting key, bool value) { set(key, (int)value); }
void load() {
Deleted: adchpp/trunk/adchpp/StringDefs.cpp
===================================================================
--- adchpp/trunk/adchpp/StringDefs.cpp 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/StringDefs.cpp 2007-11-18 20:58:59 UTC (rev 94)
@@ -1,29 +0,0 @@
-#include "adchpp.h"
-#include "ResourceManager.h"
-namespace adchpp {
-using namespace std;
-string ResourceManager::strings[] = {
-"B",
-"CID taken",
-"Disk full?",
-"GiB",
-"Hub is currently full",
-"KiB",
-"MiB",
-"Your nick contains invalid characters. Adios.",
-"Your nick is already taken, please select another one",
-"TiB",
-};
-string ResourceManager::names[] = {
-"B",
-"CidTaken",
-"DiskFull",
-"Gb",
-"HubFull",
-"Kb",
-"Mb",
-"NickInvalid",
-"NickTaken",
-"Tb",
-};
-}
Deleted: adchpp/trunk/adchpp/StringDefs.h
===================================================================
--- adchpp/trunk/adchpp/StringDefs.h 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/StringDefs.h 2007-11-18 20:58:59 UTC (rev 94)
@@ -1,23 +0,0 @@
-// @Prolog: #include "adchpp.h"
-// @Prolog: #include "ResourceManager.h"
-// @Prolog: namespace adchpp {
-// @Prolog: using namespace std;
-
-// @Strings: string ResourceManager::strings[]
-// @Names: string ResourceManager::names[]
-
-enum Strings { // @DontAdd
- B, // "B"
- CID_TAKEN, // "CID taken"
- DISK_FULL, // "Disk full?"
- GB, // "GiB"
- HUB_FULL, // "Hub is currently full"
- KB, // "KiB"
- MB, // "MiB"
- NICK_INVALID, // "Your nick contains invalid characters. Adios."
- NICK_TAKEN, // "Your nick is already taken, please select another one"
- TB, // "TiB"
- LAST // @DontAdd
-};
-
-// @Epilog: }
Modified: adchpp/trunk/adchpp/Util.cpp
===================================================================
--- adchpp/trunk/adchpp/Util.cpp 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/Util.cpp 2007-11-18 20:58:59 UTC (rev 94)
@@ -232,15 +232,15 @@
string Util::formatBytes(int64_t aBytes) {
char buf[64];
if(aBytes < 1024) {
- sprintf(buf, "%d %s", (int)(aBytes&0xffffffff), CSTRING(B));
+ sprintf(buf, "%d B", (int)(aBytes&0xffffffff));
} else if(aBytes < 1024*1024) {
- sprintf(buf, "%.02f %s", (double)aBytes/(1024.0), CSTRING(KB));
+ sprintf(buf, "%.02f KiB", (double)aBytes/(1024.0));
} else if(aBytes < 1024*1024*1024) {
- sprintf(buf, "%.02f %s", (double)aBytes/(1024.0*1024.0), CSTRING(MB));
+ sprintf(buf, "%.02f MiB", (double)aBytes/(1024.0*1024.0));
} else if(aBytes < (int64_t)1024*1024*1024*1024) {
- sprintf(buf, "%.02f %s", (double)aBytes/(1024.0*1024.0*1024.0), CSTRING(GB));
+ sprintf(buf, "%.02f GiB", (double)aBytes/(1024.0*1024.0*1024.0));
} else {
- sprintf(buf, "%.02f %s", (double)aBytes/(1024.0*1024.0*1024.0*1024.0), CSTRING(TB));
+ sprintf(buf, "%.02f TiB", (double)aBytes/(1024.0*1024.0*1024.0*1024.0));
}
return buf;
Modified: adchpp/trunk/adchpp/Util.h
===================================================================
--- adchpp/trunk/adchpp/Util.h 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/Util.h 2007-11-18 20:58:59 UTC (rev 94)
@@ -19,7 +19,6 @@
#ifndef ADCHPP_UTIL_H
#define ADCHPP_UTIL_H
-#include "ResourceManager.h"
#include "Pool.h"
#include "Mutex.h"
Modified: adchpp/trunk/adchpp/adchpp.cpp
===================================================================
--- adchpp/trunk/adchpp/adchpp.cpp 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/adchpp/adchpp.cpp 2007-11-18 20:58:59 UTC (rev 94)
@@ -47,7 +47,6 @@
Util::initialize(configPath);
- ResourceManager::newInstance();
SettingsManager::newInstance();
LogManager::newInstance();
TimerManager::newInstance();
@@ -63,14 +62,6 @@
if(!initialized) {
throw Exception("adchpp not initialized");
}
-/* if(!SETTING(LANGUAGE_FILE).empty()) {
- if(File::isAbsolutePath(SETTING(LANGUAGE_FILE))) {
- ResourceManager::getInstance()->loadLanguage(SETTING(LANGUAGE_FILE));
- } else {
- ResourceManager::getInstance()->loadLanguage(Util::getCfgPath() + SETTING(LANGUAGE_FILE));
- }
- }
-*/
Stats::startTime = GET_TIME();
if(f) f();
@@ -114,7 +105,6 @@
LogManager::deleteInstance();
SettingsManager::deleteInstance();
TimerManager::deleteInstance();
- ResourceManager::deleteInstance();
#ifdef _WIN32
WSACleanup();
Deleted: adchpp/trunk/makedefs.py
===================================================================
--- adchpp/trunk/makedefs.py 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/makedefs.py 2007-11-18 20:58:59 UTC (rev 94)
@@ -1,64 +0,0 @@
-import re
-import codecs
-import xml.sax.saxutils
-
-def makename(oldname):
- name = "";
- nextBig = True;
- for x in oldname:
- if x == '_':
- nextBig = True;
- else:
- if nextBig:
- name += x.upper();
- nextBig = False;
- else:
- name += x.lower();
-
- return name;
-
-
-version = re.search("VERSIONFLOAT (\S+)", file("adchpp/version.cpp").read()).group(1)
-
-varstr = "";
-strings = "";
-varname = "";
-names = "";
-
-prolog = "";
-epilog = "";
-
-example = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>\n';
-example += '<Language Name="Example Language" Author="arnetheduck" Version=' + version + ' Revision="1">\n'
-example += '\t<Strings>\n';
-
-lre = re.compile('\s*(\w+),\s*//\s*\"(.+)\"\s*')
-
-decoder = codecs.getdecoder('cp1252')
-encoder = codecs.getencoder('utf8')
-recodeattr = lambda s: encoder(decoder(xml.sax.saxutils.quoteattr(s))[0])[0]
-recodeval = lambda s: encoder(decoder(xml.sax.saxutils.escape(s, {"\\t" : "\t"}))[0])[0]
-
-for x in file("adchpp/StringDefs.h", "r"):
- if x.startswith("// @Strings: "):
- varstr = x[13:].strip();
- elif x.startswith("// @Names: "):
- varname = x[11:].strip();
- elif x.startswith("// @Prolog: "):
- prolog += x[12:];
- elif x.startswith("// @Epilog: "):
- epilog += x[12:];
- elif len(x) >= 5:
- match = lre.match(x);
- if match is not None:
- name , value = match.groups();
- strings += '"' + value + '", \n'
- newname = makename(name)
- names += '"' + newname + '", \n'
- example += '\t\t<String Name=%s>%s</String>\n' % (recodeattr(newname), recodeval(value))
-
-example += '\t</Strings>\n';
-example += '</Language>\n';
-
-file('adchpp/StringDefs.cpp', 'w').write(prolog + varstr + " = {\n" + strings + "};\n" + varname + " = {\n" + names + "};\n" + epilog);
-file('etc/Example.adchpp.xml', 'w').write(example);
Property changes on: adchpp/trunk/plugins/Bloom/src
___________________________________________________________________
Name: svn:ignore
+ stdinc.h.gch
Property changes on: adchpp/trunk/plugins/Script/src
___________________________________________________________________
Name: svn:ignore
- .sconsign
+ .sconsign
stdinc.h.gch
Modified: adchpp/trunk/swig/adchpp.i
===================================================================
--- adchpp/trunk/swig/adchpp.i 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/swig/adchpp.i 2007-11-18 20:58:59 UTC (rev 94)
@@ -624,7 +624,6 @@
enum StrSetting { STR_FIRST,
HUB_NAME = STR_FIRST, SERVER_IP, LOG_FILE, DESCRIPTION,
- LANGUAGE_FILE,
STR_LAST };
enum IntSetting { INT_FIRST = STR_LAST + 1,
@@ -634,9 +633,6 @@
LOGIN_TIMEOUT,
INT_LAST };
- enum Int64Setting { INT64_FIRST = INT_LAST + 1,
- INT64_LAST = INT64_FIRST, SETTINGS_LAST = INT64_LAST };
-
//bool getType(const char* name, int& n, int& type);
const std::string& getName(int n) { dcassert(n < SETTINGS_LAST); return settingTags[n]; }
@@ -647,19 +643,12 @@
int getInt(IntSetting key) {
return self->get(key);
}
- int64_t getInt64(Int64Setting key) {
- return self->get(key);
- }
-
void setString(StrSetting key, std::string const& value) {
self->set(key, value);
}
void setInt(IntSetting key, int value) {
self->set(key, value);
}
- void setInt64(Int64Setting key, int64_t value) {
- self->set(key, value);
- }
void setBool(IntSetting key, bool value) {
self->set(key, value);
}
Modified: adchpp/trunk/swig/lua.i
===================================================================
--- adchpp/trunk/swig/lua.i 2007-11-18 19:04:42 UTC (rev 93)
+++ adchpp/trunk/swig/lua.i 2007-11-18 20:58:59 UTC (rev 94)
@@ -158,3 +158,4 @@
return std::string();
}
}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
