[qet] qet/qet: [4912] Remove previous commits

[subversion@xxxxxxxxxxxxx]

Revision: 4912
Author:   scorpio810
Date:     2017-02-13 21:49:31 +0100 (Mon, 13 Feb 2017)
Log Message:
-----------
Remove previous commits

Modified Paths:
--------------
    trunk/sources/autoNum/assignvariables.cpp

Modified: trunk/sources/autoNum/assignvariables.cpp
===================================================================
--- trunk/sources/autoNum/assignvariables.cpp	2017-02-13 19:26:09 UTC (rev 4911)
+++ trunk/sources/autoNum/assignvariables.cpp	2017-02-13 20:49:31 UTC (rev 4912)
@@ -462,30 +462,17 @@
 		}
 
 		// Only Electric labels created so far
-		if (current_location.fileName() != "10_electric"){
-		QString custom_labels = "qet_labels.xml";
-		QString customfilepath = QETApp::customElementsDir().append(custom_labels);
-		QFile file(customfilepath);
-		file.isReadable();
-		if (!file.open(QFile::ReadOnly | QFile::Text))
-			return QString();
-		
-		rxml.setDevice(&file);
-		rxml.readNext();
-		}
-		
-		if (current_location.fileName() == "10_electric"){
+		//if (current_location.fileName() != "10_electric")
 		QString qet_labels = "10_electric/qet_labels.xml";
 		QString filepath = QETApp::commonElementsDir().append(qet_labels);
 		QFile file(filepath);
 		file.isReadable();
+
 		if (!file.open(QFile::ReadOnly | QFile::Text))
 			return QString();
-		
+
 		rxml.setDevice(&file);
 		rxml.readNext();
-		}
-	
 
 		while(!rxml.atEnd())
 		{