Git commit fcc24ba204c5626e629715f53735df9feeb19a65 by Frederik Schwarzer. Committed on 05/11/2013 at 23:21. Pushed by schwarzer into branch 'master'.
Fix type. can not -> cannot M +3 -3 doc/uml_basics.docbook M +1 -1 umbrello/classifier.cpp M +1 -1 umbrello/classifiercodedocument.cpp M +6 -6 umbrello/clipboard/umldragdata.cpp M +1 -1 umbrello/codegenerators/codeclassfield.cpp M +1 -1 umbrello/codegenerators/codedocument.cpp M +1 -1 umbrello/codegenerators/ownedcodeblock.cpp M +1 -1 umbrello/codegenerators/ruby/rubycodeaccessormethod.cpp M +2 -2 umbrello/dialogs/classifierlistpage.cpp M +1 -1 umbrello/dialogs/codeeditor.cpp M +1 -1 umbrello/entity.cpp M +1 -1 umbrello/enum.cpp M +1 -1 umbrello/folder.cpp M +1 -1 umbrello/refactoring/refactoringassistant.cpp M +1 -1 umbrello/umlcanvasobject.cpp M +3 -3 umbrello/umldoc.cpp M +2 -2 umbrello/umlscene.cpp M +2 -2 umbrello/umlviewimageexportermodel.cpp M +1 -1 umbrello/widgets/associationwidget.cpp http://commits.kde.org/umbrello/fcc24ba204c5626e629715f53735df9feeb19a65 diff --git a/doc/uml_basics.docbook b/doc/uml_basics.docbook index 70aa2bf..c438832 100644 --- a/doc/uml_basics.docbook +++ b/doc/uml_basics.docbook @@ -370,19 +370,19 @@ exist on its own. They exist only inside the whole, and if the whole is destroye <para>Class diagrams can contain several other items besides classes.</para> <sect4 id="interfaces"> <title>Interfaces</title> -<para>Interfaces are abstract classes which means instances can not be directly created of them. They can contain operations but no attributes. Classes can inherit from interfaces (through a realisation association) and instances can then be made of these diagrams.</para> +<para>Interfaces are abstract classes which means instances cannot be directly created of them. They can contain operations but no attributes. Classes can inherit from interfaces (through a realisation association) and instances can then be made of these diagrams.</para> <!-- FIXME screenshot --> </sect4> <sect4 id="datatype"> <title>Datatypes</title> <para>Datatypes are primitives which are typically built into a programming language. Common examples include integers and booleans. -They can not have relationships to classes but classes can have relationships to them.</para> +They cannot have relationships to classes but classes can have relationships to them.</para> <!-- FIXME screenshot --> </sect4> <sect4 id="enum"> <title>Enums</title> <para>Enums are a simple list of values. A typical example is an enum for days of the week. The options of an enum are called Enum Literals. -Like datatypes they can not have relationships to classes but classes can have relationships to them.</para> +Like datatypes they cannot have relationships to classes but classes can have relationships to them.</para> <!-- FIXME screenshot --> </sect4> <sect4 id="package"> diff --git a/umbrello/classifier.cpp b/umbrello/classifier.cpp index a35d39a..5de34d8 100644 --- a/umbrello/classifier.cpp +++ b/umbrello/classifier.cpp @@ -274,7 +274,7 @@ UMLOperation* UMLClassifier::createOperation( return NULL; } else if (checkOperationSignature(op->name(), op->getParmList())) { KMessageBox::information(0, - i18n("An operation with the same name and signature already exists. You can not add it again.")); + i18n("An operation with the same name and signature already exists. You cannot add it again.")); } else { break; } diff --git a/umbrello/classifiercodedocument.cpp b/umbrello/classifiercodedocument.cpp index 57c0665..07fe29a 100644 --- a/umbrello/classifiercodedocument.cpp +++ b/umbrello/classifiercodedocument.cpp @@ -682,7 +682,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI(QDomElement & elem) m_classFieldMap.insert(cf->getParentObject(), cf); } else - uError()<<" LoadFromXMI: can not load classfield parent_id:"<<id<<" do you have a corrupt savefile?"; + uError()<<" LoadFromXMI: cannot load classfield parent_id:"<<id<<" do you have a corrupt savefile?"; } node = childElem.nextSibling(); childElem= node.toElement(); diff --git a/umbrello/clipboard/umldragdata.cpp b/umbrello/clipboard/umldragdata.cpp index ce226b2..0dbb181 100644 --- a/umbrello/clipboard/umldragdata.cpp +++ b/umbrello/clipboard/umldragdata.cpp @@ -281,7 +281,7 @@ bool UMLDragData::decodeClip1(const QMimeData* mimeData, UMLObjectList& objects) int line; QDomDocument domDoc; if(!domDoc.setContent(xmiClip, false, &error, &line)) { - uWarning() << "Can not set content:" << error << " Line:" << line; + uWarning() << "Cannot set content:" << error << " Line:" << line; return false; } QDomNode xmiClipNode = domDoc.firstChild(); @@ -374,7 +374,7 @@ bool UMLDragData::decodeClip2(const QMimeData* mimeData, UMLObjectList& objects, int line; QDomDocument domDoc; if(!domDoc.setContent(xmiClip, false, &error, &line)) { - uWarning() << "Can not set content:" << error << " Line:" << line; + uWarning() << "Cannot set content:" << error << " Line:" << line; return false; } QDomNode xmiClipNode = domDoc.firstChild(); @@ -492,7 +492,7 @@ bool UMLDragData::getClip3TypeAndID(const QMimeData* mimeData, int line; QDomDocument domDoc; if(!domDoc.setContent(xmiClip, false, &error, &line)) { - uWarning() << "getClip3Type: Can not set content:" << error << " Line:" << line; + uWarning() << "getClip3Type: Cannot set content:" << error << " Line:" << line; return false; } QDomNode xmiClipNode = domDoc.firstChild(); @@ -555,7 +555,7 @@ bool UMLDragData::decodeClip3(const QMimeData* mimeData, UMLListViewItemList& um int line; QDomDocument domDoc; if(!domDoc.setContent(xmiClip, false, &error, &line)) { - uWarning() << "Can not set content:" << error << " Line:" << line; + uWarning() << "Cannot set content:" << error << " Line:" << line; return false; } QDomNode xmiClipNode = domDoc.firstChild(); @@ -622,7 +622,7 @@ bool UMLDragData::decodeClip4(const QMimeData* mimeData, UMLObjectList& objects, int line; QDomDocument domDoc; if(!domDoc.setContent(xmiClip, false, &error, &line)) { - uWarning() << "Can not set content:" << error << " Line:" << line; + uWarning() << "Cannot set content:" << error << " Line:" << line; return false; } QDomNode xmiClipNode = domDoc.firstChild(); @@ -724,7 +724,7 @@ bool UMLDragData::decodeClip5(const QMimeData* mimeData, UMLObjectList& objects, int line; QDomDocument domDoc; if(!domDoc.setContent(xmiClip, false, &error, &line)) { - uWarning() << "Can not set content:" << error << " Line:" << line; + uWarning() << "Cannot set content:" << error << " Line:" << line; return false; } QDomNode xmiClipNode = domDoc.firstChild(); diff --git a/umbrello/codegenerators/codeclassfield.cpp b/umbrello/codegenerators/codeclassfield.cpp index d65ee67..d7a6c08 100644 --- a/umbrello/codegenerators/codeclassfield.cpp +++ b/umbrello/codegenerators/codeclassfield.cpp @@ -291,7 +291,7 @@ void CodeClassField::setAttributesFromNode (QDomElement & root) if(method) method->loadFromXMI(element); else - uError()<<"Can not load code accessor method for type:"<<type<<" which does not exist in this codeclassfield. Is XMI out-dated or corrupt?"; + uError()<<"Cannot load code accessor method for type:"<<type<<" which does not exist in this codeclassfield. Is XMI out-dated or corrupt?"; } else if(tag == "header") { diff --git a/umbrello/codegenerators/codedocument.cpp b/umbrello/codegenerators/codedocument.cpp index fd00fb7..2fb6f77 100644 --- a/umbrello/codegenerators/codedocument.cpp +++ b/umbrello/codegenerators/codedocument.cpp @@ -489,7 +489,7 @@ void CodeDocument::addChildTagToMap (const QString &tag, TextBlock * tb) } /** - * Lookup a certain textblock by its tag value, returns NULL if it can not + * Lookup a certain textblock by its tag value, returns NULL if it cannot * find the TextBlock with such a tag. If descendIntoChildren is true, then * any child hierarchical textblocks will also be searched for a match. * @param tag the tag to look for diff --git a/umbrello/codegenerators/ownedcodeblock.cpp b/umbrello/codegenerators/ownedcodeblock.cpp index 045133c..5127dc2 100644 --- a/umbrello/codegenerators/ownedcodeblock.cpp +++ b/umbrello/codegenerators/ownedcodeblock.cpp @@ -147,7 +147,7 @@ void OwnedCodeBlock::setAttributesFromNode (QDomElement & elem) initFields (obj); // just the regular approach } else - uError() << "ERROR: can not load ownedcodeblock: parentUMLObject w/id:" + uError() << "ERROR: cannot load ownedcodeblock: parentUMLObject w/id:" << Uml::ID::toString(id) << " not found, corrupt save file?"; } diff --git a/umbrello/codegenerators/ruby/rubycodeaccessormethod.cpp b/umbrello/codegenerators/ruby/rubycodeaccessormethod.cpp index fcd2e40..6735ac9 100644 --- a/umbrello/codegenerators/ruby/rubycodeaccessormethod.cpp +++ b/umbrello/codegenerators/ruby/rubycodeaccessormethod.cpp @@ -210,7 +210,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration() break; default: // do nothing..no idea what this is - uWarning() << "Warning: can not generate RubyCodeAccessorMethod for type: " << getType(); + uWarning() << "Warning: cannot generate RubyCodeAccessorMethod for type: " << getType(); break; } diff --git a/umbrello/dialogs/classifierlistpage.cpp b/umbrello/dialogs/classifierlistpage.cpp index 68ebbe6..05929a1 100644 --- a/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/dialogs/classifierlistpage.cpp @@ -496,7 +496,7 @@ void ClassifierListPage::slotPopupMenuSel(QAction* action) return; UMLClassifierListItem* listItem = getItemList().at(currentItemIndex); if (!listItem && id != ListPopupMenu::mt_New_Attribute) { - uDebug() << "can not find att from selection"; + uDebug() << "cannot find att from selection"; return; } m_bSigWaiting = true; @@ -685,7 +685,7 @@ void ClassifierListPage::slotDoubleClick(QListWidgetItem* item) UMLClassifierListItem* listItem = getItemList().at(m_pItemListLB->row(item)); if (!listItem) { - uDebug() << "can not find att from selection"; + uDebug() << "cannot find att from selection"; return; } diff --git a/umbrello/dialogs/codeeditor.cpp b/umbrello/dialogs/codeeditor.cpp index 8675f54..6ea854b 100644 --- a/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/dialogs/codeeditor.cpp @@ -876,7 +876,7 @@ void CodeEditor::slotCopyTextBlock() else if (dynamic_cast<CodeComment*>(m_selectedTextBlock)) m_textBlockToPaste = CodeGenFactory::newCodeComment(m_parentDoc); else { - uError() << " ERROR: CodeEditor can not copy selected block:" << m_selectedTextBlock << " of unknown type"; + uError() << " ERROR: CodeEditor cannot copy selected block:" << m_selectedTextBlock << " of unknown type"; m_textBlockToPaste = 0; return; // error! } diff --git a/umbrello/entity.cpp b/umbrello/entity.cpp index 310d39e..829081f 100644 --- a/umbrello/entity.cpp +++ b/umbrello/entity.cpp @@ -372,7 +372,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* att, int position) int UMLEntity::removeEntityAttribute(UMLClassifierListItem* att) { if (!m_List.removeAll((UMLEntityAttribute*)att)) { - uDebug() << "can not find att given in list"; + uDebug() << "cannot find att given in list"; return -1; } emit entityAttributeRemoved(att); diff --git a/umbrello/enum.cpp b/umbrello/enum.cpp index a28c5f4..a0d8b81 100644 --- a/umbrello/enum.cpp +++ b/umbrello/enum.cpp @@ -204,7 +204,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, int position) int UMLEnum::removeEnumLiteral(UMLEnumLiteral* literal) { if (!m_List.removeAll(literal)) { - uDebug() << "can not find att given in list"; + uDebug() << "cannot find att given in list"; return -1; } emit enumLiteralRemoved(literal); diff --git a/umbrello/folder.cpp b/umbrello/folder.cpp index 3033362..c43b3f8 100644 --- a/umbrello/folder.cpp +++ b/umbrello/folder.cpp @@ -419,7 +419,7 @@ bool UMLFolder::loadFolderFile(const QString& path) QString error; int line; if (!doc.setContent(data, false, &error, &line)) { - uError() << "Can not set content:" << error << " line:" << line; + uError() << "Cannot set content:" << error << " line:" << line; return false; } QDomNode rootNode = doc.firstChild(); diff --git a/umbrello/refactoring/refactoringassistant.cpp b/umbrello/refactoring/refactoringassistant.cpp index 5498dd2..53a90b2 100644 --- a/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/refactoring/refactoringassistant.cpp @@ -616,7 +616,7 @@ void RefactoringAssistant::createAttribute() QTreeWidgetItem *parent = item->parent(); c = dynamic_cast<UMLClassifier*>(findUMLObject(parent)); if (!c) { - uWarning() << "No classifier - can not create!"; + uWarning() << "No classifier - cannot create!"; return; } } diff --git a/umbrello/umlcanvasobject.cpp b/umbrello/umlcanvasobject.cpp index 84c0cc6..cdcd89e 100644 --- a/umbrello/umlcanvasobject.cpp +++ b/umbrello/umlcanvasobject.cpp @@ -117,7 +117,7 @@ bool UMLCanvasObject::hasAssociation(UMLAssociation* assoc) int UMLCanvasObject::removeAssociationEnd(UMLAssociation * assoc) { if (!hasAssociation(assoc) || !m_List.removeAll(assoc)) { - DEBUG(DBG_SRC) << "can not find given assoc " << assoc << " in list"; + DEBUG(DBG_SRC) << "cannot find given assoc " << assoc << " in list"; return -1; } UMLApp::app()->document()->removeAssociation(assoc, false); diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp index afd3b98..2827799 100644 --- a/umbrello/umldoc.cpp +++ b/umbrello/umldoc.cpp @@ -1396,7 +1396,7 @@ void UMLDoc::renameChildUMLObject(UMLObject *o) bool ok = false; UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->parent()); if (!p) { - DEBUG(DBG_SRC) << "Can not create object, no parent found."; + DEBUG(DBG_SRC) << "Cannot create object, no parent found."; return; } @@ -1807,7 +1807,7 @@ short UMLDoc::encoding(QIODevice & file) int line; QDomDocument doc; if (!doc.setContent(data, false, &error, &line)) { - uWarning() << "Can not set content: " << error << " Line: " << line; + uWarning() << "Cannot set content: " << error << " Line: " << line; return ENC_UNKNOWN; } @@ -1898,7 +1898,7 @@ bool UMLDoc::loadFromXMI(QIODevice & file, short encode) int line; QDomDocument doc; if (!doc.setContent(data, false, &error, &line)) { - uWarning() << "Can not set content:" << error << " Line:" << line; + uWarning() << "Cannot set content:" << error << " Line:" << line; return false; } qApp->processEvents(); // give UI events a chance diff --git a/umbrello/umlscene.cpp b/umbrello/umlscene.cpp index 817f318..60b35ea 100644 --- a/umbrello/umlscene.cpp +++ b/umbrello/umlscene.cpp @@ -1950,7 +1950,7 @@ bool UMLScene::addWidget(UMLWidget * pWidget, bool isPasteOperation) pWidget->setID(newID); UMLObject * pObject = m_doc->findObjectById(newID); if (!pObject) { - DEBUG(DBG_SRC) << "addWidget: Can not find UMLObject for id " + DEBUG(DBG_SRC) << "addWidget: Cannot find UMLObject for id " << Uml::ID::toString(newID); return false; } @@ -2488,7 +2488,7 @@ void UMLScene::createAutoAssociations(UMLWidget * widget) } else if (roleBObj->id() == myID) { other = static_cast<UMLCanvasObject*>(roleAObj); } else { - DEBUG(DBG_SRC) << "Can not find own object " + DEBUG(DBG_SRC) << "Cannot find own object " << Uml::ID::toString(myID) << " in UMLAssoc " << Uml::ID::toString(assoc->id()); continue; diff --git a/umbrello/umlviewimageexportermodel.cpp b/umbrello/umlviewimageexportermodel.cpp index 1364ab6..bf893ec 100644 --- a/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umlviewimageexportermodel.cpp @@ -226,7 +226,7 @@ QString UMLViewImageExporterModel::exportView(UMLScene* scene, const QString &im // create the needed directories if (!prepareDirectory(url)) { - return i18n("Can not create directory: %1", url.directory()); + return i18n("Cannot create directory: %1", url.directory()); } // The fileName will be used when exporting the image. If the url isn't local, @@ -243,7 +243,7 @@ QString UMLViewImageExporterModel::exportView(UMLScene* scene, const QString &im QRectF rect = scene->diagramRect(); if (rect.isEmpty()) { - return i18n("Can not save an empty diagram"); + return i18n("Cannot save an empty diagram"); } // exporting the view to the file diff --git a/umbrello/widgets/associationwidget.cpp b/umbrello/widgets/associationwidget.cpp index f74dc6d..2fb62ef 100644 --- a/umbrello/widgets/associationwidget.cpp +++ b/umbrello/widgets/associationwidget.cpp @@ -729,7 +729,7 @@ bool AssociationWidget::activate() setWidgetForRole(m_scene->findWidget(widgetIDForRole(RoleType::B)), RoleType::B); if(!m_role[RoleType::A].umlWidget || !m_role[RoleType::B].umlWidget) { - DEBUG(DBG_SRC) << "Can not make association!"; + DEBUG(DBG_SRC) << "Cannot make association!"; return false; }