diff options
author | markus <markus@FreeBSD.org> | 2006-04-28 20:09:28 +0800 |
---|---|---|
committer | markus <markus@FreeBSD.org> | 2006-04-28 20:09:28 +0800 |
commit | 3659bcc4e346c674d415c67121d998b7587a83f5 (patch) | |
tree | 31e6db8e9df94aad56aea49e6b042cfa5f7bbbfd /sysutils | |
parent | 92aabefb34531d9aeeeb492e58815a5a7e088ad4 (diff) | |
download | freebsd-ports-gnome-3659bcc4e346c674d415c67121d998b7587a83f5.tar.gz freebsd-ports-gnome-3659bcc4e346c674d415c67121d998b7587a83f5.tar.zst freebsd-ports-gnome-3659bcc4e346c674d415c67121d998b7587a83f5.zip |
Fix build on 4.x
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/ksynaptics/files/patch-ksynaptics-src-myframe.cpp | 20 | ||||
-rw-r--r-- | sysutils/ksynaptics/files/patch-ksynaptics-src-synconfigwidget.cpp | 11 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sysutils/ksynaptics/files/patch-ksynaptics-src-myframe.cpp b/sysutils/ksynaptics/files/patch-ksynaptics-src-myframe.cpp new file mode 100644 index 000000000000..0b7c942499e3 --- /dev/null +++ b/sysutils/ksynaptics/files/patch-ksynaptics-src-myframe.cpp @@ -0,0 +1,20 @@ +--- ksynaptics/src/myframe.cpp.orig Thu Apr 27 02:00:53 2006 ++++ ksynaptics/src/myframe.cpp Thu Apr 27 02:01:45 2006 +@@ -56,7 +56,7 @@ + kdDebug() << k_funcinfo << endl; + + // range checking +- if ( ( i < NoTrigger ) or ( i >= PadModeMax ) ) ++ if ( ( i < NoTrigger ) || ( i >= PadModeMax ) ) + mPadMode = NoTrigger; + else + mPadMode = (PadMode) i; +@@ -112,7 +112,7 @@ + + // otherwise draw the corners/edges + // TODO improve this drawing +- if ( mPadMode != OneFinger and mPadMode != TwoFingers and mPadMode != ThreeFingers ) ++ if ( mPadMode != OneFinger && mPadMode != TwoFingers && mPadMode != ThreeFingers ) + { + myPainting.setPen( QColor( "Red" ) ); + myPainting.setBrush( QColor( "Red") ); diff --git a/sysutils/ksynaptics/files/patch-ksynaptics-src-synconfigwidget.cpp b/sysutils/ksynaptics/files/patch-ksynaptics-src-synconfigwidget.cpp new file mode 100644 index 000000000000..3d1aafc642e3 --- /dev/null +++ b/sysutils/ksynaptics/files/patch-ksynaptics-src-synconfigwidget.cpp @@ -0,0 +1,11 @@ +--- ksynaptics/src/synconfigwidget.cpp.orig Thu Apr 27 01:52:23 2006 ++++ ksynaptics/src/synconfigwidget.cpp Thu Apr 27 01:52:55 2006 +@@ -320,7 +320,7 @@ + // initialize the edge widget with the proper value + scrollingStateFrame->displayState( SynConfig::circularScrollTrigger() ); + +- if (!( Pad::hasDriver() and Pad::hasShm() )) ++ if (!( Pad::hasDriver() && Pad::hasShm() )) + disableEverything(); + } + |