Index: ports/net/centericq/files/patch-libicq2000-0.1::libicq2000::sigslot.h =================================================================== RCS file: ports/net/centericq/files/patch-libicq2000-0.1::libicq2000::sigslot.h diff -N ports/net/centericq/files/patch-libicq2000-0.1::libicq2000::sigslot.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-libicq2000-0.1::libicq2000::sigslot.h 11 Aug 2004 14:35:47 -0000 @@ -0,0 +1,152 @@ +--- libicq2000-0.1/libicq2000/sigslot.h.orig Wed Feb 11 01:51:44 2004 ++++ libicq2000-0.1/libicq2000/sigslot.h Wed Aug 11 17:35:41 2004 +@@ -745,8 +745,8 @@ + public: + _connection0() + { +- pobject = NULL; +- pmemfun = NULL; ++ this->pobject = NULL; ++ this->pmemfun = NULL; + } + + _connection0(dest_type* pobject, void (dest_type::*pmemfun)()) +@@ -786,8 +786,8 @@ + public: + _connection1() + { +- pobject = NULL; +- pmemfun = NULL; ++ this->pobject = NULL; ++ this->pmemfun = NULL; + } + + _connection1(dest_type* pobject, void (dest_type::*pmemfun)(arg1_type)) +@@ -827,8 +827,8 @@ + public: + _connection2() + { +- pobject = NULL; +- pmemfun = NULL; ++ this->pobject = NULL; ++ this->pmemfun = NULL; + } + + _connection2(dest_type* pobject, void (dest_type::*pmemfun)(arg1_type, arg2_type)) +@@ -889,7 +889,7 @@ + lock_block lock(this); + _connection0* conn + = new _connection0(pclass, pmemfun); +- m_connected_slots.push_back(conn); ++ this->m_connected_slots.push_back(conn); + pclass->signal_connect(this); + } + +@@ -897,15 +897,15 @@ + { + lock_block lock(this); + _sig_connection0* conn = new _sig_connection0(chainsig); +- m_connected_slots.push_back(conn); ++ this->m_connected_slots.push_back(conn); + chainsig.signal_connect(this); + } + + void emit() + { + lock_block lock(this); +- typename connections_list::const_iterator itNext, it = m_connected_slots.begin(); +- typename connections_list::const_iterator itEnd = m_connected_slots.end(); ++ typename _signal_base0::connections_list::const_iterator itNext, it = this->m_connected_slots.begin(); ++ typename _signal_base0::connections_list::const_iterator itEnd = this->m_connected_slots.end(); + + while(it != itEnd) + { +@@ -921,8 +921,8 @@ + void operator()() + { + lock_block lock(this); +- typename connections_list::const_iterator itNext, it = m_connected_slots.begin(); +- typename connections_list::const_iterator itEnd = m_connected_slots.end(); ++ typename _signal_base0::connections_list::const_iterator itNext, it = this->m_connected_slots.begin(); ++ typename _signal_base0::connections_list::const_iterator itEnd = this->m_connected_slots.end(); + + while(it != itEnd) + { +@@ -957,7 +957,7 @@ + lock_block lock(this); + _connection1* conn + = new _connection1(pclass, pmemfun); +- m_connected_slots.push_back(conn); ++ this->m_connected_slots.push_back(conn); + pclass->signal_connect(this); + } + +@@ -965,15 +965,15 @@ + { + lock_block lock(this); + _sig_connection1* conn = new _sig_connection1(chainsig); +- m_connected_slots.push_back(conn); ++ this->m_connected_slots.push_back(conn); + chainsig.signal_connect(this); + } + + void emit(arg1_type a1) + { + lock_block lock(this); +- typename connections_list::const_iterator itNext, it = m_connected_slots.begin(); +- typename connections_list::const_iterator itEnd = m_connected_slots.end(); ++ typename _signal_base1::connections_list::const_iterator itNext, it = this->m_connected_slots.begin(); ++ typename _signal_base1::connections_list::const_iterator itEnd = this->m_connected_slots.end(); + + while(it != itEnd) + { +@@ -989,8 +989,8 @@ + void operator()(arg1_type a1) + { + lock_block lock(this); +- typename connections_list::const_iterator itNext, it = m_connected_slots.begin(); +- typename connections_list::const_iterator itEnd = m_connected_slots.end(); ++ typename _signal_base1::connections_list::const_iterator itNext, it = this->m_connected_slots.begin(); ++ typename _signal_base1::connections_list::const_iterator itEnd = this->m_connected_slots.end(); + + while(it != itEnd) + { +@@ -1025,7 +1025,7 @@ + lock_block lock(this); + _connection2* conn + = new _connection2(pclass, pmemfun); +- m_connected_slots.push_back(conn); ++ this->m_connected_slots.push_back(conn); + pclass->signal_connect(this); + } + +@@ -1033,15 +1033,15 @@ + { + lock_block lock(this); + _sig_connection2* conn = new _sig_connection2(chainsig); +- m_connected_slots.push_back(conn); ++ this->m_connected_slots.push_back(conn); + chainsig.signal_connect(this); + } + + void emit(arg1_type a1, arg2_type a2) + { + lock_block lock(this); +- typename connections_list::const_iterator itNext, it = m_connected_slots.begin(); +- typename connections_list::const_iterator itEnd = m_connected_slots.end(); ++ typename _signal_base2::connections_list::const_iterator itNext, it = this->m_connected_slots.begin(); ++ typename _signal_base2::connections_list::const_iterator itEnd = this->m_connected_slots.end(); + + while(it != itEnd) + { +@@ -1057,8 +1057,8 @@ + void operator()(arg1_type a1, arg2_type a2) + { + lock_block lock(this); +- typename connections_list::const_iterator itNext, it = m_connected_slots.begin(); +- typename connections_list::const_iterator itEnd = m_connected_slots.end(); ++ typename _signal_base2::connections_list::const_iterator itNext, it = this->m_connected_slots.begin(); ++ typename _signal_base2::connections_list::const_iterator itEnd = this->m_connected_slots.end(); + + while(it != itEnd) + { Index: ports/net/centericq/files/patch-src::accountmanager.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::accountmanager.cc diff -N ports/net/centericq/files/patch-src::accountmanager.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::accountmanager.cc 11 Aug 2004 14:57:28 -0000 @@ -0,0 +1,11 @@ +--- src/accountmanager.cc.orig Wed Aug 11 17:56:58 2004 ++++ src/accountmanager.cc Wed Aug 11 17:57:15 2004 +@@ -75,7 +75,7 @@ + for(fin = false; !fin; ) { + t.clear(); + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + account = conf.getourid(pname); + + if(pname != rss) Index: ports/net/centericq/files/patch-src::centericq.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::centericq.cc diff -N ports/net/centericq/files/patch-src::centericq.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::centericq.cc 11 Aug 2004 15:04:30 -0000 @@ -0,0 +1,92 @@ +--- src/centericq.cc.orig Wed Aug 11 18:03:34 2004 ++++ src/centericq.cc Wed Aug 11 18:04:29 2004 +@@ -71,7 +71,7 @@ + if(p) + if(rus = (((string) p).substr(0, 2) == "ru")) { + conf.setcharsets("cp1251", "koi8-r"); +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + conf.setcpconvert(pname, true); + } + +@@ -124,7 +124,7 @@ + + r = regmode = true; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(gethook(pname).enabled() && !gethook(pname).getCapabs().count(hookcapab::optionalpassword)) { + if(!(ia = conf.getourid(pname)).empty()) { + if(ia.password.empty()) { +@@ -152,7 +152,7 @@ + void centericq::inithooks() { + protocolname pname; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + gethook(pname).init(); + } + } +@@ -844,7 +844,7 @@ + protocolname pname; + icqconf::imaccount ia; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + ia = conf.getourid(pname); + + if(!ia.empty()) { +@@ -857,7 +857,7 @@ + f >> cst, f.close(), f.clear(); + unlink(fname.c_str()); + +- for(st = offline; st != imstatus_size; (int) st += 1) { ++ for(st = offline; st != imstatus_size; st = (imstatus)((int)st + 1)) { + if(imstatus2char[st] == cst) { + gethook(pname).setstatus(st); + break; +@@ -1381,7 +1381,7 @@ + if(!regmode) { + exectimers(); + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + abstracthook &hook = gethook(pname); + + if(hook.online()) { +@@ -1400,7 +1400,7 @@ + keypressed = true; + time(&timer_keypress); + } else { +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + abstracthook &hook = gethook(pname); + + if(hook.online()) +@@ -1430,7 +1430,7 @@ + nautoset = false; + } + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + abstracthook &hook = gethook(pname); + stcurrent = hook.getstatus(); + +@@ -1487,7 +1487,7 @@ + * + */ + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(!conf.getourid(pname).empty() || (pname == rss)) { + abstracthook &hook = gethook(pname); + +@@ -1581,7 +1581,7 @@ + + if(!conf.enoughdiskspace()) { + if(fonline) { +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + gethook(pname).disconnect(); + + face.log(_("! free disk space is less than 10k, going offline")); Index: ports/net/centericq/files/patch-src::hooks::abstracthook.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::hooks::abstracthook.cc diff -N ports/net/centericq/files/patch-src::hooks::abstracthook.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::hooks::abstracthook.cc 11 Aug 2004 14:43:28 -0000 @@ -0,0 +1,11 @@ +--- src/hooks/abstracthook.cc.orig Wed Aug 11 17:42:28 2004 ++++ src/hooks/abstracthook.cc Wed Aug 11 17:43:26 2004 +@@ -71,7 +71,7 @@ + void abstracthook::setstatus(imstatus st) { + setautostatus(manualstatus = st); + +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(&gethook(pname) == this) { + conf.savestatus(pname, manualstatus); + break; Index: ports/net/centericq/files/patch-src::icqconf.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::icqconf.cc diff -N ports/net/centericq/files/patch-src::icqconf.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::icqconf.cc 11 Aug 2004 14:59:43 -0000 @@ -0,0 +1,132 @@ +--- src/icqconf.cc.orig Wed Aug 11 17:57:52 2004 ++++ src/icqconf.cc Wed Aug 11 17:59:40 2004 +@@ -52,7 +52,7 @@ + + savepwd = mailcheck = fenoughdiskspace = true; + +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + chatmode[pname] = true; + cpconvert[pname] = entersends[pname] = nonimonline[pname] = false; + } +@@ -420,7 +420,7 @@ + ptpmin = atoi(getword(buf, "-").c_str()); + ptpmax = atoi(buf.c_str()); + } else { +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + buf = getprotocolname(pname); + if(param.substr(0, buf.size()) == buf) { + im = getourid(pname); +@@ -432,7 +432,7 @@ + } + + if(fromcharset.empty() && tocharset.empty()) +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(getcpconvert(pname)) { + fromcharset = "cp1251"; + tocharset = "koi8-r"; +@@ -473,25 +473,25 @@ + if(getaskaway()) f << "askaway" << endl; + + param = ""; +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(getchatmode(pname)) param += (string) " " + conf.getprotocolname(pname); + if(!param.empty()) + f << "chatmode" << param << endl; + + param = ""; +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(getentersends(pname)) param += (string) " " + conf.getprotocolname(pname); + if(!param.empty()) + f << "entersends" << param << endl; + + param = ""; +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(getnonimonline(pname)) param += (string) " " + conf.getprotocolname(pname); + if(!param.empty()) + f << "nonimonline" << param << endl; + + param = ""; +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(getcpconvert(pname)) param += (string) " " + conf.getprotocolname(pname); + if(!param.empty()) + f << "convert" << param << endl; +@@ -614,7 +614,7 @@ + for(i = 0; i < clist.count; i++) { + c = (icqcontact *) clist.at(i); + +- for(it = imevent::message; it != imevent::imeventtype_size; (int) it += 1) { ++ for(it = imevent::message; it != imevent::imeventtype_size; it = (imevent::imeventtype)((int)it + 1)) { + c->setsound(it, ""); + } + } +@@ -692,7 +692,7 @@ + imcontact ic; + protocolname pname; + +- for(pname = icq; pname != protocolname_size && skey != getprotocolname(pname); (int) pname += 1); ++ for(pname = icq; pname != protocolname_size && skey != getprotocolname(pname); pname = (protocolname)((int)pname + 1)); + + if(pname != protocolname_size) { + if(suin == "*") { +@@ -1014,7 +1014,7 @@ + + if((ia = a.additional.find("status")) != a.additional.end()) { + if(!ia->second.empty()) { +- for(st = offline; st != imstatus_size && imstatus2char[st] != ia->second[0]; (int) st += 1); ++ for(st = offline; st != imstatus_size && imstatus2char[st] != ia->second[0]; st = (imstatus)((int)st + 1)); + if(st == imstatus_size) st = available; + } + } +@@ -1098,7 +1098,7 @@ + << "Written by Konstantin Klyagin." << endl + << "Built-in protocols are:"; + +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(gethook(pname).enabled()) cout << " " << conf.getprotocolname(pname); + + cout << endl << endl +@@ -1151,7 +1151,7 @@ + } else { + protocolname pname; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(getprotocolname(pname) == proto) { + cdest = imcontact(dest, pname); + break; +@@ -1234,11 +1234,11 @@ + protocolname pname; + + if(st) { +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(getprotocolname(pname) == proto) + break; + +- for(imst = offline; imst != imstatus_size; (int) imst += 1) ++ for(imst = offline; imst != imstatus_size; imst = (imstatus)((int)imst + 1)) + if(imstatus2char[imst] == st) + break; + +@@ -1319,11 +1319,11 @@ + string w; + protocolname pname; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + p[pname] = buf.empty(); + + while(!(w = getword(buf)).empty()) { +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(getprotocolname(pname) == w) { + if(excludenochat) { + p[pname] = !gethook(pname).getCapabs().count(hookcapab::nochat); Index: ports/net/centericq/files/patch-src::icqcontact.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::icqcontact.cc diff -N ports/net/centericq/files/patch-src::icqcontact.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::icqcontact.cc 11 Aug 2004 14:48:48 -0000 @@ -0,0 +1,11 @@ +--- src/icqcontact.cc.orig Wed Aug 11 17:44:05 2004 ++++ src/icqcontact.cc Wed Aug 11 17:44:26 2004 +@@ -48,7 +48,7 @@ + finlist = true; + congratulated = false; + +- for(ie = imevent::message; ie != imevent::imeventtype_size; (int) ie += 1) ++ for(ie = imevent::message; ie != imevent::imeventtype_size; ie = (imevent::imeventtype)((int)ie + 1)) + sound[ie] = ""; + + cdesc = adesc; Index: ports/net/centericq/files/patch-src::icqdialogs.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::icqdialogs.cc diff -N ports/net/centericq/files/patch-src::icqdialogs.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::icqdialogs.cc 11 Aug 2004 14:55:59 -0000 @@ -0,0 +1,139 @@ +--- src/icqdialogs.cc.orig Wed Aug 11 17:54:17 2004 ++++ src/icqdialogs.cc Wed Aug 11 17:55:48 2004 +@@ -174,7 +174,7 @@ + imsearchparams ts; + + if(subj != fsrss) { +- for(protocolname apname = icq; apname != protocolname_size; (int) apname += 1) { ++ for(protocolname apname = icq; apname != protocolname_size; apname = (protocolname)((int)apname + 1)) { + if(subj == fschannel) + if(!gethook(apname).getCapabs().count(hookcapab::conferencing)) + continue; +@@ -937,7 +937,7 @@ + m.setwindow(textwindow(4, LINES-8, 20, LINES-4, conf.getcolor(cp_dialog_menu))); + m.idle = &menuidle; + +- for(imgender i = genderUnspec; i != imgender_size; (int) i += 1) { ++ for(imgender i = genderUnspec; i != imgender_size; i = (imgender)((int)i + 1)) { + m.additemf(0, (int) i, " %s", strgender(i)); + if(i == f) m.setpos(m.getcount()-1); + } +@@ -953,7 +953,7 @@ + m.setwindow(textwindow(4, LINES-8, 18, LINES-3, conf.getcolor(cp_dialog_menu))); + m.idle = &menuidle; + +- for(ICQ2000::AgeRange i = ICQ2000::RANGE_NORANGE; i <= ICQ2000::RANGE_60_ABOVE; (int) i += 1) { ++ for(ICQ2000::AgeRange i = ICQ2000::RANGE_NORANGE; i <= ICQ2000::RANGE_60_ABOVE; i = (ICQ2000::AgeRange)((int)i + 1)) { + const char *p = stragerange(i); + + if(i == ICQ2000::RANGE_NORANGE) +@@ -1073,11 +1073,11 @@ + void icqface::multichange(bool conv[], bool newstate) { + protocolname pname; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if((!conf.getourid(pname).empty() || pname == rss) && conv[pname]) break; + + if(pname == protocolname_size || !newstate) { +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(!conf.getourid(pname).empty() || pname == rss) + conv[pname] = newstate; + } +@@ -1134,14 +1134,14 @@ + bool chatmode[protocolname_size], conv[protocolname_size], + entersends[protocolname_size], nonimonline[protocolname_size]; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + chatmode[pname] = conf.getchatmode(pname); + entersends[pname] = conf.getentersends(pname); + conv[pname] = conf.getcpconvert(pname); + nonimonline[pname] = conf.getnonimonline(pname); + } + +- for(hasany = false, pname = icq; pname != protocolname_size && !hasany; (int) pname += 1) ++ for(hasany = false, pname = icq; pname != protocolname_size && !hasany; pname = (protocolname)((int)pname + 1)) + hasany = !conf.getourid(pname).empty(); + + dialogbox db; +@@ -1184,7 +1184,7 @@ + + i = t.addnode(_(" Codepages conversion ")); + +- for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(tmp = "", pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(conv[pname]) + if(!conf.getourid(pname).empty() || pname == rss) + tmp += conf.getprotocolname(pname) + " "; +@@ -1207,13 +1207,13 @@ + t.addleaff(i, 0, 7, _(" Edit away message on status change : %s "), stryesno(askaway)); + + if(hasany) { +- for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(tmp = "", pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(chatmode[pname] && !conf.getourid(pname).empty()) + tmp += conf.getprotocolname(pname) + " "; + + t.addleaff(i, 0, 16, _(" Chat messaging mode for : %s"), tmp.c_str()); + +- for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(tmp = "", pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(entersends[pname] && !conf.getourid(pname).empty()) + tmp += conf.getprotocolname(pname) + " "; + +@@ -1225,7 +1225,7 @@ + + } + +- for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(tmp = "", pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(nonimonline[pname]) tmp += conf.getprotocolname(pname) + " "; + + t.addleaff(i, 0, 29, _(" Always online non-IM contacts for : %s"), tmp.c_str()); +@@ -1272,7 +1272,7 @@ + break; + case 3: + if(hasany) selectproto(conv, spIMplusRSS); else +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + conv[pname] = !conv[pname]; + break; + case 4: +@@ -1294,7 +1294,7 @@ + case 15: mailcheck = !mailcheck; break; + case 16: + if(hasany) selectproto(chatmode); else +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + chatmode[pname] = !chatmode[pname]; + break; + +@@ -1334,7 +1334,7 @@ + break; + case 25: + if(hasany) selectproto(entersends); else +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + entersends[pname] = !entersends[pname]; + break; + case 26: +@@ -1388,7 +1388,7 @@ + conf.setproxyconnect(proxyconnect); + conf.setcharsets(convertfrom, convertto); + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + conf.setchatmode(pname, chatmode[pname]); + conf.setentersends(pname, entersends[pname]); + conf.setnonimonline(pname, nonimonline[pname]); +@@ -1433,7 +1433,7 @@ + i = 0; + memcpy(aprots, prots, sizeof(aprots)); + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(mode == spnonIM) { + if(pname != infocard) + if(!gethook(pname).getCapabs().count(hookcapab::nochat)) Index: ports/net/centericq/files/patch-src::icqface.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::icqface.cc diff -N ports/net/centericq/files/patch-src::icqface.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::icqface.cc 11 Aug 2004 15:02:41 -0000 @@ -0,0 +1,53 @@ +--- src/icqface.cc.orig Wed Aug 11 18:01:32 2004 ++++ src/icqface.cc Wed Aug 11 18:02:31 2004 +@@ -208,7 +208,7 @@ + protocolname pname; + icqconf::imaccount ia; + +- for(pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + ia = conf.getourid(pname); + + if(!ia.empty()) { +@@ -1320,7 +1320,7 @@ + "" + }; + +- for(ipname = icq; ipname != protocolname_size; (int) ipname += 1) { ++ for(ipname = icq; ipname != protocolname_size; ipname = (protocolname)((int)ipname + 1)) { + ia = conf.getourid(ipname); + + if(!ia.empty()) { +@@ -1343,7 +1343,7 @@ + + m.idle = &menuidle; + +- for(protcount = 0, pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(protcount = 0, pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if(!conf.getourid(pname).empty()) { + protcount++; + onechoice = pname; +@@ -1372,12 +1372,12 @@ + if(r = i) { + switch(choice) { + case -1: +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(!conf.getourid(pname).empty()) + pnames.push_back(pname); + break; + case -2: +- for(pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(!conf.getourid(pname).empty()) + if(gethook(pname).getstatus() != offline) + pnames.push_back(pname); +@@ -1658,7 +1658,7 @@ + + set ps; + if(cs == csvisible || cs == csinvisible) { +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + if(gethook(pname).getCapabs().count(hookcapab::visibility)) + ps.insert(pname); + } Index: ports/net/centericq/files/patch-src::icqgroup.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::icqgroup.cc diff -N ports/net/centericq/files/patch-src::icqgroup.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::icqgroup.cc 11 Aug 2004 15:03:20 -0000 @@ -0,0 +1,10 @@ +--- src/icqgroup.cc.orig Wed Aug 11 18:03:03 2004 ++++ src/icqgroup.cc Wed Aug 11 18:03:11 2004 +@@ -82,6 +82,6 @@ + string oldname = name; + name = aname; + +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) + gethook(pname).renamegroup(oldname, name); + } Index: ports/net/centericq/files/patch-src::imevents.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::imevents.cc diff -N ports/net/centericq/files/patch-src::imevents.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::imevents.cc 11 Aug 2004 15:01:16 -0000 @@ -0,0 +1,19 @@ +--- src/imevents.cc.orig Wed Aug 11 18:00:35 2004 ++++ src/imevents.cc Wed Aug 11 18:01:06 2004 +@@ -111,14 +111,14 @@ + if(rdbuf == "\f") + getstring(f, rdbuf); + +- for(direction = incoming; direction != imdirection_size; (int) direction += 1) ++ for(direction = incoming; direction != imdirection_size; direction = (imdirection)((int)direction + 1)) + if(sdirection[direction] == rdbuf) break; + + getstring(f, rdbuf); + type = imeventtype_size; + + if(rdbuf != "") { +- for(type = message; type != imeventtype_size; (int) type += 1) ++ for(type = message; type != imeventtype_size; type = (imeventtype)((int)type + 1)) + if(seventtype[type] == rdbuf) break; + } + Index: ports/net/centericq/files/patch-src::imexternal.cc =================================================================== RCS file: ports/net/centericq/files/patch-src::imexternal.cc diff -N ports/net/centericq/files/patch-src::imexternal.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/centericq/files/patch-src::imexternal.cc 11 Aug 2004 14:56:33 -0000 @@ -0,0 +1,20 @@ +--- src/imexternal.cc.orig Sat Mar 20 18:49:08 2004 ++++ src/imexternal.cc Wed Aug 11 17:56:24 2004 +@@ -393,7 +393,7 @@ + + if(param == "event") { + while(!(param = getword(buf)).empty()) { +- for(imevent::imeventtype et = imevent::message; et != imevent::imeventtype_size; (int) et += 1) { ++ for(imevent::imeventtype et = imevent::message; et != imevent::imeventtype_size; et = (imevent::imeventtype)((int)et + 1)) { + if((param == geteventname(et)) + || (param == "all")) { + event.insert(et); +@@ -403,7 +403,7 @@ + + } else if(param == "proto") { + while(!(param = getword(buf)).empty()) { +- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) { ++ for(protocolname pname = icq; pname != protocolname_size; pname = (protocolname)((int)pname + 1)) { + if((param == conf.getprotocolname(pname)) + || (param == "all")) { + proto.insert(pname);