Mercurial > ldforge / file diff

--- a/src/types.h	Wed Oct 16 16:40:42 2013 +0300
+++ b/src/types.h	Wed Oct 16 16:47:40 2013 +0300
@@ -46,7 +46,6 @@
 typedef quint32 uint32;
 typedef quint64 uint64;
 
-template<class T> using List = QList<T>;
 template<class T> using initlist = std::initializer_list<T>;
 template<class T, class R> using pair = std::pair<T, R>;
 using std::size_t;
@@ -204,7 +203,7 @@
 		StringFormatArg (const FloatConfig& v);
 		StringFormatArg (const void* v);
 
-		template<class T> StringFormatArg (const List<T>& v)
+		template<class T> StringFormatArg (const QList<T>& v)
 		{	m_val = "{ ";
 
 			int i = 0;
@@ -313,7 +312,7 @@
 };
 
 // Formatter function
-str DoFormat (List<StringFormatArg> args);
+str DoFormat (QList<StringFormatArg> args);
 
 // printf replacement
 void doPrint (File& f, initlist<StringFormatArg> args);