Fix inadvertent "TQ" changes.

(cherry picked from commit 9c98898237)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent 6b7d3fc79f
commit 25b9a0f723

@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef GESTOR_PESTQUISA_H
#define GESTOR_PESTQUISA_H
#ifndef GESTOR_PESQUISA_H
#define GESTOR_PESQUISA_H
#include <kurl.h>

@ -202,7 +202,7 @@ void HtmlParser::parseNodesOfTypeMETA()
NodeMETA* node = new NodeMETA(aux[i]);
nodes_.push_back(node);
if(!is_content_type_set_ && node->atributoHTTP_ETQUIV().lower() == TQString("Content-Type").lower()) {
if(!is_content_type_set_ && node->atributoHTTP_EQUIV().lower() == TQString("Content-Type").lower()) {
is_content_type_set_ = true;
node_META_content_type_.setNode(aux[i]);
}
@ -218,7 +218,7 @@ TQString HtmlParser::findCharsetInMetaElement(TQString const& html)
{
NodeMETA node(metaTags[i]);
if(node.atributoHTTP_ETQUIV().lower() == TQString("Content-Type").lower()) {
if(node.atributoHTTP_EQUIV().lower() == TQString("Content-Type").lower()) {
return node.charset();
}
}
@ -383,7 +383,7 @@ void HtmlParser::mostra() const
#endif
kdDebug(23100) << nm->url() << endl
<< nm->atributoHTTP_ETQUIV() << endl
<< nm->atributoHTTP_EQUIV() << endl
<< nm->atributoNAME() << endl
<< nm->atributoCONTENT() << endl;
}

@ -166,7 +166,7 @@ void NodeLink::parseLinkLabel()
void NodeMETA::parseAttributeURL()
{
if(attribute_http_equiv_.isEmpty())
parseAttributeHTTP_ETQUIV();
parseAttributeHTTP_EQUIV();
if(upperCase(attribute_http_equiv_) == "REFRESH")
{

@ -166,7 +166,7 @@ public:
virtual TQString const& url() const;
virtual const TQString& linkLabel() const;
virtual bool isLink() const;
TQString const& atributoHTTP_ETQUIV() const;
TQString const& atributoHTTP_EQUIV() const;
TQString const& atributoNAME() const;
TQString const& atributoCONTENT() const;
TQString charset() const;
@ -176,13 +176,13 @@ public:
private:
/**
Procura se existem os atributos HTTP-ETQUIV=Refresh e URL=...
Procura se existem os atributos HTTP-EQUIV=Refresh e URL=...
Se existir considera o content do atributo URL como um link.
ex: <META HTTP-ETQUIV=Refresh CONTENT="10; URL=http://www.htmlhelp.com/">
ex: <META HTTP-EQUIV=Refresh CONTENT="10; URL=http://www.htmlhelp.com/">
*/
void parseAttributeURL();
void parseAttributeHTTP_ETQUIV();
void parseAttributeHTTP_EQUIV();
void parseAttributeNAME();
void parseAttributeCONTENT();

@ -214,7 +214,7 @@ inline bool NodeMETA::isLink() const
return false;
}
inline TQString const& NodeMETA::atributoHTTP_ETQUIV() const
inline TQString const& NodeMETA::atributoHTTP_EQUIV() const
{
return attribute_http_equiv_;
}
@ -237,16 +237,16 @@ inline bool NodeMETA::isRedirection() const
inline void NodeMETA::parse()
{
parseAttributeHTTP_ETQUIV();
parseAttributeHTTP_EQUIV();
parseAttributeNAME();
parseAttributeCONTENT();
parseAttributeURL();
}
inline void NodeMETA::parseAttributeHTTP_ETQUIV()
inline void NodeMETA::parseAttributeHTTP_EQUIV()
{
attribute_http_equiv_ = getAttribute("HTTP-ETQUIV=");
attribute_http_equiv_ = getAttribute("HTTP-EQUIV=");
}
inline void NodeMETA::parseAttributeNAME()

@ -30,7 +30,7 @@
#include "combobox.h"
enum Functions {
FirstFunction = 353, //CHANGE THIS NUMBER TO AN UNITQUE ONE!!!
FirstFunction = 353, //CHANGE THIS NUMBER TO AN UNIQUE ONE!!!
popupList,
LastFunction
};

@ -40,7 +40,7 @@
using namespace std;
enum Functions {
FirstFunction = 260, //CHANGE THIS NUMBER TO AN UNITQUE ONE!!!
FirstFunction = 260, //CHANGE THIS NUMBER TO AN UNIQUE ONE!!!
EB_isOn,
EB_setPopup,
EB_setButtonText,

@ -28,7 +28,7 @@
#include <kommanderplugin.h>
enum Functions {
FirstFunction = 450, //CHANGE THIS NUMBER TO AN UNITQUE ONE!!!
FirstFunction = 450, //CHANGE THIS NUMBER TO AN UNIQUE ONE!!!
TE_setModified,
TE_selectText,
TE_paragraphs,

@ -10,7 +10,7 @@
enum Functions {
FirstFunction = 11001, //CHANGE THIS NUMBE TO AN UNITQUE ONE!!!
FirstFunction = 11001, //CHANGE THIS NUMBE TO AN UNIQUE ONE!!!
Function1,
Function2,
LastFunction

@ -217,7 +217,7 @@ qtXslDbgShellReadline(xmlChar * prompt)
/* have we been told to die */
if (getThreadStatus() == XSLDBG_MSG_THREAD_STOP){
fprintf(stderr, "About to stop thread\n");
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
return NULL;
}
}

@ -61,7 +61,7 @@ extern "C" {
DEBUG_CONT,
DEBUG_RUN,
DEBUG_RUN_RESTART,
DEBUG_TQUIT,
DEBUG_QUIT,
DEBUG_TRACE,
DEBUG_WALK
} DebugStatusEnum;
@ -107,7 +107,7 @@ extern "C" {
DEBUG_CONT,
DEBUG_RUN,
DEBUG_RUN_RESTART,
DEBUG_TQUIT,
DEBUG_QUIT,
DEBUG_TRACE,
DEBUG_WALK
};

@ -26,7 +26,7 @@ typedef enum { /* id's for commands of xslDbgShell */
DEBUG_HELP_CMD = 100,
DEBUG_BYE_CMD,
DEBUG_EXIT_CMD,
DEBUG_TQUIT_CMD,
DEBUG_QUIT_CMD,
DEBUG_STEP_CMD,
DEBUG_STEPUP_CMD,
@ -113,7 +113,7 @@ enum CommandsEnum { /* id's for commands of xslDbgShell */
DEBUG_HELP_CMD = 100,
DEBUG_BYE_CMD,
DEBUG_EXIT_CMD,
DEBUG_TQUIT_CMD,
DEBUG_QUIT_CMD,
DEBUG_STEP_CMD,
DEBUG_STEPUP_CMD,

@ -545,7 +545,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
pctxt = xmlXPathNewContext(source->doc);
if (pctxt == NULL) {
xmlFree(ctxt);
/* xslDebugStatus = DEBUG_TQUIT; */
/* xslDebugStatus = DEBUG_QUIT; */
return result;
}
if (!xmlXPathNsLookup(pctxt, (xmlChar *) "xsl"))
@ -1346,7 +1346,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
xsldbgGenericErrorFunc("\n");
}
while (!exitShell && (xslDebugStatus != DEBUG_TQUIT)) {
while (!exitShell && (xslDebugStatus != DEBUG_QUIT)) {
if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
if (ctxt->node == (xmlNodePtr) ctxt->doc)
snprintf((char *) prompt, DEBUG_BUFFER_SIZE - 1,
@ -1464,9 +1464,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
/* --- Running related commands --- */
case DEBUG_BYE_CMD:
case DEBUG_EXIT_CMD:
case DEBUG_TQUIT_CMD:
case DEBUG_QUIT_CMD:
/* allow the stylesheet to exit */
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
exitShell++;
cmdResult = 1;
break;
@ -1782,7 +1782,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL);
if (ctxt->pctxt == NULL) {
xmlFree(ctxt);
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
return;
} else
break;
@ -1822,7 +1822,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL);
if (ctxt->pctxt == NULL) {
xmlFree(ctxt);
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
return;
} else
break;

@ -65,8 +65,8 @@ helpTop(const xmlChar * args)
int result = 0;
if (xmlStrLen(args) > 0) {
snprintf(helpParam, 100, "--param help:%c'%s'%c", TQUOTECHAR, args,
TQUOTECHAR);
snprintf(helpParam, 100, "--param help:%c'%s'%c", QUOTECHAR, args,
QUOTECHAR);
} else
xmlStrCpy(helpParam, "");
if (docsDirPath && filesTempFileName(0)) {
@ -79,10 +79,10 @@ helpTop(const xmlChar * args)
" --cd %s "
"xsldbghelp.xsl xsldbghelp.xml",
XSLDBG_BIN, helpParam,
TQUOTECHAR, VERSION, TQUOTECHAR,
TQUOTECHAR, xsldbgVerTxt.utf8().data(), TQUOTECHAR,
TQUOTECHAR, helpDocVerTxt.utf8().data(), TQUOTECHAR,
TQUOTECHAR, helpErrorTxt.utf8().data(), TQUOTECHAR,
QUOTECHAR, VERSION, QUOTECHAR,
QUOTECHAR, xsldbgVerTxt.utf8().data(), QUOTECHAR,
QUOTECHAR, helpDocVerTxt.utf8().data(), QUOTECHAR,
QUOTECHAR, helpErrorTxt.utf8().data(), QUOTECHAR,
filesTempFileName(0),
docsDirPath);
if (xslDbgShellExecute((xmlChar *) buff, optionsGetIntOption(OPTIONS_VERBOSE)) == 0) {

@ -338,16 +338,16 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
{
xmlXPathObjectPtr list;
int result = 0;
static const char * TQUIET_STR = "-q";
static const char * QUIET_STR = "-q";
bool silenceCtxtErrors = false;
if ((arg == NULL) || (xmlStrLen(arg) == 0))
arg = (xmlChar *) ".";
/* Do we quietly ingore style context errors */
if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){
if (strncasecmp((char*)arg, QUIET_STR, strlen(QUIET_STR))== 0){
silenceCtxtErrors = true;
arg = arg + strlen(TQUIET_STR);
arg = arg + strlen(QUIET_STR);
while (isspace(*arg)){
arg++;
}
@ -457,7 +457,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
/* command argument to include both name and its value */
static const char * FULLNAME_STR = "-f";
/* Quietly exit if an invalid stylesheet is provided */
static const char * TQUIET_STR = "-q";
static const char * QUIET_STR = "-q";
bool silenceCtxtErrors = false;
if (!arg) {
@ -470,9 +470,9 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
varCount = 0;
/* Do we quietly ingore style context errors */
if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){
if (strncasecmp((char*)arg, QUIET_STR, strlen(QUIET_STR))== 0){
silenceCtxtErrors = true;
arg = arg + strlen(TQUIET_STR);
arg = arg + strlen(QUIET_STR);
while (isspace(*arg)){
arg++;
}

@ -61,10 +61,10 @@ extern "C" {
/* Handle the differences in path and quote character between
* win32 and *nix systems */
#ifdef WIN32
#define TQUOTECHAR ' '
#define QUOTECHAR ' '
#define PATHCHAR '\\'
#else
#define TQUOTECHAR '\"'
#define QUOTECHAR '\"'
#define PATHCHAR '/'
#endif

@ -455,7 +455,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
if (cur->methodURI == NULL) {
if (optionsGetIntOption(OPTIONS_TIMING))
startTimer();
if (xslDebugStatus != DEBUG_TQUIT) {
if (xslDebugStatus != DEBUG_QUIT) {
if (terminalIO != NULL)
bytesWritten = xsltSaveResultToFile(terminalIO, res, cur);
else if (optionsGetStringOption
@ -719,7 +719,7 @@ xsldbgMain(int argc, char **argv)
debugGotControl(0);
while (xslDebugStatus != DEBUG_TQUIT) {
while (xslDebugStatus != DEBUG_QUIT) {
xsldbgReachedFirstTemplate = false;
/* don't force xsldbg to show command prompt */
showPrompt = 0;
@ -765,7 +765,7 @@ xsldbgMain(int argc, char **argv)
/*goto a xsldbg command prompt */
showPrompt = 1;
if (xslDebugStatus == DEBUG_NONE) {
xslDebugStatus = DEBUG_TQUIT; /* panic !! */
xslDebugStatus = DEBUG_QUIT; /* panic !! */
result = 0;
}
}
@ -776,21 +776,21 @@ xsldbgMain(int argc, char **argv)
doc = filesGetMainDoc();
if (doc == NULL) {
if (xslDebugStatus == DEBUG_NONE) {
xslDebugStatus = DEBUG_TQUIT; /* panic !! */
xslDebugStatus = DEBUG_QUIT; /* panic !! */
result = 0;
} else {
/*goto a xsldbg command prompt */
showPrompt = 1;
}
} else {
if (xslDebugStatus != DEBUG_TQUIT) {
if (xslDebugStatus != DEBUG_QUIT) {
xsltProcess(doc, cur);
result = 1;
}
}
if (optionsGetIntOption(OPTIONS_SHELL) && (showPrompt == 0)) {
if ((xslDebugStatus != DEBUG_TQUIT)
if ((xslDebugStatus != DEBUG_QUIT)
&& !debugGotControl(-1)) {
xsldbgGenericErrorFunc(i18n("\nDebugger never received control.\n"));
/*goto a xsldbg command prompt */
@ -831,12 +831,12 @@ xsldbgMain(int argc, char **argv)
}
} else {
/* request to execute stylesheet only so we're done */
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
}
} else {
/* Some sort of problem loading source file has occured. Quit? */
if (xslDebugStatus == DEBUG_NONE) {
xslDebugStatus = DEBUG_TQUIT; /* Panic!! */
xslDebugStatus = DEBUG_QUIT; /* Panic!! */
result = 0;
} else {
/*goto a xsldbg command prompt */
@ -872,7 +872,7 @@ xsldbgMain(int argc, char **argv)
}
xmlFreeDoc(tempDoc);
} else if (showPrompt && !optionsGetIntOption(OPTIONS_SHELL)) {
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
result = 0; /* panic */
}
@ -917,7 +917,7 @@ xsldbgLoadStylesheet()
cur = NULL;
if (!optionsGetIntOption(OPTIONS_SHELL)) {
xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
} else {
xsltGenericError(xsltGenericErrorContext, "\n");
xslDebugStatus = DEBUG_STOP;
@ -991,7 +991,7 @@ xsldbgLoadXmlData(void)
xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))));
if (!optionsGetIntOption(OPTIONS_SHELL)) {
xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
} else {
xsltGenericError(xsltGenericErrorContext, "\n");
xslDebugStatus = DEBUG_STOP;
@ -1036,7 +1036,7 @@ xsldbgLoadXmlTemporary(const xmlChar * path)
}
if (optionsGetIntOption(OPTIONS_TIMING)
&& (xslDebugStatus != DEBUG_TQUIT)) {
&& (xslDebugStatus != DEBUG_QUIT)) {
endTimer(TQString("Parsing document %1").arg(xsldbgUrl(path)));
}
return doc;

@ -94,7 +94,7 @@ setThreadStatus(XsldbgMessageEnum type)
case XSLDBG_MSG_THREAD_STOP:
case XSLDBG_MSG_THREAD_DEAD:
xslDebugStatus = DEBUG_TQUIT;
xslDebugStatus = DEBUG_QUIT;
threadStatus = type;
break;

@ -15,8 +15,8 @@
* *
***************************************************************************/
#ifndef TAGTQUICKLISTDLG_H
#define TAGTQUICKLISTDLG_H
#ifndef TAGQUICKLISTDLG_H
#define TAGQUICKLISTDLG_H
#include <tqwidget.h>

@ -235,7 +235,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
attr->name = TQString((const char*)at_ptr->name);
switch (at_ptr->def) {
case 1: {attr->status = "optional"; break;} //NONE
case 2: {attr->status = "required"; break;} //RETQUIRED
case 2: {attr->status = "required"; break;} //REQUIRED
case 3: {attr->status = "implied"; break;} //IMPLIED
case 4: {attr->status = "fixed"; break;} //FIXED
}

Loading…
Cancel
Save