[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 707047 by okellogg:

EBN Krazy #3 (contractions in strings)

 M  +3 -2      codegenerators/rubycodeaccessormethod.cpp  
 M  +1 -1      codeimport/kdevcppparser/driver.cpp  
 M  +2 -2      umlview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp #707046:707047
@@ -96,7 +96,8 @@
             if(maxOccurs > 0)
             {
                 text += endLine+"else"+endLine;
-                text += indent + "puts(\"ERROR: Can't add"+fieldType+" to "+fieldName+", minimum number of items reached.\")"+endLine+"end"+endLine;
+                text += indent + "puts(\"ERROR: Cannot add" + fieldType + " to " + fieldName
+                     + ", minimum number of items reached.\")" + endLine + "end" + endLine;
             }
             break;
         }
@@ -163,7 +164,7 @@
         case CodeGenerationPolicy::Public:
         case CodeGenerationPolicy::Private:
         case CodeGenerationPolicy::Protected:
-            strVis = rubydoc->scopeToRubyDecl((Uml::Visibility::Value) (scopePolicy + 200));
+            strVis = rubydoc->scopeToRubyDecl((Uml::Visibility::Value) scopePolicy);
             break;
         default:
         case CodeGenerationPolicy::FromParent:
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp #707046:707047
@@ -153,7 +153,7 @@
 	return;
 
     if ( !QFile::exists( file ) ) {
-	Problem p( "Couldn't find include file " + dep.first,
+	Problem p( "Could not find include file " + dep.first,
 		   lexer ? lexer->currentLine() : -1,
 		   lexer ? lexer->currentColumn() : -1 );
 	addProblem( fileName, p );
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #707046:707047
@@ -1500,7 +1500,7 @@
         kError() << "UMLView::addWidget: Not adding "
                   << "(id=" << ID2STR(pWidget->getID())
                   << "/type=" << type << "/name=" << pWidget->getName()
-                  << ") because it's already there" << endl;
+                  << ") because it is already there" << endl;
         return false;
     }
     //kDebug() << "UMLView::addWidget called for basetype " << type;
@@ -1574,7 +1574,7 @@
                           << "(id=" << ID2STR(pWidget->getID())
                           << "/type=" << pWidget->getBaseType()
                           << "/name=" << pWidget->getName()
-                          << ") because it's already there" << endl;
+                          << ") because it is already there" << endl;
                 delete pWidget; // Not nice but if _we_ don't do it nobody else will
                 return true;//don't stop paste just because widget found.
             }