Commit 897a6592 authored by Oliver Kellogg's avatar Oliver Kellogg
Browse files

https://phabricator.kde.org/D26419 : Typo fixes for umbrello

parent 51ed1e91
......@@ -160,7 +160,7 @@ private:
//typedef __gnu_cxx::hash_multimap<HashedString, CachedLexedFilePointer> CachedLexedFileMap;
typedef std::multimap<HashedString, CachedLexedFilePointer> CachedLexedFileMap;
CachedLexedFileMap m_files;
QSet<HashedString> m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because QString is reference-counted, this set contains a unique copy of each string to used for each appearance of the string
QSet<HashedString> m_totalStringSet; ///This is used to reduce memory-usage: Most strings appear again and again. Because QString is reference-counted, this set contains a unique copy of each string to use for each appearance of the string
struct FileModificationCache {
QDateTime m_readTime;
QDateTime m_modificationTime;
......
......@@ -602,12 +602,12 @@ public:
{
return false;
}
/**@return true if an item is a EnumModel.*/
/**@return true if an item is an EnumModel.*/
virtual bool isEnum() const
{
return false;
}
/**@return true if an item is a EnumeratorModel.*/
/**@return true if an item is an EnumeratorModel.*/
virtual bool isEnumerator() const
{
return false;
......
......@@ -149,7 +149,7 @@ private:
/// relative URLS have to start with a /
bool m_isFileCompletionAfterDirname;
/**
* a list of indizes of identifiers which must not be added as completion items
* a list of indexes of identifiers which must not be added as completion items
* examples:
* class test implements foo, ...
* => identifiers test and foo must not be proposed for completion
......
......@@ -33,7 +33,7 @@ class KeywordItem : public NormalDeclarationCompletionItem
{
public:
/// Use @p customReplacement for additional power on how the keyword gets replaced.
/// Newlines will be indendet to the indentation level of the line we execute the item on.
/// Newlines will be indented to the indentation level of the line we execute the item on.
/// To increase an indentation level, use %INDENT%. To place the cursor, use %CURSOR%.
/// Alternatively you can select a word with %SELECT%word%SELECT%
///
......
......@@ -41,7 +41,7 @@ QTEST_MAIN(Php::BenchmarkCodeCompletion)
namespace Php {
// makro defined by cmake, points to the sourcedir of _this_ file
// macro defined by cmake, points to the sourcedir of _this_ file
const QString srcPath(KDESRCDIR);
QFile* getFile(const QString& path)
......
......@@ -65,7 +65,7 @@ public:
/**
* declaration of class A with a number of completion items
*
* also introduces a instance of class A named $instA;
* also introduces an instance of class A named $instA;
*/
const QByteArray testClassA(
"class A {"
......@@ -98,7 +98,7 @@ const QByteArray testClassA(
* declaration of class B which extends class A
* B has one new public member function
*
* also introduces a instance of class B named $instB;
* also introduces an instance of class B named $instB;
*/
const QByteArray testClassB(
"class B extends A {"
......
......@@ -41,7 +41,7 @@ class NamespaceDeclaration;
typedef KDevelop::AbstractDeclarationBuilder<AstNode, IdentifierAst, TypeBuilder> DeclarationBuilderBase;
/**
* The DeclarationBuilder builds declarations, types and contexts for everything in a AST.
* The DeclarationBuilder builds declarations, types and contexts for everything in an AST.
*
* \note Since PHP allows the usage of functions, classes and interfaces before definition,
* a \see PreDeclarationBuilder is used to get the declarations _and_ types for those.
......@@ -158,7 +158,7 @@ private:
bool isGlobalRedeclaration(const KDevelop::QualifiedIdentifier &identifier, AstNode *node,
DeclarationType type);
/// check if a non-abstract method declaration tries to overwrite a final base method
/// or whether a abstract method is redeclared
/// or whether an abstract method is redeclared
/// @param identifier The identifier for the current method
/// @param curClass the current class we are in
/// @param node the node we are processing, used to access modifiers and for error reporting
......
......@@ -38,7 +38,7 @@ QTEST_MAIN(Php::Benchmarks)
namespace Php
{
// makro defined by cmake, points to the sourcedir of _this_ file
// macro defined by cmake, points to the sourcedir of _this_ file
const QString srcPath(KDESRCDIR);
Benchmarks::Benchmarks()
......
......@@ -546,7 +546,7 @@ void TestExpressionParser::arrayFunctionDereferencing()
Declaration* decl = top->localDeclarations().last();
IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
QVERIFY(type);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
// fallback
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
......@@ -574,7 +574,7 @@ void TestExpressionParser::arrayLiteralDereferencing()
Declaration* decl = top->localDeclarations().last();
IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
QVERIFY(type);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
// fallback
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
......
......@@ -146,7 +146,7 @@ private:
/// relative URLS have to start with a /
bool m_isFileCompletionAfterDirname;
/**
* a list of indizes of identifiers which must not be added as completion items
* a list of indexes of identifiers which must not be added as completion items
* examples:
* class test implements foo, ...
* => identifiers test and foo must not be proposed for completion
......
......@@ -66,7 +66,7 @@ public:
/**
* declaration of class A with a number of completion items
*
* also introduces a instance of class A named $instA;
* also introduces an instance of class A named $instA;
*/
const QByteArray testClassA(
"class A {"
......@@ -99,7 +99,7 @@ const QByteArray testClassA(
* declaration of class B which extends class A
* B has one new public member function
*
* also introduces a instance of class B named $instB;
* also introduces an instance of class B named $instB;
*/
const QByteArray testClassB(
"class B extends A {"
......
......@@ -41,7 +41,7 @@ class NamespaceDeclaration;
typedef KDevelop::AbstractDeclarationBuilder<AstNode, IdentifierAst, TypeBuilder> DeclarationBuilderBase;
/**
* The DeclarationBuilder builds declarations, types and contexts for everything in a AST.
* The DeclarationBuilder builds declarations, types and contexts for everything in an AST.
*
* \note Since PHP allows the usage of functions, classes and interfaces before definition,
* a \see PreDeclarationBuilder is used to get the declarations _and_ types for those.
......@@ -158,7 +158,7 @@ private:
bool isGlobalRedeclaration(const KDevelop::QualifiedIdentifier &identifier, AstNode *node,
DeclarationType type);
/// check if a non-abstract method declaration tries to overwrite a final base method
/// or whether a abstract method is redeclared
/// or whether an abstract method is redeclared
/// @param ids The identifier for the current method
/// @param curClass the current class we are in
/// @param node the node we are processing, used to access modifiers and for error reporting
......
......@@ -552,7 +552,7 @@ void TestExpressionParser::arrayFunctionDereferencing()
Declaration* decl = top->localDeclarations().last();
IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
QVERIFY(type);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
// fallback
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
......@@ -580,7 +580,7 @@ void TestExpressionParser::arrayLiteralDereferencing()
Declaration* decl = top->localDeclarations().last();
IntegralType::Ptr type = decl->abstractType().cast<IntegralType>();
QVERIFY(type);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns a int...", Continue);
QEXPECT_FAIL("", "we'd need advanced array support to know that [0] returns an int...", Continue);
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeInt));
// fallback
QCOMPARE(type->dataType(), static_cast<uint>(IntegralType::TypeMixed));
......
......@@ -68,7 +68,7 @@ class PluginLoader : public QObject
Q_OBJECT
public:
/** Destry the plugin loader */
/** Destroy the plugin loader */
~PluginLoader();
......
......@@ -280,7 +280,7 @@ bool AssocRules::allowAssociation(Uml::AssociationType::Enum assocType,
int actTypeB = -1;
if (actB)
actTypeB = actB->activityType();
// only from a signalwidget a objectnode widget, a normal activity, branch or fork activity, to the end
// only from a signalwidget, an objectnode widget, a normal activity, branch or fork activity, to the end
if ((actTypeB == ActivityWidget::End || actTypeB == ActivityWidget::Final) &&
actTypeA != ActivityWidget::Normal &&
actTypeA != ActivityWidget::Branch &&
......
......@@ -81,7 +81,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into ModelType representation.
* Convert an integer item into ModelType representation.
* @param item integer value to convert
* @return ModelType enum
*/
......@@ -145,7 +145,7 @@ Enum fromString(const QString& item, bool checkUnkown)
}
/**
* Convert a integer item into Visibility representation.
* Convert an integer item into Visibility representation.
* @param item integer value to convert
* @return Visibility enum
*/
......@@ -333,7 +333,7 @@ QString toString(Enum item)
}
/**
* Converts a AssociationType to its string representation.
* Converts an AssociationType to its string representation.
* @return the string representation of the AssociationType
*/
QString toStringI18n(Enum item)
......@@ -442,7 +442,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into ProgrammingLanguage representation.
* Convert an integer item into ProgrammingLanguage representation.
* @param item integer value to convert
* @return AssociationType enum
*/
......@@ -516,7 +516,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into LayoutType representation.
* Convert an integer item into LayoutType representation.
* @param item integer value to convert
* @return LayoutType enum
*/
......@@ -567,7 +567,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into SignatureType representation.
* Convert an integer item into SignatureType representation.
* @param item integer value to convert
* @return SignatureType enum
*/
......@@ -655,7 +655,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into TextRole representation.
* Convert an integer item into TextRole representation.
* @param item integer value to convert
* @return TextRole enum
*/
......@@ -704,7 +704,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into Changeability representation.
* Convert an integer item into Changeability representation.
* @param item integer value to convert
* @return Changeability enum
*/
......@@ -760,7 +760,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into SequenceMessage representation.
* Convert an integer item into SequenceMessage representation.
* @param item integer value to convert
* @return SequenceMessage enum
*/
......@@ -804,7 +804,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into RoleType representation.
* Convert an integer item into RoleType representation.
* @param item integer value to convert
* @return RoleType enum
*/
......@@ -852,7 +852,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into ParameterDirection representation.
* Convert an integer item into ParameterDirection representation.
* @param item integer value to convert
* @return ParameterDirection enum
*/
......@@ -968,7 +968,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into ProgrammingLanguage representation.
* Convert an integer item into ProgrammingLanguage representation.
* @param item integer value to convert
* @return ProgrammingLanguage enum
*/
......@@ -1156,7 +1156,7 @@ Enum fromString(const QString& item)
}
/**
* Convert a integer item into Region representation.
* Convert an integer item into Region representation.
* @param item integer value to convert
* @return Region enum
*/
......@@ -1208,7 +1208,7 @@ Corner::Enum Corner::fromString(const QString& item)
}
/**
* Convert a integer item into Corner representation.
* Convert an integer item into Corner representation.
* @param item integer value to convert
* @return Corner enum
*/
......
......@@ -376,7 +376,7 @@ void UMLClipboard::setCopyType(UMLListViewItemList& selectedItems)
/**
* Searches the child items of a UMLListViewItem to
* establish which Copy type is to be perfomed.
* establish which Copy type is to be performed.
* @param item parent of the children
* @param withDiagrams includes diagrams
* @param withObjects includes objects
......
......@@ -527,7 +527,7 @@ void ASWriter::writeClass(UMLClassifier *c)
}
as << m_endl;
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !c->doc().isEmpty())
{
as << m_endl << "/**" << m_endl;
......
......@@ -24,11 +24,11 @@ class CodeAccessorMethod : public CodeMethodBlock
public:
// some types of accessor methods that are possible:
// "GET" is to retrieve single-valued (primative or Object) fields
// "SET" is to set single-valued (primative or Object) fields
// "ADD" is to add a value to a multiple-valued field of either primative or Object items
// "REMOVE" is to remove a value to a multiple-valued field of either primative or Object items
// "LIST" is to retrive the entire list of items in a multiple-valued field
// "GET" is to retrieve single-valued (primitive or Object) fields
// "SET" is to set single-valued (primitive or Object) fields
// "ADD" is to add a value to a multiple-valued field of either primitive or Object items
// "REMOVE" is to remove a value to a multiple-valued field of either primitive or Object items
// "LIST" is to retrieve the entire list of items in a multiple-valued field
enum AccessorType {GET=0, SET, ADD, REMOVE, LIST};
explicit CodeAccessorMethod(CodeClassField * field);
......
......@@ -269,7 +269,7 @@ void CPPHeaderCodeDocument::resetTextBlocks()
/**
* Add a code operation to this cpp classifier code document.
* In the vannilla version, we just tack all operations on the end
* In the vanilla version, we just tack all operations on the end
* of the document.
* @param op the code operation
* @return bool which is true IF the code operation was added successfully
......@@ -330,7 +330,7 @@ void CPPHeaderCodeDocument::saveToXMI1 (QDomDocument & doc, QDomElement & root)
// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we resonablely will want
// such, we will want to insert everything we reasonably will want
// during creation. We can set various parts of the document (esp. the
// comments) to appear or not, as needed.
void CPPHeaderCodeDocument::updateContent()
......
......@@ -36,7 +36,7 @@ public:
/**
* Add a code operation to this cpp classifier code document.
* In the vannilla version, we just tack all operations on the end
* In the vanilla version, we just tack all operations on the end
* of the document.
* @param op the code operation
* @return bool which is true IF the code operation was added successfully
......
......@@ -45,7 +45,7 @@ CppWriter::CppWriter()
: m_stringIncludeRequired(false)
{
// Probably we could resolve this better through the use of templates,
// but it is a quick n dirty fix for the timebeing.. until codegeneration
// but it is a quick n dirty fix for the time being.. until codegeneration
// template system is in place.
// You can insert code here. 3 general variables exist: "%VARNAME%"
// allows you to specify where the vector variable should be in your code,
......@@ -390,7 +390,7 @@ void CppWriter::writeClassDecl(UMLClassifier *c, QTextStream &cpp)
if (!c->package().isEmpty() && policyExt()->getPackageIsNamespace())
cpp << m_endl << "namespace " << cleanName(c->package()) << " {" << m_endl << m_endl;
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !c->doc().isEmpty()) {
cpp << m_endl << "/**" << m_endl;
cpp << " * class " << className_ << m_endl;
......@@ -1315,7 +1315,7 @@ void CppWriter::writeOperations(UMLClassifier *c, UMLOperationList &oplist, bool
}
/**
* Intellegently print out header include/forward decl. for associated classes.
* Intelligently print out header include/forward decl. for associated classes.
* Note:
* To prevent circular including when both classifiers on either end
* of an association have roles we need to have forward declaration of
......
......@@ -220,7 +220,7 @@ void CSharpWriter::writeClass(UMLClassifier *c)
m_seenIncludes.append(container);
}
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !c->doc().isEmpty()) {
cs << m_container_indent << "/// <summary>" << m_endl;
cs << formatDoc(c->doc(), m_container_indent + QLatin1String("/// "));
......
......@@ -108,7 +108,7 @@ void DClassifierCodeDocument::init()
/**
* Add a code operation to this d classifier code document.
* In the vannilla version, we just tack all operations on the end
* In the vanilla version, we just tack all operations on the end
* of the document.
* @param op the code operation
* @return bool which is true IF the code operation was added successfully
......@@ -273,7 +273,7 @@ void DClassifierCodeDocument::resetTextBlocks()
// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we resonablely will want
// such, we will want to insert everything we reasonably will want
// during creation. We can set various parts of the document (esp. the
// comments) to appear or not, as needed.
void DClassifierCodeDocument::updateContent()
......
......@@ -114,7 +114,7 @@ QString DCodeGenerator::capitalizeFirstLetter(const QString &item)
/**
* IF the type is "string" we need to declare it as
* the D Object "String" (there is no string primative in D).
* the D Object "String" (there is no string primitive in D).
* Same thing again for "bool" to "boolean".
* @param item the item to change
* @return the changed item
......
......@@ -142,7 +142,7 @@ void DWriter::writeClass(UMLClassifier *c)
writeModuleImports(c, d);
// write the opening declaration for the class incl any documentation,
// interfaces and/or inheritence issues we have
// interfaces and/or inheritance issues we have
writeClassDecl(c, d);
// start body of class
......@@ -707,7 +707,7 @@ void DWriter::writeConstructor(UMLClassifier *c, QTextStream &d)
}
// IF the type is "string" we need to declare it as
// the D Object "String" (there is no string primative in D).
// the D Object "String" (there is no string primitive in D).
// Same thing again for "bool" to "boolean"
QString DWriter::fixTypeName(const QString& string)
{
......
......@@ -110,7 +110,7 @@ void JavaClassifierCodeDocument::init ()
/**
* @param op
*/
// in the vannilla version, we just tack all operations on the end
// in the vanilla version, we just tack all operations on the end
// of the document
bool JavaClassifierCodeDocument::addCodeOperation (CodeOperation * op)
{
......@@ -264,7 +264,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we resonablely will want
// such, we will want to insert everything we reasonably will want
// during creation. We can set various parts of the document (esp. the
// comments) to appear or not, as needed.
void JavaClassifierCodeDocument::updateContent()
......
......@@ -286,7 +286,7 @@ QString JavaCodeGenerator::getListFieldClassName()
/**
* IF the type is "string" we need to declare it as
* the Java Object "String" (there is no string primative in Java).
* the Java Object "String" (there is no string primitive in Java).
* Same thing again for "bool" to "boolean".
*/
QString JavaCodeGenerator::fixTypeName(const QString &string)
......
......@@ -174,7 +174,7 @@ void JavaWriter::writeClass(UMLClassifier *c)
writeBlankLine(java);
// write the opening declaration for the class incl any documentation,
// interfaces and/or inheritence issues we have
// interfaces and/or inheritance issues we have
writeClassDecl(c, java);
// start body of class
......@@ -333,7 +333,7 @@ void JavaWriter::writeClassDecl(UMLClassifier *c, QTextStream &java)
}
else
{
//The java generated code is wrong ! : No multiple inheritence of class
//The java generated code is wrong ! : No multiple inheritance of class
java << ", " ;
}
java << cleanName(concept->name());
......@@ -352,7 +352,7 @@ void JavaWriter::writeClassDecl(UMLClassifier *c, QTextStream &java)
}
else
{
//The java generated code is OK ! : multiple inheritence of interface
//The java generated code is OK ! : multiple inheritance of interface
java << ", " ;
}
java << cleanName(concept->name());
......
......@@ -86,7 +86,7 @@ void JSWriter::writeClass(UMLClassifier *c)
}
js << m_endl;
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !c->doc().isEmpty())
{
js << m_endl << "/**" << m_endl;
......
......@@ -3041,7 +3041,7 @@ void Php5Writer::writeClass(UMLClassifier *c)
}
php << m_endl;
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !c->doc().isEmpty()) {
php << m_endl << "/**" << m_endl;
php << " * class " << classname << m_endl;
......
......@@ -3036,7 +3036,7 @@ void PhpWriter::writeClass(UMLClassifier *c)
}
php << m_endl;
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !c->doc().isEmpty()) {
php << m_endl << "/**" << m_endl;
php << " * class " << classname << m_endl;
......
......@@ -307,7 +307,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we resonablely will want
// such, we will want to insert everything we reasonably will want
// during creation. We can set various parts of the document (esp. the
// comments) to appear or not, as needed.
void RubyClassifierCodeDocument::updateContent()
......
......@@ -225,7 +225,7 @@ void SQLWriter::writeClass(UMLClassifier *c)
sql << str << m_endl;
}
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !m_pEntity->doc().isEmpty()) {
sql << m_endl << "--" << m_endl;
sql << "-- TABLE: " << entityname << m_endl;
......
......@@ -19,7 +19,7 @@
class CodeDocument;
/**
* The fundemental unit of text within an output file containing code.
* The fundamental unit of text within an output file containing code.
*/
class TextBlock
{
......
......@@ -258,7 +258,7 @@ void ValaWriter::writeClass(UMLClassifier *c)
m_seenIncludes.append(container);
}
//Write class Documentation if there is somthing or if force option
//Write class Documentation if there is something or if force option
if (forceDoc() || !c->doc().isEmpty