Diffstat (limited to 'noncore/applets/keyhelper/keyhelperapplet/anylnk') (more/less context) (ignore whitespace changes)
3 files changed, 4 insertions, 9 deletions
diff --git a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp index 3c2298e..fc02862 100644 --- a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp +++ b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.cpp @@ -3,15 +3,9 @@ void AnyLnk::loadPixmap() { if(m_params.count() >= 3){ - QString& str = m_params[2]; - QImage image = Resource::loadImage(str); - if(image.isNull() == false){ - const QSize& size = AppLnkManager::getIconSize(); - m_pixmap.convertFromImage( - image.smoothScale(size.width(), size.height()) ); - } + m_pixmap = Opie::Core::OResource::loadPixmap( m_params[2], Opie::Core::OResource::SmallIcon ); } } void AnyLnk::parseText() diff --git a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h index 9853942..d170e6d 100644 --- a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h +++ b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AnyLnk.h @@ -10,9 +10,10 @@ #include <qclipboard.h> #include <qtextcodec.h> #include <qpe/qpeapplication.h> -#include <qpe/resource.h> + +#include <opie2/oresource.h> #include "AppLnkManager.h" #include "ConfigEx.h" diff --git a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp index 1c3dbfe..dc6dd77 100644 --- a/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp +++ b/noncore/applets/keyhelper/keyhelperapplet/anylnk/AppLnkWrapper.cpp @@ -39,5 +39,5 @@ public: protected: AppLnk* m_pLnk; }; -#endif /* _APPLNK_WRAPPER_H_ */
\ No newline at end of file +#endif /* _APPLNK_WRAPPER_H_ */ |