Upstream merged

include/base_struct.h

@@ -83,9 +83,9 @@ enum KICAD_T {
     SCH_MARKER_T,
     SCH_JUNCTION_T,
     SCH_NO_CONNECT_T,
-    SCH_BUS_ENTRY_T,
+    SCH_BUS_WIRE_ENTRY_T,
+    SCH_BUS_BUS_ENTRY_T,
     SCH_LINE_T,
-    SCH_POLYLINE_T,
     SCH_BITMAP_T,
     SCH_TEXT_T,
     SCH_LABEL_T,
@@ -384,6 +384,7 @@ public:
                                    ///< already been edited, in some functions
 #define EDA_ITEM_ALL_FLAGS -1
 
+typedef unsigned STATUS_FLAGS;
 
 /**
  * Class EDA_ITEM
@@ -404,7 +405,7 @@ private:
      * functions.
      */
     KICAD_T       m_StructType;
-    int           m_Status;
+    STATUS_FLAGS  m_Status;
 
 protected:
     EDA_ITEM*     Pnext;          ///< next in linked list
@@ -419,7 +420,7 @@ protected:
     bool          m_forceVisible;
 
     /// Flag bits for editing and other uses.
-    int           m_Flags;
+    STATUS_FLAGS  m_Flags;
 
     // Link to an copy of the item use to save the item's state for undo/redo feature.
     EDA_ITEM*     m_Image;
@@ -480,12 +481,12 @@ public:
             m_Status &= ~type;
     }
 
-    int GetStatus() const           { return m_Status; }
-    void SetStatus( int aStatus )   { m_Status = aStatus; }
+    STATUS_FLAGS GetStatus() const           { return m_Status; }
+    void SetStatus( STATUS_FLAGS aStatus )   { m_Status = aStatus; }
 
-    void SetFlags( int aMask ) { m_Flags |= aMask; }
-    void ClearFlags( int aMask = EDA_ITEM_ALL_FLAGS ) { m_Flags &= ~aMask; }
-    int GetFlags() const { return m_Flags; }
+    void SetFlags( STATUS_FLAGS aMask ) { m_Flags |= aMask; }
+    void ClearFlags( STATUS_FLAGS aMask = EDA_ITEM_ALL_FLAGS ) { m_Flags &= ~aMask; }
+    STATUS_FLAGS GetFlags() const { return m_Flags; }
 
     void SetImage( EDA_ITEM* aItem ) { m_Image = aItem; }