Attachment #279 for bug #597

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 597
Collapse All | Expand All




            break;
        }
	
        int len = RSTRING_LEN(rv);
        char* mem = (char*) malloc(len+1);
        memcpy(mem, StringValuePtr(rv), len);
        mem[len] ='\0';

            m->item().s_voidp = 0;
            break;
        }
        int len = RSTRING_LEN(rv);
        char* mem = (char*) malloc(len+1);
        memcpy(mem, StringValuePtr(rv), len);
        mem[len] ='\0';

	
	TQString *	s;
	if (qstrcmp(KCODE, "UTF8") == 0)
		s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING_LEN(rstring)));
	else if (qstrcmp(KCODE, "EUC") == 0)
		s = new TQString(codec->toUnicode(StringValuePtr(rstring)));
	else if (qstrcmp(KCODE, "SJIS") == 0)

	else if(qstrcmp(KCODE, "NONE") == 0)
		s = new TQString(TQString::fromLatin1(StringValuePtr(rstring)));
	else
		s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING_LEN(rstring)));
	return s;
}


		s = new TQCString(); 
        } else {
		// Add 1 to the ruby string length to allow for a TQCString '\0' terminator
		s = new TQCString(StringValuePtr(*(m->var())), RSTRING_LEN(*(m->var())) + 1); 
		}
	    m->item().s_voidp = s;
	    

		m->item().s_voidp = 0;
		break;
	    }
	    int count = RARRAY_LEN(av);
	    TQCOORD *coord = new TQCOORD[count + 2];
	    for(long i = 0; i < count; i++) {
		VALUE svp = rb_ary_entry(av, i);

	    VALUE arglist = *(m->var());
	    if (arglist == Qnil
	    || TYPE(arglist) != T_ARRAY
	    || RARRAY_LEN(arglist) == 0 )
	    {
                m->item().s_voidp = 0;
                break;
	    }

	    char **argv = new char *[RARRAY_LEN(arglist) + 1];
	    long i;
	    for(i = 0; i < RARRAY_LEN(arglist); i++) {
                VALUE item = rb_ary_entry(arglist, i);
                char *s = StringValuePtr(item);
                argv[i] = new char[strlen(s) + 1];

		break;
	    }

	    int count = RARRAY_LEN(list);
	    TQStringList *stringlist = new TQStringList;

	    for(long i = 0; i < count; i++) {

		break;
	    }

	    int count = RARRAY_LEN(list);
	    TQStrList *stringlist = new TQStrList;

	    for(long i = 0; i < count; i++) {

		    stringlist->append(TQString());
		    continue;
		}
		stringlist->append(TQString::fromUtf8(StringValuePtr(item), RSTRING_LEN(item)));
	    }

	    m->item().s_voidp = stringlist;

		m->item().s_voidp = 0;
		break;
	    }
	    int count = RARRAY_LEN(list);
	    ItemList *cpplist = new ItemList;
	    long i;
	    for(i = 0; i < count; i++) {

		m->item().s_voidp = 0;
		break;
	    }
	    int count = RARRAY_LEN(list);
	    TQValueList<int> *valuelist = new TQValueList<int>;
	    long i;
	    for(i = 0; i < count; i++) {

		// Convert the ruby hash to an array of key/value arrays
		VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);

		for (long i = 0; i < RARRAY_LEN(temp); i++) {
			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
			(*map)[TQString(StringValuePtr(key))] = TQString(StringValuePtr(value));

		// Convert the ruby hash to an array of key/value arrays
		VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);

		for (long i = 0; i < RARRAY_LEN(temp); i++) {
			VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
			VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
			

		m->item().s_voidp = 0;
		break;
	    }
	    int count = RARRAY_LEN(list);
	    TQRgb *rgb = new TQRgb[count + 2];
	    long i;
	    for(i = 0; i < count; i++) {

      case Marshall::FromVALUE:
	{
	    VALUE list = *(m->var());
	    if (TYPE(list) != T_ARRAY || RARRAY_LEN(list) != 2) {
		m->item().s_voidp = 0;
		break;
	    }

		m->item().s_voidp = 0;
		break;
	    }
	    int count = RARRAY_LEN(list);
	    ItemList *cpplist = new ItemList;
	    long i;
	    for(i = 0; i < count; i++) {

Return to bug 597

Lines 755-761 Link Here

(-)/tmp/kdebindings-3.5.10/qtruby/rubylib/qtruby/handlers.cpp.old (-19 / +19 lines)
755	break;	755	break;
756	}	756	}
757		757
758	int len = RSTRING(rv)->len;	758	int len = RSTRING_LEN(rv);
759	char* mem = (char*) malloc(len+1);	759	char* mem = (char*) malloc(len+1);
760	memcpy(mem, StringValuePtr(rv), len);	760	memcpy(mem, StringValuePtr(rv), len);
761	mem[len] ='\0';	761	mem[len] ='\0';
Lines 788-794 Link Here
788	m->item().s_voidp = 0;	788	m->item().s_voidp = 0;
789	break;	789	break;
790	}	790	}
791	int len = RSTRING(rv)->len;	791	int len = RSTRING_LEN(rv);
792	char* mem = (char*) malloc(len+1);	792	char* mem = (char*) malloc(len+1);
793	memcpy(mem, StringValuePtr(rv), len);	793	memcpy(mem, StringValuePtr(rv), len);
794	mem[len] ='\0';	794	mem[len] ='\0';
Lines 824-830 Link Here
824		824
825	TQString * s;	825	TQString * s;
826	if (qstrcmp(KCODE, "UTF8") == 0)	826	if (qstrcmp(KCODE, "UTF8") == 0)
827	s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING(rstring)->len));	827	s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING_LEN(rstring)));
828	else if (qstrcmp(KCODE, "EUC") == 0)	828	else if (qstrcmp(KCODE, "EUC") == 0)
829	s = new TQString(codec->toUnicode(StringValuePtr(rstring)));	829	s = new TQString(codec->toUnicode(StringValuePtr(rstring)));
830	else if (qstrcmp(KCODE, "SJIS") == 0)	830	else if (qstrcmp(KCODE, "SJIS") == 0)
Lines 832-838 Link Here
832	else if(qstrcmp(KCODE, "NONE") == 0)	832	else if(qstrcmp(KCODE, "NONE") == 0)
833	s = new TQString(TQString::fromLatin1(StringValuePtr(rstring)));	833	s = new TQString(TQString::fromLatin1(StringValuePtr(rstring)));
834	else	834	else
835	s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING(rstring)->len));	835	s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING_LEN(rstring)));
836	return s;	836	return s;
837	}	837	}
838		838
Lines 944-950 Link Here
944	s = new TQCString();	944	s = new TQCString();
945	} else {	945	} else {
946	// Add 1 to the ruby string length to allow for a TQCString '\0' terminator	946	// Add 1 to the ruby string length to allow for a TQCString '\0' terminator
947	s = new TQCString(StringValuePtr((m->var())), RSTRING((m->var()))->len + 1);	947	s = new TQCString(StringValuePtr((m->var())), RSTRING_LEN((m->var())) + 1);
948	}	948	}
949	m->item().s_voidp = s;	949	m->item().s_voidp = s;
950		950
Lines 1007-1013 Link Here
1007	m->item().s_voidp = 0;	1007	m->item().s_voidp = 0;
1008	break;	1008	break;
1009	}	1009	}
1010	int count = RARRAY(av)->len;	1010	int count = RARRAY_LEN(av);
1011	TQCOORD *coord = new TQCOORD[count + 2];	1011	TQCOORD *coord = new TQCOORD[count + 2];
1012	for(long i = 0; i < count; i++) {	1012	for(long i = 0; i < count; i++) {
1013	VALUE svp = rb_ary_entry(av, i);	1013	VALUE svp = rb_ary_entry(av, i);
Lines 1167-1181 Link Here
1167	VALUE arglist = *(m->var());	1167	VALUE arglist = *(m->var());
1168	if (arglist == Qnil	1168	if (arglist == Qnil
1169	\|\| TYPE(arglist) != T_ARRAY	1169	\|\| TYPE(arglist) != T_ARRAY
1170	\|\| RARRAY(arglist)->len == 0 )	1170	\|\| RARRAY_LEN(arglist) == 0 )
1171	{	1171	{
1172	m->item().s_voidp = 0;	1172	m->item().s_voidp = 0;
1173	break;	1173	break;
1174	}	1174	}
1175		1175
1176	char *argv = new char [RARRAY(arglist)->len + 1];	1176	char *argv = new char [RARRAY_LEN(arglist) + 1];
1177	long i;	1177	long i;
1178	for(i = 0; i < RARRAY(arglist)->len; i++) {	1178	for(i = 0; i < RARRAY_LEN(arglist); i++) {
1179	VALUE item = rb_ary_entry(arglist, i);	1179	VALUE item = rb_ary_entry(arglist, i);
1180	char *s = StringValuePtr(item);	1180	char *s = StringValuePtr(item);
1181	argv[i] = new char[strlen(s) + 1];	1181	argv[i] = new char[strlen(s) + 1];
Lines 1207-1213 Link Here
1207	break;	1207	break;
1208	}	1208	}
1209		1209
1210	int count = RARRAY(list)->len;	1210	int count = RARRAY_LEN(list);
1211	TQStringList *stringlist = new TQStringList;	1211	TQStringList *stringlist = new TQStringList;
1212		1212
1213	for(long i = 0; i < count; i++) {	1213	for(long i = 0; i < count; i++) {
Lines 1269-1275 Link Here
1269	break;	1269	break;
1270	}	1270	}
1271		1271
1272	int count = RARRAY(list)->len;	1272	int count = RARRAY_LEN(list);
1273	TQStrList *stringlist = new TQStrList;	1273	TQStrList *stringlist = new TQStrList;
1274		1274
1275	for(long i = 0; i < count; i++) {	1275	for(long i = 0; i < count; i++) {
Lines 1278-1284 Link Here
1278	stringlist->append(TQString());	1278	stringlist->append(TQString());
1279	continue;	1279	continue;
1280	}	1280	}
1281	stringlist->append(TQString::fromUtf8(StringValuePtr(item), RSTRING(item)->len));	1281	stringlist->append(TQString::fromUtf8(StringValuePtr(item), RSTRING_LEN(item)));
1282	}	1282	}
1283		1283
1284	m->item().s_voidp = stringlist;	1284	m->item().s_voidp = stringlist;
Lines 1331-1337 Link Here
1331	m->item().s_voidp = 0;	1331	m->item().s_voidp = 0;
1332	break;	1332	break;
1333	}	1333	}
1334	int count = RARRAY(list)->len;	1334	int count = RARRAY_LEN(list);
1335	ItemList *cpplist = new ItemList;	1335	ItemList *cpplist = new ItemList;
1336	long i;	1336	long i;
1337	for(i = 0; i < count; i++) {	1337	for(i = 0; i < count; i++) {
Lines 1421-1427 Link Here
1421	m->item().s_voidp = 0;	1421	m->item().s_voidp = 0;
1422	break;	1422	break;
1423	}	1423	}
1424	int count = RARRAY(list)->len;	1424	int count = RARRAY_LEN(list);
1425	TQValueList<int> *valuelist = new TQValueList<int>;	1425	TQValueList<int> *valuelist = new TQValueList<int>;
1426	long i;	1426	long i;
1427	for(i = 0; i < count; i++) {	1427	for(i = 0; i < count; i++) {
Lines 1513-1519 Link Here
1513	// Convert the ruby hash to an array of key/value arrays	1513	// Convert the ruby hash to an array of key/value arrays
1514	VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);	1514	VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
1515		1515
1516	for (long i = 0; i < RARRAY(temp)->len; i++) {	1516	for (long i = 0; i < RARRAY_LEN(temp); i++) {
1517	VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);	1517	VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
1518	VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);	1518	VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
1519	(*map)[TQString(StringValuePtr(key))] = TQString(StringValuePtr(value));	1519	(*map)[TQString(StringValuePtr(key))] = TQString(StringValuePtr(value));
Lines 1569-1575 Link Here
1569	// Convert the ruby hash to an array of key/value arrays	1569	// Convert the ruby hash to an array of key/value arrays
1570	VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);	1570	VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0);
1571		1571
1572	for (long i = 0; i < RARRAY(temp)->len; i++) {	1572	for (long i = 0; i < RARRAY_LEN(temp); i++) {
1573	VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);	1573	VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0);
1574	VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);	1574	VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1);
1575		1575
Lines 1673-1679 Link Here
1673	m->item().s_voidp = 0;	1673	m->item().s_voidp = 0;
1674	break;	1674	break;
1675	}	1675	}
1676	int count = RARRAY(list)->len;	1676	int count = RARRAY_LEN(list);
1677	TQRgb *rgb = new TQRgb[count + 2];	1677	TQRgb *rgb = new TQRgb[count + 2];
1678	long i;	1678	long i;
1679	for(i = 0; i < count; i++) {	1679	for(i = 0; i < count; i++) {
Lines 1702-1708 Link Here
1702	case Marshall::FromVALUE:	1702	case Marshall::FromVALUE:
1703	{	1703	{
1704	VALUE list = *(m->var());	1704	VALUE list = *(m->var());
1705	if (TYPE(list) != T_ARRAY \|\| RARRAY(list)->len != 2) {	1705	if (TYPE(list) != T_ARRAY \|\| RARRAY_LEN(list) != 2) {
1706	m->item().s_voidp = 0;	1706	m->item().s_voidp = 0;
1707	break;	1707	break;
1708	}	1708	}
Lines 1770-1776 Link Here
1770	m->item().s_voidp = 0;	1770	m->item().s_voidp = 0;
1771	break;	1771	break;
1772	}	1772	}
1773	int count = RARRAY(list)->len;	1773	int count = RARRAY_LEN(list);
1774	ItemList *cpplist = new ItemList;	1774	ItemList *cpplist = new ItemList;
1775	long i;	1775	long i;
1776	for(i = 0; i < count; i++) {	1776	for(i = 0; i < count; i++) {