diff options
Diffstat (limited to 'khotkeys')
52 files changed, 216 insertions, 216 deletions
diff --git a/khotkeys/README b/khotkeys/README index 658309674..c490cbc5d 100644 --- a/khotkeys/README +++ b/khotkeys/README @@ -38,7 +38,7 @@ at least snapshot 20020108. I haven't tested it with any older versions, so I don't know if it will work with them or not. - During installation, the files will tqreplace the ones that are part + During installation, the files will replace the ones that are part of the simple version in kdebase. Shortcuts assigned using KMenuEdit should still work, and the config file will be converted to the new format. However, you should backup all files before removing them ( including diff --git a/khotkeys/TODO b/khotkeys/TODO index 1ef563c13..7db646b66 100644 --- a/khotkeys/TODO +++ b/khotkeys/TODO @@ -18,7 +18,7 @@ class Condition + tab 'Windows' -> 'Conditions' hlaska o uz prirazene kl.kombinaci pro makro se opakuje i vicekrat ( pro kazde uz existujici ) rucni smazani radku nemaze makro pro editaci v dialogu ted uz ten timeout u spusteni funguje ok, ale zase kdyz chci pustit neco 2x naraz, tak se musi cekat ??? -taky to pri jeho rucni editaci neni obcas videt ( je to tqmoc vpravo ) +taky to pri jeho rucni editaci neni obcas videt ( je to moc vpravo ) grrr, to setSelected()/setCurrent() me stve, vsechny ty listboxy a listview obcas spatne detekuji vybrany :( - asi si zkratka udelat vlastni tridy, ktere budou nutit selected==current ve windowdef widgetu mit moznost autodetekce, tj. defaultni, kdyz neni nastaven spousteci prikaz @@ -70,13 +70,13 @@ electric borders u KWin zere jen okraje, ale ne primo rohy - pujde to udelat jak - pujdou i okraje, kdyz to bude vypnute u WM ( nebo se budou fackovat ? ) akce : transformace klavesy ( def. Key_Menu ) na RMB do keyboard focusu ( pro kontext menu ) akce : kdyz se objevi okno, aplikovat na nej veci, ktere dela kstart ( sticky, atd. ) -strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za tqmoc nestoji +strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za moc nestoji paste pri MMB volitelne jen kdyz MMB neni stisknuto napr. pres 500ms ( kvuli strokes ) akce : kdyz se stiskne nejaka shortcut a nejaka aplikace nebezi, tak se spusti a pak se ji ta shortcut preda ( napr. pro klipper ? ) odstranit tu KAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to ma nebo nema byt i18n, tak at je aspon default skupine akci 'KMenuedit entries' by asi nemelo jit zmenit jmeno kdyz se v KMenuEdit udela polozka a pak se ten menuentry smaze, asi by se ta shortcut mela aspon disablovat ?! at dokaze zvetsovat vsechna 'File Open Dialog' okna -pamatovat si menuentries i s polohou v K-Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi tqmoc nezvlada ) +pamatovat si menuentries i s polohou v K-Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi moc nezvlada ) neudelat to prirazeni klavesy k menuentry nejak jednodussi ? nebo zkratka doporucovat kmenuedit ? i18n("","") pro veci jako "New" diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index 0faf71002..e600e1730 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -95,7 +95,7 @@ Sound SoundRecorderArts::sound() Sound s; uint BytePS=BITS/8; uint length=m_data.size()/BytePS; - TQMemArray<TQ_INT32> da(length); + TQMemArray<Q_INT32> da(length); s.max=0; s._fs=FS; for(uint f=0;f<length; f++) diff --git a/khotkeys/data/kde32b1.khotkeys b/khotkeys/data/kde32b1.khotkeys index 2ee6f15d7..46db7521d 100644 --- a/khotkeys/data/kde32b1.khotkeys +++ b/khotkeys/data/kde32b1.khotkeys @@ -2,7 +2,7 @@ DataCount=1 [Data_1] -Comment=This group tqcontains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.) +Comment=This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.) Comment[bg]=Тази група съдържа различни примери, демонстриращи повечето от функциите на горещите клавиши. (Имайте предвид, че групата по подразбиране е изключена.) Comment[ca]=Aquest grup té varis exemples que demostren la majoria de les funcionalitats del KHotkeys. (Tingueu en compte que aquest grup i totes les seves accions estan deshabilitades per defecte.) Comment[csb]=Ta grëpa zamëkô w se różny przëmiôrë pòkazującë wikszy dzél mòżlewòtów KHotkeys. (Bôczë, że ta grëpa ë ji wszëtczé dzejania są domëslno wëłączoné.) @@ -584,7 +584,7 @@ Comment[pt]=Leia o comentário sobre a acção "Escrever 'Olá'" primeiro.\n\nO Comment[pt_BR]=Leia o comentário sobre a ação "Digitar 'Hello'" primeiro.\n\nO Qt Designer usa Ctrl+F4 para fechar as janelas (talvez porque é assim no MS Windows). Mas Ctrl+F4 no KDE significa ir para a área de trabalho virtual 4, portanto não funciona no Qt Designer, e também, o Qt Designer não usa o Ctrl+W padrão do KDE para fechar a janela.\n\nMas o problema pode ser resolvido remapeando Ctrl+W para Ctrl+F4 quando a janela ativa é o Qt Designer. Quanto o Qt Designer está ativo, toda vez que Ctrl+W é pressionado, Ctrl+F4 será enviado para o Qt Designer. Em outros aplicativos, Ctrl+W continua funcionando da maneira usual é claro.\n\nAgora precisamos especificar três coisas: Um novo atalho para o 'Ctrl+W', uma nova ação de entrada do teclado que envia o Ctrl+F4, e uma nova condição de que a janela ativa é o Qt Designer.\nO Qt Designer parece sempre ter o título 'Qt Designer by Trolltech', portanto a condição irá checar se a janela ativa tem aquele título. Comment[ro]=Citiți mai întâi comentariul la acțiunea "Tastați 'Hello'". \n\nQt Designer folosește Ctrl+F4 pentru închiderea ferestrelor (poate pentru că MS Windows o face astfel). Dar Ctrl+F4 în KDE este o scurtătură către desktop-ul virtual nr. 4, așa că nu merge în Qt Designer, iar în plus Qt Designer nu folosește standardul KDE Ctrl+W pentru închiderea ferestrei.\n\nDar problema poate fi rezolvată reasociind Ctrl+W la Ctrl+F4 când fereastra activă este Qt Designer. Când Qt Designer este activ, de fiecare dată dată când este apăsat Ctrl+W, la Qt Designer va fi trimis Ctrl+F4. În alte aplicații Ctrl+W va continua să funcționeze ca de obicei.\n\nAcum trebuie să specificăm trei lucruri: o nouă scurtătură pentru 'Ctrl+W', o nouă acțiune trimițând Ctrl+F4 și o nouă condiție cum că fereastra activă este Qt Designer.\nQt Designer pare să aibă întotdeauna titlul 'Qt Designer by Trolltech', așa că condiția va verifica dacă fereastra activă are acest titlu. Comment[ru]=По Ctrl+W будет эмулировано нажатие Ctrl+F4 для закрытия окна Qt Designer.\nПоиск окна Qt Designer осуществляется по заголовку "Qt Designer by Trolltech". -Comment[sk]=Najprv si prečítajte komentár k akcii "Typ 'Hello'".\n\nQt Designer používa na zatváranie okien Ctrl+F4 (možno preto, že to tak robí MS Windows (?)). Ale Ctrl+F4 v KDE znamená prechod na virtuálnu plochu 4, takže to nefunguje v Qt Designerovi a tiež, Qt Designer nepoužíva KDE štandardné zatváranie okien potqmocou Ctrl+W.\n\nProblém však môžete vyriešiť premapovaním Ctrl+W na Ctrl+F4, keď je aktívnym oknom okno Qt Designera. Keď je Qt Designer aktívny, vždy, keď stlačíte Ctrl+W, pošle sa Qt Designeru Ctrl+F4. V iných aplikáciach bude samozrejme Ctrl+W pracovať ako obvykle.\n\nTeraz potrebujeme nastaviť tri veci: nový spúštač klávesovej skratky 'Ctrl+W', novú vstupnú akciu klávesnice posielajúcu Ctrl+F4 a novú podmienku, že aktívne okno je Qt Designer.\nVyzerá, že Qt Designer má vždy titulok 'Qt Designer by Trolltech', takže podmienka bude kontrolovať, či má aktívne okno tento titul. +Comment[sk]=Najprv si prečítajte komentár k akcii "Typ 'Hello'".\n\nQt Designer používa na zatváranie okien Ctrl+F4 (možno preto, že to tak robí MS Windows (?)). Ale Ctrl+F4 v KDE znamená prechod na virtuálnu plochu 4, takže to nefunguje v Qt Designerovi a tiež, Qt Designer nepoužíva KDE štandardné zatváranie okien pomocou Ctrl+W.\n\nProblém však môžete vyriešiť premapovaním Ctrl+W na Ctrl+F4, keď je aktívnym oknom okno Qt Designera. Keď je Qt Designer aktívny, vždy, keď stlačíte Ctrl+W, pošle sa Qt Designeru Ctrl+F4. V iných aplikáciach bude samozrejme Ctrl+W pracovať ako obvykle.\n\nTeraz potrebujeme nastaviť tri veci: nový spúštač klávesovej skratky 'Ctrl+W', novú vstupnú akciu klávesnice posielajúcu Ctrl+F4 a novú podmienku, že aktívne okno je Qt Designer.\nVyzerá, že Qt Designer má vždy titulok 'Qt Designer by Trolltech', takže podmienka bude kontrolovať, či má aktívne okno tento titul. Comment[sr]=Прочитајте прво коментар за радњу „Унос ‘Hello’“.\n\nQt Designer користи Ctrl+F4 за затварање прозора (можда зато што је исто тако у MS Windows-у). Али Ctrl+F4 у KDE-у означава одлазак на виртуелну радну површину 4, тако да не ради у Qt Designer-у. Такође, Qt Designer не користи KDE-ово стандардно Ctrl+W за затварање прозора.\n\nОви проблеми могу бити решени другачијим мапирањем за Ctrl+W и Ctrl+F4 када је активан прозор Qt Designer-а. Тада, сваки пут када се притисне Ctrl+W, уместо тога ће Ctrl+F4 бити послато Qt Designer-у. У другим програмима, Ctrl+W наравно наставља да ради као и обично.\n\nЗа ово морамо навести три ствари: Нови окидач пречице за „Ctrl+W“, нову радњу улаза са тастатуре која даје Ctrl+F4, и нови услов да је активан прозор онај Qt Designer-а.\nИзгледа да његов прозор увек има у наслову „Qt Designer by Trolltech“, тако да ће се то проверавати у услову за активан прозор. Comment[sr@Latn]=Pročitajte prvo komentar za radnju „Unos ‘Hello’“.\n\nQt Designer koristi Ctrl+F4 za zatvaranje prozora (možda zato što je isto tako u MS Windows-u). Ali Ctrl+F4 u KDE-u označava odlazak na virtuelnu radnu površinu 4, tako da ne radi u Qt Designer-u. Takođe, Qt Designer ne koristi KDE-ovo standardno Ctrl+W za zatvaranje prozora.\n\nOvi problemi mogu biti rešeni drugačijim mapiranjem za Ctrl+W i Ctrl+F4 kada je aktivan prozor Qt Designer-a. Tada, svaki put kada se pritisne Ctrl+W, umesto toga će Ctrl+F4 biti poslato Qt Designer-u. U drugim programima, Ctrl+W naravno nastavlja da radi kao i obično.\n\nZa ovo moramo navesti tri stvari: Novi okidač prečice za „Ctrl+W“, novu radnju ulaza sa tastature koja daje Ctrl+F4, i novi uslov da je aktivan prozor onaj Qt Designer-a.\nIzgleda da njegov prozor uvek ima u naslovu „Qt Designer by Trolltech“, tako da će se to proveravati u uslovu za aktivan prozor. Comment[sv]=Läs kommentaren om åtgärden "Skriv 'Hej'" först.\n\nQt Designer använder Ctrl+F4 för att stänga fönster (kanske för att MS Windows gör det). Men Ctrl+F4 i KDE betyder att gå till virtuellt skrivbord 4, så det fungerar inte i Qt Designer, och dessutom använder inte Qt Designer KDE:s standard för att stänga fönster, Ctrl+W.\n\nProblemet kan lösas genom att ändra Ctrl+W till Ctrl+F4 när det aktiva fönstret är Qt Designer. När Qt Designer är aktiverat, skickas Ctrl+F4 till Qt Designer istället, varje gång Ctrl+W trycks ner. Ctrl+W fortsätter förstås att fungera som vanligt i andra program.\n\nNu måste vi ange tre saker: En ny snabbtangent som utlöses med 'Ctrl+W', en ny inmatningsåtgärd för tangentbordet som skickar Ctrl+F4, och ett nytt villkor att det aktiva fönstret är Qt Designer.\nQt Designer verkar alltid ha titeln 'Qt Designer by Trolltech', så villkoret kontrollerar att det aktiva fönstret har den titeln. @@ -703,7 +703,7 @@ Comment[km]=ដោយចុចជំនួស(Alt)+បញ្ជា(Ctrl)+W Comment[nb]=Ved å taste Alt+Ctrl+W et DCOP-kall vil utføres som viser minicli. Man kan bruke hvilken som helst DCOP-kalle, akkurat som å kjøre kommandolinja i 'dcop'-verktøyet. Comment[nds]=Dat Drücken vun Strg+Alt+W föhrt en DCOP-Oproop ut, de den Dialoog "Befehl utföhren" opröppt. Du kannst all DCOP-Oprööp bruken, jüst as mit dat Konsool-Programm "dcop". Comment[nl]=Door Alt+Ctrl+W in te drukken zal er een DCOP-aanroep uitgevoerd worden dat venster "Commando uitvoeren" laat zien. U kunt iedere andere DCOP-aanroep gebruiken, net zoals met de commandoregelvariant 'dcop'. -Comment[pl]=Naciśnięcie Alt+Ctrl+W spowoduje wykonanie polecenia DCOP pokazującego mini linię poleceń. Można użyć dowolnego wywołania DCOP, tak jak za potqmocą programu 'dcop' w konsoli. +Comment[pl]=Naciśnięcie Alt+Ctrl+W spowoduje wykonanie polecenia DCOP pokazującego mini linię poleceń. Można użyć dowolnego wywołania DCOP, tak jak za pomocą programu 'dcop' w konsoli. Comment[pt]=Ao carregar em Alt+Ctrl+W, será efectuada uma chamada DCOP que irá mostrar a mini-linha de comandos. Poderá usar qualquer tipo de chamada de DCOP, como se usasse a ferramenta 'dcop' da linha de comandos. Comment[pt_BR]=Ao pressionar Alt+Ctrl+W uma chamada DCOP será executada que irá mostrar o diálogo 'Executar Comando...'. Você pode usar qualquer chamada do DCOP, como quando usa a ferramenta 'dcop' na linha de comando. Comment[ro]=Apăsând Alt+Ctrl+W va iniția un apel DCOP care va arăta minicli-urile. Puteți folosi orice tip de apel DCOP, ca și cum am folosi utilitarul 'dcop'. @@ -1037,7 +1037,7 @@ Key=Alt+Ctrl+B Type=SHORTCUT [Data_1_7] -Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures tqshapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your numeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class tqcontains 'konqueror'). +Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures shapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your numeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror'). Comment[bg]=Konqi в KDE3.1 има подпрозорци, а сега вече има и жестове. Няма нужда от други браузъри >;).\n\nПросто натиснете средният бутон на мишката и започнете да правите жестове, а след като свършите просто пуснете мишката. Ако само трябва да извършите операцията "поставяне", пак ще работи - просто натиснете средния бутон. Comment[ca]=Bé, el Konqi en el KDE3.1 tenia pestanyes, i ara podeu tenir gestos de ratolí., No hi ha necessitat d'usar altres navegadors >;).\n\nNomés premeu el botó central del ratolí i comenceu a dibuixar un dels gestos, un cop hageu acabat, allibereu el botó. Si només us cal enganxar la selecció, encara funciona; simplement feu un clic amb el botó central del ratolí (podeu canviar el botó del ratolí a usar a l'arranjament global).\n\nPer ara, hi ha disponibles aquests gestos:\nmoviment a la dreta i retorn a l'esquerra - endavant (Alt+Dreta)\nmoviment a l'esquerra i retorn a la dreta - enrere (Alt+Esquerra)\nmoviment amunt i retorn avall - amunt (Alt+Amunt)\ncercle antihorari - actualitzar (F5)\n (Tant aviat com trobi quins hi ha a l'Opera o al Mozilla, n'afegiré més i asseguraré que són els mateixos. O si voleu fer-ho vós mateix, preneu-vos la llibertat d'ajudar-me i envieu-me el vostre khotkeysrc.) \n\nLes formes dels gestos (alguns dels diàlegs són del KGesture, gràcies a Mike Pilone) es poden introduir simplement executant-los en el diàleg de configuració. També podeu mirar el teclat numèric per ajudar-vos, els gestos es poden assimilar a una graella de 3x3 camps, numerats d'1 a 9.\n\nTingueu en compte que heu d'executar exactament el gest per activar l'acció. Degut a això, és possible introduir més gestos per l'acció. Hauríeu d'intentar evitar gestos complicats quan canvieu la direcció del ratolí més d'una vegada (p.ex. fer 45654 o 74123 és més senzill que fer 1236987, que és força més difícil).\n\nLes condicions de tots els gestos es defineixen en aquest grup. Tots aquests gestos són actius només si la finestra activa és el Konqueror (la classe conté 'konqueror'). Comment[da]=Ja, Konqueror i KDE3.1 har faneblade, og nu kan du også få gester. Ingen grund til at bruge andre browsere.\n\nTryk blot på musens midterste knap og begynde at tegne en gestus. Slip museknappen når du er færdig. Hvis du kun behøver at indsætte markeringen, fungerer dette også. Klik blot kun med musens midterste knap. (Du kan ændre den museknap som bruges i de generelle indstillinger.)\n\nFor øjeblikket findes følgende gester tilgængelige:\nFlyt til højre og tilbage til venstre - Fremad (Alt+Højrepil)\nFlyt til venstre og tilbage til højre - Tilbage (Alt+Vensterepil)\nFlyt opad og tilbage nedad - Op (Alt+Opadpil)\nCirkel mod uret - Opdatér (F5)\n(Så snart jeg finder ud af hvilke som findes i Opera og Mozilla, vil jeg tilføje flere, og sørge for at de er ligesådan. Eller hvis du gør det selv, så hjælp mig gerne og send mig din khotkeysrc.)\n\nGesternes form kan helt enkelt indtastes ved at udføre dem i indstillingsdialogen (nogle af dialogruterne kommer fra Kgesture, takket være Mike Pilone). Du kan også kigge på det numeriske tastatur for hjælp. Gester genkendes som et 3x3 gitter af felter, nummererede fra 1 til 9.\n\nBemærk at du skal udføre gesterne nøjagtigt for at handlingen skal udløses. På grund af dette er det muligt at indtaste flere gester for en handling. Du bør forsøge at undgå komplicerede gester hvor musens retning ændres mere end en gang (dvs. brug for eksempel 45654 eller 74123 efter som de er enkle at udføre, mens for eksempel 1236987 kan allerede være ganske svær).\n\nBetingelsen for alle gester defineres i denne gruppe. Alle gester er kun aktive hvis det aktive vindue er Konqueror (klassen indeholder 'konqueror'). diff --git a/khotkeys/data/printscreen.khotkeys b/khotkeys/data/printscreen.khotkeys index 38e22f0dc..66af14462 100644 --- a/khotkeys/data/printscreen.khotkeys +++ b/khotkeys/data/printscreen.khotkeys @@ -2,7 +2,7 @@ DataCount=1 [Data_1] -Comment=This group tqcontains actions that are set up by default. +Comment=This group contains actions that are set up by default. Comment[bg]=Тази група съдържа действия, които са зададени по подразбирани. Comment[ca]=Aquest grup conté accions que s'han establert per omissió. Comment[csb]=Na grëpa zamëkô dzejania jaczé są ùstôwióné domëslno. diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index 80d9d2031..95aa7db89 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -222,7 +222,7 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P ) { item_P->set_action( new_action ); item_P->widthChanged( 0 ); - actions_listview->tqrepaintItem( item_P ); + actions_listview->repaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index 093b7c7ca..5048289df 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -49,7 +49,7 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char void Actions_listview_widget::action_name_changed( const TQString& ) { current_action()->widthChanged( 0 ); - actions_listview->tqrepaintItem( current_action()); + actions_listview->repaintItem( current_action()); } void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool recent_action_P ) diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 5c7574a80..86ff8f47c 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -328,7 +328,7 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P ) conditions.insert( pos, new_condition ); } item_P->widthChanged( 0 ); - conditions_listview->tqrepaintItem( item_P ); + conditions_listview->repaintItem( item_P ); } #ifdef KHOTKEYS_DEBUG kdDebug( 1217 ) << "Condition_list_widget::edit_listview_item():" << endl; diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index d0d144382..817eeab89 100644 --- a/khotkeys/kcontrol/gesturedrawer.cpp +++ b/khotkeys/kcontrol/gesturedrawer.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureDrawer::GestureDrawer(TQWidget *parent, const char *name) : TQFrame(parent, name), _data(TQString::null) { - setBackgroundColor( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMinimumSize(30, 30); } @@ -33,14 +33,14 @@ void GestureDrawer::setData(const TQString &data) { _data = data; - tqrepaint(); + repaint(); } void GestureDrawer::paintEvent(TQPaintEvent *ev) { // Iterate through the data points and draw a line to each of them - TQ_UINT32 startCell = 0; - TQ_UINT32 endCell = 0; + Q_UINT32 startCell = 0; + Q_UINT32 endCell = 0; TQPoint startPoint; TQPoint endPoint; @@ -51,7 +51,7 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) startCell = TQString(_data[0]).toUInt(); } - for (TQ_UINT32 index = 1; index < _data.length(); ++index) + for (Q_UINT32 index = 1; index < _data.length(); ++index) { endCell = TQString(_data[index]).toUInt(); @@ -77,14 +77,14 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) TQFrame::paintEvent(ev); } -TQPoint GestureDrawer::lookupCellCoords(TQ_UINT32 cell) +TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell) { // First divide the widget into thirds, horizontally and vertically - TQ_UINT32 w = width(); - TQ_UINT32 h = height(); + Q_UINT32 w = width(); + Q_UINT32 h = height(); - TQ_UINT32 wThird = w / 3; - TQ_UINT32 hThird = h / 3; + Q_UINT32 wThird = w / 3; + Q_UINT32 hThird = h / 3; switch(cell) { diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index 236c65ae3..50fe5db67 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -31,13 +31,13 @@ class GestureDrawer : public QFrame void setData(const TQString &data); - virtual TQSize tqsizeHint() const { return TQSize(30, 30); } + virtual TQSize sizeHint() const { return TQSize(30, 30); } protected: void paintEvent(TQPaintEvent *ev); private: - TQPoint lookupCellCoords(TQ_UINT32 cell); + TQPoint lookupCellCoords(Q_UINT32 cell); void drawArrowHead(TQPoint &start, TQPoint &end, TQPainter &p); diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index df5cf8940..58a177910 100644 --- a/khotkeys/kcontrol/gesturerecorder.cpp +++ b/khotkeys/kcontrol/gesturerecorder.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureRecorder::GestureRecorder(TQWidget *parent, const char *name) : TQFrame(parent, name), _mouseButtonDown(false) { - setBackgroundColor( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setLineWidth(2); setMidLineWidth(0); diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index ef59a4a99..af2fb8cdc 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, "button below.\n\nDraw here:"); TQLabel *label = new TQLabel(message, this, "label"); - label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _recorder = new GestureRecorder(this, "recorder"); diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h index 36e0350ae..99242c518 100644 --- a/khotkeys/kcontrol/gesturerecordpage.h +++ b/khotkeys/kcontrol/gesturerecordpage.h @@ -53,7 +53,7 @@ class GestureRecordPage : public QVBox TQString _gest; - TQ_UINT32 _tryCount; + Q_UINT32 _tryCount; }; } // namespace KHotKeys diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 264bfd032..5d540d4c9 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows ) void Module::import() { - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(), + TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(), i18n( "Select File with Actions to Be Imported" )); if( file.isEmpty()) return; KSimpleConfig cfg( file, true ); if( !settings.import( cfg, true )) { - KMessageBox::error( tqtopLevelWidget(), + KMessageBox::error( topLevelWidget(), i18n( "Import of the specified file failed. Most probably the file is not a valid " "file with actions." )); return; diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop index 3b433608e..f5781da2b 100644 --- a/khotkeys/kcontrol/khotkeys.desktop +++ b/khotkeys/kcontrol/khotkeys.desktop @@ -153,7 +153,7 @@ Keywords[cs]=Klávesy,Globální klávesové zkratky,Schéma kláves,Klávesové Keywords[csb]=klawisze,globalné klawiszowé skrodzënë,schemë skrodzënów,gestë,mësz Keywords[cy]=Bysyll,Bysellau,Rhwymiadau bysell eang,Ystumiau,Ystumiau llygoden Keywords[da]=Taster,Globale tastebindinger,Tastebindinger,Gester,Muse-gester -Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturtqlayout,Gesten,Mausgesten +Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout,Gesten,Mausgesten Keywords[el]=Πλήκτρα,Καθολικοί συνδυασμοί πλήκτρων,Συνδυασμοί πλήκτρων,Gestures,Mouse gestures Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj,muzo Keywords[es]=Teclas,Asociaciones de teclas globales,Asociaciones de teclas,Gestos,Gestos del ratón diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index ec0671e40..3532cc13f 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P module, TQT_SLOT( changed())); connect( delete_action_button, TQT_SIGNAL( clicked()), module, TQT_SLOT( changed())); - setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why + setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why } void Main_buttons_widget::enable_delete( bool enable_P ) diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 203a32edf..199f59750 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -279,7 +279,7 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, } else { - // erase the trigger, i.e. tqreplace with a copy with no trigger and no parent yet + // erase the trigger, i.e. replace with a copy with no trigger and no parent yet Menuentry_shortcut_action_data* entry_tmp = new Menuentry_shortcut_action_data( NULL, entry->name(), entry->comment(), entry->enabled( false )); entry_tmp->set_action( new Menuentry_action( entry_tmp, entry_P )); diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index 7f8aa1396..243543519 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -434,7 +434,7 @@ const char* const Tab_widget::tab_labels[ Tab_widget::TAB_END ] = { void Tab_widget::show_pages( const Pages_set& pages_P ) { - hide(); // this seems to be necessary, otherwise it's not tqrepainter properly + hide(); // this seems to be necessary, otherwise it's not repainter properly for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 12cd12452..2533b58a0 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data() void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P ) { - if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget())) return; // KHotKeys::Module::changed() module->changed(); diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index 398827bbd..ad4bcceaf 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Action_group_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -101,7 +101,7 @@ <slots> <slot access="protected" specifier="pure virtual">action_group_name_changed( const QString& )</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui index a56ca10a4..696b5106a 100644 --- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Action_list_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -166,6 +166,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui index d5646acba..7c0a88a6f 100644 --- a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui +++ b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Actions_listview_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -78,6 +78,6 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">config.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui index c88e7247e..266dd90d9 100644 --- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui +++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Command_url_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -56,8 +56,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui index c5ca0f0e7..a64ef33c1 100644 --- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Condition_list_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -165,6 +165,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index d4a55cdee..ed6e90337 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Dcop_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -268,6 +268,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index d7db19733..60dc34237 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>General_settings_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -109,8 +109,8 @@ <slots> <slot access="protected" specifier="pure virtual">import_clicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index f386b30d6..93f3a6a2c 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>General_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -140,8 +140,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 8a4dc33f4..29f8f88d5 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Gesture_triggers_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -121,7 +121,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -257,7 +257,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -349,7 +349,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -410,7 +410,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -454,7 +454,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -514,6 +514,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui index 6798d5d6e..3bee7daf0 100644 --- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Gestures_settings_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -152,8 +152,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index f8c4fa6a7..9f82ccdcc 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Info_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <string><p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -59,6 +59,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui index 4f82823b0..f3947dd54 100644 --- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Keyboard_input_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -185,8 +185,8 @@ <slots> <slot access="protected" specifier="pure virtual">modify_pressed()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui index c88fb04b9..a46ee0a0f 100644 --- a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui +++ b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Main_buttons_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -81,6 +81,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index 2c97b461d..ae6c613f3 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Menuentry_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -95,6 +95,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui index ae4450be8..13ac0530b 100644 --- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Triggers_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -166,6 +166,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index 4be6d001f..007610fca 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -95,7 +95,7 @@ <slot access="protected" specifier="pure virtual">slotPlayPressed()</slot> <slot access="protected" specifier="pure virtual">slotStopPressed()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index a9fa76b94..2c254dcc8 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Voice_settings_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -23,13 +23,13 @@ <property name="text"> <string>In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>241</width> <height>21</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>90</height> @@ -100,7 +100,7 @@ make sure <i>Full duplex</i> is checked in your <i>Sound Syste </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kkeybutton.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui index c49cced98..58d15e3cf 100644 --- a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui +++ b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Window_trigger_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -126,6 +126,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui index 12a802be8..5e9007e9e 100644 --- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Windowdef_list_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -165,6 +165,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index bc67b8efb..01d54da98 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Windowdef_simple_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -390,7 +390,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -488,6 +488,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index fa103e6b1..fec07e22f 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -31,7 +31,7 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice."); _label = new TQLabel(_message, this, "label"); - _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index cad3437ec..471aab743 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -192,7 +192,7 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P ) { item_P->set_window( new_window ); item_P->widthChanged( 0 ); // SELI tohle i u dalsich listview? - windows_listview->tqrepaintItem( item_P ); + windows_listview->repaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index f58c7e308..e37ef395f 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -391,7 +391,7 @@ void Keyboard_input_action::execute() TQString Keyboard_input_action::description() const { TQString tmp = input(); - tmp.tqreplace( '\n', ' ' ); + tmp.replace( '\n', ' ' ); tmp.truncate( 30 ); return i18n( "Keyboard input : " ) + tmp; } diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp index 28560e03d..60b1d93b4 100644 --- a/khotkeys/shared/gestures.cpp +++ b/khotkeys/shared/gestures.cpp @@ -105,7 +105,7 @@ void Gesture::active_window_changed( WId ) void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) { - if( handlers.tqcontains( receiver_P )) + if( handlers.contains( receiver_P )) return; handlers[ receiver_P ] = true; connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), @@ -116,7 +116,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P ) { - if( !handlers.tqcontains( receiver_P )) + if( !handlers.contains( receiver_P )) return; handlers.remove( receiver_P ); disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), @@ -197,7 +197,7 @@ void Gesture::grab_mouse( bool grab_P ) if( grab_P ) { KXErrorHandler handler; - static int tqmask[] = { 0, Button1MotionMask, Button2MotionMask, Button3MotionMask, + static int mask[] = { 0, Button1MotionMask, Button2MotionMask, Button3MotionMask, Button4MotionMask, Button5MotionMask, ButtonMotionMask, ButtonMotionMask, ButtonMotionMask, ButtonMotionMask }; #define XCapL KKeyNative::modXLock() @@ -216,7 +216,7 @@ void Gesture::grab_mouse( bool grab_P ) i < 8; ++i ) XGrabButton( qt_xdisplay(), button, mods[ i ], qt_xrootwin(), False, - ButtonPressMask | ButtonReleaseMask | tqmask[ button ], GrabModeAsync, GrabModeAsync, + ButtonPressMask | ButtonReleaseMask | mask[ button ], GrabModeAsync, GrabModeAsync, None, None ); bool err = handler.error( true ); kdDebug( 1217 ) << "Gesture grab:" << err << endl; diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 90e789282..f9bfec6d3 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -55,7 +55,7 @@ Kbd::~Kbd() void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.append( shortcut_P ); if( rcv.active ) grab_shortcut( shortcut_P ); @@ -63,17 +63,17 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); if( rcv.active ) ungrab_shortcut( shortcut_P ); if( rcv.shortcuts.count() == 0 ) - tqreceivers.remove( receiver_P ); + receivers.remove( receiver_P ); } void Kbd::activate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( rcv.active ) return; rcv.active = true; @@ -85,7 +85,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P ) void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( !rcv.active ) return; rcv.active = false; @@ -97,7 +97,7 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) void Kbd::grab_shortcut( const KShortcut& shortcut_P ) { - if( grabs.tqcontains( shortcut_P )) + if( grabs.contains( shortcut_P )) ++grabs[ shortcut_P ]; else { @@ -117,7 +117,7 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P ) void Kbd::ungrab_shortcut( const KShortcut& shortcut_P ) { - if( !grabs.tqcontains( shortcut_P )) + if( !grabs.contains( shortcut_P )) return; if( --grabs[ shortcut_P ] == 0 ) { @@ -142,12 +142,12 @@ void Kbd::key_slot( TQString key_P ) { kdDebug( 1217 ) << "Key pressed:" << key_P << endl; KShortcut shortcut( key_P ); - if( !grabs.tqcontains( shortcut )) + if( !grabs.contains( shortcut )) return; - for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin(); - it != tqreceivers.end(); + for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); + it != receivers.end(); ++it ) - if( ( *it ).shortcuts.tqcontains( shortcut ) && ( *it ).active + if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active && it.key()->handle_key( shortcut )) return; } diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index eff131c44..22df89284 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -58,7 +58,7 @@ class Kbd TQValueList< KShortcut > shortcuts; bool active; }; - TQMap< Kbd_receiver*, Receiver_data > tqreceivers; + TQMap< Kbd_receiver*, Receiver_data > receivers; TQMap< KShortcut, int > grabs; KGlobalAccel* kga; }; diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index a6434be06..fdab2be56 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -63,7 +63,7 @@ bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportTyp TQString import_id = cfg_P.readEntry( "ImportId" ); if( !import_id.isEmpty()) { - if( already_imported.tqcontains( import_id )) + if( already_imported.contains( import_id )) { if( import_P == ImportSilent || KMessageBox::warningContinueCancel( NULL, diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp index ddaec44b8..c90eb2e02 100644 --- a/khotkeys/shared/sound.cpp +++ b/khotkeys/shared/sound.cpp @@ -50,7 +50,7 @@ Sound::~Sound() void Sound::load(const TQString& filename) { kdDebug() << k_funcinfo << filename << endl; - data=TQMemArray<TQ_INT32>(); + data=TQMemArray<Q_INT32>(); TQFile file(filename); if(!file.open(IO_ReadOnly)) { @@ -59,20 +59,20 @@ void Sound::load(const TQString& filename) } TQDataStream stream(&file); stream.setByteOrder( TQDataStream::LittleEndian ); - TQ_INT32 magic; + Q_INT32 magic; MAGIC("RIFF"); - READ_FROM_STREAM(TQ_UINT32,ChunkSize); + READ_FROM_STREAM(Q_UINT32,ChunkSize); MAGIC("WAVE"); MAGIC("fmt "); - READ_FROM_STREAM(TQ_UINT32,ChunkSize2); - READ_FROM_STREAM(TQ_INT16,AudioFormat); - READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); - READ_FROM_STREAM(TQ_UINT32,SampleRate); + READ_FROM_STREAM(Q_UINT32,ChunkSize2); + READ_FROM_STREAM(Q_INT16,AudioFormat); + READ_FROM_STREAM(Q_UINT16,NumberOfChannels); + READ_FROM_STREAM(Q_UINT32,SampleRate); _fs=SampleRate; - READ_FROM_STREAM(TQ_UINT32,ByteRate); - READ_FROM_STREAM(TQ_UINT16,BlockAlign); - READ_FROM_STREAM(TQ_UINT16,BitsPerSample); + READ_FROM_STREAM(Q_UINT32,ByteRate); + READ_FROM_STREAM(Q_UINT16,BlockAlign); + READ_FROM_STREAM(Q_UINT16,BitsPerSample); MAGIC("data"); READ_FROM_STREAM(TQByteArray,SoundData); NumberOfChannels=1; //Wav i play are broken @@ -90,7 +90,7 @@ void Sound::load(const TQString& filename) max=0; for(unsigned long int f=0;f<NumberOfSamples;f++) { - TQ_INT32 nb=0; + Q_INT32 nb=0; for(uint k=0;k<BytePS;k++) { nb |= (SoundData[f*BytePS+k]&0x000000FF) << (k*8); @@ -110,7 +110,7 @@ void Sound::load(const TQString& filename) } -#define SMAGIC(CH) { stream << ( TQ_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; } +#define SMAGIC(CH) { stream << ( Q_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; } void Sound::save(const TQString& filename) const { @@ -129,35 +129,35 @@ void Sound::save(const TQString& filename) const for(unsigned long int f=0;f<data.size();f++) { - TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); + Q_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); SoundData[ 2*f ]= val & 0x00FF; SoundData[2*f+1]= (val & 0xFF00) >> 8; // kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; } - TQ_UINT16 NumberOfChannels=2; - TQ_UINT32 SampleRate=_fs; + Q_UINT16 NumberOfChannels=2; + Q_UINT32 SampleRate=_fs; SMAGIC("RIFF"); - //READ_FROM_STREAM(TQ_UINT32,ChunkSize); - stream << (TQ_UINT32)(36+ SoundData.size()); + //READ_FROM_STREAM(Q_UINT32,ChunkSize); + stream << (Q_UINT32)(36+ SoundData.size()); SMAGIC("WAVE"); SMAGIC("fmt "); - //READ_FROM_STREAM(TQ_UINT32,ChunkSize2); - stream << (TQ_UINT32)(16); - //READ_FROM_STREAM(TQ_INT16,AudioFormat); - stream << (TQ_INT16)(1); - //READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); - stream << (TQ_UINT16)(NumberOfChannels); - //READ_FROM_STREAM(TQ_UINT32,SampleRate); - stream << (TQ_UINT32)(SampleRate); - //READ_FROM_STREAM(TQ_UINT32,ByteRate); - stream << (TQ_UINT32)(NumberOfChannels*SampleRate*16/8); - //READ_FROM_STREAM(TQ_UINT16,BlockAlign); - stream << (TQ_UINT16)(16/8 *NumberOfChannels); - //READ_FROM_STREAM(TQ_UINT16,BitsPerSample); - stream << (TQ_UINT16)(16); + //READ_FROM_STREAM(Q_UINT32,ChunkSize2); + stream << (Q_UINT32)(16); + //READ_FROM_STREAM(Q_INT16,AudioFormat); + stream << (Q_INT16)(1); + //READ_FROM_STREAM(Q_UINT16,NumberOfChannels); + stream << (Q_UINT16)(NumberOfChannels); + //READ_FROM_STREAM(Q_UINT32,SampleRate); + stream << (Q_UINT32)(SampleRate); + //READ_FROM_STREAM(Q_UINT32,ByteRate); + stream << (Q_UINT32)(NumberOfChannels*SampleRate*16/8); + //READ_FROM_STREAM(Q_UINT16,BlockAlign); + stream << (Q_UINT16)(16/8 *NumberOfChannels); + //READ_FROM_STREAM(Q_UINT16,BitsPerSample); + stream << (Q_UINT16)(16); SMAGIC("data"); //READ_FROM_STREAM(TQByteArray,SoundData); stream << SoundData; diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 6453563de..2c2d97d93 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -50,8 +50,8 @@ public: return _fs; } - TQMemArray<TQ_INT32> data; - TQ_UINT32 max; + TQMemArray<Q_INT32> data; + Q_UINT32 max; uint _fs; }; diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index b3042f00f..7cac2b98c 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -225,7 +225,7 @@ void Window_trigger::window_added( WId window_P ) void Window_trigger::window_removed( WId window_P ) { - if( existing_windows.tqcontains( window_P )) + if( existing_windows.contains( window_P )) { bool matches = existing_windows[ window_P ]; kdDebug( 1217 ) << "Window_trigger::w_removed() : " << matches << endl; @@ -244,7 +244,7 @@ void Window_trigger::window_removed( WId window_P ) void Window_trigger::active_window_changed( WId window_P ) { bool was_match = false; - if( existing_windows.tqcontains( last_active_window )) + if( existing_windows.contains( last_active_window )) was_match = existing_windows[ last_active_window ]; if( active && was_match && ( window_actions & WINDOW_DEACTIVATES )) { @@ -253,7 +253,7 @@ void Window_trigger::active_window_changed( WId window_P ) } /* bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches;*/ - bool matches = existing_windows.tqcontains( window_P ) + bool matches = existing_windows.contains( window_P ) ? existing_windows[ window_P ] : false; if( active && matches && ( window_actions & WINDOW_ACTIVATES )) { @@ -272,7 +272,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P ) return; kdDebug( 1217 ) << "Window_trigger::w_changed()" << endl; bool was_match = false; - if( existing_windows.tqcontains( window_P )) + if( existing_windows.contains( window_P )) was_match = existing_windows[ window_P ]; bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches; diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index e19f66eec..a6515fecf 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -79,7 +79,7 @@ void Voice::enable( bool enabled_P ) void Voice::register_handler( Voice_trigger *trigger_P ) { - if( !_references.tqcontains( trigger_P )) + if( !_references.contains( trigger_P )) _references.append(trigger_P); } @@ -179,7 +179,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P) //kdDebug(1217) << k_funcinfo << keyNative.key().toString() << endl; - if(_shortcut.tqcontains(keyNative)) + if(_shortcut.contains(keyNative)) { if(pEvent->type == XKeyPress && !_recording ) { diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp index 4f4266b7e..773f28731 100644 --- a/khotkeys/shared/voicesignature.cpp +++ b/khotkeys/shared/voicesignature.cpp @@ -154,14 +154,14 @@ static TQMemArray<double> fft(const Sound& sound, unsigned int start, unsigned i { samples[f]=sound.at(start2+rev_carry)* hamming(rev_carry, size); // KDEBUG(rev_carry); - int tqmask = size>>1; // N / 2 + int mask = size>>1; // N / 2 // add 1 backwards - while (rev_carry >= tqmask) + while (rev_carry >= mask) { - rev_carry -= tqmask; // turn off this bit - tqmask >>= 1; + rev_carry -= mask; // turn off this bit + mask >>= 1; } - rev_carry += tqmask; + rev_carry += mask; } samples[size-1]=sound.at(start2+size-1)*hamming(size-1, size); diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index a1394b731..b8e86f694 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -339,7 +339,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& case NOT_IMPORTANT : return true; case CONTAINS : - return str1_P.tqcontains( str2_P ) > 0; + return str1_P.contains( str2_P ) > 0; case IS : return str1_P == str2_P; case REGEXP : @@ -348,7 +348,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& return rg.search( str1_P ) >= 0; } case CONTAINS_NOT : - return str1_P.tqcontains( str2_P ) == 0; + return str1_P.contains( str2_P ) == 0; case IS_NOT : return str1_P != str2_P; case REGEXP_NOT : |