diff options
Diffstat (limited to 'kbattleship')
26 files changed, 180 insertions, 677 deletions
diff --git a/kbattleship/kbattleship/CMakeL10n.txt b/kbattleship/kbattleship/CMakeL10n.txt index 4ddeaac5..f246b591 100644 --- a/kbattleship/kbattleship/CMakeL10n.txt +++ b/kbattleship/kbattleship/CMakeL10n.txt @@ -1,3 +1,15 @@ ##### create translation templates ############## tde_l10n_create_template( "kbattleship" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kbattleship.desktop/" + SOURCES kbattleship.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) + +tde_l10n_create_template( + CATALOG "desktop_files/kbattleship-eventsrc/" + SOURCES_DESKTOP eventsrc + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kbattleship/kbattleship/CMakeLists.txt b/kbattleship/kbattleship/CMakeLists.txt index 5e140a16..6b84b458 100644 --- a/kbattleship/kbattleship/CMakeLists.txt +++ b/kbattleship/kbattleship/CMakeLists.txt @@ -18,7 +18,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libtdegames - ${CMAKE_SOURCE_DIR}/libtdegames/highscore ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -46,14 +45,20 @@ tde_add_executable( kbattleship AUTOMOC ##### other data ################################ -install( FILES kbattleshipui.rc eventsrc + +install( + FILES kbattleshipui.rc DESTINATION ${DATA_INSTALL_DIR}/kbattleship ) -install( FILES kbattleship.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} +tde_create_translated_desktop( + SOURCE eventsrc + DESTINATION ${DATA_INSTALL_DIR}/kbattleship + PO_DIR kbattleship-eventsrc ) +tde_create_translated_desktop( kbattleship.desktop ) + install( FILES _kbattleship._tcp DESTINATION ${DATA_INSTALL_DIR}/zeroconf ) diff --git a/kbattleship/kbattleship/Makefile.am b/kbattleship/kbattleship/Makefile.am index 3f4cddf4..b699ef21 100644 --- a/kbattleship/kbattleship/Makefile.am +++ b/kbattleship/kbattleship/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = dialogs . pictures sounds -INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes) +INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes) METASOURCES = AUTO bin_PROGRAMS = kbattleship diff --git a/kbattleship/kbattleship/eventsrc b/kbattleship/kbattleship/eventsrc index c2c8fe7e..2e88b42b 100644 --- a/kbattleship/kbattleship/eventsrc +++ b/kbattleship/kbattleship/eventsrc @@ -1,475 +1,27 @@ [!Global!] IconName=kbattleship Comment=KBattleship -Comment[ar]=لعبة سفينة الحرب (KBattleship) -Comment[be]=Марскі бой -Comment[bn]=কে-ব্যাটেলশীপ -Comment[cs]=Souboj lodí -Comment[de]=Schiffe versenken (KBattleship) -Comment[eo]=Batalŝipo -Comment[hi]=के-बैटलशिप -Comment[hr]=KPotapanje brodova -Comment[is]=KSjóorrusta -Comment[nds]=Scheep versenken (KBattleship) -Comment[ne]=केडीई ब्याटलसीप -Comment[pa]=ਕੇ-ਜੰਗੀ ਜਹਾਜ਼ -Comment[ro]=Bătălie navală -Comment[sl]=KBojnaLadja -Comment[sv]=Sänka fartyg -Comment[ta]=கேபோர்க்கப்பல் -Comment[tg]=KҶанги Киштиҳо -Comment[tr]=Amiral Battı -Comment[zh_TW]=KBattleship 戰艦 [shoot_water] Name=Shot at water -Name[ar]=إصابة في الماء -Name[be]=Стрэл у ваду -Name[bg]=Пропуск (стрелба във водата) -Name[bn]=পানিতে কামান চালান -Name[bs]=Pucanj u vodu -Name[ca]=Tir a l'aigua -Name[cs]=Střela do vody -Name[cy]=Saethu i'r dŵr -Name[da]=Skudt på vand -Name[de]=Schuss ins Wasser -Name[el]=Πυροβολισμός στο νερό -Name[eo]=Pafo al akvo -Name[es]=Disparo al agua -Name[et]=Lask vette -Name[eu]=Tiroa uretara -Name[fa]=شلیک کردن در آب -Name[fi]=Ammus veteen -Name[fr]=Tirer dans l'eau -Name[gl]=Disparo á auga -Name[he]=ירייה במים -Name[hi]=पानी पर गोली चलाएँ -Name[hr]=Pucanj u vodu -Name[hu]=Mellé ment lövés -Name[is]=Skot í sjóinn -Name[it]=Colpo in acqua -Name[ja]=水面を撃つ -Name[km]=បាញ់ត្រូវទឹក -Name[lt]=Šūvis į vandenį -Name[lv]=Trāpīts ūdenī -Name[mk]=Истрел во вода -Name[nb]=Skutt til sjøs -Name[nds]=Schööt in't Water -Name[ne]=पानीमा गोली -Name[nl]=Schot in het water -Name[nn]=Skot i sjøen -Name[pa]=ਪਾਣੀ ਉੱਤੇ ਗੋਲਾਬਾਰੀ -Name[pl]=Pudło -Name[pt]=Disparo na água -Name[pt_BR]=Tiro na água -Name[ro]=A tras în apă -Name[ru]=Промах -Name[se]=Bávkkáhus mearas -Name[sk]=Zásah vody -Name[sl]=Ustreli proti vodi -Name[sr]=Пуцањ у воду -Name[sr@Latn]=Pucanj u vodu -Name[sv]=Skott i vattnet -Name[ta]=நீரில் எரி -Name[tg]=Тирпарронӣ дар Об -Name[tr]=Yara aldı -Name[uk]=Постріл у воду -Name[wa]=Côp dins l' aiwe -Name[zh_CN]=向水中射击 -Name[zh_TW]=水面射擊 Comment=Someone has shot at the water -Comment[ar]=لقد رمى أحدهم على الماء -Comment[be]=Хтосьці зрабіў стрэл у ваду -Comment[bg]=Пропуск (стрелба във водата) -Comment[bn]=কোনো একজন পানিতে গোলা ছুড়েছে -Comment[bs]=Neko je pucao u vodu -Comment[ca]=Algú dispara a l'aigua -Comment[cs]=Někdo vystřelil do vody -Comment[cy]=Mae rhywun wedi saethu i'r dŵr -Comment[da]=Nogen har skudt på vandet -Comment[de]=Da hat jemand ins Wasser geschossen -Comment[el]=Κάποιος πυροβόλησε στο νερό -Comment[eo]=Iu pafis al la akvo -Comment[es]=Alguien ha disparado al agua -Comment[et]=Keegi tulistas vette -Comment[eu]=Norbaitek urari tiro egin dio -Comment[fa]=شخصی در آب شلیک کرده است -Comment[fi]=Joku on ampunut veteen -Comment[fr]=Quelqu'un a tiré dans l'eau -Comment[gl]=Alguén disparou á auga -Comment[he]=מישהו ירה במים -Comment[hi]=किसी ने पानी पर गोली चलाई -Comment[hr]=Neko je pucao u vodu -Comment[hu]=Az egyik játékos lövése nem talált -Comment[is]=Einhver skaut í vatnið -Comment[it]=Qualcuno ha sparato nell'acqua -Comment[ja]=誰かが水面を撃った -Comment[km]=មានមនុស្សបានបាញ់ត្រូវទឹក -Comment[lt]=Kažkas šovė į vandenį -Comment[lv]=Kāds trāpija ūdenī -Comment[mk]=Некој стрелаше во вода -Comment[nb]=Noen har skutt på vannet -Comment[nds]=Een hett in't Water schaten -Comment[ne]=केसैले पानीमा गोली हानेको छ -Comment[nl]=Iemand heeft in het water geschoten -Comment[nn]=Nokon har skote på vatnet -Comment[pa]=ਕਿਸੇ ਨੇ ਪਾਣੀ ਉੱਤੇ ਗੋਲਾਬਾਰੀ ਕੀਤੀ -Comment[pl]=Ktoś spudłował -Comment[pt]=Alguém disparou para a água -Comment[pt_BR]=Alguém atirou na água -Comment[ro]=Cineva a tras în apă -Comment[ru]=Кто-то промазал -Comment[se]=Giinu lea bávkkihan bombba -Comment[sk]=Niekto trafil vodu -Comment[sl]=Nekdo je ustrelil v vodo -Comment[sr]=Неко је пуцао у воду -Comment[sr@Latn]=Neko je pucao u vodu -Comment[sv]=Någon har skjutit i vattnet -Comment[ta]=யாரோ தண்ணீரை நோக்கி சுட்டுவிட்டார் -Comment[tg]=Касе дар об тир паронд -Comment[tr]=Birileri biri suya ateş etti -Comment[uk]=Хтось попав у воду -Comment[zh_CN]=有人向水中射击 -Comment[zh_TW]=某人已進行水面射擊 default_sound=ship-player-shoot-water.ogg default_presentation=1 [shoot_hit_1] Name=Player 1 shot -Name[ar]=رمية اللاعب 1 -Name[be]=Стрэл першага гульнёўцы -Name[bg]=Изстрел на играч 1 -Name[bn]=প্রথম খেলোয়াড় গোলা ছুড়েছে -Name[bs]=Pucanj igrača 1 -Name[ca]=Tir del jugador 1 -Name[cs]=Hráč 1 vystřelil -Name[cy]=Saethu Chwaraewr 1 -Name[da]=1. spillers skud -Name[de]=Schuss von Spieler 1 -Name[el]=Παίκτης 1 πυροβόλησε -Name[eo]=Ludanto 1 pafis -Name[es]=Disparo del jugador 1 -Name[et]=Mängija 1 lask -Name[eu]=1. jokalariak tiro egin du -Name[fa]=شلیک بازیکن ۱ -Name[fi]=Pelaaja 1 ampui -Name[fr]=Le joueur 1 a tiré -Name[gl]=Disparo do xogador 1 -Name[he]=יריית שחקן 1 -Name[hi]=खिलाड़ी 1 ने गोली चलाई -Name[hr]=Puca igrač 1 -Name[hu]=Az 1. játékos egyik hajója találatot kapott -Name[is]=Leikmaður 1 skaut -Name[it]=Spara il giocatore n. 1 -Name[ja]=プレイヤー 1 発射 -Name[km]=អ្នកលេង ១ បានបាញ់ -Name[lt]=I Žaidėjo šūvis -Name[lv]=Pirmā spēlētāja šāviens -Name[mk]=Истрел на играчот 1 -Name[nb]=Spiller 1 skutt -Name[nds]=Schööt vun Speler 1 -Name[ne]=खेलाडी १ गोली -Name[nl]=Schot van speler 1 -Name[nn]=Spelar 1 skote -Name[pa]=ਖਿਡਾਰੀ 1 ਗੋਲੀ ਚਲਾਈ -Name[pl]=Strzela Gracz 1 -Name[pt]=Jogador 1 disparou -Name[pt_BR]=Jogador 1 atira -Name[ro]=Jucătorul 1 a tras -Name[ru]=Ход первого игрока -Name[se]=Speallár 1 lea bávkkihan bombba -Name[sk]=Hráč 1 vystrelil -Name[sl]=Strel igralca 1 -Name[sr]=Пуца играч 1 -Name[sr@Latn]=Puca igrač 1 -Name[sv]=Skott från första spelaren -Name[ta]=விளையாடுபவர் 1 எரிதல் -Name[tg]=Тирпарронии бозингари 1 -Name[tr]=Oyunu 1 atış -Name[uk]=Постріл першого гравця -Name[zh_CN]=Player 1 射击 -Name[zh_TW]=玩家 1 射擊 Comment=Player 1 takes a shot -Comment[ar]=اللاعب 1 ي رم -Comment[be]=Першы гульнёўца страляе -Comment[bg]=Изстрел на играч 1 -Comment[bn]=প্রথম খেলোয়াড় গোলা ছুড়ছে -Comment[bs]=Igrač 1 je na potezu -Comment[ca]=El jugador 1 dispara -Comment[cs]=Hráč 1 vystřelil -Comment[cy]=Chwaraewr 1 yn saethu -Comment[da]=Spiller 1 skyder -Comment[de]=Spieler 1 schießt -Comment[el]=Ο παίκτης 1 πυροβολεί -Comment[eo]=Ludanto 1 pafas -Comment[es]=El jugador 1 hace un disparo -Comment[et]=Mängija 1 tulistas -Comment[eu]=1. jokalariak tiro egin du -Comment[fa]=بازیکن ۱، یک گلوله میخورد -Comment[fi]=Pelaaja 1 ampuu -Comment[fr]=Le joueur 1 a subi un tir -Comment[gl]=O xogador 1 fai un disparo -Comment[he]=שחקן 1 יורה -Comment[hi]=खिलाड़ी 1 ने गोली चलाना लिया -Comment[hr]=Igrač 1 upravo puca -Comment[hu]=Az 1. játékos lő -Comment[is]=Leikmaður 1 skýtur -Comment[it]=Il giocatore 1 prende un colpo -Comment[ja]=プレイヤー 1 が発射 -Comment[km]=អ្នកលេង១ បានបាញ់ -Comment[lt]=I Žaidėjas šauna -Comment[lv]=Šauj pirmais spēlētājs -Comment[mk]=Играчот 1 истрела -Comment[nb]=Spiller 1 er truffet -Comment[nds]=Speler 1 schütt -Comment[ne]=खेलाडी १ ले गोली लियो -Comment[nl]=Speler 1 schiet raak -Comment[nn]=Spelar 1 er truffen -Comment[pl]=Gracz 1 został trafiony -Comment[pt]=Jogador 1 dispara -Comment[pt_BR]=Jogador 1 leva um tiro -Comment[ro]=Jucătorul 1 a primit o lovitură -Comment[ru]=Ход первого игрока -Comment[se]=Speallár 1 lea deaivvahallan -Comment[sk]=Hráč 1 zasiahnutý -Comment[sl]=Igralec 1 je dobil strel -Comment[sr]=Играч 1 управо пуца -Comment[sr@Latn]=Igrač 1 upravo puca -Comment[sv]=Första spelaren skjuter -Comment[ta]=விளையாட்டாளர் 1 விளையாட துவங்குகிறார் -Comment[tg]=Бозингари 1 тир паронд -Comment[tr]=Oyuncu 1 atış attı -Comment[uk]=Перший гравець стріляє -Comment[zh_CN]=Player 1 射击 -Comment[zh_TW]=玩家 1 進行了一次射擊 default_sound=ship-player1-shoot.ogg default_presentation=1 [shoot_hit_2] Name=Player 2 shot -Name[ar]=رمية اللاعب 2 -Name[be]=Стрэл другога гульнёўцы -Name[bg]=Изстрел на играч 2 -Name[bn]=দ্বিতীয় খেলোয়াড় গোলা ছুড়েছে -Name[bs]=Pucanj igrača 2 -Name[ca]=Tir del jugador 2 -Name[cs]=Hráč 2 vystřelil -Name[cy]=Saethu Chwaraewr 2 -Name[da]=2. spillers skud -Name[de]=Schuss von Spieler 2 -Name[el]=Παίκτης 2 πυροβόλησε -Name[eo]=Ludanto 2 pafis -Name[es]=Disparo del jugador 2 -Name[et]=Mängija 2 lask -Name[eu]=2. jokalariak tiro egin du -Name[fa]=شلیک بازیکن ۲ -Name[fi]=Pelaaja 2 ampui -Name[fr]=Le joueur 2 a tiré -Name[gl]=Disparo do xogador 2 -Name[he]=יריית שחקן 2 -Name[hi]=खिलाड़ी 2 ने गोली चलाई -Name[hr]=Puca igrač 2 -Name[hu]=A 2. játékos egyik hajója találatot kapott -Name[is]=Leikmaður 2 skaut -Name[it]=Spara il giocatore n. 2 -Name[ja]=プレイヤー 2 発射 -Name[km]=អ្នកលេង ២ បានបាញ់ -Name[lt]=II Žaidėjo šūvis -Name[lv]=Otrā spēlētāja šāviens -Name[mk]=Истрел на играчот 2 -Name[nb]=Spiller 2 skutt -Name[nds]=Schööt vun Speler 2 -Name[ne]=खेलाडी २ गोली -Name[nl]=Schot van speler 2 -Name[nn]=Spelar 2 skote -Name[pa]=ਖਿਡਾਰੀ 2 ਨੇ ਗੋਲੀ ਚਲਾਈ -Name[pl]=Strzela Gracz 2 -Name[pt]=Jogador 2 disparou -Name[pt_BR]=Jogador 2 atira -Name[ro]=Jucătorul 2 a tras -Name[ru]=Ход второго игрока -Name[se]=Speallár 2 lea deaivvahallan -Name[sk]=Hráč 2 vystrelil -Name[sl]=Strel igralca 2 -Name[sr]=Пуца играч 2 -Name[sr@Latn]=Puca igrač 2 -Name[sv]=Skott från andra spelaren -Name[ta]=விளையாடுபவர் 2 எரிதல் -Name[tg]=Тирпарронии бозингари 2 -Name[tr]=Oyuncu 2 atış -Name[uk]=Постріл другого гравця -Name[zh_CN]=Player 2 射击 -Name[zh_TW]=玩家 2 射擊 Comment=Player 2 takes a shot -Comment[ar]=اللاعب 2 يرمى -Comment[be]=Другі гульнёўца старляе -Comment[bg]=Изстрел на играч 2 -Comment[bn]=দ্বিতীয় খেলোয়াড় গোলা ছুড়ছে -Comment[bs]=Igrač 2 je na potezu -Comment[ca]=El jugador 2 dispara -Comment[cs]=Hráč 2 vystřelil -Comment[cy]=Chwaraewr 2 yn saethu -Comment[da]=Spiller 2 skyder -Comment[de]=Spieler 2 schießt -Comment[el]=Ο παίκτης 2 πυροβολεί -Comment[eo]=Ludanto 2 pafas -Comment[es]=El jugador 2 hace un disparo -Comment[et]=Mängija 2 tulistas -Comment[eu]=2. jokalariak tiro egin du -Comment[fa]=بازیکن ۲، یک گلوله میخورد -Comment[fi]=Pelaaja 2 ampuu -Comment[fr]=Le joueur 2 a subi un tir -Comment[gl]=O xogador 2 fai un disparo -Comment[he]=שחקן 2 יורה -Comment[hi]=खिलाड़ी 2 ने गोली चलाना लिया -Comment[hr]=Igrač 2 upravo puca -Comment[hu]=A 2. játékos lő -Comment[is]=Leikmaður 2 skýtur -Comment[it]=Il giocatore 2 prende un colpo -Comment[ja]=プレイヤー 2 が発射 -Comment[km]=អ្នកលេង ២ បានបាញ់ -Comment[lt]=II Žaidėjas šauna -Comment[lv]=Šauj otrais spēlētājs -Comment[mk]=Играчот 2 истрела -Comment[nb]=Spiller 2 er truffet -Comment[nds]=Speler 2 schütt -Comment[ne]=खेलाडी २ ले गोली लियो -Comment[nl]=Speler 2 schiet raak -Comment[nn]=Spelar 2 er truffen -Comment[pl]=Gracz 2 został trafiony -Comment[pt]=Jogador 2 dispara -Comment[pt_BR]=Jogador 2 leva um tiro -Comment[ro]=Jucătorul 2 a primit o lovitură -Comment[ru]=Ход второго игрока -Comment[se]=Speallár 2 lea deaivvahallan -Comment[sk]=Hráč 2 zasiahnutý -Comment[sl]=Igralec 2 je dobil strel -Comment[sr]=Играч 2 управо пуца -Comment[sr@Latn]=Igrač 2 upravo puca -Comment[sv]=Andra spelaren skjuter -Comment[ta]=விளையாட்டாளர் 2 விளையாட துவங்குகிறார் -Comment[tg]=Бозингари 2 тир паронд -Comment[tr]=Oyuncu 2 atış attı -Comment[uk]=Другий гравець стріляє -Comment[zh_CN]=Player 2 射击 -Comment[zh_TW]=玩家 2 進行了一次射擊 default_sound=ship-player2-shoot.ogg default_presentation=1 [shoot_sink] Name=Sunk ship -Name[ar]=سفينة مغرقة -Name[be]=Карабель пайшоў на дно -Name[bg]=Потопен е кораб -Name[bn]=ডুবে যাওয়া জাহাজ -Name[br]=Lestr kaset d'ar strad -Name[bs]=Potopljen brod -Name[ca]=Vaixell enfonsat -Name[cs]=Loď potopena -Name[cy]=Suddo llong -Name[da]=Sunket skib -Name[de]=Schiff versenkt -Name[el]=Βουλιαγμένο πλοίο -Name[eo]=Sinkita ŝipo -Name[es]=Barco hundido -Name[et]=Laev uputatud -Name[eu]=Urperatutako ontzia -Name[fa]=کشتی غرقشده -Name[fi]=Laiva upposi -Name[fr]=Bateau coulé -Name[ga]=Long curtha chun tóin farraige -Name[gl]=Barco afundido -Name[he]=ספינה טבועה -Name[hi]=जहाज डुबाएँ -Name[hr]=Brod je potopljen -Name[hu]=Elsüllyedt egy hajó -Name[is]=Sökkti skipi -Name[it]=Nave affondata -Name[ja]=沈んだ船 -Name[km]=នាវាលិច -Name[lt]=Nuskendes laivas -Name[lv]=Nogrimis kuģis -Name[mk]=Потопи брод -Name[nb]=Senket skip -Name[nds]=Schipp afbuddelt -Name[ne]=पानीजहाज डुब्यो -Name[nl]=Gezonken schip -Name[nn]=Senka skip -Name[pa]=ਡੁੱਬਦਾ ਜਹਾਜ਼ -Name[pl]=Zatopiony okręt -Name[pt]=Navio afundado -Name[pt_BR]=Navio afundado -Name[ro]=Nava se scunfundă -Name[ru]=Корабль потоплен -Name[se]=Skiipa vuojui -Name[sk]=Potopenie lode -Name[sl]=Potopljena ladja -Name[sr]=Брод је потопљен -Name[sr@Latn]=Brod je potopljen -Name[sv]=Sänkt skepp -Name[ta]=மூழ்கும் கப்பல் -Name[tg]=Киштии ғарқшуда -Name[tr]=Batık gemi -Name[uk]=Потопив корабель -Name[wa]=Batea coulé -Name[zh_CN]=击沉军舰 -Name[zh_TW]= 沉船 Comment=A ship has been sunk -Comment[ar]=لقد أغرقت سفينة -Comment[be]=Карабель пайшоў на дно -Comment[bg]=Потопен е кораб -Comment[bn]=একটি জাহাজ ডুবে গিয়েছে -Comment[br]=Kaset d'ar strad eo ul lestr -Comment[bs]=Brod je potopljen -Comment[ca]=S'ha enfonsat un vaixell -Comment[cs]=Loď byla potopena -Comment[cy]=Mae llong wedi ei suddo -Comment[da]=Et skib er blevet sænket -Comment[de]=Ein Schiff wurde versenkt -Comment[el]=Ένα πλοίο βυθίστηκε -Comment[es]=Se ha hundido un barco -Comment[et]=Laev uputati -Comment[eu]=Ontzi bat urperatu dute -Comment[fa]=یک کشتی غرق شده است -Comment[fi]=Laiva on upotettu -Comment[fr]=Un bateau a été coulé -Comment[gl]=Afundiuse un barco -Comment[he]=ספינה הוטבעה -Comment[hi]=एक जहाज डूबा -Comment[hr]=Brod je upravo potopljen -Comment[hu]=Elsüllyedt egy hajó -Comment[is]=Skipi hefur verið sökkt -Comment[it]=Una nave è stata affondata -Comment[ja]=船は沈没しました -Comment[km]=នាវាត្រូវបានលិច -Comment[lt]=Laivas nuskandintas -Comment[lv]=Kugis ir nogrimis -Comment[mk]=Потопен е брод -Comment[nb]=Et skip er senket -Comment[nds]=En Schipp is afbuddelt -Comment[ne]=पानीजहाज डुबेको छ -Comment[nl]=Er is een schip gezonken -Comment[nn]=Eit skip er senka -Comment[pa]=ਇੱਕ ਜਹਾਜ਼ ਡੁੱਬ ਗਿਆ -Comment[pl]=Okręt został zatopiony -Comment[pt]=Foi afundado um navio -Comment[pt_BR]=Um navio acabou de afundar -Comment[ro]=O navă s-a scufundat -Comment[ru]=Корабль потоплен -Comment[se]=Skiipa vuojui -Comment[sk]=Potopenie lode -Comment[sl]=Ladja je bila potopljena -Comment[sr]=Брод је управо потопљен -Comment[sr@Latn]=Brod je upravo potopljen -Comment[sv]=Ett skepp har sänkts -Comment[ta]=கப்பல் மூழ்கிவிட்டது -Comment[tg]=Киштӣ ғарқ гардид -Comment[tr]=Bir gemi batırıldı -Comment[uk]=Корабель було потоплено -Comment[uz]=Kema choʻktirildi -Comment[uz@cyrillic]=Кема чўктирилди -Comment[wa]=On batea a stî coulé -Comment[zh_CN]=击沉了一艘军舰 -Comment[zh_TW]= 有一艘傳沉沒了 default_sound=ship-sink.ogg default_presentation=1 diff --git a/kbattleship/kbattleship/kbaiplayer.h b/kbattleship/kbattleship/kbaiplayer.h index c8e24b62..6cf4f4e5 100644 --- a/kbattleship/kbattleship/kbaiplayer.h +++ b/kbattleship/kbattleship/kbaiplayer.h @@ -28,7 +28,7 @@ class KBAIPlayer : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBAIPlayer(); diff --git a/kbattleship/kbattleship/kbattlefield.cpp b/kbattleship/kbattleship/kbattlefield.cpp index dc567d2b..c4a9e422 100644 --- a/kbattleship/kbattleship/kbattlefield.cpp +++ b/kbattleship/kbattleship/kbattlefield.cpp @@ -91,7 +91,7 @@ void KBattleField::drawOwnField() if(!m_canDraw) return; - KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent())); + KBattleshipWindow *window = static_cast<KBattleshipWindow *>(m_parent->parent()->parent()); KShip *ship = 0; int data; @@ -151,7 +151,7 @@ void KBattleField::drawEnemyField() if(!m_canDraw) return; - KBattleshipWindow *window = static_cast<KBattleshipWindow *>(TQT_TQWIDGET(m_parent->parent()->parent())); + KBattleshipWindow *window = static_cast<KBattleshipWindow *>(m_parent->parent()->parent()); for(int i = 0; i != m_enemyfieldx; i++) { diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp index 144af63a..2db6be26 100644 --- a/kbattleship/kbattleship/kbattleship.cpp +++ b/kbattleship/kbattleship/kbattleship.cpp @@ -29,7 +29,7 @@ #include <tdemessagebox.h> #include <kuser.h> -#include <kscoredialog.h> +#include <highscore/kscoredialog.h> #include "kbattleship.moc" @@ -92,16 +92,16 @@ void KBattleshipWindow::initStatusBar() void KBattleshipWindow::initActions() { - KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection()); - m_gameServerConnect = new TDEAction(i18n("&Connect to Server..."), "connect_no", Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotServerConnect()), actionCollection(), "game_serverconnect"); - m_gameNewServer = new TDEAction(i18n("&Start Server..."), "network", Key_F3, TQT_TQOBJECT(this), TQT_SLOT(slotNewServer()), actionCollection(), "game_newserver"); - m_gameSingle = new TDEAction(i18n("S&ingle Player..."), "gear", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotSinglePlayer()), actionCollection(), "game_singleplayer"); - m_gameQuit = KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(slotHighscore()), actionCollection()); - m_gameEnemyInfo = new TDEAction(i18n("&Enemy Info"), "view_text", Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotEnemyClientInfo()), actionCollection(), "game_enemyinfo"); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection()); + m_gameServerConnect = new TDEAction(i18n("&Connect to Server..."), "connect_no", Key_F2, this, TQ_SLOT(slotServerConnect()), actionCollection(), "game_serverconnect"); + m_gameNewServer = new TDEAction(i18n("&Start Server..."), "network", Key_F3, this, TQ_SLOT(slotNewServer()), actionCollection(), "game_newserver"); + m_gameSingle = new TDEAction(i18n("S&ingle Player..."), "gear", Key_F4, this, TQ_SLOT(slotSinglePlayer()), actionCollection(), "game_singleplayer"); + m_gameQuit = KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdGameAction::highscores(this, TQ_SLOT(slotHighscore()), actionCollection()); + m_gameEnemyInfo = new TDEAction(i18n("&Enemy Info"), "view_text", Key_F11, this, TQ_SLOT(slotEnemyClientInfo()), actionCollection(), "game_enemyinfo"); m_configSound = new TDEToggleAction(i18n("&Play Sounds"), 0, actionCollection(), "options_configure_sound"); - m_configGrid = new TDEToggleAction(i18n("&Show Grid"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowGrid()), actionCollection(), "options_show_grid"); + m_configGrid = new TDEToggleAction(i18n("&Show Grid"), 0, this, TQ_SLOT(slotShowGrid()), actionCollection(), "options_show_grid"); m_configGrid->setCheckedState(i18n("Hide Grid")); m_gameEnemyInfo->setEnabled(false); @@ -111,9 +111,9 @@ void KBattleshipWindow::initActions() void KBattleshipWindow::initChat() { - connect(m_chat, TQT_SIGNAL(sigSendMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotSendChatMessage(const TQString &))); - connect(m_chat, TQT_SIGNAL(sigChangeEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_chat, TQT_SIGNAL(sigChangeOwnNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangedNickCommand(const TQString &))); + connect(m_chat, TQ_SIGNAL(sigSendMessage(const TQString &)), this, TQ_SLOT(slotSendChatMessage(const TQString &))); + connect(m_chat, TQ_SIGNAL(sigChangeEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_chat, TQ_SIGNAL(sigChangeOwnNickname(const TQString &)), this, TQ_SLOT(slotChangedNickCommand(const TQString &))); } void KBattleshipWindow::changeShipPlacementDirection(){ @@ -122,8 +122,8 @@ void KBattleshipWindow::changeShipPlacementDirection(){ void KBattleshipWindow::initShipPlacing() { - connect(m_ownshiplist, TQT_SIGNAL(sigOwnFieldDataChanged(int, int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeOwnFieldData(int, int, int))); - connect(m_ownshiplist, TQT_SIGNAL(sigLastShipAdded()), TQT_TQOBJECT(this), TQT_SLOT(slotShipsReady())); + connect(m_ownshiplist, TQ_SIGNAL(sigOwnFieldDataChanged(int, int, int)), this, TQ_SLOT(slotChangeOwnFieldData(int, int, int))); + connect(m_ownshiplist, TQ_SIGNAL(sigLastShipAdded()), this, TQ_SLOT(slotShipsReady())); } void KBattleshipWindow::initView() @@ -148,10 +148,10 @@ void KBattleshipWindow::initView() m_view->startDrawing(); setFocusProxy(m_view); - connect(m_view, TQT_SIGNAL(sigEnemyFieldClicked(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotEnemyFieldClick(int, int))); - connect(m_view, TQT_SIGNAL(sigOwnFieldClicked(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotPlaceShip(int, int))); - connect(m_view, TQT_SIGNAL(sigMouseOverField(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotPlaceShipPreview(int, int))); - connect(m_view, TQT_SIGNAL(changeShipPlacementDirection()), TQT_TQOBJECT(this), TQT_SLOT(changeShipPlacementDirection())); + connect(m_view, TQ_SIGNAL(sigEnemyFieldClicked(int, int)), this, TQ_SLOT(slotEnemyFieldClick(int, int))); + connect(m_view, TQ_SIGNAL(sigOwnFieldClicked(int, int)), this, TQ_SLOT(slotPlaceShip(int, int))); + connect(m_view, TQ_SIGNAL(sigMouseOverField(int, int)), this, TQ_SLOT(slotPlaceShipPreview(int, int))); + connect(m_view, TQ_SIGNAL(changeShipPlacementDirection()), this, TQ_SLOT(changeShipPlacementDirection())); } void KBattleshipWindow::slotDeleteAI() @@ -317,11 +317,11 @@ void KBattleshipWindow::slotEnemyFieldClick(int fieldx, int fieldy) switch(KMessageBox::questionYesNo(this, i18n("Do you want to restart the game?"),TQString(),i18n("Restart"),i18n("Do Not Restart"))) { case KMessageBox::Yes: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestartAI())); break; case KMessageBox::No: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteAI())); break; } return; @@ -697,8 +697,8 @@ void KBattleshipWindow::slotServerConnect() slotStatusMsg(i18n("Loading Connect-Server dialog...")); m_client = new KClientDialog(this); - connect(m_client, TQT_SIGNAL(sigConnectServer()), TQT_TQOBJECT(this), TQT_SLOT(slotConnectToBattleshipServer())); - connect(m_client, TQT_SIGNAL(sigCancelConnect()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteConnectDialog())); + connect(m_client, TQ_SIGNAL(sigConnectServer()), this, TQ_SLOT(slotConnectToBattleshipServer())); + connect(m_client, TQ_SIGNAL(sigCancelConnect()), this, TQ_SLOT(slotDeleteConnectDialog())); m_client->show(); slotStatusMsg(i18n("Ready")); @@ -806,8 +806,8 @@ void KBattleshipWindow::slotNewServer() slotStatusMsg(i18n("Loading Start-Server dialog...")); m_server = new TDEServerDialog(this); - connect(m_server, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotStartBattleshipServer())); - connect(m_server, TQT_SIGNAL(cancelClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteServerDialog())); + connect(m_server, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotStartBattleshipServer())); + connect(m_server, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotDeleteServerDialog())); m_server->show(); slotStatusMsg(i18n("Ready")); @@ -828,7 +828,7 @@ void KBattleshipWindow::slotSendVersion() msg->versionMessage(); slotSendMessage(msg); - TQTimer::singleShot(150, TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); + TQTimer::singleShot(150, this, TQ_SLOT(slotSendGreet())); } void KBattleshipWindow::slotSendGreet() @@ -862,49 +862,49 @@ void KBattleshipWindow::slotStartBattleshipServer() if(m_connection == 0) { m_connection = new KonnectionHandling(this, m_kbserver); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendNickname()), TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigClientLost()), TQT_TQOBJECT(this), TQT_SLOT(slotClientLost())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplayRequest())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - connect(m_connection, TQT_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendNickname()), this, TQ_SLOT(slotSendGreet())); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigClientLost()), this, TQ_SLOT(slotClientLost())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplayRequest())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_connection, TQ_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), this, TQ_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else { if(m_connection->type() == KonnectionHandling::CLIENT) { - disconnect(m_kbclient, TQT_SIGNAL(sigConnected()), TQT_TQOBJECT(this), TQT_SLOT(slotSendVersion())); - disconnect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - disconnect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - disconnect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigServerLost()), TQT_TQOBJECT(this), TQT_SLOT(slotServerLost())); - disconnect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplay())); - disconnect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - disconnect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + disconnect(m_kbclient, TQ_SIGNAL(sigConnected()), this, TQ_SLOT(slotSendVersion())); + disconnect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + disconnect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + disconnect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigServerLost()), this, TQ_SLOT(slotServerLost())); + disconnect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplay())); + disconnect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + disconnect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); m_connection->updateInternal(m_kbserver); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendNickname()), TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigClientLost()), TQT_TQOBJECT(this), TQT_SLOT(slotClientLost())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplayRequest())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendNickname()), this, TQ_SLOT(slotSendGreet())); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigClientLost()), this, TQ_SLOT(slotClientLost())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplayRequest())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else m_connection->updateInternal(m_kbserver); @@ -1119,51 +1119,51 @@ void KBattleshipWindow::slotConnectToBattleshipServer(const TQString &host, int if(m_connection == 0) { m_connection = new KonnectionHandling(this, m_kbclient); - connect(m_kbclient, TQT_SIGNAL(sigConnected()), TQT_TQOBJECT(this), TQT_SLOT(slotSendVersion())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigServerLost()), TQT_TQOBJECT(this), TQT_SLOT(slotServerLost())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplay())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - connect(m_connection, TQT_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_kbclient, TQ_SIGNAL(sigConnected()), this, TQ_SLOT(slotSendVersion())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigServerLost()), this, TQ_SLOT(slotServerLost())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplay())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_connection, TQ_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), this, TQ_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else { if(m_connection->type() == KonnectionHandling::SERVER) { - disconnect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - disconnect(m_connection, TQT_SIGNAL(sigSendNickname()), TQT_TQOBJECT(this), TQT_SLOT(slotSendGreet())); - disconnect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - disconnect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - disconnect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - disconnect(m_connection, TQT_SIGNAL(sigClientLost()), TQT_TQOBJECT(this), TQT_SLOT(slotClientLost())); - disconnect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - disconnect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplayRequest())); - disconnect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); - disconnect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + disconnect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + disconnect(m_connection, TQ_SIGNAL(sigSendNickname()), this, TQ_SLOT(slotSendGreet())); + disconnect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + disconnect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + disconnect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + disconnect(m_connection, TQ_SIGNAL(sigClientLost()), this, TQ_SLOT(slotClientLost())); + disconnect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + disconnect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplayRequest())); + disconnect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + disconnect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); m_connection->updateInternal(m_kbclient); - connect(m_kbclient, TQT_SIGNAL(sigConnected()), TQT_TQOBJECT(this), TQT_SLOT(slotSendVersion())); - connect(m_connection, TQT_SIGNAL(sigAbortNetworkGame()), TQT_TQOBJECT(this), TQT_SLOT(slotAbortNetworkGame())); - connect(m_connection, TQT_SIGNAL(sigStatusBar(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigEnemyNickname(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeEnemyPlayer(const TQString &))); - connect(m_connection, TQT_SIGNAL(sigSendFieldState(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendEnemyFieldState(int, int))); - connect(m_connection, TQT_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); - connect(m_connection, TQT_SIGNAL(sigShootable(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetShootable(bool))); - connect(m_connection, TQT_SIGNAL(sigPlaceShips(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPlaceable(bool))); - connect(m_connection, TQT_SIGNAL(sigServerLost()), TQT_TQOBJECT(this), TQT_SLOT(slotServerLost())); - connect(m_connection, TQT_SIGNAL(sigReplay()), TQT_TQOBJECT(this), TQT_SLOT(slotReplay())); - connect(m_connection, TQT_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQT_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); + connect(m_kbclient, TQ_SIGNAL(sigConnected()), this, TQ_SLOT(slotSendVersion())); + connect(m_connection, TQ_SIGNAL(sigAbortNetworkGame()), this, TQ_SLOT(slotAbortNetworkGame())); + connect(m_connection, TQ_SIGNAL(sigStatusBar(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigEnemyNickname(const TQString &)), this, TQ_SLOT(slotChangeEnemyPlayer(const TQString &))); + connect(m_connection, TQ_SIGNAL(sigSendFieldState(int, int)), this, TQ_SLOT(slotSendEnemyFieldState(int, int))); + connect(m_connection, TQ_SIGNAL(sigEnemyFieldData(int, int, int, int, int, int, int, bool)), this, TQ_SLOT(slotReceivedEnemyFieldData(int, int, int, int, int, int, int, bool))); + connect(m_connection, TQ_SIGNAL(sigShootable(bool)), this, TQ_SLOT(slotSetShootable(bool))); + connect(m_connection, TQ_SIGNAL(sigPlaceShips(bool)), this, TQ_SLOT(slotSetPlaceable(bool))); + connect(m_connection, TQ_SIGNAL(sigServerLost()), this, TQ_SLOT(slotServerLost())); + connect(m_connection, TQ_SIGNAL(sigReplay()), this, TQ_SLOT(slotReplay())); + connect(m_connection, TQ_SIGNAL(sigChatMessage(const TQString &, const TQString &, bool)), m_chat, TQ_SLOT(slotReceivedMessage(const TQString &, const TQString &, bool))); m_kbclient->init(); - connect(m_connection, TQT_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); - connect(m_connection, TQT_SIGNAL(sigLost(KMessage *)), TQT_TQOBJECT(this), TQT_SLOT(slotLost(KMessage *))); + connect(m_connection, TQ_SIGNAL(sigClientInformation(const TQString &, const TQString &, const TQString &, const TQString &)), this, TQ_SLOT(slotReceivedClientInformation(const TQString &, const TQString &, const TQString &, const TQString &))); + connect(m_connection, TQ_SIGNAL(sigLost(KMessage *)), this, TQ_SLOT(slotLost(KMessage *))); } else m_connection->updateInternal(m_kbclient); @@ -1234,7 +1234,7 @@ void KBattleshipWindow::slotSinglePlayer() slotStatusMsg(i18n("Ready")); m_stat->clear(); m_chat->clear(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteAI())); cleanup(false); } } @@ -1269,8 +1269,8 @@ void KBattleshipWindow::slotStartBattleshipGame(bool clearstat) { m_aiPlayer = new KBAIPlayer(); m_aiPlayer->init(m_view->field(), m_enemyshiplist); - connect(m_aiPlayer, TQT_SIGNAL(sigReady()), TQT_TQOBJECT(this), TQT_SLOT(slotAIReady())); - connect(m_aiPlayer, TQT_SIGNAL(sigShootAt(const TQPoint)), TQT_TQOBJECT(this), TQT_SLOT(slotAIShootsAt(const TQPoint))); + connect(m_aiPlayer, TQ_SIGNAL(sigReady()), this, TQ_SLOT(slotAIReady())); + connect(m_aiPlayer, TQ_SIGNAL(sigShootAt(const TQPoint)), this, TQ_SLOT(slotAIShootsAt(const TQPoint))); } m_aiPlayer->slotRestart(); } @@ -1320,11 +1320,11 @@ void KBattleshipWindow::slotAIShootsAt(const TQPoint pos) switch(KMessageBox::questionYesNo(this, i18n("Do you want to restart the game?"), TQString(), i18n("Restart"), i18n("Do Not Restart"))) { case KMessageBox::Yes: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestartAI())); break; case KMessageBox::No: - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteAI())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDeleteAI())); break; } } diff --git a/kbattleship/kbattleship/kbattleship.desktop b/kbattleship/kbattleship/kbattleship.desktop index 504ee6b3..7067b6f8 100644 --- a/kbattleship/kbattleship/kbattleship.desktop +++ b/kbattleship/kbattleship/kbattleship.desktop @@ -1,76 +1,10 @@ [Desktop Entry] Name=KBattleship -Name[af]=Kbattleship -Name[ar]=لعبة سفينة الحرب (KBattleship) -Name[be]=Марскі бой -Name[bn]=কে-ব্যাটেলশীপ -Name[cs]=Lodě -Name[de]=Schiffe versenken -Name[hi]=के-बैटलशिप -Name[hr]=KPotapanje brodova -Name[is]=KSjóorrusta -Name[nds]=Scheep versenken -Name[ne]=केडीई ब्याटलसीप -Name[pa]=ਕੇ-ਜੰਗੀ ਜਹਾਜ਼ -Name[ro]=Bătălie navală -Name[sl]=KBojnaLadja -Name[sv]=Kbattleship -Name[ta]=கேபாட்டில்ஷிப் -Name[tg]=KҶанги Киштиҳо -Name[th]=เรือรบ - K -Name[tr]=Amiral Battı -Name[zh_TW]=KBattleship 戰艦 Exec=kbattleship %i %m -caption "%c" Icon=kbattleship Type=Application X-DocPath=kbattleship/index.html GenericName=Battleship Game -GenericName[be]=Гульня ў марскі бой -GenericName[bg]=Морски шах -GenericName[bn]=ব্যাটেলশীপ খেলা -GenericName[bs]=Igra podmornica -GenericName[ca]=Joc d'enfonsar la flota -GenericName[cs]=Bitva lodí -GenericName[cy]=Gêm Longau Rhyfel -GenericName[da]=Krigsskibe-spil -GenericName[de]=Schiffe versenken -GenericName[el]=Παιχνίδι Battleship -GenericName[eo]=Batalŝipa ludo -GenericName[es]=Juego de la batalla de naves -GenericName[et]=Laevade pommitamise mäng -GenericName[eu]=Ontzi-guda jokoa -GenericName[fa]=بازی Battleship -GenericName[fi]=Meritaistelupeli -GenericName[fr]=Jeu de bataille navale -GenericName[he]=משחק צוללות -GenericName[hr]=Igra potapanja brodova -GenericName[hu]=Torpedós -GenericName[is]=Sjóorustuleikur -GenericName[it]=Gioco a battaglia navale -GenericName[ja]=戦艦ゲーム -GenericName[km]=ល្បែងនាវាចម្បាំង -GenericName[ko]=전함 게임 -GenericName[lt]=Laivų mūšio žaidimas -GenericName[lv]=Jūras kaujas spēle -GenericName[mk]=Игра со потопување бродови -GenericName[nb]=Slagskip -GenericName[nds]=Scheep versenken -GenericName[ne]=ब्याटलसीप खेल -GenericName[nl]=Zeeslagspel -GenericName[nn]=Slagskip -GenericName[pa]=ਜੰਗੀ ਜਹਾਜ਼ ਖੇਡ -GenericName[pl]=Gra w statki -GenericName[pt]=Jogo de Batalha Naval -GenericName[pt_BR]=Jogo de Batalha Naval -GenericName[ru]=Морской бой -GenericName[sk]=Bojová loď hra -GenericName[sl]=Igra potapljanja ladjic -GenericName[sr]=Игра подморница -GenericName[sr@Latn]=Igra podmornica -GenericName[sv]=Sänka fartyg spel -GenericName[ta]=போர்த்தள விளையாட்டு -GenericName[uk]=Гра в морський бій -GenericName[zh_TW]=戰艦遊戲 Terminal=false X-DCOP-ServiceType=Multi Categories=Qt;TDE;Game;StrategyGame; diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h index c834491d..c32ec452 100644 --- a/kbattleship/kbattleship/kbattleship.h +++ b/kbattleship/kbattleship/kbattleship.h @@ -46,7 +46,7 @@ class KBattleshipWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: enum{ID_STATUS_MSG, ID_PLAYER_OWN, ID_PLAYER_ENEMY}; diff --git a/kbattleship/kbattleship/kbattleshipclient.cpp b/kbattleship/kbattleship/kbattleshipclient.cpp index d895e934..cad29b29 100644 --- a/kbattleship/kbattleship/kbattleshipclient.cpp +++ b/kbattleship/kbattleship/kbattleshipclient.cpp @@ -43,8 +43,8 @@ void KBattleshipClient::init() return; } - m_readNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - TQT_BASE_OBJECT_NAME::connect(m_readNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadData())); + m_readNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, this); + TQObject::connect(m_readNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReadData())); emit sigConnected(); } diff --git a/kbattleship/kbattleship/kbattleshipclient.h b/kbattleship/kbattleship/kbattleshipclient.h index b76d4396..6cfa8622 100644 --- a/kbattleship/kbattleship/kbattleshipclient.h +++ b/kbattleship/kbattleship/kbattleshipclient.h @@ -24,7 +24,7 @@ class KBattleshipClient : public KExtendedSocket { - Q_OBJECT + TQ_OBJECT public: KBattleshipClient(const TQString &host, int port); diff --git a/kbattleship/kbattleship/kbattleshipserver.cpp b/kbattleship/kbattleship/kbattleshipserver.cpp index a864cb61..36d3ff70 100644 --- a/kbattleship/kbattleship/kbattleshipserver.cpp +++ b/kbattleship/kbattleship/kbattleshipserver.cpp @@ -49,8 +49,8 @@ void KBattleshipServer::init() m_service.setType(BATTLESHIP_SERVICE); m_service.setPort(m_port); m_service.publishAsync(); - m_connectNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - TQT_BASE_OBJECT_NAME::connect(m_connectNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotNewConnection())); + m_connectNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, this); + TQObject::connect(m_connectNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(slotNewConnection())); } void KBattleshipServer::slotNewConnection() @@ -61,8 +61,8 @@ void KBattleshipServer::slotNewConnection() { m_service.stop(); m_serverSocket = sock; - m_readNotifier = new TQSocketNotifier(sock->fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this)); - TQObject::connect(m_readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadClient())); + m_readNotifier = new TQSocketNotifier(sock->fd(), TQSocketNotifier::Read, this); + TQObject::connect(m_readNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadClient())); emit sigNewConnect(); } else diff --git a/kbattleship/kbattleship/kbattleshipserver.h b/kbattleship/kbattleship/kbattleshipserver.h index b1c9cc4d..f488685a 100644 --- a/kbattleship/kbattleship/kbattleshipserver.h +++ b/kbattleship/kbattleship/kbattleshipserver.h @@ -25,7 +25,7 @@ class KBattleshipServer : public KExtendedSocket { - Q_OBJECT + TQ_OBJECT public: KBattleshipServer(int port, const TQString& name); diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp index 42b699bb..4008803e 100644 --- a/kbattleship/kbattleship/kbattleshipview.cpp +++ b/kbattleship/kbattleship/kbattleshipview.cpp @@ -152,7 +152,7 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) { if(event->type() == TQEvent::KeyPress && m_decide) { - TQKeyEvent *keyEvent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyEvent = static_cast<TQKeyEvent*>(event); if(keyEvent->key() == Key_Shift){ emit sigMouseOverField(m_lastX, m_lastY); emit changeShipPlacementDirection(); @@ -160,7 +160,7 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) } else if(event->type() == TQEvent::KeyRelease && m_decide) { - TQKeyEvent *keyEvent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyEvent = static_cast<TQKeyEvent*>(event); if(keyEvent->key() == Key_Shift){ emit sigMouseOverField(m_lastX, m_lastY); emit changeShipPlacementDirection(); @@ -170,15 +170,15 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) { m_decide = false; - TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(event); + TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(event); - if(mouseEvent->button() == Qt::RightButton){ + if(mouseEvent->button() == TQt::RightButton){ emit sigMouseOverField(m_lastX, m_lastY); emit changeShipPlacementDirection(); return true; } - if(mouseEvent->button() != Qt::LeftButton) + if(mouseEvent->button() != TQt::LeftButton) return false; TQPoint point(mouseEvent->x(), mouseEvent->y()); @@ -237,7 +237,7 @@ bool KBattleshipView::eventFilter(TQObject *object, TQEvent *event) setFocus(); m_decide = true; - TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT(event); + TQMouseEvent *mouseEvent = static_cast<TQMouseEvent*>(event); TQPoint point(mouseEvent->x(), mouseEvent->y()); TQRect ownRect = m_battlefield->ownRect(); diff --git a/kbattleship/kbattleship/kbattleshipview.h b/kbattleship/kbattleship/kbattleshipview.h index 399931ae..b970f7e4 100644 --- a/kbattleship/kbattleship/kbattleshipview.h +++ b/kbattleship/kbattleship/kbattleshipview.h @@ -32,7 +32,7 @@ class KBattleshipView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KBattleshipView(TQWidget *parent = 0, const char *name = 0, bool draw = false); diff --git a/kbattleship/kbattleship/kchatwidget.cpp b/kbattleship/kbattleship/kchatwidget.cpp index f6b804ee..15449eaf 100644 --- a/kbattleship/kbattleship/kchatwidget.cpp +++ b/kbattleship/kbattleship/kchatwidget.cpp @@ -20,8 +20,8 @@ KChatWidget::KChatWidget(TQWidget *parent, const char *name) : chatDlg(parent, name) { - connect(sendBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotComputeMessage())); - connect(commentEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotComputeMessage())); + connect(sendBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotComputeMessage())); + connect(commentEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotComputeMessage())); chatView->setFocusProxy(commentEdit); chatView->setMinimumSize(0, 50); commentEdit->installEventFilter(this); @@ -61,9 +61,9 @@ void KChatWidget::slotReceivedMessage(const TQString &nickname, const TQString & bool KChatWidget::eventFilter(TQObject *obj, TQEvent *e) { - if(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(commentEdit) && e->type() == TQEvent::Wheel) + if(obj == commentEdit && e->type() == TQEvent::Wheel) { - kapp->notify(TQT_TQOBJECT(chatView), e); + kapp->notify(chatView, e); return true; } return chatDlg::eventFilter(obj, e); diff --git a/kbattleship/kbattleship/kchatwidget.h b/kbattleship/kbattleship/kchatwidget.h index aebbcf93..bc3f5da7 100644 --- a/kbattleship/kbattleship/kchatwidget.h +++ b/kbattleship/kbattleship/kchatwidget.h @@ -26,7 +26,7 @@ class KChatWidget : public chatDlg { - Q_OBJECT + TQ_OBJECT public: KChatWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/kbattleship/kbattleship/kclientdialog.cpp b/kbattleship/kbattleship/kclientdialog.cpp index e5a65cf7..022dd60b 100644 --- a/kbattleship/kbattleship/kclientdialog.cpp +++ b/kbattleship/kbattleship/kclientdialog.cpp @@ -38,14 +38,14 @@ KClientDialog::KClientDialog(TQWidget *parent, const char *name) KUser u; m_mainWidget->nicknameEdit->setText(u.loginName()); - connect(m_mainWidget->serverEdit, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &))); - connect(m_mainWidget->serverEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckEnableOk())); + connect(m_mainWidget->serverEdit, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &))); + connect(m_mainWidget->serverEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckEnableOk())); m_config->setGroup("History"); m_browser = new DNSSD::ServiceBrowser(TQString::fromLatin1(BATTLESHIP_SERVICE)); - connect(m_browser,TQT_SIGNAL(finished()),TQT_SLOT(nextBatch())); + connect(m_browser,TQ_SIGNAL(finished()),TQ_SLOT(nextBatch())); m_browser->startBrowse(); - connect(m_mainWidget->lanBox,TQT_SIGNAL(activated(int)),TQT_SLOT(gameSelected(int))); + connect(m_mainWidget->lanBox,TQ_SIGNAL(activated(int)),TQ_SLOT(gameSelected(int))); m_mainWidget->serverEdit->completionObject()->setItems(m_config->readListEntry("CompletionList")); m_mainWidget->serverEdit->setMaxCount(5); diff --git a/kbattleship/kbattleship/kclientdialog.h b/kbattleship/kbattleship/kclientdialog.h index f5998fca..732424db 100644 --- a/kbattleship/kbattleship/kclientdialog.h +++ b/kbattleship/kbattleship/kclientdialog.h @@ -31,7 +31,7 @@ class KClientDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KClientDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/kbattleship/kbattleship/kgridwidget.cpp b/kbattleship/kbattleship/kgridwidget.cpp index b848484b..1a94b873 100644 --- a/kbattleship/kbattleship/kgridwidget.cpp +++ b/kbattleship/kbattleship/kgridwidget.cpp @@ -412,5 +412,5 @@ void KGridWidget::finished() void KGridWidget::cleanBuffer() { - m_doubleBuffer->fill(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background)); + m_doubleBuffer->fill(TQApplication::palette().color(TQPalette::Active, TQColorGroup::Background)); } diff --git a/kbattleship/kbattleship/konnectionhandling.cpp b/kbattleship/kbattleship/konnectionhandling.cpp index 5d5c1026..e243a747 100644 --- a/kbattleship/kbattleship/konnectionhandling.cpp +++ b/kbattleship/kbattleship/konnectionhandling.cpp @@ -24,11 +24,11 @@ KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipServer *serv m_kbserver = server; m_kbclient = 0; m_type = KonnectionHandling::SERVER; - connect(server, TQT_SIGNAL(sigServerFailure()), this, TQT_SIGNAL(sigAbortNetworkGame())); - connect(server, TQT_SIGNAL(sigNewConnect()), this, TQT_SLOT(slotNewClient())); - connect(server, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostClient())); - connect(server, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(server, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(server, TQ_SIGNAL(sigServerFailure()), this, TQ_SIGNAL(sigAbortNetworkGame())); + connect(server, TQ_SIGNAL(sigNewConnect()), this, TQ_SLOT(slotNewClient())); + connect(server, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostClient())); + connect(server, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(server, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipClient *client) : TQObject(parent) @@ -36,10 +36,10 @@ KonnectionHandling::KonnectionHandling(TQWidget *parent, KBattleshipClient *clie m_kbclient = client; m_kbserver = 0; m_type = KonnectionHandling::CLIENT; - connect(client, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostServer())); - connect(client, TQT_SIGNAL(sigSocketFailure(int)), this, TQT_SLOT(slotSocketError(int))); - connect(client, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(client, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(client, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostServer())); + connect(client, TQ_SIGNAL(sigSocketFailure(int)), this, TQ_SLOT(slotSocketError(int))); + connect(client, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(client, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } void KonnectionHandling::updateInternal(KBattleshipServer *server) @@ -47,11 +47,11 @@ void KonnectionHandling::updateInternal(KBattleshipServer *server) m_kbserver = server; m_kbclient = 0; m_type = KonnectionHandling::SERVER; - connect(server, TQT_SIGNAL(sigServerFailure()), this, TQT_SIGNAL(sigAbortNetworkGame())); - connect(server, TQT_SIGNAL(sigNewConnect()), this, TQT_SLOT(slotNewClient())); - connect(server, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostClient())); - connect(server, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(server, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(server, TQ_SIGNAL(sigServerFailure()), this, TQ_SIGNAL(sigAbortNetworkGame())); + connect(server, TQ_SIGNAL(sigNewConnect()), this, TQ_SLOT(slotNewClient())); + connect(server, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostClient())); + connect(server, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(server, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } void KonnectionHandling::updateInternal(KBattleshipClient *client) @@ -59,10 +59,10 @@ void KonnectionHandling::updateInternal(KBattleshipClient *client) m_kbclient = client; m_kbserver = 0; m_type = KonnectionHandling::CLIENT; - connect(client, TQT_SIGNAL(sigEndConnect()), this, TQT_SLOT(slotLostServer())); - connect(client, TQT_SIGNAL(sigSocketFailure(int)), this, TQT_SLOT(slotSocketError(int))); - connect(client, TQT_SIGNAL(sigNewMessage(KMessage *)), this, TQT_SLOT(slotNewMessage(KMessage *))); - connect(client, TQT_SIGNAL(sigMessageSent(KMessage *)), this, TQT_SLOT(slotMessageSent(KMessage *))); + connect(client, TQ_SIGNAL(sigEndConnect()), this, TQ_SLOT(slotLostServer())); + connect(client, TQ_SIGNAL(sigSocketFailure(int)), this, TQ_SLOT(slotSocketError(int))); + connect(client, TQ_SIGNAL(sigNewMessage(KMessage *)), this, TQ_SLOT(slotNewMessage(KMessage *))); + connect(client, TQ_SIGNAL(sigMessageSent(KMessage *)), this, TQ_SLOT(slotMessageSent(KMessage *))); } void KonnectionHandling::slotNewClient() diff --git a/kbattleship/kbattleship/konnectionhandling.h b/kbattleship/kbattleship/konnectionhandling.h index b78895b7..bc1e6adf 100644 --- a/kbattleship/kbattleship/konnectionhandling.h +++ b/kbattleship/kbattleship/konnectionhandling.h @@ -29,7 +29,7 @@ class KonnectionHandling : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum{SERVER, CLIENT}; diff --git a/kbattleship/kbattleship/kserverdialog.h b/kbattleship/kbattleship/kserverdialog.h index 90fca2d7..83d419b2 100644 --- a/kbattleship/kbattleship/kserverdialog.h +++ b/kbattleship/kbattleship/kserverdialog.h @@ -30,7 +30,7 @@ class TDEServerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: TDEServerDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/kbattleship/kbattleship/kshiplist.cpp b/kbattleship/kbattleship/kshiplist.cpp index e490fd0a..538b57e3 100644 --- a/kbattleship/kbattleship/kshiplist.cpp +++ b/kbattleship/kbattleship/kshiplist.cpp @@ -118,7 +118,7 @@ bool KShipList::canAddShips() void KShipList::addNewShip(int button, int fieldx, int fieldy) { - if(!addNewShip(!(button == Qt::LeftButton), fieldx, fieldy)) + if(!addNewShip(!(button == TQt::LeftButton), fieldx, fieldy)) KMessageBox::information(0L, i18n("You cannot place the ship here.")); } diff --git a/kbattleship/kbattleship/kshiplist.h b/kbattleship/kbattleship/kshiplist.h index c7dcb8a6..80e8c6eb 100644 --- a/kbattleship/kbattleship/kshiplist.h +++ b/kbattleship/kbattleship/kshiplist.h @@ -27,7 +27,7 @@ class KShipList : public TQObject { - Q_OBJECT + TQ_OBJECT public: KShipList(); diff --git a/kbattleship/kbattleship/kstatdialog.h b/kbattleship/kbattleship/kstatdialog.h index d4375b89..4ba29c34 100644 --- a/kbattleship/kbattleship/kstatdialog.h +++ b/kbattleship/kbattleship/kstatdialog.h @@ -22,7 +22,7 @@ class KStatDialog : public statDlg { - Q_OBJECT + TQ_OBJECT public: KStatDialog(TQWidget *parent = 0, const char *name = 0); |