summaryrefslogtreecommitdiff
path: root/examples/applet
authorzecke <zecke>2004-03-14 20:08:59 (UTC)
committer zecke <zecke>2004-03-14 20:08:59 (UTC)
commit0d79c003839718ae70b3b997162044abd5c26bf6 (patch) (side-by-side diff)
tree19708b041da3a09df8f3b571cd634a846f4ad6d7 /examples/applet
parent05c8d999941989a97a581fb5822437034ec10fd7 (diff)
downloadopie-0d79c003839718ae70b3b997162044abd5c26bf6.zip
opie-0d79c003839718ae70b3b997162044abd5c26bf6.tar.gz
opie-0d79c003839718ae70b3b997162044abd5c26bf6.tar.bz2
Update the Examples
Diffstat (limited to 'examples/applet') (more/less context) (ignore whitespace changes)
-rw-r--r--examples/applet/config.in2
-rw-r--r--examples/applet/example.pro2
-rw-r--r--examples/applet/simpleimpl.cpp96
-rw-r--r--examples/applet/simpleimpl.h23
4 files changed, 16 insertions, 107 deletions
diff --git a/examples/applet/config.in b/examples/applet/config.in
index 177de27..c3fb6dd 100644
--- a/examples/applet/config.in
+++ b/examples/applet/config.in
@@ -3,2 +3,2 @@
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 &&EXAMPLES
diff --git a/examples/applet/example.pro b/examples/applet/example.pro
index 3efd31e..5ae540b 100644
--- a/examples/applet/example.pro
+++ b/examples/applet/example.pro
@@ -12,3 +12,3 @@ DEPENDSPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopieui2
diff --git a/examples/applet/simpleimpl.cpp b/examples/applet/simpleimpl.cpp
index 82fc6e5..62d9bf7 100644
--- a/examples/applet/simpleimpl.cpp
+++ b/examples/applet/simpleimpl.cpp
@@ -1 +1,9 @@
+
+#include "simpleimpl.h"
+
+#include <opie2/otaskbarapplet.h>
+
+#include <qpe/applnk.h> // for AppLnk
+#include <qpe/resource.h> // for Resource loading
+
#include <qlabel.h>
@@ -4,6 +12,3 @@
-#include <qpe/applnk.h> // for AppLnk
-#include <qpe/resource.h> // for Resource loading
-#include "simpleimpl.h"
@@ -73,35 +78,5 @@ void SimpleApplet::paintEvent( QPaintEvent* ) {
/*
- * Here comes the implementation of the interface
+ * We need to add this symbol for the plugin exporter!
*/
-SimpleAppletImpl::SimpleAppletImpl() {
-}
-/* needed cause until it is only pure virtual */
-SimpleAppletImpl::~SimpleAppletImpl() {
- /*
- * we will delete our applets as well
- * setAUtoDelete makes the QList free
- * the objects behind the pointers
- */
- m_applets.setAutoDelete( true );
- m_applets.clear();
-}
-
-/*
- * For the taskbar interface return a Widget
- */
-QWidget* SimpleAppletImpl::applet( QWidget* parent ) {
- /*
- * There are problems with ownership. So we add
- * our ownlist and clear this;
- */
- SimpleApplet* ap = new SimpleApplet( parent );
- m_applets.append( ap );
-
- return ap;
-}
-
-/*
- * A small hint where the Applet Should be displayed
- */
-int SimpleAppletImpl::position()const {
+int SimpleApplet::position(){
return 1;
@@ -110,53 +85,6 @@ int SimpleAppletImpl::position()const {
-/*
- * Now the important QUnkownInterface method without
- * this one your applet won't load
- * @param uuid The uuid of the interface
- * @param iface The pointer to the interface ptr
- */
-QRESULT SimpleAppletImpl::queryInterface( const QUuid& uuid, QUnknownInterface** iface) {
- /* set the pointer to the interface to 0 */
- *iface = 0;
-
- /*
- * we check if we support the requested interface
- * and then assign to the pointer.
- * You may alos create another interface here so
- * *iface = this is only in this simple case true you
- * could also support more interfaces.
- * But this example below is the most common use.
- * Now the caller knows that the Interface Pointer
- * is valid and the interface supported
- */
- if ( uuid == IID_QUnknown )
- *iface = this;
- else if ( uuid == IID_TaskbarApplet )
- *iface = this;
- else
- return QS_FALSE;
-
- if ( *iface )
- (*iface)->addRef();
-
- return QS_OK;
-}
-
/*
- * Finally we need to export the Interface.
- * CREATE_INSTANCE creates a interface and calls
- * queryInterface for the QUnknownInterface once
- * With out this function the applet can't be loaded.
- *
- * NOTE: If your applet does not load it's likely you've an
- * unresolved symbol. Change the .pro TEMPLATE = lib to TEMPLATE= app
- * and recompile. If the linker only complains about a missing
- * main method the problem is more complex. In most cases it'll say
- * you which symbols are missing and you can implement them.
- * The main(int argc, char* argv[] ) does not need to be
- * included in a library so it's ok that the linker complains
+ * Here comes the implementation of the interface
*/
-Q_EXPORT_INTERFACE() {
- Q_CREATE_INSTANCE( SimpleAppletImpl )
-}
-
+EXPORT_OPIE_APPLET_v1( SimpleApplet ) \ No newline at end of file
diff --git a/examples/applet/simpleimpl.h b/examples/applet/simpleimpl.h
index f58e2af..90c632f 100644
--- a/examples/applet/simpleimpl.h
+++ b/examples/applet/simpleimpl.h
@@ -19,2 +19,3 @@
* As example we will use the Taskbar interface
+ * the OTaskBarAppletWrapper implements the factory for us
*/
@@ -47,2 +48,3 @@ public:
~SimpleApplet();
+ static int position();
private:
@@ -53,23 +55,2 @@ private:
-class SimpleAppletImpl : public TaskbarAppletInterface {
-public:
-
- SimpleAppletImpl();
- virtual ~SimpleAppletImpl();
-
- QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-
- QWidget *applet( QWidget* parent );
- int position()const;
-
- /*
- * macro for reference countint
- * if reference drops to zero
- * delete this is called
- */
- Q_REFCOUNT
-
-private:
- QList<SimpleApplet> m_applets;
-};