From b6410fac1f8a8820413f3d47137a9d362a35e683 Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Fri, 13 Apr 2007 09:29:51 +0000
Subject: [PATCH] Fix for 182214: My calls to SDK functions is yelling at me

---
 .../cdt/internal/ui/editor/SemanticHighlightings.java  |  2 +-
 .../preferences/CEditorColoringConfigurationBlock.java |  7 +++----
 .../ui/preferences/ColorSettingPreviewCode.txt         | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
index 8e98cc53741..e301a84814a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
@@ -1661,7 +1661,7 @@ public class SemanticHighlightings {
 		 * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor()
 		 */
 		public RGB getDefaultTextColor() {
-			return new RGB(180, 0, 180);
+			return new RGB(128, 40, 100);
 		}
 		
 		/*
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java
index 06a1a800737..fba6e3084ad 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java
@@ -858,8 +858,8 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock {
 			{ createHighlightedRange( 6, 18,  4, SemanticHighlightings.TYPEDEF) },
 			{ createHighlightedRange( 6, 23,  9, SemanticHighlightings.PARAMETER_VARIABLE) },
 			{ createHighlightedRange( 7,  6,  9, SemanticHighlightings.PARAMETER_VARIABLE) },
-			{ createHighlightedRange( 7, 22,  4, SemanticHighlightings.GLOBAL_VARIABLE) },
-			{ createHighlightedRange( 7, 40,  4, SemanticHighlightings.FUNCTION) },
+			{ createHighlightedRange( 7, 22,  7, SemanticHighlightings.EXTERNAL_SDK), createHighlightedRange( 7, 22,  7, SemanticHighlightings.FUNCTION) },
+			{ createHighlightedRange( 7, 30,  6, SemanticHighlightings.GLOBAL_VARIABLE) },
 			{ createHighlightedRange( 8,  9,  9, SemanticHighlightings.PARAMETER_VARIABLE) },
 			{ createHighlightedRange(10,  6,  7, SemanticHighlightings.CLASS) },
 			{ createHighlightedRange(12,  7,  6, SemanticHighlightings.ENUM) },
@@ -874,11 +874,10 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock {
 			{ createHighlightedRange(16, 14,  6, SemanticHighlightings.ENUM) },
 			{ createHighlightedRange(16, 21,  1, SemanticHighlightings.PARAMETER_VARIABLE) },
 			{ createHighlightedRange(17,  8,  5, SemanticHighlightings.LOCAL_VARIABLE_DECLARATION) },
-			{ createHighlightedRange(17, 20,  1, SemanticHighlightings.PARAMETER_VARIABLE) },
+			{ createHighlightedRange(17, 20,  5, SemanticHighlightings.MACRO_REFERENCE) },
 			{ createHighlightedRange(18,  0,  5, SemanticHighlightings.LABEL) },
 			{ createHighlightedRange(18,  7,  6, SemanticHighlightings.FUNCTION) },
 			{ createHighlightedRange(18, 14,  5, SemanticHighlightings.LOCAL_VARIABLE) },
-			{ createHighlightedRange(18, 21,  5, SemanticHighlightings.MACRO_REFERENCE) },
 			{ createHighlightedRange(19,  4,  7, SemanticHighlightings.METHOD) },
 			{ createHighlightedRange(20,  4, 12, SemanticHighlightings.STATIC_METHOD_INVOCATION), createHighlightedRange(20,  4, 12, SemanticHighlightings.METHOD) },
 			{ createHighlightedRange(21,  4,  7, SemanticHighlightings.PROBLEM) },
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt
index 5cdae187531..d6e86d311b8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorSettingPreviewCode.txt
@@ -1,11 +1,11 @@
 /* This is sample C++ code */
-#include <iostream>
+#include <cstdio>
 #define MACRO(x) x
 using namespace std;
 // This comment may span only this line
 typedef unsigned int uint;
 int static myfunc(uint parameter) {
-  if (parameter == 0) cout << "zero" << endl;
+  if (parameter == 0) fprintf(stdout, "zero\n");
   return parameter - 1;
 }
 class MyClass {
@@ -15,11 +15,11 @@ public:
   int field;
   virtual Number vmethod();
   void method(Number n) const {
-    int local= (int)n;
-label: myfunc(local, MACRO('\0'));
+    int local= (int)MACRO('\0');
+label: myfunc(local);
     vmethod();
     staticMethod();
     problem();
   }
   static void staticMethod();
-};
\ No newline at end of file
+};