diff -r bebe09014dd6 -r 6a1fa662bfc1 src/types.h --- 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 using List = QList; template using initlist = std::initializer_list; template using pair = std::pair; using std::size_t; @@ -204,7 +203,7 @@ StringFormatArg (const FloatConfig& v); StringFormatArg (const void* v); - template StringFormatArg (const List& v) + template StringFormatArg (const QList& v) { m_val = "{ "; int i = 0; @@ -313,7 +312,7 @@ }; // Formatter function -str DoFormat (List args); +str DoFormat (QList args); // printf replacement void doPrint (File& f, initlist args);