From kde-commits Wed Dec 31 16:54:42 2003 From: Ian Reinhart Geiser Date: Wed, 31 Dec 2003 16:54:42 +0000 To: kde-commits Subject: kdebindings/kjsembed/builtins Message-Id: <20031231165442.19BC193DE () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=107288972328014 CVS commit by geiseri: use new QPixmap code M +21 -26 resources.cpp 1.5 --- kdebindings/kjsembed/builtins/resources.cpp #1.4:1.5 @@ -28,6 +28,4 @@ #include "resources.h" -#include "bindings/pixmap_imp.h" - namespace KJSEmbed { namespace BuiltIns { @@ -172,7 +170,5 @@ void StdIconsImp::addBindings( JSFactory KJS::Value StdIconsImp::wrapPixmap(KJS::ExecState *exec, const QPixmap &icon) { - Bindings::Pixmap *pix = new Bindings::Pixmap(); - pix->setPixmap( icon ); - return KJS::Object( jsfact->createProxy( exec, pix ) ); + return convertToValue(exec, icon, 0L); } @@ -183,5 +179,4 @@ KJS::Value StdIconsImp::call( KJS::ExecS int arg2 = (args.size() > 2) ? args[2].toInteger(exec) : 0; // State 0 DefaultState, 1 ActiveState, 2 DisabledState, 3 LastState -// JSObjectProxy *context = 0L; switch( id ) { case StdIconsImp::BarIcon: