patch to compile with gcc 3.4

centericq-4.10.0-gcc3.4.patch (text/plain), 52.93 KB, created by Laurent Maestracci on 2004-07-04 05:17:15 UTC

Only in centericq-4.10.0-patch: Makefile
Only in centericq-4.10.0-patch: config.cache
Only in centericq-4.10.0-patch: config.h
Only in centericq-4.10.0-patch: config.log
Only in centericq-4.10.0-patch: config.status
Only in centericq-4.10.0-patch/connwrap-0.1: .deps
Only in centericq-4.10.0-patch/connwrap-0.1: Makefile
Only in centericq-4.10.0-patch/connwrap-0.1: config.log
Only in centericq-4.10.0-patch/connwrap-0.1: config.status
Only in centericq-4.10.0-patch/connwrap-0.1: connwrap.o
Only in centericq-4.10.0-patch/connwrap-0.1: libconnwrap.a
Only in centericq-4.10.0-patch/connwrap-0.1: md5.o
Only in centericq-4.10.0-patch/firetalk-0.1: .deps
Only in centericq-4.10.0-patch/firetalk-0.1: Makefile
Only in centericq-4.10.0-patch/firetalk-0.1: aim.o
Only in centericq-4.10.0-patch/firetalk-0.1: config.log
Only in centericq-4.10.0-patch/firetalk-0.1: config.status
Only in centericq-4.10.0-patch/firetalk-0.1: firetalk.o
Only in centericq-4.10.0-patch/firetalk-0.1: irc.o
Only in centericq-4.10.0-patch/firetalk-0.1: libfiretalk.a
Only in centericq-4.10.0-patch/firetalk-0.1: oscar.o
Only in centericq-4.10.0-patch/firetalk-0.1: safestring.o
Only in centericq-4.10.0-patch/firetalk-0.1: toc.o
Only in centericq-4.10.0-patch/intl: Makefile
Only in centericq-4.10.0-patch/kkconsui-0.1: Makefile
Only in centericq-4.10.0-patch/kkconsui-0.1: config.log
Only in centericq-4.10.0-patch/kkconsui-0.1: config.status
Only in centericq-4.10.0-patch/kkconsui-0.1/include: Makefile
Only in centericq-4.10.0-patch/kkconsui-0.1: libkkconsui.a
Only in centericq-4.10.0-patch/kkconsui-0.1/src: .deps
Only in centericq-4.10.0-patch/kkconsui-0.1/src: Makefile
Only in centericq-4.10.0-patch/kkconsui-0.1/src: abstractui.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: cmenus.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: colorschemer.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: conscommon.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: dialogbox.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: fileselector.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: horizontalbar.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: libsrc.a
Only in centericq-4.10.0-patch/kkconsui-0.1/src: linkedlist.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: screenarea.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: textbrowser.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: texteditor.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: textinputline.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: textwindow.o
Only in centericq-4.10.0-patch/kkconsui-0.1/src: treeview.o
Only in centericq-4.10.0-patch/kkstrtext-0.1: .deps
Only in centericq-4.10.0-patch/kkstrtext-0.1: Makefile
Only in centericq-4.10.0-patch/kkstrtext-0.1: config.log
Only in centericq-4.10.0-patch/kkstrtext-0.1: config.status
Only in centericq-4.10.0-patch/kkstrtext-0.1: kkstrtext.o
Only in centericq-4.10.0-patch/kkstrtext-0.1: libkkstrtext.a
Only in centericq-4.10.0-patch/kksystr-0.1: Makefile
Only in centericq-4.10.0-patch/kksystr-0.1: config.log
Only in centericq-4.10.0-patch/kksystr-0.1: config.status
Only in centericq-4.10.0-patch/kksystr-0.1/include: Makefile
Only in centericq-4.10.0-patch/kksystr-0.1: libkksystr.a
Only in centericq-4.10.0-patch/kksystr-0.1/src: .deps
Only in centericq-4.10.0-patch/kksystr-0.1/src: Makefile
Only in centericq-4.10.0-patch/kksystr-0.1/src: kkfsys.o
Only in centericq-4.10.0-patch/kksystr-0.1/src: kkiproc.o
Only in centericq-4.10.0-patch/kksystr-0.1/src: libsrc.a
Only in centericq-4.10.0-patch/libgadu-0.1: .deps
Only in centericq-4.10.0-patch/libgadu-0.1: Makefile
Only in centericq-4.10.0-patch/libgadu-0.1: common.o
Only in centericq-4.10.0-patch/libgadu-0.1: config.log
Only in centericq-4.10.0-patch/libgadu-0.1: config.status
Only in centericq-4.10.0-patch/libgadu-0.1: dcc.o
Only in centericq-4.10.0-patch/libgadu-0.1: events.o
Only in centericq-4.10.0-patch/libgadu-0.1: http.o
Only in centericq-4.10.0-patch/libgadu-0.1: libgadu.o
Only in centericq-4.10.0-patch/libgadu-0.1: liblibgadu.a
Only in centericq-4.10.0-patch/libgadu-0.1: obsolete.o
Only in centericq-4.10.0-patch/libgadu-0.1: pubdir.o
Only in centericq-4.10.0-patch/libgadu-0.1: pubdir50.o
Only in centericq-4.10.0-patch/libicq2000-0.1: Makefile
Only in centericq-4.10.0-patch/libicq2000-0.1: config.h
Only in centericq-4.10.0-patch/libicq2000-0.1: config.log
Only in centericq-4.10.0-patch/libicq2000-0.1: config.status
Only in centericq-4.10.0-patch/libicq2000-0.1/libicq2000: Makefile
diff -aur centericq-4.10.0/libicq2000-0.1/libicq2000/sigslot.h centericq-4.10.0-patch/libicq2000-0.1/libicq2000/sigslot.h
--- centericq-4.10.0/libicq2000-0.1/libicq2000/sigslot.h	2004-02-11 00:51:44.000000000 +0100
+++ centericq-4.10.0-patch/libicq2000-0.1/libicq2000/sigslot.h	2004-07-04 11:04:18.780208048 +0200
@@ -434,7 +434,7 @@
 		void slot_duplicate(const has_slots<mt_policy>* oldtarget, has_slots<mt_policy>* newtarget)
 		{
 			lock_block<mt_policy> lock(this);
-			typename connections_list::iterator it = m_connected_slots.begin();
+			typename connections_list::iterator it = this->m_connected_slots.begin();
 			typename connections_list::iterator itEnd = m_connected_slots.end();
 
 			while(it != itEnd)
@@ -745,8 +745,8 @@
 	public:
 		_connection0()
 		{
-			pobject = NULL;
-			pmemfun = NULL;
+			m_pobject = NULL;
+			m_pmemfun = NULL;
 		}
 
 		_connection0(dest_type* pobject, void (dest_type::*pmemfun)())
@@ -786,8 +786,8 @@
 	public:
 		_connection1()
 		{
-			pobject = NULL;
-			pmemfun = NULL;
+			m_pobject = NULL;
+			m_pmemfun = NULL;
 		}
 
 		_connection1(dest_type* pobject, void (dest_type::*pmemfun)(arg1_type))
@@ -827,8 +827,8 @@
 	public:
 		_connection2()
 		{
-			pobject = NULL;
-			pmemfun = NULL;
+			m_pobject = NULL;
+			m_pmemfun = NULL;
 		}
 
 		_connection2(dest_type* pobject, void (dest_type::*pmemfun)(arg1_type, arg2_type))
@@ -889,7 +889,7 @@
 			lock_block<mt_policy> lock(this);
 			_connection0<dest_type, mt_policy>* conn
 			    = new _connection0<dest_type, mt_policy>(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<mt_policy> lock(this);
 			_sig_connection0<mt_policy>* conn = new _sig_connection0<mt_policy>(chainsig);
-			m_connected_slots.push_back(conn);
+			this->m_connected_slots.push_back(conn);
 			chainsig.signal_connect(this);
 		}
 
 		void emit()
 		{
 			lock_block<mt_policy> 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<mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+			typename _signal_base0<mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
 
 			while(it != itEnd)
 			{
@@ -921,8 +921,8 @@
 		void operator()()
 		{
 			lock_block<mt_policy> 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<mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+			typename _signal_base0<mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
 
 			while(it != itEnd)
 			{
@@ -957,7 +957,7 @@
 			lock_block<mt_policy> lock(this);
 			_connection1<dest_type, arg1_type, mt_policy>* conn
 			    = new _connection1<dest_type, arg1_type, mt_policy>(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<mt_policy> lock(this);
 			_sig_connection1<arg1_type, mt_policy>* conn = new _sig_connection1<arg1_type, mt_policy>(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<mt_policy> 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<arg1_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+			typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
 
 			while(it != itEnd)
 			{
@@ -989,8 +989,8 @@
 		void operator()(arg1_type a1)
 		{
 			lock_block<mt_policy> 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<arg1_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+			typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
 
 			while(it != itEnd)
 			{
@@ -1025,7 +1025,7 @@
 			lock_block<mt_policy> lock(this);
 			_connection2<dest_type, arg1_type, arg2_type, mt_policy>* conn
 			    = new _connection2<dest_type, arg1_type, arg2_type, mt_policy>(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<mt_policy> lock(this);
 			_sig_connection2<arg1_type, arg2_type, mt_policy>* conn = new _sig_connection2<arg1_type, arg2_type, mt_policy>(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<mt_policy> 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<arg1_type, arg2_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+			typename _signal_base2<arg1_type, arg2_type, mt_policy>::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<mt_policy> 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<arg1_type, arg2_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+			typename _signal_base2<arg1_type, arg2_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
 
 			while(it != itEnd)
 			{
Only in centericq-4.10.0-patch/libicq2000-0.1: liblibicq2000.a
Only in centericq-4.10.0-patch/libicq2000-0.1/src: .deps
Only in centericq-4.10.0-patch/libicq2000-0.1/src: Capabilities.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: Client.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: Contact.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: ContactList.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: ContactTree.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: DirectClient.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: FileTransferClient.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: ICBMCookie.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: ICQ.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: Makefile
Only in centericq-4.10.0-patch/libicq2000-0.1/src: MessageHandler.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SMTPClient.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-BOS.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-BUD.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-GEN.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-LOC.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-MSG.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-SBL.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-SRV.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-UIN.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC-base.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SNAC.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: SocketClient.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: TLV.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: Translator.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: UserInfoBlock.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: Xml.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: buffer.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: events.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: exceptions.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: libsrc.a
Only in centericq-4.10.0-patch/libicq2000-0.1/src: socket.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: time_extra.o
Only in centericq-4.10.0-patch/libicq2000-0.1/src: version.o
Only in centericq-4.10.0-patch/libicq2000-0.1: stamp-h
Only in centericq-4.10.0-patch/libjabber-0.1: .deps
Only in centericq-4.10.0-patch/libjabber-0.1: Makefile
Only in centericq-4.10.0-patch/libjabber-0.1: config.log
Only in centericq-4.10.0-patch/libjabber-0.1: config.status
Only in centericq-4.10.0-patch/libjabber-0.1: expat.o
Only in centericq-4.10.0-patch/libjabber-0.1: genhash.o
Only in centericq-4.10.0-patch/libjabber-0.1: hashtable.o
Only in centericq-4.10.0-patch/libjabber-0.1: jconn.o
Only in centericq-4.10.0-patch/libjabber-0.1: jid.o
Only in centericq-4.10.0-patch/libjabber-0.1: jpacket.o
Only in centericq-4.10.0-patch/libjabber-0.1: jutil.o
Only in centericq-4.10.0-patch/libjabber-0.1: liblibjabber.a
Only in centericq-4.10.0-patch/libjabber-0.1: log.o
Only in centericq-4.10.0-patch/libjabber-0.1: pool.o
Only in centericq-4.10.0-patch/libjabber-0.1: pproxy.o
Only in centericq-4.10.0-patch/libjabber-0.1: rate.o
Only in centericq-4.10.0-patch/libjabber-0.1: sha.o
Only in centericq-4.10.0-patch/libjabber-0.1: snprintf.o
Only in centericq-4.10.0-patch/libjabber-0.1: socket.o
Only in centericq-4.10.0-patch/libjabber-0.1: str.o
Only in centericq-4.10.0-patch/libjabber-0.1: xmlnode.o
Only in centericq-4.10.0-patch/libjabber-0.1: xmlparse.o
Only in centericq-4.10.0-patch/libjabber-0.1: xmlrole.o
Only in centericq-4.10.0-patch/libjabber-0.1: xmltok.o
Only in centericq-4.10.0-patch/libjabber-0.1: xstream.o
Only in centericq-4.10.0-patch/libmsn-0.1: Makefile
Only in centericq-4.10.0-patch/libmsn-0.1: config.h
Only in centericq-4.10.0-patch/libmsn-0.1: config.log
Only in centericq-4.10.0-patch/libmsn-0.1: config.status
Only in centericq-4.10.0-patch/libmsn-0.1: liblibmsn.a
Only in centericq-4.10.0-patch/libmsn-0.1/msn: .deps
Only in centericq-4.10.0-patch/libmsn-0.1/msn: Makefile
Only in centericq-4.10.0-patch/libmsn-0.1/msn: authdata.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: buddy.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: connection.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: filetransfer.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: invitation.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: libmsn.a
Only in centericq-4.10.0-patch/libmsn-0.1/msn: message.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: notificationserver.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: passport.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: switchboardserver.o
Only in centericq-4.10.0-patch/libmsn-0.1/msn: util.o
Only in centericq-4.10.0-patch/libmsn-0.1: stamp-h
Only in centericq-4.10.0-patch/libyahoo2-0.1: .deps
Only in centericq-4.10.0-patch/libyahoo2-0.1: Makefile
Only in centericq-4.10.0-patch/libyahoo2-0.1: config.log
Only in centericq-4.10.0-patch/libyahoo2-0.1: config.status
Only in centericq-4.10.0-patch/libyahoo2-0.1: crypt.o
Only in centericq-4.10.0-patch/libyahoo2-0.1: liblibyahoo2.a
Only in centericq-4.10.0-patch/libyahoo2-0.1: libyahoo2.o
Only in centericq-4.10.0-patch/libyahoo2-0.1: sha.o
Only in centericq-4.10.0-patch/libyahoo2-0.1: yahoo_fn.o
Only in centericq-4.10.0-patch/libyahoo2-0.1: yahoo_httplib.o
Only in centericq-4.10.0-patch/libyahoo2-0.1: yahoo_list.o
Only in centericq-4.10.0-patch/libyahoo2-0.1: yahoo_util.o
Only in centericq-4.10.0-patch/misc: Makefile
Only in centericq-4.10.0-patch/po: Makefile
Only in centericq-4.10.0-patch/po: Makefile.in
Only in centericq-4.10.0-patch/po: POTFILES
Only in centericq-4.10.0-patch/share: Makefile
Only in centericq-4.10.0-patch/src: .deps
Only in centericq-4.10.0-patch/src: Makefile
diff -aur centericq-4.10.0/src/accountmanager.cc centericq-4.10.0-patch/src/accountmanager.cc
--- centericq-4.10.0/src/accountmanager.cc	2004-02-04 08:44:41.000000000 +0100
+++ centericq-4.10.0-patch/src/accountmanager.cc	2004-07-04 11:31:22.485367344 +0200
@@ -47,7 +47,7 @@
 
 void accountmanager::exec() {
     dialogbox db;
-    protocolname pname;
+    int pname;
     icqconf::imaccount account;
     int n, b, i, citem, action, pos;
     set<hookcapab::enumeration> capab;
@@ -75,15 +75,15 @@
     for(fin = false; !fin; ) {
 	t.clear();
 
-	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	    account = conf.getourid(pname);
+	for(pname = icq; pname != protocolname_size; pname += 1) {
+	    account = conf.getourid((protocolname) pname);
 
 	    if(pname != rss)
-	    if(gethook(pname).enabled() || !account.empty()) {
-		account = conf.getourid(pname);
-		n = t.addnode(0, 0, 0, " " + conf.getprotocolname(pname) + " ");
-		citem = ((int) (pname)+1) * 100;
-		capab = gethook(pname).getCapabs();
+	    if(gethook((protocolname) pname).enabled() || !account.empty()) {
+		account = conf.getourid((protocolname) pname);
+		n = t.addnode(0, 0, 0, " " + conf.getprotocolname((protocolname) pname) + " ");
+		citem = (pname+1) * 100;
+		capab = gethook((protocolname) pname).getCapabs();
 
 		if(!account.empty()) {
 		    tmp = "";
@@ -154,9 +154,9 @@
 	    pname = (protocolname) (citem/100-1);
 	    action = citem-(citem/100)*100;
 
-	    spname = conf.getprotocolname(pname);
-	    account = conf.getourid(pname);
-	    abstracthook &hook = gethook(pname);
+	    spname = conf.getprotocolname((protocolname) pname);
+	    account = conf.getourid((protocolname) pname);
+	    abstracthook &hook = gethook((protocolname) pname);
 
 	    switch(action) {
 		case 1:
@@ -190,7 +190,7 @@
 
 		case 8:
 		    if(!hook.online()) {
-			account = icqconf::imaccount(pname);
+			account = icqconf::imaccount((protocolname) pname);
 		    } else {
 			face.status(_("You have to disconnect the service first!"));
 		    }
@@ -215,9 +215,9 @@
 		    break;
 
 		case 10:
-		    if(face.edit(tmp = conf.getawaymsg(pname),
+		    if(face.edit(tmp = conf.getawaymsg((protocolname) pname),
 		    spname + ": " + _("away message"))) {
-			conf.setawaymsg(pname, tmp);
+			conf.setawaymsg((protocolname) pname, tmp);
 		    }
 		    break;
 
Only in centericq-4.10.0-patch/src: accountmanager.o
Only in centericq-4.10.0-patch/src: centericq
diff -aur centericq-4.10.0/src/centericq.cc centericq-4.10.0-patch/src/centericq.cc
--- centericq-4.10.0/src/centericq.cc	2004-06-19 15:17:56.000000000 +0200
+++ centericq-4.10.0-patch/src/centericq.cc	2004-07-04 13:55:13.076318088 +0200
@@ -71,8 +71,8 @@
 	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)
-		conf.setcpconvert(pname, true);
+	    for(int pname = icq; pname != protocolname_size; pname += 1)
+		conf.setcpconvert((protocolname) pname, true);
 	}
 
 	if(updateconf()) {
@@ -118,20 +118,20 @@
 }
 
 bool centericq::checkpasswords() {
-    protocolname pname;
+    int pname;
     icqconf::imaccount ia;
     bool r;
 
     r = regmode = true;
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	if(gethook(pname).enabled() && !gethook(pname).getCapabs().count(hookcapab::optionalpassword)) {
-	    if(!(ia = conf.getourid(pname)).empty()) {
+    for(pname = icq; pname != protocolname_size; pname += 1) {
+	if(gethook((protocolname) pname).enabled() && !gethook((protocolname) pname).getCapabs().count(hookcapab::optionalpassword)) {
+	    if(!(ia = conf.getourid((protocolname) pname)).empty()) {
 		if(ia.password.empty()) {
 		    conf.setsavepwd(false);
 
 		    ia.password = face.inputstr("[" +
-			conf.getprotocolname(pname) + "] " +
+			conf.getprotocolname((protocolname) pname) + "] " +
 			_("password: "), "", '*');
 
 		    if(ia.password.empty()) {
@@ -150,10 +150,10 @@
 }
 
 void centericq::inithooks() {
-    protocolname pname;
+    int pname;
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	gethook(pname).init();
+    for(pname = icq; pname != protocolname_size; pname += 1) {
+	gethook((protocolname) pname).init();
     }
 }
 
@@ -840,25 +840,25 @@
 }
 
 void centericq::rereadstatus() {
-    protocolname pname;
+    int pname;
     icqconf::imaccount ia;
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	ia = conf.getourid(pname);
+    for(pname = icq; pname != protocolname_size; pname += 1) {
+	ia = conf.getourid((protocolname) pname);
 
 	if(!ia.empty()) {
 	    char cst;
-	    imstatus st;
-	    string fname = conf.getconfigfname((string) "status-" + conf.getprotocolname(pname));
+	    int st;
+	    string fname = conf.getconfigfname((string) "status-" + conf.getprotocolname((protocolname) pname));
 	    ifstream f(fname.c_str());
 
 	    if(f.is_open()) {
 		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 += 1) {
 		    if(imstatus2char[st] == cst) {
-			gethook(pname).setstatus(st);
+			gethook((protocolname) pname).setstatus((imstatus) st);
 			break;
 		    }
 		}
@@ -1365,7 +1365,7 @@
     fd_set rfds, wfds, efds;
     struct timeval tv;
     int hsockfd;
-    protocolname pname;
+    int pname;
 
     for(keypressed = fin = false; !keypressed && !fin; ) {
 	timer_keypress = lastkeypress();
@@ -1380,8 +1380,8 @@
 	if(!regmode) {
 	    exectimers();
 
-	    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-		abstracthook &hook = gethook(pname);
+	    for(pname = icq; pname != protocolname_size; pname += 1) {
+		abstracthook &hook = gethook((protocolname) pname);
 
 		if(hook.online()) {
 		    hook.getsockets(rfds, wfds, efds, hsockfd);
@@ -1399,8 +1399,8 @@
 	    keypressed = true;
 	    time(&timer_keypress);
 	} else {
-	    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-		abstracthook &hook = gethook(pname);
+	    for(pname = icq; pname != protocolname_size; pname += 1) {
+		abstracthook &hook = gethook((protocolname) pname);
 
 		if(hook.online())
 		if(hook.isoursocket(rfds, wfds, efds)) {
@@ -1415,7 +1415,7 @@
 }
 
 void centericq::setauto(imstatus astatus) {
-    protocolname pname;
+    int pname;
     imstatus stcurrent;
     static bool autoset = false;
     bool nautoset, changed = false;
@@ -1429,8 +1429,8 @@
 	nautoset = false;
     }
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	abstracthook &hook = gethook(pname);
+    for(pname = icq; pname != protocolname_size; pname += 1) {
+	abstracthook &hook = gethook((protocolname) pname);
 	stcurrent = hook.getstatus();
 
 	if(hook.logged())
@@ -1442,7 +1442,7 @@
 	    default:
 		if(autoset && (astatus == available)) {
 		    face.log(_("+ [%s] status restored"),
-			conf.getprotocolname(pname).c_str());
+			conf.getprotocolname((protocolname) pname).c_str());
 
 		    hook.restorestatus();
 		    nautoset = false;
@@ -1457,7 +1457,7 @@
 			nautoset = changed = true;
 
 			face.log(_("+ [%s] automatically set %s"),
-			    conf.getprotocolname(pname).c_str(),
+			    conf.getprotocolname((protocolname) pname).c_str(),
 			    astatus == away ? _("away") : _("n/a"));
 		    }
 		}
@@ -1474,7 +1474,7 @@
 #define MINCK0(x, y)       (x ? (y ? (x > y ? y : x) : x) : y)
 
 void centericq::exectimers() {
-    protocolname pname;
+    int pname;
     int paway, pna;
     bool fonline = false;
 
@@ -1486,9 +1486,9 @@
     *
     */
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	if(!conf.getourid(pname).empty() || (pname == rss)) {
-	    abstracthook &hook = gethook(pname);
+    for(pname = icq; pname != protocolname_size; pname += 1) {
+	if(!conf.getourid((protocolname) pname).empty() || (pname == rss)) {
+	    abstracthook &hook = gethook((protocolname) pname);
 
 	    /*
 	    *
@@ -1498,7 +1498,7 @@
 
 	    hook.exectimers();
 
-	    if(timer_current-reconnect[pname].timer > reconnect[pname].period) {
+	    if(timer_current-reconnect[(protocolname) pname].timer > reconnect[(protocolname) pname].period) {
 		/*
 		*
 		* Any need to try auto re-connecting?
@@ -1506,15 +1506,15 @@
 		*/
 
 		if(!hook.logged()) {
-		    reconnect[pname].timer = timer_current;
+		    reconnect[(protocolname) pname].timer = timer_current;
 
-		    if(reconnect[pname].period < 180)
-			reconnect[pname].period += reconnect[pname].period/2;
+		    if(reconnect[(protocolname) pname].period < 180)
+			reconnect[(protocolname) pname].period += reconnect[(protocolname) pname].period/2;
 
 		    if(hook.online()) {
 			hook.disconnect();
 
-		    } else if(conf.getstatus(pname) != offline) {
+		    } else if(conf.getstatus((protocolname) pname) != offline) {
 			if(conf.enoughdiskspace() && !manager.isopen()) {
 			    hook.connect();
 			}
@@ -1522,7 +1522,7 @@
 		    }
 		} else {
 		    fonline = true;
-		    reconnect[pname] = reconnectInfo();
+		    reconnect[(protocolname) pname] = reconnectInfo();
 		}
 	    }
 	}
@@ -1580,8 +1580,8 @@
 
 	if(!conf.enoughdiskspace()) {
 	    if(fonline) {
-		for(pname = icq; pname != protocolname_size; (int) pname += 1)
-		    gethook(pname).disconnect();
+		for(pname = icq; pname != protocolname_size; pname += 1)
+		    gethook((protocolname) pname).disconnect();
 
 		face.log(_("! free disk space is less than 10k, going offline"));
 		face.log(_("! otherwise we can lose events and configuration"));
Only in centericq-4.10.0-patch/src: centericq.o
Only in centericq-4.10.0-patch/src: centermain.o
Only in centericq-4.10.0-patch/src: eventmanager.o
Only in centericq-4.10.0-patch/src/hooks: .deps
Only in centericq-4.10.0-patch/src/hooks: HTTPClient.o
Only in centericq-4.10.0-patch/src/hooks: Makefile
diff -aur centericq-4.10.0/src/hooks/abstracthook.cc centericq-4.10.0-patch/src/hooks/abstracthook.cc
--- centericq-4.10.0/src/hooks/abstracthook.cc	2004-04-11 18:32:28.000000000 +0200
+++ centericq-4.10.0-patch/src/hooks/abstracthook.cc	2004-07-04 11:10:45.830367480 +0200
@@ -71,9 +71,9 @@
 void abstracthook::setstatus(imstatus st) {
     setautostatus(manualstatus = st);
 
-    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
-	if(&gethook(pname) == this) {
-	    conf.savestatus(pname, manualstatus);
+    for(int pname = icq; pname != protocolname_size; pname += 1) {
+	if(&gethook((protocolname)pname) == this) {
+	    conf.savestatus((protocolname)pname, manualstatus);
 	    break;
 	}
     }
Only in centericq-4.10.0-patch/src/hooks: abstracthook.o
Only in centericq-4.10.0-patch/src/hooks: aimhook.o
Only in centericq-4.10.0-patch/src/hooks: gaduhook.o
Only in centericq-4.10.0-patch/src/hooks: icqhook.o
Only in centericq-4.10.0-patch/src/hooks: irchook.o
Only in centericq-4.10.0-patch/src/hooks: jabberhook.o
Only in centericq-4.10.0-patch/src/hooks: libhooks.a
Only in centericq-4.10.0-patch/src/hooks: ljhook.o
Only in centericq-4.10.0-patch/src/hooks: msnhook.o
Only in centericq-4.10.0-patch/src/hooks: rsshook.o
Only in centericq-4.10.0-patch/src/hooks: yahoohook.o
diff -aur centericq-4.10.0/src/icqconf.cc centericq-4.10.0-patch/src/icqconf.cc
--- centericq-4.10.0/src/icqconf.cc	2004-06-11 01:17:31.000000000 +0200
+++ centericq-4.10.0-patch/src/icqconf.cc	2004-07-04 11:42:45.634512888 +0200
@@ -52,7 +52,7 @@
 
     savepwd = mailcheck = fenoughdiskspace = true;
 
-    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
+    for(int pname = icq; pname != protocolname_size; pname += 1) {
 	chatmode[pname] = true;
 	cpconvert[pname] = entersends[pname] = nonimonline[pname] = false;
     }
@@ -376,7 +376,7 @@
     string fname = getconfigfname("config"), buf, param, rbuf;
     ifstream f(fname.c_str());
     imaccount im;
-    protocolname pname;
+    int pname;
 
     if(f.is_open()) {
 	mailcheck = askaway = false;
@@ -418,10 +418,10 @@
 		ptpmin = atoi(getword(buf, "-").c_str());
 		ptpmax = atoi(buf.c_str());
 	    } else {
-		for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-		    buf = getprotocolname(pname);
+		for(pname = icq; pname != protocolname_size; pname += 1) {
+		    buf = getprotocolname((protocolname) pname);
 		    if(param.substr(0, buf.size()) == buf) {
-			im = getourid(pname);
+			im = getourid((protocolname) pname);
 			im.read(rbuf);
 			setourid(im);
 		    }
@@ -430,8 +430,8 @@
 	}
 
 	if(fromcharset.empty() && tocharset.empty())
-	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	    if(getcpconvert(pname)) {
+	for(pname = icq; pname != protocolname_size; pname += 1) {
+	    if(getcpconvert((protocolname) pname)) {
 		fromcharset = "cp1251";
 		tocharset = "koi8-r";
 		break;
@@ -470,26 +470,26 @@
 	    if(getaskaway()) f << "askaway" << endl;
 
 	    param = "";
-	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
-		if(getchatmode(pname)) param += (string) " " + conf.getprotocolname(pname);
+	    for(int pname = icq; pname != protocolname_size; pname += 1)
+		if(getchatmode((protocolname) pname)) param += (string) " " + conf.getprotocolname((protocolname) pname);
 	    if(!param.empty())
 		f << "chatmode" << param << endl;
 
 	    param = "";
-	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
-		if(getentersends(pname)) param += (string) " " + conf.getprotocolname(pname);
+	    for(int pname = icq; pname != protocolname_size; pname += 1)
+		if(getentersends((protocolname) pname)) param += (string) " " + conf.getprotocolname((protocolname) pname);
 	    if(!param.empty())
 		f << "entersends" << param << endl;
 
 	    param = "";
-	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
-		if(getnonimonline(pname)) param += (string) " " + conf.getprotocolname(pname);
+	    for(int pname = icq; pname != protocolname_size; pname += 1)
+		if(getnonimonline((protocolname) pname)) param += (string) " " + conf.getprotocolname((protocolname) pname);
 	    if(!param.empty())
 		f << "nonimonline" << param << endl;
 
 	    param = "";
-	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
-		if(getcpconvert(pname)) param += (string) " " + conf.getprotocolname(pname);
+	    for(int pname = icq; pname != protocolname_size; pname += 1)
+		if(getcpconvert((protocolname) pname)) param += (string) " " + conf.getprotocolname((protocolname) pname);
 	    if(!param.empty())
 		f << "convert" << param << endl;
 
@@ -594,7 +594,7 @@
     string tname = getconfigfname("sounds"), buf, suin, skey;
     int n, ffuin, i;
     icqcontact *c;
-    imevent::imeventtype it;
+    int it;
 
     typedef pair<imevent::imeventtype, string> eventsound;
     vector<eventsound> soundnames;
@@ -609,8 +609,8 @@
     for(i = 0; i < clist.count; i++) {
 	c = (icqcontact *) clist.at(i);
 
-	for(it = imevent::message; it != imevent::imeventtype_size; (int) it += 1) {
-	    c->setsound(it, "");
+	for(it = imevent::message; it != imevent::imeventtype_size; it += 1) {
+	    c->setsound((imevent::imeventtype) it, "");
 	}
     }
 
@@ -685,20 +685,20 @@
 		    suin.erase(0, i+1);
 
 		    imcontact ic;
-		    protocolname pname;
+		    int pname;
 
-		    for(pname = icq; pname != protocolname_size && skey != getprotocolname(pname); (int) pname += 1);
+		    for(pname = icq; pname != protocolname_size && skey != getprotocolname((protocolname) pname); pname += 1);
 
 		    if(pname != protocolname_size) {
 			if(suin == "*") {
 			    for(i = 0; i < clist.count; i++) {
 				c = (icqcontact *) clist.at(i);
 
-				if(c->getdesc().pname == pname) c->setsound(it, buf);
+				if(c->getdesc().pname == (protocolname) pname) c->setsound((imevent::imeventtype) it, buf);
 			    }
 			} else {
-			    if(pname == icq) ic = imcontact(strtoul(suin.c_str(), 0, 0), pname);
-				else ic = imcontact(suin, pname);
+			    if(pname == icq) ic = imcontact(strtoul(suin.c_str(), 0, 0), (protocolname) pname);
+				else ic = imcontact(suin, (protocolname) pname);
 
 			    c = clist.get(ic);
 			}
@@ -708,7 +708,7 @@
 		c = clist.get(contactroot);
 	    }
 
-	    if(c) c->setsound(it, buf);
+	    if(c) c->setsound((imevent::imeventtype) it, buf);
 	}
 
 	fi.close();
@@ -1003,18 +1003,18 @@
 }
 
 imstatus icqconf::getstatus(protocolname pname) {
-    imstatus st = available;
+    int st = available;
     map<string, string>::iterator ia;
     imaccount a = getourid(pname);
 
     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 += 1);
 	    if(st == imstatus_size) st = available;
 	}
     }
 
-    return st;
+    return (imstatus) st;
 }
 
 void icqconf::savestatus(protocolname pname, imstatus st) {
@@ -1099,8 +1099,8 @@
 		<< "Written by Konstantin Klyagin." << endl
 		<< "Built-in protocols are:";
 
-	    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
-		if(gethook(pname).enabled()) cout << " " << conf.getprotocolname(pname);
+	    for(int pname = icq; pname != protocolname_size; pname += 1)
+		if(gethook((protocolname) pname).enabled()) cout << " " << conf.getprotocolname((protocolname) pname);
 
 	    cout << endl << endl
 		<< "This is free software; see the source for copying conditions.  There is NO" << endl
@@ -1150,11 +1150,11 @@
 	}
 	cdest = imcontact(strtoul(dest.c_str(), 0, 0), icq);
     } else {
-	protocolname pname;
+	int pname;
 
-	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	    if(getprotocolname(pname) == proto) {
-		cdest = imcontact(dest, pname);
+	for(pname = icq; pname != protocolname_size; pname += 1) {
+	    if(getprotocolname((protocolname) pname) == proto) {
+		cdest = imcontact(dest, (protocolname) pname);
 		break;
 	    }
 	}
@@ -1231,16 +1231,16 @@
 }
 
 void icqconf::externalstatuschange(char st, const string &proto) const {
-    imstatus imst;
-    protocolname pname;
+    int imst;
+    int pname;
 
     if(st) {
-	for(pname = icq; pname != protocolname_size; (int) pname += 1)
-	    if(getprotocolname(pname) == proto)
+	for(pname = icq; pname != protocolname_size; pname += 1)
+	    if(getprotocolname((protocolname) pname) == proto)
 		break;
 
-	for(imst = offline; imst != imstatus_size; (int) imst += 1)
-	    if(imstatus2char[imst] == st)
+	for(imst = offline; imst != imstatus_size; imst += 1)
+	    if(imstatus2char[(imstatus) imst] == st)
 		break;
 
 	try {
@@ -1248,7 +1248,7 @@
 		if(imst != imstatus_size) {
 		    string sfname = conf.getconfigfname((string) "status-" + proto);
 		    ofstream sf(sfname.c_str());
-		    if(sf.is_open()) sf << imstatus2char[imst], sf.close();
+		    if(sf.is_open()) sf << imstatus2char[(imstatus) imst], sf.close();
 
 		    selfsignal(SIGUSR1);
 		} else {
@@ -1297,14 +1297,14 @@
 
 void icqconf::initmultiproto(bool p[], string buf) {
     string w;
-    protocolname pname;
+    int pname;
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1)
+    for(pname = icq; pname != protocolname_size; pname += 1)
 	p[pname] = buf.empty();
 
     while(!(w = getword(buf)).empty()) {
-	for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	    if(getprotocolname(pname) == w) {
+	for(pname = icq; pname != protocolname_size; pname += 1) {
+	    if(getprotocolname((protocolname) pname) == w) {
 		p[pname] = true;
 		break;
 	    }
Only in centericq-4.10.0-patch/src: icqconf.o
diff -aur centericq-4.10.0/src/icqcontact.cc centericq-4.10.0-patch/src/icqcontact.cc
--- centericq-4.10.0/src/icqcontact.cc	2004-06-19 15:17:56.000000000 +0200
+++ centericq-4.10.0-patch/src/icqcontact.cc	2004-07-04 11:13:46.063967808 +0200
@@ -39,8 +39,6 @@
 
 icqcontact::icqcontact(const imcontact adesc) {
     string fname, tname;
-    imevent::imeventtype ie;
-    int i;
 
     clear();
     lastread = fhistoffset = 0;
@@ -48,8 +46,8 @@
     finlist = true;
     congratulated = false;
 
-    for(ie = imevent::message; ie != imevent::imeventtype_size; (int) ie += 1)
-	sound[ie] = "";
+    for(int ie = imevent::message; ie != imevent::imeventtype_size; ie += 1)
+	sound[(imevent::imeventtype) ie] = "";
 
     cdesc = adesc;
 
@@ -59,6 +57,7 @@
 	    if(!cdesc.uin) {
 		fname = conf.getdirname() + conf.getprotocolprefix(cdesc.pname);
 
+    int i;
 		for(i = 1; ; i++) {
 		    tname = fname + i2str(i);
 		    if(access(tname.c_str(), F_OK)) break;
Only in centericq-4.10.0-patch/src: icqcontact.o
Only in centericq-4.10.0-patch/src: icqcontacts.o
diff -aur centericq-4.10.0/src/icqdialogs.cc centericq-4.10.0-patch/src/icqdialogs.cc
--- centericq-4.10.0/src/icqdialogs.cc	2004-04-01 10:01:13.000000000 +0200
+++ centericq-4.10.0-patch/src/icqdialogs.cc	2004-07-04 11:25:52.130588904 +0200
@@ -174,13 +174,13 @@
     imsearchparams ts;
 
     if(subj != fsrss) {
-	for(protocolname apname = icq; apname != protocolname_size; (int) apname += 1) {
+	for(int apname = icq; apname != protocolname_size; apname += 1) {
 	    if(subj == fschannel)
-	    if(!gethook(apname).getCapabs().count(hookcapab::conferencing))
+	    if(!gethook((protocolname) apname).getCapabs().count(hookcapab::conferencing))
 		continue;
 
-	    if(gethook(apname).logged() || apname == infocard) {
-		penabled.push_back(apname);
+	    if(gethook((protocolname) apname).logged() || apname == infocard) {
+		penabled.push_back((protocolname) apname);
 	    }
 	}
 
@@ -937,9 +937,9 @@
     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) {
-	m.additemf(0, (int) i, " %s", strgender(i));
-	if(i == f) m.setpos(m.getcount()-1);
+    for(int i = genderUnspec; i != imgender_size; i += 1) {
+	m.additemf(0, i, " %s", strgender((imgender) i));
+	if((imgender) i == f) m.setpos(m.getcount()-1);
     }
 
     int i = m.open();
@@ -953,14 +953,14 @@
     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) {
-	const char *p = stragerange(i);
+    for(int i = ICQ2000::RANGE_NORANGE; i <= ICQ2000::RANGE_60_ABOVE; i += 1) {
+	const char *p = stragerange((ICQ2000::AgeRange) i);
 
-	if(i == ICQ2000::RANGE_NORANGE)
+	if((ICQ2000::AgeRange) i == ICQ2000::RANGE_NORANGE)
 	    p = _("none");
 
 	m.additemf(0, (int) i, " %s", p);
-	if(i == r) m.setpos(m.getcount()-1);
+	if((ICQ2000::AgeRange) i == r) m.setpos(m.getcount()-1);
     }
 
     int i = m.open();
@@ -1071,14 +1071,14 @@
 }
 
 void icqface::multichange(bool conv[], bool newstate) {
-    protocolname pname;
+    int pname;
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1)
-	if((!conf.getourid(pname).empty() || pname == rss) && conv[pname]) break;
+    for(pname = icq; pname != protocolname_size; pname += 1)
+	if((!conf.getourid((protocolname) pname).empty() || pname == rss) && conv[pname]) break;
 
     if(pname == protocolname_size || !newstate) {
-	for(pname = icq; pname != protocolname_size; (int) pname += 1)
-	    if(!conf.getourid(pname).empty() || pname == rss)
+	for(pname = icq; pname != protocolname_size; pname += 1)
+	    if(!conf.getourid((protocolname) pname).empty() || pname == rss)
 		conv[pname] = newstate;
     }
 }
@@ -1086,7 +1086,7 @@
 bool icqface::updateconf(icqconf::regsound &s, icqconf::regcolor &c) {
     bool finished, success, hasany;
     int nopt, n, i, b, nconf, ncomm, aaway, ana, noth, nfeat, ncl;
-    protocolname pname;
+    int pname;
     string tmp, phidden;
 
     string smtp = conf.getsmtphost() + ":" + i2str(conf.getsmtpport());
@@ -1133,15 +1133,15 @@
     bool chatmode[protocolname_size], conv[protocolname_size],
 	entersends[protocolname_size], nonimonline[protocolname_size];
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	chatmode[pname] = conf.getchatmode(pname);
-	entersends[pname] = conf.getentersends(pname);
-	conv[pname] = conf.getcpconvert(pname);
-	nonimonline[pname] = conf.getnonimonline(pname);
+    for(pname = icq; pname != protocolname_size; pname += 1) {
+	chatmode[pname] = conf.getchatmode((protocolname) pname);
+	entersends[pname] = conf.getentersends((protocolname) pname);
+	conv[pname] = conf.getcpconvert((protocolname) pname);
+	nonimonline[pname] = conf.getnonimonline((protocolname) pname);
     }
 
-    for(hasany = false, pname = icq; pname != protocolname_size && !hasany; (int) pname += 1)
-	hasany = !conf.getourid(pname).empty();
+    for(hasany = false, pname = icq; pname != protocolname_size && !hasany; pname += 1)
+	hasany = !conf.getourid((protocolname) pname).empty();
 
     dialogbox db;
 
@@ -1183,10 +1183,10 @@
 
 	i = t.addnode(_(" Codepages conversion "));
 
-	for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
+	for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
 	if(conv[pname])
-	if(!conf.getourid(pname).empty() || pname == rss)
-	    tmp += conf.getprotocolname(pname) + " ";
+	if(!conf.getourid((protocolname) pname).empty() || pname == rss)
+	    tmp += conf.getprotocolname((protocolname) pname) + " ";
 
 	t.addleaff(i, 0, 26, _(" Switch to language preset : %s "), iconvlang->c_str());
 	t.addleaff(i, 0, 27, _(" Convert from : %s "), convertfrom.c_str());
@@ -1206,15 +1206,15 @@
 	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)
-		if(chatmode[pname] && !conf.getourid(pname).empty())
-		    tmp += conf.getprotocolname(pname) + " ";
+	    for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
+		if(chatmode[pname] && !conf.getourid((protocolname) pname).empty())
+		    tmp += conf.getprotocolname((protocolname) pname) + " ";
 
 	    t.addleaff(i, 0, 16, _(" Chat messaging mode for : %s"), tmp.c_str());
 
-	    for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
-		if(entersends[pname] && !conf.getourid(pname).empty())
-		    tmp += conf.getprotocolname(pname) + " ";
+	    for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
+		if(entersends[pname] && !conf.getourid((protocolname) pname).empty())
+		    tmp += conf.getprotocolname((protocolname) pname) + " ";
 
 	    t.addleaff(i, 0, 25, _(" Enter key sends message for : %s"), tmp.c_str());
 
@@ -1224,8 +1224,8 @@
 
 	}
 
-	for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
-	    if(nonimonline[pname]) tmp += conf.getprotocolname(pname) + " ";
+	for(tmp = "", pname = icq; pname != protocolname_size; pname += 1)
+	    if(nonimonline[pname]) tmp += conf.getprotocolname((protocolname) pname) + " ";
 
 	t.addleaff(i, 0, 29, _(" Always online non-IM contacts for : %s"), tmp.c_str());
 
@@ -1267,7 +1267,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 += 1)
 				conv[pname] = !conv[pname];
 			break;
 		    case 4:
@@ -1288,7 +1288,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 += 1)
 				chatmode[pname] = !chatmode[pname];
 			break;
 
@@ -1328,7 +1328,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 += 1)
 				entersends[pname] = !entersends[pname];
 			break;
 		    case 26:
@@ -1381,13 +1381,13 @@
 		conf.setaskaway(askaway);
 		conf.setcharsets(convertfrom, convertto);
 
-		for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-		    conf.setchatmode(pname, chatmode[pname]);
-		    conf.setentersends(pname, entersends[pname]);
-		    conf.setnonimonline(pname, nonimonline[pname]);
+		for(pname = icq; pname != protocolname_size; pname += 1) {
+		    conf.setchatmode((protocolname) pname, chatmode[pname]);
+		    conf.setentersends((protocolname) pname, entersends[pname]);
+		    conf.setnonimonline((protocolname) pname, nonimonline[pname]);
 
 		    bool bconv = conv[pname] && (!convertfrom.empty() || !convertto.empty());
-		    conf.setcpconvert(pname, bconv || !hasany);
+		    conf.setcpconvert((protocolname) pname, bconv || !hasany);
 		}
 
 		conf.setbidi(bidi);
@@ -1419,17 +1419,17 @@
     int i, protmax;
     bool r, finished = false;
 
-    protocolname pname;
+    int pname;
     protocolname tempprots[protocolname_size];
     bool aprots[protocolname_size];
 
     i = 0;
     memcpy(aprots, prots, sizeof(aprots));
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+    for(pname = icq; pname != protocolname_size; pname += 1) {
 	if(mode == spnonIM) {
 	    if(pname != infocard)
-	    if(!gethook(pname).getCapabs().count(hookcapab::nochat))
+	    if(!gethook((protocolname) pname).getCapabs().count(hookcapab::nochat))
 		continue;
 
 	    if(pname == livejournal)
@@ -1438,19 +1438,19 @@
 	} else {
 	    if(mode != spIMplusRSS || pname != rss)
 	    if(pname != livejournal || mode == spIMonly) {
-		if(gethook(pname).getCapabs().count(hookcapab::nochat))
+		if(gethook((protocolname) pname).getCapabs().count(hookcapab::nochat))
 		    continue;
 
-		if(conf.getourid(pname).empty())
+		if(conf.getourid((protocolname) pname).empty())
 		    continue;
 
 	    }
 
-	    if(!gethook(pname).enabled())
+	    if(!gethook((protocolname) pname).enabled())
 		continue;
 	}
 
-	tempprots[i++] = pname;
+	tempprots[i++] = (protocolname) pname;
     }
 
     protmax = i;
Only in centericq-4.10.0-patch/src: icqdialogs.o
diff -aur centericq-4.10.0/src/icqface.cc centericq-4.10.0-patch/src/icqface.cc
--- centericq-4.10.0/src/icqface.cc	2004-06-21 15:04:10.000000000 +0200
+++ centericq-4.10.0-patch/src/icqface.cc	2004-07-04 13:46:03.962796032 +0200
@@ -204,16 +204,16 @@
 
 void icqface::showtopbar() {
     string buf;
-    protocolname pname;
+    int pname;
     icqconf::imaccount ia;
 
-    for(pname = icq; pname != protocolname_size; (int) pname += 1) {
-	ia = conf.getourid(pname);
+    for(pname = icq; pname != protocolname_size; pname += 1) {
+	ia = conf.getourid((protocolname) pname);
 
 	if(!ia.empty()) {
 	    buf += " ";
-	    buf += conf.getprotocolname(pname) + ":";
-	    buf += imstatus2char[gethook(pname).getstatus()];
+	    buf += conf.getprotocolname((protocolname) pname) + ":";
+	    buf += imstatus2char[gethook((protocolname) pname).getstatus()];
 //            buf += ">";
 	}
     }
@@ -1303,7 +1303,7 @@
 
 void icqface::makeprotocolmenu(verticalmenu &m) {
     icqconf::imaccount ia;
-    protocolname ipname;
+    int ipname;
 
     static const string pitems[protocolname_size] = {
 	_(" [icq] ICQ network"),
@@ -1318,11 +1318,11 @@
 	""
     };
 
-    for(ipname = icq; ipname != protocolname_size; (int) ipname += 1) {
-	ia = conf.getourid(ipname);
+    for(ipname = icq; ipname != protocolname_size; ipname += 1) {
+	ia = conf.getourid((protocolname) ipname);
 
 	if(!ia.empty()) {
-	    m.additem(0, ipname, pitems[ipname]);
+	    m.additem(0, (protocolname) ipname, pitems[ipname]);
 	}
     }
 }
@@ -1334,20 +1334,21 @@
 
     vector<imstatus> mst;
     vector<imstatus>::iterator im;
-    protocolname pname, onechoice;
+    protocolname onechoice;
+		int pname;
 
     m.setwindow(textwindow(sizeWArea.x1, sizeWArea.y1, sizeWArea.x1+27,
 	sizeWArea.y1+9, conf.getcolor(cp_main_text)));
 
     m.idle = &menuidle;
 
-    for(protcount = 0, pname = icq; pname != protocolname_size; (int) pname += 1) {
-	if(!conf.getourid(pname).empty()) {
+    for(protcount = 0, pname = icq; pname != protocolname_size; pname += 1) {
+	if(!conf.getourid((protocolname) pname).empty()) {
 	    protcount++;
-	    onechoice = pname;
+	    onechoice = (protocolname) pname;
 	}
 
-	alrlogged = alrlogged || gethook(pname).getstatus() != offline;
+	alrlogged = alrlogged || gethook((protocolname) pname).getstatus() != offline;
     }
 
     if(protcount < 2) {
@@ -1370,15 +1371,15 @@
     if(r = i) {
 	switch(choice) {
 	    case -1:
-		for(pname = icq; pname != protocolname_size; (int) pname += 1)
-		    if(!conf.getourid(pname).empty())
-			pnames.push_back(pname);
+		for(pname = icq; pname != protocolname_size; pname += 1)
+		    if(!conf.getourid((protocolname) pname).empty())
+			pnames.push_back((protocolname) pname);
 		break;
 	    case -2:
-		for(pname = icq; pname != protocolname_size; (int) pname += 1)
-		    if(!conf.getourid(pname).empty())
-		    if(gethook(pname).getstatus() != offline)
-			pnames.push_back(pname);
+		for(pname = icq; pname != protocolname_size; pname += 1)
+		    if(!conf.getourid((protocolname) pname).empty())
+		    if(gethook((protocolname) pname).getstatus() != offline)
+			pnames.push_back((protocolname) pname);
 		break;
 	    default:
 		pnames.push_back((protocolname) choice);
@@ -1656,9 +1657,9 @@
 
     set<protocolname> ps;
     if(cs == csvisible || cs == csinvisible) {
-	for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
-	    if(gethook(pname).getCapabs().count(hookcapab::visibility))
-		ps.insert(pname);
+	for(int pname = icq; pname != protocolname_size; pname += 1)
+	    if(gethook((protocolname) pname).getCapabs().count(hookcapab::visibility))
+		ps.insert((protocolname) pname);
     }
 
     lst.fillmenu(db.getmenu(), cs);
Only in centericq-4.10.0-patch/src: icqface.o
diff -aur centericq-4.10.0/src/icqgroup.cc centericq-4.10.0-patch/src/icqgroup.cc
--- centericq-4.10.0/src/icqgroup.cc	2003-11-22 20:14:33.000000000 +0100
+++ centericq-4.10.0-patch/src/icqgroup.cc	2004-07-04 13:47:10.545673896 +0200
@@ -82,6 +82,6 @@
     string oldname = name;
     name = aname;
 
-    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
-	gethook(pname).renamegroup(oldname, name);
+    for(int pname = icq; pname != protocolname_size; pname += 1)
+	gethook((protocolname) pname).renamegroup(oldname, name);
 }
Only in centericq-4.10.0-patch/src: icqgroup.o
Only in centericq-4.10.0-patch/src: icqgroups.o
Only in centericq-4.10.0-patch/src: icqhist.o
Only in centericq-4.10.0-patch/src: icqmlist.o
Only in centericq-4.10.0-patch/src: imcontact.o
Only in centericq-4.10.0-patch/src: imcontroller.o
diff -aur centericq-4.10.0/src/imevents.cc centericq-4.10.0-patch/src/imevents.cc
--- centericq-4.10.0/src/imevents.cc	2004-04-11 18:32:28.000000000 +0200
+++ centericq-4.10.0-patch/src/imevents.cc	2004-07-04 12:08:55.696827136 +0200
@@ -62,11 +62,11 @@
 }
 
 imevent::imeventtype imevent::gettype() const {
-    return type;
+    return (imevent::imeventtype) type;
 }
 
 imevent::imdirection imevent::getdirection() const {
-    return direction;
+    return (imevent::imdirection) direction;
 }
 
 imcontact imevent::getcontact() const {
@@ -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 += 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 += 1)
 	    if(seventtype[type] == rdbuf) break;
     }
 
diff -aur centericq-4.10.0/src/imevents.h centericq-4.10.0-patch/src/imevents.h
--- centericq-4.10.0/src/imevents.h	2004-02-21 17:15:05.000000000 +0100
+++ centericq-4.10.0-patch/src/imevents.h	2004-07-04 12:03:45.457990608 +0200
@@ -30,8 +30,8 @@
 
     protected:
 	imcontact contact;
-	imeventtype type;
-	imdirection direction;
+	int type;
+	int direction;
 	time_t senttimestamp;
 	time_t timestamp;
 
Only in centericq-4.10.0-patch/src: imevents.o
diff -aur centericq-4.10.0/src/imexternal.cc centericq-4.10.0-patch/src/imexternal.cc
--- centericq-4.10.0/src/imexternal.cc	2004-03-20 17:49:08.000000000 +0100
+++ centericq-4.10.0-patch/src/imexternal.cc	2004-07-04 11:28:28.890757736 +0200
@@ -393,20 +393,20 @@
 
 	    if(param == "event") {
 		while(!(param = getword(buf)).empty()) {
-		    for(imevent::imeventtype et = imevent::message; et != imevent::imeventtype_size; (int) et += 1) {
-			if((param == geteventname(et))
+		    for(int et = imevent::message; et != imevent::imeventtype_size; et += 1) {
+			if((param == geteventname((imevent::imeventtype) et))
 			|| (param == "all")) {
-			    event.insert(et);
+			    event.insert((imevent::imeventtype) et);
 			}
 		    }
 		}
 
 	    } else if(param == "proto") {
 		while(!(param = getword(buf)).empty()) {
-		    for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
-			if((param == conf.getprotocolname(pname))
+		    for(int pname = icq; pname != protocolname_size; pname += 1) {
+			if((param == conf.getprotocolname((protocolname) pname))
 			|| (param == "all")) {
-			    proto.insert(pname);
+			    proto.insert((protocolname) pname);
 			}
 		    }
 		}
Only in centericq-4.10.0-patch/src: imexternal.o
Only in centericq-4.10.0-patch/src: imlogger.o
Only in centericq-4.10.0-patch: stamp-h