revert some change in comit 2675:

Qt use enum for use flags: Qt is a good exemple to make code


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2686 bfdf4180-ca20-0410-9c96-a3a8aa849046

sources/qetgraphicsitem/element.h

@@ -23,13 +23,6 @@
 class Diagram;
 class ElementTextItem;
 
-// this define is use to know the kind of element and
-// to use flag for element provider class
-#define SIMPLE 1
-#define REPORT 2
-#define MASTER 4
-#define SLAVE 8
-#define BORNIER 16
 
 /**
 	This is the base class for electrical elements.
@@ -49,6 +42,15 @@ class Element : public QetGraphicsItem {
 	// attributes
 	public:
 	enum { Type = UserType + 1000 };
+	// this enum is use to know the kind of element and
+	// to use flag for element provider class
+	enum {Simple = 1,
+		  Report = 2,
+		  Master = 4,
+		  SlaveNO = 8,
+		  SlaveNC = 16,
+		  AllSlave = 24,
+		  Bornier = 32};
 	
 	protected:
 	QList <Element *> connected_elements;

sources/qetgraphicsitem/ghostelement.h

@@ -43,7 +43,7 @@ class GhostElement : public CustomElement {
 	// methods
 	public:
 	virtual bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false);
-	virtual int linkType() const {return SIMPLE;}
+	virtual int linkType() const {return Simple;}
 	
 	protected:
 	QRectF minimalBoundingRect() const;

sources/qetgraphicsitem/reportelement.cpp

@@ -39,7 +39,7 @@ void ReportElement::linkToElement(Element * elmt) {
 	}
 
 	//ensure elmt is a report
-	if (elmt->linkType() == REPORT && i) {
+	if (elmt->linkType() == Report && i) {
 		unLinkAllElements();
 		connected_elements << elmt;
 		connect(elmt, SIGNAL(positionChange(QPointF)), this, SLOT(updateLabel()));
@@ -73,7 +73,7 @@ void ReportElement::unLinkAllElements(){
  * @return the kind of link type
  */
 int ReportElement::linkType() const {
-	return REPORT;
+	return Report;
 }
 
 /**

sources/qetgraphicsitem/simpleelement.cpp

@@ -22,5 +22,5 @@ SimpleElement::SimpleElement(const ElementsLocation &location, QGraphicsItem *qg
 {}
 
 int SimpleElement::linkType() const {
-	return SIMPLE;
+	return Simple;
 }

sources/ui/folioreportproperties.cpp

@@ -37,7 +37,7 @@ FolioReportProperties::~FolioReportProperties()
  */
 void FolioReportProperties::BuildRadioList() {
 	ElementProvider ep(element_->diagram()->project(), element_->diagram());
-	QList <Element *> elmt_list = ep.FreeElement(REPORT);
+	QList <Element *> elmt_list = ep.FreeElement(Element::Report);
 
 	foreach (Element *elmt, elmt_list) {
 		if (elmt != element_) {