author | drw <drw> | 2005-06-04 00:13:32 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-04 00:13:32 (UTC) |
commit | c220c5e580c3cd0e16cf9a7c252a0f66b7034d02 (patch) (unidiff) | |
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 @@ | |||
1 | Makefile* | ||
2 | moc* | ||
3 | .moc* | ||
4 | .obj | ||
5 | .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 @@ | |||
1 | Makefile* | ||
2 | moc* | ||
3 | .moc* | ||
4 | .obj | ||
5 | .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 | |||
@@ -5,11 +5,5 @@ void AnyLnk::loadPixmap() | |||
5 | { | 5 | { |
6 | if(m_params.count() >= 3){ | 6 | if(m_params.count() >= 3){ |
7 | QString& str = m_params[2]; | 7 | m_pixmap = Opie::Core::OResource::loadPixmap( m_params[2], Opie::Core::OResource::SmallIcon ); |
8 | QImage image = Resource::loadImage(str); | ||
9 | if(image.isNull() == false){ | ||
10 | const QSize& size = AppLnkManager::getIconSize(); | ||
11 | m_pixmap.convertFromImage( | ||
12 | image.smoothScale(size.width(), size.height()) ); | ||
13 | } | ||
14 | } | 8 | } |
15 | } | 9 | } |
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 | |||
@@ -12,5 +12,6 @@ | |||
12 | 12 | ||
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | #include <qpe/resource.h> | 14 | |
15 | #include <opie2/oresource.h> | ||
15 | 16 | ||
16 | #include "AppLnkManager.h" | 17 | #include "AppLnkManager.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 | |||
@@ -41,3 +41,3 @@ protected: | |||
41 | }; | 41 | }; |
42 | 42 | ||
43 | #endif /* _APPLNK_WRAPPER_H_ */ \ No newline at end of file | 43 | #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 | |||
@@ -9,5 +9,5 @@ static const char* _version_ = "1.2.2"; | |||
9 | 9 | ||
10 | KeyHelperWidget::KeyHelperWidget(QWidget* parent, const char* name) | 10 | KeyHelperWidget::KeyHelperWidget(QWidget* parent, const char* name) |
11 | : QLabel(parent, name),disabled(Resource::loadPixmap("zkb-disabled")) | 11 | : QLabel(parent, name),disabled(Opie::Core::OResource::loadPixmap("zkb-disabled")) |
12 | { | 12 | { |
13 | qDebug("KeyHelperWidget::KeyHelperWidget()"); | 13 | qDebug("KeyHelperWidget::KeyHelperWidget()"); |
@@ -295,5 +295,5 @@ void KeyHelperWidget::initDebugLevel() | |||
295 | } | 295 | } |
296 | 296 | ||
297 | void KeyHelperWidget::setDebugLevel(int level) | 297 | void KeyHelperWidget::setDebugLevel(int /*level*/) |
298 | { | 298 | { |
299 | #ifdef QT_QWS_EBX | 299 | #ifdef QT_QWS_EBX |
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 | |||
@@ -9,9 +9,9 @@ | |||
9 | #include <opie2/otaskbarapplet.h> | 9 | #include <opie2/otaskbarapplet.h> |
10 | #include <opie2/okeyfilter.h> | 10 | #include <opie2/okeyfilter.h> |
11 | #include <opie2/oresource.h> | ||
11 | 12 | ||
12 | #include <qpe/qcopenvelope_qws.h> | 13 | #include <qpe/qcopenvelope_qws.h> |
13 | #include <qpe/qpeapplication.h> | 14 | #include <qpe/qpeapplication.h> |
14 | #include <qpe/global.h> | 15 | #include <qpe/global.h> |
15 | #include <qpe/resource.h> | ||
16 | #include "KeyHelper.h" | 16 | #include "KeyHelper.h" |
17 | #include "AppLnkManager.h" | 17 | #include "AppLnkManager.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 @@ | |||
1 | Makefile* | ||
2 | moc* | ||
3 | .moc* | ||
4 | .obj | ||
5 | .moc | ||
6 | KHCWidgetBase.cpp | ||
7 | KHCWidgetBase.h \ No newline at end of file | ||