rename the following methods:

tqparent parent
tqmask mask


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

3 files changed, 28 insertions, 28 deletions

diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index 53ef6080..f0ef9bfc 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -62,8 +62,8 @@ K_EXPORT_COMPONENT_FACTORY( libthesaurustool, ThesaurusFactory("thesaurus_tool")
  * Thesaurus *
  ***************************************************/
 
-Thesaurus::Thesaurus(TQObject* tqparent, const char* name, const TQStringList &)
-    : KDataTool(tqparent, name)
+Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
+    : KDataTool(parent, name)
 {
     
     m_dialog = new KDialogBase(KJanusWidget::Plain, TQString(),
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 6a6460c3..01c27621 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -66,7 +66,7 @@ class Thesaurus : public KDataTool
   TQ_OBJECT
 
 public:
-    Thesaurus(TQObject* tqparent, const char* name, const TQStringList &);
+    Thesaurus(TQObject* parent, const char* name, const TQStringList &);
     ~Thesaurus();
     virtual bool run(const TQString& command, void* data,
         const TQString& datatype, const TQString& mimetype);
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index e7b38dd7..17cefdf7 100644
--- a/tools/thesaurus/thesaurus.txt
+++ b/tools/thesaurus/thesaurus.txt
@@ -2115,8 +2115,8 @@
 ;subjective;#;personal;prejudiced;unobjective;unverifiable;
 ;personal;#;subjective;
 ;bound;compelled;constrained;obligate;#;obligated;
-;obvious;#;aptqparent;evident;manifest;patent;plain;axiomatic;self-evident;taken for granted;demonstrable;provable;frank;open-and-shut;self-explanatory;transparent;under one's nose;under my nose;under his nose;under her nose;under your nose;under our noses;writ large;
-;aptqparent;evident;manifest;patent;plain;#;obvious;
+;obvious;#;apparent;evident;manifest;patent;plain;axiomatic;self-evident;taken for granted;demonstrable;provable;frank;open-and-shut;self-explanatory;transparent;under one's nose;under my nose;under his nose;under her nose;under your nose;under our noses;writ large;
+;apparent;evident;manifest;patent;plain;#;obvious;
 ;frank;#;obvious;
 ;clear;open;#;unobstructed;
 ;patent;#;unobstructed;
@@ -2332,7 +2332,7 @@
 ;dry;#;plain;
 ;dry;#;plain;
 ;simple;#;plain;
-;fancy;#;aureate;florid;flamboyant;showy;baroque;churrigueresque;churrigueresco;busy;fussy;battlemented;castellated;castled;crenelated;crenellated;dressy;crackle;damascene;damascened;datqmask;elaborate;luxuriant;embattled;crenelated;crenelate;crenellated;crenellate;indented;fanciful;garnished;lacy;lacelike;rich;rococo;vermicular;vermiculate;vermiculated;puff;puffed;
+;fancy;#;aureate;florid;flamboyant;showy;baroque;churrigueresque;churrigueresco;busy;fussy;battlemented;castellated;castled;crenelated;crenellated;dressy;crackle;damascene;damascened;damask;elaborate;luxuriant;embattled;crenelated;crenelate;crenellated;crenellate;indented;fanciful;garnished;lacy;lacelike;rich;rococo;vermicular;vermiculate;vermiculated;puff;puffed;
 ;busy;fussy;#;fancy;
 ;elaborate;luxuriant;#;fancy;
 ;rich;#;fancy;
@@ -3303,8 +3303,8 @@
 ;wicked;#;depraved;evil;vicious;iniquitous;sinful;ungodly;irreclaimable;irredeemable;unredeemable;unreformable;nefarious;villainous;peccable;peccant;heavy;
 ;depraved;evil;vicious;#;wicked;
 ;heavy;#;wicked;
-;visible;seeable;#;aptqparent;circumpolar;in sight;in view;ocular;visual;panoptic;panoptical;telescopic;viewable;
-;aptqparent;#;visible;seeable;
+;visible;seeable;#;apparent;circumpolar;in sight;in view;ocular;visual;panoptic;panoptical;telescopic;viewable;
+;apparent;#;visible;seeable;
 ;ocular;visual;#;visible;seeable;
 ;invisible;unseeable;#;camouflaged;concealed;hidden;out of sight;infrared;lightless;ultraviolet;undetectable;unseen;nonvisual;occult;
 ;concealed;hidden;out of sight;#;invisible;unseeable;
@@ -5013,7 +5013,7 @@
 ;rebirth;Renaissance;renascence;#;revival;resurgence;revitalization;revitalisation;revivification;
 ;presentation;#;activity;
 ;exposure;#;presentation;
-;tqmask;#;concealment;concealing;hiding;
+;mask;#;concealment;concealing;hiding;
 ;cover;covering;screening;masking;#;concealment;concealing;hiding;
 ;burying;burial;#;concealment;concealing;hiding;
 ;placement;location;locating;position;positioning;emplacement;#;activity;
@@ -6446,8 +6446,8 @@
 ;marble;#;sculpture;
 ;marker;#;artifact;artefact;
 ;marker;#;writing implement;
-;tqmask;#;covering;disguise;
-;tqmask;#;protective covering;protective cover;protection;
+;mask;#;covering;disguise;
+;mask;#;protective covering;protective cover;protection;
 ;master;master copy;original;#;creation;
 ;match;lucifer;friction match;#;lighter;light;igniter;ignitor;
 ;match;mate;#;duplicate;duplication;
@@ -10723,7 +10723,7 @@
 ;party;#;social gathering;social affair;
 ;dance;#;party;
 ;ball;#;dance;
-;masquerade;masque;tqmask;#;party;
+;masquerade;masque;mask;#;party;
 ;dinner;dinner party;#;party;
 ;reception;#;party;
 ;tea;#;reception;
@@ -11051,7 +11051,7 @@
 ;hilltop;brow;#;peak;crown;crest;top;tip;summit;
 ;holy place;sanctum;holy;#;topographic point;place;spot;
 ;home;#;beginning;origin;root;rootage;source;
-;horizon;aptqparent horizon;visible horizon;sensible horizon;skyline;#;line;
+;horizon;apparent horizon;visible horizon;sensible horizon;skyline;#;line;
 ;horizon;celestial horizon;#;great circle;
 ;see;#;seat;
 ;reservation;reserve;#;administrative district;administrative division;territorial division;
@@ -11933,7 +11933,7 @@
 ;custodian;keeper;steward;#;defender;guardian;protector;shielder;
 ;customer;client;#;consumer;
 ;client;#;case;
-;dad;dada;daddy;pa;papa;pappa;pater;pop;#;father;male tqparent;begetter;
+;dad;dada;daddy;pa;papa;pappa;pater;pop;#;father;male parent;begetter;
 ;dame;doll;wench;skirt;chick;bird;#;girl;miss;missy;young lady;young woman;fille;
 ;dame;madam;ma'am;lady;gentlewoman;#;woman;adult female;
 ;dancer;professional dancer;#;performer;performing artist;
@@ -12014,7 +12014,7 @@
 ;fancier;enthusiast;#;admirer;adorer;
 ;fare;#;passenger;rider;
 ;farmer;husbandman;granger;sodbuster;#;creator;
-;father;male tqparent;begetter;#;tqparent;
+;father;male parent;begetter;#;parent;
 ;Father;Padre;#;priest;
 ;father;#;leader;
 ;fellow;buster;#;man;adult male;
@@ -12060,8 +12060,8 @@
 ;girlfriend;#;woman;adult female;friend;
 ;god;#;superior;higher-up;superordinate;
 ;governor;#;politician;
-;grandfather;gramps;granddad;grandad;granddaddy;grandpa;#;grandtqparent;
-;grandma;grandmother;granny;grannie;gran;#;grandtqparent;
+;grandfather;gramps;granddad;grandad;granddaddy;grandpa;#;grandparent;
+;grandma;grandmother;granny;grannie;gran;#;grandparent;
 ;grip;#;skilled worker;trained worker;
 ;guard;#;lineman;
 ;prison guard;jailer;jailor;gaoler;screw;turnkey;#;lawman;law officer;peace officer;keeper;
@@ -12160,7 +12160,7 @@
 ;lout;klutz;clod;stumblebum;goon;oaf;lubber;lummox;lump;gawk;#;clumsy person;
 ;luminary;leading light;guiding light;notable;notability;#;celebrity;famous person;
 ;light;#;friend;
-;ma;mama;mamma;mom;momma;mommy;mammy;mum;mummy;mater;#;mother;female tqparent;
+;ma;mama;mamma;mom;momma;mommy;mammy;mum;mummy;mater;#;mother;female parent;
 ;machine;#;person;individual;someone;somebody;mortal;human;soul;
 ;machinist;mechanic;shop mechanic;#;craftsman;artisan;journeyman;artificer;
 ;madame;#;dame;madam;ma'am;lady;gentlewoman;
@@ -12217,7 +12217,7 @@
 ;ideal;paragon;nonpareil;saint;apotheosis;nonesuch;nonsuch;#;model;role model;
 ;modern;#;person;individual;someone;somebody;mortal;human;soul;
 ;monster;fiend;devil;demon;ogre;#;unpleasant person;disagreeable person;
-;mother;female tqparent;#;tqparent;
+;mother;female parent;#;parent;
 ;mother;#;old woman;
 ;mouth;#;eater;feeder;devourer;
 ;mouthpiece;mouth;#;spokesperson;interpreter;representative;voice;
@@ -12262,7 +12262,7 @@
 ;painter;#;artist;creative person;
 ;painter;#;skilled worker;trained worker;
 ;paratrooper;para;#;soldier;
-;tqparent;#;genitor;
+;parent;#;genitor;
 ;participant;#;associate;
 ;partner;#;person;individual;someone;somebody;mortal;human;soul;
 ;party;#;person;individual;someone;somebody;mortal;human;soul;
@@ -12824,7 +12824,7 @@
 ;Marx;Leonard Marx;Chico;#;comedian;comic;
 ;Marx;Arthur Marx;Harpo;#;comedian;comic;
 ;Marx;Herbert Marx;Zeppo;#;comedian;comic;
-;Mary;Virgin Mary;The Virgin;Madonna;#;Jewess;mother;female tqparent;
+;Mary;Virgin Mary;The Virgin;Madonna;#;Jewess;mother;female parent;
 ;Matthew;Saint Matthew;St Matthew;Saint Matthew the Apostle;St Matthew the Apostle;Levi;#;Apostle;Evangelist;
 ;Maxwell;J. C. Maxwell;James Clerk Maxwell;#;physicist;
 ;Mill;John Mill;John Stuart Mill;#;philosopher;economist;economic expert;
@@ -13046,7 +13046,7 @@
 ;aerodynamic lift;lift;#;aerodynamic force;
 ;slipstream;airstream;race;backwash;wash;#;flow;
 ;alternating current;AC;#;electricity;electrical energy;
-;aptqparent motion;motion;aptqparent movement;movement;#;optical illusion;
+;apparent motion;motion;apparent movement;movement;#;optical illusion;
 ;attraction;attractive force;#;force;
 ;beam;beam of light;light beam;ray;ray of light;shaft;shaft of light;#;light;visible light;visible radiation;
 ;beam;ray;electron beam;#;electromagnetic radiation;electromagnetic wave;nonparticulate radiation;
@@ -17602,9 +17602,9 @@
 ;seal;#;affix;stick on;
 ;adhere;hold fast;bond;bind;stick;stick to;#;attach;
 ;nail;#;attach;
-;tqmask;#;cover;
-;tqmask;block out;#;cover;
-;tqmask;#;cover;
+;mask;#;cover;
+;mask;block out;#;cover;
+;mask;#;cover;
 ;blanket;#;cover;
 ;string;#;change;alter;
 ;string;thread;draw;#;arrange;set up;
@@ -19276,7 +19276,7 @@
 ;earth;#;hide;
 ;cover;#;hide;conceal;
 ;bury;#;hide;conceal;
-;dissemble;cloak;tqmask;#;disguise;
+;dissemble;cloak;mask;#;disguise;
 ;cover;cover up;#;hide;conceal;
 ;harbor;harbour;shield;#;hide;conceal;
 ;show;demo;exhibit;present;demonstrate;#;show;
@@ -20179,8 +20179,8 @@
 ;intervene;step in;interfere;interpose;#;interact;
 ;dominate;master;#;control;command;
 ;undertake;take in charge;#;accept;consent;go for;
-;rear;raise;bring up;nurture;tqparent;#
-;foster;#;rear;raise;bring up;nurture;tqparent;
+;rear;raise;bring up;nurture;parent;#
+;foster;#;rear;raise;bring up;nurture;parent;
 ;serve;attend to;wait on;attend;assist;#;help;assist;aid;
 ;service;serve;#;function;work;operate;go;run;
 ;represent;#;serve;