summaryrefslogtreecommitdiff
path: root/noncore/applets/zkbapplet/applet/zkbwidget.cpp
Side-by-side diff
Diffstat (limited to 'noncore/applets/zkbapplet/applet/zkbwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/zkbapplet/applet/zkbwidget.cpp18
1 files changed, 5 insertions, 13 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,10 +29,8 @@ ZkbWidget::ZkbWidget(QWidget* parent)
ZkbWidget::~ZkbWidget()
{
- if (keymap != 0) {
- delete keymap;
- keymap = 0;
- }
+ delete keymap;
+ keymap = 0;
}
int ZkbWidget::position()
@@ -41,13 +39,11 @@ int ZkbWidget::position()
}
bool ZkbWidget::loadKeymap() {
- ZkbConfig c(QPEApplication::qpeDir()+"share/zkb");
+ ZkbConfig c(Global::applicationFileName("zkb", QString::null) );
QFontMetrics fm(font());
- if (keymap != 0) {
- delete keymap;
- keymap = 0;
- }
+ delete keymap;
+ keymap = 0;
Keymap* km = new Keymap();
@@ -98,10 +94,6 @@ bool ZkbWidget::loadKeymap() {
return true;
}
-QSize ZkbWidget::sizeHint() const {
- return QSize(AppLnk::smallIconSize(),AppLnk::smallIconSize());
-}
-
void ZkbWidget::stateChanged(const QString& s) {
// odebug << "stateChanged: " << s.utf8() << "\n" << oendl;
setText(s);