File svn-1097582-backport.diff of Package synaptiks

Overview Repositories Revisions Requests Users Attributes Meta

File svn-1097582-backport.diff of Package synaptiks (Revision c0fb98c7f47eb4149b31b7600efe69c4)

Currently displaying revision c0fb98c7f47eb4149b31b7600efe69c4 , Show latest

diff -ur -p1 synaptiks-0.3.2orig/src/daemon/de.lunaryorn.Touchpad.xml synaptiks-0.3.2/src/daemon/de.lunaryorn.Touchpad.xml
--- src/daemon/de.lunaryorn.Touchpad.xml	2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/de.lunaryorn.Touchpad.xml	2010-03-29 22:05:27.147510532 +0200
@@ -3,15 +3,2 @@
   <interface name="de.lunaryorn.Touchpad">
-    <property name="on" type="b" access="readwrite"/>
-    <property name="circularScrolling" type="b" access="readwrite"/>
-    <property name="CircularScrollingTrigger" type="y" access="readwrite"/>
-    <property name="horizontalEdgeScrolling" type="b" access="readwrite"/>
-    <property name="verticalEdgeScrolling" type="b" access="readwrite"/>
-    <property name="cornerCoasting" type="b" access="readwrite"/>
-    <property name="costingSpeed" type="d" access="readwrite"/>
-    <property name="cornerButtons" type="ay" access="readwrite"/>
-    <property name="fingerButtons" type="ay" access="readwrite"/>
-    <property name="hasLeftButton" type="b" access="read"/>
-    <property name="hasMiddleButton" type="b" access="read"/>
-    <property name="hasRightButton" type="b" access="read"/>
-    <property name="fingerDetection" type="i" access="read"/>
     <method name="isOn">
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpadadaptor.cpp synaptiks-0.3.2/src/daemon/touchpadadaptor.cpp
--- src/daemon/touchpadadaptor.cpp	2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpadadaptor.cpp	2010-03-29 22:05:27.151508909 +0200
@@ -40,6 +40,4 @@ using namespace synaptiks;
 template<typename T>
-T respondError(const QXDeviceError &error) {
-    QDBusConnection::sessionBus().send(
-        QDBusMessage::createError("de.lunaryorn.TouchpadError",
-                                  error.toString()));
+T respondError(Touchpad *touchpad, const QXDeviceError &error) {
+    touchpad->sendErrorReply("de.lunaryorn.TouchpadError", error.toString());
     return T();
@@ -58,3 +56,3 @@ QString TouchpadAdaptor::name() const {
     } catch (const QXDeviceError &error) {
-        return respondError<QString>(error);
+        return respondError<QString>(this->parent(), error);
     }
@@ -66,3 +64,3 @@ bool TouchpadAdaptor::isOn() const {
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -74,3 +72,3 @@ void TouchpadAdaptor::setOn(bool on) {
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -82,3 +80,3 @@ bool TouchpadAdaptor::circularScrolling(
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -90,3 +88,3 @@ void TouchpadAdaptor::setCircularScrolli
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -98,3 +96,3 @@ uchar TouchpadAdaptor::circularScrolling
     } catch (const QXDeviceError &error) {
-        return respondError<uchar>(error);
+        return respondError<uchar>(this->parent(), error);
     }
@@ -108,5 +106,4 @@ void TouchpadAdaptor::setCircularScrolli
                                    Touchpad::TopLeftCornerTrigger);
-            QDBusConnection::sessionBus().send(
-                QDBusMessage::createError("de.lunaryorn.TouchpadError",
-                                          message));
+            this->parent()->sendErrorReply("de.lunaryorn.TouchpadError",
+                                          message);
         } else {
@@ -116,3 +113,3 @@ void TouchpadAdaptor::setCircularScrolli
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -124,3 +121,3 @@ bool TouchpadAdaptor::horizontalEdgeScro
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -132,3 +129,3 @@ void TouchpadAdaptor::setHorizontalEdgeS
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -140,3 +137,3 @@ bool TouchpadAdaptor::verticalEdgeScroll
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -148,3 +145,3 @@ void TouchpadAdaptor::setVerticalEdgeScr
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -156,3 +153,3 @@ bool TouchpadAdaptor::cornerCoasting() c
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -164,3 +161,3 @@ void TouchpadAdaptor::setCornerCoasting(
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -172,3 +169,3 @@ double TouchpadAdaptor::coastingSpeed()
     } catch (const QXDeviceError &error) {
-        return respondError<double>(error);
+        return respondError<double>(this->parent(), error);
     }
@@ -180,3 +177,3 @@ void TouchpadAdaptor::setCoastingSpeed(d
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -188,3 +185,3 @@ QByteArray TouchpadAdaptor::cornerButton
     } catch (const QXDeviceError &error) {
-        return respondError<QByteArray>(error);
+        return respondError<QByteArray>(this->parent(), error);
     }
@@ -198,5 +195,3 @@ void TouchpadAdaptor::setCornerButtons(c
                 "The argument must have at least %1 elements", 4);
-            QDBusConnection::sessionBus().send(
-                QDBusMessage::createError(
-                    "de.lunaryorn.TouchpadError", message));
+            this->parent()->sendErrorReply("de.lunaryorn.TouchpadError", message);
         }
@@ -204,3 +199,3 @@ void TouchpadAdaptor::setCornerButtons(c
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -212,3 +207,3 @@ QByteArray TouchpadAdaptor::fingerButton
     } catch (const QXDeviceError &error) {
-        return respondError<QByteArray>(error);
+        return respondError<QByteArray>(this->parent(), error);
     }
@@ -222,5 +217,3 @@ void TouchpadAdaptor::setFingerButtons(c
                 "The argument must have at least %1 elements", 3);
-            QDBusConnection::sessionBus().send(
-                QDBusMessage::createError(
-                    "de.lunaryorn.TouchpadError", message));
+            this->parent()->sendErrorReply("de.lunaryorn.TouchpadError", message);
         }
@@ -228,3 +221,3 @@ void TouchpadAdaptor::setFingerButtons(c
     } catch (const QXDeviceError &error) {
-        respondError<void>(error);
+        respondError<void>(this->parent(), error);
     }
@@ -236,3 +229,3 @@ bool TouchpadAdaptor::hasLeftButton() co
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -244,3 +237,3 @@ bool TouchpadAdaptor::hasMiddleButton()
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -252,3 +245,3 @@ bool TouchpadAdaptor::hasRightButton() c
     } catch (const QXDeviceError &error) {
-        return respondError<bool>(error);
+        return respondError<bool>(this->parent(), error);
     }
@@ -260,3 +253,3 @@ int TouchpadAdaptor::fingerDetection() c
     } catch (const QXDeviceError &error) {
-        return respondError<int>(error);
+        return respondError<int>(this->parent(), error);
     }
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpadadaptor.h synaptiks-0.3.2/src/daemon/touchpadadaptor.h
--- src/daemon/touchpadadaptor.h	2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpadadaptor.h	2010-03-29 22:05:27.153510682 +0200
@@ -52,26 +52,2 @@ namespace synaptiks {
 
-    public:
-        Q_PROPERTY(QString name READ name)
-        Q_PROPERTY(bool on READ isOn WRITE setOn)
-        Q_PROPERTY(bool circularScrolling
-                   READ circularScrolling WRITE setCircularScrolling)
-        Q_PROPERTY(uchar CircularScrollingTrigger READ circularScrollingTrigger
-                   WRITE setCircularScrollingTrigger)
-        Q_PROPERTY(bool horizontalEdgeScrolling READ horizontalEdgeScrolling
-                   WRITE setHorizontalEdgeScrolling)
-        Q_PROPERTY(bool verticalEdgeScrolling READ verticalEdgeScrolling
-                   WRITE setVerticalEdgeScrolling)
-        Q_PROPERTY(bool cornerCoasting
-                   READ cornerCoasting WRITE setCornerCoasting)
-        Q_PROPERTY(double costingSpeed READ coastingSpeed
-                   WRITE setCoastingSpeed DESIGNABLE false)
-        Q_PROPERTY(QByteArray cornerButtons
-                   READ cornerButtons WRITE setCornerButtons)
-        Q_PROPERTY(QByteArray fingerButtons
-                   READ fingerButtons WRITE setFingerButtons)
-        Q_PROPERTY(bool hasLeftButton READ hasLeftButton)
-        Q_PROPERTY(bool hasMiddleButton READ hasMiddleButton)
-        Q_PROPERTY(bool hasRightButton READ hasRightButton)
-        Q_PROPERTY(int fingerDetection READ fingerDetection)
-
     public Q_SLOTS:
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpad.h synaptiks-0.3.2/src/daemon/touchpad.h
--- src/daemon/touchpad.h	2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpad.h	2010-03-29 22:05:27.146508808 +0200
@@ -33,2 +33,3 @@
 #include "qxdevice.h"
+#include <QtDBus/QDBusContext>
 #include <QtCore/QObject>
@@ -130,2 +131,3 @@ namespace synaptiks {
      * @code
+     *
      * Touchpad *touchpad = Touchpad::findTouchpad(parent);
@@ -161,3 +163,3 @@ namespace synaptiks {
      */
-    class Touchpad: public QObject {
+    class Touchpad: public QObject, public QDBusContext {
         Q_OBJECT

Places

File svn-1097582-backport.diff of Package synaptiks (Revision c0fb98c7f47eb4149b31b7600efe69c4)

Places