summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/okeyfilter.cpp53
-rw-r--r--libopie2/opiecore/okeyfilter.h54
2 files changed, 80 insertions, 27 deletions
diff --git a/libopie2/opiecore/okeyfilter.cpp b/libopie2/opiecore/okeyfilter.cpp
index d806dbd..b064272 100644
--- a/libopie2/opiecore/okeyfilter.cpp
+++ b/libopie2/opiecore/okeyfilter.cpp
@@ -33,17 +33,28 @@ _;:, .> :=|. This program is free software; you can
namespace Opie {
namespace Core {
-QValueList<QWSServer::KeyboardFilter*> OKeyFilter::filterList;
-QValueList<QWSServer::KeyboardFilter*> OKeyFilter::preFilterList;
+class OKeyFilterPrivate:public OKeyFilter, QWSServer::KeyboardFilter
+{
+ static QValueList<QWSServer::KeyboardFilter*> filterList;
+ static QValueList<QWSServer::KeyboardFilter*> preFilterList;
+protected:
+ OKeyFilterPrivate(const OKeyFilterPrivate&):OKeyFilter(),QWSServer::KeyboardFilter(){};
+ virtual void addPreHandler(QWSServer::KeyboardFilter*);
+ virtual void remPreHandler(QWSServer::KeyboardFilter*);
+
+public:
+ OKeyFilterPrivate();
+ virtual ~OKeyFilterPrivate();
+ virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
+ virtual void addHandler(QWSServer::KeyboardFilter*);
+ virtual void remHandler(QWSServer::KeyboardFilter*);
+};
+
+QValueList<QWSServer::KeyboardFilter*> OKeyFilterPrivate::filterList;
+QValueList<QWSServer::KeyboardFilter*> OKeyFilterPrivate::preFilterList;
OKeyFilter::OKeyFilter()
- :QWSServer::KeyboardFilter()
{
- filterList.clear();
- preFilterList.clear();
- if ( isQWS( ) ) {
- QWSServer::setKeyboardFilter ( this );
- }
}
OKeyFilter::~OKeyFilter()
@@ -54,12 +65,12 @@ OKeyFilter* OKeyFilter::inst()
{
static OKeyFilter*ofilter = 0;
if (!ofilter) {
- ofilter = new OKeyFilter;
+ ofilter = new OKeyFilterPrivate;
}
return ofilter;
}
-bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
+bool OKeyFilterPrivate::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
{
QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) {
@@ -75,7 +86,7 @@ bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress,
return false;
}
-void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF)
{
if (filterList.find(aF)!=filterList.end()) {
return;
@@ -84,7 +95,7 @@ void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF)
filterList.append(aF);
}
-void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF)
{
QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
if ( (iter=filterList.find(aF))==filterList.end() ) {
@@ -94,7 +105,7 @@ void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF)
filterList.remove(iter);
}
-void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF)
{
if (preFilterList.find(aF)!=preFilterList.end()) {
return;
@@ -103,7 +114,7 @@ void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF)
preFilterList.append(aF);
}
-void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF)
{
QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
if ( (iter=preFilterList.find(aF))==preFilterList.end() ) {
@@ -113,6 +124,20 @@ void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF)
preFilterList.remove(iter);
}
+OKeyFilterPrivate::OKeyFilterPrivate()
+ :OKeyFilter(),QWSServer::KeyboardFilter()
+{
+ filterList.clear();
+ preFilterList.clear();
+ if ( isQWS( ) ) {
+ QWSServer::setKeyboardFilter ( this );
+ }
+}
+
+OKeyFilterPrivate::~OKeyFilterPrivate()
+{
+}
+
/* namespace Core */
}
/* namespace Opie */
diff --git a/libopie2/opiecore/okeyfilter.h b/libopie2/opiecore/okeyfilter.h
index 3f9f744..a65bc48 100644
--- a/libopie2/opiecore/okeyfilter.h
+++ b/libopie2/opiecore/okeyfilter.h
@@ -47,29 +47,57 @@ namespace Internal {
* @author Rajko Albrecht
* @version 1.0
*/
-class OKeyFilter:public QWSServer::KeyboardFilter
+class OKeyFilter
{
friend class Opie::Core::ODevice;
friend class Opie::Core::Internal::iPAQ;
friend class Opie::Core::Internal::SIMpad;
- static QValueList<QWSServer::KeyboardFilter*> filterList;
- static QValueList<QWSServer::KeyboardFilter*> preFilterList;
-
- OKeyFilter();
- OKeyFilter(const OKeyFilter&):QWSServer::KeyboardFilter(){};
-
protected:
- void addPreHandler(QWSServer::KeyboardFilter*);
- void remPreHandler(QWSServer::KeyboardFilter*);
+ /**
+ * Protected constructor - generate class via inst()
+ * @see inst()
+ */
+ OKeyFilter();
+ /**
+ * Protected constructor - generate class via inst()
+ * @see inst()
+ */
+ OKeyFilter(const OKeyFilter&){};
+ /**
+ * Append filter to the primary list.
+ * This is only allowed for friend classes from odevice
+ * @param aFilter a filter to append
+ * @see addHandler
+ */
+ virtual void addPreHandler(QWSServer::KeyboardFilter*aFilter)=0;
+ /**
+ * Remove the specified filter from list and give back ownership.
+ * This is only allowed for friend classes from odevice
+ * @param aFilter a filter to remove
+ * @see remHandler
+ */
+ virtual void remPreHandler(QWSServer::KeyboardFilter*aFilter)=0;
public:
virtual ~OKeyFilter();
- virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
-
- void addHandler(QWSServer::KeyboardFilter*);
- void remHandler(QWSServer::KeyboardFilter*);
+ /**
+ * Append filter to the secondary list.
+ * @param aFilter a filter to append
+ * @see addPreHandler
+ */
+ virtual void addHandler(QWSServer::KeyboardFilter*)=0;
+ /**
+ * Remove the specified filter from list and give back ownership.
+ * @param aFilter a filter to remove
+ * @see remPreHandler
+ */
+ virtual void remHandler(QWSServer::KeyboardFilter*)=0;
+ /**
+ * Returns a handler to an instance of OKeyFilter
+ * @return a pointer to a working OKeyFilter
+ */
static OKeyFilter*inst();
};