wok-next rev 20881
accessx: fix build
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Jul 10 11:20:55 2018 +0300 (2018-07-10) |
| parents | e99bd65b617a |
| children | d958fec46c9f |
| files | accessx/receipt accessx/stuff/patches/accessx-0951.patch accessx/stuff/patches/accessx.diff accessx/stuff/patches/series |
line diff
1.1 --- a/accessx/receipt Mon Jul 09 04:41:27 2018 +0300 1.2 +++ b/accessx/receipt Tue Jul 10 11:20:55 2018 +0300 1.3 @@ -1,35 +1,34 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="accessx" 1.8 VERSION="0.951" 1.9 CATEGORY="utilities" 1.10 -SHORT_DESC="Set and display Xkeyboard (XCB) Accessx features." 1.11 +SHORT_DESC="Set and display Xkeyboard (XCB) Accessx features" 1.12 MAINTAINER="paul@slitaz.org" 1.13 LICENSE="GPL2" 1.14 +WEB_SITE="http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php" 1.15 + 1.16 TARBALL="$PACKAGE${VERSION//./}.tar.gz" 1.17 -WEB_SITE="http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php" 1.18 -WGET_URL="$(dirname $WEB_SITE)/files/$TARBALL" 1.19 +WGET_URL="http://cita.disability.uiuc.edu/software/accessx/files/$TARBALL" 1.20 1.21 -DEPENDS="tk tcl" 1.22 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev" 1.23 +BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev tk-dev" 1.24 1.25 -# Rules to configure and make the package. 1.26 -compile_rules() 1.27 -{ 1.28 - sed -i 's/^LLIBS=.*/& -lX11/' Makefile 1.29 +compile_rules() { 1.30 + sed -i 's|$(CC) $(OPTS) ax.C|$(CC) $(LDFLAGS) $(OPTS) ax.C|' Makefile 1.31 1.32 - make 1.33 + make \ 1.34 + OPTS="${CXXFLAGS}" \ 1.35 + XLIBDIR="-L/usr/lib" \ 1.36 + LLIBS="$(pkg-config --libs xext) $(pkg-config --libs x11)" \ 1.37 + || return 1 1.38 + 1.39 + install -Dm755 accessx $install/usr/bin/accessx 1.40 + install -Dm755 ax $install/usr/bin/ax 1.41 + 1.42 + cook_pick_docs README 1.43 } 1.44 1.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.46 -genpkg_rules() 1.47 -{ 1.48 - mkdir -p $fs/usr/bin 1.49 - cp -a $src/ax $fs/usr/bin 1.50 - cp -a $src/accessx* $fs/usr/bin/accessx 1.51 - 1.52 - # Change owner & perms accessx 1.53 - chown root.root $fs/usr/bin/accessx 1.54 - chmod 0755 $fs/usr/bin/accessx 1.55 +genpkg_rules() { 1.56 + copy @std 1.57 + DEPENDS="xorg-libX11 tk tcl" 1.58 } 1.59 -
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/accessx/stuff/patches/accessx-0951.patch Tue Jul 10 11:20:55 2018 +0300 2.3 @@ -0,0 +1,65 @@ 2.4 +diff -ur accessx.orig/Access.C accessx/Access.C 2.5 +--- accessx.orig/Access.C 2003-09-19 19:08:01.000000000 +0300 2.6 ++++ accessx/Access.C 2008-01-07 18:53:43.000000000 +0200 2.7 +@@ -22,6 +22,8 @@ 2.8 + #include <X11/XKBlib.h> 2.9 + #include "Access.h" 2.10 + 2.11 ++using namespace std; 2.12 ++ 2.13 + // 2.14 + // Access() 2.15 + // 2.16 +@@ -153,7 +155,7 @@ 2.17 + //Get the state of the keyboard. 2.18 + 2.19 + XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd); 2.20 +- if ((int)xkb == BadAlloc || xkb == NULL) 2.21 ++ if (xkb == NULL) 2.22 + { 2.23 + return 5; /*AccessKeyboardQueryFailure;*/ 2.24 + } 2.25 +@@ -262,7 +264,7 @@ 2.26 + //Get the state of the keyboard. 2.27 + 2.28 + XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd); 2.29 +- if ((int)xkb == BadAlloc || xkb == NULL) 2.30 ++ if (xkb == NULL) 2.31 + { 2.32 + return 5; /*AccessKeyboardQueryFailure;*/ 2.33 + } 2.34 +diff -ur accessx.orig/Access.h accessx/Access.h 2.35 +--- accessx.orig/Access.h 2003-09-19 19:00:42.000000000 +0300 2.36 ++++ accessx/Access.h 2008-01-07 18:53:47.000000000 +0200 2.37 +@@ -21,7 +21,7 @@ 2.38 + * 2.39 + */ 2.40 + 2.41 +-#include <iostream.h> 2.42 ++#include <iostream> 2.43 + #include <math.h> 2.44 + 2.45 + inline char* onoroff(int val) 2.46 +diff -ur accessx.orig/ax.C accessx/ax.C 2.47 +--- accessx.orig/ax.C 2003-09-19 19:09:31.000000000 +0300 2.48 ++++ accessx/ax.C 2008-01-07 18:53:49.000000000 +0200 2.49 +@@ -20,6 +20,7 @@ 2.50 + 2.51 + #include "ax.h" 2.52 + 2.53 ++using namespace std; 2.54 + 2.55 + /////////////////////////////////////////////////////////////////////////////// 2.56 + // 2.57 +diff -ur accessx.orig/ax.h accessx/ax.h 2.58 +--- accessx.orig/ax.h 2003-09-19 19:06:56.000000000 +0300 2.59 ++++ accessx/ax.h 2008-01-07 18:53:51.000000000 +0200 2.60 +@@ -24,7 +24,7 @@ 2.61 + 2.62 + // Include Files 2.63 + 2.64 +-#include <iostream.h> 2.65 ++#include <iostream> 2.66 + #include <stdio.h> 2.67 + #include <stdlib.h> 2.68 + #include <string.h>
3.1 --- a/accessx/stuff/patches/accessx.diff Mon Jul 09 04:41:27 2018 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,551 +0,0 @@ 3.4 -Patch for deprecated <iostream.h> 3.5 - 3.6 ---- a/Access.C 2003-09-19 17:08:01.000000000 +0100 3.7 -+++ b/Access.C 2010-10-03 12:29:36.000000000 +0100 3.8 -@@ -19,6 +19,7 @@ 3.9 - */ 3.10 - 3.11 - #include <X11/Xlib.h> 3.12 -+#include <iostream> 3.13 - #include <X11/XKBlib.h> 3.14 - #include "Access.h" 3.15 - 3.16 -@@ -62,43 +63,43 @@ 3.17 - 3.18 - void Access::ShowDiagnostics() 3.19 - { 3.20 -- cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << endl; 3.21 -- cout << "AccessX Timeout Value: " << GetAccessXDelay() << endl; 3.22 -+ std::cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << std::endl; 3.23 -+ std::cout << "AccessX Timeout Value: " << GetAccessXDelay() << std::endl; 3.24 - 3.25 -- cout << endl; 3.26 -+ std::cout << std::endl; 3.27 - 3.28 -- cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << endl; 3.29 -- cout << " - Delay: " << GetMouseKeysDelay() << endl; 3.30 -- cout << " - Interval: " << GetMouseKeysInterval() << endl; 3.31 -- cout << " - T to Max: " << GetMouseKeysTimeToMax() << endl; 3.32 -- cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << endl; 3.33 -- cout << " - Curve: " << GetMouseKeysCurve() << endl; 3.34 -+ std::cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << std::endl; 3.35 -+ std::cout << " - Delay: " << GetMouseKeysDelay() << std::endl; 3.36 -+ std::cout << " - Interval: " << GetMouseKeysInterval() << std::endl; 3.37 -+ std::cout << " - T to Max: " << GetMouseKeysTimeToMax() << std::endl; 3.38 -+ std::cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << std::endl; 3.39 -+ std::cout << " - Curve: " << GetMouseKeysCurve() << std::endl; 3.40 - 3.41 -- cout << endl; 3.42 -+ std::cout << std::endl; 3.43 - 3.44 -- cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << endl; 3.45 -- cout << " - Delay: " << GetSlowKeysDelay() << endl; 3.46 -+ std::cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << std::endl; 3.47 -+ std::cout << " - Delay: " << GetSlowKeysDelay() << std::endl; 3.48 - 3.49 -- cout << endl; 3.50 -+ std::cout << std::endl; 3.51 - 3.52 -- cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << endl; 3.53 -- cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState()) 3.54 -- << endl; 3.55 -- cout << " - 2 Key Dis: " << 3.56 -- onoroff(GetStickyKeysTwoKeyDisableState()) << endl; 3.57 -+ std::cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << std::endl; 3.58 -+ std::cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState()) 3.59 -+ << std::endl; 3.60 -+ std::cout << " - 2 Key Dis: " << 3.61 -+ onoroff(GetStickyKeysTwoKeyDisableState()) << std::endl; 3.62 - 3.63 -- cout << endl; 3.64 -+ std::cout << std::endl; 3.65 - 3.66 -- cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << endl; 3.67 -- cout << " - Delay: " << GetBounceKeysDelay() << endl; 3.68 -+ std::cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << std::endl; 3.69 -+ std::cout << " - Delay: " << GetBounceKeysDelay() << std::endl; 3.70 - 3.71 -- cout << endl; 3.72 -+ std::cout << std::endl; 3.73 - 3.74 -- cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << endl; 3.75 -- cout << " - Delay: " << GetRepeatKeysDelay() << endl; 3.76 -- cout << " - Interval: " << GetRepeatKeysInterval() << endl; 3.77 -+ std::cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << std::endl; 3.78 -+ std::cout << " - Delay: " << GetRepeatKeysDelay() << std::endl; 3.79 -+ std::cout << " - Interval: " << GetRepeatKeysInterval() << std::endl; 3.80 - 3.81 -- cout << endl; 3.82 -+ std::cout << std::endl; 3.83 - } 3.84 - 3.85 - // 3.86 ---- a/Access.h 2003-09-19 17:00:42.000000000 +0100 3.87 -+++ b/Access.h 2010-10-03 12:24:20.000000000 +0100 3.88 -@@ -21,7 +21,7 @@ 3.89 - * 3.90 - */ 3.91 - 3.92 --#include <iostream.h> 3.93 -+#include <iostream> 3.94 - #include <math.h> 3.95 - 3.96 - inline char* onoroff(int val) 3.97 ---- a/ax.C 2003-09-19 17:09:31.000000000 +0100 3.98 -+++ b/ax.C 2010-10-03 12:31:00.000000000 +0100 3.99 -@@ -62,45 +62,45 @@ 3.100 - 3.101 - void showHelp(void) { 3.102 - 3.103 -- cout << "Usage: accessx [options & option/value pairs]" 3.104 -- << endl << endl; 3.105 -- cout << "status: Show status of AccessX Features" << endl 3.106 -- << "help: Show this help text" << endl 3.107 -- << "loadconfig: Load the ~/AccessX config file" << endl 3.108 -- << endl 3.109 -- << "+timeout: Enable AccessX Timeout" << endl 3.110 -- << "-timeout: Disable AccessX Timeout" << endl 3.111 -- << "timeout <value>: Set AccessX Timeout" << endl 3.112 -- << endl 3.113 -- << "+mousekeys: Enable MouseKeys" << endl 3.114 -- << "-mousekeys: Disable MouseKeys" << endl 3.115 -- << "mousedelay <value>: Set MouseKeys Delay" << endl 3.116 -- << "mouseinterval <value>: Set MouseKeys Interval" << endl 3.117 -- << "mousetimetomax <value>: Set MouseKeys time to max speed" << endl 3.118 -- << "mousemaxspeed <value>: Set MouseKeys max speed" << endl 3.119 -- << "mousecurve <value>: Set MouseKeys acceleration curve" << endl 3.120 -- << endl 3.121 -- << "+slowkeys: Enable SlowKeys" << endl 3.122 -- << "-slowkeys: Disable SlowKeys" << endl 3.123 -- << "slowdelay <value>: Set SlowKeys Delay" << endl 3.124 -- << endl 3.125 -- << "+stickykeys: Enable StickyKeys" << endl 3.126 -- << "-stickykeys: Disable StickyKeys" << endl 3.127 -- << "+stickylatchtolock: Enable S.K. Latch To Lock" << endl 3.128 -- << "-stickylatchtolock: Disbale S.K. Latch To Lock" << endl 3.129 -- << "+stickytwokeydisable: Enable S.K. Two Key Disable" << endl 3.130 -- << "-stickytwokeydisable: Disable S.K. Two Key Disable" << endl 3.131 -- << endl 3.132 -- << "+bouncekeys: Enable BounceKeys" << endl 3.133 -- << "-bouncekeys: Disable BounceKeys" << endl 3.134 -- << "bouncedelay <value>: Set Debounce Delay" << endl 3.135 -- << endl 3.136 -- << "+repeatkeys: Enable RepeatKeys" << endl 3.137 -- << "-repeatkeys: Disable RepeatKeys" << endl 3.138 -- << "repeatdelay <value>: Set RepeatKeys Delay" << endl 3.139 -- << "repeatinterval <value>: Set RepeatKeys Interval" << endl << endl 3.140 -- << "With no options, loads config file." << endl 3.141 -- << endl; 3.142 -+ std::cout << "Usage: accessx [options & option/value pairs]" 3.143 -+ << std::endl << std::endl; 3.144 -+ std::cout << "status: Show status of AccessX Features" << std::endl 3.145 -+ << "help: Show this help text" << std::endl 3.146 -+ << "loadconfig: Load the ~/AccessX config file" << std::endl 3.147 -+ << std::endl 3.148 -+ << "+timeout: Enable AccessX Timeout" << std::endl 3.149 -+ << "-timeout: Disable AccessX Timeout" << std::endl 3.150 -+ << "timeout <value>: Set AccessX Timeout" << std::endl 3.151 -+ << std::endl 3.152 -+ << "+mousekeys: Enable MouseKeys" << std::endl 3.153 -+ << "-mousekeys: Disable MouseKeys" << std::endl 3.154 -+ << "mousedelay <value>: Set MouseKeys Delay" << std::endl 3.155 -+ << "mouseinterval <value>: Set MouseKeys Interval" << std::endl 3.156 -+ << "mousetimetomax <value>: Set MouseKeys time to max speed" << std::endl 3.157 -+ << "mousemaxspeed <value>: Set MouseKeys max speed" << std::endl 3.158 -+ << "mousecurve <value>: Set MouseKeys acceleration curve" << std::endl 3.159 -+ << std::endl 3.160 -+ << "+slowkeys: Enable SlowKeys" << std::endl 3.161 -+ << "-slowkeys: Disable SlowKeys" << std::endl 3.162 -+ << "slowdelay <value>: Set SlowKeys Delay" << std::endl 3.163 -+ << std::endl 3.164 -+ << "+stickykeys: Enable StickyKeys" << std::endl 3.165 -+ << "-stickykeys: Disable StickyKeys" << std::endl 3.166 -+ << "+stickylatchtolock: Enable S.K. Latch To Lock" << std::endl 3.167 -+ << "-stickylatchtolock: Disbale S.K. Latch To Lock" << std::endl 3.168 -+ << "+stickytwokeydisable: Enable S.K. Two Key Disable" << std::endl 3.169 -+ << "-stickytwokeydisable: Disable S.K. Two Key Disable" << std::endl 3.170 -+ << std::endl 3.171 -+ << "+bouncekeys: Enable BounceKeys" << std::endl 3.172 -+ << "-bouncekeys: Disable BounceKeys" << std::endl 3.173 -+ << "bouncedelay <value>: Set Debounce Delay" << std::endl 3.174 -+ << std::endl 3.175 -+ << "+repeatkeys: Enable RepeatKeys" << std::endl 3.176 -+ << "-repeatkeys: Disable RepeatKeys" << std::endl 3.177 -+ << "repeatdelay <value>: Set RepeatKeys Delay" << std::endl 3.178 -+ << "repeatinterval <value>: Set RepeatKeys Interval" << std::endl << std::endl 3.179 -+ << "With no options, loads config file." << std::endl 3.180 -+ << std::endl; 3.181 - } 3.182 - 3.183 - 3.184 -@@ -115,26 +115,26 @@ 3.185 - 3.186 - void showRawStatus(Access* ax) 3.187 - { 3.188 -- cout << ax->GetAccessXTOState() << endl; 3.189 -- cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << endl; 3.190 -- cout << ax->GetMouseKeysState() << endl; 3.191 -- cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << endl; 3.192 -- cout << ax->GetMouseKeysMaxSpeed() << endl; 3.193 -- cout << ax->GetSlowKeysState() << endl; 3.194 -- cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << endl; 3.195 -- cout << ax->GetStickyKeysState() << endl; 3.196 -- cout << ax->GetStickyKeysLatchToLockState() << endl; 3.197 -- cout << ax->GetStickyKeysTwoKeyDisableState() << endl; 3.198 -- cout << ax->GetBounceKeysState() << endl; 3.199 -- cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << endl; 3.200 -- cout << ax->GetRepeatKeysState() << endl; 3.201 -- cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << endl; 3.202 -- cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << endl; 3.203 -- cout << ToggleKeysToggleSet << endl; 3.204 -- cout << SoundOnOffToggleSet << endl; 3.205 -- cout << SlowKeysOnAcceptToggleSet << endl; 3.206 -- cout << SlowKeysOnPressToggleSet << endl; 3.207 -- cout << EnableAccessXToggleSet << endl; 3.208 -+ std::cout << ax->GetAccessXTOState() << std::endl; 3.209 -+ std::cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << std::endl; 3.210 -+ std::cout << ax->GetMouseKeysState() << std::endl; 3.211 -+ std::cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << std::endl; 3.212 -+ std::cout << ax->GetMouseKeysMaxSpeed() << std::endl; 3.213 -+ std::cout << ax->GetSlowKeysState() << std::endl; 3.214 -+ std::cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << std::endl; 3.215 -+ std::cout << ax->GetStickyKeysState() << std::endl; 3.216 -+ std::cout << ax->GetStickyKeysLatchToLockState() << std::endl; 3.217 -+ std::cout << ax->GetStickyKeysTwoKeyDisableState() << std::endl; 3.218 -+ std::cout << ax->GetBounceKeysState() << std::endl; 3.219 -+ std::cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << std::endl; 3.220 -+ std::cout << ax->GetRepeatKeysState() << std::endl; 3.221 -+ std::cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << std::endl; 3.222 -+ std::cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << std::endl; 3.223 -+ std::cout << ToggleKeysToggleSet << std::endl; 3.224 -+ std::cout << SoundOnOffToggleSet << std::endl; 3.225 -+ std::cout << SlowKeysOnAcceptToggleSet << std::endl; 3.226 -+ std::cout << SlowKeysOnPressToggleSet << std::endl; 3.227 -+ std::cout << EnableAccessXToggleSet << std::endl; 3.228 - } 3.229 - 3.230 - /////////////////////////////////////////////////////////////////////////////// 3.231 -@@ -183,7 +183,7 @@ 3.232 - index++; 3.233 - rc = getValue(argv[index], &value); 3.234 - if(rc) { 3.235 -- cout << "Invalid Option." << endl; 3.236 -+ std::cout << "Invalid Option." << std::endl; 3.237 - exit(2); 3.238 - } 3.239 - ax->SetAccessXDelay(value); 3.240 -@@ -201,7 +201,7 @@ 3.241 - index++; 3.242 - rc = getValue(argv[index], &value); 3.243 - if(rc) { 3.244 -- cout << "Invalid Option." << endl; 3.245 -+ std::cout << "Invalid Option." << std::endl; 3.246 - exit(2); 3.247 - } 3.248 - ax->SetMouseKeysDelay(value); 3.249 -@@ -210,7 +210,7 @@ 3.250 - index++; 3.251 - rc = getValue(argv[index], &value); 3.252 - if(rc) { 3.253 -- cout << "Invalid Option." << endl; 3.254 -+ std::cout << "Invalid Option." << std::endl; 3.255 - exit(2); 3.256 - } 3.257 - ax->SetMouseKeysInterval(value); 3.258 -@@ -219,7 +219,7 @@ 3.259 - index++; 3.260 - rc = getValue(argv[index], &value); 3.261 - if(rc) { 3.262 -- cout << "Invalid Option." << endl; 3.263 -+ std::cout << "Invalid Option." << std::endl; 3.264 - exit(2); 3.265 - } 3.266 - ax->SetMouseKeysTimeToMax(value); 3.267 -@@ -228,7 +228,7 @@ 3.268 - index++; 3.269 - rc = getValue(argv[index], &value); 3.270 - if(rc) { 3.271 -- cout << "Invalid Option." << endl; 3.272 -+ std::cout << "Invalid Option." << std::endl; 3.273 - exit(2); 3.274 - } 3.275 - ax->SetMouseKeysMaxSpeed(value); 3.276 -@@ -237,7 +237,7 @@ 3.277 - index++; 3.278 - rc = getValue(argv[index], &value); 3.279 - if(rc) { 3.280 -- cout << "Invalid Option." << endl; 3.281 -+ std::cout << "Invalid Option." << std::endl; 3.282 - exit(2); 3.283 - } 3.284 - ax->SetMouseKeysCurve(value); 3.285 -@@ -255,7 +255,7 @@ 3.286 - index++; 3.287 - rc = getValue(argv[index], &value); 3.288 - if(rc) { 3.289 -- cout << "Invalid Option." << endl; 3.290 -+ std::cout << "Invalid Option." << std::endl; 3.291 - exit(2); 3.292 - } 3.293 - ax->SetSlowKeysDelay(value); 3.294 -@@ -294,7 +294,7 @@ 3.295 - index++; 3.296 - rc = getValue(argv[index], &value); 3.297 - if(rc) { 3.298 -- cout << "Invalid Option." << endl; 3.299 -+ std::cout << "Invalid Option." << std::endl; 3.300 - exit(2); 3.301 - } 3.302 - ax->SetBounceKeysDelay(value); 3.303 -@@ -312,7 +312,7 @@ 3.304 - index++; 3.305 - rc = getValue(argv[index], &value); 3.306 - if(rc) { 3.307 -- cout << "Invalid Option." << endl; 3.308 -+ std::cout << "Invalid Option." << std::endl; 3.309 - exit(2); 3.310 - } 3.311 - ax->SetRepeatKeysDelay(value); 3.312 -@@ -321,7 +321,7 @@ 3.313 - index++; 3.314 - rc = getValue(argv[index], &value); 3.315 - if(rc) { 3.316 -- cout << "Invalid Option." << endl; 3.317 -+ std::cout << "Invalid Option." << std::endl; 3.318 - exit(2); 3.319 - } 3.320 - ax->SetRepeatKeysInterval(value); 3.321 -@@ -330,7 +330,7 @@ 3.322 - // AccessX Unknown Features --------------------------------------------- 3.323 - 3.324 - else { 3.325 -- cout << "Unknown Option!" << endl; 3.326 -+ std::cout << "Unknown Option!" << std::endl; 3.327 - exit(1); 3.328 - } 3.329 - 3.330 -@@ -490,14 +490,14 @@ 3.331 - else if(!strcmp(param, "*TimeOutScale.value:")) { 3.332 - rc = getValue(value, &TimeOutScaleValue); 3.333 - if(rc) { 3.334 -- cout << "Invalid Config File Option." << endl; 3.335 -+ std::cout << "Invalid Config File Option." << std::endl; 3.336 - exit(10); 3.337 - } 3.338 - } 3.339 - else if(!strcmp(param, "*TimeOutScale.decimalPoints:")) { 3.340 - rc = getValue(value, &TimeOutScaleDecimalPoints); 3.341 - if(rc) { 3.342 -- cout << "Invalid Config File Option." << endl; 3.343 -+ std::cout << "Invalid Config File Option." << std::endl; 3.344 - exit(10); 3.345 - } 3.346 - } 3.347 -@@ -505,7 +505,7 @@ 3.348 - else if(!strcmp(param, "*KRGSlowKeysDelayScale.value:")) { 3.349 - rc = getValue(value, &KRGSlowKeysDelayScaleValue); 3.350 - if(rc) { 3.351 -- cout << "Invalid Config File Option." << endl; 3.352 -+ std::cout << "Invalid Config File Option." << std::endl; 3.353 - exit(10); 3.354 - } 3.355 - } 3.356 -@@ -513,7 +513,7 @@ 3.357 - else if(!strcmp(param, "*KRGSlowKeysDelayScale.decimalPoints:")) { 3.358 - rc = getValue(value, &KRGSlowKeysDelayScaleDecimalPoints); 3.359 - if(rc) { 3.360 -- cout << "Invalid Config File Option." << endl; 3.361 -+ std::cout << "Invalid Config File Option." << std::endl; 3.362 - exit(10); 3.363 - } 3.364 - } 3.365 -@@ -521,7 +521,7 @@ 3.366 - else if(!strcmp(param, "*MouseMaxSpeedScale.value:")) { 3.367 - rc = getValue(value, &MouseMaxSpeedScaleValue); 3.368 - if(rc) { 3.369 -- cout << "Invalid Config File Option." << endl; 3.370 -+ std::cout << "Invalid Config File Option." << std::endl; 3.371 - exit(10); 3.372 - } 3.373 - } 3.374 -@@ -529,7 +529,7 @@ 3.375 - else if(!strcmp(param, "*MouseMaxSpeedScale.decimalPoints:")) { 3.376 - rc = getValue(value, &MouseMaxSpeedScaleDecimalPoints); 3.377 - if(rc) { 3.378 -- cout << "Invalid Config File Option." << endl; 3.379 -+ std::cout << "Invalid Config File Option." << std::endl; 3.380 - exit(10); 3.381 - } 3.382 - } 3.383 -@@ -537,7 +537,7 @@ 3.384 - else if(!strcmp(param, "*KRGDebounceScale.value:")) { 3.385 - rc = getValue(value, &KRGDebounceScaleValue); 3.386 - if(rc) { 3.387 -- cout << "Invalid Config File Option." << endl; 3.388 -+ std::cout << "Invalid Config File Option." << std::endl; 3.389 - exit(10); 3.390 - } 3.391 - } 3.392 -@@ -545,7 +545,7 @@ 3.393 - else if(!strcmp(param, "*KRGDebounceScale.decimalPoints:")) { 3.394 - rc = getValue(value, &KRGDebounceScaleDecimalPoints); 3.395 - if(rc) { 3.396 -- cout << "Invalid Config File Option." << endl; 3.397 -+ std::cout << "Invalid Config File Option." << std::endl; 3.398 - exit(10); 3.399 - } 3.400 - } 3.401 -@@ -553,7 +553,7 @@ 3.402 - else if(!strcmp(param, "*KRGRepeatDelayScale.value:")) { 3.403 - rc = getValue(value, &KRGRepeatDelayScaleValue); 3.404 - if(rc) { 3.405 -- cout << "Invalid Config File Option." << endl; 3.406 -+ std::cout << "Invalid Config File Option." << std::endl; 3.407 - exit(10); 3.408 - } 3.409 - } 3.410 -@@ -561,7 +561,7 @@ 3.411 - else if(!strcmp(param, "*KRGRepeatDelayScale.decimalPoints:")) { 3.412 - rc = getValue(value, &KRGRepeatDelayScaleDecimalPoints); 3.413 - if(rc) { 3.414 -- cout << "Invalid Config File Option." << endl; 3.415 -+ std::cout << "Invalid Config File Option." << std::endl; 3.416 - exit(10); 3.417 - } 3.418 - } 3.419 -@@ -569,7 +569,7 @@ 3.420 - else if(!strcmp(param, "*KRGRepeatRateScale.value:")) { 3.421 - rc = getValue(value, &KRGRepeatRateScaleValue); 3.422 - if(rc) { 3.423 -- cout << "Invalid Config File Option." << endl; 3.424 -+ std::cout << "Invalid Config File Option." << std::endl; 3.425 - exit(10); 3.426 - } 3.427 - } 3.428 -@@ -577,7 +577,7 @@ 3.429 - else if(!strcmp(param, "*KRGRepeatRateScale.decimalPoints:")) { 3.430 - rc = getValue(value, &KRGRepeatRateScaleDecimalPoints); 3.431 - if(rc) { 3.432 -- cout << "Invalid Config File Option." << endl; 3.433 -+ std::cout << "Invalid Config File Option." << std::endl; 3.434 - exit(10); 3.435 - } 3.436 - } 3.437 -@@ -585,7 +585,7 @@ 3.438 - else if(!strcmp(param, "*MouseTimeToMaxScale.value:")) { 3.439 - rc = getValue(value, &MouseTimeToMaxScaleValue); 3.440 - if(rc) { 3.441 -- cout << "Invalid Config File Option." << endl; 3.442 -+ std::cout << "Invalid Config File Option." << std::endl; 3.443 - exit(10); 3.444 - } 3.445 - } 3.446 -@@ -593,13 +593,13 @@ 3.447 - else if(!strcmp(param, "*MouseTimeToMaxScale.decimalPoints:")) { 3.448 - rc = getValue(value, &MouseTimeToMaxScaleDecimalPoints); 3.449 - if(rc) { 3.450 -- cout << "Invalid Config File Option." << endl; 3.451 -+ std::cout << "Invalid Config File Option." << std::endl; 3.452 - exit(10); 3.453 - } 3.454 - } 3.455 - 3.456 - else { 3.457 -- cout << "Invalid Config File Parameter." << endl; 3.458 -+ std::cout << "Invalid Config File Parameter." << std::endl; 3.459 - exit(10); 3.460 - } 3.461 - } 3.462 -@@ -621,7 +621,7 @@ 3.463 - SlowKeysDelayValue /= 10; 3.464 - 3.465 - if(SlowKeysDelayValue == 0) { 3.466 -- cout << "Config File: Slow Keys Delay Cannot Be Zero." << endl; 3.467 -+ std::cout << "Config File: Slow Keys Delay Cannot Be Zero." << std::endl; 3.468 - exit(10); 3.469 - } 3.470 - 3.471 -@@ -629,7 +629,7 @@ 3.472 - TimeOutValue /= 10; 3.473 - 3.474 - if(TimeOutValue == 0) { 3.475 -- cout << "Config File: Timeout Value Cannot Be Zero." << endl; 3.476 -+ std::cout << "Config File: Timeout Value Cannot Be Zero." << std::endl; 3.477 - exit(10); 3.478 - } 3.479 - 3.480 -@@ -637,7 +637,7 @@ 3.481 - MouseMaxSpeedValue /= 10; 3.482 - 3.483 - if(MouseMaxSpeedValue == 0) { 3.484 -- cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << endl; 3.485 -+ std::cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << std::endl; 3.486 - exit(10); 3.487 - } 3.488 - 3.489 -@@ -645,7 +645,7 @@ 3.490 - MouseTimeToMaxValue /= 10; 3.491 - 3.492 - if(MouseTimeToMaxValue == 0) { 3.493 -- cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << endl; 3.494 -+ std::cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << std::endl; 3.495 - exit(10); 3.496 - } 3.497 - 3.498 -@@ -653,7 +653,7 @@ 3.499 - DebounceValue /= 10; 3.500 - 3.501 - if(DebounceValue == 0) { 3.502 -- cout << "Config File: Debounce Delay Cannot Be Zero." << endl; 3.503 -+ std::cout << "Config File: Debounce Delay Cannot Be Zero." << std::endl; 3.504 - exit(10); 3.505 - } 3.506 - 3.507 -@@ -661,7 +661,7 @@ 3.508 - RepeatDelayValue /= 10; 3.509 - 3.510 - if(RepeatDelayValue == 0) { 3.511 -- cout << "Config File: Repeat Keys Delay Cannot Be Zero." << endl; 3.512 -+ std::cout << "Config File: Repeat Keys Delay Cannot Be Zero." << std::endl; 3.513 - exit(10); 3.514 - } 3.515 - 3.516 -@@ -669,7 +669,7 @@ 3.517 - RepeatRateValue /= 10; 3.518 - 3.519 - if(RepeatRateValue == 0) { 3.520 -- cout << "Config File: Repeat Keys Rate Cannot Be Zero." << endl; 3.521 -+ std::cout << "Config File: Repeat Keys Rate Cannot Be Zero." << std::endl; 3.522 - exit(10); 3.523 - } 3.524 - 3.525 -@@ -695,14 +695,14 @@ 3.526 - ax->SetRepeatKeysInterval((int)floor(1000.0/RepeatRateValue)); 3.527 - 3.528 - if(!quiet) { 3.529 -- cout << "Config file ~/AccessX loaded." << endl 3.530 -- << "\"ax help\" for help." << endl; 3.531 -+ std::cout << "Config file ~/AccessX loaded." << std::endl 3.532 -+ << "\"ax help\" for help." << std::endl; 3.533 - } 3.534 - } 3.535 - else { 3.536 - if(!quiet) { 3.537 -- cout << "Config File ~/AccessX not found!" << endl 3.538 -- << "\"ax help\" for help." << endl; 3.539 -+ std::cout << "Config File ~/AccessX not found!" << std::endl 3.540 -+ << "\"ax help\" for help." << std::endl; 3.541 - } 3.542 - } 3.543 - } 3.544 ---- a/ax.h 2003-09-19 17:06:56.000000000 +0100 3.545 -+++ b/ax.h 2010-10-03 12:24:42.000000000 +0100 3.546 -@@ -24,7 +24,7 @@ 3.547 - 3.548 - // Include Files 3.549 - 3.550 --#include <iostream.h> 3.551 -+#include <iostream> 3.552 - #include <stdio.h> 3.553 - #include <stdlib.h> 3.554 - #include <string.h>