rename the following methods:

tqparent parent
tqmask mask


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

27 files changed, 49 insertions, 49 deletions

diff --git a/src/translators/alexandriaimporter.h b/src/translators/alexandriaimporter.h
index 9bec25d..7ac5162 100644
--- a/src/translators/alexandriaimporter.h
+++ b/src/translators/alexandriaimporter.h
@@ -50,7 +50,7 @@ public:
   virtual Data::CollPtr collection();
   /**
    */
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual bool canImport(int type) const;
 
 public slots:
diff --git a/src/translators/audiofileimporter.h b/src/translators/audiofileimporter.h
index 5733860..a02e2bc 100644
--- a/src/translators/audiofileimporter.h
+++ b/src/translators/audiofileimporter.h
@@ -45,7 +45,7 @@ public:
   virtual Data::CollPtr collection();
   /**
    */
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual bool canImport(int type) const;
 
 public slots:
diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp
index d51e061..2135c67 100644
--- a/src/translators/bibtexexporter.cpp
+++ b/src/translators/bibtexexporter.cpp
@@ -191,7 +191,7 @@ bool BibtexExporter::exec() {
 }
 
 TQWidget* BibtexExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/bibtexexporter.h b/src/translators/bibtexexporter.h
index b626e88..ea7189c 100644
--- a/src/translators/bibtexexporter.h
+++ b/src/translators/bibtexexporter.h
@@ -40,7 +40,7 @@ public:
   virtual TQString formatString() const;
   virtual TQString fileFilter() const;
 
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual void readOptions(KConfig*);
   virtual void saveOptions(KConfig*);
 
diff --git a/src/translators/bibteximporter.h b/src/translators/bibteximporter.h
index e0d248c..4d9fe2b 100644
--- a/src/translators/bibteximporter.h
+++ b/src/translators/bibteximporter.h
@@ -64,7 +64,7 @@ public:
    * @return A pointer to a @ref BibtexCollection, or 0 if none can be created.
    */
   virtual Data::CollPtr collection();
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual bool canImport(int type) const;
 
 public slots:
diff --git a/src/translators/btparse/err.h b/src/translators/btparse/err.h
index a9ba6da..d16615d 100644
--- a/src/translators/btparse/err.h
+++ b/src/translators/btparse/err.h
@@ -61,13 +61,13 @@
  * hidden and does not need to be saved during a "save state" operation
  */
 /* maximum of 32 bits/unsigned int and must be 8 bits/byte */
-static SetWordType bittqmask[] = {
+static SetWordType bitmask[] = {
         0x00000001, 0x00000002, 0x00000004, 0x00000008,
         0x00000010, 0x00000020, 0x00000040, 0x00000080
 };
 
 void
-zzresynch(SetWordType *wd,SetWordType tqmask)
+zzresynch(SetWordType *wd,SetWordType mask)
 {
         static int consumed = 1;
 
@@ -77,10 +77,10 @@ zzresynch(SetWordType *wd,SetWordType tqmask)
         if ( !consumed ) {zzCONSUME; return;}
 
         /* if current token is in resynch set, we've got what we wanted */
-        if ( wd[LA(1)]&tqmask || LA(1) == zzEOF_TOKEN ) {consumed=0; return;}
+        if ( wd[LA(1)]&mask || LA(1) == zzEOF_TOKEN ) {consumed=0; return;}
 
         /* scan until we find something in the resynch set */
-        while ( !(wd[LA(1)]&tqmask) && LA(1) != zzEOF_TOKEN ) {zzCONSUME;}
+        while ( !(wd[LA(1)]&mask) && LA(1) != zzEOF_TOKEN ) {zzCONSUME;}
         consumed=1;
 }
 
@@ -237,11 +237,11 @@ zzedecode(SetWordType *a)
         if ( zzset_deg(a)>1 ) fprintf(stderr, " {");
         do {
                 register SetWordType t = *p;
-                register SetWordType *b = &(bittqmask[0]);
+                register SetWordType *b = &(bitmask[0]);
                 do {
                         if ( t & *b ) fprintf(stderr, " %s", zztokens[e]);
                         e++;
-                } while (++b < &(bittqmask[sizeof(SetWordType)*8]));
+                } while (++b < &(bitmask[sizeof(SetWordType)*8]));
         } while (++p < endp);
         if ( zzset_deg(a)>1 ) fprintf(stderr, " }");
 }
@@ -271,7 +271,7 @@ zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok, int k, cha
 int
 zzset_el(unsigned b, SetWordType *p)
 {
-        return( p[BSETDIVWORD(b)] & bittqmask[BSETMODWORD(b)] );
+        return( p[BSETDIVWORD(b)] & bitmask[BSETMODWORD(b)] );
 }
 
 int
@@ -289,10 +289,10 @@ zzset_deg(SetWordType *a)
         while ( p < endp )
         {
                 register SetWordType t = *p;
-                register SetWordType *b = &(bittqmask[0]);
+                register SetWordType *b = &(bitmask[0]);
                 do {
                         if (t & *b) ++degree;
-                } while (++b < &(bittqmask[sizeof(SetWordType)*8]));
+                } while (++b < &(bitmask[sizeof(SetWordType)*8]));
                 p++;
         }
 
diff --git a/src/translators/btparse/input.c b/src/translators/btparse/input.c
index 03668af..dbb7b44 100644
--- a/src/translators/btparse/input.c
+++ b/src/translators/btparse/input.c
@@ -174,7 +174,7 @@ finish_parse (int **err_counts)
 static boolean
 parse_status (int *saved_counts)
 {
-   ushort        ignore_etqmask;
+   ushort        ignore_emask;
 
    /* 
     * This bit-twiddling fetches the error status (which has a bit
@@ -182,9 +182,9 @@ parse_status (int *saved_counts)
     * to get "true" if there were any serious errors, and then 
     * returns the opposite of that.
     */
-   ignore_etqmask =
+   ignore_emask =
       (1<<BTERR_NOTIFY) | (1<<BTERR_CONTENT) | (1<<BTERR_LEXWARN);
-   return !(bt_error_status (saved_counts) & ~ignore_etqmask);
+   return !(bt_error_status (saved_counts) & ~ignore_emask);
 }   
 
 
@@ -237,7 +237,7 @@ AST * bt_parse_entry_s (char *    entry_text,
       return NULL;
    }
 
-   zzast_sp = ZZAST_STACKSIZE;          /* workaround aptqparent pccts bug */
+   zzast_sp = ZZAST_STACKSIZE;          /* workaround apparent pccts bug */
    start_parse (NULL, entry_text, line);
 
    entry (&entry_ast);                  /* enter the parser */
@@ -364,7 +364,7 @@ AST * bt_parse_entry (FILE *    infile,
     * functions?
     */
 
-   zzast_sp = ZZAST_STACKSIZE;          /* workaround aptqparent pccts bug */
+   zzast_sp = ZZAST_STACKSIZE;          /* workaround apparent pccts bug */
 
 #if defined(LL_K) || defined(ZZINF_LOOK) || defined(DEMAND_LOOK)
 # error One of LL_K, ZZINF_LOOK, or DEMAND_LOOK was defined
diff --git a/src/translators/btparse/lex_auxiliary.c b/src/translators/btparse/lex_auxiliary.c
index 097fcb6..8fac463 100644
--- a/src/translators/btparse/lex_auxiliary.c
+++ b/src/translators/btparse/lex_auxiliary.c
@@ -115,7 +115,7 @@ static int     JunkCount;               /* non-whitespace chars at toplevel */
  *     mismatch -- this determines which character ('"' or '}') can 
  *     actually end the string
  *   StringStart:
- *     line on which current string started; if we detect an aptqparent
+ *     line on which current string started; if we detect an apparent
  *     runaway, this is used to report where the runaway started
  *   ApparentRunaway:
  *     flags if we have already detected (and warned) that the current
diff --git a/src/translators/btparse/parse_auxiliary.c b/src/translators/btparse/parse_auxiliary.c
index 401e322..6284e6a 100644
--- a/src/translators/btparse/parse_auxiliary.c
+++ b/src/translators/btparse/parse_auxiliary.c
@@ -36,7 +36,7 @@ GEN_PRIVATE_ERRFUNC (syntax_error, (char * fmt, ...),
 
 
 /* this is stolen from PCCTS' err.h */
-static SetWordType bittqmask[] = 
+static SetWordType bitmask[] = 
 {
     0x00000001, 0x00000002, 0x00000004, 0x00000008,
     0x00000010, 0x00000020, 0x00000040, 0x00000080
@@ -115,7 +115,7 @@ append_token_set (char *msg, SetWordType *a)
    do 
    {
       SetWordType t = *p;
-      SetWordType *b = &(bittqmask[0]);
+      SetWordType *b = &(bitmask[0]);
       do
       {
          if (t & *b)
@@ -128,7 +128,7 @@ append_token_set (char *msg, SetWordType *a)
                strcat (msg, " or ");
          }
          e++;
-      } while (++b < &(bittqmask[sizeof(SetWordType)*8]));
+      } while (++b < &(bitmask[sizeof(SetWordType)*8]));
    } while (++p < endp);
 }
 
diff --git a/src/translators/btparse/postprocess.c b/src/translators/btparse/postprocess.c
index ad8c764..692e084 100644
--- a/src/translators/btparse/postprocess.c
+++ b/src/translators/btparse/postprocess.c
@@ -168,7 +168,7 @@ bt_postprocess_string (char * s, ushort options)
 @CREATED    : 1997/01/10, GPW
 @MODIFIED   : 1997/08/25, GPW: renamed from bt_postprocess_field(), and changed
                                to take the head of a list of simple values,
-                               rather than the tqparent of that list
+                               rather than the parent of that list
 -------------------------------------------------------------------------- */
 char *
 bt_postprocess_value (AST * value, ushort options, boolean replace)
@@ -418,7 +418,7 @@ bt_postprocess_value (AST * value, ushort options, boolean replace)
 @RETURNS    : 
 @DESCRIPTION: Postprocesses all the strings in a single "field = value"
               assignment subtree.  Just checks that 'field' does indeed
-              point to an BTAST_FIELD node (presumably the tqparent of a list
+              point to an BTAST_FIELD node (presumably the parent of a list
               of simple values), downcases the field name, and calls
               bt_postprocess_value() on the value.
 @GLOBALS    : 
diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp
index 6936ef0..d4831b3 100644
--- a/src/translators/csvexporter.cpp
+++ b/src/translators/csvexporter.cpp
@@ -99,7 +99,7 @@ bool CSVExporter::exec() {
 }
 
 TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/csvexporter.h b/src/translators/csvexporter.h
index ee300cf..77b5e6b 100644
--- a/src/translators/csvexporter.h
+++ b/src/translators/csvexporter.h
@@ -40,7 +40,7 @@ public:
   virtual TQString formatString() const;
   virtual TQString fileFilter() const;
 
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual void readOptions(KConfig* config);
   virtual void saveOptions(KConfig* config);
 
diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp
index 532fbcf..cf233bd 100644
--- a/src/translators/csvimporter.cpp
+++ b/src/translators/csvimporter.cpp
@@ -211,7 +211,7 @@ Tellico::Data::CollPtr CSVImporter::collection() {
 }
 
 TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/csvimporter.h b/src/translators/csvimporter.h
index d12f3c0..9cadf92 100644
--- a/src/translators/csvimporter.h
+++ b/src/translators/csvimporter.h
@@ -56,7 +56,7 @@ public:
   virtual Data::CollPtr collection();
   /**
    */
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
 
   virtual bool validImport() const;
 
diff --git a/src/translators/exporter.h b/src/translators/exporter.h
index 3085609..0f7b55f 100644
--- a/src/translators/exporter.h
+++ b/src/translators/exporter.h
@@ -74,7 +74,7 @@ public:
    */
   virtual void reset() {}
 
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0) = 0;
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0) = 0;
   virtual void readOptions(KConfig*) {}
   virtual void saveOptions(KConfig*) {}
 
diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp
index fa864b6..8a13ed3 100644
--- a/src/translators/freedbimporter.cpp
+++ b/src/translators/freedbimporter.cpp
@@ -505,7 +505,7 @@ TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
 
   // cddb cache stuff
   m_buttonGroup = new TQButtonGroup(m_widget);
-  m_buttonGroup->hide(); // only use as button tqparent
+  m_buttonGroup->hide(); // only use as button parent
   m_buttonGroup->setExclusive(true);
   m_buttonGroup->insert(m_radioCDROM);
   m_buttonGroup->insert(m_radioCache);
diff --git a/src/translators/freedbimporter.h b/src/translators/freedbimporter.h
index 22003ee..22c7036 100644
--- a/src/translators/freedbimporter.h
+++ b/src/translators/freedbimporter.h
@@ -45,7 +45,7 @@ public:
   virtual Data::CollPtr collection();
   /**
    */
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual bool canImport(int type) const;
 
 public slots:
diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp
index 8ea2218..333ebfd 100644
--- a/src/translators/htmlexporter.cpp
+++ b/src/translators/htmlexporter.cpp
@@ -455,7 +455,7 @@ void HTMLExporter::writeImages(Data::CollPtr coll_) {
 }
 
 TQWidget* HTMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/htmlexporter.h b/src/translators/htmlexporter.h
index 421d09e..0f7371d 100644
--- a/src/translators/htmlexporter.h
+++ b/src/translators/htmlexporter.h
@@ -52,7 +52,7 @@ public:
   virtual TQString formatString() const;
   virtual TQString fileFilter() const;
 
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual void readOptions(KConfig*);
   virtual void saveOptions(KConfig*);
 
diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp
index e0d0de3..65b85ee 100644
--- a/src/translators/onixexporter.cpp
+++ b/src/translators/onixexporter.cpp
@@ -166,7 +166,7 @@ TQString ONIXExporter::text() {
 }
 
 TQWidget* ONIXExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp
index f5ec13b..a4f2e72 100644
--- a/src/translators/pilotdbexporter.cpp
+++ b/src/translators/pilotdbexporter.cpp
@@ -200,7 +200,7 @@ bool PilotDBExporter::exec() {
 }
 
 TQWidget* PilotDBExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/pilotdbexporter.h b/src/translators/pilotdbexporter.h
index 8b3e4b2..f827e2c 100644
--- a/src/translators/pilotdbexporter.h
+++ b/src/translators/pilotdbexporter.h
@@ -37,7 +37,7 @@ public:
   virtual TQString formatString() const;
   virtual TQString fileFilter() const;
 
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   virtual void readOptions(KConfig* cfg);
   virtual void saveOptions(KConfig* cfg);
 
diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp
index 9d9d033..221a11b 100644
--- a/src/translators/tellicoxmlexporter.cpp
+++ b/src/translators/tellicoxmlexporter.cpp
@@ -262,7 +262,7 @@ void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& paren
 
     // if multiple versions are allowed, split them into separate elements
     if(fIt->flags() & Data::Field::AllowMultiple) {
-      // tqparent element if field contains multiple values, child of entryElem
+      // parent element if field contains multiple values, child of entryElem
       // who cares about grammar, just add an 's' to the name
       TQDomElement parElem = dom_.createElement(fieldName + 's');
       entryElem.appendChild(parElem);
@@ -472,7 +472,7 @@ void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& pa
 }
 
 TQWidget* TellicoXMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/tellicoxmlexporter.h b/src/translators/tellicoxmlexporter.h
index 1fe4f43..666bdde 100644
--- a/src/translators/tellicoxmlexporter.h
+++ b/src/translators/tellicoxmlexporter.h
@@ -59,13 +59,13 @@ public:
   static const unsigned syntaxVersion;
 
 private:
-  void exportCollectionXML(TQDomDocument& doc, TQDomElement& tqparent, bool format) const;
-  void exportFieldXML(TQDomDocument& doc, TQDomElement& tqparent, Data::FieldPtr field) const;
-  void exportEntryXML(TQDomDocument& doc, TQDomElement& tqparent, Data::EntryPtr entry, bool format) const;
-  void exportImageXML(TQDomDocument& doc, TQDomElement& tqparent, const TQString& imageID) const;
-  void exportGroupXML(TQDomDocument& doc, TQDomElement& tqparent) const;
-  void exportFilterXML(TQDomDocument& doc, TQDomElement& tqparent, FilterPtr filter) const;
-  void exportBorrowerXML(TQDomDocument& doc, TQDomElement& tqparent, Data::BorrowerPtr borrower) const;
+  void exportCollectionXML(TQDomDocument& doc, TQDomElement& parent, bool format) const;
+  void exportFieldXML(TQDomDocument& doc, TQDomElement& parent, Data::FieldPtr field) const;
+  void exportEntryXML(TQDomDocument& doc, TQDomElement& parent, Data::EntryPtr entry, bool format) const;
+  void exportImageXML(TQDomDocument& doc, TQDomElement& parent, const TQString& imageID) const;
+  void exportGroupXML(TQDomDocument& doc, TQDomElement& parent) const;
+  void exportFilterXML(TQDomDocument& doc, TQDomElement& parent, FilterPtr filter) const;
+  void exportBorrowerXML(TQDomDocument& doc, TQDomElement& parent, Data::BorrowerPtr borrower) const;
 
   // keep track of which images were written, since some entries could have same image
   mutable StringSet m_images;
diff --git a/src/translators/xsltexporter.cpp b/src/translators/xsltexporter.cpp
index e797f7e..f7151fd 100644
--- a/src/translators/xsltexporter.cpp
+++ b/src/translators/xsltexporter.cpp
@@ -59,7 +59,7 @@ bool XSLTExporter::exec() {
 }
 
 TQWidget* XSLTExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
-  if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) {
+  if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) {
     return m_widget;
   }
 
diff --git a/src/translators/xsltexporter.h b/src/translators/xsltexporter.h
index 2a626f2..b14afd3 100644
--- a/src/translators/xsltexporter.h
+++ b/src/translators/xsltexporter.h
@@ -32,7 +32,7 @@ public:
   virtual TQString formatString() const;
   virtual TQString fileFilter() const;
 
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
 
 private:
   TQWidget* m_widget;
diff --git a/src/translators/xsltimporter.h b/src/translators/xsltimporter.h
index 16aa6d2..25357de 100644
--- a/src/translators/xsltimporter.h
+++ b/src/translators/xsltimporter.h
@@ -41,7 +41,7 @@ public:
   virtual Data::CollPtr collection();
   /**
    */
-  virtual TQWidget* widget(TQWidget* tqparent, const char* name=0);
+  virtual TQWidget* widget(TQWidget* parent, const char* name=0);
   void setXSLTURL(const KURL& url) { m_xsltURL = url; }
 
 private: