GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-31 17:03:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Portability

Browse source 
- Removed obsolete COLOR_* definitions from i18n.h that conflict on Cygwin.
This commit is contained in:
Paul Beckingham 2010-02-12 00:39:07 -05:00
parent 67546f8163
commit 0a3ee9f0a7
3 changed files with 39 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Color.cpp
View file

@ -42,16 +42,16 @@ static struct
int index; // offset red=3 (therefore fg=33, bg=43)
} allColors[] =
{
// Color.h enum i18n.h English Index
{ Color::nocolor, 0, "none", 0},
{ Color::black, COLOR_BLACK, "black", 1}, // fg 29+0 bg 39+0
{ Color::red, COLOR_RED, "red", 2},
{ Color::green, COLOR_GREEN, "green", 3},
{ Color::yellow, COLOR_YELLOW, "yellow", 4},
{ Color::blue, COLOR_BLUE, "blue", 5},
{ Color::magenta, COLOR_MAGENTA, "magenta", 6},
{ Color::cyan, COLOR_CYAN, "cyan", 7},
{ Color::white, COLOR_WHITE, "white", 8},
// Color.h enum i18n.h English Index
{ Color::nocolor, 0, "none", 0},
{ Color::black, CCOLOR_BLACK, "black", 1}, // fg 29+0 bg 39+0
{ Color::red, CCOLOR_RED, "red", 2},
{ Color::green, CCOLOR_GREEN, "green", 3},
{ Color::yellow, CCOLOR_YELLOW, "yellow", 4},
{ Color::blue, CCOLOR_BLUE, "blue", 5},
{ Color::magenta, CCOLOR_MAGENTA, "magenta", 6},
{ Color::cyan, CCOLOR_CYAN, "cyan", 7},
{ Color::white, CCOLOR_WHITE, "white", 8},
};

68
src/i18n.h
View file

@ -134,59 +134,21 @@
// 4xx Columns
// 5xx Colors
#define COLOR_BOLD 500
#define COLOR_UL 501
#define COLOR_B_UL 502
#define COLOR_BLACK 503
#define COLOR_RED 504
#define COLOR_GREEN 505
#define COLOR_YELLOW 506
#define COLOR_BLUE 507
#define COLOR_MAGENTA 508
#define COLOR_CYAN 509
#define COLOR_WHITE 510
#define COLOR_B_BLACK 511
#define COLOR_B_RED 512
#define COLOR_B_GREEN 513
#define COLOR_B_YELLOW 514
#define COLOR_B_BLUE 515
#define COLOR_B_MAGENTA 516
#define COLOR_B_CYAN 517
#define COLOR_B_WHITE 518
#define COLOR_UL_BLACK 519
#define COLOR_UL_RED 520
#define COLOR_UL_GREEN 521
#define COLOR_UL_YELLOW 522
#define COLOR_UL_BLUE 523
#define COLOR_UL_MAGENTA 524
#define COLOR_UL_CYAN 525
#define COLOR_UL_WHITE 526
#define COLOR_B_UL_BLACK 527
#define COLOR_B_UL_RED 528
#define COLOR_B_UL_GREEN 529
#define COLOR_B_UL_YELLOW 530
#define COLOR_B_UL_BLUE 531
#define COLOR_B_UL_MAGENTA 532
#define COLOR_B_UL_CYAN 533
#define COLOR_B_UL_WHITE 534
#define COLOR_ON_BLACK 535
#define COLOR_ON_RED 536
#define COLOR_ON_GREEN 537
#define COLOR_ON_YELLOW 538
#define COLOR_ON_BLUE 539
#define COLOR_ON_MAGENTA 540
#define COLOR_ON_CYAN 541
#define COLOR_ON_WHITE 542
#define COLOR_ON_BRIGHT_BLACK 543
#define COLOR_ON_BRIGHT_RED 544
#define COLOR_ON_BRIGHT_GREEN 545
#define COLOR_ON_BRIGHT_YELLOW 546
#define COLOR_ON_BRIGHT_BLUE 547
#define COLOR_ON_BRIGHT_MAGENTA 548
#define COLOR_ON_BRIGHT_CYAN 549
#define COLOR_ON_BRIGHT_WHITE 550
#define COLOR_OFF 551
#define COLOR_UNKNOWN 552
#define CCOLOR_BOLD 500
#define CCOLOR_UNDERLINE 501
#define CCOLOR_ON 502
#define CCOLOR_BRIGHT 503
#define CCOLOR_BLACK 504
#define CCOLOR_RED 505
#define CCOLOR_GREEN 506
#define CCOLOR_YELLOW 507
#define CCOLOR_BLUE 508
#define CCOLOR_MAGENTA 509
#define CCOLOR_CYAN 510
#define CCOLOR_WHITE 511
#define CCOLOR_OFF 520
#define CCOLOR_UNKNOWN 521
// 6xx Config