Fix inadvertent "TQ" changes.

(cherry picked from commit 2b144e9d62)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent 8a029426ca
commit 0fda229352

@ -164,7 +164,7 @@ public:
/* /*
Sets the rules to decide when 2 string match (Uppercase and remove char Sets the rules to decide when 2 string match (Uppercase and remove char
are not set here) are not set here)
1 = ETQUAL 1 = EQUAL
2 = SEARCH STRING IS CONTAINED IN DATABASE STRING (use with care, if you search nothing 2 = SEARCH STRING IS CONTAINED IN DATABASE STRING (use with care, if you search nothing
it will produce a dangerouse output) it will produce a dangerouse output)
4 = DATABASE STRING IS CONTAINED IN SEARCH STRING (it exclude msgid "") 4 = DATABASE STRING IS CONTAINED IN SEARCH STRING (it exclude msgid "")

@ -886,7 +886,7 @@ TQString escapePO(TQString msgid)
if (index == -1) if (index == -1)
break; break;
if (index > 1 && msgid.at(index - 1) == '\\' && msgid.at(index - 2) != '\\') 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 else
msgid.replace(index, 2, "\""); msgid.replace(index, 2, "\"");
} }
@ -910,7 +910,7 @@ TQString escapePO(TQString msgid)
} }
msgid.replace(TQRegExp("&POXML_LITERALLINEFEED;"), "\\n"); msgid.replace(TQRegExp("&POXML_LITERALLINEFEED;"), "\\n");
msgid.replace(TQRegExp("&POXML_LITERALTQUOTE;"), "\\"); msgid.replace(TQRegExp("&POXML_LITERALQUOTE;"), "\\");
return msgid; return msgid;
} }

@ -177,7 +177,7 @@ enum NodeType
TQString nodeTypeToString( int type ); TQString nodeTypeToString( int type );
#if defined(CPPPARSER_TQUICK_ALLOCATOR) #if defined(CPPPARSER_QUICK_ALLOCATOR)
#include <tquick_allocator.h> #include <tquick_allocator.h>

@ -309,7 +309,7 @@ protected:
* *
* @param node Pointer to the PetalNode which may contain a controlled unit * @param node Pointer to the PetalNode which may contain a controlled unit
* @param name Name of the current node * @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. * @param parentPkg Pointer to the current parent UMLPackage.
* @return True if the node actually contained a controlled unit. * @return True if the node actually contained a controlled unit.
*/ */

@ -9,8 +9,8 @@
* Umbrello UML Modeller Authors <uml-devel@uml.sf.net> * * Umbrello UML Modeller Authors <uml-devel@uml.sf.net> *
***************************************************************************/ ***************************************************************************/
#ifndef UNITQUEID_H #ifndef UNIQUEID_H
#define UNITQUEID_H #define UNIQUEID_H
#include "umlnamespace.h" #include "umlnamespace.h"

Loading…
Cancel
Save