remove duplicated boiler plate code in favour of the OTaskbarApplet template

1 files changed, 19 insertions, 6 deletions

diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 56a031c..5d6bce4 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -17,8 +17,4 @@
 
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <unistd.h>
-
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
@@ -26,2 +22,3 @@
 
+/* QT */
 #include <qlineedit.h>
@@ -36,2 +33,8 @@
 
+/* STD */
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <unistd.h>
 
@@ -499,2 +502,7 @@ ScreenshotApplet::~ScreenshotApplet()
 
+int ScreenshotApplet::position()
+{
+    return 6;
+}
+
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
@@ -530 +538,6 @@ void ScreenshotApplet::paintEvent( QPaintEvent* )
 
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> );
+}
+