Diffstat (limited to 'noncore/applets/zkbapplet/applet') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/applets/zkbapplet/applet/zkbwidget.cpp | 10 | ||||
-rw-r--r-- | noncore/applets/zkbapplet/applet/zkbwidget.h | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.cpp b/noncore/applets/zkbapplet/applet/zkbwidget.cpp index 13729ea..55c08b3 100644 --- a/noncore/applets/zkbapplet/applet/zkbwidget.cpp +++ b/noncore/applets/zkbapplet/applet/zkbwidget.cpp | |||
@@ -29,11 +29,9 @@ ZkbWidget::ZkbWidget(QWidget* parent) | |||
29 | 29 | ||
30 | ZkbWidget::~ZkbWidget() | 30 | ZkbWidget::~ZkbWidget() |
31 | { | 31 | { |
32 | if (keymap != 0) { | ||
33 | delete keymap; | 32 | delete keymap; |
34 | keymap = 0; | 33 | keymap = 0; |
35 | } | 34 | } |
36 | } | ||
37 | 35 | ||
38 | int ZkbWidget::position() | 36 | int ZkbWidget::position() |
39 | { | 37 | { |
@@ -41,13 +39,11 @@ int ZkbWidget::position() | |||
41 | } | 39 | } |
42 | 40 | ||
43 | bool ZkbWidget::loadKeymap() { | 41 | bool ZkbWidget::loadKeymap() { |
44 | ZkbConfig c(QPEApplication::qpeDir()+"share/zkb"); | 42 | ZkbConfig c(Global::applicationFileName("zkb", QString::null) ); |
45 | QFontMetrics fm(font()); | 43 | QFontMetrics fm(font()); |
46 | 44 | ||
47 | if (keymap != 0) { | ||
48 | delete keymap; | 45 | delete keymap; |
49 | keymap = 0; | 46 | keymap = 0; |
50 | } | ||
51 | 47 | ||
52 | Keymap* km = new Keymap(); | 48 | Keymap* km = new Keymap(); |
53 | 49 | ||
@@ -98,10 +94,6 @@ bool ZkbWidget::loadKeymap() { | |||
98 | return true; | 94 | return true; |
99 | } | 95 | } |
100 | 96 | ||
101 | QSize ZkbWidget::sizeHint() const { | ||
102 | return QSize(AppLnk::smallIconSize(),AppLnk::smallIconSize()); | ||
103 | } | ||
104 | |||
105 | void ZkbWidget::stateChanged(const QString& s) { | 97 | void ZkbWidget::stateChanged(const QString& s) { |
106 | // odebug << "stateChanged: " << s.utf8() << "\n" << oendl; | 98 | // odebug << "stateChanged: " << s.utf8() << "\n" << oendl; |
107 | setText(s); | 99 | setText(s); |
diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.h b/noncore/applets/zkbapplet/applet/zkbwidget.h index 9bce85a..13906c0 100644 --- a/noncore/applets/zkbapplet/applet/zkbwidget.h +++ b/noncore/applets/zkbapplet/applet/zkbwidget.h | |||
@@ -17,8 +17,6 @@ public: | |||
17 | ~ZkbWidget(); | 17 | ~ZkbWidget(); |
18 | static int position(); | 18 | static int position(); |
19 | 19 | ||
20 | QSize sizeHint() const; | ||
21 | |||
22 | protected: | 20 | protected: |
23 | QLabel* label; | 21 | QLabel* label; |
24 | Keymap* keymap; | 22 | Keymap* keymap; |