diff options
Diffstat (limited to 'kwordquiz')
60 files changed, 759 insertions, 741 deletions
diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp index f142ee64..004525c3 100644 --- a/kwordquiz/src/dlglanguage.cpp +++ b/kwordquiz/src/dlglanguage.cpp @@ -23,7 +23,7 @@ #include "prefs.h" #include "dlglanguage.h" -DlgLanguage::DlgLanguage(TQWidget *parent, const char *name, bool modal): KDialogBase(Swallow, i18n("Column Titles"), Ok|Cancel, Ok, parent, name, modal, true) +DlgLanguage::DlgLanguage(TQWidget *tqparent, const char *name, bool modal): KDialogBase(Swallow, i18n("Column Titles"), Ok|Cancel, Ok, tqparent, name, modal, true) { dlgBase = new DlgLanguageBase( this, "Dlg" ); setMainWidget(dlgBase); diff --git a/kwordquiz/src/dlglanguage.h b/kwordquiz/src/dlglanguage.h index d158f52b..d92b80ad 100644 --- a/kwordquiz/src/dlglanguage.h +++ b/kwordquiz/src/dlglanguage.h @@ -28,8 +28,9 @@ class KCompletion; */ class DlgLanguage : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgLanguage(TQWidget *parent = 0, const char *name = 0, bool modal=true); + DlgLanguage(TQWidget *tqparent = 0, const char *name = 0, bool modal=true); ~DlgLanguage(); void setLanguage(int index, const TQString &lang); diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui index 0db87f5e..38073b59 100644 --- a/kwordquiz/src/dlglanguagebase.ui +++ b/kwordquiz/src/dlglanguagebase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgLanguageBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgLanguageBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>1</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>120</height> @@ -33,15 +33,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>picLanguage1</cstring> </property> @@ -53,7 +53,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -90,7 +90,7 @@ <property name="frameShadow"> <enum>Sunken</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <property name="toolTip" stdset="0"> @@ -100,7 +100,7 @@ <string>Enter a title (identifier) for the left column</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblLanguage1</cstring> </property> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -136,15 +136,15 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout2_2</cstring> + <cstring>tqlayout2_2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>picLanguage2</cstring> </property> @@ -156,7 +156,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -187,7 +187,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <property name="toolTip" stdset="0"> @@ -197,7 +197,7 @@ <string>Enter a title (identifier) for the right column</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblLanguage2</cstring> </property> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -240,5 +240,5 @@ <data format="XPM.GZ" length="29827">789cdd9c5b532bb992a8dff7afe8d87adb31a1c1601b3b4e9c0783c10603b6b9c3c43ce85a36b631e03b13e7bf9f943253948d59cdea5e3dd3319b702f3eaa4a522a2fca94cafbdffff5db7de7fcb77ffdfb3f265335ed9bdf4c4fbdfdf62f3b1b8d56fff19ffff7bffef1cfc2cece6fe153aa947fdbfde7bffde39f62f99bf94decc4ff45ae26ae045653e6025e5f1017f17e2513e3fd1366ba7f4e5ca1fb8f13e3fd7bcc78bf3d4f8cd7793c069ff72f89e3754dfd1768fcb64e4ce3d327912b69bcb3c4d8fe1133f6efde1363fba7c43c7e9118afdf31d3f31789f1fa0b318ddf5e24c6fee7cc345f156496c71d24c6f60e99b17db12226f904c957a0f1ea2131f56f7460688dfa736d64ee2f1b33e3753320e6f6f97e6a5f7488a97d5547de657bf2c4f47ccf12d3f32e8ebf50e1fbd53d31ddef9b89515e47ccfa50c4d47f16e77b37f5a70bc43c1f2362ba5f64c87b3cde77627ade548859defdc855be3f9b27467d5e11b3bd9d1373ff07c4d4bff3c8456acfc4fbf70a7cbf1a10b3feee13637fd7c8fcbce825c6eb6fc4341e3b4a1caffb2366d2f79298fab7515f7b697cba45ccf36312a37e2e98c99ea7c43c7fddc438be0531ebc3248ed73394af5a2ad17862fc2816f8793721e6f9dc4f8cf25d30e378b4412eb1bd9d258ef79b17661a7f8d98fa77d5c4f1fe9e24aed2f89f12c7eb5621972dcd6f8c7745552ad1785e89e97eb360a6eb15e4728138f65fda2d59f47f7fc2bc5b8de39b22970bd4de09333dbf434cfd672a31de7fc7bc8bf26a6292cff3f396e6b71859b1bd0b4b4cface9e91cb85bd42ec7f9798e64f1d3253fcaf11d37c8832335ef77bc4dcff03333d7f9818e3e58019e551288fdaa7f9300789f1fe1a33de9f758959ffa3c4d87f8f199fb7515fe55df61777835caeeea17e14318dcf1d33d37c779871befc5be2f87cd640e6f1ab62626c6fc68cedd923621a9fdf65c6eb3d474cfa7565665a5f1433dd6f8869fc59d4775925ffed27c6f11499c9fece90d378de99d17e7d8d19e5b737c4341ef7c88cf78b0362d2bf1689f1fe2133cdc77d62ec6f8a5ca1f95337cca4ffa89ffd3d66bb4c1c9f57cc349ffe3e315e7f20a6f1660b66942f8bf6baafd99e8c424ef79f3193ff3c13b33dbf26c6fbb17f5d2579b23b661a9f4b1cefd77d66b2b7d87e656f9ffc4f3d31533cd4c434dfaa815c617faa12933cba8e9cfa7b63c6fec49098e64bbf33e375d727a6f9502d661aaf4f8cf2e378358fcfe278358fcf0f89697c599999aedf25467dec13737c6e3293bf4f99c95e70fcba4afa106fcc38be9e42566c3f17cc64efcdc4689fa7c4ec1f7566b29f7ee278dd9602c3f24ae3f30b66b2df4962ec7f9798fd859fa7f1eb5be6928aedcd98cbb17e702fc86c6fb6cd8cfde93d6496372b31d3784f88491ef39018fb77cc45b4ff15b1a2e787ccc538be8cef77d89fb965c6fb8564c6f60ccd87dea5f86798c95fca89317e3f3393fd92fcba4cf9c93c31fa0fc9a715b57f9f18f573c94cf617e349d5b07ff7047295ecd7b59869bd386426fd30737ef1c48cf78b0131d9835789513f381f86e7d78c8969fecc9c19e74ff591613e707ecf98f17a56481cc76769fc3c5f3d9f18ed6fc14cf9c90d338e57de31637fca30537f9ab984f5ed0931cdbfda498cfa7966c6fee469e2785d72ff8afcf32171ec5fce881db62f6b89f1f91533b57f9018fb7f6746f9cc5562948fe435649f729c18db1f3053fbf3c4389f9298e65b1c27c6f5fd9199e2fb1131cd8f8dd75591d73b3121a678944d99697eae89d99e9ac464cfe21c19127ab4873133c6137d8fac77517fbe414cfab667cca86f9bae937d09667c3e5b12933e759199fc87db637d3e3053fb6f89b1fd7d666cdfec1093be6d8199fc799c18d78f1633f56f13637ce931e37ccaabc4e87f65661c9f4bedd3f8d2f3383ebb8b9cece73d31da4fc64cf6534f8cd74f98c9ffda89713c7d668a87cf89713e69bc6c7fd226c6f60533f5af13e3f523665a4f1689713d34cc940f5412e37a4bf361c8ffe579626c7fc24cfda7fb495f5d66ea8fc74bf1c0f37cb0ff9f25c6e76f98c91fe37aa80ce7431ee73f748ff1e09298fcc10c89693c42103bbc6eabc86c1fee9c19edc39f25c6f511c76b589ffa8331de8c9929be1698c9de4462b4b73e33f903c9c3fad4978951be3233c583d3c4b8de3798c9febb89713ce97e5abfd3fd349e0e33d9ff1d31e9dbb03cacef97c4980f5e3053bef49e18ed798f99f2f171628c8f57cc383eb99318c73763c6f1a97d62b21fbb9718ede59a99e2f35d62b4df0a33e98fe79fe287b9488cf118e3b9b1e4ffd63393bd1f31537e10f5ab8b9c6f9b4b64b657fb424cf3632c33cd4f62ca176b89d11e9969bc593531fac73e32afff2e2366fdbc22b33d6434bee4af57cc643f3566b29fb7c4713cbacc4cebcf3c318ef78198e65f6b66f2a7476692ff3a31f63f62a6f16689b17d816cd91f3bccb4be7613a37ccce43f16e5b59c8f659298c73f60c6f9d73d621a9fbd64a6eb536443eb89bf41b6ec6f31df3625cecffd71e2785d1c22737cc9f69929bf4f4ccf3f3163ff66454cf2a92133f9db8819edcb1788d91f7789c9bffc6d62ccbf2533e98bc66f69bd543e31fa478798f3d54b66f2cf2233ce574f13933d8958ff18cbf2bb2633d9e36b629cdf6762b26fcdf797717ed401f3fe5e9cdf2231fb9f4f8cfd9d32533c7f60a6e75f13eb383fe7c41c8fee9829bf1925c67874cb4cf1fb3e31eabfc74cfe963163ffa281ccf32f0a89b1fd4366da6f9089717c27cc141fca89317e5f33d3fec25162bc3e25e67ca59918fb5f32d3fab1488cf6f1ce4cf9fc1333daa7dc27e67c649418dbe7fb697d12b789b1fd1e33c5e7c7c4387eb22f4bf62e1e1263feb0c34ced937e1ccd6f16d7275b4af1f09c19f5638ac49c5f4c12a3bf5f32a3fde80e72d24f8399f6af1e99291e9e3053fede62a6fe0f13c7f6cd1931e947779929ff2825c6f5ea8099e2f52c31c623c54cf6719518e3c92b338d779719f5ab6e1363bc3d67a6f14e8959ffcf8951ff4366b22f9718aff37c90fef53c31ea9fe79bfc5fb513a37c4b668a37c7ccb83ee807669287e793f35b93388ea7cbf2707dab12e378b97dae6fdb89315fe0f9a778e15e1363bce2f975b4bf41f23bae671a89b13fcf4ce3e927c6eb4566ca27687e1dd7c737cc145fea89d13fd01e1cdb83b7cc149f2789e378dd8019edd9d599d19e5d2171b48f2c5dafe0f52762ae577712a33e2f98297f3a488cf6f0c84cfb352f89713eaf99697de7f152fc7715661c8ff1c4a4efec28319e8765cca45fee9fd783cbc4986f707f144f6c9119f56d4acc688fd92a31daeb0d338d17edd5b13d985d66b287d7c4680f17cc148f2a89d1dfaf9969fca93dd27f6a8ffc69c48ce3975566f2a766628c0f7bccb4fef1755e5fde1263fde498a97e1a3393ff2c1363be6499c93eaf98291f3c25e6fac733533e19e3992b27fdec2446fd08661cbf5d25467bee30933da7f6aa268ebf85ccf3e7e689b17dc74cfabf4d8cf94f8f19fb57a5c4680f6fccd8bfa813f37ed21333d56b85c4987f9d32533d9e98e4ab3063fbbe9a385eb78698d7ef6766b2af3d66aaafae13e3f832665a6f3b89717c9299f235969feb8d1533d517717d71ce703cc5eb8ef5e10f985531de3f4276bb2a5ecf7688393f3862a67a7bc14cf3a113e37cbd1173fd639829bec4facc97395e76a752fc551fa9d67ed7e193d8484b9f5fd257b4adbf4c92dff9b024f6d7b4f70bf46273f3fb33a3b37f3fbd6c93647394e1df5f35e2bf542fbf2bdd97f705ff711ffef33faf976f48f3f57dead749f2d7e8a5fb850ffdc80affbe7af949e9fe667a913efe9bc1a727fbc04f72107c81d694644d72087ff7f019c5fb07c0bdbf975ee4b31cc3e8b2f8fb531ca100895ee42b48865264f0f70c7eefc1dff0f77e9422fb75baff157a916f7202a31bc3ef93a01f906a1cad27483895b3a40f9426e8692e17f059ca157c7e9934bfcc5fde499249f7c337de41aaf06f2de88c22f0813c9475f8f7481e477db1b5fd3df462e3881b2049187553d672d7344950877fc3e84f401fa7b205bc8cf786e7cefe56ebfe398ce83c5ad710467e01236ec9b6ecc8aebc9457f25adec85b7927efe5837c943bb2007fdf957bb208f77a78aef4b7cac71ab22cf741925759915518e9a390420825b430c20a277cfc7122133dd1174f62208662249ec518ee1f8a975f23c937f5f2d53af0b1468cc08b5bb22b5ec59b9888298c7a26e662113f0bb14c3f8bf8b7b9588977511307e2109ea9831ec10a49c77f62bdf9865ea07571049fe3d81bd5201051df055896688a13b914a7a225cec4b9b810ed385efe597ef1b320a93aa20bfabb1457e21ae25a13dabb81d817e21c4407710b3ef524ee7e9d5ec25c897b71241ec4a3d841494401e2d29bac895d99893d5114255116fba212475fa59fed52d0552595883c176da594564659880e4d39863e7ac1974012ad9c14caff6abd8034c71b7fafc985ca544ff5d5931a901c4b58e27f24c987a4511efa5bb4399067a846b2aa9e21c6853c2244795869d5f3aff517d0c9b178483e029605bd2dd458bda857f5066321bb49a3fbd14f554dd4544d493b3325d43c3ebd520bb594776aa5de6155653f8cbaf9657a818f785cf3f67dd0494bd5d4813a54f5a00f18ddd1b7e4d8ae1f904c1d470feaa806b864531e515f13ca80be55b77e6f7d011b6649cad2a81379a14e554b9db187f03c7fe1f15bac2ed922cb328d770469ced5856aab0e4497719466f4dddcfa67d697d08aea424b2d90e4525dc551a3657df6908d79cf4704b02a815a041b93f1e9656a01a29bba5637ea569c82df8c5557dd7d773fe1a7d67d6cc9c92ef4754f92a007e0983ecbb1ce7949513b22d74a2e5eab2bf5a01ec529f41956e15fa897b89e044d3fab1dd04941edc21abe483d2f29ba92ad241d6cae26acc563b5b7666dc71bfac4c8d65145555265d150fb30f231c74e5805c49fd24b584f2cc4ae9aaa8075dda024a489bc7682241335c9594b55556141aa5316d3d1f2432a904992ce3017f8b056fc4ba685565ac38a8c33fa8c151fac6b7f228ec1a0438d31910ea2f0255817dbcd5a9ccd6963a1aa30af57daa862783b437b657426ce744ff7f5931e88773d8c630ff391a233fb4fa2851ee967d5830c47c55a35dbac41377de75b7aa9c15c8ce5428fc5103d3ecdfd7a4c8a72e81798d157fda6277a2a5a6aac67b2ade77a0159ca1ee4cd5dbdd42bfdae6bfa4085f95feac3a0d10d6f8a57c45c1fe8ba3e8af91a57dba1a25bf75ff3337ad1c790393addd04d6d3806873ef5893e4149a09b53d4876ee9337d2eaff4856eeb8e7ad65d7d09f973a8d0c6a1b681d834d057fa5adf80be6e216f9e518b47fa2e274fb23b68ef5e3f40bd730855dc7194e6e58feb25aef3bbfa51bde81d584f72512748425a89feaa0b7a57c3dceba22e41ef43b08a67a82d3f624f19227aa875ac5cc2dabeabcb7a5f5770b54dfeb74c5eb8040d2fc3571e20da54e4819190af85aaee625d920f69be938f858cc508a362af148df2b1c7e8208931c6aa82713233dea44f9468147339aaa031af83d5f7c0f44cdf3c09a95b66c0313145c565eaa76d8672cf8c623d7a0075a9a6b3834f113ae9656bcca63b67e6d98cd535e5e9eb768d51b96a5eccab7933d24ce2fd50ff834e50922154070f297f08f57d2d4a86fff6cccccccd4261ce508dfa11498ee839666956fadabc83242e561b5f783fe96573059a446f1fc949b00add3535f5847d7dac886a167a0a3ad1d21c9843358679d39b3d40ef022439377588454f513763f8d4a22787dda7913932c7a6619a20cd32facc7a061167cb9c9853d33267716f67b231d60d7fd996190449a4870ce2192aad92395f8b5e791bab286d56e6c2b421428ce28e44b2006aeb1cd6ee71c8504d07ee299aaeb93457e65a1e74a7e606fe36d073736bee82377eca50638fe6de3c9847b363a6a600d270dbb88bf8298e6d6606618fcbec823453b952a1d2aa444baef2eaf8517b983d53d4637d15ade7431f79ddf8e073308aa6ac87b7ebccbea998aa7c901df08166ccec07166eb14accc5664683b20cac5605d071668dd94927216add23d6fc85e7318b1174640ae15fd386ea773f579d2c28178c2b80b5d68967b0ae41da59f29f62ff4436ac87bf1fd8ccf620b10c7b011d5db37dfb04d2bc8963b8766207766847719d5d7efa59887dfbac1b20cd4b58ff7fbceeaf9dfc3c7de43c52e9b11d07ade00a927c3efaaa1ed917fb0a92d450276091bc139bcf041b7206f3af55d3bed90948829e3db3533b338f760ecf9c419e756a17ba4f99dea78c4e55edd2ae62eefc65ccddaa97b07b3dc18ccebe8b5763a25672d105d76968bf665fed01659e0d90e4637f381f3143ae7b20eaa08743a88617316fdb130b5bb747f2c1cce44a3cc0b34dfb2e1fe18e799226c902f3b8b0c7b62177ed1c2c3fe688bfab17d4c5906a39a8ef4cc93643f457722d8b3c8a73756d4feca96dc50861d0c369377c4d2f100b05e8e40c74d20e966acfd554dfd90bf8fddeb66d07fc26cc1ef467bbf6529d7f96255a77c75ea99a3c8c96ffc957d6d7fd9c957155ba5215f16cafd76331b40cd970885ff6c6deca4c75ed5dac311a3133ef51be142428f3ec80ee1eec7dc85762865f4d2b53b0b44358ffe7200db4a19c7db08f49331b3e0356b6630b1cc368cc5fe4c9492f7df2e42164758f621abd3d9f2be1ef993e8798efedee9a4e794d6ed8bd58837aa96d112429814e3eea938fea07565fd33465b10795f7be9cd8b2dd17595a29f39a99db8a69e86e5c63dee32a9c93ea533e96f40277865a5be89990b1e5cd1a31645fafb6aa4b90a97c3ea77f97fb4eca1246023d77c229d189f9c1346a784135d931c9e39d7606f22c68432fd4a37e8558365fd74ab48b4c7bc8c74cca29e2783fac6dab5e9e409a303a50b9103193cd6985f2f30e64f517b05ef82d156cc349e7c07f208ad8a229839f743e2a2dca1de72926423eecbccb541667f3c2f520afab6fca12fb9cb9be7b42bde4c7fba55ec2d503b0b2f0bb961da152afec2bd3188ff7dd40b7e5d0649f6b71bb07d612f6fd57622cafdc3066d74bf0f50ffb9ca79dc11043ea6ee49ec1a7c2e8408ff60daaa46d7a9943a5d98816f6bc9ebd6cd74bd45a5891a25e6457e8f5ac38ca125a357aaa3b21275ecbeae913a3f3ca94dcd8bd400db9998d522e4cffadea27fbe05e61d584100715f1917b7393cd5c1c23a79bca4b5b60bd7c1dc7727ad1f235daba06cf375bf402fdbb999bbb45981ff0c6cdf5246425076ee9c610a3861fa3a21c283fd30bb7720a3cff5a2fe4b1087dcee4b1aa294d7a495eeadea306175055c85817fd60dd5fd34ba8afa771f7e84ad88df989b2e8175783eab71be209ccd370a352e863de65db411277c092e42a131a254872e884aa88c7986bf8b827aaa19a7b43bbdcf0d2853a7775d0dff067f4029f19fc5e7747b9dd2392258ea20215ae82ea37647ac34fad9ec88e29839fcca224dbcf2e62d5e38e21c635e4aa8b15b48d35e7d0f45d33643a1f15265927e44cf2c19d44bd64f1acfad3fa928f075137c3384763092b97f01bd10433b18e3b956d58e38335854aeb3c663d0d5ce365d509885d2bc13b636bbb983196cd43eeeb5aee2cf85cdc91005b804a6d126b9b96bc83c8b74c5979925fdd9ba26975b12eaa6fadf7795d0927a4fcbb8d91f97e8b2c31f228036b35546ae2184660696f71164efaec813b57c53816cea6f33b97f05f0711cdb55dc7ee9b47f9eebae2d15dca41771a33d449b05077055139e9efe3c7ad20133aa0b1ba6dfb30b91a10d7151f77d6b2303fb41bb66ee7b0bae90cbc15b246f28fb168baebb85f5385de4a6ef5a90ac9af5093e87137ee56d5dc5d8c83e3a893a6bb8f33d8326592654333e05f0fb2dd455faeaf4bb2a9972e9f1484753f6430f7e02f9f6559424f67e23aec5cc75385b00317768dea02f4e51ee339df3cae279feb449446461b9b99a2b3f210ea977dd0ef4d9046d6c46d58fbb7cb02337be676a22724bd7c11c738bfc57727825e1ec4fb3659445bf7e41ef45c0ef956acdb9b908936210a4fd06b697f683d766db6b252455780356c27ae47e1ac32ccc891dbd5ab64a36bb2e811d4b0a817f53beb3ee7c7b1b604b94fd48be86d89420b2d755f5eca5af0f4601d50b3d76d16d69390ad802413cc56482b1ff6f5b1d66056d67133f562baf1c415779b2012e886dbd3bcd7bc66db6a60dff42cc52ffb398e7dd2cb285acd4a2ecc9b2b26efcdc7d3857e925db8ef1cee1bc0480650e7f45d89b2faf5dde5f52a31c5d890f902b5ddb1bc852aac089e3fc57c415eba72ccd8d253bc0feff65d45174356f9bbf918eb2554541aaad1035970d5cf356b388fd303bd04cb6a80ad8fe0031924f8498724c99fc66ca97863b54d11117e9faba5975e885b9a49a50a7a27d6b19bb2406e0eb37b22b3cd68fcb55e50d3d1bbba1ef746aa187d30878a678b99b935a3b8f73596debe9bfde8271388b7391b671bd377318bcbd72e6ba702f6c86b6f42cd08ba29bbba1ead9db655e933b74b6f21220db79f8d7dd4fb1bfe12f69e56e6d13b5bc7fa85f6c379077be6bd1e530d39f099a9048bc12c3a9e76e54e95e339f152cdd662dac78a13ac69e67b50b7847d9615d43b7d5a29391395342b2bdf975d5dfaeafd8c5cbdcfefded9f8864ef834f5c23f855a8c4f2592ed40ffbae607a615f622bb5373e587d1c226246bb49de417b032c67deefc89eb5a2c09b5b2d27ea0c67ea44efd33dbc2872c61f7024672664a7ebc916d6de865631f70104f6efa216715cfa2966c378dc1bfc0680fb4f3afe05323f0fc6b37d6b5b0c742abcab1205d60ecf56ffe2dd6c81f275f6b9131ec63e82158da4497e1334a15f2878d85385113ad6861298649b7a99794a97fbc13d983cf24be7bb4eba77882951f43d47ad5cffcdcf4c23b2bea59766cc72fe219de9cf69f78c7bee29756f8957f0fb26edb95e04a135aacf9038821959caf7d686eee0ff5b53cc4f31789a7c0f54f7ae1bc46939cc1f333e9a16637f6ddd771d721d999e0f5c11ff9636f82bfc0e7d46676668fe2f972ae6684ace3d837e4a57983357e462be0b695339c1c2d7dd39fc43dd28d739110f9dcca9faa8adaa1fd314b39d9d77ac9cb697d0ba459aa82e8867ed0ced28a1ea2da4c57cc13e8700455d4523d9b47a8235b71f6298aaa7b77e8432efceecfc3d7c4409af6b60a2044f2584fe457a0b56c1fb472211f3d6456f62ef9f78ff4b2fe0d8f916f439ef4e23b601ded0f59282e4f54b0e00e7863db7721ab1ccb377f691e4dc31eaa2a595aac4f689d9ec9437fe5afddf1a777cad8cec239f4514e53496bd1eb2a6ee66ffc2dccda738a63fa4bbd6c56541c2b4ecc61f046f04f8acbd1226847595d9bb90e6f633dc0fd2559d373f09bbbb88fe2f5933b5395304350379a503b7aa1bdbfcfedc17cb6b5ed36b8506f1a72f0b882e77712d7dea2ffc679a5b3affe219e594c5916b0df2a67bb66cf09ff28e790659e8134e12ca5ec779cf73bf2ce2d630419407d3296fb90a1f4e59e2ff8dd8fda19e3dec6cfa6dec0977c3883ae4306cb3bbce1ec33bfbb28be755e5917d7e2cc435e06abdd3445fc2aed2a877876a75756ca23b10b2a6fcacc977cd9efbb67a8db17e17dd798b3ed40a61376dd8bbee2abf6d0d653cdf9f5cf8225d30799cc449c0dbfbe37f1653eb65d2f433f162da762cd9bab0ef3eb76a6326d0771ad811a53edc8a2ca4c3b9e9486dddc90c94f20030dbb7f509f78235ecd01f8dafcd38ede7689c2be585821cbbe15ebaab59344f9e95cec87d23475db3e4334db7c03b19ade355c596587194470d9c45a24beb33f044f7d0b6fd1a9b07b0ed2844c14da3b947bfac61e85d528bc79f1a53e88322827322f67be05d1a8b97ebef3937a31f64e77b3cc2e537db45157847c0b6257176a9a4758cd2e624f633a459ac47797f7d549ace54d3cdd10ba64fa59cfd7a096c6e8bee527bdc3d4cefa100b75f0f650c7e623d3d7f5cb171febba66c738dfc89ed25efdc6592faddcce1e660379073d9f440f1d8993a8a3463a01b771dfed5966ee241b66a3ec3937ff9fb413a4c9c6d94bf62adb21fac6d1f7ff9c5e606d78b685ec2d9bc4b76116b9d17ff82f9ed0cfd57936b50df908955a2beeebe8f8b6bb8ff56788412ba84fca7aae4eb399af65f3ad922cd6fedbce16e05f7d23e1799fde87d9f256dc77fcc578f9220ad9325b65ef6a90ab3ff23d7f44d3b9b0e624abf9335552b5ecc0f4e3feceb15ed8a2dc93bb90070ff47b16d6ac4a3a0d597c9221af9faaae6575d9056942b634e62c78d3d2bef59e523d3b0afbc6309f2a3ba67713319be1774af27e1462a854f7ea5c9baca1dfac537d796f1fe4bdaf674da5cd0948d149d5da3427cb57710cf20b3dc84ed408e2e2383ba59d3eb76969df8a63ad78cef22e87fa316b6567319a2e37eae0cdea2afe80ddad445bd5e1e71eb2ce4ed4447edc5fbfc79cff09963803dd9c9b0be814cf5edcdafbb1df5e5f401f257ce7283bd20df5e8665861c4ba3d9f9b6fd6599b59227b7435f72ee3276fdf9aab85b7af86aeacdad945fefb327f607d71591bdfa0323bbaa31b59c70d7521b6ff92deb85aef7b9d271be3de26f12249b34533f1cc0f32bc2cf8cc4bfe74e4e7e258770a95d685be0ce72c419aec28bbccaef4339d5d2fb6d589e84ff9357543675f672f5ffc3d444955cdaeb39bdcfefecfaf2f229ee4b910014c16562cd1d03abbcdee742bd8ffefbcc10f95bf12f49ee88fa58857b3f117511a2481787f0fb1307eef89e3d8cfea257b100dc8b1c27adeb4bbaa9b3dca10db76b282ae6eafad7e67a6d7bd9f779a16712d79a16f9dacc92166a097cc7b5980f885ebcba7b7bbbea9974fe791615e4c2bdb356533343f8ea8db24d894a58adffb81bcab9fbd668bfc9bbf51b332aec1fd6c2fec5ca4efc37cfd5edf0fb3984f92f4219e1ccb1331565956d43be6dee01abae9bb5bb29d8d484eebab3ed022737ae66cc8a1437d0355e941bcba024916ea02f2f093f056fcb631fd09bd34e33996867cf7d4ed42942e65a5ac0cb1a0c2bb16f86eac3a72ef9b6febe2fe6c7c6f96bf9b54516f7e2f937a9c85330367faaea207f1ad82397a7cf8b642667443dce2fbb49bb3fc33feb22e114683f87dbd2358870f8c5465f3a8c6d9be7b145dc87cd7ab926d5181f759e6c2f90b7b08d5ef6516fa9885730350fb557612a599c71385916dda816e403416a2f9a331fe91eff1c9b7b8af99c5ef4c424e200ae13d7f7f9555ec5b56758fb692befbb6593ba6efbea9ab9eec899e928f3d0d757c1dea9b5069851abe674047e2b5677a36e8047237f093b0731e74124ebabe1ad71ffa7e2546c566fc06ee0a2276219c27c3fa7302faa9b9b96968effa5ab829d8f9b91ea97bb7722b750fbf0ddcbe7eb54bdfb7676eaeaf55c58fc15275a8e042a5456f0365d0ee9e6af75c4f66f7fe35fa89a0b759c59f5bf7373ffa38be27abe3bb62606de6cc14ac811a72d8f3fe5cae40aaba7bd20d79a94e5d5d3e98228cfc419c99a23f035f284bb048736c5aba84ef06c0487bf1dcba194f5e076657865df7233fca6ecc28eeba0e3667f20fc7b1cf5616f69b47f13bdf427ad44bd8b732bba6907a809a076cfcd49d98963dd0ed5ea6db7a6e5aaee1c7f45e398f084f4b86b1ca0adf210fb9f038ec208691cb66fc17bfb91ddeb3ed7f8e487f5c2f5f44eb8fbfe1db37e96debb559c0b7afb7b5f5e9adc32d7b765bfbff53fef22349c2e73d274d7aa76833b26fb779948af623d7fefefbffdf187f462f5b4686dfec58d7454695537dcb7bf8fc3e26ee41e6f6b5a9d212b93d6e9ddf21def6f9febaff03bd6cfe7dcd8ae0f73ad781db6680f720d7f20aaab4481fbf4e2f5b6b85fca836e6ec2b2bfafc779450ffc8fabe691bdfd4cb57954fbea5b5f381ef49a293e56dd1d79a8e7e20d14fc7b1af3cfc47d6f7831eb75c5faf45c2bde5dcfddbfa4dedfa56aff74bf5f2390ead7be997a3c9dfbf16d5736dfe6016e09e5e0f329f3f9027ffde7dbfeaf3ddfe7ecdbafff7fcfcd5ffbf70ff9d9fff557af97fffe71fff1f2192a73f</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/dlgrc.cpp b/kwordquiz/src/dlgrc.cpp index 9fa996e3..dc5693ad 100644 --- a/kwordquiz/src/dlgrc.cpp +++ b/kwordquiz/src/dlgrc.cpp @@ -19,7 +19,7 @@ #include "dlgrc.h" -DlgRC::DlgRC(TQWidget *parent, const char *name, bool modal): KDialogBase(Swallow, i18n("Rows & Columns"), Ok|Cancel, Ok, parent, name, modal, true) +DlgRC::DlgRC(TQWidget *tqparent, const char *name, bool modal): KDialogBase(Swallow, i18n("Rows & Columns"), Ok|Cancel, Ok, tqparent, name, modal, true) { dlgBase = new DlgRCBase( this, "Dlg" ); setMainWidget(dlgBase); diff --git a/kwordquiz/src/dlgrc.h b/kwordquiz/src/dlgrc.h index b54fa64c..d1aa4bb3 100644 --- a/kwordquiz/src/dlgrc.h +++ b/kwordquiz/src/dlgrc.h @@ -27,8 +27,9 @@ class DlgRC : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgRC(TQWidget *parent = 0, const char *name = 0, bool modal=true); + DlgRC(TQWidget *tqparent = 0, const char *name = 0, bool modal=true); ~DlgRC(); void setNumRows(int r); diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index 1ee9a6f4..7a62dd15 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgRCBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgRCBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>156</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>150</height> @@ -25,9 +25,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -43,7 +43,7 @@ <property name="maxLength"> <number>5</number> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <property name="validChars"> @@ -56,7 +56,7 @@ <string>Enter the number of rows the vocabulary should have</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblNumRows</cstring> </property> @@ -75,9 +75,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -103,7 +103,7 @@ <string>Enter the height (in pixels) for the selected row(s)</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblRowHeight</cstring> </property> @@ -122,15 +122,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblColWidth</cstring> </property> @@ -173,7 +173,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>krestrictedline.h</includehint> <includehint>krestrictedline.h</includehint> diff --git a/kwordquiz/src/dlgsort.cpp b/kwordquiz/src/dlgsort.cpp index 20221468..bac1f85c 100644 --- a/kwordquiz/src/dlgsort.cpp +++ b/kwordquiz/src/dlgsort.cpp @@ -21,7 +21,7 @@ #include "dlgsort.h" -DlgSort::DlgSort(TQWidget *parent, const char *name, bool modal): KDialogBase(Swallow, i18n("Sort"), Ok|Cancel, Ok, parent, name, modal, true) +DlgSort::DlgSort(TQWidget *tqparent, const char *name, bool modal): KDialogBase(Swallow, i18n("Sort"), Ok|Cancel, Ok, tqparent, name, modal, true) { dlgBase = new DlgSortBase( this, "Dlg" ); setMainWidget(dlgBase); diff --git a/kwordquiz/src/dlgsort.h b/kwordquiz/src/dlgsort.h index 181cf75b..4a36e385 100644 --- a/kwordquiz/src/dlgsort.h +++ b/kwordquiz/src/dlgsort.h @@ -27,9 +27,10 @@ class DlgSort : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgSort(TQWidget *parent = 0, const char *name = 0, bool modal=true); + DlgSort(TQWidget *tqparent = 0, const char *name = 0, bool modal=true); ~DlgSort(); bool base(); diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui index e2e7e3f6..7d56584e 100644 --- a/kwordquiz/src/dlgsortbase.ui +++ b/kwordquiz/src/dlgsortbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgSortBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgSortBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>170</height> @@ -33,15 +33,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpBase</cstring> </property> @@ -58,7 +58,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>optLang1</cstring> </property> @@ -72,7 +72,7 @@ <string>Select to sort based on the left column</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>optLang2</cstring> </property> @@ -88,7 +88,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpDirection</cstring> </property> @@ -105,7 +105,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>optAscending</cstring> </property> @@ -119,7 +119,7 @@ <string>Select to sort in ascending order</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>optDescending</cstring> </property> @@ -139,5 +139,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index 79dd2da0..25d8b49a 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -22,8 +22,8 @@ #include <kcharselect.h> #include <kdebug.h> -DlgSpecChar::DlgSpecChar( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal ) - : KDialogBase( Plain, i18n("Select Character"), User1 | Cancel, User1 , parent, name, _modal ) +DlgSpecChar::DlgSpecChar( TQWidget *tqparent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal ) + : KDialogBase( Plain, i18n("Select Character"), User1 | Cancel, User1 , tqparent, name, _modal ) { initDialog(_chr,_font,true); @@ -38,11 +38,11 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_ grid = new TQGridLayout( page, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - int t = (_chr.unicode()/256); + int t = (_chr.tqunicode()/256); charSelect = new KCharSelect( page, "", _font, _chr, t); connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); - charSelect->resize( charSelect->sizeHint() ); + charSelect->resize( charSelect->tqsizeHint() ); charSelect->enableFontCombo( false ); grid->addWidget( charSelect, 0, 0 ); diff --git a/kwordquiz/src/dlgspecchar.h b/kwordquiz/src/dlgspecchar.h index e3ab3ff3..b5ca9aa5 100644 --- a/kwordquiz/src/dlgspecchar.h +++ b/kwordquiz/src/dlgspecchar.h @@ -31,9 +31,10 @@ class KButtonBox; class DlgSpecChar : public KDialogBase { Q_OBJECT + TQ_OBJECT public: //constructor when you want to insert multi char - DlgSpecChar( TQWidget *parent, const char *name, const TQString &_font, + DlgSpecChar( TQWidget *tqparent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal=true ); ~DlgSpecChar(); diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index eafa5294..6db1916f 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -25,10 +25,10 @@ #include "prefs.h" -FlashView::FlashView(TQWidget *parent, const char *name, WFlags f) - : FlashViewBase(parent, name, f) +FlashView::FlashView(TQWidget *tqparent, const char *name, WFlags f) + : FlashViewBase(tqparent, name, f) { - m_score = new WQScore(); + m_score = new WTQScore(); m_timer = new TQTimer(this); connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); } @@ -39,7 +39,7 @@ FlashView::~FlashView() } -void FlashView::setQuiz(WQQuiz *quiz) +void FlashView::setQuiz(WTQQuiz *quiz) { m_quiz = quiz; } @@ -57,7 +57,7 @@ void FlashView::init() updateScore(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(true); win->actionCollection()->action("flash_know")->setEnabled(true); win->actionCollection()->action("flash_dont_know")->setEnabled(true); @@ -84,7 +84,7 @@ void FlashView::keepDiscardCard(bool keep) { if (!keep) { - m_score->countIncrement(WQScore::cdCorrect); + m_score->countIncrement(WTQScore::cdCorrect); updateScore(); KNotifyClient::event(winId(), "QuizCorrect", i18n("Your answer was correct!")); } @@ -92,7 +92,7 @@ void FlashView::keepDiscardCard(bool keep) { m_error++; m_quiz->checkAnswer(m_question, ""); - m_score->countIncrement(WQScore::cdError); + m_score->countIncrement(WTQScore::cdError); updateScore(); KNotifyClient::event(winId(), "QuizError", i18n("Your answer was incorrect.")); } @@ -106,7 +106,7 @@ void FlashView::keepDiscardCard(bool keep) else { m_quiz->finish(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(false); win->actionCollection()->action("flash_know")->setEnabled(false); win->actionCollection()->action("flash_dont_know")->setEnabled(false); diff --git a/kwordquiz/src/flashview.h b/kwordquiz/src/flashview.h index c6135df5..02a20177 100644 --- a/kwordquiz/src/flashview.h +++ b/kwordquiz/src/flashview.h @@ -23,7 +23,7 @@ #include "wqscore.h" -class WQQuiz; +class WTQQuiz; /** @author Peter Hedlund @@ -31,12 +31,13 @@ class WQQuiz; class FlashView : public FlashViewBase { Q_OBJECT + TQ_OBJECT public: - FlashView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + FlashView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); ~FlashView(); - void setQuiz(WQQuiz *quiz); + void setQuiz(WTQQuiz *quiz); void init(); private slots: @@ -51,8 +52,8 @@ public slots: void slotApplySettings(); private: - WQQuiz *m_quiz; - WQScore *m_score; + WTQQuiz *m_quiz; + WTQScore *m_score; KAction* actFlip; KAction* actKnow; diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui index d1cf9e1f..42af6476 100644 --- a/kwordquiz/src/flashviewbase.ui +++ b/kwordquiz/src/flashviewbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FlashViewBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FlashViewBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -60,14 +60,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QFrame" row="1" column="1"> + <widget class="TQFrame" row="1" column="1"> <property name="name"> <cstring>fraCard</cstring> </property> @@ -99,7 +99,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblLanguageQuestion</cstring> </property> @@ -126,7 +126,7 @@ <property name="text"> <string>Language 1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -175,7 +175,7 @@ <string>The flashcard</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblQuestion</cstring> </property> @@ -203,7 +203,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -225,16 +225,16 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <property name="name"> @@ -257,15 +257,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblScoreCount</cstring> </property> @@ -292,7 +292,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -302,7 +302,7 @@ <string>The number of cards in the session</string> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>picCorrect</cstring> </property> @@ -314,7 +314,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -333,7 +333,7 @@ <string>The number of cards counted as correct (I know). May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="5"> + <widget class="TQLabel" row="0" column="5"> <property name="name"> <cstring>lblScoreCorrect</cstring> </property> @@ -360,7 +360,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -370,7 +370,7 @@ <string>The number of cards counted as correct (I know). May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="6"> + <widget class="TQLabel" row="0" column="6"> <property name="name"> <cstring>picError</cstring> </property> @@ -382,7 +382,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -401,7 +401,7 @@ <string>The number of cards counted as incorrect (I do not know). May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picCount</cstring> </property> @@ -413,7 +413,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -432,7 +432,7 @@ <string>The number of cards in the session</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>lblScoreAnswered</cstring> </property> @@ -459,7 +459,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -469,7 +469,7 @@ <string>The number of cards already seen. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>picAnswered</cstring> </property> @@ -481,7 +481,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -500,7 +500,7 @@ <string>The number of cards already seen. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="7"> + <widget class="TQLabel" row="0" column="7"> <property name="name"> <cstring>lblScoreError</cstring> </property> @@ -527,7 +527,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -548,5 +548,5 @@ <data format="XPM.GZ" length="29635">789cdd9c59536349b2a0dffb579475bcb58dc5456841b2b17910082476891daedd87588f401202b4736dfefb7884bb878e1632c9aaec99b2694c957c9c25c2c3f73847fd1ffffae3a17dfec7bffee31fa3b11a3f9b3f4c577dfcf12f3b190c16fff95fffebbffff1cfc2cece1fe153de2bfdb1fbcffff18f7f8af91fe60fb113ff17b996b81a588d990b787c465cc2f3954c8ce78f98e9fc297195ce3f4a8ce71799f17c7b92188ff37c0c5eef7b89e3714de31768feb64e4cf3d3c791ab69be93c478ff43661cdfa5e338be3e21e6f98bc478fc9e99ae3f4e8cc7df8869fef634318e3f65a6f5aa22b33c6e9618ef77c08cf7170b62924fd0fc0b345fdd27a6f18d0e0c77a3f1dc09328f9765cc78dcbc10f3fd2f89e9fea24d4cf7570de45db6274f4cd7674562bade45fb2a54f97cf5404ce7fb7a6294d711b33e14318d9f7503efa6f1748198d763404ce78b0cb9c8f3fd24a6ebcd1e31cb8b5ce3f3b3d7c4a8cf6b62b6b773621e7f9f98c6771ab944f73367818b053e5ff588597ff78971bc1b64be5e7413e3f10f629a8fed258ec7fd9c99f43d23a6f1ad899ce6a74f89797d4c62d4cf0533d9f39898d7af9318e73723667d98c4f17846e395cb349f68ffa5025fef86c4bc9ebb8951be2633ce471be432dbdb59e278be1932d3fcebc434be2b25c6f93d12d768fe2f89e3712b90f72cad2fce4f95cb349f77623adf4c99e97815b952208ef1b0bc5bb6e8ff7e9f79b716e7f7865c29d0fd5acc74fd0e318defcb89f1fc3be65d5c6f1aaf42f2f91b624bf247ff2ec3fc8a8578ff5d625a1f75c04cf17d4e4cf28a0a33cde79e98eeefaf98e9facfc4180f7bcc385fa591f7485e534f8ce727c6f3b31631ebf739318e6f98f17a17e35d05d6a318d7db5689693eaece8cf777a7ccb83ebe9f385e9f2d9079beaa9418eff7ce4cfad827a6f9f83b669287af277db90233e50bc54ce7ef12f37a467fa82479fd8819edcb8f99511e7b454cf777b7cc78bed82726fd699118cfef32937c378971bc57e42aad87ba65a6f9477bda2b32db69e278bde2e3b43ebe93188f3f12d37cb32133e92be6a33dcdf15c58628a674621a7eb0f98c91f5e89d93edf13e3f917c835922f3b67a6f98ac4f17cfdcc4ceb1ff55d2da6f8dc404ee77f30e3f9a24f4cf2eb4f663cee1c31c9a34e99693d5462d44fb4ffaa4ef1fb3931eaf78919f59fe17c748de41789c91f769015ebef8299e43d4c8ce31f10b37dce98f1fc4c25467963fd512bf1fdb31b66f2e72362bade3c24c6eb1d7309f5bb205674fd0b7349c5f9d4881d8e676e99f17c2199f17ee60359ef92ff4a66b287a7c418ef5f9849bf6fc415ca97e3c4e83fc7c48aee7f9d18fdfd9499f415ebc99aa972beeb21b3bce69598e431136694473d23c3fc50de33663c9e7512c7f5b22d629a7f564e8cf63462a6f9f1fd2ab83ef29e19c7538619c7f315e632f63fc7c4b41e6a2731aed72b338e274f12c7e3f29699ec73c9717c49eba11dde5fd613e3f50b66baff7e621cff9319e5335789513e92d790bdc86162bc7f8f99ee3f4d8cf509ad87a1f5164789315f3c31533d7448ccf612f5ab4a55cae7ea8599ced7c414ff5513b9c6f9b94a4cf6a51f90f52eeac77f12933eed3133ead33612a3fd4866bc3e7b23267de91233e5e72633e9eb9199ee9faea7fb1799f1fee68998f46979fea44fff9218ebab13661a5f24467fb6cc684ff23a31fa579919e7e77a89717e1933cecf923cc93e3e13a37d64cc641f8dc478fc9899fceb3231cea7cb4cf1e73531ae678598ec4bdac4787fc14ce3ebc478fc9019c7d7b3c4b85e3566ca4f85c418dff788c9bfe57962bcff8899c6ef26467db599693c9687fcddb788d9bfcf12e3f537cc94df513ec3fe601532fb83cf8839dede32d3f17662bc7f8598fb872633f9f70733d547683f86edc9b598293e1e268ef6941d21b3fef565628c3f43668ab70566f29fbdc4689f5d66f21f4f4cfad75789319e5498717c719218f3719399fca59318e793cea7fc7a9418e773ce4cfe724d4cf6617698c93ede12a37e0e99697d6789d1fe8bcc540f0e13633e4ce3e1fc641a8fe63762c6f9295e4fb237fb9418f323eb87e28fb84f8cf65e6526fd65cc54ef9c2746ff217bb3142fac6326fb6b3093fc51ffbac4f6e7df99e9f89271fc5d62ee07769849bf77cc7b3ade6fc85c2dc6f3fbc88aea677bc64ce3d1f9acffec9898f4e3cf98c95eeacc642fef89a33e748599f2d35b62f4974b625a6fad99c97f9e98c91e6e12e3f803669aaf4c8cf56409d9b2ffb599a9feb8488cf29d1093bff8180fb4ad513f92e17caca2f8e38e98293fcd9969fda7c4bc7ff1c24cfed923e6fcba9718f5394636949f3cced75af6c7a86f53e6fe4d8c88a9becffacc246f8798fbaf4f62924f9c23ab32cedf0e98d17e4409d972bd502026fdba983f8de57eca6b6445fb2bea0a5957f07ea6474cf141086287c77dcc7fb6ccfd94e920f3fdec2bb2a6f5329699ec2531d9ff3471942f1b11937d650f8971fe3bc81c4f9d21e6f815edc93a8ee7be48ac70fd32c38ce3e92e31dddf5e32e3711be7eb2adc2ff945e2a86f7180ccf69cdd3153bfb5c74cd73b66bcbf9913937dab3e33c5d70133adff2d31c7df5d628aa7fe3231c6a33233adff11b2a37a4af9c4180fe97ac7fdca3933c563bc9f63f9dc0133c59bb7c4e80f7d628a5fbac58cf2ab7de65a29aedf3531db8b4f8ce31d3253fd78c34cd73f2736713d8e88793dae98a91ee926c6fc72c74cf9f82131ea5730533ccd98717cd144e6f51585c478ff0366ea1f64629c5f8399ec793731e6e31b66daeff84c8cc7c7c45cafb612e3f87366aa07668951ff0b66ead79e99d1fee41e31d7a383c478ff1766b297bbc478ff8c99f603ae13e3fcc9be1cd9b3784c8cf1688799ee4ffaf1b4be599c8f07ff20fd9c33a37e4c9198ebc54162f4e72b66b41fdd464efad967a6fdb02766ca7775668ac7e97c1a7fc9f1fee69498f4a33bcc949fca8931be2e98291f4f1263bc51cc641f1789315ebc33d37caf9851bfea2e31c6cb0633cd7744ccfa7f4d8cfaef33937db9c4789ce525fdeb6962d43faf37f9bfba4c8cf2cd9929de1c32637cd78fcc240faf27f73726719c4f67cc4cf3558971be47cce40f178931bfa5eb69bd0789315e3d3053fd41ebe9b99f6d26c6f13c33cde739311e2f3153fea3f97adeffb865a6f8729018fd23e633efa17e89f66e3e9153fd7082ccf6e22533c5ef51e278bdcb98a9de5830a3bdbbfbc4d17eb229b3c2e39e98ebadbbc4a8ef0b66aa07c689d15e9e9869bfee2d31d69be7cc54afa5f1703eaec88cf3318e98ec219b25c6f5ab3093fe1f99295f5c25c67ae29999fac9fbc4981f7798d13e4c8919ed377b4f8cc70533aeafbe4d8cebdb64a6f5ed306b1be59f309b723c7e86ccf6670acc647fef89d1fe2e9829fe5513637cb961a6f5d84d8cc74f99297f7f24467bec33e37ac81a33f9732b31d60f5d665c0f554e8cfa7d65c6f5c81cb389eb21f87e9c0f3f12637dcce773ff3e64a6fda24662acdf2c33f5c385c4988fae99a99e6f3253fd7dcc4cfabc67c6f9fbddc4f1b8d5c49c5f07cca48f2233d5ebd789d13e3d33e5c3e3c438df4366daef607d90ffd80933d95b3531d65fe41fde53fdf4c24cfeba488cfebac78cf7eb8ca5f8777da45af95d874f62232d7d7ecb58d116fe6d92fce4c392d8df73bfdfa0179b5bdf5f999dfdfbe9659b24ebb30cfffeae19ff5bf5f253e9be3c2ff88f5bfacfff7bbd7c439aafcf53bf4f927f8f5e3a5ff8d08facf0efab975f94ee6fa617e9e3bf197cbaf219f845f6822f504e49d624fbf0770f9f413cbf07dcfd7be945beca21cc2e8bbfbfc4190a90e84dbe83642845067fcfe0f72efc0d7f7f8e5264bf4ff7bf432ff2438e607643f87d14f403520da3f50409c77292f481d2043d4de50c3e73b980cf6f93e6b7f9cb274932ea2c7de313a40affd683ce2802efcb03d9807f0fe551d4175bdbdf432f36ceb809928459b7643d774c93040df837ccfe18f471224f81e7f1dc70ddd9df2aef9fc38ccea375f561e61730e3537929dbb223afe4b5bc91b7f24edecb07f9289fe48e2cc0df77655196e05c0fd795ff56f5585356e41e48f22eabb206337d125208a184164658e1848f3f4e64a22b9ec58be889be1888573184f3fbe2edf748f24dbd7c9507963962005e7c2a3be25d7c889118c3ac27622a66f13313f3f4338b7f9b8a85f81475b12f0ee09a06e811ac9074fc17f2cd37f402771787f0398aa3510f0211f5538065899638967371224ec599381717e232ce977fe65ffccc48aab6e880feaec4b5b881b8d682fbdd42ec0b710ea283b8039f7a11f7bf4f2f61adc48338148fe249eca024a20071e943d6c5aecc445194445954c49ea8c6d9d7e867bb1474544925224fc5a5524a2ba32c4487961cc218dde04b2089564e0ae57fb75e409aa3b5bfd7e54c65aaab9ed58bea911c7348f13f926429699487fe166d0ee4e9ab81aca9578871a18e08511e32ad7afdbdfe023a39128fc947c0b260b4991aaa37f5ae3e602e643769763ffaa9a9911aab316967a2849ac6ab176aa6e6f25e2dd4276455f6c3a89bdfa617f888a7156fdf039d9caabada5707aa11f401b33bfc961cdbf50392a9a3e8416dd504976cc9431a6b4415d0b7fad6efe517b06196a4228d3a9617ea449daa33f6105ee72f3c7e8bd5255b6459c6f18c20cdb9ba5097aa0dd16518a5197cb7b6fe95fc12eea23a70a75390e44a5dc759a3656d7ac8dabae723025895402d828dc978f53cdd01a29bba51b7ea4e9c80df0c5547dd7f773fe197f23edec9c90e8cf54092a007e09c36e558e5bca4a81d91bb4b2e5eab6bf5a89ec4098c19b2f06fd44bcc2741d3af6a07745250bb90c36769e4394557b295a483f56cc25a3c52c5156b3b5ad32746b6b62aa9b2aa88a6da83990f39764216107f492f219f58885d755505ebba4549481379ed0449466a94b3969aaa41426a5015d3d6722915c8244967580b2cad15ff9269a195d6909171455fb1e383bcf617e2184c3af41823e9200a5f8175b1ddacc4d99c3666aa06eb7aad8d2a69ab9df6cae84c9ce9ae7ed62fba273e753fce3dac478aceec3f89667aa05f55172a1c157bd56cbd075df79d6fe9a50e6b3194333d147df4f8b4f6ab3129caa1df6045dff5871ee9b13855433d91977aaa6750a514a16eeee8b95ee84f5dd7fb2aacff5c1f048dae79533c22a67a5f37f461acd7b8db0e1dddaaff9a5fd18b3e82cad1e9a66e69c331388ca98ff5314a02c39ca03ef4a93ed3e7f25a5fe84bdd56afbaa3afa07e0e1dda30f436109b7afa5adfe85bd0d71dd4cd13bae3a1becfc993ec0eeef7a01fa1df39802eee284af3f6e7f512f3fcae7e526f7a07f2492eea0449482bd15f7541ef6a587b5dd26518bd0f56f10abde532f65420a2875ec7ca39e4f65d5dd17bba8ad936f9df3c79e11c343c0f5f8980685395fb4642bd16baba8b554996d27ca71e0b158b1146c551291ae5638fd1411263c29b4dd0bf64c619cf9f28d120d672d441635d07d977df64a66b9e85d4a7e68563628a8af334cea5e9c9a2e9c77e741ffa524dcf0e362274d2cbd6984d674eccc0bcaa1baad357ed1aa372cd0ccd9b7937d27cc4f347a08fd7e8ade1f349b55c9020f4f7f52819fedb35633331538535432dea472439a2e7989999eb1bb300495cec36bef07ed2cb7a061a456f1fc851b00add319fea05c75a6644350923059d6869ea665f0d61ddf4fa0830ba0049cecd01c4a297a89b217cead193c3eed3c034cca139324d90661e7d66b58288ab655ae6d89c98d3b8b7335a9beb9abf6cab0c8224d24305f10a9d56d99cad44afbc8d55953673736e2e20420ce28e44b200bad739e4ee61a850cd259c53326dd33157e65aee77c6e606fed6d353736bee82376e54a87144736f1ecca3793223b303d2f0bd711771238ead5706618fcb14409ab15ca8d06955a325d7383b2e7b0fb36b8a7aa8afa3f52cf591d78d0f3e07b368c9862999b2a9983d53958fb20d3ed08a957dcfd42c9c24a662bda241595eac025f7432b3da3ca527216ad52356fc85d7318b11746076c2bfe602badfbd5c7732a35a3066006bac15af605dbdb4b3e43762ff4836ad83bfef5b6f33282cc35e405bd76d177ac913f9218ee0d8b17db62fb617f3ec7ce36726f66c5f37419ab790ff7f9cf7579efcbc2c6b1ea9f4d00e82563083249f8fbeaa07f6d5063fa9a34ec0227927365f0936e504d65fab967db3ef20097af6c47ed89179b463b8e60ceaac133bd1cf54e96d5474aa66a7fa36d6ce5fc6dcad7a09bbd723ace8ec4cbc1b13b5928b2e98a7e1fe733bb40baa3c9b20c9727f381f3143adbb2f1ab66b3fa11b9ec5baad2866b66ef7e5a3012b168f706dcbcee4139c314dd22459601d67f6c036e4ae1d83e5c71af1a77a415df4a99783fece94ec6188fe4aae54918771ad6eec916dda568c10063d9c76c357f402b150804e8e412797c152ed891aeb7b7b0abf3fd8337b0e7e13560fc6b317f6529d6fca12adbb6ddbaa2e0fa2e56ff8ca6adecf591977a50b5515afb6b31a8be1ce500d87f865af2c547caa63af638fd18c957997eaa5204185570774f7686f42bd122bfc5aca4cc1d23e21ff4f411ab88772f6d6de25cdacf98c9dda7bfbc0318ce6fc459d9cf4f24c9edc87aaee498ca3b7e76b25fc3dd3e710f39d7d5cd129e7e4a67d8a3da897daee802405d0c9b23f59763f907d4dd39445113aef3d39b2bbb628b29429f39a99da9239d29d98633e6316ce49b5518f25bdc099a1d7167a2264bcf37a8f18aaaf775bd665a854461b9deba7dcb31559c648a0a776cf56453bd607e3a8e119f56447248fb73527a1ce827be8997ad2ef10cba6ab5a897691690ff5984935459cefd2dab6eae505a409b3534ec0ff261485b953c1fabc0d55fd05e40bb7a5836dda8a53e03f1045ec8e29839fb4979d16d58ed31413a11e76da1995c5d5bc7010e6a1f25b93258e3971ce79d44b7ebe5fea251cdd072b0bbf6bd9866c3015b9ec45bd13c47b97e94bd987ea71a317b74f602d61df7f2186f2da7563753d075f5fdae734ed0c8618d270cfee057c2acc2ee8f10dbaa46d7a9942a7d98c16f6ba5abd6cd74bd45ac848512fb223f46a551c650977357aacdba1265ea9eae913a3f3c2945ccff5a1875caf46a916a6ffd6f48bbd7503c89a10e2a0233e74af6eb85e8b63e4746ff20abc9ff4f2751ccbe945cbf768eb1a3cdf6cd10b8cefdedd871b85f5016f5ccf27a12a817ce27a3674c369565403e5577ae6c6b60a9e7fa367f248843127f248d59526bd242f7531c3aa992a401f936dcffd5bf512faeb71dc3dba16766d7da22cfacd4da1fbed847802ebd45feb149eb1eeb26741129724c97526344b377673bba7aae229d61a3eee896ae8e63ed02ed7bc74a6cedd02f4d7ff15bdc06702bf37dc676ef7886489b3a84287aba0fb3550e9f537ee7a2cdba6ec62ffebbe7a7611bb1e57b77b6e5f2e3ad841dbd873f64dd71d844a67d961927542cd241f5d23ea258bcfaa37f24b3e1e44ddf4e31a0d25642ee1d7a20956626d77282f21c7076b0a9dd679ac7a9a98e3650da2f03b542bbc33b6b28b1963d934d4beeec83583cfc51d09b005e8d446b1b73995f710f9e6a92a4ff2ab075334271dec8b1a5bfb7dce2be10929ff6e63647ed8224b8c3cca40ae864e4d1cc10c2ced2d4ec2933ebb702d558a73e16a3abf7309ff75c7605d27eed416cda3fc7467e2c99dcb5e671c2bd451b05077015139e96ff903de751ce25d9ceb321b6cd14bec404dccd5226a11d68776c356ed1cb29bcec05ba16a24ff188a96bb8cfb353518ade0c61b5d483e438da2c7b55d47d5dd558c83c3a89396bb8e2b786aca24cb9a66c0bf6ee465077db9b12ac9ba5e3afca420e4fd50c13c80bf6cca328791cec44dd8b98e4f15c20e5cd8356a08d097bb8dcff9a6319f6cf689288d8c36f66e8a4ec803e85ff640bfb7411a59177721f76f970556f6ccdd454f487af9228e717d8bef4e04bd3c8acf6db2884bdd954518b912eaadd8b7b7a0126d41147e47afa5fda1d5d8b57e97852ab97bc8613b311f85679561450edd835e241b5d91450fa08745bda89fe47dae8f636f09721fab37d1dd1285665aea677925ebc1d3837540cfdeb03ee49350ad802423ac56482b4bfb5ae61aaccadaee5dbd99767ce28abb4d100974d33d6ade6b5eb16dd5b36f7a92e297dd8c631b7a1944ab59c89979774fc97bf3f174a65f6407ce3b87f37a30931ef4395db74355fdeaeef26a9798626ca87c812e5d5dde41175602cf1f63bd20af5c21566ce92ade8777bbaea84ba1aafc693dc67a091d95866e745f165c69b3670dcfe3744fcfc1b29a60eb03f84066043f699324f9a7315b3aded86d534484dfa76aeecaae22ee6825952ae89dd8c7aecb02b539ac6e03abfd7549b6eb05351dbdabe3f6623551c3e88335547cb698995bd38f7b5f43e9edcc54a29f8c20dee66c9c6d4cdfc72a2edfbbac3c15b0fbaeea6aa16704dd54dc420f569eb6d5e833b5532f2122f5b73f1b5bf6fb6bfe12f69e16e6d10b5bc7fe85f6c379077be2951e520fd9f3da0499675845c7a75db9a7caf139f15c4d5662da32e3046b9a78037d4bd86759e8a9739429b91295b42a0b6f654797bf7a3f23d7eff3bb7736bea1133e2d3df3e12d96f48c27d90e8cafebde9b93b017d9199b2b9f450b1b91acd176925f40668cfbdcf927ae2bb124f4ca4a7baf86beab4efc33dbc25296b07b0133393325ffb2566dade9656d1fb0179fdc3c879a55bc8a7ab2dd3407df83d9ee6b27c26e75d8a9bb763d5d0f7b2c94558e04e90263afeffb7eec91974fbe562263d8c7d07dbbef07ba029f41ea90973616e2441dc63ba6fa8fbb932df518f52bfc4e64173ea3f8eed1ae7fc52758f93944add7fcd0bf992cbcb3a25e65db9efbf7f80c6f4afb4fbc635ff51f90a63b7e1464ddb62bc19d26dc71ec271043aa395f5b6a6eeaa7fa461ee0f317894f811b1b7ae1ba46939cc1f333f0e80af488333fc35d87646782f3839ffb85ab057f81cf89f57664f7e3f3e55ccf085547dd7fca2b1372fc3b65c06d99333c399afbbadf8f7ba46bcf4542e473637fa0aa6a87f6c72cd5645feb252fa7f50d9066ae0aa213c6413b4b193d44b589ae9a67d0e100baa8b97a358fd0471ec5d5a728aa1edcdc1f422dfce98f9c70f72eee906d4a132279ec27f21968a5da07ad34e5937f817ee93af9f78ff4b2fa0d8f816f419df4e68fc13a2e97b2505c1ea960c16df0c60b7f0255e5507ef853f3688eeca7aa91a5c5fe84f2f4441ef8337feeea1bef94b19d85e7d087394d25ad45afabba777fe12f61d55e531cd35fea65bda3e258716cf68337827f525c8e16413bcaeac64c74781beb11ce2fcbba9e82dfb4e33e8ad72faea9aa6185a06f34a177741508569ddc1ecca6ad6db7c199fad05083c70c9edf495c798bfe1bcf2b9d1dfaabf8cc62ccb280fdd6b8da35bb76cf5fcb29549967204d789652f6374efb1be8a81a3182f4a03f19ca3da8509e65d1dffabb65ef8c716fed675d6fe04bfe1eeabf0654b0bcc31b9e7de67717c5b79e5736c48d38f3e0d390edc629e2d7685739c4b3b65e989a3c14bbb6225a32f38ffec9efb817e8db67e17dd758b3ed40a51376dd4bbee077ed67ccc03f7af36fe931a1fadbf7455f8aabe157f726beacc7b6eba5ef5fc4a9adc69e37d71de6f3b62ffb8a7d8eb9067a4cb5234b2a3317f14969d8cd0d95fc082ad0b0fb07fd89ab897753075f9b6eece86d9728ec8b85bdea8a6fc4be6ae549a2dc782ef643695afad2f64567a573a708434f4a1756d817bf07f56e0b7b91f8ce7e1f3cf523bc45077fdb0bd2844a14ee77208bfad6ee876c14debcf8521f44beea6b662027be01d1a8b5fa7ce717f562ecb5ee64d24e537fb4d657847a0b6257077a9a27c8661771a4213d451ac57797f7d471ece54d7cba2174d97433e1c76e4cd17dcb4f7a87e93253100b75f0f6d0c7e623d3d7fdcb171febcecc93acf9cf4ca7bdfab567bd94b99dfdcc8cbc87918fa3870ec471d451333d01b771dfed5566ae91d9cc653eb7fe1bda09d26459d6cd9ee56588be71f6cf7f4d2f901b5eed43f692f5e2db30b3dcec97fe3bc3aca2ceb3be6dc827e8d44ee3be8e8e6fbbfbd87f8618b480fea4a2a7ea241bf871f6fad5de59eebf97d910fcab6b245cefd3fb305bde8afb8ebf1827df44217bcbdeb30fd5cbf51ff99197d1742aac6965237fa8caaa9e8d4d37eeef1ce999dd9145b90b75b0d79fd9440fe21b8ee97d870d3f59eaa7a6ebd95476409a502d0db90a5eb7b46fbda7d4c86661df18d65365737a3711ab197ea724ef4721864af5a0ceb5c916fac35af52c1fecad7cf0b3ec5369d30229daa95b1be764f92a8e417da17b595d0d202e0eada69d3eb76e69df8a63a7f139cba7eceba76c3f3b88d174bed607af7757f107ec6e212e55037e1ea0ea6c474de4e7fdf57bccf99f50274c40370d730e83e2b317b7f27eecb7f30be8a38cef1c6533dd544fee1d3b8cd8b7e76bf3f53e6bbd4a648faee5de65dcf0f6adb55a78fbaaef0aea323bcc7f5fe64fe417971de11b54e649b775336bbaae2ec4fbbfa537ae56c75ee5d1dabcb7493c4bd26cd14c7ce607155ed6029f79cb3f1df9b538d61943a775a1afc27396204d36cb8eb313fd4acfae67dbfa44f4a77c4e5dd3d9d7d5cb177f0f5152d5b2d3ec2cb7bfffebf945c427792e4400e343c6124dad552b3bd7a7c1fe7ff2063f74fe4ad07ba23f96221ecdb22fa2344802f1fe026261fcde13c7b15fd54b76299a5063857cdeb28faa93b521e335fc71d6d1b5edbdd54f567ad5fb79a76916734997be75b2228798805e32af6401e217e6978db7bbbea9978de791615dcc497665caa6677e56ed6e4ab02e4b0dbff7e3ab99ca9eb361fecddfa8591973b08aefc4f6d3f761be7eafef8755cc8624cf59fc269b18aa2cbbd63be6debce0b86bbebba5da598be4945ff5be16bea6274e841a3af437d095a2340b9064a62ea00e3f0e6fc56f9bd35fd04b2b3ec7d250ef9eb80788d2e5ec26bb855850e55d0b7c37561dbac9fadbbab83f1bdf9be5ef2655d587bff7453d34e169af335d57d4bdf856c1143d3e7c5bc1efe9a6b8c3f769d757f957fc6555228c06f1fb7a879087f78d5415f3a886d99dbb151da87c57bb926d5181f759a6c2f9a6fd84eef7ca97e0be93f0dc00d47e9dd5a334d3f84461600fedb36e423416a2f5a339fe99eff1c98fb8af99c5ef4c424d200ae13d7f7f96dddbb7ecc1ddda52faeedb7aef98befba6aeb3c7ec29db914f597877b601fd4de8b4420f0f55a4866a32dbcd8a4127fa33f849d8390f3a094fbabe9ad79ffa7e2546c556fc06ee0222f64e789e0cf9e718f453771fe64887ff1f1be1dec0cecff5403d38e854d403fcd673bbfadd4ebdb5c7ee43dfa8aa7f014bd5a1830b9d16bd0d94c17d8b90e34b20ef45dcab9cc7151cc64eee2fe5fdf58f3e8aefc9eaf8ae18589b39353b56430fd9cfcafe482e40aa86f3ba29afd4895bc847538499df883353f487e00b15f9a486e6d09ce832be1b0033edc6e7d6adf8e4b5670a32ecba1ffa6e7666fa71d7b5b7be927f3a8e6d5a59d86f1ec4ef7c0be9512f61dfca14c2ef3402f43c60e327ae614eec425f66157da9a7e6c4edfb177aaf9c67844f4bfab1cb0adf210fb5f030ec208699cb56fc17bfb91ddeb37dde8c487f5e2f5f44ebe5dff0ed9bf4b6f5ca2ae0dbd7dbeeb5f1d6e1963dbbade3ff257ff99124e1f3999326bd53b41ed9b7db3c4a45fb912b7ffff9ff37c65fd1cb9699e1373b56759151e7d4d8f21e3ebf8f897b90b97d6deab4446e8f5be77788b77dbe9ff77fa097f5bfaf5811fcdee03e70db0af01ee44a5d419d16e9e3f7e9656baf909fd5da9a7d65459b7f4709f58facef9bb6f14dbd7cd5f9e4efb4f27ce07b92e864795bf4b5a2a31f48f4cb71ec2b0fff91f5fd60c42dc7577b91706e2577feb671d37d7d23dbfbad7ad98c43ab5efae56cf2e7af44f5dc3d7fb00a704eb60795cf9fa8937f76deeffa7c77bcdf93f7ff9e9f7ff7ff2fdcffcdcfff577af9dffff31fff075dc58bf2</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/keduvocdata.cpp b/kwordquiz/src/keduvocdata.cpp index 48b20f8e..3afe5ac2 100644 --- a/kwordquiz/src/keduvocdata.cpp +++ b/kwordquiz/src/keduvocdata.cpp @@ -69,13 +69,13 @@ TQString KEduVocDataItem::getText(const TQString &tagName) const return element.text(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } //////////////////////////////////////////////////////////////////////////////// @@ -156,7 +156,7 @@ TQString KEduVocData::language(int col) else return document -> documentElement().namedItem("e").namedItem("t").toElement().attribute("l"); else - return TQString::null; + return TQString(); } diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp index 787cabab..4cf9ebe3 100644 --- a/kwordquiz/src/kvtmlwriter.cpp +++ b/kwordquiz/src/kvtmlwriter.cpp @@ -21,7 +21,7 @@ KVTMLWriter::KVTMLWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(outputFile); + outputStream.setDevice(TQT_TQIODEVICE(outputFile)); outputStream.setEncoding(TQTextStream::UnicodeUTF8); outputStream << "<?xml version=\"1.0\"?>" << endl; @@ -35,10 +35,10 @@ KVTMLWriter::KVTMLWriter(TQFile *file) void KVTMLWriter::addHeader(const TQString &generator, int cols, int rows, const TQString &title) { TQString s = TQString("<kvtml\n generator=\"%1\"\n cols=\"%2\"\n lines=\"%3\"\n title=\"%4\">") - .arg(generator) - .arg(cols) - .arg(rows) - .arg(title); + .tqarg(generator) + .tqarg(cols) + .tqarg(rows) + .tqarg(title); outputStream << s << endl << endl; } @@ -50,12 +50,12 @@ void KVTMLWriter::addFirstItem(const TQString &ll, int lwidth, const TQString &l { outputStream << " <e>" << endl; TQString s = TQString(" <o width=\"%1\" l=\"%2\">") - .arg(lwidth) - .arg(ll); + .tqarg(lwidth) + .tqarg(ll); outputStream << s << escape(left) << "</o>" << endl; s = TQString(" <t width=\"%1\" l=\"%2\">") - .arg(rwidth) - .arg(rl); + .tqarg(rwidth) + .tqarg(rl); outputStream << s << escape(right) << "</t>" << endl; outputStream << " </e>" << endl; } @@ -81,9 +81,9 @@ KVTMLWriter::~KVTMLWriter() TQString KVTMLWriter::escape( const TQString & s) { TQString result = s; - result.replace(TQChar('&'), "&"); //must be done first - result.replace(TQChar('<'), "<"); - result.replace(TQChar('>'), ">"); + result.tqreplace(TQChar('&'), "&"); //must be done first + result.tqreplace(TQChar('<'), "<"); + result.tqreplace(TQChar('>'), ">"); return result; } diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 9dde6a0c..a13b0aa0 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -52,7 +52,7 @@ #define ID_MODE_1 1 -#define ID_MENU_QUIZ 1001 +#define ID_MENU_TQUIZ 1001 KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name) { @@ -68,7 +68,7 @@ KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name) initView(); m_dirWatch = KDirWatch::self(); - m_quizType = WQQuiz::qtEditor; + m_quizType = WTQQuiz::qtEditor; m_quiz = 0; m_flashView = 0; m_multipleView = 0; @@ -105,117 +105,117 @@ void KWordQuizApp::initActions() KAction* configNotifications; KAction* configApp; - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", this, TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Saves the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Saves the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); fileClose->setWhatsThis(i18n("Closes the active vocabulary document")); fileClose->setToolTip(fileClose->whatsThis()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Prints the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quits KWordQuiz")); fileQuit->setToolTip(fileQuit->whatsThis()); - editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection()); + editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); editUndo->setWhatsThis(i18n("Undoes the last command")); editUndo->setToolTip(editUndo->whatsThis()); - editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); + editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); editCut->setWhatsThis(i18n("Cuts the text from the selected cells and places it on the clipboard")); editCut->setToolTip(editCut->whatsThis()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copies the text from the selected cells and places it on the clipboard")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Pastes previously cut or copied text from the clipboard into the selected cells")); editPaste->setToolTip(editPaste->whatsThis()); - editClear = KStdAction::clear(this, TQT_SLOT(slotEditClear()), actionCollection()); + editClear = KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotEditClear()), actionCollection()); editClear->setWhatsThis(i18n("Clears the content of the selected cells")); editClear->setToolTip(editClear->whatsThis()); - editInsert = new KAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", this, TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); + editInsert = new KAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); editInsert->setWhatsThis(i18n("Inserts a new row above the current row")); editInsert->setToolTip(editInsert->whatsThis()); - editDelete = new KAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", this, TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); + editDelete = new KAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); editDelete->setWhatsThis(i18n("Deletes the selected row(s)")); editDelete->setToolTip(editDelete->whatsThis()); - editMarkBlank = new KAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", this, TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); + editMarkBlank = new KAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank")); editMarkBlank->setToolTip(editMarkBlank->whatsThis()); - editUnmarkBlank = new KAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, this, TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); + editUnmarkBlank = new KAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word")); editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis()); - //@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection()); + //@todo implement editFind = KStdAction::tqfind(this, TQT_SLOT(slotEditFind()), actionCollection()); - vocabLanguages = new KAction(i18n("&Column Titles..."), "languages", "CTRL+L", this, TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); + vocabLanguages = new KAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary")); vocabLanguages->setToolTip(vocabLanguages->whatsThis()); - vocabFont = new KAction(i18n("&Font..."), "fonts", 0, this, TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); + vocabFont = new KAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); vocabFont->setWhatsThis(i18n("Defines the font used by the editor")); vocabFont->setToolTip(vocabFont->whatsThis()); - //@todo implement vocabKeyboard = new KAction(i18n("&Keyboard..."), "kxkb", 0, this, TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); + //@todo implement vocabKeyboard = new KAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); - vocabRC = new KAction(i18n("&Rows/Columns..."), "rowcol", 0, this, TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); + vocabRC = new KAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary")); vocabRC->setToolTip(vocabRC->whatsThis()); - vocabSort = new KAction(i18n("&Sort..."), "sort_incr", 0, this, TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); + vocabSort = new KAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column")); vocabSort->setToolTip(vocabSort->whatsThis()); - vocabShuffle = new KAction(i18n("Sh&uffle"), "shuffle", 0, this, TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); + vocabShuffle = new KAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary")); vocabShuffle->setToolTip(vocabShuffle->whatsThis()); - mode = new KToolBarPopupAction(i18n("Change Mode"), "mode1", 0, this, TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); + mode = new KToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); mode->setWhatsThis(i18n("Changes the mode used in quiz sessions")); mode->setToolTip(mode->whatsThis()); KPopupMenu *popup = mode->popupMenu(); popup->clear(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", this, TQT_SLOT(slotMode1()), 0, 0); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", this, TQT_SLOT(slotMode2()), 0, 1); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", this, TQT_SLOT(slotMode3()), 0, 2); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", this, TQT_SLOT(slotMode4()), 0, 3); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", this, TQT_SLOT(slotMode5()), 0, 4); - - mode1 = new KToggleAction("", "mode1", 0, this, TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); - mode2 = new KToggleAction("", "mode2", 0, this, TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); - mode3 = new KToggleAction("", "mode3", 0, this, TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); - mode4 = new KToggleAction("", "mode4", 0, this, TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); - mode5 = new KToggleAction("", "mode5", 0, this, TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); + + mode1 = new KToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); + mode2 = new KToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); + mode3 = new KToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); + mode4 = new KToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); + mode5 = new KToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); mode1->setWhatsThis(i18n("Selects this mode")); mode2->setWhatsThis(i18n("Selects this mode")); mode3->setWhatsThis(i18n("Selects this mode")); @@ -227,56 +227,56 @@ void KWordQuizApp::initActions() mode4->setToolTip(mode4->whatsThis()); mode5->setToolTip(mode5->whatsThis()); - quizEditor = new KAction(i18n("&Editor"), "editor", "F6", this, TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); + quizEditor = new KAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); quizEditor->setWhatsThis(i18n("Activates the vocabulary editor")); quizEditor->setToolTip(quizEditor->whatsThis()); - quizFlash = new KAction(i18n("&Flashcard"), "flash", "F7", this, TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); + quizFlash = new KAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary")); quizFlash->setToolTip(quizFlash->whatsThis()); - quizMultiple = new KAction(i18n("&Multiple Choice"), "multiple", "F8", this, TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); + quizMultiple = new KAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary")); quizMultiple->setToolTip(quizMultiple->whatsThis()); - quizQA = new KAction(i18n("&Question && Answer"), "qa", "F9", this, TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); + quizQA = new KAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary")); quizQA->setToolTip(quizQA->whatsThis()); - quizCheck = new KAction(i18n("&Check"), "check", "Return", this, 0, actionCollection(),"quiz_check"); + quizCheck = new KAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check"); quizCheck->setWhatsThis(i18n("Checks your answer to this question")); quizCheck->setToolTip(quizCheck->whatsThis()); - flashKnow = new KAction(i18n("I &Know"), "know", "K", this, 0, actionCollection(),"flash_know"); + flashKnow = new KAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know"); flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card")); flashKnow->setToolTip(flashKnow->whatsThis()); - flashDontKnow = new KAction(i18n("I &Do Not Know"), "dontknow", "D", this, 0, actionCollection(),"flash_dont_know"); + flashDontKnow = new KAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know"); flashDontKnow->setWhatsThis(i18n("Counts this card as incorrect and shows the next card")); flashDontKnow->setToolTip(flashDontKnow->whatsThis()); - qaHint = new KAction(i18n("&Hint"), "hint", "CTRL+H", this, 0, actionCollection(),"qa_hint"); + qaHint = new KAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint"); qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer")); qaHint->setToolTip(qaHint->whatsThis()); - quizRestart = new KAction(i18n("&Restart"), "restart.png", "CTRL+R", this, 0, actionCollection(), "quiz_restart"); + quizRestart = new KAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart"); quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning")); quizRestart->setToolTip(quizRestart->whatsThis()); - quizRepeatErrors = new KAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", this, 0, actionCollection(),"quiz_repeat_errors"); + quizRepeatErrors = new KAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors"); quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions")); quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis()); - configNotifications = KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection()); + configNotifications = KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection()); configNotifications->setWhatsThis(i18n("Configures sound and other notifications for certain events")); configNotifications->setToolTip(configNotifications->whatsThis()); - configApp = KStdAction::preferences(this, TQT_SLOT( slotConfigure()), actionCollection()); + configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotConfigure()), actionCollection()); configApp->setWhatsThis(i18n("Specifies preferences for the vocabulary editor and quiz sessions")); configApp->setToolTip(configApp->whatsThis()); - charMapper = new TQSignalMapper(this); - connect(charMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotInsertChar(int))); + charMapper = new TQSignalMapper(TQT_TQOBJECT(this)); + connect(charMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotInsertChar(int))); specialChar1 = new KAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ; specialChar2 = new KAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ; @@ -299,12 +299,12 @@ void KWordQuizApp::initActions() charMapper->setMapping(specialChar9, 9); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool))); + connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(KAction *, bool))); updateSpecialCharIcons(); if (!initialGeometrySet()) - resize( TQSize(650, 500).expandedTo(minimumSizeHint())); + resize( TQSize(650, 500).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -333,8 +333,8 @@ void KWordQuizApp::initView() setCentralWidget(m_editView); setCaption(doc->URL().fileName(),false); m_editView->setFont(Prefs::editorFont()); - connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), this, TQT_SLOT(slotUndoChange(const TQString&, bool))); - connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), this, TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); + connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), TQT_TQOBJECT(this), TQT_SLOT(slotUndoChange(const TQString&, bool))); + connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); } void KWordQuizApp::openURL(const KURL& url) @@ -497,7 +497,7 @@ void KWordQuizApp::slotFileOpen() cb -> setChecked(false); TQString filter = i18n("*.kvtml *.wql *.xml.gz *.csv|All Supported Documents\n*.kvtml|KDE Vocabulary Document\n*.wql|KWordQuiz Document\n*.xml.gz|Pauker Lesson\n*.csv|Comma-Separated Values"); - KFileDialog *fd = new KFileDialog(TQString::null, filter, this, 0, true, cb); + KFileDialog *fd = new KFileDialog(TQString(), filter, this, 0, true, cb); fd -> setOperationMode(KFileDialog::Opening); fd -> setMode(KFile::Files | KFile::ExistingOnly); fd -> setCaption(i18n("Open Vocabulary Document")); @@ -568,7 +568,7 @@ void KWordQuizApp::slotFileSave() void KWordQuizApp::slotFileGHNS() { if (!m_newStuff) - m_newStuff = new KWQNewStuff(this); + m_newStuff = new KWTQNewStuff(this); m_newStuff->download(); } @@ -585,7 +585,7 @@ bool KWordQuizApp::saveAsFileName( ) bool success = false; TQString filter = i18n("*.kvtml|KDE Vocabulary Document\n*.wql|KWordQuiz Document\n*.csv|Comma-Separated Values\n*.html|Hypertext Markup Language"); - KFileDialog *fd = new KFileDialog(TQString::null, filter, this, 0, true); + KFileDialog *fd = new KFileDialog(TQString(), filter, this, 0, true); fd -> setOperationMode(KFileDialog::Saving); fd -> setCaption(i18n("Save Vocabulary Document As")); @@ -595,7 +595,7 @@ bool KWordQuizApp::saveAsFileName( ) if(!url.isEmpty()){ //@todo check that a valid extension was really given - if (!url.fileName().contains('.')) + if (!url.fileName().tqcontains('.')) { if (fd->currentFilter() == "*.wql") url = KURL(url.path() + ".wql"); @@ -610,7 +610,7 @@ bool KWordQuizApp::saveAsFileName( ) TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</qt>") - .arg(url.path()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel) + .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel) { // do nothing } @@ -660,7 +660,7 @@ void KWordQuizApp::slotFileClose() void KWordQuizApp::slotFilePrint() { slotStatusMsg(i18n("Printing...")); - WQPrintDialogPage * p = new WQPrintDialogPage(this); + WTQPrintDialogPage * p = new WTQPrintDialogPage(this); KPrinter printer; printer.addDialogPage(p); printer.setFullPage(true); @@ -801,7 +801,7 @@ void KWordQuizApp::slotVocabFont() void KWordQuizApp::slotVocabKeyboard() { - slotStatusMsg(i18n("Changing the keyboard layout...")); + slotStatusMsg(i18n("Changing the keyboard tqlayout...")); KMessageBox::sorry(0, i18n("Not implemented yet")); slotStatusMsg(i18n("Ready")); } @@ -885,32 +885,32 @@ void KWordQuizApp::slotMode5() void KWordQuizApp::slotQuizEditor() { slotStatusMsg(i18n("Starting editor session...")); - updateSession(WQQuiz::qtEditor); + updateSession(WTQQuiz::qtEditor); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizFlash() { slotStatusMsg(i18n("Starting flashcard session...")); - updateSession(WQQuiz::qtFlash); + updateSession(WTQQuiz::qtFlash); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizMultiple() { slotStatusMsg(i18n("Starting multiple choice session...")); - updateSession(WQQuiz::qtMultiple); + updateSession(WTQQuiz::qtMultiple); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizQA() { slotStatusMsg(i18n("Starting question & answer session...")); - updateSession(WQQuiz::qtQA); + updateSession(WTQQuiz::qtQA); slotStatusMsg(i18n("Ready")); } -void KWordQuizApp::updateSession(WQQuiz::QuizType qt) +void KWordQuizApp::updateSession(WTQQuiz::QuizType qt) { if (m_quiz != 0) { @@ -919,24 +919,24 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) } switch( m_quizType ){ - case WQQuiz::qtEditor: + case WTQQuiz::qtEditor: // break; - case WQQuiz::qtFlash: + case WTQQuiz::qtFlash: if (m_flashView != 0) { delete(m_flashView); m_flashView = 0; } break; - case WQQuiz::qtMultiple: + case WTQQuiz::qtMultiple: if (m_multipleView != 0) { delete(m_multipleView); m_multipleView = 0; } break; - case WQQuiz::qtQA: + case WTQQuiz::qtQA: if (m_qaView != 0) { delete(m_qaView); @@ -949,15 +949,15 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) updateActions(qt); switch( m_quizType ){ - case WQQuiz::qtEditor: + case WTQQuiz::qtEditor: m_editView->show(); setCentralWidget(m_editView); m_editView -> setFocus(); break; - case WQQuiz::qtFlash: - m_quiz = new WQQuiz(m_editView); + case WTQQuiz::qtFlash: + m_quiz = new WTQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WQQuiz::qtFlash); + m_quiz ->setQuizType(WTQQuiz::qtFlash); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { @@ -982,10 +982,10 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_quiz = 0; } break; - case WQQuiz::qtMultiple: - m_quiz = new WQQuiz(m_editView); + case WTQQuiz::qtMultiple: + m_quiz = new WTQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WQQuiz::qtMultiple); + m_quiz ->setQuizType(WTQQuiz::qtMultiple); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { @@ -1009,16 +1009,16 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_quiz = 0; } break; - case WQQuiz::qtQA: - m_quiz = new WQQuiz(m_editView); + case WTQQuiz::qtQA: + m_quiz = new WTQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WQQuiz::qtQA); + m_quiz ->setQuizType(WTQQuiz::qtQA); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { m_editView->saveCurrentSelection(true); m_editView->hide(); - m_qaView = new QAView(this); + m_qaView = new TQAView(this); connect(quizCheck, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotCheck())); connect(qaHint, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotHint())); connect(quizRestart, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRestart())); @@ -1055,7 +1055,7 @@ void KWordQuizApp::slotConfigure() //KConfigDialog didn't find an instance of this dialog, so lets create it : KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyPreferences())); dialog->show(); } @@ -1064,7 +1064,7 @@ void KWordQuizApp::slotApplyPreferences() kdDebug() << "Prefs Update" << endl; editMarkBlank->setEnabled(Prefs::enableBlanks()); editUnmarkBlank->setEnabled(Prefs::enableBlanks()); - m_editView->viewport()->repaint(true); + m_editView->viewport()->tqrepaint(true); updateSpecialCharIcons(); emit settingsChanged(); } @@ -1074,14 +1074,14 @@ void KWordQuizApp::updateSpecialCharIcons( ) for (int i = 0; i < 9; i++){ KAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1()); act->setIcon(charIcon(Prefs::specialCharacters()[i])); - act->setToolTip(i18n("Inserts the character %1").arg(Prefs::specialCharacters()[i])); + act->setToolTip(i18n("Inserts the character %1").tqarg(Prefs::specialCharacters()[i])); } } TQString KWordQuizApp::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); ///No need to redraw if it already exists if (KStandardDirs::exists(s)) @@ -1096,19 +1096,19 @@ TQString KWordQuizApp::charIcon(const TQChar & c) ///Create the pixmap TQPixmap pm(128, 128); - pm.fill(Qt::white); + pm.fill(TQt::white); TQPainter p(&pm); p.setFont(font); - p.setPen(Qt::blue); - p.drawText(r, Qt::AlignCenter, (TQString) c); + p.setPen(TQt::blue); + p.drawText(r, TQt::AlignCenter, (TQString) c); - ///Create transparency mask + ///Create transparency tqmask TQBitmap bm(128, 128); - bm.fill(Qt::color0); + bm.fill(TQt::color0); TQPainter b(&bm); b.setFont(font); - b.setPen(Qt::color1); - b.drawText(r, Qt::AlignCenter, (TQString) c); + b.setPen(TQt::color1); + b.drawText(r, TQt::AlignCenter, (TQString) c); ///Mask the pixmap pm.setMask(bm); @@ -1131,7 +1131,7 @@ void KWordQuizApp::slotStatusMsg(const TQString &text) void KWordQuizApp::updateMode(int m) { if (m_quiz != 0) - if (KMessageBox::warningContinueCancel(this, i18n("This will restart your quiz. Do you wish to continue?"), TQString::null, KStdGuiItem::cont(), "askModeQuiz") != KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("This will restart your quiz. Do you wish to continue?"), TQString(), KStdGuiItem::cont(), "askModeQuiz") != KMessageBox::Continue) { mode1->setChecked(Prefs::mode() == 1); mode2->setChecked(Prefs::mode() == 2); @@ -1145,11 +1145,11 @@ void KWordQuizApp::updateMode(int m) TQString s1 = m_editView -> horizontalHeader()->label(0); TQString s2 = m_editView -> horizontalHeader()->label(1); - mode1->setText(i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2)); - mode2->setText(i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1)); - mode3->setText(i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2)); - mode4->setText(i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1)); - mode5->setText(i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2)); + mode1->setText(i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2)); + mode2->setText(i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1)); + mode3->setText(i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2)); + mode4->setText(i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1)); + mode5->setText(i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2)); mode1->setChecked(Prefs::mode() == 1); mode2->setChecked(Prefs::mode() == 2); @@ -1164,30 +1164,30 @@ void KWordQuizApp::updateMode(int m) popup->setItemChecked(3, Prefs::mode() == 4); popup->setItemChecked(4, Prefs::mode() == 5); - popup->changeItem(0, i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2)); - popup->changeItem(1, i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1)); - popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2)); - popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1)); - popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2)); + popup->changeItem(0, i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2)); + popup->changeItem(1, i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1)); + popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2)); + popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1)); + popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2)); TQString s; mode->setIcon("mode" + s.setNum(Prefs::mode())); switch( Prefs::mode() ){ case 1: - statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s1).arg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); break; case 2: - statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s2).arg(s1), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE); break; case 3: - statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); break; case 4: - statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s2).arg(s1), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE); break; case 5: - statusBar()->changeItem(i18n("%1 <-> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 <-> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); break; } @@ -1217,9 +1217,9 @@ void KWordQuizApp::slotContextMenuRequested(int row, int col, const TQPoint & po popup->exec(pos); } -void KWordQuizApp::updateActions( WQQuiz::QuizType qt ) +void KWordQuizApp::updateActions( WTQQuiz::QuizType qt ) { - bool fEdit = (qt == WQQuiz::qtEditor); + bool fEdit = (qt == WTQQuiz::qtEditor); fileSave->setEnabled(fEdit); fileSaveAs->setEnabled(fEdit); @@ -1237,21 +1237,21 @@ void KWordQuizApp::updateActions( WQQuiz::QuizType qt ) vocabSort->setEnabled(fEdit); vocabShuffle->setEnabled(fEdit); - quizEditor->setEnabled(qt != WQQuiz::qtEditor); - quizFlash->setEnabled(qt != WQQuiz::qtFlash); - quizMultiple->setEnabled(qt != WQQuiz::qtMultiple); - quizQA->setEnabled(qt != WQQuiz::qtQA); + quizEditor->setEnabled(qt != WTQQuiz::qtEditor); + quizFlash->setEnabled(qt != WTQQuiz::qtFlash); + quizMultiple->setEnabled(qt != WTQQuiz::qtMultiple); + quizQA->setEnabled(qt != WTQQuiz::qtQA); - quizCheck->setEnabled(qt != WQQuiz::qtEditor); - quizRestart->setEnabled(qt != WQQuiz::qtEditor); + quizCheck->setEnabled(qt != WTQQuiz::qtEditor); + quizRestart->setEnabled(qt != WTQQuiz::qtEditor); quizRepeatErrors->setEnabled(false); - flashKnow->setEnabled(qt == WQQuiz::qtFlash); - flashDontKnow->setEnabled(qt == WQQuiz::qtFlash); + flashKnow->setEnabled(qt == WTQQuiz::qtFlash); + flashDontKnow->setEnabled(qt == WTQQuiz::qtFlash); - qaHint->setEnabled(qt == WQQuiz::qtQA); + qaHint->setEnabled(qt == WTQQuiz::qtQA); - toolBar("quizToolBar")->setHidden(qt == WQQuiz::qtEditor); + toolBar("quizToolBar")->setHidden(qt == WTQQuiz::qtEditor); } diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index 66e7b440..7b038b11 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZ_H -#define KWORDQUIZ_H +#ifndef KWORDTQUIZ_H +#define KWORDTQUIZ_H #ifdef HAVE_CONFIG_H #include <config.h> #endif -// include files for Qt +// include files for TQt #include <tqsignalmapper.h> // include files for KDE @@ -38,10 +38,10 @@ class KWordQuizDoc; class KWordQuizView; class KWordQuizPrefs; -class QAView; +class TQAView; class MultipleView; class FlashView; -class KWQNewStuff; +class KWTQNewStuff; /** * The base class for KWordQuiz application windows. It sets up the main @@ -60,13 +60,14 @@ class KWQNewStuff; class KWordQuizApp : public KMainWindow { Q_OBJECT + TQ_OBJECT friend class KWordQuizView; public: /** construtor of KWordQuizApp, calls all init functions to create the application. */ - KWordQuizApp(TQWidget* parent=0, const char* name=0); + KWordQuizApp(TQWidget* tqparent=0, const char* name=0); ~KWordQuizApp(); /** opens a file specified by commandline option */ @@ -78,7 +79,7 @@ class KWordQuizApp : public KMainWindow bool saveAsFileName(); protected: - /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration * file */ void saveOptions(); @@ -172,7 +173,7 @@ class KWordQuizApp : public KMainWindow void slotVocabLanguages(); /** define vocabulary fonts */ void slotVocabFont(); - /** define keyboard layouts */ + /** define keyboard tqlayouts */ void slotVocabKeyboard(); /** define special characters */ void slotVocabChar(); @@ -226,9 +227,9 @@ class KWordQuizApp : public KMainWindow void slotContextMenuRequested(int, int, const TQPoint &); private: - WQQuiz::QuizType m_quizType; + WTQQuiz::QuizType m_quizType; - WQQuiz *m_quiz; + WTQQuiz *m_quiz; /** view is the main widget which represents your working area. The View * class should handle all events of the view widget. It is kept empty so @@ -238,7 +239,7 @@ class KWordQuizApp : public KMainWindow KWordQuizView *m_editView; FlashView *m_flashView; MultipleView *m_multipleView; - QAView *m_qaView; + TQAView *m_qaView; KWordQuizPrefs *m_prefDialog; @@ -309,14 +310,14 @@ class KWordQuizApp : public KMainWindow KAction* specialChar9; KDirWatch * m_dirWatch; - KWQNewStuff * m_newStuff; + KWTQNewStuff * m_newStuff; void updateMode(int m); - void updateSession(WQQuiz::QuizType qt); - void updateActions(WQQuiz::QuizType qt); + void updateSession(WTQQuiz::QuizType qt); + void updateActions(WTQQuiz::QuizType qt); void updateSpecialCharIcons(); TQString charIcon(const TQChar &); void openURL(const KURL& url); }; -#endif // KWORDQUIZ_H +#endif // KWORDTQUIZ_H diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index f5309636..9325c5bb 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt // include files for KDE #include <klocale.h> @@ -33,15 +33,15 @@ #include "wqlwriter.h" #include "prefs.h" -//QList<KWordQuizView> *KWordQuizDoc::pViewList = 0L; +//TQList<KWordQuizView> *KWordQuizDoc::pViewList = 0L; //KWordQuizView *KWordQuizDoc::m_view; -KWordQuizDoc::KWordQuizDoc(TQWidget *parent, const char *name) : TQObject(parent, name) +KWordQuizDoc::KWordQuizDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) { connect(KDirWatch::self(), TQT_SIGNAL(dirty(const TQString& )), this, TQT_SLOT(slotModifiedOnDisk(const TQString& ))); /* if(!pViewList) { - pViewList = new QList<KWordQuizView>(); + pViewList = new TQList<KWordQuizView>(); } pViewList->setAutoDelete(true);*/ @@ -73,14 +73,14 @@ const KURL& KWordQuizDoc::URL() const void KWordQuizDoc::slotUpdateAllViews(KWordQuizView *sender) { - //m_view->repaint(); + //m_view->tqrepaint(); /*KWordQuizView *w; if(pViewList) { for(w=pViewList->first(); w!=0; w=pViewList->next()) { if(w!=sender) - w->repaint(); + w->tqrepaint(); } }*/ @@ -105,7 +105,7 @@ bool KWordQuizDoc::saveModified() if(modified) { - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); int want_save = KMessageBox::warningYesNoCancel(win, i18n("The current file has been modified.\n" "Do you want to save it?"), @@ -162,7 +162,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index) TQFile file(tmpfile); if (!file.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path())); + KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path())); return false; } @@ -317,7 +317,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index) } g->setUpdatesEnabled(true); - g->repaintContents(); + g->tqrepaintContents(); } modified=false; if (append) @@ -333,7 +333,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/) if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>") - .arg(url.path())); + .tqarg(url.path())); //if (filename == fname) // filename = ""; return false; @@ -347,7 +347,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/) { file.close(); KVTMLWriter writer(&file); - writer.addHeader(TQString("kwordquiz %1").arg(KWQ_VERSION), 2, g->numRows(), url.fileName()); + writer.addHeader(TQString("kwordquiz %1").tqarg(KWTQ_VERSION), 2, g->numRows(), url.fileName()); writer.addFirstItem(g->horizontalHeader()->label(0), g->columnWidth(0), g->text(w, 0), g->horizontalHeader()->label(1), g->columnWidth(1), g->text(w, 1)); w++; int r = g->numRows(); @@ -479,8 +479,8 @@ void KWordQuizDoc::slotModifiedOnDisk( const TQString & path) /*@todo this code doesn't work very well. Have to look in more detail on how Kate does it. if (doc_url.path() == path) { - TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").arg(doc_url.fileName()); - int i = KMessageBox::warningYesNoCancel(0, str + i18n("Do you want to reload the modified file? Data loss may occur."),TQString::null,i18n("Reload"),i18n("Do Not Reload")); + TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").tqarg(doc_url.fileName()); + int i = KMessageBox::warningYesNoCancel(0, str + i18n("Do you want to reload the modified file? Data loss may occur."),TQString(),i18n("Reload"),i18n("Do Not Reload")); if ( i == KMessageBox::Yes) openDocument(doc_url); } diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index b79879fc..724b8f61 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZDOC_H -#define KWORDQUIZDOC_H +#ifndef KWORDTQUIZDOC_H +#define KWORDTQUIZDOC_H #ifdef HAVE_CONFIG_H #include <config.h> @@ -40,12 +40,13 @@ class KWordQuizView; * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 1.2 code generation */ -class KWordQuizDoc : public QObject +class KWordQuizDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Constructor for the fileclass of the application */ - KWordQuizDoc(TQWidget *parent, const char *name=0); + KWordQuizDoc(TQWidget *tqparent, const char *name=0); /** Destructor for the fileclass of the application */ ~KWordQuizDoc(); @@ -75,15 +76,15 @@ class KWordQuizDoc : public QObject void setURL(const KURL& url); public slots: - /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed. - * As this view normally repaints itself, it is excluded from the paintEvent. + /** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed. + * As this view normally tqrepaints itself, it is excluded from the paintEvent. */ void slotUpdateAllViews(KWordQuizView *sender); void slotModifiedOnDisk(const TQString &); public: /** the list of the views currently connected to the document */ - //static QList<KWordQuizView> *pViewList; + //static TQList<KWordQuizView> *pViewList; //static KWordQuizView *m_view; private: /** the modified flag of the current document */ @@ -92,4 +93,4 @@ class KWordQuizDoc : public QObject KWordQuizView *m_view; }; -#endif // KWORDQUIZDOC_H +#endif // KWORDTQUIZDOC_H diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index 61380e68..351c0fef 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -41,8 +41,8 @@ #include "kwordquiz.h" #include "dlgspecchar.h" -KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/) - : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false) +KWordQuizPrefs::KWordQuizPrefs(TQWidget *tqparent, const char *name, KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/) + : KConfigDialog(tqparent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false) { m_config = config; @@ -63,7 +63,7 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, KConfigSkele connect(m_prefCharacter->lstCharacters, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCharListSelectionChanged())); connect(m_prefCharacter->btnCharacter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectSpecChar())); - KWordQuizApp *win=(KWordQuizApp *) parent; + KWordQuizApp *win=(KWordQuizApp *) tqparent; int i=0; KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters"); diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h index 3afd5f9f..30287c99 100644 --- a/kwordquiz/src/kwordquizprefs.h +++ b/kwordquiz/src/kwordquizprefs.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZPREFS_H -#define KWORDQUIZPREFS_H +#ifndef KWORDTQUIZPREFS_H +#define KWORDTQUIZPREFS_H #include <kconfigdialog.h> @@ -33,8 +33,9 @@ class DlgSpecChar; class KWordQuizPrefs : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: - KWordQuizPrefs(TQWidget *parent=0, const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList, + KWordQuizPrefs(TQWidget *tqparent=0, const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false); protected slots: diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 0096f591..6db0f3a9 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt #include <tqpainter.h> #include <tqtable.h> #include <tqclipboard.h> @@ -37,12 +37,12 @@ #include "dlgrc.h" #include "dlgspecchar.h" -TQValueList<WQUndo> *KWordQuizView::m_undoList = 0L; +TQValueList<WTQUndo> *KWordQuizView::m_undoList = 0L; -KWQTableItem::KWQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text) +KWTQTableItem::KWTQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text) {} -int KWQTableItem::alignment() const +int KWTQTableItem::tqalignment() const { bool num; bool ok1 = false; @@ -52,13 +52,13 @@ int KWQTableItem::alignment() const (void)text().toDouble(&ok2); num = ok1 || ok2; - return (num ? Qt::AlignRight : Qt::AlignAuto) | Qt::AlignVCenter; + return (num ? TQt::AlignRight : TQt::AlignAuto) | TQt::AlignVCenter; } -KWordQuizView::KWordQuizView(TQWidget *parent, const char *name) : TQTable(parent, name) +KWordQuizView::KWordQuizView(TQWidget *tqparent, const char *name) : TQTable(tqparent, name) { if(!m_undoList) - m_undoList = new TQValueList<WQUndo>(); + m_undoList = new TQValueList<WTQUndo>(); setNumCols(2); setNumRows(50); @@ -77,7 +77,7 @@ KWordQuizView::~KWordQuizView() KWordQuizDoc *KWordQuizView::getDocument() const { - KWordQuizApp *theApp=(KWordQuizApp *) parentWidget(); + KWordQuizApp *theApp=(KWordQuizApp *) tqparentWidget(); return theApp->getDocument(); } @@ -211,12 +211,12 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) if (type == 2) { - painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName())); + painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName())); return; } painter.drawLine(marg, marg, marg + cw0 + cw1 + cw2 + cw3, marg); - painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName())); + painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName())); if (type == 1) { @@ -284,16 +284,16 @@ bool KWordQuizView::gridIsEmpty() return true; } -TQWidget * KWordQuizView::beginEdit( int row, int col, bool replace ) +TQWidget * KWordQuizView::beginEdit( int row, int col, bool tqreplace ) { m_currentText = text(row, col); - cellEditor = TQTable::beginEdit(row, col, replace); + cellEditor = TQTable::beginEdit(row, col, tqreplace); if (cellEditor) cellEditor->installEventFilter(this); return cellEditor; } -void KWordQuizView::endEdit( int row, int col, bool accept, bool replace ) +void KWordQuizView::endEdit( int row, int col, bool accept, bool tqreplace ) { // this code gets called after enter and arrow keys, now we // only process if editing really has been done @@ -302,7 +302,7 @@ void KWordQuizView::endEdit( int row, int col, bool accept, bool replace ) { if (((TQLineEdit *) cellWidget(row, col))->text() != m_currentText) addUndo(i18n("&Undo Entry")); - TQTable::endEdit(row, col, accept, replace); //this will destroy the cellWidget + TQTable::endEdit(row, col, accept, tqreplace); //this will destroy the cellWidget if (!text(row, col).isEmpty()) { TQTableItem* itm; @@ -356,7 +356,7 @@ void KWordQuizView::doEditUndo( ) } else { - WQUndo undo; + WTQUndo undo; if (m_undoList->count() > 0) { setUpdatesEnabled(false); @@ -472,7 +472,7 @@ void KWordQuizView::doEditPaste( ) br= br + sl.count() - 1; if (lc == 0) //left col? - if (sl[0].find("\t") < ((int) sl[0].length() - 1)) + if (sl[0].tqfind("\t") < ((int) sl[0].length() - 1)) rc = 1; //expand to second column; uint i = 0; @@ -555,7 +555,7 @@ void KWordQuizView::doEditInsert( ) addSelection(TQTableSelection(m_currentSel.topRow(), m_currentSel.leftCol(), m_currentSel.bottomRow(), m_currentSel.rightCol())); setCurrentCell(m_currentRow, m_currentCol); setUpdatesEnabled(true); - repaintContents(); + tqrepaintContents(); getDocument()->setModified(true); } @@ -666,7 +666,7 @@ void KWordQuizView::doEditMarkBlank( ) st = st.prepend(delim_start); st = st.append(delim_end); int ss = l->selectionStart(); - s = s.replace(ss, len, st); + s = s.tqreplace(ss, len, st); l->setText(s); l->setSelection(ss, st.length()); } @@ -691,7 +691,7 @@ void KWordQuizView::doEditUnmarkBlank( ) s.remove(delim_start); s.remove(delim_end); int ss = l->selectionStart(); - ls = ls.replace(ss, len, s); + ls = ls.tqreplace(ss, len, s); l->setText(ls); l->setSelection(ss, s.length()); } @@ -702,15 +702,15 @@ void KWordQuizView::doEditUnmarkBlank( ) s = l->text(); int cs = l->cursorPosition(); - int fr = s.findRev(delim_start, cs); + int fr = s.tqfindRev(delim_start, cs); if (fr > 0) { - s = s.replace(fr, 1, ""); + s = s.tqreplace(fr, 1, ""); cs--; } - int ff = s.find(delim_end, cs); + int ff = s.tqfind(delim_end, cs); if (ff > 0) - s = s.replace(ff, 1, ""); + s = s.tqreplace(ff, 1, ""); l->setText(s); l->setCursorPosition(cs); @@ -805,7 +805,7 @@ void KWordQuizView::doVocabShuffle( ) addSelection(TQTableSelection(m_currentSel.topRow(), m_currentSel.leftCol(), m_currentSel.bottomRow(), m_currentSel.rightCol())); setCurrentCell(m_currentRow, m_currentCol); setUpdatesEnabled(true); - repaintContents(); + tqrepaintContents(); getDocument()->setModified(true); } @@ -870,7 +870,7 @@ void KWordQuizView::slotSpecChar(const TQChar & c) TQString s = l->selectedText(); int len = s.length(); int ss = l->selectionStart(); - ls = ls.replace(ss, len, c); + ls = ls.tqreplace(ss, len, c); l->setText(ls); l->setSelection(ss, 1); } @@ -966,7 +966,7 @@ void KWordQuizView::addUndo( const TQString & caption ) m_undoList->remove(m_undoList->begin()); } - WQUndo* undo = new WQUndo(); + WTQUndo* undo = new WTQUndo(); undo->setText(caption); undo->setFont(font()); undo->setColWidth0(verticalHeader()->width()); @@ -1008,7 +1008,7 @@ void KWordQuizView::paintCell( TQPainter * p, int row, int col, const TQRect & c if (Prefs::enableBlanks()) if (!checkForBlank(text(row, col), true)) - g.setColor(TQColorGroup::Text, Qt::red); + g.setColor(TQColorGroup::Text, TQt::red); TQTable::paintCell (p, row, col, cr, selected, g ); } @@ -1051,7 +1051,7 @@ void KWordQuizView::slotCheckedAnswer( int i ) bool KWordQuizView::eventFilter( TQObject * o, TQEvent * e ) { - if (o == cellEditor) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(cellEditor)) { if ( e->type() == TQEvent::KeyPress ) { @@ -1075,7 +1075,7 @@ void KWordQuizView::setText(int row, int col, const TQString & text) itm->updateEditor(row, col); updateCell(row, col); } else { - KWQTableItem *i = new KWQTableItem(this, TQTableItem::OnTyping, text); + KWTQTableItem *i = new KWTQTableItem(this, TQTableItem::OnTyping, text); setItem(row, col, i); } } diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index 00289925..a15b496e 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#ifndef KWORDQUIZVIEW_H -#define KWORDQUIZVIEW_H +#ifndef KWORDTQUIZVIEW_H +#define KWORDTQUIZVIEW_H #ifdef HAVE_CONFIG_H #include <config.h> #endif -// include files for Qt +// include files for TQt #include <tqtable.h> #include <kprinter.h> @@ -41,30 +41,31 @@ class DlgSpecChar; @author Peter Hedlund */ -class KWQTableItem :public QTableItem +class KWTQTableItem :public TQTableItem { public: - KWQTableItem( TQTable* table, EditType et, const TQString & text ); - virtual int alignment() const; + KWTQTableItem( TQTable* table, EditType et, const TQString & text ); + virtual int tqalignment() const; }; -class KWordQuizView : public QTable +class KWordQuizView : public TQTable { Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ - KWordQuizView(TQWidget *parent = 0, const char *name=0); + KWordQuizView(TQWidget *tqparent = 0, const char *name=0); /** Destructor for the main view */ ~KWordQuizView(); - /** returns a pointer to the document connected to the view instance. Mind that this method requires a KWordQuizApp instance as a parent + /** returns a pointer to the document connected to the view instance. Mind that this method requires a KWordQuizApp instance as a tqparent * widget to get to the window document pointer by calling the KWordQuizApp::getDocument() method. * * @see KWordQuizApp#getDocument */ KWordQuizDoc *getDocument() const; - //Reimplemented from QTable + //Reimplemented from TQTable void paintCell ( TQPainter * p, int row, int col, const TQRect & cr, bool selected, const TQColorGroup & cg ); void setFont( const TQFont &); void setText( int row, int col, const TQString &text ); @@ -89,8 +90,8 @@ class KWordQuizView : public QTable bool checkSyntax(bool all, bool blanks); void saveCurrentSelection(bool clear); protected: - TQWidget * beginEdit(int row, int col, bool replace); - void endEdit ( int row, int col, bool accept, bool replace ); + TQWidget * beginEdit(int row, int col, bool tqreplace); + void endEdit ( int row, int col, bool accept, bool tqreplace ); void activateNextCell(); void keyPressEvent( TQKeyEvent* ); bool eventFilter( TQObject*, TQEvent* ); @@ -113,11 +114,11 @@ class KWordQuizView : public QTable DlgSpecChar* dlgSpecChar; TQWidget * cellEditor; /** the list of the undo objects */ - static TQValueList<WQUndo> *m_undoList; + static TQValueList<WTQUndo> *m_undoList; void doNewPage(TQPainter & painter, int res, int type); void doEndOfPage(TQPainter & painter, int vPos, int pageNum, int res, int type); bool checkForBlank(const TQString & s, bool blank); }; -#endif // KWORDQUIZVIEW_H +#endif // KWORDTQUIZVIEW_H diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index 05da32af..0d7fb1de 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -27,26 +27,26 @@ #include "kwqnewstuff.h" #include "prefs.h" -KWQNewStuff::KWQNewStuff(TQWidget *parent, const char *name) : TQObject(), KNewStuff("kdeedu/vocabulary", parent) +KWTQNewStuff::KWTQNewStuff(TQWidget *tqparent, const char *name) : TQObject(), KNewStuff("kdeedu/vocabulary", tqparent) { - m_app = (KWordQuizApp *) parent; + m_app = (KWordQuizApp *) tqparent; } -bool KWQNewStuff::install(const TQString & fileName) +bool KWTQNewStuff::install(const TQString & fileName) { m_app->slotFileOpenRecent(KURL(fileName)); return true; } -bool KWQNewStuff::createUploadFile(const TQString & fileName) +bool KWTQNewStuff::createUploadFile(const TQString & fileName) { return true; } -TQString KWQNewStuff::destinationPath(KNS::Entry * entry) +TQString KWTQNewStuff::destinationPath(KNS::Entry * entry) { if (entry) { @@ -67,28 +67,28 @@ TQString KWQNewStuff::destinationPath(KNS::Entry * entry) return file; } else - return TQString::null; + return TQString(); } -TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) +TQString KWTQNewStuff::downloadDestination(KNS::Entry * entry) { TQString file = destinationPath(entry); if (KStandardDirs::exists(file)) { - int result = KMessageBox::questionYesNo(parentWidget(), + int result = KMessageBox::questionYesNo(tqparentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") - .arg(file), - TQString::null, + .tqarg(file), + TQString(), i18n("Overwrite"),i18n("Do Not Overwrite")); if (result == KMessageBox::No) - return TQString::null; + return TQString(); } - KMessageBox::information(parentWidget(), + KMessageBox::information(tqparentWidget(), i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>") - .arg(file), - TQString::null, + .tqarg(file), + TQString(), "NewStuffDownloadLocation"); return file; } diff --git a/kwordquiz/src/kwqnewstuff.h b/kwordquiz/src/kwqnewstuff.h index f3ae82c1..81d3c9e1 100644 --- a/kwordquiz/src/kwqnewstuff.h +++ b/kwordquiz/src/kwqnewstuff.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KWQNEWSTUFF_H -#define KWQNEWSTUFF_H +#ifndef KWTQNEWSTUFF_H +#define KWTQNEWSTUFF_H #include <knewstuff/knewstuff.h> @@ -25,11 +25,12 @@ class KWordQuizApp; /** @author Peter Hedlund */ -class KWQNewStuff : public TQObject, public KNewStuff +class KWTQNewStuff : public TQObject, public KNewStuff { Q_OBJECT + TQ_OBJECT public: - KWQNewStuff(TQWidget *parent = 0, const char *name = 0); + KWTQNewStuff(TQWidget *tqparent = 0, const char *name = 0); /** Installs a downloaded file according to the application's configuration. diff --git a/kwordquiz/src/main.cpp b/kwordquiz/src/main.cpp index 3de695a8..8f6ad60e 100644 --- a/kwordquiz/src/main.cpp +++ b/kwordquiz/src/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("kwordquiz", I18N_NOOP("KWordQuiz"), - KWQ_VERSION, + KWTQ_VERSION, description, KAboutData::License_GPL, "(c) 2003-2005, Peter Hedlund", diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp index 3920c12a..e61097ef 100644 --- a/kwordquiz/src/multipleview.cpp +++ b/kwordquiz/src/multipleview.cpp @@ -27,17 +27,17 @@ #include "multipleview.h" #include "prefs.h" -MultipleView::MultipleView(TQWidget *parent, const char *name, WFlags f) - : MultipleViewBase(parent, name, f) +MultipleView::MultipleView(TQWidget *tqparent, const char *name, WFlags f) + : MultipleViewBase(tqparent, name, f) { - m_score = new WQScore(); + m_score = new WTQScore(); } MultipleView::~MultipleView() {} -void MultipleView::setQuiz(WQQuiz *quiz) +void MultipleView::setQuiz(WTQQuiz *quiz) { m_quiz = quiz; } @@ -77,7 +77,7 @@ void MultipleView::init() picYourAnswer->clear(); picCorrectAnswer->clear(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(true); win->actionCollection()->action("quiz_repeat_errors")->setEnabled(false); @@ -87,7 +87,7 @@ void MultipleView::init() void MultipleView::slotCheck() { - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); if (win->actionCollection()->action("quiz_check")->isEnabled()) { @@ -124,7 +124,7 @@ void MultipleView::slotCheck() lblCorrectHeader->clear(); picCorrectAnswer->clear(); lblCorrect->clear(); - m_score->countIncrement(WQScore::cdCorrect); + m_score->countIncrement(WTQScore::cdCorrect); updateScore(); KNotifyClient::event(winId(), "QuizCorrect", i18n("Your answer was correct!")); } @@ -138,7 +138,7 @@ void MultipleView::slotCheck() //lblCorrect->setFont(m_quiz->fontAnswer(m_question)); picCorrectAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->setText(i18n("Correct Answer")); - m_score->countIncrement(WQScore::cdError); + m_score->countIncrement(WTQScore::cdError); updateScore(); KNotifyClient::event(winId(), "QuizError", i18n("Your answer was incorrect.")); } @@ -253,7 +253,7 @@ void MultipleView::showQuestion(int i) lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -278,7 +278,7 @@ void MultipleView::showQuestion(int i) opt2->setChecked(false); opt3->setChecked(false); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiRightCol), KIcon::Panel)); } void MultipleView::slotApplySettings( ) diff --git a/kwordquiz/src/multipleview.h b/kwordquiz/src/multipleview.h index 7d4f06de..d2bfe843 100644 --- a/kwordquiz/src/multipleview.h +++ b/kwordquiz/src/multipleview.h @@ -29,12 +29,13 @@ class MultipleView : public MultipleViewBase { Q_OBJECT + TQ_OBJECT public: - MultipleView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + MultipleView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); ~MultipleView(); - void setQuiz(WQQuiz *quiz); + void setQuiz(WTQQuiz *quiz); void init(); public slots: @@ -47,8 +48,8 @@ public slots: void slotApplySettings(); private: - WQQuiz *m_quiz; - WQScore *m_score; + WTQQuiz *m_quiz; + WTQScore *m_score; int m_question; int m_error; diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 5d85e7af..4ed3eb6e 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MultipleViewBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MultipleViewBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -30,15 +30,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout58</cstring> + <cstring>tqlayout58</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblQuestionLanguage</cstring> </property> @@ -50,7 +50,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -64,7 +64,7 @@ <property name="text"> <string>Language 1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -74,7 +74,7 @@ <string>Language or other identifier for the question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblQuestion</cstring> </property> @@ -95,7 +95,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -105,7 +105,7 @@ <string>The question</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picQuestion</cstring> </property> @@ -117,7 +117,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -135,15 +135,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout60</cstring> + <cstring>tqlayout60</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picYourAnswer</cstring> </property> @@ -155,7 +155,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -171,7 +171,7 @@ <string>Your previous answer</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblYourAnswerHeader</cstring> </property> @@ -183,7 +183,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -197,7 +197,7 @@ <property name="text"> <string>Your Answer</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -207,7 +207,7 @@ <string>Your answer to the previous question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblYourAnswer</cstring> </property> @@ -228,7 +228,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -240,9 +240,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="6" column="0"> + <widget class="TQLayoutWidget" row="6" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <property name="name"> @@ -265,15 +265,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblScoreCount</cstring> </property> @@ -300,7 +300,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -310,7 +310,7 @@ <string>The number of questions in the session</string> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>picCorrect</cstring> </property> @@ -322,7 +322,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -341,7 +341,7 @@ <string>The number of questions answered correctly. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="5"> + <widget class="TQLabel" row="0" column="5"> <property name="name"> <cstring>lblScoreCorrect</cstring> </property> @@ -368,7 +368,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -378,7 +378,7 @@ <string>The number of questions answered correctly. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="6"> + <widget class="TQLabel" row="0" column="6"> <property name="name"> <cstring>picError</cstring> </property> @@ -390,7 +390,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -409,7 +409,7 @@ <string>The number of questions answered incorrectly. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picCount</cstring> </property> @@ -421,7 +421,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -440,7 +440,7 @@ <string>The number of questions in the session</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>lblScoreAnswered</cstring> </property> @@ -467,7 +467,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -477,7 +477,7 @@ <string>The number of questions already answered. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>picAnswered</cstring> </property> @@ -489,7 +489,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -508,7 +508,7 @@ <string>The number of questions already answered. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="7"> + <widget class="TQLabel" row="0" column="7"> <property name="name"> <cstring>lblScoreError</cstring> </property> @@ -535,7 +535,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -549,15 +549,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>layout61</cstring> + <cstring>tqlayout61</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblCorrectHeader</cstring> </property> @@ -569,7 +569,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -583,7 +583,7 @@ <property name="text"> <string>Correct Answer</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -593,7 +593,7 @@ <string>The correct answer to the previous question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblCorrect</cstring> </property> @@ -614,7 +614,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -624,7 +624,7 @@ <string>The correct answer to the previous question</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picCorrectAnswer</cstring> </property> @@ -636,7 +636,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -654,15 +654,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout63</cstring> + <cstring>tqlayout63</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picAnswer</cstring> </property> @@ -674,7 +674,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -690,7 +690,7 @@ <string>Your choices</string> </property> </widget> - <widget class="QRadioButton" row="2" column="1"> + <widget class="TQRadioButton" row="2" column="1"> <property name="name"> <cstring>opt2</cstring> </property> @@ -702,7 +702,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -718,7 +718,7 @@ <string>Three choices for the answer. One is correct.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>opt1</cstring> </property> @@ -730,7 +730,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -746,7 +746,7 @@ <string>Three choices for the answer. One is correct.</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblAnswerLanguage</cstring> </property> @@ -758,7 +758,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -772,7 +772,7 @@ <property name="text"> <string>Language 2</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -782,7 +782,7 @@ <string>Language or other identifier for the answer</string> </property> </widget> - <widget class="QRadioButton" row="3" column="1"> + <widget class="TQRadioButton" row="3" column="1"> <property name="name"> <cstring>opt3</cstring> </property> @@ -794,7 +794,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -812,15 +812,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout59</cstring> + <cstring>tqlayout59</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblPreviousQuestionHeader</cstring> </property> @@ -832,7 +832,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -846,7 +846,7 @@ <property name="text"> <string>Previous Question</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -856,7 +856,7 @@ <string>The previous question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblPreviousQuestion</cstring> </property> @@ -877,7 +877,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="indent"> @@ -890,7 +890,7 @@ <string>The previous question</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picPrevious</cstring> </property> @@ -902,7 +902,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -967,10 +967,10 @@ <slot>slotOpt3Clicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotOpt1Clicked()</slot> <slot>slotOpt2Clicked()</slot> <slot>slotOpt3Clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/paukerreader.cpp b/kwordquiz/src/paukerreader.cpp index df34a8d7..6d5027be 100644 --- a/kwordquiz/src/paukerreader.cpp +++ b/kwordquiz/src/paukerreader.cpp @@ -61,13 +61,13 @@ TQString PaukerDataItem::getText(const TQString &tagName) const return element.text(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } else - return TQString::null; + return TQString(); } /*! diff --git a/kwordquiz/src/prefcardappearance.cpp b/kwordquiz/src/prefcardappearance.cpp index e2e08f2a..d5853fae 100644 --- a/kwordquiz/src/prefcardappearance.cpp +++ b/kwordquiz/src/prefcardappearance.cpp @@ -18,8 +18,8 @@ #include "prefcardappearance.h" -PrefCardAppearance::PrefCardAppearance(TQWidget *parent, const char *name) - : PrefCardAppearanceBase(parent, name) +PrefCardAppearance::PrefCardAppearance(TQWidget *tqparent, const char *name) + : PrefCardAppearanceBase(tqparent, name) { widgetStack->raiseWidget(frontStackPage); } diff --git a/kwordquiz/src/prefcardappearance.h b/kwordquiz/src/prefcardappearance.h index b152155c..9ee53337 100644 --- a/kwordquiz/src/prefcardappearance.h +++ b/kwordquiz/src/prefcardappearance.h @@ -20,8 +20,9 @@ class PrefCardAppearance : public PrefCardAppearanceBase { Q_OBJECT + TQ_OBJECT public: - PrefCardAppearance(TQWidget *parent = 0, const char *name = 0); + PrefCardAppearance(TQWidget *tqparent = 0, const char *name = 0); ~PrefCardAppearance(); public slots: diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 46762ed3..cd2bf98f 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PrefCardAppearanceBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PrefCardAppearanceBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QFrame" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQFrame" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>cardFrame</cstring> </property> @@ -34,13 +34,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>175</width> <height>100</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>175</width> <height>100</height> @@ -62,11 +62,11 @@ <property name="toolTip" stdset="0"> <string>The flashcard</string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>42</y> @@ -98,7 +98,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -112,7 +112,7 @@ <property name="name"> <cstring>line</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>33</y> @@ -155,11 +155,11 @@ <string>The flashcard</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>titleLabel</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>11</y> @@ -190,7 +190,7 @@ <property name="text"> <string>Front</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -215,7 +215,7 @@ <string>Use to show the other side of the card</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textColorLabel</cstring> </property> @@ -234,7 +234,7 @@ <cstring>textColorButton</cstring> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>frameColorLabel</cstring> </property> @@ -253,7 +253,7 @@ <cstring></cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>fontLabel</cstring> </property> @@ -272,7 +272,7 @@ <cstring></cstring> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>cardColorLabel</cstring> </property> @@ -291,7 +291,7 @@ <cstring></cstring> </property> </widget> - <widget class="QWidgetStack" row="0" column="2" rowspan="4" colspan="1"> + <widget class="TQWidgetStack" row="0" column="2" rowspan="4" colspan="1"> <property name="name"> <cstring>widgetStack</cstring> </property> @@ -303,7 +303,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>backStackPage</cstring> </property> @@ -386,7 +386,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>frontStackPage</cstring> </property> @@ -480,7 +480,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>400</width> <height>20</height> @@ -534,15 +534,15 @@ <tabstop>kcfg_FrontCardColor</tabstop> <tabstop>kcfg_FrontFrameColor</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotFlipButtonClicked()</slot> <slot>slotFontChanged(const QFont &)</slot> <slot>slotTextColorChanged(const QColor &)</slot> <slot>slotAboutToShowWidget(QWidget *)</slot> <slot>slotFrameColorChanged(const QColor &)</slot> <slot>slotCardColorChanged(const QColor &)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/kwordquiz/src/prefcharacter.cpp b/kwordquiz/src/prefcharacter.cpp index 7ef819d4..2e6d3f54 100644 --- a/kwordquiz/src/prefcharacter.cpp +++ b/kwordquiz/src/prefcharacter.cpp @@ -18,8 +18,8 @@ #include "prefcharacter.h" -PrefCharacter::PrefCharacter(TQWidget *parent, const char *name) - : PrefCharacterBase(parent, name) +PrefCharacter::PrefCharacter(TQWidget *tqparent, const char *name) + : PrefCharacterBase(tqparent, name) { } diff --git a/kwordquiz/src/prefcharacter.h b/kwordquiz/src/prefcharacter.h index eb46f2e3..8f3d0ec3 100644 --- a/kwordquiz/src/prefcharacter.h +++ b/kwordquiz/src/prefcharacter.h @@ -27,8 +27,9 @@ class PrefCharacter : public PrefCharacterBase { Q_OBJECT + TQ_OBJECT public: - PrefCharacter(TQWidget *parent = 0, const char *name = 0); + PrefCharacter(TQWidget *tqparent = 0, const char *name = 0); ~PrefCharacter(); }; diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index 7202c6d9..73bf227c 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PrefCharacterBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PrefCharacterBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>356</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>350</height> @@ -39,7 +39,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>lblShortCutInfo</cstring> </property> @@ -52,11 +52,11 @@ <property name="text"> <string>Note: Select Settings -> Configure Shortcuts... to change the shortcut associated with each action.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QListView" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Action</string> @@ -299,16 +299,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>220</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -324,7 +324,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>50</height> @@ -355,14 +355,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>31</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>lblPreview</cstring> </property> @@ -382,7 +382,7 @@ <property name="text"> <string>A</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignBottom</set> </property> <property name="toolTip" stdset="0"> @@ -402,7 +402,7 @@ <tabstop>lstCharacters</tabstop> <tabstop>btnCharacter</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kwordquiz/src/prefeditor.cpp b/kwordquiz/src/prefeditor.cpp index 3fc69802..6610d5b8 100644 --- a/kwordquiz/src/prefeditor.cpp +++ b/kwordquiz/src/prefeditor.cpp @@ -19,8 +19,8 @@ #include "prefeditor.h" -PrefEditor::PrefEditor(TQWidget *parent, const char *name, WFlags f) - : PrefEditorBase(parent, name, f) +PrefEditor::PrefEditor(TQWidget *tqparent, const char *name, WFlags f) + : PrefEditorBase(tqparent, name, f) { } diff --git a/kwordquiz/src/prefeditor.h b/kwordquiz/src/prefeditor.h index c84b3364..a88c1892 100644 --- a/kwordquiz/src/prefeditor.h +++ b/kwordquiz/src/prefeditor.h @@ -27,9 +27,10 @@ class PrefEditor : public PrefEditorBase { Q_OBJECT + TQ_OBJECT public: - PrefEditor(TQWidget *parent, const char *name=0, WFlags f=0); + PrefEditor(TQWidget *tqparent, const char *name=0, WFlags f=0); ~PrefEditor(); }; diff --git a/kwordquiz/src/prefeditorbase.ui b/kwordquiz/src/prefeditorbase.ui index 71ef99ed..beef0b99 100644 --- a/kwordquiz/src/prefeditorbase.ui +++ b/kwordquiz/src/prefeditorbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PrefEditorBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PrefEditorBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>256</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>250</height> @@ -28,7 +28,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>kcfg_EnterMove</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>optDown</cstring> </property> @@ -59,7 +59,7 @@ <string>Select if the next cell below should become active when pressing Enter.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>optRight</cstring> </property> @@ -73,7 +73,7 @@ <string>Select if the next cell to the right should become active when pressing Enter</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>optNoMove</cstring> </property> @@ -89,7 +89,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_EnableBlanks</cstring> </property> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>81</height> @@ -122,5 +122,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/prefquiz.cpp b/kwordquiz/src/prefquiz.cpp index cfb07aae..a57b0816 100644 --- a/kwordquiz/src/prefquiz.cpp +++ b/kwordquiz/src/prefquiz.cpp @@ -24,8 +24,8 @@ #include "prefquiz.h" -PrefQuiz::PrefQuiz(TQWidget *parent, const char *name, WFlags f) - : PrefQuizBase(parent, name, f) +PrefQuiz::PrefQuiz(TQWidget *tqparent, const char *name, WFlags f) + : PrefQuizBase(tqparent, name, f) { kcfg_FlipDelay -> setEnabled(kcfg_AutoFlip->isChecked()); kcfg_KeepDiscard->setEnabled(kcfg_AutoFlip->isChecked()); diff --git a/kwordquiz/src/prefquiz.h b/kwordquiz/src/prefquiz.h index 9d7174c4..59a4c307 100644 --- a/kwordquiz/src/prefquiz.h +++ b/kwordquiz/src/prefquiz.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef PREFQUIZ_H -#define PREFQUIZ_H +#ifndef PREFTQUIZ_H +#define PREFTQUIZ_H #include "prefquizbase.h" @@ -27,9 +27,10 @@ class PrefQuiz : public PrefQuizBase { Q_OBJECT + TQ_OBJECT public: - PrefQuiz(TQWidget *parent, const char *name=0, WFlags f=0); + PrefQuiz(TQWidget *tqparent, const char *name=0, WFlags f=0); ~PrefQuiz(); }; diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 82cdf626..ebe2fbb8 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PrefQuizBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PrefQuizBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>356</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>350</height> @@ -28,7 +28,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>grpMultiple</cstring> </property> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_AutoCheck</cstring> </property> @@ -58,7 +58,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>grpQA</cstring> </property> @@ -72,7 +72,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_HintError</cstring> </property> @@ -88,7 +88,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>grpScore</cstring> </property> @@ -102,7 +102,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_Percent</cstring> </property> @@ -128,14 +128,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>31</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>KeepDiscard</cstring> </property> @@ -162,14 +162,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lblSeconds</cstring> </property> @@ -199,7 +199,7 @@ <string>Delay in seconds to flip card</string> </property> </widget> - <widget class="QButtonGroup" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_KeepDiscard</cstring> </property> @@ -219,7 +219,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>optCorrect</cstring> </property> @@ -233,7 +233,7 @@ <string>Select if the previous card should be counted as correct when moving to the next card</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>optError</cstring> </property> @@ -249,7 +249,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_AutoFlip</cstring> </property> @@ -284,10 +284,10 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotAutoFlipClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index 4660df9f..b67e176b 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -63,23 +63,23 @@ TQString highlightError(const TQString & c, const TQString & e) } -QAView::QAView(TQWidget *parent, const char *name, WFlags f):QAViewBase(parent, name, f) +TQAView::TQAView(TQWidget *tqparent, const char *name, WFlags f):QAViewBase(tqparent, name, f) { - m_score = new WQScore(); + m_score = new WTQScore(); } -QAView::~QAView() +TQAView::~TQAView() { delete txtAnswer; //Fixes #122110 on PCLOS and Ubuntu } -void QAView::setQuiz(WQQuiz *quiz) +void TQAView::setQuiz(WTQQuiz *quiz) { m_quiz = quiz; } -void QAView::init() +void TQAView::init() { m_score -> setQuestionCount(m_quiz->questionCount()); m_score -> setAsPercent(Prefs::percent()); @@ -116,7 +116,7 @@ void QAView::init() picYourAnswer->clear(); picCorrectAnswer->clear(); - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); win->actionCollection()->action("quiz_check")->setEnabled(true); win->actionCollection()->action("qa_hint")->setEnabled(true); win->actionCollection()->action("quiz_repeat_errors")->setEnabled(false); @@ -127,9 +127,9 @@ void QAView::init() txtAnswer->setFocus(); } -void QAView::slotCheck() +void TQAView::slotCheck() { - KWordQuizApp *win=(KWordQuizApp *) parent(); + KWordQuizApp *win=(KWordQuizApp *) tqparent(); if (win->actionCollection()->action("quiz_check")->isEnabled()) { bool fIsCorrect; @@ -155,7 +155,7 @@ void QAView::slotCheck() lblCorrectHeader->clear(); picCorrectAnswer->clear(); lblCorrect->clear(); - m_score->countIncrement(WQScore::cdCorrect); + m_score->countIncrement(WTQScore::cdCorrect); updateScore(); KNotifyClient::event(winId(), "QuizCorrect", i18n("Your answer was correct!")); } @@ -168,7 +168,7 @@ void QAView::slotCheck() lblCorrect->setText(m_quiz->answer(m_question)); picCorrectAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->setText(i18n("Correct Answer")); - m_score->countIncrement(WQScore::cdError); + m_score->countIncrement(WTQScore::cdError); updateScore(); KNotifyClient::event(winId(), "QuizError", i18n("Your answer was incorrect.")); } @@ -200,7 +200,7 @@ void QAView::slotCheck() } } -void QAView::slotHint() +void TQAView::slotHint() { TQString answer = txtAnswer->text(); TQString correctAnswer = m_quiz->hint(m_question); @@ -228,19 +228,19 @@ void QAView::slotHint() m_hintUsed = true; } -void QAView::slotRestart() +void TQAView::slotRestart() { m_quiz->activateBaseList(); init(); } -void QAView::slotRepeat() +void TQAView::slotRepeat() { m_quiz->activateErrorList(); init(); } -void QAView::updateScore() +void TQAView::updateScore() { TQString s; s = s.setNum(m_quiz->questionCount(), 10); @@ -265,16 +265,16 @@ void QAView::updateScore() /*! - \fn QAView::showQuestion(int i) + \fn TQAView::showQuestion(int i) */ -void QAView::showQuestion(int i) +void TQAView::showQuestion(int i) { //m_quiz->setColumn(i); lblQuestionLanguage -> setText(m_quiz ->langQuestion(i)); lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -290,18 +290,18 @@ void QAView::showQuestion(int i) //txtAnswer->setFont(m_quiz->fontAnswer(i)); txtAnswer -> setText(""); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiRightCol), KIcon::Panel)); - //@todo handle keyboard layouts + //@todo handle keyboard tqlayouts } -void QAView::slotApplySettings( ) +void TQAView::slotApplySettings( ) { m_score ->setAsPercent(Prefs::percent()); updateScore(); } -void QAView::slotSpecChar( const TQChar & c) +void TQAView::slotSpecChar( const TQChar & c) { if (txtAnswer->hasFocus()) { @@ -311,7 +311,7 @@ void QAView::slotSpecChar( const TQChar & c) TQString s = txtAnswer->selectedText(); int len = s.length(); int ss = txtAnswer->selectionStart(); - ls = ls.replace(ss, len, c); + ls = ls.tqreplace(ss, len, c); txtAnswer->setText(ls); txtAnswer->setSelection(ss, 1); } diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index f18567ec..ecd7cfff 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef QAVIEW_H -#define QAVIEW_H +#ifndef TQAVIEW_H +#define TQAVIEW_H #include <kaction.h> @@ -29,15 +29,16 @@ /** @author Peter Hedlund */ -class QAView : public QAViewBase +class TQAView : public QAViewBase { Q_OBJECT + TQ_OBJECT public: - QAView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); + TQAView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); - ~QAView(); + ~TQAView(); - void setQuiz(WQQuiz *quiz); + void setQuiz(WTQQuiz *quiz); void init(); public slots: @@ -49,8 +50,8 @@ public slots: void slotSpecChar(const TQChar &); private: - WQQuiz *m_quiz; - WQScore *m_score; + WTQQuiz *m_quiz; + WTQScore *m_score; KAction* actCheck; KAction* actHint; diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index 96baa0cc..9675b560 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>QAViewBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>QAViewBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -30,15 +30,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="7" column="0"> + <widget class="TQLayoutWidget" row="7" column="0"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="6"> + <widget class="TQLabel" row="0" column="6"> <property name="name"> <cstring>picError</cstring> </property> @@ -50,7 +50,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -69,7 +69,7 @@ <string>The number of questions answered incorrectly. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="7"> + <widget class="TQLabel" row="0" column="7"> <property name="name"> <cstring>lblScoreError</cstring> </property> @@ -88,7 +88,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -98,7 +98,7 @@ <string>The number of questions answered incorrectly. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>picAnswered</cstring> </property> @@ -110,7 +110,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -129,7 +129,7 @@ <string>The number of questions already answered. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picCount</cstring> </property> @@ -141,7 +141,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -160,7 +160,7 @@ <string>The number of questions in the session</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblScoreCount</cstring> </property> @@ -179,7 +179,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -189,7 +189,7 @@ <string>The number of questions in the session</string> </property> </widget> - <widget class="QLabel" row="0" column="5"> + <widget class="TQLabel" row="0" column="5"> <property name="name"> <cstring>lblScoreCorrect</cstring> </property> @@ -208,7 +208,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -218,7 +218,7 @@ <string>The number of questions answered correctly. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>lblScoreAnswered</cstring> </property> @@ -237,7 +237,7 @@ <property name="text"> <string>00</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="toolTip" stdset="0"> @@ -247,7 +247,7 @@ <string>The number of questions already answered. May be shown as a percentage.</string> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>picCorrect</cstring> </property> @@ -259,7 +259,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -280,15 +280,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout51</cstring> + <cstring>tqlayout51</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblPreviousQuestionHeader</cstring> </property> @@ -300,7 +300,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -314,7 +314,7 @@ <property name="text"> <string>Previous Question</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -324,7 +324,7 @@ <string>The previous question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblPreviousQuestion</cstring> </property> @@ -345,7 +345,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -355,7 +355,7 @@ <string>The previous question</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picPrevious</cstring> </property> @@ -367,7 +367,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -385,15 +385,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout52</cstring> + <cstring>tqlayout52</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblYourAnswerHeader</cstring> </property> @@ -405,7 +405,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -419,7 +419,7 @@ <property name="text"> <string>Your Answer</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -429,7 +429,7 @@ <string>Your answer to the previous question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblYourAnswer</cstring> </property> @@ -450,7 +450,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -460,7 +460,7 @@ <string>Your answer to the previous question</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picYourAnswer</cstring> </property> @@ -472,7 +472,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -490,15 +490,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>layout53</cstring> + <cstring>tqlayout53</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picCorrectAnswer</cstring> </property> @@ -510,7 +510,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -526,7 +526,7 @@ <string>Previous correct answer</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblCorrectHeader</cstring> </property> @@ -538,7 +538,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -552,7 +552,7 @@ <property name="text"> <string>Correct Answer</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -562,7 +562,7 @@ <string>The correct answer to the previous question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblCorrect</cstring> </property> @@ -583,7 +583,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -595,15 +595,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout54</cstring> + <cstring>tqlayout54</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblAnswerBlank</cstring> </property> @@ -624,7 +624,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -646,7 +646,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <property name="toolTip" stdset="0"> @@ -656,7 +656,7 @@ <string>Type the answer to the question</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblAnswerLanguage</cstring> </property> @@ -668,7 +668,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>32</height> @@ -682,7 +682,7 @@ <property name="text"> <string>Language 2</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -692,7 +692,7 @@ <string>Language or other identifier for the answer</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picAnswer</cstring> </property> @@ -704,7 +704,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -736,15 +736,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout57</cstring> + <cstring>tqlayout57</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblQuestionLanguage</cstring> </property> @@ -756,7 +756,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -770,7 +770,7 @@ <property name="text"> <string>Language 1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -780,7 +780,7 @@ <string>Language or other identifier for the question</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>picQuestion</cstring> </property> @@ -792,7 +792,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -808,7 +808,7 @@ <string>The question</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblQuestion</cstring> </property> @@ -829,7 +829,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="toolTip" stdset="0"> @@ -862,8 +862,8 @@ <slot>slotCheck()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="private">slotCheck()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/version.h b/kwordquiz/src/version.h index d202ba2e..7a33f3d2 100644 --- a/kwordquiz/src/version.h +++ b/kwordquiz/src/version.h @@ -1 +1 @@ -#define KWQ_VERSION "0.8.1" +#define KWTQ_VERSION "0.8.1" diff --git a/kwordquiz/src/wqlistitem.cpp b/kwordquiz/src/wqlistitem.cpp index 597337f8..0e4cf94c 100644 --- a/kwordquiz/src/wqlistitem.cpp +++ b/kwordquiz/src/wqlistitem.cpp @@ -18,37 +18,37 @@ #include "wqlistitem.h" -WQListItem::WQListItem() +WTQListItem::WTQListItem() { } -WQListItem::~WQListItem() +WTQListItem::~WTQListItem() { } -void WQListItem::setQuestion(int i) +void WTQListItem::setQuestion(int i) { m_question = i; } -void WQListItem::setCorrect(int c) +void WTQListItem::setCorrect(int c) { m_correct = c; } -void WQListItem::setOneOp(int i) +void WTQListItem::setOneOp(int i) { m_oneOp = i; } -void WQListItem::setTwoOp(int i) +void WTQListItem::setTwoOp(int i) { m_twoOp = i; } -void WQListItem::setThreeOp(int i) +void WTQListItem::setThreeOp(int i) { m_threeOp = i; } diff --git a/kwordquiz/src/wqlistitem.h b/kwordquiz/src/wqlistitem.h index 8924aa0c..6689c37b 100644 --- a/kwordquiz/src/wqlistitem.h +++ b/kwordquiz/src/wqlistitem.h @@ -16,19 +16,19 @@ Boston, MA 02110-1301, USA. */ -#ifndef WQLISTITEM_H -#define WQLISTITEM_H +#ifndef WTQLISTITEM_H +#define WTQLISTITEM_H /** @author Peter Hedlund */ -class WQListItem{ +class WTQListItem{ public: - WQListItem(); + WTQListItem(); - ~WQListItem(); + ~WTQListItem(); void setQuestion(int i); void setCorrect(int c); void setOneOp(int i); diff --git a/kwordquiz/src/wqlreader.cpp b/kwordquiz/src/wqlreader.cpp index 7eef97c7..915fceb9 100644 --- a/kwordquiz/src/wqlreader.cpp +++ b/kwordquiz/src/wqlreader.cpp @@ -75,18 +75,18 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) while (ts.readLine() != "[Font Info]"); s = ts.readLine(); - int p = s.find("=", 0); + int p = s.tqfind("=", 0); TQString fam = s.right(s.length() - (p + 1)); fam = fam.mid(1, fam.length() - 2); //g->font().setFamily(s); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); int ps = s.toInt(0); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); int b = 0; if (s == "1") @@ -95,7 +95,7 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) } s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); bool it = (s == "1"); @@ -103,52 +103,52 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) while (ts.readLine() != "[Character Info]"); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); m_specialCharacters = s.right(s.length() - (p + 1)); while (ts.readLine() != "[Grid Info]"); ts.readLine(); //skip value for width of row headers s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_colWidth1 = s.toInt(0, 10); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_colWidth2 = s.toInt(0, 10); s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_numRows = (s.toInt(0, 10) - 1); //We need to reduce by one since the header is not included // Selection s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_topLeft =s.toInt(0, 10) - 1; s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_topRight =s.toInt(0, 10) - 1; s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_bottomLeft =s.toInt(0, 10) - 1; s = ts.readLine(); - p = s.find("=", 0); + p = s.tqfind("=", 0); s = s.right(s.length() - (p + 1)); m_bottomRight =s.toInt(0, 10) - 1 ; while (ts.readLine() != "[Vocabulary]"); s = ts.readLine(); - p = s.find(" [", 0); + p = s.tqfind(" [", 0); s = s.left(p); s = s.stripWhiteSpace(); m_language1 = s; @@ -157,7 +157,7 @@ KWqlDataItemList WqlReader::parse(const TQString &fileName) while (!s.isNull()) { s = ts.readLine(); - p = s.find("[", 0); + p = s.tqfind("[", 0); TQString r = s.mid(p + 1, 10); int h = r.toInt(0, 10); s = s.left(p); diff --git a/kwordquiz/src/wqlreader.h b/kwordquiz/src/wqlreader.h index 79096956..fe8f63a2 100644 --- a/kwordquiz/src/wqlreader.h +++ b/kwordquiz/src/wqlreader.h @@ -13,8 +13,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef WQLREADER_H -#define WQLREADER_H +#ifndef WTQLREADER_H +#define WTQLREADER_H /** @author Peter Hedlund diff --git a/kwordquiz/src/wqlwriter.cpp b/kwordquiz/src/wqlwriter.cpp index e5314201..579561ff 100644 --- a/kwordquiz/src/wqlwriter.cpp +++ b/kwordquiz/src/wqlwriter.cpp @@ -22,7 +22,7 @@ WqlWriter::WqlWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(outputFile); + outputStream.setDevice(TQT_TQIODEVICE(outputFile)); outputStream.setEncoding(TQTextStream::Latin1); outputStream << "WordQuiz" << winendl; @@ -35,16 +35,16 @@ void WqlWriter::writeFont( const TQFont & font ) outputStream << "[Font Info]" << winendl; outputStream << "FontName1=\"" << font.family() << "\"" << winendl; outputStream << "FontSize1=" << TQString::number(font.pointSize()) << winendl; - outputStream << TQString("FontBold1=%1").arg(font.bold() ? "1" : "0") <<winendl; - outputStream << TQString("FontItalic1=%1").arg(font.italic() ? "1" : "0") <<winendl; + outputStream << TQString("FontBold1=%1").tqarg(font.bold() ? "1" : "0") <<winendl; + outputStream << TQString("FontItalic1=%1").tqarg(font.italic() ? "1" : "0") <<winendl; outputStream << "FontColor1=0" << winendl; outputStream << "CharSet1=0" << winendl; outputStream << "Layout1=0" << winendl; outputStream << "FontName2=\"" << font.family() << "\"" << winendl; outputStream << "FontSize2=" << TQString::number(font.pointSize()) << winendl; - outputStream << TQString("FontBold2=%1").arg(font.bold() ? "1" : "0") <<winendl; - outputStream << TQString("FontItalic2=%1").arg(font.italic() ? "1" : "0") <<winendl; + outputStream << TQString("FontBold2=%1").tqarg(font.bold() ? "1" : "0") <<winendl; + outputStream << TQString("FontItalic2=%1").tqarg(font.italic() ? "1" : "0") <<winendl; outputStream << "FontColor2=0" << winendl; outputStream << "CharSet2=0" << winendl; outputStream << "Layout2=0" << winendl << winendl; @@ -83,7 +83,7 @@ void WqlWriter::writeFirstItem( const TQString & ll, const TQString & rl ) void WqlWriter::writeItem( const TQString & left, const TQString & right, int rh ) { - outputStream << left << TQString( " [%1]").arg(rh * 15, 10, 10 ) << winendl ; + outputStream << left << TQString( " [%1]").tqarg(rh * 15, 10, 10 ) << winendl ; outputStream << right << winendl; } diff --git a/kwordquiz/src/wqlwriter.h b/kwordquiz/src/wqlwriter.h index edcfa192..460483cb 100644 --- a/kwordquiz/src/wqlwriter.h +++ b/kwordquiz/src/wqlwriter.h @@ -13,8 +13,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef WQLWRITER_H -#define WQLWRITER_H +#ifndef WTQLWRITER_H +#define WTQLWRITER_H #include <tqfile.h> #include <tqtextstream.h> diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index e9baebcc..bcc721b5 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -25,8 +25,8 @@ #include "wqprintdialogpage.h" -WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) +WTQPrintDialogPage::WTQPrintDialogPage(TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { setTitle(i18n("Vocabulary Options")); @@ -34,10 +34,10 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) g = new TQButtonGroup(i18n("Select Type of Printout"), this ); g->setColumnLayout(0, Qt::Vertical ); - g->layout()->setSpacing( 6 ); - g->layout()->setMargin( 11 ); - TQGridLayout * v = new TQGridLayout( g->layout() ); - v->setAlignment( Qt::AlignTop ); + g->tqlayout()->setSpacing( 6 ); + g->tqlayout()->setMargin( 11 ); + TQGridLayout * v = new TQGridLayout( g->tqlayout() ); + v->tqsetAlignment( TQt::AlignTop ); rb0 = new TQRadioButton(i18n("Vocabulary &list"), g ); v->addWidget( rb0, 0, 0 ); @@ -54,16 +54,16 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) } -WQPrintDialogPage::~WQPrintDialogPage() +WTQPrintDialogPage::~WTQPrintDialogPage() { } -void WQPrintDialogPage::getOptions(TQMap< TQString, TQString > & opts, bool incldef) +void WTQPrintDialogPage::getOptions(TQMap< TQString, TQString > & opts, bool incldef) { opts[ "kde-kwordquiz-type" ] = TQString::number(g->selectedId()); } -void WQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) +void WTQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) { TQString type = opts[ "kde-kwordquiz-type" ]; switch (type.toInt()) @@ -74,7 +74,7 @@ void WQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) } } -bool WQPrintDialogPage::isValid(const TQString & msg ) +bool WTQPrintDialogPage::isValid(const TQString & msg ) { return true; } diff --git a/kwordquiz/src/wqprintdialogpage.h b/kwordquiz/src/wqprintdialogpage.h index 3a52aa6e..ffb10c27 100644 --- a/kwordquiz/src/wqprintdialogpage.h +++ b/kwordquiz/src/wqprintdialogpage.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef WQPRINTDIALOGPAGE_H -#define WQPRINTDIALOGPAGE_H +#ifndef WTQPRINTDIALOGPAGE_H +#define WTQPRINTDIALOGPAGE_H #include <kdeprint/kprintdialogpage.h> @@ -27,13 +27,14 @@ Print dialog page to provide specific print options for KWordQuiz @author Peter Hedlund */ -class WQPrintDialogPage : public KPrintDialogPage +class WTQPrintDialogPage : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: - WQPrintDialogPage( TQWidget *parent = 0, const char *name = 0 ); + WTQPrintDialogPage( TQWidget *tqparent = 0, const char *name = 0 ); - ~WQPrintDialogPage(); + ~WTQPrintDialogPage(); //reimplement virtual functions void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); void setOptions(const TQMap<TQString,TQString>& opts); diff --git a/kwordquiz/src/wqquiz.cpp b/kwordquiz/src/wqquiz.cpp index 23600567..1ba46076 100644 --- a/kwordquiz/src/wqquiz.cpp +++ b/kwordquiz/src/wqquiz.cpp @@ -23,20 +23,20 @@ #include "wqquiz.h" #include "prefs.h" -WQQuiz::WQQuiz(KWordQuizView * parent, const char *name) : TQObject(parent, name) +WTQQuiz::WTQQuiz(KWordQuizView * tqparent, const char *name) : TQObject(tqparent, name) { - m_table = parent; + m_table = tqparent; m_list.clear(); m_errorList.clear(); m_quizList.clear(); } -void WQQuiz::activateErrorList() +void WTQQuiz::activateErrorList() { m_list.clear(); - WQListItem l; + WTQListItem l; QuizList::iterator it; for ( it = m_errorList.begin(); it != m_errorList.end(); ++it ) @@ -47,7 +47,7 @@ void WQQuiz::activateErrorList() } -void WQQuiz::activateBaseList() +void WTQQuiz::activateBaseList() { m_list.clear(); @@ -64,7 +64,7 @@ void WQQuiz::activateBaseList() } -void WQQuiz::addToList(int aCol, int bCol) +void WTQQuiz::addToList(int aCol, int bCol) { //build a list of row numbers containing text in both columns @@ -85,8 +85,8 @@ void WQQuiz::addToList(int aCol, int bCol) IntList::ConstIterator it; for ( it = tempList.begin(); it != tempList.end(); ++it ) { - WQListItem *li; - li = new WQListItem(); + WTQListItem *li; + li = new WTQListItem(); li->setQuestion(aCol); li->setCorrect(1); li->setOneOp(*it); @@ -114,7 +114,7 @@ void WQQuiz::addToList(int aCol, int bCol) } -bool WQQuiz::init() +bool WTQQuiz::init() { bool result = false; @@ -196,7 +196,7 @@ bool WQQuiz::init() return true; } -void WQQuiz::listRandom() +void WTQQuiz::listRandom() { TQPtrList<void> list; @@ -216,10 +216,10 @@ void WQQuiz::listRandom() m_quizList.append(items[i]); } -bool WQQuiz::checkAnswer(int i, const TQString & a) +bool WTQQuiz::checkAnswer(int i, const TQString & a) { bool result = false; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) { @@ -239,12 +239,12 @@ bool WQQuiz::checkAnswer(int i, const TQString & a) if (TQString(m_correctBlank).length() > 0) { TQStringList la, ls; - if (ans.find(";") > 0) + if (ans.tqfind(";") > 0) ls = TQStringList::split(";", ans); else ls.append(ans); - if (m_correctBlank.find(";") > 0) + if (m_correctBlank.tqfind(";") > 0) la = TQStringList::split(";", m_correctBlank); else la.append(m_correctBlank); @@ -292,11 +292,11 @@ bool WQQuiz::checkAnswer(int i, const TQString & a) return result; } -TQStringList WQQuiz::multiOptions(int i) +TQStringList WTQQuiz::multiOptions(int i) { TQString *s; TQStringList Result; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; typedef TQPtrList<TQString> LS; LS *ls; @@ -347,10 +347,10 @@ TQStringList WQQuiz::multiOptions(int i) return Result; } -TQString WQQuiz::quizIcon(int i, QuizIcon ico) +TQString WTQQuiz::quizIcon(int i, QuizIcon ico) { TQString s; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; if (ico == qiLeftCol) { if (li.question() == 0) @@ -369,7 +369,7 @@ TQString WQQuiz::quizIcon(int i, QuizIcon ico) return s; } -TQString WQQuiz::yourAnswer(int i, const TQString & s) +TQString WTQQuiz::yourAnswer(int i, const TQString & s) { TQString result =""; @@ -377,17 +377,17 @@ TQString WQQuiz::yourAnswer(int i, const TQString & s) { TQStringList ls; - if (s.find(";") > 0) + if (s.tqfind(";") > 0) ls = TQStringList::split(";", s, true); else ls.append(s); - result = m_answerBlank.replace("..........", "<u></u>"); + result = m_answerBlank.tqreplace("..........", "<u></u>"); int offset = 0, counter = 0; while (offset >= 0) { - offset = result.find("<u>", offset); + offset = result.tqfind("<u>", offset); if (offset >= 0) { result.insert(offset + 3, ls[counter]); @@ -405,7 +405,7 @@ TQString WQQuiz::yourAnswer(int i, const TQString & s) return result; } -TQString WQQuiz::hint(int i) +TQString WTQQuiz::hint(int i) { if (TQString(m_correctBlank).length() > 0) { @@ -417,20 +417,20 @@ TQString WQQuiz::hint(int i) } } -void WQQuiz::setQuizType(QuizType qt) +void WTQQuiz::setQuizType(QuizType qt) { m_quizType = qt; } -void WQQuiz::setQuizMode(int qm) +void WTQQuiz::setQuizMode(int qm) { m_quizMode = qm; } -TQString WQQuiz::question(int i) +TQString WTQQuiz::question(int i) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; TQString s = m_table->text(li.oneOp(), li.question()); if (Prefs::enableBlanks()) { @@ -439,7 +439,7 @@ TQString WQQuiz::question(int i) } if (m_quizType != qtFlash && i > 0) { - WQListItem li2 = m_list[i - 1]; + WTQListItem li2 = m_list[i - 1]; emit checkingAnswer(li2.oneOp()); } else @@ -448,7 +448,7 @@ TQString WQQuiz::question(int i) return s; } -TQString WQQuiz::blankAnswer(int i) +TQString WTQQuiz::blankAnswer(int i) { TQString r = ""; @@ -458,7 +458,7 @@ TQString WQQuiz::blankAnswer(int i) if (m_quizType == qtQA && Prefs::enableBlanks()) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) { @@ -474,7 +474,7 @@ TQString WQQuiz::blankAnswer(int i) rx.setMinimal(true); rx.setPattern("\\[.*\\]"); - r.replace(rx, ".........."); + r.tqreplace(rx, ".........."); if (r != tTemp) { @@ -486,9 +486,9 @@ TQString WQQuiz::blankAnswer(int i) if (offset >= 0) { if (m_correctBlank.length() > 0) - m_correctBlank = m_correctBlank + ";" + " " + tTemp.mid(offset + 1, tTemp.find(']', offset) - offset - 1); + m_correctBlank = m_correctBlank + ";" + " " + tTemp.mid(offset + 1, tTemp.tqfind(']', offset) - offset - 1); else - m_correctBlank = tTemp.mid(offset + 1, tTemp.find(']', offset) - offset - 1); + m_correctBlank = tTemp.mid(offset + 1, tTemp.tqfind(']', offset) - offset - 1); offset++; } } @@ -497,10 +497,10 @@ TQString WQQuiz::blankAnswer(int i) return m_answerBlank; } -TQString WQQuiz::answer(int i) +TQString WTQQuiz::answer(int i) { TQString s; - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) { @@ -517,8 +517,8 @@ TQString WQQuiz::answer(int i) s = m_table->text(li.oneOp(), j); if (Prefs::enableBlanks()) { - s.replace("[", "<u>"); - s.replace("]", "</u>"); + s.tqreplace("[", "<u>"); + s.tqreplace("]", "</u>"); s.prepend("<qt>"); s.append("</qt>"); } @@ -535,16 +535,16 @@ TQString WQQuiz::answer(int i) return s; } -TQString WQQuiz::langQuestion(int i) +TQString WTQQuiz::langQuestion(int i) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; return m_table->horizontalHeader()->label(li.question()); } -TQString WQQuiz::langAnswer(int i) +TQString WTQQuiz::langAnswer(int i) { - WQListItem li = m_list[i]; + WTQListItem li = m_list[i]; int j; if (li.question() == 0) @@ -559,26 +559,26 @@ TQString WQQuiz::langAnswer(int i) return m_table->horizontalHeader()->label(j); } -int WQQuiz::kbAnswer(int i) +int WTQQuiz::kbAnswer(int i) { -/* WQListItem *li = m_list->at(i); +/* WTQListItem *li = m_list->at(i); if (li->question() == 0) { - //@todo return m_table ->layoutLeft(); + //@todo return m_table ->tqlayoutLeft(); } else { - //@todo return m_table -> layoutRight(); + //@todo return m_table -> tqlayoutRight(); }*/ return 0; } -int WQQuiz::questionCount() +int WTQQuiz::questionCount() { return m_questionCount; } -void WQQuiz::finish() +void WTQQuiz::finish() { emit checkingAnswer(-1); } diff --git a/kwordquiz/src/wqquiz.h b/kwordquiz/src/wqquiz.h index d86c9fa0..a9d0c93d 100644 --- a/kwordquiz/src/wqquiz.h +++ b/kwordquiz/src/wqquiz.h @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef WQQUIZ_H -#define WQQUIZ_H +#ifndef WTQQUIZ_H +#define WTQQUIZ_H #include <tqtable.h> @@ -28,16 +28,17 @@ @author Peter Hedlund */ -typedef TQValueList<WQListItem> QuizList; +typedef TQValueList<WTQListItem> QuizList; -class WQQuiz : public QObject +class WTQQuiz : public TQObject { Q_OBJECT + TQ_OBJECT public: enum QuizType {qtEditor, qtFlash, qtMultiple, qtQA}; enum QuizIcon {qiLeftCol, qiRightCol, qiQuestion, qiCorrect, qiError}; - WQQuiz(KWordQuizView * parent, const char * name=0); + WTQQuiz(KWordQuizView * tqparent, const char * name=0); void activateErrorList(); void activateBaseList(); diff --git a/kwordquiz/src/wqscore.cpp b/kwordquiz/src/wqscore.cpp index 80cb3960..485363b0 100644 --- a/kwordquiz/src/wqscore.cpp +++ b/kwordquiz/src/wqscore.cpp @@ -16,7 +16,7 @@ #include "wqscore.h" -WQScore::WQScore() +WTQScore::WTQScore() { m_questionCount = 0; m_percent = false; @@ -26,16 +26,16 @@ WQScore::WQScore() } -WQScore::~WQScore() +WTQScore::~WTQScore() {} -void WQScore::setAsPercent(bool p) +void WTQScore::setAsPercent(bool p) { m_percent = p; } -void WQScore::setQuestionCount(int c) +void WTQScore::setQuestionCount(int c) { m_questionCount = c; //m_percent = false; @@ -44,7 +44,7 @@ void WQScore::setQuestionCount(int c) m_answerCount = 0; } -void WQScore::countIncrement(CountDirection d) +void WTQScore::countIncrement(CountDirection d) { if (d != cdNone) @@ -56,9 +56,9 @@ void WQScore::countIncrement(CountDirection d) } /*! - \fn WQScore::answerText() + \fn WTQScore::answerText() */ -TQString WQScore::answerText() +TQString WTQScore::answerText() { TQString s; if (m_percent) @@ -80,9 +80,9 @@ TQString WQScore::answerText() } /*! - \fn WQScore::correctText() + \fn WTQScore::correctText() */ -TQString WQScore::correctText() +TQString WTQScore::correctText() { TQString s; if (m_percent) @@ -102,9 +102,9 @@ TQString WQScore::correctText() } /*! - \fn WQScore::errorText() + \fn WTQScore::errorText() */ -TQString WQScore::errorText() +TQString WTQScore::errorText() { TQString s; if (m_percent) @@ -124,9 +124,9 @@ TQString WQScore::errorText() } /*! - \fn WQScore::valueToString(int i) + \fn WTQScore::valueToString(int i) */ -TQString WQScore::valueToString(int i) +TQString WTQScore::valueToString(int i) { TQString s = ""; //return empty string for 0 diff --git a/kwordquiz/src/wqscore.h b/kwordquiz/src/wqscore.h index 46c4651d..10e575fa 100644 --- a/kwordquiz/src/wqscore.h +++ b/kwordquiz/src/wqscore.h @@ -14,20 +14,20 @@ * * ***************************************************************************/ -#ifndef WQSCORE_H -#define WQSCORE_H +#ifndef WTQSCORE_H +#define WTQSCORE_H #include <tqwidget.h> /** @author Peter Hedlund */ -class WQScore{ +class WTQScore{ public: enum CountDirection {cdCorrect, cdError, cdNone}; - WQScore(); + WTQScore(); - ~WQScore(); + ~WTQScore(); void setAsPercent(bool p); void setQuestionCount(int c); diff --git a/kwordquiz/src/wqundo.h b/kwordquiz/src/wqundo.h index d9b5e9c7..b0d584dd 100644 --- a/kwordquiz/src/wqundo.h +++ b/kwordquiz/src/wqundo.h @@ -13,8 +13,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef WQUNDO_H -#define WQUNDO_H +#ifndef WTQUNDO_H +#define WTQUNDO_H #include <tqtable.h> @@ -23,7 +23,7 @@ /** @author Peter Hedlund */ -class WQUndo{ +class WTQUndo{ public: TQFont font() const {return m_font;} void setFont(const TQFont & font) {m_font = font;} |