CVS commit by deller: make it compile and use QString::number() instead of QString::snprintf() M +2 -4 Makefile.am 1.50 M +10 -5 opengl.cpp 1.2 --- kdebase/kcontrol/info/Makefile.am #1.49:1.50 @@ -2,16 +2,14 @@ if COMPILE_GL_INFO -GL_INFO_CPP = opengl.cpp AM_CXXFLAGS = -DINFO_OPENGL_AVAILABLE endif -kcm_info_la_SOURCES = main.cpp memory.cpp $(GL_INFO_CPP) +kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO) kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) +kcm_info_la_METASOURCES = AUTO INCLUDES= $(all_includes) $(GLINC) - -kcm_info_la_METASOURCES = AUTO messages: --- kdebase/kcontrol/info/opengl.cpp #1.1:1.2 @@ -21,4 +21,6 @@ ***************************************************************************/ +#if defined(INFO_OPENGL_AVAILABLE) + #define KCMGL_DO_GLU @@ -427,8 +429,8 @@ print_limits(QListViewItem *l1, const ch if (glGetError() == GL_NONE) { QString s; - if (!tfloat && count == 1) s.sprintf("%d", max[0]); else - if (!tfloat && count == 2) s.sprintf("%d, %d", max[0], max[1]); else - if (tfloat && count == 2) s.sprintf("%f - %f", fmax[0], fmax[1]); else - if (tfloat && count == 1) s.sprintf("%f", fmax[0]); + if (!tfloat && count == 1) s = QString::number(max[0]); else + if (!tfloat && count == 2) s = QString("%1, %2").arg(max[0]).arg(max[1]); else + if (tfloat && count == 2) s = QString("%1 - %2").arg(fmax[0],0,'f',6).arg(fmax[1],0,'f',6); else + if (tfloat && count == 1) s = QString::number(fmax[0],'f',6); if (l3) l3 = new QListViewItem(l2, l3, cur_token->name, s); else l3 = new QListViewItem(l2, cur_token->name, s); @@ -641,2 +643,5 @@ bool GetInfo_OpenGL(QListView * lBox) return GetInfo_OpenGL_Generic(lBox); } + +#endif /* INFO_OPENGL_AVAILABLE */ +