Fix inadvertent TQt string conversions

This closes Bug 782

12 files changed, 23 insertions, 23 deletions

diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index 8c4c2795..4931b938 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cc
@@ -77,7 +77,7 @@ void Msod::drawShape(
         "SEAL",                     // Seal
         "ARC",                      // Arc
         "LINE",                     // Line
-        "PLATQUE",                   // Plaque
+        "PLAQUE",                   // Plaque
         "CAN",                      // Can
         "DONUT",                    // Donut
         "TEXTSIMPLE",               // Textsimple
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc
index 47173cb9..507ba84e 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -725,7 +725,7 @@ void OoImpressExport::appendObjects(TQDomDocument & doccontent, TQDomNode &objec
         case 12: // polyline
             appendPolyline( doccontent, o, drawPage );
             break;
-        case 13: //OT_TQUADRICBEZIERCURVE = 13
+        case 13: //OT_QUADRICBEZIERCURVE = 13
         case 14: //OT_CUBICBEZIERCURVE = 14
             //todo
             // "draw:path"
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index 0464b782..75ddc2a5 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -159,7 +159,7 @@ void CSVDialog::fillTable( )
 {
     int row, column;
     bool lastCharDelimiter = false;
-    enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD,
+    enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
            S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
 
     TQChar x;
@@ -214,7 +214,7 @@ void CSVDialog::fillTable( )
          case S_START :
             if (x == m_textquote)
             {
-                state = S_TQUOTED_FIELD;
+                state = S_QUOTED_FIELD;
             }
             else if (x == m_delimiter)
             {
@@ -235,21 +235,21 @@ void CSVDialog::fillTable( )
                 state = S_MAYBE_NORMAL_FIELD;
             }
             break;
-         case S_TQUOTED_FIELD :
+         case S_QUOTED_FIELD :
             if (x == m_textquote)
             {
-                state = S_MAYBE_END_OF_TQUOTED_FIELD;
+                state = S_MAYBE_END_OF_QUOTED_FIELD;
             }
             else
             {
                 field += x;
             }
             break;
-         case S_MAYBE_END_OF_TQUOTED_FIELD :
+         case S_MAYBE_END_OF_QUOTED_FIELD :
             if (x == m_textquote)
             {
                 field += x;
-                state = S_TQUOTED_FIELD;
+                state = S_QUOTED_FIELD;
             }
             else if (x == m_delimiter || x == '\n')
             {
@@ -272,10 +272,10 @@ void CSVDialog::fillTable( )
             }
             else
             {
-                state = S_END_OF_TQUOTED_FIELD;
+                state = S_END_OF_QUOTED_FIELD;
             }
             break;
-         case S_END_OF_TQUOTED_FIELD :
+         case S_END_OF_QUOTED_FIELD :
             if (x == m_delimiter || x == '\n')
             {
                 setText(row - m_startRow, column - m_startCol, field);
@@ -300,7 +300,7 @@ void CSVDialog::fillTable( )
             if (x == m_textquote)
             {
                 field = TQString();
-                state = S_TQUOTED_FIELD;
+                state = S_QUOTED_FIELD;
                 break;
             }
          case S_NORMAL_FIELD :
diff --git a/filters/kspread/csv/status.html b/filters/kspread/csv/status.html
index 497ee00a..c4379ade 100644
--- a/filters/kspread/csv/status.html
+++ b/filters/kspread/csv/status.html
@@ -98,11 +98,11 @@ Let's try to draw the graph of the state machine using ascii-art.
             /--\            
             |  |           
             |  v    "     
-       /--[START]-------->[TQUOTED_FIELD] (**) 
+       /--[START]-------->[QUOTED_FIELD] (**) 
   other|   ^   ^            |        ^ 
    (*) |   |   | DEL or     | "      | " (*) 
        |   |   | EOL        v        |           other 
-       |   |   \----[MAYBE_END_OF_TQUOTED_FIELD]--------> Error 
+       |   |   \----[MAYBE_END_OF_QUOTED_FIELD]--------> Error 
        |   |
        |   | DEL or
        |   | EOL
diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h
index feb0f563..c57ad4aa 100644
--- a/filters/kword/mswrite/structures_generated.h
+++ b/filters/kword/mswrite/structures_generated.h
@@ -70,7 +70,7 @@ namespace MSWrite
 	// 
 	// 	Structure Fields:
 	// 
-	// 		name #RETQUIRED
+	// 		name #REQUIRED
 	// 		type #IMPLIED "Word"
 	// 		default #IMPLIED ""
 	// 		description #IMPLIED ""	(also valid for Structures)
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
index 8f5baeb5..46e5466c 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
@@ -142,7 +142,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
     XtNumber(actions),				// num_actions
     resources,					// resources
     XtNumber(resources),			// num_resources
-    NULLTQUARK,					// xrm_class
+    NULLQUARK,					// xrm_class
     TRUE,					// compress_motion
     XtExposeCompressMaximal,			// compress_exposure
     TRUE,					// compress_enterleave
diff --git a/filters/kword/starwriter/status.html b/filters/kword/starwriter/status.html
index d7667e6c..c6656c9c 100644
--- a/filters/kword/starwriter/status.html
+++ b/filters/kword/starwriter/status.html
@@ -3,7 +3,7 @@
 <HTML>
 <HEAD>
   <TITLE>StarWriter 5.x filter for KWord</TITLE>
-  <META HTTP-ETQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
   <META NAME="GENERATOR" CONTENT="Quanta Plus">
 </HEAD>
 <BODY>
diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc
index d28430dd..3f330fa7 100644
--- a/filters/olefilters/powerpoint97/powerpoint.cc
+++ b/filters/olefilters/powerpoint97/powerpoint.cc
@@ -104,9 +104,9 @@ void Powerpoint::invokeHandler(
         { "EXPLAINATOM",                4039,   0 /* &Powerpoint::opExPlainAtom */ },
         { "EXPLAINLINK",                4054,   0 /* &Powerpoint::opExPlainLink */ },
         { "EXPLAINLINKATOM",            4036,   0 /* &Powerpoint::opExPlainLinkAtom */ },
-        { "EXTQUICKTIME",                4073,   0 /* &Powerpoint::opExQuickTime */ },
-        { "EXTQUICKTIMEMOVIE",           4074,   0 /* &Powerpoint::opExQuickTimeMovie */ },
-        { "EXTQUICKTIMEMOVIEDATA",       4075,   0 /* &Powerpoint::opExQuickTimeMovieData */ },
+        { "EXQUICKTIME",                4073,   0 /* &Powerpoint::opExQuickTime */ },
+        { "EXQUICKTIMEMOVIE",           4074,   0 /* &Powerpoint::opExQuickTimeMovie */ },
+        { "EXQUICKTIMEMOVIEDATA",       4075,   0 /* &Powerpoint::opExQuickTimeMovieData */ },
         { "EXSUBSCRIPTION",             4076,   0 /* &Powerpoint::opExSubscription */ },
         { "EXSUBSCRIPTIONSECTION",      4077,   0 /* &Powerpoint::opExSubscriptionSection */ },
         { "EXTERNALOBJECT",             4027,   0 /* &Powerpoint::opExternalObject */ },
diff --git a/filters/olefilters/powerpoint97/pptSlide.cpp b/filters/olefilters/powerpoint97/pptSlide.cpp
index e1b02296..d60a887e 100644
--- a/filters/olefilters/powerpoint97/pptSlide.cpp
+++ b/filters/olefilters/powerpoint97/pptSlide.cpp
@@ -97,7 +97,7 @@ void PptSlide::addText(TQString text, TQ_UINT16 type)
 	case OTHER_TEXT:
 	case CENTER_BODY_TEXT:
 	case HALF_BODY_TEXT:
-	case TQUARTER_BODY_TEXT:
+	case QUARTER_BODY_TEXT:
 	        TQStringList data(TQStringList::split(TQChar('\r'), text, true));
 		for (j = 0; j < data.count(); j++)
 		{
diff --git a/filters/olefilters/powerpoint97/pptSlide.h b/filters/olefilters/powerpoint97/pptSlide.h
index 78e9cb0a..4297495e 100644
--- a/filters/olefilters/powerpoint97/pptSlide.h
+++ b/filters/olefilters/powerpoint97/pptSlide.h
@@ -38,7 +38,7 @@ DESCRIPTION
 #define CENTER_BODY_TEXT 	5	//center body(subtitle in title slide)
 #define CENTER_TITLE_TEXT 	6	//center title(title in title slide)
 #define HALF_BODY_TEXT 	7	//half body(body in two-column slide)
-#define TQUARTER_BODY_TEXT 	8	//quarter body(body in four-body slide)
+#define QUARTER_BODY_TEXT 	8	//quarter body(body in four-body slide)
 //--
 
 //--char style types
diff --git a/filters/olefilters/powerpoint97/pptdoc.cc b/filters/olefilters/powerpoint97/pptdoc.cc
index 07ac8725..9aa10ee4 100644
--- a/filters/olefilters/powerpoint97/pptdoc.cc
+++ b/filters/olefilters/powerpoint97/pptdoc.cc
@@ -68,7 +68,7 @@ void PptDoc::gotSlide(
 	case OTHER_TEXT:
 	case CENTER_BODY_TEXT:
 	case HALF_BODY_TEXT:
-	case TQUARTER_BODY_TEXT:
+	case QUARTER_BODY_TEXT:
 		for (j = 0; j < data.count(); j++)
 		{
 			ourSlide.body.append(data[j]);
diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cc
index 270cc30f..42be4de5 100644
--- a/filters/olefilters/powerpoint97/pptxml.cc
+++ b/filters/olefilters/powerpoint97/pptxml.cc
@@ -258,7 +258,7 @@ void PptXml::setPlaceholder(PptSlide &slide)
 		break;
 	case OTHER_TEXT:
 	case HALF_BODY_TEXT:
-	case TQUARTER_BODY_TEXT:
+	case QUARTER_BODY_TEXT:
 		y = 130;
 		if(m_half)
 		{