Diffstat (limited to 'noncore/apps/opie-console/function_keyboard.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index 7f313d6..80d9f29 100644 --- a/noncore/apps/opie-console/function_keyboard.h +++ b/noncore/apps/opie-console/function_keyboard.h | |||
@@ -1,10 +1,11 @@ | |||
1 | #ifndef OPIE_FUNCTION_KEYBOARD_H | 1 | #ifndef OPIE_FUNCTION_KEYBOARD_H |
2 | #define OPIE_FUNCTION_KEYBOARD_H | 2 | #define OPIE_FUNCTION_KEYBOARD_H |
3 | 3 | ||
4 | #include <qpe/config.h> | 4 | #include <qpe/config.h> |
5 | #include <qpe/resource.h> | ||
5 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
6 | #include <qframe.h> | 7 | #include <qframe.h> |
7 | #include <qpainter.h> | 8 | #include <qpainter.h> |
8 | #include <qvbox.h> | 9 | #include <qvbox.h> |
9 | #include <qgroupbox.h> | 10 | #include <qgroupbox.h> |
10 | #include <qmap.h> | 11 | #include <qmap.h> |
@@ -13,19 +14,18 @@ | |||
13 | #include "profiledialogwidget.h" | 14 | #include "profiledialogwidget.h" |
14 | 15 | ||
15 | 16 | ||
16 | struct FKey { | 17 | struct FKey { |
17 | 18 | ||
18 | FKey(): qcode(0), unicode(0) {}; | 19 | FKey(): qcode(0), unicode(0) {}; |
19 | FKey(const QString &l, const QString &f, ushort q, ushort u): | 20 | FKey(const QString &l, const QString &f, ushort q, ushort u): |
20 | label(l), pixFile(f), qcode(q), unicode(u) { | 21 | label(l), pixFile(f), qcode(q), unicode(u) { |
21 | |||
22 | if (!f.isEmpty()) { | ||
23 | 22 | ||
24 | pix = new QPixmap (QPEApplication::qpeDir() + "pics/console/keys/" + f); | 23 | if (!f.isEmpty()) { |
25 | 24 | ||
25 | pix = new QPixmap ( Resource::loadPixmap("console/keys/" + f ) ); | ||
26 | } | 26 | } |
27 | }; | 27 | }; |
28 | 28 | ||
29 | QString label; | 29 | QString label; |
30 | QPixmap *pix; | 30 | QPixmap *pix; |
31 | QString pixFile; | 31 | QString pixFile; |