1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

Fix build on 4.x

This commit is contained in:
Markus Brueffer 2006-04-28 12:09:28 +00:00
parent 0e5aa1add1
commit df166a39f6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=160657
2 changed files with 31 additions and 0 deletions

View File

@ -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") );

View File

@ -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();
}