diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-13 01:11:30 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-20 05:10:27 +0200 |
| commit | 0fda22935291190784780b9d5cae98c348ae0fd9 (patch) | |
| tree | 7e9d39db8ce6f643ba30a7493b110d138067d1da | |
| parent | 8a029426cae127e48b703630bc02c018435bdda2 (diff) | |
| download | tdesdk-0fda22935291190784780b9d5cae98c348ae0fd9.tar.gz tdesdk-0fda22935291190784780b9d5cae98c348ae0fd9.zip | |
Fix inadvertent "TQ" changes.
(cherry picked from commit 2b144e9d62d7aef14c0b3c4739778e0738bc0e02)
| -rw-r--r-- | kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h | 2 | ||||
| -rw-r--r-- | poxml/parser.cpp | 4 | ||||
| -rw-r--r-- | umbrello/umbrello/codeimport/kdevcppparser/ast.h | 2 | ||||
| -rw-r--r-- | umbrello/umbrello/petaltree2uml.cpp | 2 | ||||
| -rw-r--r-- | umbrello/umbrello/uniqueid.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h index 2f56247c..f2d33569 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 be06d80a..606e4a4b 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 992c46f9..dc9cc1a9 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" |