Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

7 files changed, 146 insertions, 146 deletions

diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index 27e91426..2639301e 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -56,7 +56,7 @@ bool convert( const KURL & uIn, const TQString & /*inputFormat*/, const KURL & u
     manager->setBatchMode( batch );
 
     TQCString mime( outputFormat.latin1() );
-    KoFilter::ConversionStatus status = manager->exp0rt( uOut.path(), mime );
+    KoFilter::ConversiontqStatus status = manager->exp0rt( uOut.path(), mime );
     progressObj.slotProgress(-1);
 
     delete manager;
@@ -117,17 +117,17 @@ int main( int argc, char **argv )
         KMimeType::Ptr inputMimetype = KMimeType::findByURL( uIn );
         if ( inputMimetype->name() == KMimeType::defaultMimeType() )
         {
-            kdError() << i18n("Mimetype for input file %1 not found!").arg(uIn.prettyURL()) << endl;
+            kdError() << i18n("Mimetype for input file %1 not found!").tqarg(uIn.prettyURL()) << endl;
             return 1;
         }
         KMimeType::Ptr outputMimetype;
         if ( args->isSet("mimetype") )
         {
-            TQString mime = TQString::fromLatin1( args->getOption("mimetype") );
+            TQString mime = TQString::tqfromLatin1( args->getOption("mimetype") );
             outputMimetype = KMimeType::mimeType( mime );
             if ( outputMimetype->name() == KMimeType::defaultMimeType() )
             {
-                kdError() << i18n("Mimetype not found %1").arg(mime) << endl;
+                kdError() << i18n("Mimetype not found %1").tqarg(mime) << endl;
                 return 1;
             }
         }
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index b5c3d5d0..fc6ca9c3 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.cpp
+++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp
@@ -241,7 +241,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1,
 		int res = getNumber(txt, &pos);
 		if (pos >= len)
 			return;
-		switch (txt.at(pos).latin1()) {
+		switch (txt.tqat(pos).latin1()) {
 			case 'H':
 				hours = res;
 				break;
@@ -259,7 +259,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1,
 	}
 	hours += days * 24;
 	appendItem(group1, labelid,
-		   i18n("%1:%2.%3").arg(hours).arg(minutes, 2).arg(seconds,2 ));
+		   i18n("%1:%2.%3").tqarg(hours).tqarg(minutes, 2).tqarg(seconds,2 ));
 }
 
 void KOfficePlugin::getDateTime(KFileMetaInfoGroup group1,
@@ -336,7 +336,7 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
       if (node.isElement()){
 	appendItem(groupuser,
 		   node.toElement().attribute(metaname,
-					      TQString("User %1").arg(i)),
+					      TQString("User %1").tqarg(i)),
 		   node.toElement().text());
       }
     }
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc
index bc1f4c06..a7e74822 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cc
@@ -59,7 +59,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv)
 	}
 
 /* TODO: get selection(), not only clipboard!
-	TQClipboard *cb = TQApplication::clipboard();
+	TQClipboard *cb = TQApplication::tqclipboard();
 	TQString text = cb->text();
 	if( text.isNull() || text.length() > 50 ) {
 		// long texts are probably not supposed to be searched for
diff --git a/tools/spell/main.cc b/tools/spell/main.cc
index 4489aa4f..db6e3fa1 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cc
@@ -81,7 +81,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
         KConfig * config = instance()->config();
         TQCString gn( "KSpell " );
         gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...)
-        TQString groupName = TQString::fromLatin1( gn );
+        TQString groupName = TQString::tqfromLatin1( gn );
         //kdDebug() << "Group: " << groupName << endl;
         if ( config->hasGroup( groupName ) )
         {
@@ -114,7 +114,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
 #endif
 #if 0 //fixme
     // Call the spell checker
-    KSpell::spellStatus status=(KSpell::spellStatus)KSpell::modalCheck( buffer, &ksconfig );
+    KSpell::spelltqStatus status=(KSpell::spelltqStatus)KSpell::modalCheck( buffer, &ksconfig );
 
     if (status == KSpell::Error)
     {
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index 32271af8..573b907c 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -97,11 +97,11 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
     row1->addWidget(m_edit, 1);
     row1->addWidget(m_search, 0);
     m_back = new TQToolButton(m_page);
-    m_back->setIconSet(BarIconSet(TQString::fromLatin1("back")));
+    m_back->setIconSet(BarIconSet(TQString::tqfromLatin1("back")));
     TQToolTip::add(m_back, i18n("Back"));
     row1->addWidget(m_back, 0);
     m_forward = new TQToolButton(m_page);
-    m_forward->setIconSet(BarIconSet(TQString::fromLatin1("forward")));
+    m_forward->setIconSet(BarIconSet(TQString::tqfromLatin1("forward")));
     TQToolTip::add(m_forward, i18n("Forward"));
     row1->addWidget(m_forward, 0);
     m_lang = new KPushButton(i18n("Change Language..."), m_page);
@@ -302,7 +302,7 @@ void Thesaurus::setCaption()
 {
     KURL url = KURL();
     url.setPath(m_data_file);
-    m_dialog->setCaption(i18n("Related Words - %1").arg(url.fileName()));
+    m_dialog->setCaption(i18n("Related Words - %1").tqarg(url.fileName()));
 }
 
 // Enbale or disable back and forward button
@@ -429,7 +429,7 @@ void Thesaurus::thesExited(KProcess *)
 
     if( !m_thesproc_stderr.isEmpty() ) {
         KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute grep. "
-          "Output:<br>%1").arg(m_thesproc_stderr));
+          "Output:<br>%1").tqarg(m_thesproc_stderr));
         TQApplication::restoreOverrideCursor();
         return;
     }
@@ -590,10 +590,10 @@ void Thesaurus::findTermWordnet(const TQString &term)
     m_combobox->insertItem(i18n("Synonyms/Hypernyms - Ordered by Frequency"));
     m_combobox->insertItem(i18n("Synonyms - Ordered by Similarity of Meaning (verbs only)"));
     m_combobox->insertItem(i18n("Antonyms - Words with Opposite Meanings"));
-    m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").arg(m_edit->currentText()));
-    m_combobox->insertItem(i18n("Meronyms - %1 has a ...").arg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").tqarg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Meronyms - %1 has a ...").tqarg(m_edit->currentText()));
     // 5:
-    m_combobox->insertItem(i18n("Holonyms - ... has a %1").arg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Holonyms - ... has a %1").tqarg(m_edit->currentText()));
     m_combobox->insertItem(i18n("Attributes"));
     m_combobox->insertItem(i18n("Cause To (for some verbs only)"));
     m_combobox->insertItem(i18n("Verb Entailment (for some verbs only)"));
@@ -604,7 +604,7 @@ void Thesaurus::findTermWordnet(const TQString &term)
     m_combobox->insertItem(i18n("Overview of Senses"));
 
     /** NOT todo:
-      * -Hypernym tree: layout is difficult, you can get the same information
+      * -Hypernym tree: tqlayout is difficult, you can get the same information
       *  by following links
       * -Coordinate terms (sisters): just go to synset and then use hyponyms
       * -Has Part Meronyms, Has Substance Meronyms, Has Member Meronyms,
@@ -648,13 +648,13 @@ void Thesaurus::wnExited(KProcess *)
     
     if( !m_wnproc_stderr.isEmpty() ) {
         m_resultbox->setText(i18n("<b>Error:</b> Failed to execute WordNet program 'wn'. "
-          "Output:<br>%1").arg(m_wnproc_stderr));
+          "Output:<br>%1").tqarg(m_wnproc_stderr));
         TQApplication::restoreOverrideCursor();
         return;
     }
 
     if( m_wnproc_stdout.isEmpty() ) {
-        m_resultbox->setText(i18n("No match for '%1'.").arg(m_edit->currentText()));
+        m_resultbox->setText(i18n("No match for '%1'.").tqarg(m_edit->currentText()));
     } else {
         // render in a table, each line one row:
         TQStringList lines = lines.split(TQChar('\n'), m_wnproc_stdout, false);
@@ -677,7 +677,7 @@ void Thesaurus::wnExited(KProcess *)
             // TODO?: 
             // move "=>" in own column?
             l = formatLine(l);
-            // Table layout:
+            // Table tqlayout:
             result += "<tr>";
             if( l.startsWith(" ") ) {
                 result += "\t<td width=\"15\"></td>";
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index da01b2f2..01c27621 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqobject.h>
 #include <tqregexp.h>
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 #include <tqtabdialog.h>
 #include <tqtabwidget.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqtooltip.h>
 #include <tqwidget.h>
 #include <tqvbox.h>
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index 6f2f47ed..17cefdf7 100644
--- a/tools/thesaurus/thesaurus.txt
+++ b/tools/thesaurus/thesaurus.txt
@@ -1877,9 +1877,9 @@
 ;hushed;muted;subdued;quiet;#;soft;
 ;little;small;#;soft;
 ;low;low-toned;#;soft;
-;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-shaped;sounding;heavy;sonorous;
+;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-tqshaped;sounding;heavy;sonorous;
 ;rich;#;full;
-;orotund;rotund;round;pear-shaped;#;full;
+;orotund;rotund;round;pear-tqshaped;#;full;
 ;heavy;sonorous;#;full;
 ;thin;#;pale;
 ;pale;#;thin;
@@ -2701,10 +2701,10 @@
 ;sinful;unholy;wicked;#;unrighteous;
 ;cast-iron;iron;#;robust;
 ;decrepit;feeble;infirm;sapless;weak;weakly;#;frail;
-;round;circular;#;ball-shaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-shaped;orbiculate;orbicular;
-;ball-shaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular;
+;round;circular;#;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-tqshaped;orbiculate;orbicular;
+;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular;
 ;square;#;quadrate;right-angled;squared;squarish;
-;annular;annulate;annulated;circinate;circular;ringed;ring-shaped;#;rounded;
+;annular;annulate;annulated;circinate;circular;ringed;ring-tqshaped;#;rounded;
 ;rural;#;agrarian;agricultural;farming;agrestic;rustic;arcadian;bucolic;pastoral;rustic;campestral;countrified;countryfied;rustic;country;country-bred;country-style;country;cracker-barrel;folksy;homespun;frontier;hick;hobnailed;farm;
 ;agrarian;agricultural;farming;#;rural;
 ;urban;#;citified;cityfied;city-bred;city-born;urbanized;urbanised;
@@ -2853,9 +2853,9 @@
 ;noteworthy;remarkable;#;significant;important;
 ;operative;key;#;significant;important;
 ;light;#;insignificant;unimportant;
-;simple;unsubdivided;#;acerate;acerose;acicular;needle-shaped;needlelike;acuminate;apiculate;caudate;cordate;heart-shaped;cuneate;wedge-shaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-shaped;swordlike;bladelike;hastate;spearhead-shaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-shaped;peltate;shield-shaped;perfoliate;reniform;kidney-shaped;sagittate;sagittiform;arrow-shaped;spatulate;spatula-shaped;unlobed;
+;simple;unsubdivided;#;acerate;acerose;acicular;needle-tqshaped;needlelike;acuminate;apiculate;caudate;cordate;heart-tqshaped;cuneate;wedge-tqshaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-tqshaped;swordlike;bladelike;hastate;spearhead-tqshaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-tqshaped;peltate;shield-tqshaped;perfoliate;reniform;kidney-tqshaped;sagittate;sagittiform;arrow-tqshaped;spatulate;spatula-tqshaped;unlobed;
 ;linear;elongate;#;simple;unsubdivided;
-;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-shaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid;
+;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-tqshaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid;
 ;simple;#;elemental;ultimate;oversimplified;simplistic;simplex;simplified;unanalyzable;undecomposable;uncomplicated;unsophisticated;
 ;elemental;ultimate;#;simple;
 ;complex;#;analyzable;decomposable;Byzantine;convoluted;intricate;involved;knotty;labyrinthine;tangled;tortuous;colonial;compound;complicated;composite;compound;gordian;interlacing;interlinking;interlocking;interwoven;labyrinthine;labyrinthian;mazy;multifactorial;multiplex;thickening;
@@ -3897,7 +3897,7 @@
 ;motivation;motive;need;#;psychological feature;
 ;feeling;#;psychological feature;
 ;location;#;breathe;take a breath;respire;
-;shape;form;#;attribute;
+;tqshape;form;#;attribute;
 ;time;#;abstraction;
 ;space;#;abstraction;
 ;act;human action;human activity;#
@@ -4427,8 +4427,8 @@
 ;damage;harm;hurt;scathe;#;change of integrity;
 ;wound;wounding;#;damage;harm;hurt;scathe;
 ;burn;#;damage;harm;hurt;scathe;
-;fold;folding;#;change of shape;
-;protrusion;projection;jut;jutting;#;change of shape;
+;fold;folding;#;change of tqshape;
+;protrusion;projection;jut;jutting;#;change of tqshape;
 ;activity;#;act;human action;human activity;
 ;operation;#;activity;
 ;practice;pattern;#;activity;
@@ -4976,7 +4976,7 @@
 ;organization;organisation;arrangement;#;activity;
 ;order;ordering;#;organization;organisation;arrangement;
 ;succession;sequence;#;order;ordering;
-;layout;#;order;ordering;
+;tqlayout;#;order;ordering;
 ;listing;itemization;itemisation;#;organization;organisation;arrangement;
 ;grouping;#;activity;
 ;categorization;categorisation;classification;compartmentalization;compartmentalisation;#;grouping;
@@ -6268,7 +6268,7 @@
 ;horn;#;noisemaker;
 ;horror;#;thing;
 ;horse;#;gymnastic apparatus;exerciser;
-;horseshoe;shoe;U-shaped plate;#;plate;scale;shell;
+;horseshoe;shoe;U-tqshaped plate;#;plate;scale;shell;
 ;hospital;infirmary;#;medical building;health facility;
 ;hostel;hostelry;inn;lodge;#;hotel;
 ;hotel;#;building;edifice;
@@ -6471,7 +6471,7 @@
 ;microphone;mike;#;electro-acoustic transducer;
 ;military post;post;#;military installation;
 ;mill;grinder;#;machine;
-;miller;milling machine;#;shaper;shaping machine;
+;miller;milling machine;#;tqshaper;shaping machine;
 ;mine;#;explosive device;
 ;mine;#;excavation;hole in the ground;
 ;miniature;toy;#;copy;
@@ -7239,7 +7239,7 @@
 ;perspective;linear perspective;#;appearance;visual aspect;
 ;phase;#;appearance;visual aspect;
 ;format;#;appearance;visual aspect;
-;form;shape;cast;#;appearance;visual aspect;
+;form;tqshape;cast;#;appearance;visual aspect;
 ;persona;image;#;appearance;visual aspect;
 ;semblance;color;colour;#;appearance;visual aspect;
 ;face;#;appearance;visual aspect;
@@ -7569,7 +7569,7 @@
 ;beat;#;pace;rate;
 ;dispatch;despatch;expedition;expeditiousness;#;celerity;quickness;rapidity;
 ;haste;hastiness;hurry;hurriedness;#;speed;swiftness;fastness;
-;shape;form;configuration;contour;#;spatial property;spatiality;
+;tqshape;form;configuration;contour;#;spatial property;spatiality;
 ;symmetry;symmetricalness;correspondence;balance;#;spatial property;spatiality;
 ;tilt;list;inclination;lean;leaning;#;position;spatial relation;
 ;gradient;grade;slope;#;position;spatial relation;
@@ -7577,12 +7577,12 @@
 ;upgrade;rise;rising slope;#;grade;
 ;pitch;rake;slant;#;gradient;grade;slope;
 ;point;pointedness;#;taper;
-;curvature;curve;#;shape;form;configuration;contour;
+;curvature;curve;#;tqshape;form;configuration;contour;
 ;position;spatial relation;#;relation;
 ;placement;arrangement;#;position;spatial relation;
 ;composition;composing;#;placement;arrangement;
 ;proportion;balance;#;placement;arrangement;
-;true;#;alignment;
+;true;#;tqalignment;
 ;position;posture;attitude;#;bodily property;
 ;presentation;#;position;posture;attitude;
 ;guard;#;position;posture;attitude;
@@ -7779,8 +7779,8 @@
 ;tone;#;quality;
 ;resistance;#;unresponsiveness;
 ;body;organic structure;physical structure;#;natural object;
-;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure;
-;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh;
+;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure;
+;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh;
 ;body;dead body;#;natural object;
 ;cadaver;corpse;stiff;clay;remains;#;body;dead body;
 ;mummy;#;body;dead body;
@@ -7794,7 +7794,7 @@
 ;system;#;body part;
 ;sheath;case;#;covering;natural covering;cover;
 ;skin;tegument;cutis;#;connective tissue;body covering;
-;tube;tube-shaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure;
+;tube;tube-tqshaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;passage;passageway;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;orifice;opening;porta;#;passage;passageway;
 ;duct;canal;channel;#;passage;passageway;
@@ -7845,7 +7845,7 @@
 ;chamber;#;cavity;bodily cavity;cavum;
 ;valve;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;stomach;tummy;tum;breadbasket;#;internal organ;viscus;
-;vessel;vas;#;tube;tube-shaped structure;
+;vessel;vas;#;tube;tube-tqshaped structure;
 ;liquid body substance;bodily fluid;body fluid;humor;humour;#;body substance;
 ;juice;succus;#;liquid body substance;bodily fluid;body fluid;humor;humour;
 ;milk;#;liquid body substance;bodily fluid;body fluid;humor;humour;nutriment;nourishment;nutrition;sustenance;aliment;alimentation;victuals;
@@ -8314,7 +8314,7 @@
 ;concept;conception;construct;#;idea;thought;
 ;perception;#;conceptualization;conceptualisation;conceptuality;
 ;notion;#;concept;conception;construct;
-;layout;#;design;plan;
+;tqlayout;#;design;plan;
 ;redundancy;#;configuration;constellation;
 ;trap;snare;#;design;plan;
 ;idea;#;opinion;sentiment;persuasion;view;thought;
@@ -8457,9 +8457,9 @@
 ;percept;perception;perceptual experience;#;representation;mental representation;internal representation;
 ;figure;#;percept;perception;perceptual experience;
 ;ground;#;percept;perception;perceptual experience;
-;form;shape;pattern;#;structure;
-;mosaic;#;form;shape;pattern;
-;strand;#;form;shape;pattern;
+;form;tqshape;pattern;#;structure;
+;mosaic;#;form;tqshape;pattern;
+;strand;#;form;tqshape;pattern;
 ;sight;#;visual percept;visual image;
 ;view;aspect;prospect;scene;vista;panorama;#;visual percept;visual image;
 ;background;ground;#;view;aspect;prospect;scene;vista;panorama;
@@ -8479,7 +8479,7 @@
 ;appearance;#;representation;mental representation;internal representation;
 ;illusion;semblance;#;appearance;
 ;front;#;appearance;
-;shape;embodiment;#;concretism;concrete representation;
+;tqshape;embodiment;#;concretism;concrete representation;
 ;belief;#;content;cognitive content;mental object;
 ;conviction;strong belief;article of faith;#;belief;
 ;faith;trust;#;belief;
@@ -10440,7 +10440,7 @@
 ;shock;#;mass;
 ;shock;#;pile;heap;mound;cumulus;
 ;combination;#;collection;aggregation;accumulation;assemblage;
-;combination;#;alliance;coalition;alignment;alinement;
+;combination;#;alliance;coalition;tqalignment;alinement;
 ;body;#;gathering;assemblage;
 ;public;#;body;
 ;world;domain;#;class;social class;socio-economic class;
@@ -10605,7 +10605,7 @@
 ;tribe;federation of tribes;#;nation;
 ;state;nation;country;land;commonwealth;res publica;body politic;#;political unit;
 ;member;#;unit;social unit;
-;bloc;axis;#;alliance;coalition;alignment;alinement;
+;bloc;axis;#;alliance;coalition;tqalignment;alinement;
 ;Europe;#;collection;aggregation;accumulation;assemblage;
 ;Asia;#;collection;aggregation;accumulation;assemblage;
 ;European Union;EU;European Community;EC;European Economic Community;EEC;Common Market;Europe;#;world organization;international organization;
@@ -10766,7 +10766,7 @@
 ;fleet;#;steamship company;steamship line;
 ;fleet;#;collection;aggregation;accumulation;assemblage;
 ;fleet;#;collection;aggregation;accumulation;assemblage;
-;alliance;coalition;alignment;alinement;#;organization;organisation;
+;alliance;coalition;tqalignment;alinement;#;organization;organisation;
 ;United Nations;UN;#;world organization;international organization;
 ;International Monetary Fund;IMF;#;United Nations agency;UN agency;
 ;World Health Organization;WHO;#;United Nations agency;UN agency;
@@ -12048,7 +12048,7 @@
 ;general practitioner;GP;#;doctor;doc;physician;MD;Dr.;medico;
 ;geezer;bloke;#;man;adult male;
 ;general;full general;#;general officer;
-;generator;source;author;#;maker;shaper;
+;generator;source;author;#;maker;tqshaper;
 ;genius;mastermind;brain;#;intellectual;intellect;
 ;gentleman;#;man;adult male;
 ;ghostwriter;ghost;#;writer;author;
@@ -12170,7 +12170,7 @@
 ;mailman;postman;mail carrier;letter carrier;carrier;#;deliveryman;delivery boy;deliverer;
 ;major;#;commissioned military officer;
 ;major;#;student;pupil;educatee;
-;maker;shaper;#;creator;
+;maker;tqshaper;#;creator;
 ;male child;boy;#;male;male person;
 ;man;adult male;#;male;male person;
 ;man;#;male;male person;lover;
@@ -12178,7 +12178,7 @@
 ;man;#;person;individual;someone;somebody;mortal;human;soul;
 ;man;#;subordinate;subsidiary;underling;
 ;mannequin;manikin;mannikin;manakin;fashion model;model;#;assistant;helper;help;supporter;
-;manufacturer;producer;#;maker;shaper;
+;manufacturer;producer;#;maker;tqshaper;
 ;marauder;predator;vulture;#;attacker;aggressor;assailant;assaulter;
 ;Marine;devil dog;leatherneck;shipboard soldier;#;serviceman;military man;man;military personnel;
 ;marshal;marshall;#;lawman;law officer;peace officer;
@@ -13922,62 +13922,62 @@
 ;change;#;relation;
 ;difference;#;change;
 ;implication;logical implication;conditional relation;#;logical relation;
-;solid;#;shape;form;
-;plane;sheet;#;shape;form;
-;figure;#;shape;form;
-;line;#;shape;form;
+;solid;#;tqshape;form;
+;plane;sheet;#;tqshape;form;
+;figure;#;tqshape;form;
+;line;#;tqshape;form;
 ;cylinder;#;solid;
 ;heart;#;plane figure;two-dimensional figure;
-;curve;curved shape;#;line;
-;wave;#;curve;curved shape;
-;bend;crook;turn;#;curve;curved shape;
-;hook;crotchet;#;curve;curved shape;
-;envelope;#;curve;curved shape;
-;connection;connexion;link;#;shape;form;
+;curve;curved tqshape;#;line;
+;wave;#;curve;curved tqshape;
+;bend;crook;turn;#;curve;curved tqshape;
+;hook;crotchet;#;curve;curved tqshape;
+;envelope;#;curve;curved tqshape;
+;connection;connexion;link;#;tqshape;form;
 ;diameter;#;straight line;
-;pit;fossa;#;concave shape;concavity;cavity;bodily cavity;cavum;
-;recess;recession;niche;corner;#;concave shape;concavity;
+;pit;fossa;#;concave tqshape;concavity;cavity;bodily cavity;cavum;
+;recess;recession;niche;corner;#;concave tqshape;concavity;
 ;circle;#;ellipse;oval;
-;circle;#;shape;form;
+;circle;#;tqshape;form;
 ;chord;#;straight line;
 ;sector;#;plane figure;two-dimensional figure;
-;disk;disc;saucer;#;round shape;
+;disk;disc;saucer;#;round tqshape;
 ;ring;halo;annulus;anulus;doughnut;anchor ring;#;toroid;
-;loop;#;round shape;
-;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round shape;
+;loop;#;round tqshape;
+;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round tqshape;
 ;element;#;straight line;
 ;kink;twist;twirl;#;fold;crease;plication;flexure;crimp;bend;
 ;square;foursquare;#;rectangle;
-;triangle;trigon;trilateral;#;polygon;polygonal shape;
+;triangle;trigon;trilateral;#;polygon;polygonal tqshape;
 ;star;#;plane figure;two-dimensional figure;
 ;box;#;rectangle;
-;knot;gnarl;#;distorted shape;distortion;
-;arch;#;curve;curved shape;
-;bell;bell shape;campana;#;curve;curved shape;
+;knot;gnarl;#;distorted tqshape;distortion;
+;arch;#;curve;curved tqshape;
+;bell;bell tqshape;campana;#;curve;curved tqshape;
 ;angle;#;space;
 ;hour angle;HA;#;angular distance;
 ;dip;angle of dip;magnetic dip;magnetic inclination;inclination;#;angle;
 ;lead;#;angle;
-;bowl;trough;#;concave shape;concavity;
+;bowl;trough;#;concave tqshape;concavity;
 ;groove;channel;#;depression;impression;imprint;
-;scoop;pocket;#;concave shape;concavity;
-;node;knob;thickening;#;convex shape;convexity;
-;bow;arc;#;curve;curved shape;
-;depression;impression;imprint;#;concave shape;concavity;
+;scoop;pocket;#;concave tqshape;concavity;
+;node;knob;thickening;#;convex tqshape;convexity;
+;bow;arc;#;curve;curved tqshape;
+;depression;impression;imprint;#;concave tqshape;concavity;
 ;base;#;flank;
 ;balance;equilibrium;equipoise;counterbalance;#;structure;construction;
 ;symmetry;proportion;#;balance;equilibrium;equipoise;counterbalance;
-;sphere;#;round shape;
+;sphere;#;round tqshape;
 ;hemisphere;#;subfigure;
-;sphere;#;round shape;
+;sphere;#;round tqshape;
 ;ball;globe;orb;#;sphere;
-;cylinder;#;round shape;
-;column;tower;pillar;#;shape;form;
+;cylinder;#;round tqshape;
+;column;tower;pillar;#;tqshape;form;
 ;barrel;drum;#;cylinder;
 ;pipe;tube;#;cylinder;
-;drop;bead;pearl;#;round shape;
-;ridge;#;convex shape;convexity;
-;point;tip;peak;#;convex shape;convexity;
+;drop;bead;pearl;#;round tqshape;
+;ridge;#;convex tqshape;convexity;
+;point;tip;peak;#;convex tqshape;convexity;
 ;boundary;edge;bound;#;line;
 ;margin;border;perimeter;#;boundary;edge;bound;
 ;periphery;fringe;outer boundary;#;boundary;edge;bound;
@@ -13985,13 +13985,13 @@
 ;crown;peak;summit;#;upper bound;
 ;diagonal;bias;#;straight line;
 ;dip;#;depression;impression;imprint;
-;cup;#;concave shape;concavity;
+;cup;#;concave tqshape;concavity;
 ;incision;scratch;prick;slit;dent;#;depression;impression;imprint;
 ;score;scotch;#;incision;scratch;prick;slit;dent;
 ;wrinkle;furrow;crease;crinkle;seam;line;#;depression;impression;imprint;
 ;crevice;cranny;crack;fissure;chap;#;depression;impression;imprint;
-;fold;crease;plication;flexure;crimp;bend;#;angular shape;angularity;
-;space;#;amorphous shape;
+;fold;crease;plication;flexure;crimp;bend;#;angular tqshape;angularity;
+;space;#;amorphous tqshape;
 ;node;#;connection;connexion;link;
 ;articulation;join;joint;juncture;junction;#;connection;connexion;link;
 ;hole;#;space;
@@ -14005,7 +14005,7 @@
 ;block;cube;#;solid;
 ;tail;tail end;#;projection;
 ;tongue;knife;#;projection;
-;projection;#;convex shape;convexity;
+;projection;#;convex tqshape;convexity;
 ;medium;#;state;
 ;condition;#;state;
 ;condition;status;#;state;
@@ -14445,11 +14445,11 @@
 ;vulnerability;exposure;#;danger;
 ;tension;tensity;tenseness;tautness;#;condition;status;
 ;tonicity;tonus;tone;#;tension;tensity;tenseness;tautness;
-;condition;shape;#;good health;healthiness;
-;fitness;physical fitness;good shape;good condition;#;condition;shape;
+;condition;tqshape;#;good health;healthiness;
+;fitness;physical fitness;good tqshape;good condition;#;condition;tqshape;
 ;repair;#;condition;status;
 ;seaworthiness;fitness;#;soundness;
-;disability;disablement;handicap;impairment;#;unfitness;poor shape;bad condition;
+;disability;disablement;handicap;impairment;#;unfitness;poor tqshape;bad condition;
 ;putrescence;putridness;rottenness;corruption;#;putrefaction;rot;
 ;devastation;desolation;ruin;#;deterioration;impairment;
 ;wear;#;deterioration;impairment;
@@ -15115,20 +15115,20 @@
 ;affect;impact;bear upon;bear on;touch on;touch;#;change;alter;
 ;change by reversal;turn;reverse;#;change;
 ;switch over;switch;exchange;#;change by reversal;turn;reverse;
-;granulate;grain;#;change shape;change form;deform;
-;tie;#;shape;form;
-;terrace;#;shape;form;
-;fork;#;shape;form;
-;shape;form;#;change;alter;
-;dimension;#;shape;form;
-;roll;#;shape;form;
-;draw;#;shape;form;
-;strike;#;shape;form;
-;twist;#;shape;form;
-;granulate;grain;#;shape;form;
-;ridge;#;shape;form;
-;round;round out;round off;#;shape;form;
-;square;square up;#;shape;form;
+;granulate;grain;#;change tqshape;change form;deform;
+;tie;#;tqshape;form;
+;terrace;#;tqshape;form;
+;fork;#;tqshape;form;
+;tqshape;form;#;change;alter;
+;dimension;#;tqshape;form;
+;roll;#;tqshape;form;
+;draw;#;tqshape;form;
+;strike;#;tqshape;form;
+;twist;#;tqshape;form;
+;granulate;grain;#;tqshape;form;
+;ridge;#;tqshape;form;
+;round;round out;round off;#;tqshape;form;
+;square;square up;#;tqshape;form;
 ;round off;round down;round out;round;#;change;alter;
 ;change state;turn;#;change;
 ;fall;#;change state;turn;
@@ -15315,8 +15315,8 @@
 ;age;get on;mature;maturate;#;develop;
 ;turn;#;age;get on;mature;maturate;
 ;age;#;develop;
-;progress;come on;come along;advance;get on;get along;shape up;#;develop;
-;climb;#;progress;come on;come along;advance;get on;get along;shape up;
+;progress;come on;come along;advance;get on;get along;tqshape up;#;develop;
+;climb;#;progress;come on;come along;advance;get on;get along;tqshape up;
 ;age;#;change;alter;
 ;mature;maturate;grow;#;develop;
 ;grow;#;change;
@@ -15346,7 +15346,7 @@
 ;piece;patch;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
 ;point;repoint;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
 ;patch;patch up;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
-;dish;#;shape;form;
+;dish;#;tqshape;form;
 ;bulk;#;bulge;pouch;protrude;
 ;inflate;blow up;expand;amplify;#;increase;
 ;reform;#;better;improve;amend;ameliorate;meliorate;
@@ -15413,7 +15413,7 @@
 ;regulate;modulate;#;adjust;set;
 ;adapt;accommodate;#;change;alter;vary;
 ;fit;#;adapt;accommodate;
-;fit;#;shape;form;
+;fit;#;tqshape;form;
 ;qualify;dispose;#;prepare;groom;train;
 ;temper;harden;#;modify;
 ;anneal;temper;#;toughen;
@@ -15584,7 +15584,7 @@
 ;dull;#;weaken;
 ;cloud;#;dull;
 ;dull;#;change;
-;sharpen;taper;point;#;change shape;change form;deform;
+;sharpen;taper;point;#;change tqshape;change form;deform;
 ;flatten;drop;#;change;alter;
 ;phase;#;synchronize;synchronise;sync;
 ;blend;flux;mix;conflate;commingle;immix;fuse;coalesce;meld;combine;merge;#;change integrity;
@@ -15724,12 +15724,12 @@
 ;perfect;hone;#;better;improve;amend;ameliorate;meliorate;
 ;polish;round;round off;polish up;brush up;#;perfect;hone;
 ;polish;refine;fine-tune;down;#;better;improve;amend;ameliorate;meliorate;
-;deform;distort;strain;#;shape;form;
-;draw;#;change shape;change form;deform;
-;blow;#;shape;form;
-;block;#;shape;form;
-;block;#;shape;form;
-;cup;#;shape;form;
+;deform;distort;strain;#;tqshape;form;
+;draw;#;change tqshape;change form;deform;
+;blow;#;tqshape;form;
+;block;#;tqshape;form;
+;block;#;tqshape;form;
+;cup;#;tqshape;form;
 ;mar;impair;spoil;deflower;vitiate;#;damage;
 ;stamp;#;snuff out;extinguish;
 ;kill;obliterate;wipe out;#;take away;take out;
@@ -16156,11 +16156,11 @@
 ;format;#;determine;set;
 ;charge;#;determine;set;
 ;determine;#;specify;define;delineate;delimit;delimitate;
-;determine;shape;mold;influence;regulate;#;cause;do;make;
-;decide;#;determine;shape;mold;influence;regulate;
-;time;#;determine;shape;mold;influence;regulate;
-;index;#;determine;shape;mold;influence;regulate;
-;pace;#;determine;shape;mold;influence;regulate;
+;determine;tqshape;mold;influence;regulate;#;cause;do;make;
+;decide;#;determine;tqshape;mold;influence;regulate;
+;time;#;determine;tqshape;mold;influence;regulate;
+;index;#;determine;tqshape;mold;influence;regulate;
+;pace;#;determine;tqshape;mold;influence;regulate;
 ;deliberate;cogitate;#;chew over;think over;meditate;ponder;excogotate;contemplate;muse;reflect;mull;mull over;ruminate;speculate;
 ;see;#;deliberate;cogitate;
 ;contemplate;#;consider;take;deal;look at;
@@ -16403,7 +16403,7 @@
 ;swallow;take back;unsay;withdraw;#;renounce;repudiate;
 ;retreat;pull back;back out;back away;crawfish;crawfish out;pull in one's horns;withdraw;#
 ;revoke;annul;lift;countermand;reverse;repeal;overturn;rescind;vacate;#;cancel;strike down;
-;cancel;invalidate;#;score;mark;
+;cancel;tqinvalidate;#;score;mark;
 ;bracket;bracket out;#;edit;redact;
 ;cross off;cross out;strike out;strike off;mark;#;take away;take out;
 ;dismiss;disregard;brush aside;brush off;discount;push aside;ignore;#;reject;
@@ -17342,7 +17342,7 @@
 ;cling to;hold close;hold tight;clutch;#;hold;take hold;
 ;cling;cleave;adhere;stick;cohere;#;touch;adjoin;meet;contact;
 ;twist;#;turn;
-;twist;twine;distort;#;change shape;change form;deform;
+;twist;twine;distort;#;change tqshape;change form;deform;
 ;curl;wave;#;twist;
 ;grip;#;seize;prehend;clutch;
 ;wield;handle;#;manipulate;
@@ -17419,8 +17419,8 @@
 ;slice;slice up;#;cut;
 ;pink;#;cut;
 ;carve;cut up;#;cut;
-;carve;#;cut;shape;form;work;mold;mould;forge;
-;swage;upset;#;shape;form;work;mold;mould;forge;
+;carve;#;cut;tqshape;form;work;mold;mould;forge;
+;swage;upset;#;tqshape;form;work;mold;mould;forge;
 ;carve;chip at;#;cut;
 ;chop;hack;#;cut;
 ;chop;chop up;#;cut;
@@ -17430,7 +17430,7 @@
 ;nick;snick;#;cut;
 ;chip;knap;cut off;break off;#;cut;
 ;chip;chip off;come off;break away;break off;#;separate;divide;part;
-;chip;#;shape;form;work;mold;mould;forge;
+;chip;#;tqshape;form;work;mold;mould;forge;
 ;skim;skim off;cream off;cream;#;remove;take;take away;withdraw;
 ;egg;#;coat;surface;
 ;flour;#;dredge;
@@ -17467,7 +17467,7 @@
 ;fold;fold up;turn up;#;change surface;
 ;pucker;rumple;cockle;crumple;knit;#;wrinkle;ruckle;crease;crinkle;scrunch;scrunch up;crisp;
 ;contract;#;shrink;reduce;
-;bend;deform;twist;turn;#;change shape;change form;deform;
+;bend;deform;twist;turn;#;change tqshape;change form;deform;
 ;hole;#;hollow;hollow out;core out;
 ;rout;root;rootle;#;dig;delve;cut into;turn over;
 ;cave;undermine;#;hollow;hollow out;core out;
@@ -17954,7 +17954,7 @@
 ;thread;#;guide;run;draw;pass;
 ;wind;wind up;#;tighten;fasten;
 ;wind;wrap;roll;twine;#;move;displace;
-;encircle;circle;#;shape;form;
+;encircle;circle;#;tqshape;form;
 ;cheese;#;spool;
 ;ball;#;wind;wrap;roll;twine;
 ;clue;clew;#;wind;wrap;roll;twine;
@@ -18158,9 +18158,9 @@
 ;output;#;produce;make;create;
 ;pulse;pulsate;#;produce;make;create;
 ;machine;#;produce;make;create;
-;machine;#;shape;form;work;mold;mould;forge;
-;stamp;#;shape;form;work;mold;mould;forge;
-;beat;#;shape;form;work;mold;mould;forge;
+;machine;#;tqshape;form;work;mold;mould;forge;
+;stamp;#;tqshape;form;work;mold;mould;forge;
+;beat;#;tqshape;form;work;mold;mould;forge;
 ;elaborate;#;produce;make;create;
 ;compose;compile;#;make;
 ;catalogue;catalog;#;compose;compile;
@@ -18247,14 +18247,14 @@
 ;tie;#;fashion;forge;
 ;craft;#;fashion;forge;
 ;cooper;#;make;
-;shape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
-;hill;#;shape;form;work;mold;mould;forge;
+;tqshape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
+;hill;#;tqshape;form;work;mold;mould;forge;
 ;dip;#;create from raw material;create from raw stuff;
 ;raise;erect;rear;set up;put up;#;construct;build;make;
 ;level;raze;rase;dismantle;tear down;take down;pull down;#;destroy;destruct;
 ;press;press out;#;cast;mold;mould;
-;cast;mold;mould;#;shape;form;work;mold;mould;forge;
-;throw;#;shape;form;work;mold;mould;forge;
+;cast;mold;mould;#;tqshape;form;work;mold;mould;forge;
+;throw;#;tqshape;form;work;mold;mould;forge;
 ;cook;fix;ready;make;prepare;#;create from raw material;create from raw stuff;
 ;sandwich;#;organize;organise;prepare;devise;get up;machinate;
 ;devil;#;cook;fix;ready;make;prepare;
@@ -18290,7 +18290,7 @@
 ;gloss;polish;#;decorate;adorn;grace;ornament;embellish;beautify;
 ;japan;#;lacquer;
 ;blueprint;draft;draught;#;design;plan;
-;sculpt;sculpture;#;shape;form;work;mold;mould;forge;
+;sculpt;sculpture;#;tqshape;form;work;mold;mould;forge;
 ;paint;#;represent;interpret;
 ;paint;#;create;
 ;create;#;act;move;
@@ -18320,7 +18320,7 @@
 ;shade;fill in;#;draw;paint;
 ;vein;#;stain;
 ;color;colour;emblazon;#;decorate;adorn;grace;ornament;embellish;beautify;
-;model;mold;mould;#;shape;form;work;mold;mould;forge;
+;model;mold;mould;#;tqshape;form;work;mold;mould;forge;
 ;model;tqmock up;#;represent;interpret;
 ;sketch;outline;chalk out;#;draw;
 ;coin;#;create verbally;
@@ -19016,7 +19016,7 @@
 ;crook;curve;#;bend;flex;
 ;arch;curve;arc;#;bend;flex;
 ;straighten;unbend;#;change posture;
-;bend;flex;#;change shape;change form;deform;
+;bend;flex;#;change tqshape;change form;deform;
 ;dress;line up;#;position;
 ;line up;queue up;queue;#;stand;stand up;
 ;slope;incline;pitch;#;lean;tilt;tip;slant;angle;
@@ -19062,7 +19062,7 @@
 ;close;#;approach;near;come on;go up;draw near;draw close;come near;
 ;close;come together;#;move;
 ;push;crowd;#;approach;near;come on;go up;draw near;draw close;come near;
-;unfold;stretch;stretch out;extend;#;change shape;change form;deform;
+;unfold;stretch;stretch out;extend;#;change tqshape;change form;deform;
 ;tear;shoot;shoot down;charge;buck;#;rush;hotfoot;hasten;hie;speed;race;pelt along;rush along;cannonball along;bucket along;belt along;
 ;travel rapidly;speed;hurry;zip;#;travel;go;move;locomote;
 ;speed;#;travel;go;move;locomote;
@@ -19124,7 +19124,7 @@
 ;conduct;transmit;convey;carry;channel;#;bring;convey;take;
 ;clear;top;#;pass;overtake;overhaul;
 ;outdistance;outstrip;distance;#;leave behind;
-;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change shape;change form;deform;
+;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change tqshape;change form;deform;
 ;career;#;travel;go;move;locomote;
 ;circuit;#;travel;go;move;locomote;
 ;spread;scatter;spread out;#;circulate;pass around;pass on;distribute;
@@ -20038,8 +20038,8 @@
 ;cancel;strike down;#;declare;adjudge;hold;
 ;cancel;call off;#
 ;break;#;cancel;call off;
-;invalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
-;break;#;invalidate;annul;quash;void;avoid;nullify;
+;tqinvalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
+;break;#;tqinvalidate;annul;quash;void;avoid;nullify;
 ;sanction;#;authorize;authorise;pass;clear;
 ;issue;supply;#;distribute;
 ;distribute;#;transfer;
@@ -20369,7 +20369,7 @@
 ;connect;link;link up;join;unite;#
 ;bridge;bridge over;#;connect;link;tie;link up;
 ;root;#;become;
-;form;take form;take shape;spring;#;become;
+;form;take form;take tqshape;spring;#;become;
 ;originate;arise;rise;develop;uprise;spring up;grow;#;become;
 ;come forth;emerge;#;originate;arise;rise;develop;uprise;spring up;grow;
 ;break;#;come forth;emerge;