From 2391cfd9c79b87b3b00a4bb4a1d76981debb4486 Mon Sep 17 00:00:00 2001 From: drw Date: Sun, 24 Apr 2005 21:32:37 +0000 Subject: Resource -> OResource --- (limited to 'core/applets/vtapplet') diff --git a/core/applets/vtapplet/opie-vtapplet.control b/core/applets/vtapplet/opie-vtapplet.control index a1662f1..ae504a9 100644 --- a/core/applets/vtapplet/opie-vtapplet.control +++ b/core/applets/vtapplet/opie-vtapplet.control @@ -4,6 +4,6 @@ Priority: optional Section: opie/applets Maintainer: Opie Team Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Switch to another virtual terminal Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp index ae89635..0d4e657 100644 --- a/core/applets/vtapplet/vt.cpp +++ b/core/applets/vtapplet/vt.cpp @@ -15,8 +15,10 @@ /* OPIE */ #include +#include + #include -#include + using namespace Opie::Core; /* QT */ @@ -68,11 +70,7 @@ QString VTApplet::tr( const char* s, const char* p ) const QIconSet VTApplet::icon ( ) const { - QPixmap pix; - QImage img = Resource::loadImage ( "terminal" ); - - if ( !img. isNull ( )) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon ); return pix; } diff --git a/core/applets/vtapplet/vtapplet.pro b/core/applets/vtapplet/vtapplet.pro index 6c4873c..912af58 100644 --- a/core/applets/vtapplet/vtapplet.pro +++ b/core/applets/vtapplet/vtapplet.pro @@ -6,7 +6,7 @@ TARGET = vtapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include( $(OPIEDIR)/include.pro ) -- cgit v0.9.0.2