wok-next view accessx/stuff/patches/accessx.diff @ rev 19784

Build glib static libs and make static desktop-file-validate (for cookutils compressor), remake optipng & pngquant: use sbin for static binaries. Up 915resolution, Qt4-qca-ossl, R, accessx, advancecomp, aiksaurus, airpwn, amsn for auto-patching; lowercase libIDL, ORBit2 names.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Jun 19 04:02:32 2017 +0300 (2017-06-19)
parents
children
line source
1 Patch for deprecated <iostream.h>
2
3 --- a/Access.C 2003-09-19 17:08:01.000000000 +0100
4 +++ b/Access.C 2010-10-03 12:29:36.000000000 +0100
5 @@ -19,6 +19,7 @@
6 */
7
8 #include <X11/Xlib.h>
9 +#include <iostream>
10 #include <X11/XKBlib.h>
11 #include "Access.h"
12
13 @@ -62,43 +63,43 @@
14
15 void Access::ShowDiagnostics()
16 {
17 - cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << endl;
18 - cout << "AccessX Timeout Value: " << GetAccessXDelay() << endl;
19 + std::cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << std::endl;
20 + std::cout << "AccessX Timeout Value: " << GetAccessXDelay() << std::endl;
21
22 - cout << endl;
23 + std::cout << std::endl;
24
25 - cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << endl;
26 - cout << " - Delay: " << GetMouseKeysDelay() << endl;
27 - cout << " - Interval: " << GetMouseKeysInterval() << endl;
28 - cout << " - T to Max: " << GetMouseKeysTimeToMax() << endl;
29 - cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << endl;
30 - cout << " - Curve: " << GetMouseKeysCurve() << endl;
31 + std::cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << std::endl;
32 + std::cout << " - Delay: " << GetMouseKeysDelay() << std::endl;
33 + std::cout << " - Interval: " << GetMouseKeysInterval() << std::endl;
34 + std::cout << " - T to Max: " << GetMouseKeysTimeToMax() << std::endl;
35 + std::cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << std::endl;
36 + std::cout << " - Curve: " << GetMouseKeysCurve() << std::endl;
37
38 - cout << endl;
39 + std::cout << std::endl;
40
41 - cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << endl;
42 - cout << " - Delay: " << GetSlowKeysDelay() << endl;
43 + std::cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << std::endl;
44 + std::cout << " - Delay: " << GetSlowKeysDelay() << std::endl;
45
46 - cout << endl;
47 + std::cout << std::endl;
48
49 - cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << endl;
50 - cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState())
51 - << endl;
52 - cout << " - 2 Key Dis: " <<
53 - onoroff(GetStickyKeysTwoKeyDisableState()) << endl;
54 + std::cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << std::endl;
55 + std::cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState())
56 + << std::endl;
57 + std::cout << " - 2 Key Dis: " <<
58 + onoroff(GetStickyKeysTwoKeyDisableState()) << std::endl;
59
60 - cout << endl;
61 + std::cout << std::endl;
62
63 - cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << endl;
64 - cout << " - Delay: " << GetBounceKeysDelay() << endl;
65 + std::cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << std::endl;
66 + std::cout << " - Delay: " << GetBounceKeysDelay() << std::endl;
67
68 - cout << endl;
69 + std::cout << std::endl;
70
71 - cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << endl;
72 - cout << " - Delay: " << GetRepeatKeysDelay() << endl;
73 - cout << " - Interval: " << GetRepeatKeysInterval() << endl;
74 + std::cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << std::endl;
75 + std::cout << " - Delay: " << GetRepeatKeysDelay() << std::endl;
76 + std::cout << " - Interval: " << GetRepeatKeysInterval() << std::endl;
77
78 - cout << endl;
79 + std::cout << std::endl;
80 }
81
82 //
83 --- a/Access.h 2003-09-19 17:00:42.000000000 +0100
84 +++ b/Access.h 2010-10-03 12:24:20.000000000 +0100
85 @@ -21,7 +21,7 @@
86 *
87 */
88
89 -#include <iostream.h>
90 +#include <iostream>
91 #include <math.h>
92
93 inline char* onoroff(int val)
94 --- a/ax.C 2003-09-19 17:09:31.000000000 +0100
95 +++ b/ax.C 2010-10-03 12:31:00.000000000 +0100
96 @@ -62,45 +62,45 @@
97
98 void showHelp(void) {
99
100 - cout << "Usage: accessx [options & option/value pairs]"
101 - << endl << endl;
102 - cout << "status: Show status of AccessX Features" << endl
103 - << "help: Show this help text" << endl
104 - << "loadconfig: Load the ~/AccessX config file" << endl
105 - << endl
106 - << "+timeout: Enable AccessX Timeout" << endl
107 - << "-timeout: Disable AccessX Timeout" << endl
108 - << "timeout <value>: Set AccessX Timeout" << endl
109 - << endl
110 - << "+mousekeys: Enable MouseKeys" << endl
111 - << "-mousekeys: Disable MouseKeys" << endl
112 - << "mousedelay <value>: Set MouseKeys Delay" << endl
113 - << "mouseinterval <value>: Set MouseKeys Interval" << endl
114 - << "mousetimetomax <value>: Set MouseKeys time to max speed" << endl
115 - << "mousemaxspeed <value>: Set MouseKeys max speed" << endl
116 - << "mousecurve <value>: Set MouseKeys acceleration curve" << endl
117 - << endl
118 - << "+slowkeys: Enable SlowKeys" << endl
119 - << "-slowkeys: Disable SlowKeys" << endl
120 - << "slowdelay <value>: Set SlowKeys Delay" << endl
121 - << endl
122 - << "+stickykeys: Enable StickyKeys" << endl
123 - << "-stickykeys: Disable StickyKeys" << endl
124 - << "+stickylatchtolock: Enable S.K. Latch To Lock" << endl
125 - << "-stickylatchtolock: Disbale S.K. Latch To Lock" << endl
126 - << "+stickytwokeydisable: Enable S.K. Two Key Disable" << endl
127 - << "-stickytwokeydisable: Disable S.K. Two Key Disable" << endl
128 - << endl
129 - << "+bouncekeys: Enable BounceKeys" << endl
130 - << "-bouncekeys: Disable BounceKeys" << endl
131 - << "bouncedelay <value>: Set Debounce Delay" << endl
132 - << endl
133 - << "+repeatkeys: Enable RepeatKeys" << endl
134 - << "-repeatkeys: Disable RepeatKeys" << endl
135 - << "repeatdelay <value>: Set RepeatKeys Delay" << endl
136 - << "repeatinterval <value>: Set RepeatKeys Interval" << endl << endl
137 - << "With no options, loads config file." << endl
138 - << endl;
139 + std::cout << "Usage: accessx [options & option/value pairs]"
140 + << std::endl << std::endl;
141 + std::cout << "status: Show status of AccessX Features" << std::endl
142 + << "help: Show this help text" << std::endl
143 + << "loadconfig: Load the ~/AccessX config file" << std::endl
144 + << std::endl
145 + << "+timeout: Enable AccessX Timeout" << std::endl
146 + << "-timeout: Disable AccessX Timeout" << std::endl
147 + << "timeout <value>: Set AccessX Timeout" << std::endl
148 + << std::endl
149 + << "+mousekeys: Enable MouseKeys" << std::endl
150 + << "-mousekeys: Disable MouseKeys" << std::endl
151 + << "mousedelay <value>: Set MouseKeys Delay" << std::endl
152 + << "mouseinterval <value>: Set MouseKeys Interval" << std::endl
153 + << "mousetimetomax <value>: Set MouseKeys time to max speed" << std::endl
154 + << "mousemaxspeed <value>: Set MouseKeys max speed" << std::endl
155 + << "mousecurve <value>: Set MouseKeys acceleration curve" << std::endl
156 + << std::endl
157 + << "+slowkeys: Enable SlowKeys" << std::endl
158 + << "-slowkeys: Disable SlowKeys" << std::endl
159 + << "slowdelay <value>: Set SlowKeys Delay" << std::endl
160 + << std::endl
161 + << "+stickykeys: Enable StickyKeys" << std::endl
162 + << "-stickykeys: Disable StickyKeys" << std::endl
163 + << "+stickylatchtolock: Enable S.K. Latch To Lock" << std::endl
164 + << "-stickylatchtolock: Disbale S.K. Latch To Lock" << std::endl
165 + << "+stickytwokeydisable: Enable S.K. Two Key Disable" << std::endl
166 + << "-stickytwokeydisable: Disable S.K. Two Key Disable" << std::endl
167 + << std::endl
168 + << "+bouncekeys: Enable BounceKeys" << std::endl
169 + << "-bouncekeys: Disable BounceKeys" << std::endl
170 + << "bouncedelay <value>: Set Debounce Delay" << std::endl
171 + << std::endl
172 + << "+repeatkeys: Enable RepeatKeys" << std::endl
173 + << "-repeatkeys: Disable RepeatKeys" << std::endl
174 + << "repeatdelay <value>: Set RepeatKeys Delay" << std::endl
175 + << "repeatinterval <value>: Set RepeatKeys Interval" << std::endl << std::endl
176 + << "With no options, loads config file." << std::endl
177 + << std::endl;
178 }
179
180
181 @@ -115,26 +115,26 @@
182
183 void showRawStatus(Access* ax)
184 {
185 - cout << ax->GetAccessXTOState() << endl;
186 - cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << endl;
187 - cout << ax->GetMouseKeysState() << endl;
188 - cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << endl;
189 - cout << ax->GetMouseKeysMaxSpeed() << endl;
190 - cout << ax->GetSlowKeysState() << endl;
191 - cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << endl;
192 - cout << ax->GetStickyKeysState() << endl;
193 - cout << ax->GetStickyKeysLatchToLockState() << endl;
194 - cout << ax->GetStickyKeysTwoKeyDisableState() << endl;
195 - cout << ax->GetBounceKeysState() << endl;
196 - cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << endl;
197 - cout << ax->GetRepeatKeysState() << endl;
198 - cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << endl;
199 - cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << endl;
200 - cout << ToggleKeysToggleSet << endl;
201 - cout << SoundOnOffToggleSet << endl;
202 - cout << SlowKeysOnAcceptToggleSet << endl;
203 - cout << SlowKeysOnPressToggleSet << endl;
204 - cout << EnableAccessXToggleSet << endl;
205 + std::cout << ax->GetAccessXTOState() << std::endl;
206 + std::cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << std::endl;
207 + std::cout << ax->GetMouseKeysState() << std::endl;
208 + std::cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << std::endl;
209 + std::cout << ax->GetMouseKeysMaxSpeed() << std::endl;
210 + std::cout << ax->GetSlowKeysState() << std::endl;
211 + std::cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << std::endl;
212 + std::cout << ax->GetStickyKeysState() << std::endl;
213 + std::cout << ax->GetStickyKeysLatchToLockState() << std::endl;
214 + std::cout << ax->GetStickyKeysTwoKeyDisableState() << std::endl;
215 + std::cout << ax->GetBounceKeysState() << std::endl;
216 + std::cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << std::endl;
217 + std::cout << ax->GetRepeatKeysState() << std::endl;
218 + std::cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << std::endl;
219 + std::cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << std::endl;
220 + std::cout << ToggleKeysToggleSet << std::endl;
221 + std::cout << SoundOnOffToggleSet << std::endl;
222 + std::cout << SlowKeysOnAcceptToggleSet << std::endl;
223 + std::cout << SlowKeysOnPressToggleSet << std::endl;
224 + std::cout << EnableAccessXToggleSet << std::endl;
225 }
226
227 ///////////////////////////////////////////////////////////////////////////////
228 @@ -183,7 +183,7 @@
229 index++;
230 rc = getValue(argv[index], &value);
231 if(rc) {
232 - cout << "Invalid Option." << endl;
233 + std::cout << "Invalid Option." << std::endl;
234 exit(2);
235 }
236 ax->SetAccessXDelay(value);
237 @@ -201,7 +201,7 @@
238 index++;
239 rc = getValue(argv[index], &value);
240 if(rc) {
241 - cout << "Invalid Option." << endl;
242 + std::cout << "Invalid Option." << std::endl;
243 exit(2);
244 }
245 ax->SetMouseKeysDelay(value);
246 @@ -210,7 +210,7 @@
247 index++;
248 rc = getValue(argv[index], &value);
249 if(rc) {
250 - cout << "Invalid Option." << endl;
251 + std::cout << "Invalid Option." << std::endl;
252 exit(2);
253 }
254 ax->SetMouseKeysInterval(value);
255 @@ -219,7 +219,7 @@
256 index++;
257 rc = getValue(argv[index], &value);
258 if(rc) {
259 - cout << "Invalid Option." << endl;
260 + std::cout << "Invalid Option." << std::endl;
261 exit(2);
262 }
263 ax->SetMouseKeysTimeToMax(value);
264 @@ -228,7 +228,7 @@
265 index++;
266 rc = getValue(argv[index], &value);
267 if(rc) {
268 - cout << "Invalid Option." << endl;
269 + std::cout << "Invalid Option." << std::endl;
270 exit(2);
271 }
272 ax->SetMouseKeysMaxSpeed(value);
273 @@ -237,7 +237,7 @@
274 index++;
275 rc = getValue(argv[index], &value);
276 if(rc) {
277 - cout << "Invalid Option." << endl;
278 + std::cout << "Invalid Option." << std::endl;
279 exit(2);
280 }
281 ax->SetMouseKeysCurve(value);
282 @@ -255,7 +255,7 @@
283 index++;
284 rc = getValue(argv[index], &value);
285 if(rc) {
286 - cout << "Invalid Option." << endl;
287 + std::cout << "Invalid Option." << std::endl;
288 exit(2);
289 }
290 ax->SetSlowKeysDelay(value);
291 @@ -294,7 +294,7 @@
292 index++;
293 rc = getValue(argv[index], &value);
294 if(rc) {
295 - cout << "Invalid Option." << endl;
296 + std::cout << "Invalid Option." << std::endl;
297 exit(2);
298 }
299 ax->SetBounceKeysDelay(value);
300 @@ -312,7 +312,7 @@
301 index++;
302 rc = getValue(argv[index], &value);
303 if(rc) {
304 - cout << "Invalid Option." << endl;
305 + std::cout << "Invalid Option." << std::endl;
306 exit(2);
307 }
308 ax->SetRepeatKeysDelay(value);
309 @@ -321,7 +321,7 @@
310 index++;
311 rc = getValue(argv[index], &value);
312 if(rc) {
313 - cout << "Invalid Option." << endl;
314 + std::cout << "Invalid Option." << std::endl;
315 exit(2);
316 }
317 ax->SetRepeatKeysInterval(value);
318 @@ -330,7 +330,7 @@
319 // AccessX Unknown Features ---------------------------------------------
320
321 else {
322 - cout << "Unknown Option!" << endl;
323 + std::cout << "Unknown Option!" << std::endl;
324 exit(1);
325 }
326
327 @@ -490,14 +490,14 @@
328 else if(!strcmp(param, "*TimeOutScale.value:")) {
329 rc = getValue(value, &TimeOutScaleValue);
330 if(rc) {
331 - cout << "Invalid Config File Option." << endl;
332 + std::cout << "Invalid Config File Option." << std::endl;
333 exit(10);
334 }
335 }
336 else if(!strcmp(param, "*TimeOutScale.decimalPoints:")) {
337 rc = getValue(value, &TimeOutScaleDecimalPoints);
338 if(rc) {
339 - cout << "Invalid Config File Option." << endl;
340 + std::cout << "Invalid Config File Option." << std::endl;
341 exit(10);
342 }
343 }
344 @@ -505,7 +505,7 @@
345 else if(!strcmp(param, "*KRGSlowKeysDelayScale.value:")) {
346 rc = getValue(value, &KRGSlowKeysDelayScaleValue);
347 if(rc) {
348 - cout << "Invalid Config File Option." << endl;
349 + std::cout << "Invalid Config File Option." << std::endl;
350 exit(10);
351 }
352 }
353 @@ -513,7 +513,7 @@
354 else if(!strcmp(param, "*KRGSlowKeysDelayScale.decimalPoints:")) {
355 rc = getValue(value, &KRGSlowKeysDelayScaleDecimalPoints);
356 if(rc) {
357 - cout << "Invalid Config File Option." << endl;
358 + std::cout << "Invalid Config File Option." << std::endl;
359 exit(10);
360 }
361 }
362 @@ -521,7 +521,7 @@
363 else if(!strcmp(param, "*MouseMaxSpeedScale.value:")) {
364 rc = getValue(value, &MouseMaxSpeedScaleValue);
365 if(rc) {
366 - cout << "Invalid Config File Option." << endl;
367 + std::cout << "Invalid Config File Option." << std::endl;
368 exit(10);
369 }
370 }
371 @@ -529,7 +529,7 @@
372 else if(!strcmp(param, "*MouseMaxSpeedScale.decimalPoints:")) {
373 rc = getValue(value, &MouseMaxSpeedScaleDecimalPoints);
374 if(rc) {
375 - cout << "Invalid Config File Option." << endl;
376 + std::cout << "Invalid Config File Option." << std::endl;
377 exit(10);
378 }
379 }
380 @@ -537,7 +537,7 @@
381 else if(!strcmp(param, "*KRGDebounceScale.value:")) {
382 rc = getValue(value, &KRGDebounceScaleValue);
383 if(rc) {
384 - cout << "Invalid Config File Option." << endl;
385 + std::cout << "Invalid Config File Option." << std::endl;
386 exit(10);
387 }
388 }
389 @@ -545,7 +545,7 @@
390 else if(!strcmp(param, "*KRGDebounceScale.decimalPoints:")) {
391 rc = getValue(value, &KRGDebounceScaleDecimalPoints);
392 if(rc) {
393 - cout << "Invalid Config File Option." << endl;
394 + std::cout << "Invalid Config File Option." << std::endl;
395 exit(10);
396 }
397 }
398 @@ -553,7 +553,7 @@
399 else if(!strcmp(param, "*KRGRepeatDelayScale.value:")) {
400 rc = getValue(value, &KRGRepeatDelayScaleValue);
401 if(rc) {
402 - cout << "Invalid Config File Option." << endl;
403 + std::cout << "Invalid Config File Option." << std::endl;
404 exit(10);
405 }
406 }
407 @@ -561,7 +561,7 @@
408 else if(!strcmp(param, "*KRGRepeatDelayScale.decimalPoints:")) {
409 rc = getValue(value, &KRGRepeatDelayScaleDecimalPoints);
410 if(rc) {
411 - cout << "Invalid Config File Option." << endl;
412 + std::cout << "Invalid Config File Option." << std::endl;
413 exit(10);
414 }
415 }
416 @@ -569,7 +569,7 @@
417 else if(!strcmp(param, "*KRGRepeatRateScale.value:")) {
418 rc = getValue(value, &KRGRepeatRateScaleValue);
419 if(rc) {
420 - cout << "Invalid Config File Option." << endl;
421 + std::cout << "Invalid Config File Option." << std::endl;
422 exit(10);
423 }
424 }
425 @@ -577,7 +577,7 @@
426 else if(!strcmp(param, "*KRGRepeatRateScale.decimalPoints:")) {
427 rc = getValue(value, &KRGRepeatRateScaleDecimalPoints);
428 if(rc) {
429 - cout << "Invalid Config File Option." << endl;
430 + std::cout << "Invalid Config File Option." << std::endl;
431 exit(10);
432 }
433 }
434 @@ -585,7 +585,7 @@
435 else if(!strcmp(param, "*MouseTimeToMaxScale.value:")) {
436 rc = getValue(value, &MouseTimeToMaxScaleValue);
437 if(rc) {
438 - cout << "Invalid Config File Option." << endl;
439 + std::cout << "Invalid Config File Option." << std::endl;
440 exit(10);
441 }
442 }
443 @@ -593,13 +593,13 @@
444 else if(!strcmp(param, "*MouseTimeToMaxScale.decimalPoints:")) {
445 rc = getValue(value, &MouseTimeToMaxScaleDecimalPoints);
446 if(rc) {
447 - cout << "Invalid Config File Option." << endl;
448 + std::cout << "Invalid Config File Option." << std::endl;
449 exit(10);
450 }
451 }
452
453 else {
454 - cout << "Invalid Config File Parameter." << endl;
455 + std::cout << "Invalid Config File Parameter." << std::endl;
456 exit(10);
457 }
458 }
459 @@ -621,7 +621,7 @@
460 SlowKeysDelayValue /= 10;
461
462 if(SlowKeysDelayValue == 0) {
463 - cout << "Config File: Slow Keys Delay Cannot Be Zero." << endl;
464 + std::cout << "Config File: Slow Keys Delay Cannot Be Zero." << std::endl;
465 exit(10);
466 }
467
468 @@ -629,7 +629,7 @@
469 TimeOutValue /= 10;
470
471 if(TimeOutValue == 0) {
472 - cout << "Config File: Timeout Value Cannot Be Zero." << endl;
473 + std::cout << "Config File: Timeout Value Cannot Be Zero." << std::endl;
474 exit(10);
475 }
476
477 @@ -637,7 +637,7 @@
478 MouseMaxSpeedValue /= 10;
479
480 if(MouseMaxSpeedValue == 0) {
481 - cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << endl;
482 + std::cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << std::endl;
483 exit(10);
484 }
485
486 @@ -645,7 +645,7 @@
487 MouseTimeToMaxValue /= 10;
488
489 if(MouseTimeToMaxValue == 0) {
490 - cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << endl;
491 + std::cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << std::endl;
492 exit(10);
493 }
494
495 @@ -653,7 +653,7 @@
496 DebounceValue /= 10;
497
498 if(DebounceValue == 0) {
499 - cout << "Config File: Debounce Delay Cannot Be Zero." << endl;
500 + std::cout << "Config File: Debounce Delay Cannot Be Zero." << std::endl;
501 exit(10);
502 }
503
504 @@ -661,7 +661,7 @@
505 RepeatDelayValue /= 10;
506
507 if(RepeatDelayValue == 0) {
508 - cout << "Config File: Repeat Keys Delay Cannot Be Zero." << endl;
509 + std::cout << "Config File: Repeat Keys Delay Cannot Be Zero." << std::endl;
510 exit(10);
511 }
512
513 @@ -669,7 +669,7 @@
514 RepeatRateValue /= 10;
515
516 if(RepeatRateValue == 0) {
517 - cout << "Config File: Repeat Keys Rate Cannot Be Zero." << endl;
518 + std::cout << "Config File: Repeat Keys Rate Cannot Be Zero." << std::endl;
519 exit(10);
520 }
521
522 @@ -695,14 +695,14 @@
523 ax->SetRepeatKeysInterval((int)floor(1000.0/RepeatRateValue));
524
525 if(!quiet) {
526 - cout << "Config file ~/AccessX loaded." << endl
527 - << "\"ax help\" for help." << endl;
528 + std::cout << "Config file ~/AccessX loaded." << std::endl
529 + << "\"ax help\" for help." << std::endl;
530 }
531 }
532 else {
533 if(!quiet) {
534 - cout << "Config File ~/AccessX not found!" << endl
535 - << "\"ax help\" for help." << endl;
536 + std::cout << "Config File ~/AccessX not found!" << std::endl
537 + << "\"ax help\" for help." << std::endl;
538 }
539 }
540 }
541 --- a/ax.h 2003-09-19 17:06:56.000000000 +0100
542 +++ b/ax.h 2010-10-03 12:24:42.000000000 +0100
543 @@ -24,7 +24,7 @@
544
545 // Include Files
546
547 -#include <iostream.h>
548 +#include <iostream>
549 #include <stdio.h>
550 #include <stdlib.h>
551 #include <string.h>