moved vhdl gen. into block

[blast.git] / AbstractBlock.cpp

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index 13adcae22b44098ea2cd9834481bda1d37e80428..336b677a10aeb7f3b75ab64967af1e283181d85c 100644 (file)
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -3,9 +3,11 @@
 #include <QMessageBox>\r
 #include "AbstractInterface.h"\r
 #include "BlockParameter.h"\r
 #include <QMessageBox>\r
 #include "AbstractInterface.h"\r
 #include "BlockParameter.h"\r

+#include "Parameters.h"\r

 #include "GroupBlock.h"\r
 #include "ConnectedInterface.h"\r
 \r
 #include "GroupBlock.h"\r
 #include "ConnectedInterface.h"\r
 \r

+\r

 AbstractBlock::AbstractBlock() {\r
   name = "";\r
   parent = NULL;\r
 AbstractBlock::AbstractBlock() {\r
   name = "";\r
   parent = NULL;\r


@@ -13,7 +15,7 @@ AbstractBlock::AbstractBlock() {
 \r
 /*\r
 AbstractBlock::AbstractBlock(const QString& _name) {\r
 \r
 /*\r
 AbstractBlock::AbstractBlock(const QString& _name) {\r

-  name = normalizeName(_name);\r
+  name = Parameters::normalizeName(_name);\r

   parent = NULL;\r
 }\r
 */\r
   parent = NULL;\r
 }\r
 */\r


@@ -29,7 +31,7 @@ AbstractBlock::~AbstractBlock() {
 }\r
 \r
 void AbstractBlock::setName(const QString& str) {\r
 }\r
 \r
 void AbstractBlock::setName(const QString& str) {\r

-  name = normalizeName(str);\r
+  name = Parameters::normalizeName(str);\r

 }\r
 \r
 void AbstractBlock::setParent(AbstractBlock* _parent) {\r
 }\r
 \r
 void AbstractBlock::setParent(AbstractBlock* _parent) {\r


@@ -239,12 +241,7 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
   return lst;\r
 }\r
 \r
   return lst;\r
 }\r
 \r

-QString AbstractBlock::normalizeName(const QString &name) {\r
-  QString s = name;\r
-  s.replace(QRegularExpression("[^a-zA-Z0-9_]"),"_");\r
-  s.replace(QRegularExpression("[_]+"),"_");\r
-  return s;\r
-}\r
+\r

 \r
 void AbstractBlock::connectClkReset() throw(Exception) {\r
 \r
 \r
 void AbstractBlock::connectClkReset() throw(Exception) {\r
 \r