From f65902c05fedb5701f456133c154c20ebaaae8a5 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 14:44:55 -0500 Subject: [PATCH] Fix inadvertent tqt changes. --- chalk/data/palettes/Named_Colors.gpl | 2 +- chalk/ui/kis_dlg_preferences.cc | 2 +- filters/kspread/gnumeric/gnumericimport.cc | 2 +- filters/kspread/qpro/qproimport.cc | 2 +- kexi/kexidb/drivers/mySQL/mySQL.pro | 2 +- kexi/kexidb/drivers/sqlite/sqlite_common.pro | 2 +- kexi/kexidb/drivers/sqlite2/sqlite2.pro | 4 +- kexi/kexidb/kexidb.pro | 2 +- kexi/tests/gui/finddialog/finddialog.pro | 4 +- kspread/kspread_format.cc | 6 +-- lib/kotext/kohyphen/hyphdicts/hyph_es.dic | 4 +- lib/kotext/kohyphen/hyphdicts/hyph_hu.dic | 2 +- tools/thesaurus/thesaurus.txt | 40 ++++++++++---------- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/chalk/data/palettes/Named_Colors.gpl b/chalk/data/palettes/Named_Colors.gpl index ce7af023..5fbd533b 100644 --- a/chalk/data/palettes/Named_Colors.gpl +++ b/chalk/data/palettes/Named_Colors.gpl @@ -15,7 +15,7 @@ Columns: 16 255 228 196 bisque (255 228 196) 255 218 185 peach puff (255 218 185) 255 222 173 navajo white (255 222 173) -255 228 181 tqmoccasin (255 228 181) +255 228 181 moccasin (255 228 181) 255 248 220 cornsilk (255 248 220) 255 255 240 ivory (255 255 240) 255 250 205 lemon chiffon (255 250 205) diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 14b19c8b..8e053eaf 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -589,7 +589,7 @@ void TabletSettingsTab::applyTabletDeviceSettings() #else // EXTENDED_X11_TABLET_SUPPORT -// Fix compilation. tqmoc seems to not see the undefined symbol needed +// Fix compilation. moc seems to not see the undefined symbol needed // for these slots to be declared. void TabletSettingsTab::slotActivateDevice(int /*deviceIndex*/) { diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc index b0833e87..01346a5b 100644 --- a/filters/kspread/gnumeric/gnumericimport.cc +++ b/filters/kspread/gnumeric/gnumericimport.cc @@ -1848,7 +1848,7 @@ KoFilter::ConversionStatus GNUMERICFilter::convert( const TQCString & from, cons kdDebug(30521) << "...still here..." << endl; - // No need for a dynamic cast here, since we use TQt's tqmoc magic + // No need for a dynamic cast here, since we use TQt's moc magic Doc * ksdoc = ( Doc * ) document; if ( ksdoc->mimeType() != "application/x-kspread" ) diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc index 920d20a7..ec4793d0 100644 --- a/filters/kspread/qpro/qproimport.cc +++ b/filters/kspread/qpro/qproimport.cc @@ -117,7 +117,7 @@ KoFilter::ConversionStatus QpImport::convert( const TQCString& from, const TQCSt kdDebug(30523) << "...still here..." << endl; - // No need for a dynamic cast here, since we use TQt's tqmoc magic + // No need for a dynamic cast here, since we use TQt's moc magic Doc *ksdoc=(Doc*)document; if(ksdoc->mimeType()!="application/x-kspread") diff --git a/kexi/kexidb/drivers/mySQL/mySQL.pro b/kexi/kexidb/drivers/mySQL/mySQL.pro index 5f00a413..cc6eddd6 100644 --- a/kexi/kexidb/drivers/mySQL/mySQL.pro +++ b/kexi/kexidb/drivers/mySQL/mySQL.pro @@ -14,7 +14,7 @@ contains(CONFIG,debug) { TARGET = kexidb_mysqldriver$$KDELIBDEBUG -system( bash ktqmoc ) +system( bash kmoc ) SOURCES = \ mysqlconnection_p.cpp \ diff --git a/kexi/kexidb/drivers/sqlite/sqlite_common.pro b/kexi/kexidb/drivers/sqlite/sqlite_common.pro index 7770eb9d..81fb85b3 100644 --- a/kexi/kexidb/drivers/sqlite/sqlite_common.pro +++ b/kexi/kexidb/drivers/sqlite/sqlite_common.pro @@ -2,7 +2,7 @@ include( ../common.pro ) DEFINES += MAKE_KEXIDB_SQLITE_DRIVER_LIB -system( bash ktqmoc ) +system( bash kmoc ) SOURCES = \ sqliteconnection.cpp \ diff --git a/kexi/kexidb/drivers/sqlite2/sqlite2.pro b/kexi/kexidb/drivers/sqlite2/sqlite2.pro index b3ac6156..e9597ebd 100644 --- a/kexi/kexidb/drivers/sqlite2/sqlite2.pro +++ b/kexi/kexidb/drivers/sqlite2/sqlite2.pro @@ -2,9 +2,9 @@ include( ../sqlite/sqlite_common.pro ) LIBS += $$KDELIBDESTDIR/kexisql2$$KDELIBDEBUGLIB -INCLUDEPATH += $(KEXI)/3rdparty/kexisql/src ../sqlite/tqmoc +INCLUDEPATH += $(KEXI)/3rdparty/kexisql/src ../sqlite/moc -system( bash ktqmoc ../sqlite ) +system( bash kmoc ../sqlite ) DEFINES += SQLITE2 diff --git a/kexi/kexidb/kexidb.pro b/kexi/kexidb/kexidb.pro index 6c17210c..d16e3f59 100644 --- a/kexi/kexidb/kexidb.pro +++ b/kexi/kexidb/kexidb.pro @@ -9,7 +9,7 @@ TARGET = kexidb$$KDEBUG DEFINES += YYERROR_VERBOSE=1 -system( bash ktqmoc ) +system( bash kmoc ) SOURCES = \ object.cpp \ diff --git a/kexi/tests/gui/finddialog/finddialog.pro b/kexi/tests/gui/finddialog/finddialog.pro index dfbdd7eb..f76b5372 100644 --- a/kexi/tests/gui/finddialog/finddialog.pro +++ b/kexi/tests/gui/finddialog/finddialog.pro @@ -5,12 +5,12 @@ include( $(KEXI)/common.pro ) CONFIG += qt warn_on release DEPENDPATH = ../../include -system( bash ktqmoc ) +system( bash kmoc ) TARGET = finddialogtest DESTDIR=. -system( bash ktqmoc ) +system( bash kmoc ) system( bash kdcopidl ) SOURCES = kexifinddialog.cpp main.cpp diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc index b0960735..2c0cf45a 100644 --- a/kspread/kspread_format.cc +++ b/kspread/kspread_format.cc @@ -3140,7 +3140,7 @@ namespace Currency_LNS { "COP", I18N_NOOP("Colombia"), I18N_NOOP("Colombian Peso"), I18N_NOOP("C$") }, { "KMF", I18N_NOOP("Comoros"), I18N_NOOP("Comoro Franc"), I18N_NOOP("KMF") }, { "XAF", I18N_NOOP("Congo"), I18N_NOOP("CFA Franc BEAC"), I18N_NOOP("XAF") }, - { "CDF", I18N_NOOP("Congo, The Detqmocratic Republic Of"), I18N_NOOP("Franc Congolais"), I18N_NOOP("CDF") }, + { "CDF", I18N_NOOP("Congo, The Democratic Republic Of"), I18N_NOOP("Franc Congolais"), I18N_NOOP("CDF") }, { "NZD", I18N_NOOP("Cook Islands"), I18N_NOOP("New Zealand Dollar"), I18N_NOOP("NZD") }, { "CRC", I18N_NOOP("Costa Rica"), I18N_NOOP("Costa Rican Colon"), I18N_NOOP("C") }, { "XOF", I18N_NOOP("Cote D'Ivoire"), I18N_NOOP("CFA Franc BCEAO"), I18N_NOOP("XOF") }, @@ -3214,11 +3214,11 @@ namespace Currency_LNS { "KZT", I18N_NOOP("Kazakhstan"), I18N_NOOP("Tenge"), I18N_NOOP("KZT") }, { "KES", I18N_NOOP("Kenya"), I18N_NOOP("Kenyan Shilling"), I18N_NOOP("KES") }, { "AUD", I18N_NOOP("Kiribati"), I18N_NOOP("Australian Dollar"), I18N_NOOP("AUD") }, - { "KPW", I18N_NOOP("Korea, Detqmocratic People's Republic Of"), I18N_NOOP("North Korean Won"), I18N_NOOP("KPW") }, + { "KPW", I18N_NOOP("Korea, Democratic People's Republic Of"), I18N_NOOP("North Korean Won"), I18N_NOOP("KPW") }, { "KRW", I18N_NOOP("Korea, Republic Of"), I18N_NOOP("Won"), I18N_NOOP("KRW") }, { "KWD", I18N_NOOP("Kuwait"), I18N_NOOP("Kuwaiti Dinar"), I18N_NOOP("KWD") }, { "KGS", I18N_NOOP("Kyrgyzstan"), I18N_NOOP("Som"), I18N_NOOP("KGS") }, - { "LAK", I18N_NOOP("Lao People's Detqmocratic Republic"), I18N_NOOP("Kip"), I18N_NOOP("LAK") }, + { "LAK", I18N_NOOP("Lao People's Democratic Republic"), I18N_NOOP("Kip"), I18N_NOOP("LAK") }, { "LVL", I18N_NOOP("Latvia"), I18N_NOOP("Latvian Lats"), I18N_NOOP("Ls") }, { "LBP", I18N_NOOP("Lebanon"), I18N_NOOP("Lebanese Pound"), I18N_NOOP("LBP") }, { "ZAR", I18N_NOOP("Lesotho"), I18N_NOOP("Rand"), I18N_NOOP("ZAR") }, diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_es.dic b/lib/kotext/kohyphen/hyphdicts/hyph_es.dic index 05ff239c..2af6bfa1 100644 --- a/lib/kotext/kohyphen/hyphdicts/hyph_es.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_es.dic @@ -451,8 +451,8 @@ z1h 2locos. 2loca. 2locas. -2tqmoco. -2tqmocos. +2moco. +2mocos. 2mula. 2mulas. 2pedo. diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic b/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic index 2137b1f9..66564932 100644 --- a/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_hu.dic @@ -26978,7 +26978,7 @@ ge3mell 2g1e2més ge1mé 2g1eml -ge2tqmoc +ge2moc ge1mo 2g1emp ge1na2 diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt index 9d4eb1ed..7228dc91 100644 --- a/tools/thesaurus/thesaurus.txt +++ b/tools/thesaurus/thesaurus.txt @@ -567,9 +567,9 @@ ;commercial;#;commercialized;commercialised;mercantile;business;mercantile;mercenary;moneymaking;technical;technical;trade; ;technical;#;commercial; ;technical;#;commercial; -;common;#;average;ordinary;detqmocratic;popular;demotic;frequent;general;grassroots;standard; +;common;#;average;ordinary;democratic;popular;demotic;frequent;general;grassroots;standard; ;average;ordinary;#;common; -;detqmocratic;popular;#;common; +;democratic;popular;#;common; ;frequent;#;common; ;general;#;common; ;standard;#;common; @@ -844,13 +844,13 @@ ;clamant;crying;exigent;insistent;instant;#;imperative; ;desperate;#;imperative; ;pressing;urgent;#;imperative; -;detqmocratic;#;antiauthoritarian;classless;egalitarian;direct;parliamentary;parliamentary;participatory;popular;representative;republican; -;direct;#;detqmocratic; -;parliamentary;#;detqmocratic; -;parliamentary;#;detqmocratic; -;popular;#;detqmocratic; -;representative;#;detqmocratic; -;republican;#;detqmocratic; +;democratic;#;antiauthoritarian;classless;egalitarian;direct;parliamentary;parliamentary;participatory;popular;representative;republican; +;direct;#;democratic; +;parliamentary;#;democratic; +;parliamentary;#;democratic; +;popular;#;democratic; +;representative;#;democratic; +;republican;#;democratic; ;arbitrary;#;absolute;capricious;impulsive;whimsical;discretionary;discretional; ;absolute;#;arbitrary; ;effusive;emotional;gushing;gushy;#;demonstrative; @@ -1127,7 +1127,7 @@ ;expensive;#;big-ticket;high-ticket;costly;dear;high-priced;pricey;pricy;dearly-won;costly;overpriced; ;costly;dear;high-priced;pricey;pricy;#;expensive; ;dearly-won;costly;#;expensive; -;cheap;inexpensive;#;bargain;cut-rate;cut-price;bargain-priced;cut-rate;cut-price;detqmocratization;detqmocratisation;dirt cheap;low-cost;low-priced;affordable;nickel-and-dime;sixpenny;threepenny;twopenny;tuppeny;two-a-penny;twopenny-halfpenny; +;cheap;inexpensive;#;bargain;cut-rate;cut-price;bargain-priced;cut-rate;cut-price;democratization;democratisation;dirt cheap;low-cost;low-priced;affordable;nickel-and-dime;sixpenny;threepenny;twopenny;tuppeny;two-a-penny;twopenny-halfpenny; ;bargain;cut-rate;cut-price;#;cheap;inexpensive; ;experienced;#;full-fledged;fully fledged;initiate;initiated;intimate;intimate with;knowledgeable;knowledgeable about;old;older;practiced;practised;seasoned;veteran; ;initiate;initiated;#;experienced; @@ -2035,7 +2035,7 @@ ;at rest;inactive;motionless;static;still;#;nonmoving;unmoving; ;fixed;set;rigid;#;nonmoving;unmoving; ;mown;cut;# -;continental;#;phragtqmocone;phragmacone;transcontinental; +;continental;#;phragmocone;phragmacone;transcontinental; ;worldwide;#;intercontinental; ;national;#;nationalist;nationalistic; ;nationalist;nationalistic;#;national; @@ -6219,7 +6219,7 @@ ;hammer;#;striker; ;hammer;#;striker; ;hammer;#;sports equipment;sporting goods; -;hamtqmock;sack;#;bed; +;hammock;sack;#;bed; ;hand;#;pointer; ;hand brake;emergency;emergency brake;parking brake;#;brake; ;handcart;pushcart;cart;go-cart;#;wheeled vehicle; @@ -8497,7 +8497,7 @@ ;thought;#;belief; ;principle;#;value; ;gospel;#;doctrine;philosophy;school of thought;ism; -;majority rule;detqmocracy;#;doctrine;philosophy;school of thought;ism; +;majority rule;democracy;#;doctrine;philosophy;school of thought;ism; ;magic;#;supernaturalism; ;aesthetic;esthetic;#;philosophical doctrine;philosophical theory; ;mechanism;#;philosophical doctrine;philosophical theory; @@ -8603,7 +8603,7 @@ ;slant;angle;#;point of view;viewpoint;stand;standpoint; ;political orientation;ideology;political theory;#;orientation; ;reaction;#;conservatism;conservativism; -;detqmocracy;#;political orientation;ideology;political theory; +;democracy;#;political orientation;ideology;political theory; ;socialism;#;political orientation;ideology;political theory; ;Christianity;Christian religion;#;religion;faith;religious belief; ;nationalism;#;conviction;strong belief;article of faith; @@ -10808,7 +10808,7 @@ ;rally;mass meeting;#;gathering;assemblage; ;cell;cadre;#;political unit; ;underground;resistance;#;revolutionary group; -;detqmocracy;republic;commonwealth;#;political system;form of government; +;democracy;republic;commonwealth;#;political system;form of government; ;republic;#;political system;form of government; ;monarchy;#;autocracy;autarchy; ;capitalism;capitalist economy;#;market economy;free enterprise;laissez-faire economy; @@ -11949,8 +11949,8 @@ ;dean;doyen;#;elder;senior; ;debtor;#;borrower; ;delegate;#;representative; -;detqmocrat;populist;#;advocate;advocator;proponent;exponent; -;Detqmocrat;#;politician;politico;pol;political leader; +;democrat;populist;#;advocate;advocator;proponent;exponent; +;Democrat;#;politician;politico;pol;political leader; ;dependant;dependent;#;recipient;receiver; ;deputy;lieutenant;#;assistant;helper;help;supporter; ;deputy;deputy sheriff;#;lawman;law officer;peace officer; @@ -16498,11 +16498,11 @@ ;pan;tear apart;trash;#;disparage;belittle;pick at; ;vilify;revile;vituperate;rail;#;abuse;clapperclaw;blackguard;shout; ;mind;#;object; -;tease;razz;rag;cod;tantalize;tantalise;bait;taunt;twit;rally;ride;#;tqmock;betqmock; +;tease;razz;rag;cod;tantalize;tantalise;bait;taunt;twit;rally;ride;#;mock;bemock; ;pull the leg of;kid;#;gull;dupe;slang;befool;cod;fool;put on;take in;put one over;put one across; ;raise;#;incite;instigate;set off;stir up; ;nettle;needle;goad;#;harass;hassle;harry;chivy;chivvy;chevy;chevvy;beset;plague;molest;provoke; -;ridicule;guy;blackguard;laugh at;jest at;rib;make fun;poke fun;#;tqmock;betqmock; +;ridicule;guy;blackguard;laugh at;jest at;rib;make fun;poke fun;#;mock;bemock; ;debunk;expose;#;ridicule;guy;blackguard;laugh at;jest at;rib;make fun;poke fun; ;joke;jest;#;communicate;intercommunicate; ;horse around;arse around;fool around;fool;#;play;joke;jest; @@ -18321,7 +18321,7 @@ ;vein;#;stain; ;color;colour;emblazon;#;decorate;adorn;grace;ornament;embellish;beautify; ;model;mold;mould;#;shape;form;work;mold;mould;forge; -;model;tqmock up;#;represent;interpret; +;model;mock up;#;represent;interpret; ;sketch;outline;chalk out;#;draw; ;coin;#;create verbally; ;write;compose;pen;indite;#;create verbally;