Attachment #173 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




};

#define logger logger_backend
void rb_str_catf_1(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));

static VALUE (*_new_kde)(int, VALUE *, VALUE) = 0;
static VALUE (*_kconfigskeletonitem_immutable)(VALUE) = 0;

    }
};

void rb_str_catf_1(VALUE self, const char *format, ...) 
{
    va_list ap;
    va_start(ap, format);

    VALUE r = rb_str_new2("");
    Smoke::Method &meth = qt_Smoke->methods[id];
    const char *tname = qt_Smoke->types[meth.ret].name;
    if(meth.flags & Smoke::mf_static) rb_str_catf_1(r, "static ");
    rb_str_catf_1(r, "%s ", (tname ? tname:"void"));
    rb_str_catf_1(r, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
    for(int i = 0; i < meth.numArgs; i++) {
	if(i) rb_str_catf_1(r, ", ");
	tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;
	rb_str_catf_1(r, "%s", (tname ? tname:"void"));
    }
    rb_str_catf_1(r, ")");
    if(meth.flags & Smoke::mf_const) rb_str_catf_1(r, " const");
    return r;
}


    if(rmeths != Qnil) {
	int count = RARRAY(rmeths)->len;
        for(int i = 0; i < count; i++) {
	    rb_str_catf_1(errmsg, "\t");
	    int id = NUM2INT(rb_ary_entry(rmeths, i));
	    Smoke::Method &meth = qt_Smoke->methods[id];
	    const char *tname = qt_Smoke->types[meth.ret].name;
	    if(meth.flags & Smoke::mf_enum) {
			rb_str_catf_1(errmsg, "enum ");
			rb_str_catf_1(errmsg, "%s::%s", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
			rb_str_catf_1(errmsg, "\n");
	    } else {
			if(meth.flags & Smoke::mf_static) rb_str_catf(errmsg, "static ");
			rb_str_catf_1(errmsg, "%s ", (tname ? tname:"void"));
			rb_str_catf_1(errmsg, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
			for(int i = 0; i < meth.numArgs; i++) {
			if(i) rb_str_catf_1(errmsg, ", ");
			tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;
			rb_str_catf_1(errmsg, "%s", (tname ? tname:"void"));
			}
			rb_str_catf_1(errmsg, ")");
			if(meth.flags & Smoke::mf_const) rb_str_catf_1(errmsg, " const");
			rb_str_catf_1(errmsg, "\n");
        	}
        }
    }

Return to bug 597

Lines 110-116 Link Here

(-)/tmp/kdebindings-3.5.10/qtruby/rubylib/qtruby/Qt.cpp.old (-20 / +20 lines)
110	};	110	};
111		111
112	#define logger logger_backend	112	#define logger logger_backend
113	void rb_str_catf(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));	113	void rb_str_catf_1(VALUE self, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
114		114
115	static VALUE (_new_kde)(int, VALUE , VALUE) = 0;	115	static VALUE (_new_kde)(int, VALUE , VALUE) = 0;
116	static VALUE (*_kconfigskeletonitem_immutable)(VALUE) = 0;	116	static VALUE (*_kconfigskeletonitem_immutable)(VALUE) = 0;
Lines 820-826 Link Here
820	}	820	}
821	};	821	};
822		822
823	void rb_str_catf(VALUE self, const char *format, ...)	823	void rb_str_catf_1(VALUE self, const char *format, ...)
824	{	824	{
825	va_list ap;	825	va_list ap;
826	va_start(ap, format);	826	va_start(ap, format);
Lines 985-1000 Link Here
985	VALUE r = rb_str_new2("");	985	VALUE r = rb_str_new2("");
986	Smoke::Method &meth = qt_Smoke->methods[id];	986	Smoke::Method &meth = qt_Smoke->methods[id];
987	const char *tname = qt_Smoke->types[meth.ret].name;	987	const char *tname = qt_Smoke->types[meth.ret].name;
988	if(meth.flags & Smoke::mf_static) rb_str_catf(r, "static ");	988	if(meth.flags & Smoke::mf_static) rb_str_catf_1(r, "static ");
989	rb_str_catf(r, "%s ", (tname ? tname:"void"));	989	rb_str_catf_1(r, "%s ", (tname ? tname:"void"));
990	rb_str_catf(r, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);	990	rb_str_catf_1(r, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
991	for(int i = 0; i < meth.numArgs; i++) {	991	for(int i = 0; i < meth.numArgs; i++) {
992	if(i) rb_str_catf(r, ", ");	992	if(i) rb_str_catf_1(r, ", ");
993	tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;	993	tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;
994	rb_str_catf(r, "%s", (tname ? tname:"void"));	994	rb_str_catf_1(r, "%s", (tname ? tname:"void"));
995	}	995	}
996	rb_str_catf(r, ")");	996	rb_str_catf_1(r, ")");
997	if(meth.flags & Smoke::mf_const) rb_str_catf(r, " const");	997	if(meth.flags & Smoke::mf_const) rb_str_catf_1(r, " const");
998	return r;	998	return r;
999	}	999	}
1000		1000
Lines 2599-2624 Link Here
2599	if(rmeths != Qnil) {	2599	if(rmeths != Qnil) {
2600	int count = RARRAY(rmeths)->len;	2600	int count = RARRAY(rmeths)->len;
2601	for(int i = 0; i < count; i++) {	2601	for(int i = 0; i < count; i++) {
2602	rb_str_catf(errmsg, "\t");	2602	rb_str_catf_1(errmsg, "\t");
2603	int id = NUM2INT(rb_ary_entry(rmeths, i));	2603	int id = NUM2INT(rb_ary_entry(rmeths, i));
2604	Smoke::Method &meth = qt_Smoke->methods[id];	2604	Smoke::Method &meth = qt_Smoke->methods[id];
2605	const char *tname = qt_Smoke->types[meth.ret].name;	2605	const char *tname = qt_Smoke->types[meth.ret].name;
2606	if(meth.flags & Smoke::mf_enum) {	2606	if(meth.flags & Smoke::mf_enum) {
2607	rb_str_catf(errmsg, "enum ");	2607	rb_str_catf_1(errmsg, "enum ");
2608	rb_str_catf(errmsg, "%s::%s", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);	2608	rb_str_catf_1(errmsg, "%s::%s", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
2609	rb_str_catf(errmsg, "\n");	2609	rb_str_catf_1(errmsg, "\n");
2610	} else {	2610	} else {
2611	if(meth.flags & Smoke::mf_static) rb_str_catf(errmsg, "static ");	2611	if(meth.flags & Smoke::mf_static) rb_str_catf(errmsg, "static ");
2612	rb_str_catf(errmsg, "%s ", (tname ? tname:"void"));	2612	rb_str_catf_1(errmsg, "%s ", (tname ? tname:"void"));
2613	rb_str_catf(errmsg, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);	2613	rb_str_catf_1(errmsg, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]);
2614	for(int i = 0; i < meth.numArgs; i++) {	2614	for(int i = 0; i < meth.numArgs; i++) {
2615	if(i) rb_str_catf(errmsg, ", ");	2615	if(i) rb_str_catf_1(errmsg, ", ");
2616	tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;	2616	tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name;
2617	rb_str_catf(errmsg, "%s", (tname ? tname:"void"));	2617	rb_str_catf_1(errmsg, "%s", (tname ? tname:"void"));
2618	}	2618	}
2619	rb_str_catf(errmsg, ")");	2619	rb_str_catf_1(errmsg, ")");
2620	if(meth.flags & Smoke::mf_const) rb_str_catf(errmsg, " const");	2620	if(meth.flags & Smoke::mf_const) rb_str_catf_1(errmsg, " const");
2621	rb_str_catf(errmsg, "\n");	2621	rb_str_catf_1(errmsg, "\n");
2622	}	2622	}
2623	}	2623	}
2624	}	2624	}