[Uml-devel] KDE/kdesdk/umbrello/umbrello
Albert Astals Cid
tsdgeos at terra.es
Sat Oct 11 20:34:38 UTC 2008
SVN commit 870129 by aacid:
constify some containers and their iterators, save some detaches
M +6 -6 codegenerators/codegenerator.cpp
M +6 -6 codegenerators/cpp/cppcodegenerator.cpp
M +3 -3 codegenerators/cpp/cppheadercodedocument.cpp
M +3 -3 codegenerators/cpp/cppsourcecodedocument.cpp
M +3 -3 codegenerators/d/dclassifiercodedocument.cpp
M +3 -3 codegenerators/java/javaclassifiercodedocument.cpp
M +3 -3 codegenerators/ruby/rubyclassifiercodedocument.cpp
M +3 -3 codegenerators/simplecodegenerator.cpp
M +3 -3 codeimport/cppimport.cpp
M +2 -2 codeimport/idlimport.cpp
M +3 -3 codeimport/import_utils.cpp
M +2 -2 codeimport/javaimport.cpp
M +4 -4 codeimport/nativeimportbase.cpp
M +3 -3 dialogs/activitypage.cpp
M +5 -5 model_utils.cpp
M +3 -3 umldoc.cpp
M +2 -2 umlviewimageexportermodel.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/codegenerator.cpp #870128:870129
@@ -241,9 +241,9 @@
}
else
{
- CodeDocumentList * docList = getCodeDocumentList();
- CodeDocumentList::iterator it = docList->begin();
- CodeDocumentList::iterator end = docList->end();
+ const CodeDocumentList * docList = getCodeDocumentList();
+ CodeDocumentList::const_iterator it = docList->begin();
+ CodeDocumentList::const_iterator end = docList->end();
for ( ; it != end; ++it ) {
(*it)->saveToXMI(doc, docElement);
}
@@ -490,11 +490,11 @@
if (!pathDir.exists())
{
// ugh. dir separator here is UNIX specific..
- QStringList dirs = pathDir.absolutePath().split('/');
+ const QStringList dirs = pathDir.absolutePath().split('/');
QString currentDir;
- QStringList::iterator end(dirs.end());
- for (QStringList::iterator dir(dirs.begin()); dir != end; ++dir)
+ QStringList::const_iterator end(dirs.end());
+ for (QStringList::const_iterator dir(dirs.begin()); dir != end; ++dir)
{
currentDir += '/' + *dir;
if (! (pathDir.exists(currentDir)
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cpp/cppcodegenerator.cpp #870128:870129
@@ -148,9 +148,9 @@
QDomElement docElement = doc.createElement( "codegenerator" );
docElement.setAttribute("language", "C++");
- CodeDocumentList * docList = getCodeDocumentList();
- CodeDocumentList::Iterator it = docList->begin();
- CodeDocumentList::Iterator end = docList->end();
+ const CodeDocumentList * docList = getCodeDocumentList();
+ CodeDocumentList::ConstIterator it = docList->begin();
+ CodeDocumentList::ConstIterator end = docList->end();
for ( ; it != end; ++it )
(*it)->saveToXMI(doc, docElement);
@@ -168,9 +168,9 @@
*/
void CPPCodeGenerator::syncCodeToDocument ( )
{
- CodeDocumentList * docList = getCodeDocumentList();
- CodeDocumentList::Iterator it = docList->begin();
- CodeDocumentList::Iterator end = docList->end();
+ const CodeDocumentList * docList = getCodeDocumentList();
+ CodeDocumentList::ConstIterator it = docList->begin();
+ CodeDocumentList::ConstIterator end = docList->end();
for ( ; it != end; ++it )
(*it)->synchronize();
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cpp/cppheadercodedocument.cpp #870128:870129
@@ -355,9 +355,9 @@
CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
// first, set the global flag on whether or not to show classfield info
- CodeClassFieldList * cfList = getCodeClassFieldList();
- CodeClassFieldList::iterator it = cfList->begin();
- CodeClassFieldList::iterator end = cfList->end();
+ const CodeClassFieldList * cfList = getCodeClassFieldList();
+ CodeClassFieldList::const_iterator it = cfList->begin();
+ CodeClassFieldList::const_iterator end = cfList->end();
for( ; it != end; ++it )
(*it)->setWriteOutMethods(policy->getAutoGenerateAccessors());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cpp/cppsourcecodedocument.cpp #870128:870129
@@ -88,9 +88,9 @@
QString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
// first, set the global flag on whether or not to show classfield info
- CodeClassFieldList * cfList = getCodeClassFieldList();
- CodeClassFieldList::iterator it = cfList->begin();
- CodeClassFieldList::iterator end = cfList->end();
+ const CodeClassFieldList * cfList = getCodeClassFieldList();
+ CodeClassFieldList::const_iterator it = cfList->begin();
+ CodeClassFieldList::const_iterator end = cfList->end();
for( ; it != end; ++it )
(*it)->setWriteOutMethods(policy->getAutoGenerateAccessors());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/d/dclassifiercodedocument.cpp #870128:870129
@@ -300,9 +300,9 @@
// first, set the global flag on whether or not to show classfield info
// This depends on whether or not we have attribute/association classes
- CodeClassFieldList * cfList = getCodeClassFieldList();
- CodeClassFieldList::iterator it = cfList->begin();
- CodeClassFieldList::iterator end = cfList->end();
+ const CodeClassFieldList * cfList = getCodeClassFieldList();
+ CodeClassFieldList::const_iterator it = cfList->begin();
+ CodeClassFieldList::const_iterator end = cfList->end();
for( ; it != end; ++it ) {
CodeClassField * field = *it;
if(field->parentIsAttribute())
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/java/javaclassifiercodedocument.cpp #870128:870129
@@ -305,9 +305,9 @@
// first, set the global flag on whether or not to show classfield info
// This depends on whether or not we have attribute/association classes
- CodeClassFieldList * cfList = getCodeClassFieldList();
- CodeClassFieldList::iterator it = cfList->begin();
- CodeClassFieldList::iterator end = cfList->end();
+ const CodeClassFieldList * cfList = getCodeClassFieldList();
+ CodeClassFieldList::const_iterator it = cfList->begin();
+ CodeClassFieldList::const_iterator end = cfList->end();
for( ; it != end; ++it ) {
CodeClassField * field = *it;
if(field->parentIsAttribute())
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/ruby/rubyclassifiercodedocument.cpp #870128:870129
@@ -330,9 +330,9 @@
// first, set the global flag on whether or not to show classfield info
// This depends on whether or not we have attribute/association classes
- CodeClassFieldList * cfList = getCodeClassFieldList();
- CodeClassFieldList::iterator it = cfList->begin();
- CodeClassFieldList::iterator end = cfList->end();
+ const CodeClassFieldList * cfList = getCodeClassFieldList();
+ CodeClassFieldList::const_iterator it = cfList->begin();
+ CodeClassFieldList::const_iterator end = cfList->end();
for( ; it != end; ++it) {
CodeClassField * field = *it;
if(field->parentIsAttribute())
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/simplecodegenerator.cpp #870128:870129
@@ -103,11 +103,11 @@
// does our complete output directory exist yet? if not, try to create it
if (!pathDir.exists())
{
- QStringList dirs = pathDir.absolutePath().split('/');
+ const QStringList dirs = pathDir.absolutePath().split('/');
QString currentDir = "";
- QStringList::iterator end(dirs.end());
- for (QStringList::iterator dir(dirs.begin()); dir != end; ++dir)
+ QStringList::const_iterator end(dirs.end());
+ for (QStringList::const_iterator dir(dirs.begin()); dir != end; ++dir)
{
currentDir += '/' + *dir;
if (! (pathDir.exists(currentDir)
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/cppimport.cpp #870128:870129
@@ -87,10 +87,10 @@
ms_driver->addIncludePath( "/usr/include/c++" );
ms_driver->addIncludePath( "/usr/include/g++" );
ms_driver->addIncludePath( "/usr/local/include" );
- QStringList incPathList = Import_Utils::includePathList();
+ const QStringList incPathList = Import_Utils::includePathList();
if (incPathList.count()) {
- QStringList::Iterator end(incPathList.end());
- for (QStringList::Iterator i(incPathList.begin()); i != end; ++i) {
+ QStringList::ConstIterator end(incPathList.end());
+ for (QStringList::ConstIterator i(incPathList.begin()); i != end; ++i) {
ms_driver->addIncludePath( *i );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/idlimport.cpp #870128:870129
@@ -99,10 +99,10 @@
uDebug() << "adding path " << path;
Import_Utils::addIncludePath(path);
}
- QStringList includePaths = Import_Utils::includePathList();
+ const QStringList includePaths = Import_Utils::includePathList();
//QProcess command("cpp", UMLAp::app());
QString command("cpp -C"); // -C means "preserve comments"
- for (QStringList::Iterator pathIt = includePaths.begin();
+ for (QStringList::ConstIterator pathIt = includePaths.begin();
pathIt != includePaths.end(); ++pathIt) {
QString path = (*pathIt);
//command.addArgument(" -I" + path);
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/import_utils.cpp #870128:870129
@@ -261,11 +261,11 @@
return o;
// Create dependencies on template parameters.
QString caption = templateInstantiation.cap(1);
- QStringList params = caption.split(QRegExp("[^\\w:\\.]+"));
+ const QStringList params = caption.split(QRegExp("[^\\w:\\.]+"));
if (!params.count())
return o;
- QStringList::Iterator end(params.end());
- for (QStringList::Iterator it(params.begin()); it != end; ++it) {
+ QStringList::ConstIterator end(params.end());
+ for (QStringList::ConstIterator it(params.begin()); it != end; ++it) {
UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, parentPkg);
if (p == NULL || p->getBaseType() == Uml::ot_Datatype)
continue;
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/javaimport.cpp #870128:870129
@@ -234,8 +234,8 @@
if (keyword == "package") {
m_currentPackage = advance();
const QString& qualifiedName = m_currentPackage;
- QStringList names = qualifiedName.split('.');
- for (QStringList::Iterator it = names.begin(); it != names.end(); ++it) {
+ const QStringList names = qualifiedName.split('.');
+ for (QStringList::ConstIterator it = names.begin(); it != names.end(); ++it) {
QString name = (*it);
UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Package,
name, m_scope[m_scopeIndex], m_comment);
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/nativeimportbase.cpp #870128:870129
@@ -256,8 +256,8 @@
}
if (line.contains(QRegExp("^\\s*$")))
return;
- QStringList words = split(line);
- for (QStringList::Iterator it = words.begin(); it != words.end(); ++it) {
+ const QStringList words = split(line);
+ for (QStringList::ConstIterator it = words.begin(); it != words.end(); ++it) {
QString word = *it;
if (word[0] == '"' || word[0] == '\'')
m_source.append(word); // string constants are handled by split()
@@ -291,8 +291,8 @@
return;
}
bool found = false;
- QStringList includePaths = Import_Utils::includePathList();
- for (QStringList::Iterator pathIt = includePaths.begin();
+ const QStringList includePaths = Import_Utils::includePathList();
+ for (QStringList::ConstIterator pathIt = includePaths.begin();
pathIt != includePaths.end(); ++pathIt) {
QString path = (*pathIt);
if (! path.endsWith('/')) {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/activitypage.cpp #870128:870129
@@ -91,10 +91,10 @@
mainLayout->addWidget( m_pActivityGB );
//now fill activity list box
- QStringList list = m_pStateWidget -> getActivityList();
- QStringList::Iterator end(list.end());
+ const QStringList list = m_pStateWidget -> getActivityList();
+ QStringList::ConstIterator end(list.end());
- for( QStringList::Iterator it(list.begin()); it != end; ++it ) {
+ for( QStringList::ConstIterator it(list.begin()); it != end; ++it ) {
m_pActivityLW->addItem( *it );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/model_utils.cpp #870128:870129
@@ -309,9 +309,9 @@
if (gen == NULL)
return false;
const bool caseSensitive = UMLApp::app()->activeLanguageIsCaseSensitive();
- QStringList dataTypes = gen->defaultDatatypes();
- QStringList::Iterator end(dataTypes.end());
- for (QStringList::Iterator it = dataTypes.begin(); it != end; ++it) {
+ const QStringList dataTypes = gen->defaultDatatypes();
+ QStringList::ConstIterator end(dataTypes.end());
+ for (QStringList::ConstIterator it = dataTypes.begin(); it != end; ++it) {
if (caseSensitive) {
if (type == *it)
return true;
@@ -563,8 +563,8 @@
arglist = arglist.trimmed();
if (arglist.isEmpty())
return PS_OK;
- QStringList args = arglist.split( QRegExp("\\s*,\\s*") );
- for (QStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) {
+ const QStringList args = arglist.split( QRegExp("\\s*,\\s*") );
+ for (QStringList::ConstIterator lit = args.begin(); lit != args.end(); ++lit) {
NameAndType nmTp;
Parse_Status ps = parseAttribute(*lit, nmTp, owningScope);
if (ps)
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #870128:870129
@@ -396,11 +396,11 @@
// get the root directory and all entries in
const KArchiveDirectory * rootDir = archive.directory();
- QStringList entries = rootDir->entries();
+ const QStringList entries = rootDir->entries();
QString entryMimeType;
bool foundXMI = false;
- QStringList::Iterator it;
- QStringList::Iterator end(entries.end());
+ QStringList::ConstIterator it;
+ QStringList::ConstIterator end(entries.end());
// now go through all entries till we find an xmi file
for (it = entries.begin(); it != end; ++it)
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexportermodel.cpp #870128:870129
@@ -64,8 +64,8 @@
QStringList UMLViewImageExporterModel::supportedMimeTypes()
{
if (!supportedMimeTypesList.size()) {
- QStringList imageTypes = UMLViewImageExporterModel::supportedImageTypes();
- for (QStringList::Iterator it = imageTypes.begin(); it != imageTypes.end(); ++it) {
+ const QStringList imageTypes = UMLViewImageExporterModel::supportedImageTypes();
+ for (QStringList::ConstIterator it = imageTypes.begin(); it != imageTypes.end(); ++it) {
QString mimeType = imageTypeToMimeType(*it);
if (!mimeType.isNull())
supportedMimeTypesList.append(mimeType);
More information about the umbrello-devel
mailing list