1 files changed, 14 insertions, 1 deletions

diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index d304f54..b36ee12 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -5,29 +5,32 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "multikey.h"
 
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/global.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qlabel.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qcopchannel_qws.h>
 
 Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
 {
     QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this);
     connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)),
              this, SLOT(message(const QCString &, const QByteArray &)));
 
     setFont( QFont( "Helvetica", 10, QFont::Normal ) );
@@ -103,34 +106,44 @@ void Multikey::message(const QCString &message, const QByteArray &data)
                 }
                 keymap_map = sw[i];
             }
 
             QFile map(keymap_map);
             if (map.open(IO_ReadOnly)) {
                 QString line;
 
                 map.readLine(line, 1024);
                 while (!map.atEnd()) {
 
                     if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) {
-                
+
                         if (i != sw.count()-1) {
                             if (keymap_map == current_map) {
                                 lang = i;
                             }
                             sw_maps.append(keymap_map);
                             labels.append(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
                             popupMenu.insertItem(labels[labels.count()-1], labels.count()-1);
                         } else {
                             current = line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace();
                         }
                         break;
                     }
                     map.readLine(line, 1024);
                 }
                 map.close();
             }
         }
 
         setText(current);
     }
 }
+
+int Multikey::position()
+{
+    return 10;
+}
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> );
+}