Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 14 insertions, 2 deletions

diff --git a/library/taskbarappletinterface.h b/library/taskbarappletinterface.h
index 7e20329..705dd9a 100644
--- a/library/taskbarappletinterface.h
+++ b/library/taskbarappletinterface.h
@@ -1,6 +1,6 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -23,4 +23,5 @@
 
 #include <qpe/qcom.h>
+#include <qpixmap.h>
 
 #ifndef QT_NO_COMPONENT
@@ -39,3 +40,14 @@ struct TaskbarAppletInterface : public QUnknownInterface
 };
 
+// {7505E192-4977-465A-B72F-0A8DD491CF43} 
+#ifndef IID_TaskbarNamedApplet
+#define IID_TaskbarNamedApplet QUuid( 0x7505e192, 0x4977, 0x465a, 0xb7, 0x2f, 0x0a, 0x8d, 0xd4, 0x91, 0xcf, 0x43)
+#endif
+
+struct TaskbarNamedAppletInterface : public TaskbarAppletInterface
+{
+    virtual QString name() const = 0;
+    virtual QPixmap icon() const = 0;
+};
+
 #endif