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

33 files changed, 146 insertions, 146 deletions

diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp
index fee207a..e67bba6 100644
--- a/src/fetch/amazonfetcher.cpp
+++ b/src/fetch/amazonfetcher.cpp
@@ -82,8 +82,8 @@ const AmazonFetcher::SiteData& AmazonFetcher::siteData(int site_) {
   return dataVector[site_];
 }
 
-AmazonFetcher::AmazonFetcher(Site site_, TQObject* tqparent_, const char* name_)
-    : Fetcher(tqparent_, name_), m_xsltHandler(0), m_site(site_), m_imageSize(MediumImage),
+AmazonFetcher::AmazonFetcher(Site site_, TQObject* parent_, const char* name_)
+    : Fetcher(parent_, name_), m_xsltHandler(0), m_site(site_), m_imageSize(MediumImage),
       m_access(TQString::tqfromLatin1(AMAZON_ACCESS_KEY)),
       m_assoc(TQString::tqfromLatin1(AMAZON_ASSOC_TOKEN)), m_addLinkField(true), m_limit(AMAZON_MAX_RETURNS_TOTAL),
       m_countOffset(0), m_page(1), m_total(-1), m_numResults(0), m_job(0), m_started(false) {
@@ -397,7 +397,7 @@ void AmazonFetcher::slotComplete(KIO::Job* job_) {
         }
         // for some reason, Amazon will return an error simply when a valid ISBN is not found
         // I really want to ignore that, so check the IsValid element in the Request element
-        TQDomNode isValidNode = n.tqparentNode().namedItem(TQString::tqfromLatin1("IsValid"));
+        TQDomNode isValidNode = n.parentNode().namedItem(TQString::tqfromLatin1("IsValid"));
         if(m_key == ISBN && isValidNode.toElement().text().lower() == Latin1Literal("true")) {
           continue;
         }
@@ -793,7 +793,7 @@ void AmazonFetcher::updateEntry(Data::EntryPtr entry_) {
 
 void AmazonFetcher::parseTitle(Data::EntryPtr entry, int collType) {
   Q_UNUSED(collType);
-  // assume that everything in brackets or tqparentheses is extra
+  // assume that everything in brackets or parentheses is extra
   TQRegExp rx(TQString::tqfromLatin1("[\\(\\[](.*)[\\)\\]]"));
   rx.setMinimal(true);
   TQString title = entry->field(TQString::tqfromLatin1("title"));
@@ -834,12 +834,12 @@ bool AmazonFetcher::parseTitleToken(Data::EntryPtr entry, const TQString& token)
   return res;
 }
 
-Tellico::Fetch::ConfigWidget* AmazonFetcher::configWidget(TQWidget* tqparent_) const {
-  return new AmazonFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* AmazonFetcher::configWidget(TQWidget* parent_) const {
+  return new AmazonFetcher::ConfigWidget(parent_, this);
 }
 
-AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const AmazonFetcher* fetcher_/*=0*/)
-    : Fetch::ConfigWidget(tqparent_) {
+AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher* fetcher_/*=0*/)
+    : Fetch::ConfigWidget(parent_) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2);
   l->setSpacing(4);
   l->setColStretch(1, 10);
diff --git a/src/fetch/amazonfetcher.h b/src/fetch/amazonfetcher.h
index ed7b97a..cf7b1fb 100644
--- a/src/fetch/amazonfetcher.h
+++ b/src/fetch/amazonfetcher.h
@@ -141,7 +141,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-  ConfigWidget(TQWidget* tqparent_, const AmazonFetcher* fetcher = 0);
+  ConfigWidget(TQWidget* parent_, const AmazonFetcher* fetcher = 0);
 
   virtual void saveConfig(KConfigGroup& config);
   virtual TQString preferredName() const;
diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp
index 3a93281..393313a 100644
--- a/src/fetch/animenfofetcher.cpp
+++ b/src/fetch/animenfofetcher.cpp
@@ -39,8 +39,8 @@ namespace {
 
 using Tellico::Fetch::AnimeNfoFetcher;
 
-AnimeNfoFetcher::AnimeNfoFetcher(TQObject* tqparent_, const char* name_ /*=0*/)
-    : Fetcher(tqparent_, name_), m_started(false) {
+AnimeNfoFetcher::AnimeNfoFetcher(TQObject* parent_, const char* name_ /*=0*/)
+    : Fetcher(parent_, name_), m_started(false) {
 }
 
 TQString AnimeNfoFetcher::defaultName() {
@@ -360,12 +360,12 @@ void AnimeNfoFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* AnimeNfoFetcher::configWidget(TQWidget* tqparent_) const {
-  return new AnimeNfoFetcher::ConfigWidget(tqparent_);
+Tellico::Fetch::ConfigWidget* AnimeNfoFetcher::configWidget(TQWidget* parent_) const {
+  return new AnimeNfoFetcher::ConfigWidget(parent_);
 }
 
-AnimeNfoFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_)
-    : Fetch::ConfigWidget(tqparent_) {
+AnimeNfoFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/animenfofetcher.h b/src/fetch/animenfofetcher.h
index df43b87..ead205e 100644
--- a/src/fetch/animenfofetcher.h
+++ b/src/fetch/animenfofetcher.h
@@ -57,7 +57,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_);
+    ConfigWidget(TQWidget* parent_);
     virtual void saveConfig(KConfigGroup&) {}
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp
index b176d88..6586d94 100644
--- a/src/fetch/arxivfetcher.cpp
+++ b/src/fetch/arxivfetcher.cpp
@@ -40,8 +40,8 @@ namespace {
 
 using Tellico::Fetch::ArxivFetcher;
 
-ArxivFetcher::ArxivFetcher(TQObject* tqparent_)
-    : Fetcher(tqparent_), m_xsltHandler(0), m_start(0), m_job(0), m_started(false) {
+ArxivFetcher::ArxivFetcher(TQObject* parent_)
+    : Fetcher(parent_), m_xsltHandler(0), m_start(0), m_job(0), m_started(false) {
 }
 
 ArxivFetcher::~ArxivFetcher() {
@@ -345,12 +345,12 @@ void ArxivFetcher::updateEntrySynchronous(Data::EntryPtr entry) {
   }
 }
 
-Tellico::Fetch::ConfigWidget* ArxivFetcher::configWidget(TQWidget* tqparent_) const {
-  return new ArxivFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* ArxivFetcher::configWidget(TQWidget* parent_) const {
+  return new ArxivFetcher::ConfigWidget(parent_, this);
 }
 
-ArxivFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const ArxivFetcher*)
-    : Fetch::ConfigWidget(tqparent_) {
+ArxivFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ArxivFetcher*)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/arxivfetcher.h b/src/fetch/arxivfetcher.h
index be64c0e..2afcf43 100644
--- a/src/fetch/arxivfetcher.h
+++ b/src/fetch/arxivfetcher.h
@@ -59,7 +59,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const ArxivFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const ArxivFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup& config);
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/bibsonomyfetcher.cpp b/src/fetch/bibsonomyfetcher.cpp
index b2e7d2e..a6fd18a 100644
--- a/src/fetch/bibsonomyfetcher.cpp
+++ b/src/fetch/bibsonomyfetcher.cpp
@@ -35,8 +35,8 @@ namespace {
 
 using Tellico::Fetch::BibsonomyFetcher;
 
-BibsonomyFetcher::BibsonomyFetcher(TQObject* tqparent_)
-    : Fetcher(tqparent_), m_job(0), m_started(false) {
+BibsonomyFetcher::BibsonomyFetcher(TQObject* parent_)
+    : Fetcher(parent_), m_job(0), m_started(false) {
 }
 
 BibsonomyFetcher::~BibsonomyFetcher() {
@@ -188,12 +188,12 @@ void BibsonomyFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* BibsonomyFetcher::configWidget(TQWidget* tqparent_) const {
-  return new BibsonomyFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* BibsonomyFetcher::configWidget(TQWidget* parent_) const {
+  return new BibsonomyFetcher::ConfigWidget(parent_, this);
 }
 
-BibsonomyFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const BibsonomyFetcher*)
-    : Fetch::ConfigWidget(tqparent_) {
+BibsonomyFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const BibsonomyFetcher*)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/bibsonomyfetcher.h b/src/fetch/bibsonomyfetcher.h
index 530e286..133c309 100644
--- a/src/fetch/bibsonomyfetcher.h
+++ b/src/fetch/bibsonomyfetcher.h
@@ -54,7 +54,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const BibsonomyFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const BibsonomyFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup& config);
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/citebasefetcher.cpp b/src/fetch/citebasefetcher.cpp
index 177530c..744950e 100644
--- a/src/fetch/citebasefetcher.cpp
+++ b/src/fetch/citebasefetcher.cpp
@@ -36,8 +36,8 @@ namespace {
 
 using Tellico::Fetch::CitebaseFetcher;
 
-CitebaseFetcher::CitebaseFetcher(TQObject* tqparent_)
-    : Fetcher(tqparent_), m_job(0), m_started(false) {
+CitebaseFetcher::CitebaseFetcher(TQObject* parent_)
+    : Fetcher(parent_), m_job(0), m_started(false) {
 }
 
 CitebaseFetcher::~CitebaseFetcher() {
@@ -227,12 +227,12 @@ void CitebaseFetcher::updateEntrySynchronous(Data::EntryPtr entry) {
   }
 }
 
-Tellico::Fetch::ConfigWidget* CitebaseFetcher::configWidget(TQWidget* tqparent_) const {
-  return new CitebaseFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* CitebaseFetcher::configWidget(TQWidget* parent_) const {
+  return new CitebaseFetcher::ConfigWidget(parent_, this);
 }
 
-CitebaseFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const CitebaseFetcher*)
-    : Fetch::ConfigWidget(tqparent_) {
+CitebaseFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CitebaseFetcher*)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/citebasefetcher.h b/src/fetch/citebasefetcher.h
index b91433b..ffafc2e 100644
--- a/src/fetch/citebasefetcher.h
+++ b/src/fetch/citebasefetcher.h
@@ -55,7 +55,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const CitebaseFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const CitebaseFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup& config);
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp
index 3ceeea3..97ff608 100644
--- a/src/fetch/configwidget.cpp
+++ b/src/fetch/configwidget.cpp
@@ -22,7 +22,7 @@
 
 using Tellico::Fetch::ConfigWidget;
 
-ConfigWidget::ConfigWidget(TQWidget* tqparent_) : TQWidget(tqparent_), m_modified(false), m_accepted(false) {
+ConfigWidget::ConfigWidget(TQWidget* parent_) : TQWidget(parent_), m_modified(false), m_accepted(false) {
   TQHBoxLayout* boxLayout = new TQHBoxLayout(this);
   boxLayout->setSpacing(10);
 
diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp
index 6840e6d..2969e60 100644
--- a/src/fetch/crossreffetcher.cpp
+++ b/src/fetch/crossreffetcher.cpp
@@ -44,8 +44,8 @@ namespace {
 
 using Tellico::Fetch::CrossRefFetcher;
 
-CrossRefFetcher::CrossRefFetcher(TQObject* tqparent_)
-    : Fetcher(tqparent_), m_xsltHandler(0), m_job(0), m_started(false) {
+CrossRefFetcher::CrossRefFetcher(TQObject* parent_)
+    : Fetcher(parent_), m_xsltHandler(0), m_job(0), m_started(false) {
 }
 
 CrossRefFetcher::~CrossRefFetcher() {
@@ -326,12 +326,12 @@ void CrossRefFetcher::updateEntrySynchronous(Data::EntryPtr entry) {
   }
 }
 
-Tellico::Fetch::ConfigWidget* CrossRefFetcher::configWidget(TQWidget* tqparent_) const {
-  return new CrossRefFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* CrossRefFetcher::configWidget(TQWidget* parent_) const {
+  return new CrossRefFetcher::ConfigWidget(parent_, this);
 }
 
-CrossRefFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const CrossRefFetcher* fetcher_)
-    : Fetch::ConfigWidget(tqparent_) {
+CrossRefFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CrossRefFetcher* fetcher_)
+    : Fetch::ConfigWidget(parent_) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2);
   l->setSpacing(4);
   l->setColStretch(1, 10);
diff --git a/src/fetch/crossreffetcher.h b/src/fetch/crossreffetcher.h
index 7b502c6..8852358 100644
--- a/src/fetch/crossreffetcher.h
+++ b/src/fetch/crossreffetcher.h
@@ -60,7 +60,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const CrossRefFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const CrossRefFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup& config);
     virtual TQString preferredName() const;
   private:
diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp
index a92219a..b569940 100644
--- a/src/fetch/discogsfetcher.cpp
+++ b/src/fetch/discogsfetcher.cpp
@@ -42,8 +42,8 @@ namespace {
 
 using Tellico::Fetch::DiscogsFetcher;
 
-DiscogsFetcher::DiscogsFetcher(TQObject* tqparent_, const char* name_)
-    : Fetcher(tqparent_, name_), m_xsltHandler(0),
+DiscogsFetcher::DiscogsFetcher(TQObject* parent_, const char* name_)
+    : Fetcher(parent_, name_), m_xsltHandler(0),
       m_limit(DISCOGS_MAX_RETURNS_TOTAL), m_job(0), m_started(false),
       m_apiKey(TQString::tqfromLatin1(DISCOGS_API_KEY)) {
 }
@@ -342,12 +342,12 @@ void DiscogsFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* DiscogsFetcher::configWidget(TQWidget* tqparent_) const {
-  return new DiscogsFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* DiscogsFetcher::configWidget(TQWidget* parent_) const {
+  return new DiscogsFetcher::ConfigWidget(parent_, this);
 }
 
-DiscogsFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const DiscogsFetcher* fetcher_)
-    : Fetch::ConfigWidget(tqparent_) {
+DiscogsFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const DiscogsFetcher* fetcher_)
+    : Fetch::ConfigWidget(parent_) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 2, 2);
   l->setSpacing(4);
   l->setColStretch(1, 10);
diff --git a/src/fetch/discogsfetcher.h b/src/fetch/discogsfetcher.h
index cddb0b1..2c30465 100644
--- a/src/fetch/discogsfetcher.h
+++ b/src/fetch/discogsfetcher.h
@@ -76,7 +76,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const DiscogsFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const DiscogsFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup&);
     virtual TQString preferredName() const;
   private:
diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp
index 83fee42..99f01f1 100644
--- a/src/fetch/entrezfetcher.cpp
+++ b/src/fetch/entrezfetcher.cpp
@@ -45,7 +45,7 @@ namespace {
 
 using Tellico::Fetch::EntrezFetcher;
 
-EntrezFetcher::EntrezFetcher(TQObject* tqparent_, const char* name_) : Fetcher(tqparent_, name_), m_xsltHandler(0),
+EntrezFetcher::EntrezFetcher(TQObject* parent_, const char* name_) : Fetcher(parent_, name_), m_xsltHandler(0),
     m_step(Begin), m_started(false) {
 }
 
@@ -463,12 +463,12 @@ void EntrezFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* EntrezFetcher::configWidget(TQWidget* tqparent_) const {
-  return new EntrezFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* EntrezFetcher::configWidget(TQWidget* parent_) const {
+  return new EntrezFetcher::ConfigWidget(parent_, this);
 }
 
-EntrezFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const EntrezFetcher* fetcher_/*=0*/)
-    : Fetch::ConfigWidget(tqparent_) {
+EntrezFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const EntrezFetcher* fetcher_/*=0*/)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/entrezfetcher.h b/src/fetch/entrezfetcher.h
index bd94fdc..bc8af9f 100644
--- a/src/fetch/entrezfetcher.h
+++ b/src/fetch/entrezfetcher.h
@@ -63,7 +63,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const EntrezFetcher* fetcher=0);
+    ConfigWidget(TQWidget* parent_, const EntrezFetcher* fetcher=0);
     virtual void saveConfig(KConfigGroup& config);
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp
index 88f8cd5..3c11c20 100644
--- a/src/fetch/execexternalfetcher.cpp
+++ b/src/fetch/execexternalfetcher.cpp
@@ -70,7 +70,7 @@ TQStringList ExecExternalFetcher::parseArguments(const TQString& str_) {
   return args;
 }
 
-ExecExternalFetcher::ExecExternalFetcher(TQObject* tqparent_, const char* name_/*=0*/) : Fetcher(tqparent_, name_),
+ExecExternalFetcher::ExecExternalFetcher(TQObject* parent_, const char* name_/*=0*/) : Fetcher(parent_, name_),
     m_started(false), m_collType(-1), m_formatType(-1), m_canUpdate(false), m_process(0), m_deleteOnRemove(false) {
 }
 
@@ -331,12 +331,12 @@ void ExecExternalFetcher::updateEntry(Data::EntryPtr entry_) {
   startSearch(args);
 }
 
-Tellico::Fetch::ConfigWidget* ExecExternalFetcher::configWidget(TQWidget* tqparent_) const {
-  return new ExecExternalFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* ExecExternalFetcher::configWidget(TQWidget* parent_) const {
+  return new ExecExternalFetcher::ConfigWidget(parent_, this);
 }
 
-ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const ExecExternalFetcher* fetcher_/*=0*/)
-    : Fetch::ConfigWidget(tqparent_), m_deleteOnRemove(false) {
+ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExternalFetcher* fetcher_/*=0*/)
+    : Fetch::ConfigWidget(parent_), m_deleteOnRemove(false) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 5, 2);
   l->setSpacing(4);
   l->setColStretch(1, 10);
diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp
index f7bc4c3..e0b176c 100644
--- a/src/fetch/fetchmanager.cpp
+++ b/src/fetch/fetchmanager.cpp
@@ -463,32 +463,32 @@ Tellico::Fetch::TypePairList Manager::typeList() {
 
 
 // called when creating a new fetcher
-Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* tqparent_, Type type_, const TQString& name_) {
+Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* parent_, Type type_, const TQString& name_) {
   ConfigWidget* w = 0;
   switch(type_) {
 #ifdef AMAZON_SUPPORT
     case Amazon:
-      w = new AmazonFetcher::ConfigWidget(tqparent_);
+      w = new AmazonFetcher::ConfigWidget(parent_);
       break;
 #endif
 #ifdef IMDB_SUPPORT
     case IMDB:
-      w = new IMDBFetcher::ConfigWidget(tqparent_);
+      w = new IMDBFetcher::ConfigWidget(parent_);
       break;
 #endif
 #ifdef HAVE_YAZ
     case Z3950:
-      w = new Z3950Fetcher::ConfigWidget(tqparent_);
+      w = new Z3950Fetcher::ConfigWidget(parent_);
       break;
 #endif
     case SRU:
-      w = new SRUConfigWidget(tqparent_);
+      w = new SRUConfigWidget(parent_);
       break;
     case Entrez:
-      w = new EntrezFetcher::ConfigWidget(tqparent_);
+      w = new EntrezFetcher::ConfigWidget(parent_);
       break;
     case ExecExternal:
-      w = new ExecExternalFetcher::ConfigWidget(tqparent_);
+      w = new ExecExternalFetcher::ConfigWidget(parent_);
       if(!name_.isEmpty() && m_scriptMap.tqcontains(name_)) {
         // bundledScriptHasExecPath() actually needs to write the exec path
         // back to the config so the configWidget can read it. But if the spec file
@@ -512,37 +512,37 @@ Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* tqparent_, Type ty
       }
       break;
     case Yahoo:
-      w = new YahooFetcher::ConfigWidget(tqparent_);
+      w = new YahooFetcher::ConfigWidget(parent_);
       break;
     case AnimeNfo:
-      w = new AnimeNfoFetcher::ConfigWidget(tqparent_);
+      w = new AnimeNfoFetcher::ConfigWidget(parent_);
       break;
     case IBS:
-      w = new IBSFetcher::ConfigWidget(tqparent_);
+      w = new IBSFetcher::ConfigWidget(parent_);
       break;
     case ISBNdb:
-      w = new ISBNdbFetcher::ConfigWidget(tqparent_);
+      w = new ISBNdbFetcher::ConfigWidget(parent_);
       break;
     case GCstarPlugin:
-      w = new GCstarPluginFetcher::ConfigWidget(tqparent_);
+      w = new GCstarPluginFetcher::ConfigWidget(parent_);
       break;
     case CrossRef:
-      w = new CrossRefFetcher::ConfigWidget(tqparent_);
+      w = new CrossRefFetcher::ConfigWidget(parent_);
       break;
     case Arxiv:
-      w = new ArxivFetcher::ConfigWidget(tqparent_);
+      w = new ArxivFetcher::ConfigWidget(parent_);
       break;
     case Citebase:
-      w = new CitebaseFetcher::ConfigWidget(tqparent_);
+      w = new CitebaseFetcher::ConfigWidget(parent_);
       break;
     case Bibsonomy:
-      w = new BibsonomyFetcher::ConfigWidget(tqparent_);
+      w = new BibsonomyFetcher::ConfigWidget(parent_);
       break;
     case GoogleScholar:
-      w = new GoogleScholarFetcher::ConfigWidget(tqparent_);
+      w = new GoogleScholarFetcher::ConfigWidget(parent_);
       break;
     case Discogs:
-      w = new DiscogsFetcher::ConfigWidget(tqparent_);
+      w = new DiscogsFetcher::ConfigWidget(parent_);
       break;
     case Unknown:
       kdWarning() << "Fetch::Manager::configWidget() - no widget defined for type = " << type_ << endl;
diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp
index 3129c78..d6d049c 100644
--- a/src/fetch/gcstarpluginfetcher.cpp
+++ b/src/fetch/gcstarpluginfetcher.cpp
@@ -178,7 +178,7 @@ TQString GCstarPluginFetcher::gcstarType(int collType_) {
   return TQString();
 }
 
-GCstarPluginFetcher::GCstarPluginFetcher(TQObject* tqparent_, const char* name_/*=0*/) : Fetcher(tqparent_, name_),
+GCstarPluginFetcher::GCstarPluginFetcher(TQObject* parent_, const char* name_/*=0*/) : Fetcher(parent_, name_),
     m_started(false), m_collType(-1), m_process(0) {
 }
 
@@ -383,12 +383,12 @@ void GCstarPluginFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* GCstarPluginFetcher::configWidget(TQWidget* tqparent_) const {
-  return new GCstarPluginFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* GCstarPluginFetcher::configWidget(TQWidget* parent_) const {
+  return new GCstarPluginFetcher::ConfigWidget(parent_, this);
 }
 
-GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const GCstarPluginFetcher* fetcher_/*=0*/)
-    : Fetch::ConfigWidget(tqparent_), m_needPluginList(true) {
+GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GCstarPluginFetcher* fetcher_/*=0*/)
+    : Fetch::ConfigWidget(parent_), m_needPluginList(true) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 3, 4);
   l->setSpacing(4);
   l->setColStretch(1, 10);
diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp
index 1d14043..d7773d2 100644
--- a/src/fetch/googlescholarfetcher.cpp
+++ b/src/fetch/googlescholarfetcher.cpp
@@ -34,8 +34,8 @@ namespace {
 
 using Tellico::Fetch::GoogleScholarFetcher;
 
-GoogleScholarFetcher::GoogleScholarFetcher(TQObject* tqparent_, const char* name_)
-    : Fetcher(tqparent_, name_),
+GoogleScholarFetcher::GoogleScholarFetcher(TQObject* parent_, const char* name_)
+    : Fetcher(parent_, name_),
       m_limit(GOOGLE_MAX_RETURNS_TOTAL), m_start(0), m_job(0), m_started(false),
       m_cookieIsSet(false) {
   m_bibtexRx = TQRegExp(TQString::tqfromLatin1("<a\\s.*href\\s*=\\s*\"([^>]*scholar\\.bib[^>]*)\""));
@@ -215,12 +215,12 @@ void GoogleScholarFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* GoogleScholarFetcher::configWidget(TQWidget* tqparent_) const {
-  return new GoogleScholarFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* GoogleScholarFetcher::configWidget(TQWidget* parent_) const {
+  return new GoogleScholarFetcher::ConfigWidget(parent_, this);
 }
 
-GoogleScholarFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const GoogleScholarFetcher*/*=0*/)
-    : Fetch::ConfigWidget(tqparent_) {
+GoogleScholarFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GoogleScholarFetcher*/*=0*/)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/googlescholarfetcher.h b/src/fetch/googlescholarfetcher.h
index 9391d1f..adc58f8 100644
--- a/src/fetch/googlescholarfetcher.h
+++ b/src/fetch/googlescholarfetcher.h
@@ -68,7 +68,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const GoogleScholarFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const GoogleScholarFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup&) {}
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp
index 855d2f0..734c431 100644
--- a/src/fetch/ibsfetcher.cpp
+++ b/src/fetch/ibsfetcher.cpp
@@ -39,8 +39,8 @@ namespace {
 
 using Tellico::Fetch::IBSFetcher;
 
-IBSFetcher::IBSFetcher(TQObject* tqparent_, const char* name_ /*=0*/)
-    : Fetcher(tqparent_, name_), m_started(false) {
+IBSFetcher::IBSFetcher(TQObject* parent_, const char* name_ /*=0*/)
+    : Fetcher(parent_, name_), m_started(false) {
 }
 
 TQString IBSFetcher::defaultName() {
@@ -397,12 +397,12 @@ void IBSFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* IBSFetcher::configWidget(TQWidget* tqparent_) const {
-  return new IBSFetcher::ConfigWidget(tqparent_);
+Tellico::Fetch::ConfigWidget* IBSFetcher::configWidget(TQWidget* parent_) const {
+  return new IBSFetcher::ConfigWidget(parent_);
 }
 
-IBSFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_)
-    : Fetch::ConfigWidget(tqparent_) {
+IBSFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/ibsfetcher.h b/src/fetch/ibsfetcher.h
index b607b3a..c2a588c 100644
--- a/src/fetch/ibsfetcher.h
+++ b/src/fetch/ibsfetcher.h
@@ -57,7 +57,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_);
+    ConfigWidget(TQWidget* parent_);
     virtual void saveConfig(KConfigGroup&) {}
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp
index 5db3a49..d70429f 100644
--- a/src/fetch/imdbfetcher.cpp
+++ b/src/fetch/imdbfetcher.cpp
@@ -74,7 +74,7 @@ void IMDBFetcher::initRegExps() {
   s_titleRx->setMinimal(true);
 }
 
-IMDBFetcher::IMDBFetcher(TQObject* tqparent_, const char* name_) : Fetcher(tqparent_, name_),
+IMDBFetcher::IMDBFetcher(TQObject* parent_, const char* name_) : Fetcher(parent_, name_),
     m_job(0), m_started(false), m_fetchImages(true), m_host(TQString::tqfromLatin1(IMDB_SERVER)),
     m_limit(IMDB_MAX_RESULTS), m_countOffset(0) {
   if(!s_tagRx) {
@@ -261,10 +261,10 @@ void IMDBFetcher::slotComplete(KIO::Job* job_) {
 void IMDBFetcher::parseSingleTitleResult() {
 //  myDebug() << "IMDBFetcher::parseSingleTitleResult()" << endl;
   s_titleRx->search(Tellico::decodeHTML(TQString(m_data)));
-  // split title at tqparenthesis
+  // split title at parenthesis
   const TQString cap1 = s_titleRx->cap(1);
   int pPos = cap1.tqfind('(');
-  // FIXME: maybe remove tqparentheses here?
+  // FIXME: maybe remove parentheses here?
   SearchResult* r = new SearchResult(this,
                                      pPos == -1 ? cap1 : cap1.left(pPos),
                                      pPos == -1 ? TQString() : cap1.mid(pPos),
@@ -344,11 +344,11 @@ void IMDBFetcher::parseTitleBlock(const TQString& str_) {
   int count = 0;
   int start = s_anchorTitleRx->search(str_);
   while(m_started && start > -1) {
-    // split title at tqparenthesis
+    // split title at parenthesis
     const TQString cap1 = s_anchorTitleRx->cap(1); // the anchor url
     const TQString cap2 = s_anchorTitleRx->cap(2).stripWhiteSpace(); // the anchor text
     start += s_anchorTitleRx->matchedLength();
-    int pPos = cap2.tqfind('('); // if it has tqparentheses, use that for description
+    int pPos = cap2.tqfind('('); // if it has parentheses, use that for description
     TQString desc;
     if(pPos > -1) {
       int pPos2 = cap2.tqfind(')', pPos+1);
@@ -356,7 +356,7 @@ void IMDBFetcher::parseTitleBlock(const TQString& str_) {
         desc = cap2.mid(pPos+1, pPos2-pPos-1);
       }
     } else {
-      // tqparenthesis might be outside anchor tag
+      // parenthesis might be outside anchor tag
       int end = s_anchorTitleRx->search(str_, start);
       if(end == -1) {
         end = str_.length();
@@ -434,7 +434,7 @@ void IMDBFetcher::parseSingleNameResult() {
     desc.truncate(0);
     bool isEpisode = false;
     len = s_anchorTitleRx->cap(0).length();
-    // split title at tqparenthesis
+    // split title at parenthesis
     const TQString cap2 = s_anchorTitleRx->cap(2).stripWhiteSpace();
     int pPos = cap2.tqfind('(');
     if(pPos > -1) {
@@ -479,7 +479,7 @@ void IMDBFetcher::parseSingleNameResult() {
       break;
     }
 
-    // FIXME: maybe remove tqparentheses here?
+    // FIXME: maybe remove parentheses here?
     SearchResult* r = new SearchResult(this, pPos == -1 ? cap2 : cap2.left(pPos), desc, TQString());
     KURL u(m_url, s_anchorTitleRx->cap(1)); // relative URL constructor
     u.setQuery(TQString());
@@ -528,7 +528,7 @@ void IMDBFetcher::parseMultipleNameResults() {
     while(pos > -1 && pos < end && m_matches.size() < m_limit) {
       KURL u(m_url, s_anchorNameRx->cap(1));
       s = s_anchorNameRx->cap(2).stripWhiteSpace() + ' ';
-      // if more than one exact, add tqparentheses
+      // if more than one exact, add parentheses
       if(nameMap.tqcontains(s) && nameMap[s] > 0) {
         // fix the first one that didn't have a number
         if(nameMap[s] == 1) {
@@ -700,7 +700,7 @@ Tellico::Data::EntryPtr IMDBFetcher::parseEntry(const TQString& str_) {
 void IMDBFetcher::doTitle(const TQString& str_, Data::EntryPtr entry_) {
   if(s_titleRx->search(str_) > -1) {
     const TQString cap1 = s_titleRx->cap(1);
-    // titles always have tqparentheses
+    // titles always have parentheses
     int pPos = cap1.tqfind('(');
     TQString title = cap1.left(pPos).stripWhiteSpace();
     // remove first and last quotes is there
@@ -708,7 +708,7 @@ void IMDBFetcher::doTitle(const TQString& str_, Data::EntryPtr entry_) {
       title = title.mid(1, title.length()-2);
     }
     entry_->setField(TQString::tqfromLatin1("title"), title);
-    // remove tqparenthesis
+    // remove parenthesis
     uint pPos2 = pPos+1;
     while(pPos2 < cap1.length() && cap1[pPos2].isDigit()) {
       ++pPos2;
@@ -1123,12 +1123,12 @@ void IMDBFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* IMDBFetcher::configWidget(TQWidget* tqparent_) const {
-  return new IMDBFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* IMDBFetcher::configWidget(TQWidget* parent_) const {
+  return new IMDBFetcher::ConfigWidget(parent_, this);
 }
 
-IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const IMDBFetcher* fetcher_/*=0*/)
-    : Fetch::ConfigWidget(tqparent_) {
+IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const IMDBFetcher* fetcher_/*=0*/)
+    : Fetch::ConfigWidget(parent_) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2);
   l->setSpacing(4);
   l->setColStretch(1, 10);
diff --git a/src/fetch/imdbfetcher.h b/src/fetch/imdbfetcher.h
index fd68b62..9b6b5ce 100644
--- a/src/fetch/imdbfetcher.h
+++ b/src/fetch/imdbfetcher.h
@@ -66,7 +66,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const IMDBFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const IMDBFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup& config);
     virtual TQString preferredName() const;
 
diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp
index 92fb084..3c6c093 100644
--- a/src/fetch/isbndbfetcher.cpp
+++ b/src/fetch/isbndbfetcher.cpp
@@ -39,8 +39,8 @@ namespace {
 
 using Tellico::Fetch::ISBNdbFetcher;
 
-ISBNdbFetcher::ISBNdbFetcher(TQObject* tqparent_, const char* name_)
-    : Fetcher(tqparent_, name_), m_xsltHandler(0),
+ISBNdbFetcher::ISBNdbFetcher(TQObject* parent_, const char* name_)
+    : Fetcher(parent_, name_), m_xsltHandler(0),
       m_limit(ISBNDB_MAX_RETURNS_TOTAL), m_page(1), m_total(-1), m_countOffset(0),
       m_job(0), m_started(false) {
 }
@@ -332,12 +332,12 @@ void ISBNdbFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* ISBNdbFetcher::configWidget(TQWidget* tqparent_) const {
-  return new ISBNdbFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* ISBNdbFetcher::configWidget(TQWidget* parent_) const {
+  return new ISBNdbFetcher::ConfigWidget(parent_, this);
 }
 
-ISBNdbFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const ISBNdbFetcher*/*=0*/)
-    : Fetch::ConfigWidget(tqparent_) {
+ISBNdbFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ISBNdbFetcher*/*=0*/)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/isbndbfetcher.h b/src/fetch/isbndbfetcher.h
index f5983b2..835f1c0 100644
--- a/src/fetch/isbndbfetcher.h
+++ b/src/fetch/isbndbfetcher.h
@@ -58,7 +58,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const ISBNdbFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const ISBNdbFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup&) {}
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp
index 96ca7d4..6719a53 100644
--- a/src/fetch/srufetcher.cpp
+++ b/src/fetch/srufetcher.cpp
@@ -51,12 +51,12 @@ namespace {
 using Tellico::Fetch::SRUFetcher;
 using Tellico::Fetch::SRUConfigWidget;
 
-SRUFetcher::SRUFetcher(TQObject* tqparent_, const char* name_)
-    : Fetcher(tqparent_, name_), m_job(0), m_MARCXMLHandler(0), m_MODSHandler(0), m_started(false) {
+SRUFetcher::SRUFetcher(TQObject* parent_, const char* name_)
+    : Fetcher(parent_, name_), m_job(0), m_MARCXMLHandler(0), m_MODSHandler(0), m_started(false) {
 }
 
 SRUFetcher::SRUFetcher(const TQString& name_, const TQString& host_, uint port_, const TQString& path_,
-                       TQObject* tqparent_) : Fetcher(tqparent_),
+                       TQObject* parent_) : Fetcher(parent_),
       m_host(host_), m_port(port_), m_path(path_),
       m_job(0), m_MARCXMLHandler(0), m_MODSHandler(0), m_started(false) {
   m_name = name_; // m_name is protected in super class
@@ -412,9 +412,9 @@ bool SRUFetcher::initMODSHandler() {
   return true;
 }
 
-Tellico::Fetch::Fetcher::Ptr SRUFetcher::libraryOfCongress(TQObject* tqparent_) {
+Tellico::Fetch::Fetcher::Ptr SRUFetcher::libraryOfCongress(TQObject* parent_) {
   return new SRUFetcher(i18n("Library of Congress (US)"), TQString::tqfromLatin1("z3950.loc.gov"), 7090,
-                        TQString::tqfromLatin1("voyager"), tqparent_);
+                        TQString::tqfromLatin1("voyager"), parent_);
 }
 
 // static
@@ -425,12 +425,12 @@ Tellico::StringMap SRUFetcher::customFields() {
   return map;
 }
 
-Tellico::Fetch::ConfigWidget* SRUFetcher::configWidget(TQWidget* tqparent_) const {
-  return new SRUConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* SRUFetcher::configWidget(TQWidget* parent_) const {
+  return new SRUConfigWidget(parent_, this);
 }
 
-SRUConfigWidget::SRUConfigWidget(TQWidget* tqparent_, const SRUFetcher* fetcher_ /*=0*/)
-    : ConfigWidget(tqparent_) {
+SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ /*=0*/)
+    : ConfigWidget(parent_) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2);
   l->setSpacing(4);
   l->setColStretch(1, 10);
diff --git a/src/fetch/srufetcher.h b/src/fetch/srufetcher.h
index d62b866..4e745dc 100644
--- a/src/fetch/srufetcher.h
+++ b/src/fetch/srufetcher.h
@@ -114,7 +114,7 @@ Q_OBJECT
 friend class SRUFetcher;
 
 public:
-  SRUConfigWidget(TQWidget* tqparent_, const SRUFetcher* fetcher = 0);
+  SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher = 0);
   virtual void saveConfig(KConfigGroup& config);
   virtual TQString preferredName() const;
 
diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp
index d625cad..6e74d60 100644
--- a/src/fetch/yahoofetcher.cpp
+++ b/src/fetch/yahoofetcher.cpp
@@ -40,8 +40,8 @@ namespace {
 
 using Tellico::Fetch::YahooFetcher;
 
-YahooFetcher::YahooFetcher(TQObject* tqparent_, const char* name_)
-    : Fetcher(tqparent_, name_), m_xsltHandler(0),
+YahooFetcher::YahooFetcher(TQObject* parent_, const char* name_)
+    : Fetcher(parent_, name_), m_xsltHandler(0),
       m_limit(YAHOO_MAX_RETURNS_TOTAL), m_job(0), m_started(false) {
 }
 
@@ -382,12 +382,12 @@ void YahooFetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* YahooFetcher::configWidget(TQWidget* tqparent_) const {
-  return new YahooFetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* YahooFetcher::configWidget(TQWidget* parent_) const {
+  return new YahooFetcher::ConfigWidget(parent_, this);
 }
 
-YahooFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const YahooFetcher*/*=0*/)
-    : Fetch::ConfigWidget(tqparent_) {
+YahooFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const YahooFetcher*/*=0*/)
+    : Fetch::ConfigWidget(parent_) {
   TQVBoxLayout* l = new TQVBoxLayout(optionsWidget());
   l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget()));
   l->addStretch();
diff --git a/src/fetch/yahoofetcher.h b/src/fetch/yahoofetcher.h
index d7b2082..1c295c8 100644
--- a/src/fetch/yahoofetcher.h
+++ b/src/fetch/yahoofetcher.h
@@ -69,7 +69,7 @@ public:
 
   class ConfigWidget : public Fetch::ConfigWidget {
   public:
-    ConfigWidget(TQWidget* tqparent_, const YahooFetcher* fetcher = 0);
+    ConfigWidget(TQWidget* parent_, const YahooFetcher* fetcher = 0);
     virtual void saveConfig(KConfigGroup&) {}
     virtual TQString preferredName() const;
   };
diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp
index 465df5c..d0bffa3 100644
--- a/src/fetch/z3950fetcher.cpp
+++ b/src/fetch/z3950fetcher.cpp
@@ -59,8 +59,8 @@ namespace {
 
 using Tellico::Fetch::Z3950Fetcher;
 
-Z3950Fetcher::Z3950Fetcher(TQObject* tqparent_, const char* name_)
-    : Fetcher(tqparent_, name_), m_conn(0), m_port(Z3950_DEFAULT_PORT), m_esn(Z3950_DEFAULT_ESN),
+Z3950Fetcher::Z3950Fetcher(TQObject* parent_, const char* name_)
+    : Fetcher(parent_, name_), m_conn(0), m_port(Z3950_DEFAULT_PORT), m_esn(Z3950_DEFAULT_ESN),
       m_started(false), m_done(true), m_MARC21XMLHandler(0),
       m_UNIMARCXMLHandler(0), m_MODSHandler(0) {
 }
@@ -503,12 +503,12 @@ void Z3950Fetcher::updateEntry(Data::EntryPtr entry_) {
   emit signalDone(this); // always need to emit this if not continuing with the search
 }
 
-Tellico::Fetch::ConfigWidget* Z3950Fetcher::configWidget(TQWidget* tqparent_) const {
-  return new Z3950Fetcher::ConfigWidget(tqparent_, this);
+Tellico::Fetch::ConfigWidget* Z3950Fetcher::configWidget(TQWidget* parent_) const {
+  return new Z3950Fetcher::ConfigWidget(parent_, this);
 }
 
-Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const Z3950Fetcher* fetcher_/*=0*/)
-    : Fetch::ConfigWidget(tqparent_) {
+Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* fetcher_/*=0*/)
+    : Fetch::ConfigWidget(parent_) {
   TQGridLayout* l = new TQGridLayout(optionsWidget(), 7, 2);
   l->setSpacing(4);
   l->setColStretch(1, 10);