[sword-svn] r2766 - in trunk: bindings/corba/omniorbcpp bindings/corba/orbitcpp bindings/gsoap bindings/java-jni/jni examples/cmdline src/frontend/framework
scribe at crosswire.org
scribe at crosswire.org
Sun Jan 20 14:05:43 MST 2013
Author: scribe
Date: 2013-01-20 14:05:43 -0700 (Sun, 20 Jan 2013)
New Revision: 2766
Modified:
trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
trunk/bindings/corba/orbitcpp/swordorb-impl.cpp
trunk/bindings/gsoap/gsoapsword.cpp
trunk/bindings/java-jni/jni/swordstub.cpp
trunk/examples/cmdline/listoptions.cpp
trunk/examples/cmdline/lookup.cpp
trunk/examples/cmdline/search.cpp
trunk/examples/cmdline/threaded_search.cpp
trunk/src/frontend/framework/femain.cpp
Log:
Optimization to change postfix incrementors to prefix in ancillary files (Jaak Ristioja)
Modified: trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -114,35 +114,35 @@
i1Start = entryAttribs.find(level1);
i1End = i1Start;
if (i1End != entryAttribs.end())
- i1End++;
+ ++i1End;
}
else {
i1Start = entryAttribs.begin();
i1End = entryAttribs.end();
}
- for (;i1Start != i1End; i1Start++) {
+ for (;i1Start != i1End; ++i1Start) {
if ((level2) && (*level2)) {
i2Start = i1Start->second.find(level2);
i2End = i2Start;
if (i2End != i1Start->second.end())
- i2End++;
+ ++i2End;
}
else {
i2Start = i1Start->second.begin();
i2End = i1Start->second.end();
}
- for (;i2Start != i2End; i2Start++) {
+ for (;i2Start != i2End; ++i2Start) {
if ((level3) && (*level3)) {
i3Start = i2Start->second.find(level3);
i3End = i3Start;
if (i3End != i2Start->second.end())
- i3End++;
+ ++i3End;
}
else {
i3Start = i2Start->second.begin();
i3End = i2Start->second.end();
}
- for (;i3Start != i3End; i3Start++) {
+ for (;i3Start != i3End; ++i3Start) {
results.push_back(i3Start->second);
}
if (i3Start != i3End)
@@ -367,7 +367,7 @@
sword::SWModule *module = 0;
int size = 0;
- for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) {
+ for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey"))))
size++;
}
@@ -375,7 +375,7 @@
// if (size > 183) size = 183;
milist->length(size);
int i = 0;
- for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) {
+ for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
module = it->second;
if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) {
SWBuf type = module->getType();
@@ -438,12 +438,12 @@
sword::StringList options = delegate->getGlobalOptions();
swordorb::StringList *retVal = new swordorb::StringList;
int count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str()));
}
return retVal;
@@ -453,12 +453,12 @@
sword::StringList options = delegate->getGlobalOptionValues(option);
swordorb::StringList *retVal = new swordorb::StringList;
int count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str()));
}
return retVal;
@@ -484,12 +484,12 @@
sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
swordorb::StringList *retVal = new swordorb::StringList;
int count = 0;
- for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) {
+ for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) {
+ for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str()));
}
return retVal;
@@ -508,12 +508,12 @@
swordorb::StringList *retVal = new swordorb::StringList;
int count = 0;
sword::InstallMgr *installMgr = new sword::InstallMgr();
- for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+ for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+ for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->second->caption.c_str()));
}
delete installMgr;
Modified: trunk/bindings/corba/orbitcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/orbitcpp/swordorb-impl.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/bindings/corba/orbitcpp/swordorb-impl.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -45,13 +45,13 @@
ModInfoList *milist = new ModInfoList;
sword::SWModule *module = 0;
int size = 0;
- for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) {
+ for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey"))))
size++;
}
milist->length(size);
int i = 0;
- for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) {
+ for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
module = it->second;
if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) {
SWBuf type = module->Type();
@@ -89,12 +89,12 @@
sword::StringList options = delegate->getGlobalOptions();
StringList *retVal = new StringList;
int count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(it->c_str());
}
return retVal;
@@ -105,12 +105,12 @@
sword::StringList options = delegate->getGlobalOptionValues(option);
StringList *retVal = new StringList;
int count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(it->c_str());
}
return retVal;
@@ -237,35 +237,35 @@
i1Start = entryAttribs.find(level1);
i1End = i1Start;
if (i1End != entryAttribs.end())
- i1End++;
+ ++i1End;
}
else {
i1Start = entryAttribs.begin();
i1End = entryAttribs.end();
}
- for (;i1Start != i1End; i1Start++) {
+ for (;i1Start != i1End; ++i1Start) {
if ((level2) && (*level2)) {
i2Start = i1Start->second.find(level2);
i2End = i2Start;
if (i2End != i1Start->second.end())
- i2End++;
+ ++i2End;
}
else {
i2Start = i1Start->second.begin();
i2End = i1Start->second.end();
}
- for (;i2Start != i2End; i2Start++) {
+ for (;i2Start != i2End; ++i2Start) {
if ((level3) && (*level3)) {
i3Start = i2Start->second.find(level3);
i3End = i3Start;
if (i3End != i2Start->second.end())
- i3End++;
+ ++i3End;
}
else {
i3Start = i2Start->second.begin();
i3End = i2Start->second.end();
}
- for (;i3Start != i3End; i3Start++) {
+ for (;i3Start != i3End; ++i3Start) {
results.push_back(i3Start->second);
}
if (i3Start != i3End)
@@ -395,12 +395,12 @@
sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
StringList *retVal = new StringList;
int count = 0;
- for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) {
+ for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) {
+ for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(it->c_str());
}
return retVal;
@@ -419,12 +419,12 @@
swordorb::StringList *retVal = new swordorb::StringList;
int count = 0;
sword::InstallMgr *installMgr = new sword::InstallMgr();
- for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+ for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
count++;
}
retVal->length(count);
count = 0;
- for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+ for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->second->caption.c_str()));
}
delete installMgr;
Modified: trunk/bindings/gsoap/gsoapsword.cpp
===================================================================
--- trunk/bindings/gsoap/gsoapsword.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/bindings/gsoap/gsoapsword.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -108,17 +108,17 @@
static string retVal = "";
retVal = "var entryAttribs = new Array();\n";
string l1keys = "entryAttribs[0] = new Array(";
- for (l1=0,i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); i1++,l1++) {
+ for (l1=0,i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); ++i1,++l1) {
sprintf(lbuf1, "%d", l1+1);
retVal += "entryAttribs["+lbuf1+"] = new Array();\n";
string l2keys = "entryAttribs["+lbuf1+"][0] = new Array(";
cout << "[ " << i1->first << " ]\n";
- for (l2=0,i2 = i1->second.begin(); i2 != i1->second.end(); i2++,l2++) {
+ for (l2=0,i2 = i1->second.begin(); i2 != i1->second.end(); ++i2,++l2) {
sprintf(lbuf2, "%d", l2+1);
retVal += "entryAttribs["+lbuf1+"]["+lbuf2+"][0] = new Array();\n";
string l3keys = "entryAttribs["+lbuf1+"]["+lbuf2+"][0] = new Array(";
cout << "\t[ " << i2->first << " ]\n";
- for (l3=0,i3 = i2->second.begin(); i3 != i2->second.end(); i3++,l3++) {
+ for (l3=0,i3 = i2->second.begin(); i3 != i2->second.end(); ++i3,++l3) {
cout << "\t\t" << i3->first << " = " << i3->second << "\n";
}
}
Modified: trunk/bindings/java-jni/jni/swordstub.cpp
===================================================================
--- trunk/bindings/java-jni/jni/swordstub.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/bindings/java-jni/jni/swordstub.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -154,7 +154,7 @@
init();
int size = 0;
- for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); it++) {
+ for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); ++it) {
if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey"))))
size++;
}
@@ -172,7 +172,7 @@
jobjectArray ret = (jobjectArray) env->NewObjectArray(size, clazzModInfo, NULL);
int i = 0;
- for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); it++) {
+ for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); ++it) {
SWModule *module = it->second;
if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) {
@@ -328,7 +328,7 @@
sword::StringList options = mgr->getGlobalOptions();
int count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
count++;
}
@@ -336,7 +336,7 @@
jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it)));
}
@@ -361,14 +361,14 @@
env->ReleaseStringUTFChars(optionJS, option);
int count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
count++;
}
jclass clazzString = env->FindClass("java/lang/String");
jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
count = 0;
- for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) {
+ for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it)));
}
@@ -422,7 +422,7 @@
sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
int count = 0;
- for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) {
+ for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
count++;
}
@@ -430,7 +430,7 @@
jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
count = 0;
- for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) {
+ for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it)));
}
return ret;
@@ -645,35 +645,35 @@
i1Start = entryAttribs.find(level1);
i1End = i1Start;
if (i1End != entryAttribs.end())
- i1End++;
+ ++i1End;
}
else {
i1Start = entryAttribs.begin();
i1End = entryAttribs.end();
}
- for (;i1Start != i1End; i1Start++) {
+ for (;i1Start != i1End; ++i1Start) {
if ((level2) && (*level2)) {
i2Start = i1Start->second.find(level2);
i2End = i2Start;
if (i2End != i1Start->second.end())
- i2End++;
+ ++i2End;
}
else {
i2Start = i1Start->second.begin();
i2End = i1Start->second.end();
}
- for (;i2Start != i2End; i2Start++) {
+ for (;i2Start != i2End; ++i2Start) {
if ((level3) && (*level3)) {
i3Start = i2Start->second.find(level3);
i3End = i3Start;
if (i3End != i2Start->second.end())
- i3End++;
+ ++i3End;
}
else {
i3Start = i2Start->second.begin();
i3End = i2Start->second.end();
}
- for (;i3Start != i3End; i3Start++) {
+ for (;i3Start != i3End; ++i3Start) {
results.push_back(i3Start->second);
}
if (i3Start != i3End)
@@ -1262,12 +1262,12 @@
jobjectArray ret;
int count = 0;
- for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+ for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
count++;
}
ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
count = 0;
- for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+ for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(it->second->caption.c_str())));
}
@@ -1331,7 +1331,7 @@
map<SWModule *, int> modStats = installMgr->getModuleStatus(*mgr, *source->second->getMgr());
int size = 0;
- for (map<SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); it++) {
+ for (map<SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); ++it) {
size++;
}
@@ -1339,7 +1339,7 @@
jobjectArray ret = (jobjectArray) env->NewObjectArray(size, clazzModInfo, NULL);
int i = 0;
- for (map<SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); it++) {
+ for (map<SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); ++it) {
SWModule *module = it->first;
int status = it->second;
Modified: trunk/examples/cmdline/listoptions.cpp
===================================================================
--- trunk/examples/cmdline/listoptions.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/examples/cmdline/listoptions.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -33,10 +33,10 @@
SWMgr library;
StringList options = library.getGlobalOptions();
- for (StringList::const_iterator it = options.begin(); it != options.end(); it++) {
+ for (StringList::const_iterator it = options.begin(); it != options.end(); ++it) {
cout << *it << " (" << library.getGlobalOptionTip(*it) << ")\n";
StringList optionValues = library.getGlobalOptionValues(*it);
- for (StringList::const_iterator it2 = optionValues.begin(); it2 != optionValues.end(); it2++) {
+ for (StringList::const_iterator it2 = optionValues.begin(); it2 != optionValues.end(); ++it2) {
cout << "\t" << *it2 << "\n";
}
}
Modified: trunk/examples/cmdline/lookup.cpp
===================================================================
--- trunk/examples/cmdline/lookup.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/examples/cmdline/lookup.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -59,7 +59,7 @@
if (!target) {
fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]);
ModMap::iterator it;
- for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+ for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) {
fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description());
}
exit(-1);
@@ -98,11 +98,11 @@
AttributeTypeList::iterator i1;
AttributeList::iterator i2;
AttributeValue::iterator i3;
- for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); i1++) {
+ for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); ++i1) {
std::cout << "[ " << i1->first << " ]\n";
- for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) {
+ for (i2 = i1->second.begin(); i2 != i1->second.end(); ++i2) {
std::cout << "\t[ " << i2->first << " ]\n";
- for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) {
+ for (i3 = i2->second.begin(); i3 != i2->second.end(); ++i3) {
std::cout << "\t\t" << i3->first << " = " << i3->second << "\n";
}
}
Modified: trunk/examples/cmdline/search.cpp
===================================================================
--- trunk/examples/cmdline/search.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/examples/cmdline/search.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -86,7 +86,7 @@
it = manager.Modules.find(argv[1]);
if (it == manager.Modules.end()) {
fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]);
- for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+ for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) {
fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description());
}
exit(-1);
Modified: trunk/examples/cmdline/threaded_search.cpp
===================================================================
--- trunk/examples/cmdline/threaded_search.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/examples/cmdline/threaded_search.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -125,7 +125,7 @@
it = manager.Modules.find(argv[1]);
if (it == manager.Modules.end()) {
fprintf(stderr, "Could not find module [%s]. Available modules:\n", argv[1]);
- for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+ for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) {
fprintf(stderr, "[%s]\t - %s\n", (*it).second->Name(), (*it).second->Description());
}
exit(-1);
Modified: trunk/src/frontend/framework/femain.cpp
===================================================================
--- trunk/src/frontend/framework/femain.cpp 2013-01-20 19:30:38 UTC (rev 2765)
+++ trunk/src/frontend/framework/femain.cpp 2013-01-20 21:05:43 UTC (rev 2766)
@@ -23,7 +23,7 @@
FEMain::~FEMain() {
list <SWDisplay *>::iterator it;
- for (it = displays.begin(); it != displays.end(); it++)
+ for (it = displays.begin(); it != displays.end(); ++it)
delete *it;
}
More information about the sword-cvs
mailing list