author | drw <drw> | 2005-06-04 00:13:32 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-04 00:13:32 (UTC) |
commit | c220c5e580c3cd0e16cf9a7c252a0f66b7034d02 (patch) (side-by-side diff) | |
tree | feec669d11c40c6f66fef806e42df0fdad4f6d5d /noncore | |
parent | 0fcaa971ee658effa1dc36205df6dfbc43a6b0ad (diff) | |
download | opie-c220c5e580c3cd0e16cf9a7c252a0f66b7034d02.zip opie-c220c5e580c3cd0e16cf9a7c252a0f66b7034d02.tar.gz opie-c220c5e580c3cd0e16cf9a7c252a0f66b7034d02.tar.bz2 |
Resource -> OResource, fix couple compile warnings and add .cvsignore files
8 files changed, 24 insertions, 12 deletions
diff --git a/noncore/applets/keyhelper/.cvsignore b/noncore/applets/keyhelper/.cvsignore new file mode 100644 index 0000000..9f2b524 --- a/dev/null +++ b/noncore/applets/keyhelper/.cvsignore @@ -0,0 +1,5 @@ +Makefile* +moc* +.moc* +.obj +.moc diff --git a/noncore/applets/keyhelper/keyhelperapplet/.cvsignore b/noncore/applets/keyhelper/keyhelperapplet/.cvsignore new file mode 100644 index 0000000..9f2b524 --- a/dev/null +++ b/noncore/applets/keyhelper/keyhelperapplet/.cvsignore @@ -0,0 +1,5 @@ +Makefile* +moc* +.moc* +.obj +.moc 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 @@ -6,9 +6,3 @@ 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 ); } 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 @@ -13,3 +13,4 @@ #include <qpe/qpeapplication.h> -#include <qpe/resource.h> + +#include <opie2/oresource.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 @@ -42,2 +42,2 @@ protected: -#endif /* _APPLNK_WRAPPER_H_ */
\ No newline at end of file +#endif /* _APPLNK_WRAPPER_H_ */ diff --git a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp index 7beb511..9fac51b 100644 --- a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp +++ b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp @@ -10,3 +10,3 @@ static const char* _version_ = "1.2.2"; KeyHelperWidget::KeyHelperWidget(QWidget* parent, const char* name) - : QLabel(parent, name),disabled(Resource::loadPixmap("zkb-disabled")) + : QLabel(parent, name),disabled(Opie::Core::OResource::loadPixmap("zkb-disabled")) { @@ -296,3 +296,3 @@ void KeyHelperWidget::initDebugLevel() -void KeyHelperWidget::setDebugLevel(int level) +void KeyHelperWidget::setDebugLevel(int /*level*/) { diff --git a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h index 4798c5c..0901081 100644 --- a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h +++ b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.h @@ -10,2 +10,3 @@ #include <opie2/okeyfilter.h> +#include <opie2/oresource.h> @@ -14,3 +15,2 @@ #include <qpe/global.h> -#include <qpe/resource.h> #include "KeyHelper.h" diff --git a/noncore/applets/keyhelper/keyhelperconf/.cvsignore b/noncore/applets/keyhelper/keyhelperconf/.cvsignore new file mode 100644 index 0000000..f4d9255 --- a/dev/null +++ b/noncore/applets/keyhelper/keyhelperconf/.cvsignore @@ -0,0 +1,7 @@ +Makefile* +moc* +.moc* +.obj +.moc +KHCWidgetBase.cpp +KHCWidgetBase.h
\ No newline at end of file |