Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/tellico@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

21 files changed, 74 insertions, 74 deletions

diff --git a/src/translators/alexandriaimporter.cpp b/src/translators/alexandriaimporter.cpp
index 2c67408..1df5116 100644
--- a/src/translators/alexandriaimporter.cpp
+++ b/src/translators/alexandriaimporter.cpp
@@ -179,7 +179,7 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() {
   return m_coll;
 }
 
-TQWidget* AlexandriaImporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
+TQWidget* AlexandriaImporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
   if(m_widget) {
     return m_widget;
   }
@@ -187,7 +187,7 @@ TQWidget* AlexandriaImporter::widget(TQWidget* tqparent_, const char* name_/*=0*
   m_libraryDir = TQDir::home();
   m_libraryDir.setFilter(TQDir::Dirs | TQDir::Readable | TQDir::NoSymLinks);
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Alexandria Options"), m_widget);
diff --git a/src/translators/amcimporter.cpp b/src/translators/amcimporter.cpp
index 399d7a7..d988d55 100644
--- a/src/translators/amcimporter.cpp
+++ b/src/translators/amcimporter.cpp
@@ -260,14 +260,14 @@ TQStringList AMCImporter::parseCast(const TQString& text_) {
     } else if(text_.at(pos) == '(') {
       if(nPar == 0) {
         person = text_.mid(oldPos, pos-oldPos).stripWhiteSpace();
-        oldPos = pos+1; // add one to go past tqparenthesis
+        oldPos = pos+1; // add one to go past parenthesis
       }
       ++nPar;
     } else if(text_.at(pos) == ')') {
       --nPar;
       if(nPar == 0) {
         role = text_.mid(oldPos, pos-oldPos).stripWhiteSpace();
-        oldPos = pos+1; // add one to go past tqparenthesis
+        oldPos = pos+1; // add one to go past parenthesis
       }
     }
   }
diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp
index 0d23fa5..539c03e 100644
--- a/src/translators/audiofileimporter.cpp
+++ b/src/translators/audiofileimporter.cpp
@@ -329,12 +329,12 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
 #endif
 }
 
-TQWidget* AudioFileImporter::widget(TQWidget* tqparent_, const char* name_) {
+TQWidget* AudioFileImporter::widget(TQWidget* parent_, const char* name_) {
   if(m_widget) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQVGroupBox* box = new TQVGroupBox(i18n("Audio File Options"), m_widget);
diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp
index d1aa57b..867dda3 100644
--- a/src/translators/bibtexexporter.cpp
+++ b/src/translators/bibtexexporter.cpp
@@ -190,12 +190,12 @@ bool BibtexExporter::exec() {
   return FileHandler::writeTextURL(url(), text, options() & ExportUTF8, options() & Export::ExportForce);
 }
 
-TQWidget* BibtexExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* BibtexExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("Bibtex Options"), m_widget);
diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp
index 8394f6a..97ab55c 100644
--- a/src/translators/bibteximporter.cpp
+++ b/src/translators/bibteximporter.cpp
@@ -278,12 +278,12 @@ void BibtexImporter::slotCancel() {
   m_cancelled = true;
 }
 
-TQWidget* BibtexImporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
+TQWidget* BibtexImporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
   if(m_widget) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQButtonGroup* box = new TQVButtonGroup(i18n("Bibtex Options"), m_widget);
diff --git a/src/translators/bibtexmlexporter.cpp b/src/translators/bibtexmlexporter.cpp
index 153fd3f..85934b2 100644
--- a/src/translators/bibtexmlexporter.cpp
+++ b/src/translators/bibtexmlexporter.cpp
@@ -99,7 +99,7 @@ bool BibtexmlExporter::exec() {
 
   StringSet usedKeys;
   TQString type, key, newKey, value, elemName, parElemName;
-  TQDomElement btElem, entryElem, tqparentElem, fieldElem;
+  TQDomElement btElem, entryElem, parentElem, fieldElem;
   for(Data::EntryVec::ConstIterator entryIt = entries().begin(); entryIt != entries().end(); ++entryIt) {
     key = entryIt->field(keyField);
     if(key.isEmpty()) {
@@ -157,15 +157,15 @@ bool BibtexmlExporter::exec() {
           elemName = TQString::tqfromLatin1("keyword");
         }
 
-        tqparentElem = dom.createElement(parElemName);
+        parentElem = dom.createElement(parElemName);
         const TQStringList values = entryIt->fields(field->name(), false);
         for(TQStringList::ConstIterator it = values.begin(); it != values.end(); ++it) {
           fieldElem = dom.createElement(elemName);
           fieldElem.appendChild(dom.createTextNode(*it));
-          tqparentElem.appendChild(fieldElem);
+          parentElem.appendChild(fieldElem);
         }
-        if(tqparentElem.hasChildNodes()) {
-          entryElem.appendChild(tqparentElem);
+        if(parentElem.hasChildNodes()) {
+          entryElem.appendChild(parentElem);
         }
       } else {
         fieldElem = dom.createElement(elemName);
diff --git a/src/translators/btparse/btparse.h b/src/translators/btparse/btparse.h
index c2d0200..df5206c 100644
--- a/src/translators/btparse/btparse.h
+++ b/src/translators/btparse/btparse.h
@@ -254,7 +254,7 @@ extern "C" {
  * First, we might need a prototype for strdup() (because the zzcr_ast
  * macro uses it, and that macro is used in pccts/ast.c -- which I don't
  * want to modify if I can help it, because it's someone else's code).
- * This is to accomodate AIX, where including <string.h> aptqparently doesn't
+ * This is to accomodate AIX, where including <string.h> apparently doesn't
  * declare strdup() (reported by Reiner Schlotte
  * <schlotte@geo.palmod.uni-bremen.de>), and compiling bibtex.c (which
  * includes pccts/ast.c) crashes because of this (yes, yes, I know it
diff --git a/src/translators/btparse/input.c b/src/translators/btparse/input.c
index c50468e..03668af 100644
--- a/src/translators/btparse/input.c
+++ b/src/translators/btparse/input.c
@@ -164,7 +164,7 @@ finish_parse (int **err_counts)
 @RETURNS    : false if there were serious errors in the recently-parsed input
               true otherwise (no errors or just warnings)
 @DESCRIPTION: Gets the "error status" bitmap relative to a saved set of
-              error counts and tqmasks of non-serious errors.
+              error counts and masks of non-serious errors.
 @GLOBALS    : 
 @CALLS      : 
 @CALLERS    : 
@@ -178,7 +178,7 @@ parse_status (int *saved_counts)
 
    /* 
     * This bit-twiddling fetches the error status (which has a bit
-    * for each error class), tqmasks off the bits for trivial errors
+    * for each error class), masks off the bits for trivial errors
     * to get "true" if there were any serious errors, and then 
     * returns the opposite of that.
     */
diff --git a/src/translators/btparse/lex_auxiliary.c b/src/translators/btparse/lex_auxiliary.c
index 9e5b452..097fcb6 100644
--- a/src/translators/btparse/lex_auxiliary.c
+++ b/src/translators/btparse/lex_auxiliary.c
@@ -107,7 +107,7 @@ static int     JunkCount;               /* non-whitespace chars at toplevel */
  *     brace depth within a string; we can only end the current string
  *     when this is zero
  *   ParenDepth:
- *     tqparenthesis depth within a string; needed for @comment entries
+ *     parenthesis depth within a string; needed for @comment entries
  *     that are paren-delimited (because the comment in that case is
  *     a paren-delimited string)
  *   StringOpener:
@@ -117,7 +117,7 @@ static int     JunkCount;               /* non-whitespace chars at toplevel */
  *   StringStart:
  *     line on which current string started; if we detect an aptqparent
  *     runaway, this is used to report where the runaway started
- *   AptqparentRunaway:
+ *   ApparentRunaway:
  *     flags if we have already detected (and warned) that the current
  *     string appears to be a runaway, so that we don't warn again
  *     (and again and again and again)
@@ -130,9 +130,9 @@ static int     JunkCount;               /* non-whitespace chars at toplevel */
  */
 static char    StringOpener = '\0';     /* '{' or '"' */
 static int     BraceDepth;              /* depth of brace-nesting */
-static int     ParenDepth;              /* depth of tqparenthesis-nesting */
+static int     ParenDepth;              /* depth of parenthesis-nesting */
 static int     StringStart = -1;        /* start line of current string */
-static int     AptqparentRunaway;         /* current string looks like runaway */
+static int     ApparentRunaway;         /* current string looks like runaway */
 static int     QuoteWarned;             /* already warned about " in string? */
 
 
@@ -590,7 +590,7 @@ void start_string (char start_char)
    BraceDepth = 0;
    ParenDepth = 0;
    StringStart = zzline;
-   AptqparentRunaway = 0;
+   ApparentRunaway = 0;
    QuoteWarned = 0;
    if (start_char == '{')
       open_brace ();
@@ -598,7 +598,7 @@ void start_string (char start_char)
       ParenDepth++;
    if (start_char == '"' && EntryState == in_comment)
    {
-      lexical_error ("comment entries must be delimited by either braces or tqparentheses");
+      lexical_error ("comment entries must be delimited by either braces or parentheses");
       EntryState = toplevel;
       zzmode (START);
       return;
@@ -878,7 +878,7 @@ void check_runaway_string (void)
    }
    
 
-   if (!AptqparentRunaway)                /* haven't already warned about it */
+   if (!ApparentRunaway)                /* haven't already warned about it */
    {
       enum { none, entry, field, giveup } guess;
 
@@ -930,7 +930,7 @@ void check_runaway_string (void)
       {
          lexical_warning ("possible runaway string started at line %d", 
                           StringStart);
-         AptqparentRunaway = 1;
+         ApparentRunaway = 1;
       }
    }
 
diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp
index 4d4d32e..ef608b7 100644
--- a/src/translators/csvexporter.cpp
+++ b/src/translators/csvexporter.cpp
@@ -98,12 +98,12 @@ bool CSVExporter::exec() {
   return FileHandler::writeTextURL(url(), text, options() & ExportUTF8, options() & Export::ExportForce);
 }
 
-TQWidget* CSVExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("CSV Options"), m_widget);
diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp
index 683a3d1..b23dd93 100644
--- a/src/translators/csvimporter.cpp
+++ b/src/translators/csvimporter.cpp
@@ -210,12 +210,12 @@ Tellico::Data::CollPtr CSVImporter::collection() {
   return m_coll;
 }
 
-TQWidget* CSVImporter::widget(TQWidget* tqparent_, const char* name_) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("CSV Options"), m_widget);
diff --git a/src/translators/filelistingimporter.cpp b/src/translators/filelistingimporter.cpp
index 00e0709..8f3afe1 100644
--- a/src/translators/filelistingimporter.cpp
+++ b/src/translators/filelistingimporter.cpp
@@ -180,12 +180,12 @@ Tellico::Data::CollPtr FileListingImporter::collection() {
   return m_coll;
 }
 
-TQWidget* FileListingImporter::widget(TQWidget* tqparent_, const char* name_) {
+TQWidget* FileListingImporter::widget(TQWidget* parent_, const char* name_) {
   if(m_widget) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQVGroupBox* box = new TQVGroupBox(i18n("File Listing Options"), m_widget);
diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp
index 1364b4e..155f79e 100644
--- a/src/translators/freedbimporter.cpp
+++ b/src/translators/freedbimporter.cpp
@@ -479,11 +479,11 @@ void FreeDBImporter::readCDText(const TQCString& drive_) {
 }
 #undef SETFIELD
 
-TQWidget* FreeDBImporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
+TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
   if(m_widget) {
     return m_widget;
   }
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* bigbox = new TQGroupBox(1, Qt::Horizontal, i18n("Audio CD Options"), m_widget);
diff --git a/src/translators/griffith2tellico.py b/src/translators/griffith2tellico.py
index 31c947e..19bf583 100755
--- a/src/translators/griffith2tellico.py
+++ b/src/translators/griffith2tellico.py
@@ -149,7 +149,7 @@ class BasicTellicoDOM:
 			else:
 				field = key
 
-			tqparentNode = self.__doc.createElement(field + 's')
+			parentNode = self.__doc.createElement(field + 's')
 			
 			for value in values:
 				if len(value) == 0: continue
@@ -173,9 +173,9 @@ class BasicTellicoDOM:
 				else:
 					node.appendChild(self.__doc.createTextNode(value.strip()))
 				
-				if node.hasChildNodes(): tqparentNode.appendChild(node)
+				if node.hasChildNodes(): parentNode.appendChild(node)
 			
-			if tqparentNode.hasChildNodes(): entryNode.appendChild(tqparentNode)
+			if parentNode.hasChildNodes(): entryNode.appendChild(parentNode)
 
 		self.__collection.appendChild(entryNode)
 
diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp
index b8a38c0..77a09c0 100644
--- a/src/translators/htmlexporter.cpp
+++ b/src/translators/htmlexporter.cpp
@@ -454,12 +454,12 @@ void HTMLExporter::writeImages(Data::CollPtr coll_) {
   }
 }
 
-TQWidget* HTMLExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* HTMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("HTML Options"), m_widget);
diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp
index d58e9fe..e0d0de3 100644
--- a/src/translators/onixexporter.cpp
+++ b/src/translators/onixexporter.cpp
@@ -165,12 +165,12 @@ TQString ONIXExporter::text() {
   return m_handler->applyStylesheet(output.toString());
 }
 
-TQWidget* ONIXExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* ONIXExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("ONIX Archive Options"), m_widget);
diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp
index 03115e9..caab986 100644
--- a/src/translators/pilotdbexporter.cpp
+++ b/src/translators/pilotdbexporter.cpp
@@ -199,12 +199,12 @@ bool PilotDBExporter::exec() {
   return FileHandler::writeDataURL(url(), pdb.data(), options() & Export::ExportForce);
 }
 
-TQWidget* PilotDBExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* PilotDBExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("PilotDB Options"), m_widget);
diff --git a/src/translators/tellicoimporter.cpp b/src/translators/tellicoimporter.cpp
index ae06500..3f97074 100644
--- a/src/translators/tellicoimporter.cpp
+++ b/src/translators/tellicoimporter.cpp
@@ -214,7 +214,7 @@ void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
     // removeChild only works for immediate tqchildren
     // remove _default field
     if(addFields) {
-      fieldelems.item(0).tqparentNode().removeChild(fieldelems.item(0));
+      fieldelems.item(0).parentNode().removeChild(fieldelems.item(0));
     }
   }
 
diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp
index 397366b..011d991 100644
--- a/src/translators/tellicoxmlexporter.cpp
+++ b/src/translators/tellicoxmlexporter.cpp
@@ -114,7 +114,7 @@ TQString TellicoXMLExporter::exportXMLString() const {
   return exportXML().toString();
 }
 
-void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement& tqparent_, bool format_) const {
+void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement& parent_, bool format_) const {
   Data::CollPtr coll = collection();
   if(!coll) {
     kdWarning() << "TellicoXMLExporter::exportCollectionXML() - no collection pointer!" << endl;
@@ -173,7 +173,7 @@ void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement&
     exportGroupXML(dom_, collElem);
   }
 
-  tqparent_.appendChild(collElem);
+  parent_.appendChild(collElem);
 
   // the borrowers and filters are in the tellico object, not the collection
   if(options() & Export::ExportComplete) {
@@ -183,7 +183,7 @@ void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement&
       exportBorrowerXML(dom_, bElem, bIt);
     }
     if(bElem.hasChildNodes()) {
-      tqparent_.appendChild(bElem);
+      parent_.appendChild(bElem);
     }
 
     TQDomElement fElem = dom_.createElement(TQString::tqfromLatin1("filters"));
@@ -192,12 +192,12 @@ void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement&
       exportFilterXML(dom_, fElem, fIt);
     }
     if(fElem.hasChildNodes()) {
-      tqparent_.appendChild(fElem);
+      parent_.appendChild(fElem);
     }
   }
 }
 
-void TellicoXMLExporter::exportFieldXML(TQDomDocument& dom_, TQDomElement& tqparent_, Data::FieldPtr field_) const {
+void TellicoXMLExporter::exportFieldXML(TQDomDocument& dom_, TQDomElement& parent_, Data::FieldPtr field_) const {
   TQDomElement elem = dom_.createElement(TQString::tqfromLatin1("field"));
 
   elem.setAttribute(TQString::tqfromLatin1("name"),     field_->name());
@@ -227,10 +227,10 @@ void TellicoXMLExporter::exportFieldXML(TQDomDocument& dom_, TQDomElement& tqpar
     elem.appendChild(e);
   }
 
-  tqparent_.appendChild(elem);
+  parent_.appendChild(elem);
 }
 
-void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& tqparent_, Data::EntryPtr entry_, bool format_) const {
+void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& parent_, Data::EntryPtr entry_, bool format_) const {
   TQDomElement entryElem = dom_.createElement(TQString::tqfromLatin1("entry"));
   entryElem.setAttribute(TQString::tqfromLatin1("id"), entry_->id());
 
@@ -333,10 +333,10 @@ void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& tqpar
     }
   } // end field loop
 
-  tqparent_.appendChild(entryElem);
+  parent_.appendChild(entryElem);
 }
 
-void TellicoXMLExporter::exportImageXML(TQDomDocument& dom_, TQDomElement& tqparent_, const TQString& id_) const {
+void TellicoXMLExporter::exportImageXML(TQDomDocument& dom_, TQDomElement& parent_, const TQString& id_) const {
   if(id_.isEmpty()) {
     myDebug() << "TellicoXMLExporter::exportImageXML() - empty image!" << endl;
     return;
@@ -374,10 +374,10 @@ void TellicoXMLExporter::exportImageXML(TQDomDocument& dom_, TQDomElement& tqpar
       imgElem.setAttribute(TQString::tqfromLatin1("link"), TQString::tqfromLatin1("true"));
     }
   }
-  tqparent_.appendChild(imgElem);
+  parent_.appendChild(imgElem);
 }
 
-void TellicoXMLExporter::exportGroupXML(TQDomDocument& dom_, TQDomElement& tqparent_) const {
+void TellicoXMLExporter::exportGroupXML(TQDomDocument& dom_, TQDomElement& parent_) const {
   Data::EntryVec vec = entries(); // need a copy for ::tqcontains();
   bool exportAll = collection()->entries().count() == vec.count();
   // iterate over each group, which are the first tqchildren
@@ -398,12 +398,12 @@ void TellicoXMLExporter::exportGroupXML(TQDomDocument& dom_, TQDomElement& tqpar
       groupElem.appendChild(entryRefElem);
     }
     if(groupElem.hasChildNodes()) {
-      tqparent_.appendChild(groupElem);
+      parent_.appendChild(groupElem);
     }
   }
 }
 
-void TellicoXMLExporter::exportFilterXML(TQDomDocument& dom_, TQDomElement& tqparent_, FilterPtr filter_) const {
+void TellicoXMLExporter::exportFilterXML(TQDomDocument& dom_, TQDomElement& parent_, FilterPtr filter_) const {
   TQDomElement filterElem = dom_.createElement(TQString::tqfromLatin1("filter"));
   filterElem.setAttribute(TQString::tqfromLatin1("name"), filter_->name());
 
@@ -439,17 +439,17 @@ void TellicoXMLExporter::exportFilterXML(TQDomDocument& dom_, TQDomElement& tqpa
     filterElem.appendChild(ruleElem);
   }
 
-  tqparent_.appendChild(filterElem);
+  parent_.appendChild(filterElem);
 }
 
-void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& tqparent_,
+void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& parent_,
                                            Data::BorrowerPtr borrower_) const {
   if(borrower_->isEmpty()) {
     return;
   }
 
   TQDomElement bElem = dom_.createElement(TQString::tqfromLatin1("borrower"));
-  tqparent_.appendChild(bElem);
+  parent_.appendChild(bElem);
 
   bElem.setAttribute(TQString::tqfromLatin1("name"), borrower_->name());
   bElem.setAttribute(TQString::tqfromLatin1("uid"), borrower_->uid());
@@ -471,12 +471,12 @@ void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& tq
   }
 }
 
-TQWidget* TellicoXMLExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* TellicoXMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("Tellico XML Options"), m_widget);
diff --git a/src/translators/xsltexporter.cpp b/src/translators/xsltexporter.cpp
index 09636f2..e797f7e 100644
--- a/src/translators/xsltexporter.cpp
+++ b/src/translators/xsltexporter.cpp
@@ -58,12 +58,12 @@ bool XSLTExporter::exec() {
                                    options() & ExportUTF8, options() & Export::ExportForce);
 }
 
-TQWidget* XSLTExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) {
+TQWidget* XSLTExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("XSLT Options"), m_widget);
diff --git a/src/translators/xsltimporter.cpp b/src/translators/xsltimporter.cpp
index 62f7255..eb4cd2a 100644
--- a/src/translators/xsltimporter.cpp
+++ b/src/translators/xsltimporter.cpp
@@ -86,13 +86,13 @@ Tellico::Data::CollPtr XSLTImporter::collection() {
   return m_coll;
 }
 
-TQWidget* XSLTImporter::widget(TQWidget* tqparent_, const char* name_) {
+TQWidget* XSLTImporter::widget(TQWidget* parent_, const char* name_) {
   // if the url has already been set, then there's no widget
   if(!m_xsltURL.isEmpty()) {
     return 0;
   }
 
-  m_widget = new TQWidget(tqparent_, name_);
+  m_widget = new TQWidget(parent_, name_);
   TQVBoxLayout* l = new TQVBoxLayout(m_widget);
 
   TQGroupBox* box = new TQGroupBox(1, Qt::Vertical, i18n("XSLT Options"), m_widget);