summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h2
-rw-r--r--poxml/parser.cpp4
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast.h2
-rw-r--r--umbrello/umbrello/petaltree2uml.cpp2
-rw-r--r--umbrello/umbrello/uniqueid.h4
5 files changed, 7 insertions, 7 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
index fcaa05e2..d7715e4e 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
@@ -164,7 +164,7 @@ public:
/*
Sets the rules to decide when 2 string match (Uppercase and remove char
are not set here)
- 1 = ETQUAL
+ 1 = EQUAL
2 = SEARCH STRING IS CONTAINED IN DATABASE STRING (use with care, if you search nothing
it will produce a dangerouse output)
4 = DATABASE STRING IS CONTAINED IN SEARCH STRING (it exclude msgid "")
diff --git a/poxml/parser.cpp b/poxml/parser.cpp
index fc19468d..468ff24e 100644
--- a/poxml/parser.cpp
+++ b/poxml/parser.cpp
@@ -886,7 +886,7 @@ TQString escapePO(TQString msgid)
if (index == -1)
break;
if (index > 1 && msgid.at(index - 1) == '\\' && msgid.at(index - 2) != '\\')
- msgid.replace(index - 1, 3, "&POXML_LITERALTQUOTE;");
+ msgid.replace(index - 1, 3, "&POXML_LITERALQUOTE;");
else
msgid.replace(index, 2, "\"");
}
@@ -910,7 +910,7 @@ TQString escapePO(TQString msgid)
}
msgid.replace(TQRegExp("&POXML_LITERALLINEFEED;"), "\\n");
- msgid.replace(TQRegExp("&POXML_LITERALTQUOTE;"), "\\");
+ msgid.replace(TQRegExp("&POXML_LITERALQUOTE;"), "\\");
return msgid;
}
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 3c96da9e..e6dec103 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -177,7 +177,7 @@ enum NodeType
TQString nodeTypeToString( int type );
-#if defined(CPPPARSER_TQUICK_ALLOCATOR)
+#if defined(CPPPARSER_QUICK_ALLOCATOR)
#include <tquick_allocator.h>
diff --git a/umbrello/umbrello/petaltree2uml.cpp b/umbrello/umbrello/petaltree2uml.cpp
index 8d56a3ec..c8cccdc2 100644
--- a/umbrello/umbrello/petaltree2uml.cpp
+++ b/umbrello/umbrello/petaltree2uml.cpp
@@ -309,7 +309,7 @@ protected:
*
* @param node Pointer to the PetalNode which may contain a controlled unit
* @param name Name of the current node
- * @param id TQUID of the current node
+ * @param id QUID of the current node
* @param parentPkg Pointer to the current parent UMLPackage.
* @return True if the node actually contained a controlled unit.
*/
diff --git a/umbrello/umbrello/uniqueid.h b/umbrello/umbrello/uniqueid.h
index 56cedb56..7dcbd4bb 100644
--- a/umbrello/umbrello/uniqueid.h
+++ b/umbrello/umbrello/uniqueid.h
@@ -9,8 +9,8 @@
* Umbrello UML Modeller Authors <uml-devel@uml.sf.net> *
***************************************************************************/
-#ifndef UNITQUEID_H
-#define UNITQUEID_H
+#ifndef UNIQUEID_H
+#define UNIQUEID_H
#include "umlnamespace.h"