Browse Source

Class -> CssClass (cpp fix)

Nicolas Cannasse 12 years ago
parent
commit
8f44381afc
4 changed files with 7 additions and 7 deletions
  1. 2 2
      h2d/css/Defs.hx
  2. 2 2
      h2d/css/Engine.hx
  3. 1 1
      h2d/css/JQuery.hx
  4. 2 2
      h2d/css/Parser.hx

+ 2 - 2
h2d/css/Defs.hx

@@ -28,8 +28,8 @@ enum DockStyle {
 	Full;
 }
 
-class Class {
-	public var parent : Null<Class>;
+class CssClass {
+	public var parent : Null<CssClass>;
 	public var node : Null<String>;
 	public var className : Null<String>;
 	public var pseudoClass : Null<String>;

+ 2 - 2
h2d/css/Engine.hx

@@ -3,7 +3,7 @@ import h2d.css.Defs;
 
 class Rule {
 	public var id : Int;
-	public var c : Class;
+	public var c : CssClass;
 	public var priority : Int;
 	public var s : Style;
 	public function new() {
@@ -40,7 +40,7 @@ class Engine {
 		return dp == 0 ? r1.id - r2.id : dp;
 	}
 
-	public static function ruleMatch( c : Class, d : h2d.comp.Component ) {
+	public static function ruleMatch( c : CssClass, d : h2d.comp.Component ) {
 		if( c.pseudoClass != null ) {
 			var pc = ":" + c.pseudoClass;
 			var found = false;

+ 1 - 1
h2d/css/JQuery.hx

@@ -111,7 +111,7 @@ class JQuery {
 		return set;
 	}
 	
-	function lookupRec(comp:Component, classes:Array<Defs.Class>, set : Array<Component> ) {
+	function lookupRec(comp:Component, classes:Array<Defs.CssClass>, set : Array<Component> ) {
 		for( c in classes )
 			if( Engine.ruleMatch(c, comp) ) {
 				set.push(comp);

+ 2 - 2
h2d/css/Parser.hx

@@ -598,8 +598,8 @@ class Parser {
 		return classes;
 	}
 	
-	function readClass( parent ) : Class {
-		var c = new Class();
+	function readClass( parent ) : CssClass {
+		var c = new CssClass();
 		c.parent = parent;
 		var def = false;
 		var last = null;