author | mickeyl <mickeyl> | 2004-03-01 14:44:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-01 14:44:21 (UTC) |
commit | 7a819ad4bc09aa88521044bfbb06ab37a4c2ef66 (patch) (unidiff) | |
tree | 30adbbdd3d1eedaadd3671a17d960d161ddbfbe0 /core/applets | |
parent | dbf8c3e1fc4416f2fd719b7d278984591a2366de (diff) | |
download | opie-7a819ad4bc09aa88521044bfbb06ab37a4c2ef66.zip opie-7a819ad4bc09aa88521044bfbb06ab37a4c2ef66.tar.gz opie-7a819ad4bc09aa88521044bfbb06ab37a4c2ef66.tar.bz2 |
libopie1-->libopie2
-rw-r--r-- | core/applets/multikeyapplet/config.in | 2 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 15 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikey.h | 1 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikeyapplet.pro | 6 |
4 files changed, 19 insertions, 5 deletions
diff --git a/core/applets/multikeyapplet/config.in b/core/applets/multikeyapplet/config.in index fc7affe..2e1a9e2 100644 --- a/core/applets/multikeyapplet/config.in +++ b/core/applets/multikeyapplet/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && MULTIKEY | 4 | depends ( LIBQPE || LIBQPE-X11 ) && MULTIKEY |
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 | |||
@@ -16,2 +16,4 @@ | |||
16 | 16 | ||
17 | /* OPIE */ | ||
18 | #include <opie2/otaskbarapplet.h> | ||
17 | #include <qpe/global.h> | 19 | #include <qpe/global.h> |
@@ -21,2 +23,3 @@ | |||
21 | 23 | ||
24 | /* QT */ | ||
22 | #include <qlabel.h> | 25 | #include <qlabel.h> |
@@ -114,3 +117,3 @@ void Multikey::message(const QCString &message, const QByteArray &data) | |||
114 | if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) { | 117 | if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) { |
115 | 118 | ||
116 | if (i != sw.count()-1) { | 119 | if (i != sw.count()-1) { |
@@ -136 +139,11 @@ void Multikey::message(const QCString &message, const QByteArray &data) | |||
136 | } | 139 | } |
140 | |||
141 | int Multikey::position() | ||
142 | { | ||
143 | return 10; | ||
144 | } | ||
145 | |||
146 | Q_EXPORT_INTERFACE() | ||
147 | { | ||
148 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> ); | ||
149 | } | ||
diff --git a/core/applets/multikeyapplet/multikey.h b/core/applets/multikeyapplet/multikey.h index 1c5aa0c..acddfc8 100644 --- a/core/applets/multikeyapplet/multikey.h +++ b/core/applets/multikeyapplet/multikey.h | |||
@@ -26,2 +26,3 @@ public: | |||
26 | Multikey(QWidget *parent); | 26 | Multikey(QWidget *parent); |
27 | static int position(); | ||
27 | 28 | ||
diff --git a/core/applets/multikeyapplet/multikeyapplet.pro b/core/applets/multikeyapplet/multikeyapplet.pro index 4be1f74..86e41c0 100644 --- a/core/applets/multikeyapplet/multikeyapplet.pro +++ b/core/applets/multikeyapplet/multikeyapplet.pro | |||
@@ -2,4 +2,4 @@ TEMPLATE = lib | |||
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS= multikey.h multikeyappletimpl.h | 3 | HEADERS= multikey.h |
4 | SOURCES= multikey.cpp multikeyappletimpl.cpp | 4 | SOURCES= multikey.cpp |
5 | TARGET = multikeyapplet | 5 | TARGET = multikeyapplet |
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |