From 2d3c19b6abc28bd33e9348f46529b6de145aa335 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kerry@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kerry/src/beaglesearch.cpp | 4 ++-- kerry/src/beaglesearch.h | 6 +++--- kerry/src/hitwidget.cpp | 8 ++++---- kerry/src/hitwidget_layout.ui | 12 ++++++------ kerry/src/kcm/select_privacy_resource.ui | 2 +- kerry/src/searchdlg.cpp | 2 +- kerry/src/searchdlg_layout.ui | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/kerry/src/beaglesearch.cpp b/kerry/src/beaglesearch.cpp index 54e3046..58a6f8a 100644 --- a/kerry/src/beaglesearch.cpp +++ b/kerry/src/beaglesearch.cpp @@ -319,7 +319,7 @@ void BeagleSearch::hits_added_cb (BeagleQuery *query, BeagleHitsAddedResponse *r result->score = beagle_hit_get_score(BEAGLE_HIT (l->data)); result->uri = get_uri_from_file_hit (BEAGLE_HIT (l->data)); result->tilegroup = Unknown; - result->tqparent_uri = get_parent_uri_from_file_hit (BEAGLE_HIT (l->data)); + result->parent_uri = get_parent_uri_from_file_hit (BEAGLE_HIT (l->data)); result->source = get_source_from_file_hit (BEAGLE_HIT (l->data)); result->client_id = client->id; #if 0 @@ -333,7 +333,7 @@ void BeagleSearch::hits_added_cb (BeagleQuery *query, BeagleHitsAddedResponse *r const char* value = beagle_property_get_value( property ); kdDebug() << " \"" << key << "\" = \"" << value << "\"" << endl; } - kdDebug() << "tqparent_uri = " << *(result->tqparent_uri) << endl; + kdDebug() << "parent_uri = " << *(result->parent_uri) << endl; kdDebug() << "source = " << *(result->source) << endl; kdDebug() << "tilegroup = " << result->tilegroup << endl; #endif diff --git a/kerry/src/beaglesearch.h b/kerry/src/beaglesearch.h index 7c09cee..2a6e731 100644 --- a/kerry/src/beaglesearch.h +++ b/kerry/src/beaglesearch.h @@ -67,7 +67,7 @@ class beagle_result_struct { public: beagle_result_struct () { uri = NULL; - tqparent_uri = NULL; + parent_uri = NULL; source = NULL; mime_type = NULL; snippet = NULL; @@ -77,14 +77,14 @@ public: ~beagle_result_struct () { delete uri; - delete tqparent_uri; + delete parent_uri; delete source; delete mime_type; delete snippet; } TQString *uri; - TQString *tqparent_uri; + TQString *parent_uri; TQString *source; PropertyList properties; TQString hit_type; diff --git a/kerry/src/hitwidget.cpp b/kerry/src/hitwidget.cpp index 3762dc7..649c076 100644 --- a/kerry/src/hitwidget.cpp +++ b/kerry/src/hitwidget.cpp @@ -145,22 +145,22 @@ void HitWidget::setPropertiesText(TQString text) void HitWidget::insertHeaderWidget( int index, TQWidget * widget) { - tqlayoutHeader->insertWidget(index,widget); + layoutHeader->insertWidget(index,widget); } void HitWidget::insertHitWidget( int index, TQWidget * widget) { - tqlayoutButton->insertWidget(index,widget); + layoutButton->insertWidget(index,widget); } void HitWidget::insertTextWidget( int index, TQWidget * widget) { - tqlayoutText->insertWidget(index,widget); + layoutText->insertWidget(index,widget); } void HitWidget::insertHitSpacing( int index, int size) { - tqlayoutButton->insertSpacing(index,size); + layoutButton->insertSpacing(index,size); } TQString HitWidget::uri() const diff --git a/kerry/src/hitwidget_layout.ui b/kerry/src/hitwidget_layout.ui index b458d2a..f8354b5 100644 --- a/kerry/src/hitwidget_layout.ui +++ b/kerry/src/hitwidget_layout.ui @@ -57,7 +57,7 @@ - tqlayoutIcon + layoutIcon @@ -202,7 +202,7 @@ - tqlayoutHeader + layoutHeader @@ -260,7 +260,7 @@ - tqlayoutText + layoutText @@ -312,7 +312,7 @@ - tqlayoutButton + layoutButton @@ -369,8 +369,8 @@ 89504e470d0a1a0a0000000d4948445200000040000000470806000000b76c4166000013c349444154789cd59b797c54e5b9c7bfef39b36526939504123611300ae202294a412c52aca0423197c5da96aa148b8ab6b4f45a976b5d3ef62af4f6aab5d88216efd52ab457f40388209b20d42218a0e06509040890852c6499c96ce73cf78f33998430249310d4fb7c3eef273367ce79dff7f77b96f7799ff704bea6f20790c9203920ce68f380f407b91de437205ff51c2f8a3c07721988b200b6d9d2406680ac834b3b3b9eea8a4977853c0bf20670a8c5355dd7e9dbb72fbd7bf72635351511a1bcbc9c03070e505b5b1bbb2f1df829f0e4d7084f5c590d3b5a7e7f03e46e90dc165acdcbcb93471e7944366edc28959595621886b416bfdf2f6bd7ae955b6fbd55945242d4620abe8e6ef12ac850103b881ef5653788a305e8a4a4249932658aac5fbf5e2291c83980cf27a669caf2e5cb25232323d6d7ad1d24e1a29acc22909f00b9bd7b3369d224b2b3b3a9afafe7f4e9d3d4d5d5919999c9f5d75fcf6db7dd46767676a7c7d9b3670f37df7c33e5e5e500dc0ffce1ebe00e4341aeb9e61aa9aaaa4a58ab9d95ad5bb78acbe512a2d6b5fcab7687c7409240366fde7cd1c137c9534f3d157385895f3501978278bd5e0904025f1a010d0d0d9293932344738644e6a95d2c026c80520aa5da77c56030d8e9714cd38c7df6783ccc983103001ff06202245c340286000d0d0d1c3d7af4bcf7048341e6cd9bc7c183073bdcffce9d3bb9e1861bf0fbfdb16b7bf7ee25292929f67d7f02fd5c3402be81a59d0d1b36c4fd7dfbf6ed8c1c3992d75f7f9d81030776a8efa3478f3261c204f2f2f2484e4e8e5d1f3c7830c1603066751f004f7d55b1e0896830bae38e3b623eba7bf76e79e2892764c48811a2699a003266cc980ef9792412911b6fbc51745d975dbb76c5bde785175e88f50fc8c82e24c10ef402ae044601e3807c6002f063e0c9eb60cfd5205a74f0dcdc5c314d53f6eedd2bd9d9d9e7e4f34f3cf144870858b2648900327efc7889442262188698a629a6699e75dfc2850bcf22a1b359621e3017f81b701808b706d0d49452a2699a689a26baae4b5a5a9a0c19324466cf9e2da1504844444a4b4b65d8b061b1679c4ea7ecdbb72f61f0a15048060c1820802c5dba541a1b1b25100848301894502824e17038468a6118f2ca2bafc448d0acbd46c2240c063e04ccf3016ed95e7ae925a9aaaa129fcf27a150e81c6db494aaaa2a993a75aae4e7e7cbead5ab3ba4fd356bd608206eb75b4a4a4aa4b6b656eaeaeaa4bebe5e1a1a1ac4e7f389dfef3f8b98c71f7f3c36cf6f2748c0f5407d4bcdde70c30dd2bf7fffb8e0dd6eb79497977708486765eedcb90248efdebda5a2a2422a2b2ba5aaaa4aaaababa5a6a6466a6a6ae4cc993367115357572763c78e8d6588adc1c65b057e072403a4a5a5b164c91294521c3e7c382e5bf7de7bef05e5f11d91a625d5eff7e3f7fb09854267b570387c4e330c83f9f3e7e3743a0901cfb722211e01c300bc5e2f1b366ce0e0c1836cdebc39ee84ba77efce934f3ed9a520db926eddba01505d5d4d5959590c646b225ab75ebd7af1ddef7e1780ddadfa8c47400540414101575d75158b162d8a3b194dd358b870219999995d06b03d193264080022427d7d7d9b9a6fdd264e9c089c5d70012b636d2dab8199cb972f273737978a8a8ab89379e08107983c7972d7a14b401c0e07006eb79bb4b434c2e130d09c72b7d5060d1a84aeeb941bc6597dc623603130b3b6b696e79e7b2eee446ebae926162c58d095d81292eddbb703306ad4286c361ba150a84dd0d04c8ec7e3c1e57251ebf39dd5673c02fe01ac07c6c69b446e6e2e6fbdf5564c1b5f961c3f7e9c65cb96e1743a9931634687b4dfd4448448ab7ee31100300ff814380ba5a669bcf6da6bf4e8d1a3cb01b625c16090993367525f5fcf9c3973e8d3a74f87b4af94a2a1a1816030481ad64eb149ce474021f024f09b96171f7cf0416eb9e5968b81f1bc120e8799356b161f7df411e3c78f67e2c48984c3e1b820db6abb76edc2300c7280aa16fd9f8f0080e7817f018629a59832650af3e7cfbf7848e388dfefe7eebbef66d9b2658c1c3992d9b367138944300c2361cd37b5f7df7f1fb0362e7b5b8cd11601027c020c9b3a752a6fbffd7642c58dae92d2d252a64d9bc6962d5b183e7c380f3ffc3022d2aee9c76bfbf6ed63d3a64dd88149c09216e3b44500c03ae0e1eaeaea2f157c61612105050514171773cd35d73067ce1c8036c1437ccdd7d4d4f0ecb3cf6218063380c9adaac5ed11f031e02b2c2cf498a689a65db4fa494c3efcf043a64f9f4e6d6d2d7dfaf461f6ecd928a53ae5f7814080679e79868a8a0a4602afc72995b787a81ef8b0aaaa8a03070e743dda56b272e54a0a0a0aa8adadc5e572316bd6acd87adf5ed6d73afdf5f97c3cfffcf3ecdfbf9f41c0d6f39c1324a2d2b74484952b57762dda56525858c85d77dd15abf14d983081cccccc7681c62326180cf2eaabaf525858487fe03fe1bef38d9b88633b81e343870ecddeb163c74589055bb66c61ecd8b1b1e4a667cf9edc77df7de8ba9e90a943b35b78bd5ede7bef3d56ac58410656c09bd8064e3d81f919408fb2b2b26f8e1a358a4b2fedf449f47965f4e8d1d4d4d400169049932691969686699ab16618c659dfe3b55028c4eeddbb59b66c1922c263c08fdb5172a2eabc1cd8377cf8706debd6add86cedc5cec465cb962d8c1e3d3af6fdb2cb2ee38e3beee890d69bdad6ad5bd9b8712381408041c01709e04b34acef1f33668cb67dfb761e7df451443a5f646d6868a0a8a888a2a222bea7d459e001860d1b9690dfb7bea7a6a6864d9b36110804f83570245d91d93fa9dd8926acca871e7a888d1b37b260c1024cd3e4e9a79fc6ed769f739f8870faf4690e1d3ac4912347282929e1c489131c3f7e9ca2a2224a4b4ba9afafc71387445dd7494e4eee709eaf9462c3860d343636320d583f7a048e439fa1b9c2ede2ea5044bbfdf6db65c58a1500e4e5e5316bd62cf2f3f3d1759da2a222b66ddbc6d6ad5b3974e810a150a8ddfe92812ca0b8c5b569d3a6919e9edea135fff0e1c3ac58b102d334599a99c9627f0dbbb234f42c8db29da12e890100141616568f1f3f3ebdacac2ca1fb1d580708df02928008e0029a6a48e380b780675b3c3362c408060d1a745e025a5fabacac64f9f2e531c22b74c549b1f1fb94086b07da29f9ac0b090058bb76ad4c9b362d16b5e3890db816f835d03dceefce68d3a313180194b7f8bd4f9f3e8c1b37eebcfd1f3f7e9c8f3ffe985028c40d585bd6eb95429410128d1a143b75e1992b1decd8156813638773db9b6fbe59ad59b3863163c69c93132403538095c042e2838766e082b5c64e6bf5fb891327a8afaf3fe7b96030c8b66ddb58b76e1d4628c443c046ac3a3e8012d004c024d3807e67cc73fa682d9dce6a0a0b0babef9f3933fdf0e79f932c829de6a442c7327f2f90035ca2147d95d0cf840c2c775058a72e260a0d611450dba2fffcfc7caebefa6ac00aac454545ecd8b103bfdf8f07788156e95d144948e99c128362a5f17696c6ebe5913631766a41dffe8f4fe5de1f7c9fa37bf7e146a16399921605a5015e4f32975f974fff9c9ef44a4d21f0d9a7a81dbb4184306028e0f23c7acdb887fadd3b29787b29afb718a3a2a202d33429292961d7ae5d54565602d659ddd34041eb4989022518a6494841c814c291f697eb0e13b061e306f9e1f4e9d4141fc781c286c4fcc8c452840674efd387abf2f3e9df3d975edd32d8b16e2388c2a74c6c28f4c183b976feef503db2c8b8ed76e6b9dd2c7dedcfb172d5c9932779e79d77686c6c042cabf911f0721b731320a484b08288d2d01adb27a0433160d5aa5572ef9ddfa3bcf818214cec08369ab5af68f26f45cf4bfa92ee4e26d5e3417c7e42a52789208494c2183090ab17bc80caed86386de080febf7a9cdb5b8c6518068d8d8d3880c9c05fdb052f180a02a2f0a3b15f4ccada5f8913b78065cb96ca8c1ffc005f4d0d9a1252c53a2bb745416b28246a0d769b4eaf3e7d48732793e27653b1670f2e9f8fb0022d27876be7ff165b4e0ecae604cd86681aa7febc98bb80e54008e80d7c07ab82730bcd8791cd0e1dfda49ab5ec13c52107acefeb64756588eada2e728155ab56c9b4a95309f87d68026e9ac15b9a57688044ff66a4a791969e86c7e3c2ed7472fac86122220492dc5cfff8e3b8fae6a2940dc3aea38be2d8ab7f447bf925c62a8d37c4c40bdcccd9113a7e245310cd28439ac63e37bc36c6cdc9fe0edc675239bdae064eb4fdfe5142042c7ff75d7c3e1fba5238109c58098d9d26b31754f4b31dc8cecec6e372e3763871d874ce949e22aceb8cfaf94f49cbbf1e74856836f44884838b16a1fd7e213d2361ec62c6825bbbcb939218789422ace96cced43998e22a8f94998b7d3567360732a496136d7793500cb8ffc107f8ef37ff8b4179797850b8b0986b6a4de075c0a6203525058fcb4592cd8e8970faf871ae2828e092f1b7a1e9825296bd1c58fc1abcfc0772c2215c22984d569dc8a45adc18528add221cccd08a03bec043e5871b5f3a7dd8d834f492d1dbdbeb22210b187aed500570efd429b276ff7eec58eb7c53c46f5afe9a129ccc8c0c5c4e3b4ebb83706323e9fd0770dd3df7806e0365bd3cb3eb4f0b712c5c448e118ae5054deedcd273cf478600261a4a991802fe017a79ed58e7e29c24d7aaddef95fa005617ad6b175b8796416f4a0a0e9acd1f9aa3bf169d9443c0e34d21c9e1c06eb3a1743b53e6fe0c9bc70d4a81283e5ff657fc0bff489611c24d7c336cca14db169388b2713a4bd83627b33a3d4b5fbe647a89afddc75a488796c1cb075f891d8583666d5be0ade0e7049251646677c3ed70a1db34323d29a4a665a0340d34eb7c2eb4e333bc86894314365131c0f1e4bc24886575b52e838f7e9285ef0ae7dd4ba697fc6f47f04082163079ca6d2a6fe0e05bcb2b2b2d3f152b876f39691d6b75f0ea36b2bb75c36577e0d46d883210cd8c2e92a06c3ad7cc7b84034507318b8e6228b0c541190fb8b4ba5e69d3587d4f7af93f873baefefdb78bcbe33cd2ae24521364ff1707d97364fbf12dffd83cc31692548fd9acb526137261fde7469ac3c988f1b790969a863dc9c59677dfa757cf5cec6eaf75aea02bb4b454bc03f2a85ab3066f38823dc1b067288552105150e6547cf2a3ece2f5dfd02f5d3ced645dc7a15b92b00bd49d0c071c5ef58b60ba865f596b7e186b8f6f62c5043790a4295c0e079a4dc7268adada1ab6bff917cc480843039442b36978467d13cfd871849560b431aea2a5ab0986d8a84e52ec999553bea3c071dd9bf794b55ff669433a14031c6eb5da9163aff7b92de04d26a9d3b4bf57b8535248727b2c82c206015f3dbb57aea064ed1ad06ce07060daec689a46b7390f509f9a8ed9cae055abbf4de318288e5daaf8e0d93e4c7cf9548fdf7da7e4f48580870e129092e5687067d90f491f3bf5766216d0b432a0846e970f4477ba30cd08758d0d94edde455238cc3f5f5b8271a61c250a655a9b37c71583f03e703f215dc7542a464353ca2b2afaa2a202bf43f1e98454fee7c55ef7cd9a7baccb0e273a4440d126bf1c5adf30cc96ad08f476128c461085550c49164873b81011c434894422d81b032403ea741927feb214d314ab0ea0039a8ef7de1904877dc302defad0452cf0b55e8d0f66f760ccaa33eab1db8bfff4fdb7bb27d345d2a9d3cee28f83ca4c127cc92ae6ffc9401aa0f91b0946c2440c033122b882615281145194bff357fc9ffd1d9b802e764cbb42f36692f6e27c1abbe7a25ab98280ef54ae7ddfdf7ed1f7b13b5f2c55003f7abb6fd69b7796375c18ec66e9fc71af29d4db21a859feef069215786d3a4a8bee0c952229ba6b4c42e8e66fa0fcf15f13a92a25a229547d030dbb0a096eda86ad5b7a748dd32d7f578aa22b92f8db2ffbfd7df6bf153ff7d467570e025872e7b184fdfe81d59764b4774fa78f78c261938809018f06f5e0c2c42d60b3390847045d45f0979c44852328acf258b280f3d4294eff6c1e221ab62345786aaab01b26ba98a0744c6560a23839c4cd964707ac0877b7ffe5df770ed31f19b6f38b8ecef195f147abdbbba7d3c124294b856c76cd9ee2d6187ccce05b11931c14de4157e0bcb41f75c5c7683c70889470901c057d059214248915344d05280d4d045309ba680882a914a7ae4c62e78b831f9b32667bfcf7f41290c92f65bb963f541168efbe4e5940bf51eee492c2c677bc39fad8a41c2dd7a61cb88bfcf412a8fc623f27f77d8189c2ab04b7d2f18a810d7088b59d1605ba2814621545a3ae5f97a9537a4f5ff6dd9a31f0a8e9efd699b93549c84f02f5a00bb0004f37dd95ded7f1e39e03ddf9791ed788fc374a075e1d3169c0aaf15763b1db17b882e66ab093e832a73454b48a682a28bbc4f9c9a167f24a2b87273f327de0d6239d9d5747a5d331c05769047c958d2f0fbb3163822bcbe93432f481f60a21036844a800ec28d251b8306315242babb336d0a65288521c1895b27ff7dc7e2ffc7052e18aae8195b85cf04b3f8d6163475d205c549be540a1a12b65d50480de2892317160f9bd2d6a70a612ab9a85c61763d3d838b7dfab5f0578e80202d6be5c5611f4199b6b339d9c5626d562620049283c982d8ec1a2db4865e5f4268aa0078a1feab7e0a7930a5ffc8f6dc3fb5de85c3a235df2da573062d41a5e1d44a8538a10908a908922052b4d8e6efb31a39a0fdb14c7bedfb3aae0b69df300e67e737bf17907b888d22504f86bcdaa804b8868e017c10da462253f764057a02989fe2b99c29704077e7559fdd6821e3fffed27d726b425bf5872c1efba5c31da9b545a1c4c72191a95285211d25131f076ac034b0584743899a31f7d7778f2e707f0fdabfe79e389c5bf3cd6d66ef8ff87f4186c5f9493a9c98b369bbc0fb201e43334398a92332001a5a4bc9b4d3e9fd3bfee836da3ee03f8a8fca68bffd6650272c11670cb4fb25424647f3f5cdf38b3fa5484cc6d3e9c62e251824b29fc3d1d278ede98f645f9949eafc865362dbdbb6d1bc0b8ee1bda3fbbfe12e4ff00e8dbd0e166c8e7ef0000000049454e44ae426082 - - + + hitwidget_layout.ui.h diff --git a/kerry/src/kcm/select_privacy_resource.ui b/kerry/src/kcm/select_privacy_resource.ui index 1542d58..d8dcaf4 100644 --- a/kerry/src/kcm/select_privacy_resource.ui +++ b/kerry/src/kcm/select_privacy_resource.ui @@ -82,5 +82,5 @@ select_privacy_resource.ui.h - + diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp index d35cada..81e34b5 100644 --- a/kerry/src/searchdlg.cpp +++ b/kerry/src/searchdlg.cpp @@ -1356,7 +1356,7 @@ void SearchDlg::slotOpenKNotes(const TQString& noteid) void SearchDlg::slotOpenURL(const TQString& url) { - (void) new KRun( url, tqparentWidget()); + (void) new KRun( url, parentWidget()); } TQString SearchDlg::formatBytes(TQString& bytesStr) const diff --git a/kerry/src/searchdlg_layout.ui b/kerry/src/searchdlg_layout.ui index a2f5224..c1204cb 100644 --- a/kerry/src/searchdlg_layout.ui +++ b/kerry/src/searchdlg_layout.ui @@ -1096,8 +1096,8 @@ searchdlg_layout.ui.h - - + + kwidgetlistbox.h kpushbutton.h