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 | |||
@@ -1,25 +1,19 @@ | |||
1 | #include "AnyLnk.h" | 1 | #include "AnyLnk.h" |
2 | #include "KHUtil.h" | 2 | #include "KHUtil.h" |
3 | 3 | ||
4 | void AnyLnk::loadPixmap() | 4 | 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 | } |
16 | 10 | ||
17 | void AnyLnk::parseText() | 11 | void AnyLnk::parseText() |
18 | { | 12 | { |
19 | if(m_params.count() >= 2){ | 13 | if(m_params.count() >= 2){ |
20 | QString& str = m_params[1]; | 14 | QString& str = m_params[1]; |
21 | if(str != QString::null && str.length() > 0){ | 15 | if(str != QString::null && str.length() > 0){ |
22 | replaceKeyword(str); | 16 | replaceKeyword(str); |
23 | replaceDate(str); | 17 | replaceDate(str); |
24 | } | 18 | } |
25 | } | 19 | } |
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 | |||
@@ -2,25 +2,26 @@ | |||
2 | #define _ANYLNK_H_ | 2 | #define _ANYLNK_H_ |
3 | 3 | ||
4 | #include <time.h> | 4 | #include <time.h> |
5 | 5 | ||
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | #include <qstringlist.h> | 7 | #include <qstringlist.h> |
8 | #include <qpixmap.h> | 8 | #include <qpixmap.h> |
9 | #include <qimage.h> | 9 | #include <qimage.h> |
10 | #include <qclipboard.h> | 10 | #include <qclipboard.h> |
11 | #include <qtextcodec.h> | 11 | #include <qtextcodec.h> |
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" |
17 | #include "ConfigEx.h" | 18 | #include "ConfigEx.h" |
18 | 19 | ||
19 | class AnyLnk | 20 | class AnyLnk |
20 | { | 21 | { |
21 | public: | 22 | public: |
22 | AnyLnk(){} | 23 | AnyLnk(){} |
23 | AnyLnk(const QStringList& params){ | 24 | AnyLnk(const QStringList& params){ |
24 | m_params = params; | 25 | m_params = params; |
25 | loadPixmap(); | 26 | loadPixmap(); |
26 | } | 27 | } |
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 | |||
@@ -31,13 +31,13 @@ public: | |||
31 | } | 31 | } |
32 | virtual const QPixmap& pixmap(){ | 32 | virtual const QPixmap& pixmap(){ |
33 | if(m_pixmap.isNull()){ | 33 | if(m_pixmap.isNull()){ |
34 | return(m_pLnk->pixmap()); | 34 | return(m_pLnk->pixmap()); |
35 | } else { | 35 | } else { |
36 | return(m_pixmap); | 36 | return(m_pixmap); |
37 | } | 37 | } |
38 | } | 38 | } |
39 | protected: | 39 | protected: |
40 | AppLnk* m_pLnk; | 40 | AppLnk* m_pLnk; |
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 | |||
@@ -1,23 +1,23 @@ | |||
1 | #include "KeyHelperWidget.h" | 1 | #include "KeyHelperWidget.h" |
2 | #include "QSafeDataStream.h" | 2 | #include "QSafeDataStream.h" |
3 | #include "KHUtil.h" | 3 | #include "KHUtil.h" |
4 | 4 | ||
5 | QWidget* g_Widget = NULL; | 5 | QWidget* g_Widget = NULL; |
6 | int g_level = 0; | 6 | int g_level = 0; |
7 | 7 | ||
8 | static const char* _version_ = "1.2.2"; | 8 | 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()"); |
14 | g_Widget = this; | 14 | g_Widget = this; |
15 | m_defHandler = NULL; | 15 | m_defHandler = NULL; |
16 | //m_reset = false; | 16 | //m_reset = false; |
17 | m_reset = true; | 17 | m_reset = true; |
18 | m_useFilter = false; | 18 | m_useFilter = false; |
19 | m_pHelper = NULL; | 19 | m_pHelper = NULL; |
20 | m_status = false; | 20 | m_status = false; |
21 | 21 | ||
22 | //unset(); | 22 | //unset(); |
23 | initDebugLevel(); | 23 | initDebugLevel(); |
@@ -285,25 +285,25 @@ void MsgHandler(QtMsgType type, const char* msg) | |||
285 | } | 285 | } |
286 | } | 286 | } |
287 | 287 | ||
288 | void KeyHelperWidget::initDebugLevel() | 288 | void KeyHelperWidget::initDebugLevel() |
289 | { | 289 | { |
290 | ConfigEx& cfg = ConfigEx::getInstance("keyhelper"); | 290 | ConfigEx& cfg = ConfigEx::getInstance("keyhelper"); |
291 | cfg.setGroup("Global"); | 291 | cfg.setGroup("Global"); |
292 | 292 | ||
293 | int level = cfg.readNumEntry("DebugLevel", 0); | 293 | int level = cfg.readNumEntry("DebugLevel", 0); |
294 | setDebugLevel(level); | 294 | setDebugLevel(level); |
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 |
300 | static bool noDebug = true; | 300 | static bool noDebug = true; |
301 | g_level = level; | 301 | g_level = level; |
302 | if(g_level > 0){ | 302 | if(g_level > 0){ |
303 | if(noDebug){ | 303 | if(noDebug){ |
304 | m_defHandler = qInstallMsgHandler(MsgHandler); | 304 | m_defHandler = qInstallMsgHandler(MsgHandler); |
305 | noDebug = false; | 305 | noDebug = false; |
306 | } | 306 | } |
307 | } else { | 307 | } else { |
308 | qInstallMsgHandler(m_defHandler); | 308 | qInstallMsgHandler(m_defHandler); |
309 | noDebug = true; | 309 | noDebug = true; |
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 | |||
@@ -1,27 +1,27 @@ | |||
1 | #ifndef _KEY_HELPER_WIDGET_H_ | 1 | #ifndef _KEY_HELPER_WIDGET_H_ |
2 | #define _KEY_HELPER_WIDGET_H_ | 2 | #define _KEY_HELPER_WIDGET_H_ |
3 | 3 | ||
4 | #include <qwidget.h> | 4 | #include <qwidget.h> |
5 | #include <qlabel.h> | 5 | #include <qlabel.h> |
6 | #include <qpixmap.h> | 6 | #include <qpixmap.h> |
7 | #include <qtimer.h> | 7 | #include <qtimer.h> |
8 | #include <qaccel.h> | 8 | #include <qaccel.h> |
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" |
18 | #include "ConfigEx.h" | 18 | #include "ConfigEx.h" |
19 | 19 | ||
20 | #include <syslog.h> | 20 | #include <syslog.h> |
21 | 21 | ||
22 | Q_EXPORT void MsgHandler(QtMsgType type, const char* msg); | 22 | Q_EXPORT void MsgHandler(QtMsgType type, const char* msg); |
23 | 23 | ||
24 | class KeyHelperWidget : public QLabel | 24 | class KeyHelperWidget : public QLabel |
25 | { | 25 | { |
26 | Q_OBJECT | 26 | Q_OBJECT |
27 | public: | 27 | public: |
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 | ||