[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdesdk/umbrello/umbrello
From: Oliver Kellogg <okellogg () users ! sourceforge ! net>
Date: 2005-12-23 22:07:06
Message-ID: 1135375626.645532.1349.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 490963 by okellogg:
parseOperation(): Include C++ template expressions when looking up types.
M +4 -3 model_utils.cpp
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/model_utils.cpp #490962:490963
@@ -346,13 +346,12 @@
if (pos == -1)
return PS_Illegal_MethodName;
desc.m_name = pat.cap(1);
- // Remove possible empty parentheses ()
- m.remove( QRegExp("\\s*\\(\\s*\\)") );
desc.m_pReturnType = NULL;
- pat = QRegExp( ":\\s*(\\w[\\w\\. ]*)$" );
+ pat = QRegExp("\\) *:(.*)$");
pos = pat.search(m);
if (pos != -1) { // return type is optional
QString retType = pat.cap(1);
+ retType = retType.stripWhiteSpace();
if (retType != "void") {
UMLObject *pRetType = owningScope->findTemplate(retType);
if (pRetType == NULL) {
@@ -363,6 +362,8 @@
desc.m_pReturnType = pRetType;
}
}
+ // Remove possible empty parentheses ()
+ m.remove( QRegExp("\\s*\\(\\s*\\)") );
desc.m_args.clear();
pat = QRegExp( "\\((.*)\\)" );
pos = pat.search(m);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic