diff options
Diffstat (limited to 'kate')
156 files changed, 1164 insertions, 1949 deletions
diff --git a/kate/CMakeL10n.txt b/kate/CMakeL10n.txt index e2998f650..258cbed19 100644 --- a/kate/CMakeL10n.txt +++ b/kate/CMakeL10n.txt @@ -9,3 +9,9 @@ tde_l10n_create_template( ) tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/kate-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox index 99ddc9c7a..49a820395 100644 --- a/kate/Mainpage.dox +++ b/kate/Mainpage.dox @@ -33,4 +33,3 @@ Christoph Cullmann \<cullmann@kde.org\> */ // DOXYGEN_REFERENCES = tdecore tdeio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs // DOXYGEN_SET_PROJECT_NAME = Kate -// vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt index 8a6efd2ca..b823e4e60 100644 --- a/kate/data/CMakeLists.txt +++ b/kate/data/CMakeLists.txt @@ -11,9 +11,11 @@ ##### other data ################################ -install( FILES - katepart.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE katepart.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kate-desktops +) install( FILES katepartui.rc katepartreadonlyui.rc @@ -43,9 +45,9 @@ install( FILES ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml java.xml json.xml jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lsl.xml lua.xml m3u.xml - m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml - maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml modelica.xml - modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml + m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml markdown.xml mason.xml mathematica.xml + matlab.xml maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml + modelica.xml modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml modula-2.xml monobasic.xml mup.xml nagios.xml nasm.xml nemerle.xml nesc.xml noweb.xml objectivecpp.xml objectivec.xml ocaml.xml ocamllex.xml ocamlyacc.xml octave.xml oors.xml opal.xml opencl.xml diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am index 09df83b7f..5f1eda66d 100644 --- a/kate/data/Makefile.am +++ b/kate/data/Makefile.am @@ -23,9 +23,9 @@ syntaxkate_DATA = language.dtd syntax.template \ ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml javascript-php.xml java.xml json.xml \ jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml \ literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lsl.xml lua.xml m3u.xml \ - m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml \ - maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml modelica.xml \ - modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml \ + m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml markdown.xml mason.xml mathematica.xml \ + matlab.xml maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml \ + modelica.xml modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml \ modula-2.xml monobasic.xml mup.xml nagios.xml nasm.xml nemerle.xml nesc.xml \ noweb.xml objectivecpp.xml objectivec.xml ocaml.xml ocamllex.xml ocamlyacc.xml \ octave.xml oors.xml opal.xml opencl.xml \ diff --git a/kate/data/ada.xml b/kate/data/ada.xml index f2f753c5f..12968308c 100644 --- a/kate/data/ada.xml +++ b/kate/data/ada.xml @@ -199,4 +199,3 @@ <keywords casesensitive="0" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/ahdl.xml b/kate/data/ahdl.xml index cf0ab4652..f4767afe8 100644 --- a/kate/data/ahdl.xml +++ b/kate/data/ahdl.xml @@ -142,4 +142,3 @@ <keywords casesensitive="0" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/asn1.xml b/kate/data/asn1.xml index 85668071a..d8225bc44 100644 --- a/kate/data/asn1.xml +++ b/kate/data/asn1.xml @@ -61,6 +61,3 @@ </itemDatas> </highlighting> </language> -<!-- -// kate: space-indent on; indent-width 2; replace-tabs on; ---> diff --git a/kate/data/c.xml b/kate/data/c.xml index 501e865e3..aa250ec9c 100644 --- a/kate/data/c.xml +++ b/kate/data/c.xml @@ -197,7 +197,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> diff --git a/kate/data/cmake.xml b/kate/data/cmake.xml index fa2e71900..47b5efc74 100644 --- a/kate/data/cmake.xml +++ b/kate/data/cmake.xml @@ -3706,6 +3706,3 @@ <keywords casesensitive="1" /> </general> </language> - -<!-- kate: indent-width 2; tab-width 2; --> - diff --git a/kate/data/context.xml b/kate/data/context.xml index ebd3faaa4..24dd2d763 100644 --- a/kate/data/context.xml +++ b/kate/data/context.xml @@ -128,5 +128,3 @@ </encodings> </spellchecking> </language> - -<!-- kate: space-indent off; indent-width 4; --> diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml index 6efe9cb3c..d50aec098 100644 --- a/kate/data/cpp.xml +++ b/kate/data/cpp.xml @@ -27,5 +27,3 @@ </highlighting> </language> - -<!-- kate: indent-width 2; tab-width 2; --> diff --git a/kate/data/diff.xml b/kate/data/diff.xml index b681b4270..62fdceb1e 100644 --- a/kate/data/diff.xml +++ b/kate/data/diff.xml @@ -15,7 +15,7 @@ 2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com> Fixed folding. --> -<language name="Diff" version="1.12" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch"> +<language name="Diff" version="1.13" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch"> <highlighting> @@ -108,8 +108,8 @@ <itemData name="Normal Text" defStyleNum="dsNormal"/> <itemData name="File" defStyleNum="dsKeyword"/> <itemData name="Header" defStyleNum="dsDataType"/> - <itemData name="Removed line" defStyleNum="dsString" color="#FF0000"/> - <itemData name="Added line" defStyleNum="dsOthers" color="#0000FF"/> + <itemData name="Removed line" defStyleNum="dsString" backgroundColor="#ffeef0"/> + <itemData name="Added line" defStyleNum="dsOthers" backgroundColor="#e6ffed"/> <itemData name="Changed line (old)" defStyleNum="dsString" color="#FF0000"/> <itemData name="Changed line (new)" defStyleNum="dsOthers" color="#0000FF"/> </itemDatas> diff --git a/kate/data/dockerfile.xml b/kate/data/dockerfile.xml index 3e90ee24d..61363ca75 100644 --- a/kate/data/dockerfile.xml +++ b/kate/data/dockerfile.xml @@ -57,5 +57,3 @@ </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> - diff --git a/kate/data/doxygen.xml b/kate/data/doxygen.xml index 302eeae8f..3bacf26b9 100644 --- a/kate/data/doxygen.xml +++ b/kate/data/doxygen.xml @@ -511,4 +511,3 @@ <keywords casesensitive="1" weakDeliminator="\$~" /> </general> </language> -<!-- kate: indent-width 2; --> diff --git a/kate/data/dtd.xml b/kate/data/dtd.xml index 17914d16c..7c9747757 100644 --- a/kate/data/dtd.xml +++ b/kate/data/dtd.xml @@ -106,5 +106,3 @@ </general> </language> -<!-- kate: indent-width 2; indent-mode normal; tab-indents on; --> - diff --git a/kate/data/erlang.xml b/kate/data/erlang.xml index f26e45a3c..60143c27b 100644 --- a/kate/data/erlang.xml +++ b/kate/data/erlang.xml @@ -247,4 +247,3 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/fasm.xml b/kate/data/fasm.xml index 64734ce01..e8aa0e8d2 100644 --- a/kate/data/fasm.xml +++ b/kate/data/fasm.xml @@ -896,4 +896,3 @@ Notes: </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/fgl-4gl.xml b/kate/data/fgl-4gl.xml index 7b2084dbd..b92523641 100644 --- a/kate/data/fgl-4gl.xml +++ b/kate/data/fgl-4gl.xml @@ -347,7 +347,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/fgl-per.xml b/kate/data/fgl-per.xml index 44bc53151..21d09df57 100644 --- a/kate/data/fgl-per.xml +++ b/kate/data/fgl-per.xml @@ -159,7 +159,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/freebasic.xml b/kate/data/freebasic.xml index 1072a2894..8a4f3b130 100644 --- a/kate/data/freebasic.xml +++ b/kate/data/freebasic.xml @@ -605,4 +605,3 @@ </comments> </general> </language> -<!-- // kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/fsharp.xml b/kate/data/fsharp.xml index 8cf8ab12e..f6b278476 100644 --- a/kate/data/fsharp.xml +++ b/kate/data/fsharp.xml @@ -284,4 +284,3 @@ </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/gcc.xml b/kate/data/gcc.xml index 0f78b3361..d7e70a41f 100644 --- a/kate/data/gcc.xml +++ b/kate/data/gcc.xml @@ -578,4 +578,3 @@ <keywords casesensitive="1"/> </general> </language> -<!-- kate: indent-width 2; tab-width 2; --> diff --git a/kate/data/gdb.xml b/kate/data/gdb.xml index 0cff053b3..3d45a7e12 100644 --- a/kate/data/gdb.xml +++ b/kate/data/gdb.xml @@ -9,7 +9,7 @@ v1.0: <language name="GDB Backtrace" section="Other" version="1.0-1" kateversion="2.4" - extensions="*.kcrash;*.crash;*.bt" + extensions="*.tdecrash;*.kcrash;*.crash;*.bt" mimetype="" author="Milian Wolff (mail@milianw.de)" license="LGPL"> @@ -55,5 +55,3 @@ v1.0: </highlighting> </language> - -<!-- kate: replace-tabs: on; tab-width: 4; indent-width: 4; -->
\ No newline at end of file diff --git a/kate/data/gitolite.xml b/kate/data/gitolite.xml index 63e21bc17..2d6743ae8 100644 --- a/kate/data/gitolite.xml +++ b/kate/data/gitolite.xml @@ -40,5 +40,4 @@ </general> - <!-- kate: space-indent on indent-width 2 replace-tabs on indent-mode xml --> </language> diff --git a/kate/data/idl.xml b/kate/data/idl.xml index a8a2787dd..06b37118b 100644 --- a/kate/data/idl.xml +++ b/kate/data/idl.xml @@ -100,7 +100,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml index d139522b1..3bbeb9f01 100644 --- a/kate/data/isocpp.xml +++ b/kate/data/isocpp.xml @@ -156,8 +156,8 @@ <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_UNUSED </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <item> TRUE </item> <item> FALSE </item> <item> TQ_ARG </item> @@ -198,13 +198,8 @@ <item> TQ_SCRIPTABLE </item> <item> TQ_SETS </item> <item> TQ_SIGNAL </item> - <item> TQ_SIGNALS </item> <item> TQ_SLOT </item> - <item> TQ_SLOTS </item> <item> TQ_UNUSED </item> - <item> TQT_SIGNAL </item> - <item> TQT_SLOT </item> - <item> TQT_TQOBJECT </item> <item> connect </item> <item> disconnect </item> <item> emit </item> @@ -595,4 +590,3 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: indent-width 2; tab-width 2; --> diff --git a/kate/data/jam.xml b/kate/data/jam.xml index 0d8e5201d..0472f8b6b 100644 --- a/kate/data/jam.xml +++ b/kate/data/jam.xml @@ -337,4 +337,3 @@ IN THE SOFTWARE. <keywords weakDeliminator=":;{}()[].!+,-<=>%&/?^|~\*," additionalDeliminator=" "/> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml index e90f0b051..916d213c1 100644 --- a/kate/data/javascript.xml +++ b/kate/data/javascript.xml @@ -101,6 +101,7 @@ <DetectChar attribute="String" context="String" char=""" /> <DetectChar attribute="String" context="String SQ" char="'" /> + <DetectChar attribute="String" context="Template String" char="`" /> <IncludeRules context="##Doxygen" /> <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/" /> @@ -154,6 +155,11 @@ <LineContinue/> <DetectChar attribute="String" context="#pop" char="'" /> </context> + <context attribute="String" lineEndContext="#pop" name="Template String"> + <HlCStringChar attribute="Char" /> + <LineContinue/> + <DetectChar attribute="String" context="#pop" char="`" /> + </context> <context attribute="Comment" lineEndContext="#pop" name="Comment"> <IncludeRules context="##Alerts" /> diff --git a/kate/data/json.xml b/kate/data/json.xml index 28ad8e8a3..4121dbe52 100644 --- a/kate/data/json.xml +++ b/kate/data/json.xml @@ -98,7 +98,3 @@ </itemDatas> </highlighting> </language> -<!-- -// kate: space-indent on; indent-width 2; replace-tabs on; ---> - diff --git a/kate/data/julia.xml b/kate/data/julia.xml index aa0b9804b..20ef87c96 100644 --- a/kate/data/julia.xml +++ b/kate/data/julia.xml @@ -285,6 +285,3 @@ endRegion="block" /> </general> </language> - -<!-- It's recommended to put the following line in the Variables field under Settings->Configure Kate->Open/Save->Modes&Filetypes --> -<!-- kate: space-indent on; indent-width 4; mixed-indent off; indent-mode cstyle; --> diff --git a/kate/data/katepart.desktop b/kate/data/katepart.desktop index 95834df61..74f13d075 100644 --- a/kate/data/katepart.desktop +++ b/kate/data/katepart.desktop @@ -1,87 +1,5 @@ [Desktop Entry] Name=Embedded Advanced Text Editor -Name[af]=Ingebedde Gevorderde Teks Redigeerder -Name[ar]=محرر نص كيدي متقدم و مدمج -Name[az]=Daxili Mütəxəssis Mətn Editoru -Name[be]=Унутраны адмысловы тэкставы рэдактар -Name[bg]=Разширен текстов редактор -Name[bn]=অভ্যন্তরীন উন্নত টেক্সট সম্পাদক -Name[br]=Aozer skrid barek enframmet -Name[bs]=Umetnuti napredni tekst editor -Name[ca]=Editor avançat de text, encastable -Name[cs]=Zabudovaný rozšířený editor -Name[csb]=Òbsôdzony awansowôny editora tekstu -Name[cy]=Golygydd Testun Uwch Mewnol -Name[da]=Indlejret avanceret teksteditor -Name[de]=Erweiterte Editorkomponente -Name[el]=Ενσωματωμένος προχωρημένος επεξεργαστής κειμένου -Name[eo]=Enkorpigita altnivela tekstredaktilo -Name[es]=Editor de texto avanzado empotrable -Name[et]=Põimitud võimas tekstiredaktor -Name[eu]=Kapsulatutako testu-editore aurreratua -Name[fa]=ویرایشگر متن پیشرفتۀ نهفته -Name[fi]=Upotettava kehittynyt tekstieditori -Name[fr]=Éditeur de texte avancé intégré -Name[fy]=Ynsletten avansearre tekstbewurker -Name[ga]=Ard-eagarthóir téacs leabaithe -Name[gl]=Editor de Textos Avanzado Incrustado -Name[he]=עורך הטקסט המתקדם המוטבע -Name[hi]= अंतर्निहित विकसित पाठ संपादक -Name[hr]=Ugrađena napredna obrada teksta -Name[hsb]=Integrowany lěpši wobdźěłar teksta -Name[hu]=Beágyazott Kate szövegszerkesztő -Name[id]=Komponen Editor Teks Embedded -Name[is]=Ívefjanlegur þróaður textaritill -Name[it]=Editor di testi avanzato integrato -Name[ja]=埋め込み高機能テキストエディタ -Name[ka]=ჩადგმული ტექსტური რედაქტორი -Name[kk]=Ендірілетін үздік мәтін редакторы -Name[km]=កម្មវិធីនិពន្ធអត្ថបទកម្រិតខ្ពស់ដែលបានបង្កប់ -Name[ko]=끼워넣은 고급 글월 편집기 -Name[lb]=Agebetteten erweiderten Texteditor -Name[lt]=Įdėtas sudėtingesnis tekstų redaktorius -Name[lv]=Iegultais paplašinātais tekstu redaktors -Name[mk]=Вгнезден напреден текст уредувач -Name[mn]=Kate-хэрэгсэл -Name[ms]=Penyunting Teks Termaju Terimplan -Name[mt]=Editur ta' test integrat avvanzat -Name[nb]=Innebyggbart, avansert tekstredigerings-program -Name[nds]=Inbett verwiedert Texteditor -Name[ne]=सम्मिलित उन्नत पाठ सम्पादक -Name[nl]=Ingebed tekstinvoercomponent -Name[nn]=Inkluderbart avansert skriveprogram -Name[nso]=Mofetosi yo a Robaditswego wa Sengwalwana seo se Beetswegopele -Name[pa]=ਸ਼ਾਮਿਲ ਤਕਨੀਕੀ ਪਾਠ ਸੰਪਾਦਕ -Name[pl]=Osadzony zaawansowany edytor tekstu -Name[pt]=Editor de Texto Avançado Embebido -Name[pt_BR]=Componente integrado ao Editor de textos -Name[ro]=Editor de text avansat înglobat -Name[ru]=Встроенный текстовый редактор -Name[rw]=Muhinduzi y'Umwandiko Ihanitse Ishyizwemo -Name[se]=Nana buorre vuojuhanláhkái čállinprográmma -Name[sk]=Vložiteľný komponent pokročilého textového editora -Name[sl]=Vgrajeni napredni urejevalnik besedil -Name[sq]=Tekst Editori i avancuar i ngulur -Name[sr]=Уграђени напредни уређивач текста -Name[sr@Latn]=Ugrađeni napredni uređivač teksta -Name[sv]=Inbäddningsbar avancerad texteditor -Name[ta]=உட்பொதிந்த மேம்பட்ட உரை தொகுப்பாளர் -Name[te]=ఆధునిక పొదగిన వాచకం సరిచేయునది -Name[tg]=Таҳриргари матни дарунсохти беҳбудшуда -Name[th]=โปรแกรมแก้ไขข้อความขั้นสูงแบบฝังตัว -Name[tr]=Gelişmiş Metin Düzenleyici -Name[tt]=Mäten öçen Quşılma-Üzgärtkeç -Name[uk]=Вмонтований потужний текстовий редактор -Name[uz]=Matn tahrirchi -Name[uz@cyrillic]=Матн таҳрирчи -Name[ven]=Musengulusi wa manwalwa a nthesa o dzheniswaho -Name[vi]=Bộ Soạn thảo Văn bản Cấp cao Nhúng -Name[wa]=Ravalé aspougneu di tecse avancî -Name[xh]=Umhleli Wombhalo Obhekisa phambili Olungiselweyo -Name[zh_CN]=嵌入式 TDE 高级文本编辑器 -Name[zh_HK]=嵌入式進階文字編輯器 -Name[zh_TW]=嵌入式進階文字編輯器 -Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe X-TDE-Library=libkatepart Icon=kate X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document diff --git a/kate/data/lilypond.xml b/kate/data/lilypond.xml index 3e0a340b7..ea7884e2e 100644 --- a/kate/data/lilypond.xml +++ b/kate/data/lilypond.xml @@ -1039,5 +1039,4 @@ </language> <!-- - // kate: space-indent on; indent-width 2; replace-tabs on; dynamic-word-wrap off; - --> +--> diff --git a/kate/data/lpc.xml b/kate/data/lpc.xml index bf1dac5e2..6145f3cd7 100644 --- a/kate/data/lpc.xml +++ b/kate/data/lpc.xml @@ -163,5 +163,4 @@ License: Artistic </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> <!-- === End of file. === --> diff --git a/kate/data/lsl.xml b/kate/data/lsl.xml index 2d0fc5118..608e10aa5 100644 --- a/kate/data/lsl.xml +++ b/kate/data/lsl.xml @@ -1045,6 +1045,3 @@ </comments> </general> </language> -<!-- -// kate: space-indent on; indent-width 2; replace-tabs on; ---> diff --git a/kate/data/makefile.xml b/kate/data/makefile.xml index e25376dd9..44d87e52d 100644 --- a/kate/data/makefile.xml +++ b/kate/data/makefile.xml @@ -215,4 +215,3 @@ <keywords casesensitive="1" weakDeliminator = "-"/> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/markdown.xml b/kate/data/markdown.xml new file mode 100644 index 000000000..177b904da --- /dev/null +++ b/kate/data/markdown.xml @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Kate syntax highlight filter for Markdown/MultiMarkdown documents. + + Copyright 2008 Darrin Yeager. http://www.dyeager.org/ + Dual-Licensed under both GPL and BSD licenses. + + Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/ +--> + + +<!-- the [^\s]{1} is in the regex to avoid interfering with bullet list which + starts "* item". Thus emphasis/strong MUST be formed like *words here* + with the asterisks next to the beginning of the first word. + + Match space or newline, followed by "*", followed by one non-space, + followed by anything non-asterisk, followed by "*", followed by + space, end-of-sentence punctuation, or the end of the line. +--> +<!DOCTYPE language SYSTEM "language.dtd" + [ + <!ENTITY strongemphasisregex "(\s|^)[\*_]{3}[^\*_]+[\*_]{3}(\s|\.|,|;|:|\-|\?|$)"> + <!ENTITY strongregex "(\s|^)[\*_]{2}[^\s]{1}[^\*_]+[\*_]{2}(\s|\.|,|;|:|\-|\?|$)"> + <!ENTITY emphasisregex "(\s|^)[\*_]{1}[^\s]{1}[^\*_]+[\*_]{1}(\s|\.|,|;|:|\-|\?|$)"> + <!ENTITY reflinkregex '\[[^\]\^]+\]\s*\[[^\]]*\]\s*(\s+\"[^\"]*\"){0,1}'> + <!ENTITY reflinktargetregex '\[[^\]\^]+\]\:\s+[^\s]+(\s+\"[^\"]*\"){0,1}'> + <!ENTITY footnoteregex "\[\^[^\]]+\]"> + <!ENTITY preregex "^\s*```\s*"> + <!ENTITY pretilderegex "^\s*~~~\s*"> + <!ENTITY preendregex "^\s*```\s*$"> + <!ENTITY pretildeendregex "^\s*~~~\s*$"> + <!ENTITY presingleline '```[^`]+```'> + <!ENTITY idlinkregex '\[[^\]\^]+\]\s*\(#[^\(]*\)'> + <!ENTITY inlinelinkregex '\[[^\]\^]+\]\s*\([^\(]*\)'> + <!ENTITY inlineimageregex '\!\[[^\]\^]+\]\([^\(]*\)'> + <!ENTITY refimageregex '\!\[[^\]\^]+\]\[[^\[]*\]'> + <!ENTITY autolinkregex '<(https?|ftp):[^\">\s]+>'> + <!ENTITY mailtolinkregex '<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>'> + <!ENTITY rulerregex '^ {,3}([\*\-_]\s*){3,}\s*$'> + <!-- two spaces at end of line generates linebreak --> + <!ENTITY linebreakregex "( |\\)$"> + <!ENTITY strikeoutregex "~~[^~\s].*[^~\s]~~"> + <!ENTITY prediffregex "^(```|~~~)\s{0,}diff"> + <!ENTITY difflineremoveregex "^-[^-].*$"> + <!ENTITY difflineaddregex "^\+[^\+].*$"> + <!ENTITY diffheader1regex "^-{3} .*$"> + <!ENTITY diffheader2regex "^(\+{3} .*|^@@.*)$"> + <!ENTITY diffheaderdiffregex "^diff .*$"> +]> + +<language name="Markdown" version="1.4" section="Markup" + extensions="*.md;*.mmd;*.mdwn" + author="Darrin Yeager, Claes Holmerson" + license="GPL,BSD" > + <highlighting> + <contexts> + + <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" > + <DetectChar context="blockquote" char=">" column="0"/> + <RegExpr attribute="h1" String="^#\s.*[#]?$" /> + <RegExpr attribute="h2" String="^##\s.*[#]?$" /> + <RegExpr attribute="h3" String="^###\s.*[#]?$" /> + <RegExpr attribute="h4" String="^####\s.*[#]?$" /> + <RegExpr attribute="h5" String="^#####\s.*[#]?$" /> + <RegExpr attribute="h6" String="^######\s.*[#]?$" /> + <RegExpr attribute="strongemphasis" String="&strongemphasisregex;" /> + <RegExpr attribute="strong" String="&strongregex;" /> + <RegExpr attribute="emphasis" String="&emphasisregex;" /> + <RegExpr attribute="ruler" String="&rulerregex;" /> + <RegExpr context="bullet" String="^ {,3}[\*\+\-]\s" /> + <RegExpr context="numlist" String="^ {,3}[\d]+\.\s" /> + <RegExpr attribute="code" String="^([\s]{4,}|\t+).*$" /> + <RegExpr attribute="meta" String="^(Title|Author|Date|Copyright|Revision|CSS|LaTeX\ XSLT|Categories|Tags|BaseName|Excerpt):(.*)+$" /> + <IncludeRules context="inc" /> + </context> + + <context attribute="blockquote" lineEndContext="#pop" name="blockquote"> + <RegExpr attribute="bq-strong" String="&strongregex;" /> + <RegExpr attribute="bq-emphasis" String="&emphasisregex;" /> + <RegExpr attribute="bq-strongemphasis" String="&strongemphasisregex;" /> + <IncludeRules context="inc" /> + </context> + + <context attribute="bullet" lineEndContext="#pop" name="bullet" > + <RegExpr attribute="bl-strong" String="&strongregex;" /> + <RegExpr attribute="bl-emphasis" String="&emphasisregex;" /> + <RegExpr attribute="bl-strongemphasis" String="&strongemphasisregex;" /> + <IncludeRules context="inc" /> + </context> + + <context attribute="numlist" lineEndContext="#pop" name="numlist" > + <RegExpr attribute="nl-strong" String="&strongregex;" /> + <RegExpr attribute="nl-emphasis" String="&emphasisregex;" /> + <RegExpr attribute="nl-strongemphasis" String="&strongemphasisregex;" /> + <IncludeRules context="inc" /> + </context> + + <context attribute="comment" lineEndContext="#stay" name="comment" > + <RegExpr String="-->" attribute="comment" context="#pop" endRegion="comment"/> + </context> + + <context attribute="prediff" lineEndContext="#stay" name="prediff" > + <RegExpr String="&preendregex;" attribute="prediff" context="#pop" endRegion="prediff"/> + <RegExpr attribute="difflineremove" String="&difflineremoveregex;" /> + <RegExpr attribute="difflineadd" String="&difflineaddregex;" /> + <RegExpr attribute="diffheader1" String="&diffheader1regex;" /> + <RegExpr attribute="diffheader2" String="&diffheader2regex;" /> + <RegExpr attribute="diffheaderdiff" String="&diffheaderdiffregex;" /> + </context> + + <context attribute="code" lineEndContext="#stay" name="pre" > + <RegExpr String="&preendregex;" attribute="code" context="#pop" endRegion="pre"/> + </context> + + <context attribute="code" lineEndContext="#stay" name="pretilde" > + <RegExpr String="&pretildeendregex;" attribute="code" context="#pop" endRegion="pretilde"/> + </context> + + <context attribute="common" name="inc" lineEndContext="#stay" > + <RegExpr context="comment" String="<!--" beginRegion="comment" /> + <RegExpr context="prediff" String="&prediffregex;" beginRegion="prediff" /> + <RegExpr attribute="code" minimal="true" String="&presingleline;"/> + <RegExpr attribute="code" context="pre" String="&preregex;" beginRegion="pre" /> + <RegExpr attribute="code" context="pretilde" String="&pretilderegex;" beginRegion="pretilde" /> + <RegExpr attribute="code" String="``.*``" /> + <RegExpr attribute="code" String="`[^`]*`" /> + <RegExpr attribute="reflink" String="&reflinkregex;" /> + <RegExpr attribute="footnote" String="&footnoteregex;" /> + <RegExpr attribute="idlink" String="&idlinkregex;"/> + <RegExpr attribute="inlinelink" String="&inlinelinkregex;"/> + <RegExpr attribute="reflinktarget" String="&reflinktargetregex;"/> + <RegExpr attribute="inlineimage" String="&inlineimageregex;"/> + <RegExpr attribute="refimage" String="&refimageregex;"/> + <RegExpr attribute="autolink" String="&autolinkregex;"/> + <RegExpr attribute="mailtolink" String="&mailtolinkregex;"/> + <RegExpr attribute="strikeout" minimal="true" String="&strikeoutregex;"/> + <RegExpr attribute="linebreak" minimal="true" String="&linebreakregex;"/> + </context> + </contexts> + + <itemDatas> + <itemData name="Normal Text" defStyleNum="dsNormal" /> + <itemData name="common" defStyleNum="dsNormal" /> + <itemData name="emphasis" defStyleNum="dsNormal" italic="true" /> + <itemData name="strong" defStyleNum="dsNormal" bold="true" /> + <itemData name="diffheader1" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" bold="true" /> + <itemData name="diffheader2" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" /> + <itemData name="diffheaderdiff" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#000000" bold="true" /> + <itemData name="difflineremove" defStyleNum="dsString" backgroundColor="#ffeef0" /> + <itemData name="difflineadd" defStyleNum="dsOthers" backgroundColor="#e6ffed" /> + <itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/> + <itemData name="ruler" defStyleNum="dsNormal" color="#e200e2" bold="true" /> + <itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" backgroundColor="#fafaaf" /> + <itemData name="linebreak" defStyleNum="dsNormal" backgroundColor="#F8E0FF" /> + <itemData name="h1" defStyleNum="dsFunction" bold="true" /> + <itemData name="h2" defStyleNum="dsFunction" bold="true" /> + <itemData name="h3" defStyleNum="dsFunction" bold="true" /> + <itemData name="h4" defStyleNum="dsFunction" bold="true" /> + <itemData name="h5" defStyleNum="dsFunction" bold="true" /> + <itemData name="h6" defStyleNum="dsFunction" bold="true" /> + <itemData name="blockquote" defStyleNum="dsNormal" color="black" /> + <itemData name="bq-emphasis" defStyleNum="dsNormal" color="black" italic="true" /> + <itemData name="bq-strong" defStyleNum="dsNormal" color="black" bold="true" /> + <itemData name="bq-strongemphasis" defStyleNum="dsNormal" color="black" italic="true" bold="true" /> + <itemData name="bullet" defStyleNum="dsNormal" color="#b700b7" /> + <itemData name="bl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" /> + <itemData name="bl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" /> + <itemData name="bl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" /> + <itemData name="numlist" defStyleNum="dsNormal" color="#b700b7" /> + <itemData name="nl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" /> + <itemData name="nl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" /> + <itemData name="nl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" /> + <itemData name="comment" defStyleNum="dsComment" /> + <itemData name="pre" defStyleNum="dsNormal" backgroundColor="#eeeeee" /> + <itemData name="prediff" defStyleNum="dsNormal" backgroundColor="#eeeeee" /> + <itemData name="code" defStyleNum="dsNormal" color="darkcyan" backgroundColor="#eeeeee" /> + <itemData name="reflink" defStyleNum="dsOthers" color="blue" /> + <itemData name="idlink" defStyleNum="dsOthers" color="blue" italic="true" /> + <itemData name="inlinelink" defStyleNum="dsOthers" color="blue" /> + <itemData name="autolink" defStyleNum="dsOthers" underline="true" /> + <itemData name="mailtolink" defStyleNum="dsOthers" underline="true" /> + <itemData name="footnote" defStyleNum="dsOthers" italic="true" /> + <itemData name="meta" defStyleNum="dsComment" /> + <itemData name="reflinktarget" defStyleNum="dsOthers" /> + <itemData name="inlineimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" /> + <itemData name="refimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" /> + </itemDatas> + </highlighting> + + <general> + <comments> + <comment name="multiLine" start="<!--" end="-->" region="comment" /> + </comments> + </general> + +</language> diff --git a/kate/data/mel.xml b/kate/data/mel.xml index 8806852cd..90166889f 100644 --- a/kate/data/mel.xml +++ b/kate/data/mel.xml @@ -1376,5 +1376,3 @@ with this program; if not, write to the Free Software Foundation, Inc., </comments> </general> </language> - -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/modelines.xml b/kate/data/modelines.xml index a7566f330..c5f2061a6 100644 --- a/kate/data/modelines.xml +++ b/kate/data/modelines.xml @@ -188,4 +188,3 @@ </general> </language> -<!-- kate: indent-width 2; --> diff --git a/kate/data/nasm.xml b/kate/data/nasm.xml index ba50d5008..e218543a8 100644 --- a/kate/data/nasm.xml +++ b/kate/data/nasm.xml @@ -890,4 +890,3 @@ with this program; if not, write to the Free Software Foundation, Inc., </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/nesc.xml b/kate/data/nesc.xml index 5a5d0db54..688281bde 100644 --- a/kate/data/nesc.xml +++ b/kate/data/nesc.xml @@ -172,7 +172,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> </itemDatas> </highlighting> <general> diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml index a49ed574f..a07940916 100644 --- a/kate/data/objectivec.xml +++ b/kate/data/objectivec.xml @@ -79,8 +79,8 @@ <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_UNUSED </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <item> TRUE </item> <item> FALSE </item> <item> TQ_ARG </item> @@ -121,13 +121,8 @@ <item> TQ_SCRIPTABLE </item> <item> TQ_SETS </item> <item> TQ_SIGNAL </item> - <item> TQ_SIGNALS </item> <item> TQ_SLOT </item> - <item> TQ_SLOTS </item> <item> TQ_UNUSED </item> - <item> TQT_SIGNAL </item> - <item> TQT_SLOT </item> - <item> TQT_TQOBJECT </item> <item> connect </item> <item> disconnect </item> <item> emit </item> @@ -230,7 +225,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> </itemDatas> </highlighting> <general> diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml index 8be78b2d4..bfe4298d4 100644 --- a/kate/data/objectivecpp.xml +++ b/kate/data/objectivecpp.xml @@ -124,8 +124,8 @@ <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_UNUSED </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <item> TRUE </item> <item> FALSE </item> <item> TQ_ARG </item> @@ -166,13 +166,8 @@ <item> TQ_SCRIPTABLE </item> <item> TQ_SETS </item> <item> TQ_SIGNAL </item> - <item> TQ_SIGNALS </item> <item> TQ_SLOT </item> - <item> TQ_SLOTS </item> <item> TQ_UNUSED </item> - <item> TQT_SIGNAL </item> - <item> TQT_SLOT </item> - <item> TQT_TQOBJECT </item> <item> connect </item> <item> disconnect </item> <item> emit </item> diff --git a/kate/data/ocaml.xml b/kate/data/ocaml.xml index 4d47d7b04..bf2c4ef06 100644 --- a/kate/data/ocaml.xml +++ b/kate/data/ocaml.xml @@ -621,4 +621,3 @@ </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/ocamllex.xml b/kate/data/ocamllex.xml index 14b5837b9..666253bd5 100644 --- a/kate/data/ocamllex.xml +++ b/kate/data/ocamllex.xml @@ -78,4 +78,3 @@ </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/ocamlyacc.xml b/kate/data/ocamlyacc.xml index 6d4d7ba6c..540b38fe3 100644 --- a/kate/data/ocamlyacc.xml +++ b/kate/data/ocamlyacc.xml @@ -157,4 +157,3 @@ </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/octave.xml b/kate/data/octave.xml index 6e504b329..3158364d3 100644 --- a/kate/data/octave.xml +++ b/kate/data/octave.xml @@ -2216,4 +2216,3 @@ </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/opencl.xml b/kate/data/opencl.xml index 5c5cc7c5c..c4e2b3d39 100644 --- a/kate/data/opencl.xml +++ b/kate/data/opencl.xml @@ -241,7 +241,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> diff --git a/kate/data/perl.xml b/kate/data/perl.xml index 59f46d436..d5ac3f8a5 100644 --- a/kate/data/perl.xml +++ b/kate/data/perl.xml @@ -875,4 +875,3 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/php.xml b/kate/data/php.xml index 3abd5e26d..fc963a30a 100644 --- a/kate/data/php.xml +++ b/kate/data/php.xml @@ -5542,27 +5542,27 @@ Changes: <DetectChar attribute="String" context="#pop" char="'" /> </context> <context name="htmlheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true"> - <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" /> + <RegExpr attribute="Backslash Code" context="#pop" String="^[\s]*%1;?$" dynamic="true" endRegion="Heredoc" /> <IncludeRules context="commonheredoc" /> <IncludeRules context="##HTML" /> </context> <context name="cssheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true"> - <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" /> + <RegExpr attribute="Backslash Code" context="#pop" String="^[\s]*%1;?$" dynamic="true" endRegion="Heredoc" /> <IncludeRules context="commonheredoc" /> <IncludeRules context="##CSS" /> </context> <context name="mysqlheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true"> - <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" /> + <RegExpr attribute="Backslash Code" context="#pop" String="^[\s]*%1;?$" dynamic="true" endRegion="Heredoc" /> <IncludeRules context="commonheredoc" /> <IncludeRules context="##SQL (MySQL)" /> </context> <context name="javascriptheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true"> - <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" /> + <RegExpr attribute="Backslash Code" context="#pop" String="^[\s]*%1;?$" dynamic="true" endRegion="Heredoc" /> <IncludeRules context="commonheredoc" /> <IncludeRules context="Normal##JavaScript" /> </context> <context name="heredoc" attribute="String" lineEndContext="#stay" dynamic="true"> - <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" /> + <RegExpr attribute="Backslash Code" context="#pop" String="^[\s]*%1;?$" dynamic="true" endRegion="Heredoc" /> <IncludeRules context="commonheredoc" /> </context> <context name="commonheredoc" attribute="String" lineEndContext="#stay"> diff --git a/kate/data/picsrc.xml b/kate/data/picsrc.xml index a60c89017..d51b17c88 100644 --- a/kate/data/picsrc.xml +++ b/kate/data/picsrc.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> -<!-- kate: space-indent on; indent-width 2; --> <!-- Microchip PIC assembler syntaxfile for gpasm/mpasm assembler by * Original author: Alain GIBAUD (alain.gibaud@univ-valenciennes.fr) diff --git a/kate/data/purebasic.xml b/kate/data/purebasic.xml index 1e390711e..bd41c0c71 100644 --- a/kate/data/purebasic.xml +++ b/kate/data/purebasic.xml @@ -1763,4 +1763,3 @@ </comments> </general> </language> -<!-- // kate: space-indent on; indent-width 3; replace-tabs on; --> diff --git a/kate/data/python.xml b/kate/data/python.xml index e77aa8c03..ef6d0efe8 100644 --- a/kate/data/python.xml +++ b/kate/data/python.xml @@ -599,5 +599,3 @@ <keywords casesensitive="1" additionalDeliminator="#'"/> </general> </language> - -<!-- kate: space-indent off; indent-width 4; --> diff --git a/kate/data/qmake.xml b/kate/data/qmake.xml index 821213a14..9521c0795 100644 --- a/kate/data/qmake.xml +++ b/kate/data/qmake.xml @@ -124,4 +124,3 @@ </general> </language> -<!-- kate: indent-width 2; --> diff --git a/kate/data/qml.xml b/kate/data/qml.xml index 303684d2f..99a9426bc 100644 --- a/kate/data/qml.xml +++ b/kate/data/qml.xml @@ -148,5 +148,3 @@ <keywords casesensitive="1" /> </general> </language> - -<!-- kate: tab-width 2; replace-tabs on; indent-width 2; -->
\ No newline at end of file diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml index 6ce265e35..d1e4ed488 100644 --- a/kate/data/qt4.xml +++ b/kate/data/qt4.xml @@ -34,8 +34,8 @@ <item> slots </item> <item> foreach </item> <item> forever </item> - <item> SIGNAL </item> - <item> SLOT </item> + <item> Q_SIGNAL </item> + <item> Q_SLOT </item> <!-- http://qt-project.org/doc/qt-4.8/QApplication.html#macros --> <item> qApp </item> <!-- http://qt-project.org/doc/qt-4.8/qcoreapplication.html#macros --> @@ -1609,4 +1609,3 @@ </general> </language> -<!-- kate: indent-width 2; tab-width 2; --> diff --git a/kate/data/replicode.xml b/kate/data/replicode.xml index 189a0ffc3..b6888f422 100644 --- a/kate/data/replicode.xml +++ b/kate/data/replicode.xml @@ -193,4 +193,3 @@ the Free Software Foundation; either version 2 of the License, or <keywords casesensitive="1" weakDeliminator="|." /> </general> </language> -<!-- kate: space-indent on; indent-width 4; replace-tabs on; indent-mode xml; --> diff --git a/kate/data/rpmspec.xml b/kate/data/rpmspec.xml index 3ae4eb9d5..ef503330b 100644 --- a/kate/data/rpmspec.xml +++ b/kate/data/rpmspec.xml @@ -2,8 +2,8 @@ <!DOCTYPE language SYSTEM "language.dtd" [ <!ENTITY a_valid_char_in_macro_names "A-Za-z0-9_"> <!ENTITY command_section_name "(prep|build|pre|preun|install|post|postun|clean|files|trigger|triggerin|triggerun|triggerpostun|verifyscript|check|pretrans|posttrans)"> - <!ENTITY arch "(aarch64|alpha|alphaev5|alphaev56|alphaev6|alphaev67|alphapca56|amd64|armv3l|armv4b|armv4l|armv4tl|armv5b|armv5l|armv5teb|armv5tejl|armv5tel|armv6l|armv7l|atariclone|atarist|atariste|ataritt|athlon|axp|em64t|falcon|fat|geode|hades|hppa|hppa1\.0|hppa1\.1|hppa1\.2|hppa2\.0|hppa64|i370|i386|i486|i586|i686|ia32e|ia64|IP|m68k|m68kmint|milan|mips|mipsel|noarch|osfmach3_i386|osfmach3_i486|osfmach3_i586|osfmach3_i686|osfmach3_ppc|parisc|pentium3|pentium4|powerpc|powerpc64|powerppc|ppc|ppc32dy4|ppc64|ppc64le|ppc64iseries|ppc64pseries|ppc8260|ppc8560|ppciseries|ppcpseries|rs6000|s390|s390x|sgi|sh|sh3|sh4|sh4a|sparc|sparc64|sparc64v|sparcv8|sparcv9|sparcv9v|sun4|sun4c|sun4d|sun4m|sun4u|x86_64|xtensa)"> - <!ENTITY os "(AIX|AmigaOS|BSD_OS|bsdi|bsdi4\.0|cygwin32|CYGWIN32_95|CYGWIN32_NT|Darwin|darwin|Darwin|FreeBSD|FreeMiNT|HP-UX|hpux10|hpux10\.00|hpux10\.01|hpux10\.10|hpux10\.20|hpux10\.30|hpux11\.00|hpux9\.04|hpux9\.05|hpux9\.07|IRIX|Irix|IRIX|IRIX64|Irix64|IRIX64|Linux|Linux\/390|Linux\/ESA|machten|MacOSX|macosx|MacOSX|MiNT|mint|MiNT|mint|MiNT|mint|MP_RAS|ncr-sysv4\.2|ncr-sysv4\.3|NEXTSTEP|NextStep|OS\/390|OSF1|osf1|osf3\.2|osf4\.0|SCO_SV|SCO_SV3\.2v5\.0\.2|solaris|solaris2\.3|solaris2\.4|solaris2\.5|solaris2\.6|solaris2\.7|SunOS|SunOS4|SunOS5|TOS|UNIX_SV|VM\/ESA)"> + <!ENTITY arch "(aarch64|alpha|alphaev5|alphaev56|alphaev6|alphaev67|alphapca56|amd64|armv3l|armv4b|armv4l|armv4tl|armv5b|armv5l|armv5teb|armv5tejl|armv5tel|armv6l|armv7l|atariclone|atarist|atariste|ataritt|athlon|axp|em64t|falcon|fat|geode|hades|hppa|hppa1\.0|hppa1\.1|hppa1\.2|hppa2\.0|hppa64|i370|i386|i486|i586|i686|ia32e|ia64|IP|m68k|m68kmint|milan|mips|mipsel|noarch|parisc|pentium3|pentium4|powerpc|powerpc64|powerppc|ppc|ppc32dy4|ppc64|ppc64le|ppc64iseries|ppc64pseries|ppc8260|ppc8560|ppciseries|ppcpseries|rs6000|s390|s390x|sgi|sh|sh3|sh4|sh4a|sparc|sparc64|sparc64v|sparcv8|sparcv9|sparcv9v|sun4|sun4c|sun4d|sun4m|sun4u|x86_64|xtensa)"> + <!ENTITY os "(AIX|AmigaOS|BSD_OS|bsdi|bsdi4\.0|cygwin32|CYGWIN32_95|CYGWIN32_NT|Darwin|darwin|Darwin|FreeBSD|FreeMiNT|HP-UX|hpux10|hpux10\.00|hpux10\.01|hpux10\.10|hpux10\.20|hpux10\.30|hpux11\.00|hpux9\.04|hpux9\.05|hpux9\.07|IRIX|Irix|IRIX|IRIX64|Irix64|IRIX64|Linux|Linux\/390|Linux\/ESA|machten|MacOSX|macosx|MacOSX|MiNT|mint|MiNT|mint|MiNT|mint|MP_RAS|ncr-sysv4\.2|ncr-sysv4\.3|NEXTSTEP|NextStep|OS\/390|SCO_SV|SCO_SV3\.2v5\.0\.2|solaris|solaris2\.3|solaris2\.4|solaris2\.5|solaris2\.6|solaris2\.7|SunOS|SunOS4|SunOS5|TOS|UNIX_SV|VM\/ESA)"> <!ENTITY arch_conditionals_names "(ifarch|ifnarch)"> <!ENTITY os_conditionals_names "(ifos|ifnos)"> <!ENTITY lookahead_whitespace_eol "(?=($| |\t))"> diff --git a/kate/data/rust.xml b/kate/data/rust.xml index 10bf247b0..0dd82f86c 100644 --- a/kate/data/rust.xml +++ b/kate/data/rust.xml @@ -34,7 +34,7 @@ <!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*"> <!ENTITY rustIntSuf "([iu](8|16|32|64)?)?"> ]> -<language name="Rust" version="1.0" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/rust" priority="15"> +<language name="Rust" version="1.1" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/rust" priority="15"> <highlighting> <list name="fn"> <item> fn </item> @@ -323,10 +323,14 @@ <RegExpr String="U[0-9a-fA-F]{8}" attribute="CharEscape" context="#pop"/> <RegExpr String="." attribute="Error" context="#pop"/> </context> - <context attribute="Comment" lineEndContext="#pop" name="Commentar 1"/> + <context attribute="Comment" lineEndContext="#pop" name="Commentar 1"> + <LineContinue attribute="Comment" context="#stay"/> + <IncludeRules context="##Alerts" /> + </context> <context attribute="Comment" lineEndContext="#stay" name="Commentar 2"> <DetectSpaces/> <Detect2Chars char="*" char1="/" attribute="Comment" context="#pop" endRegion="Comment"/> + <IncludeRules context="##Alerts" /> </context> </contexts> <itemDatas> @@ -348,6 +352,7 @@ <itemData name="Macro" defStyleNum="dsOthers"/> <itemData name="Attribute" defStyleNum="dsOthers"/> <itemData name="Lifetime" defStyleNum="dsOthers" bold="1"/> + <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError"/> </itemDatas> </highlighting> diff --git a/kate/data/sql.xml b/kate/data/sql.xml index c7b733531..6b023e80e 100644 --- a/kate/data/sql.xml +++ b/kate/data/sql.xml @@ -4,7 +4,6 @@ <!-- This file is maintained by Anders Lund <anders@alweb.dk> since 2005-11-06 v3 fix comments by Gene Thomas <gene@genethomas.com> --> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> <language name="SQL" version="4" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL"> <highlighting> <list name="keywords"> diff --git a/kate/data/syntax.template b/kate/data/syntax.template index 92996644b..06121ba3c 100644 --- a/kate/data/syntax.template +++ b/kate/data/syntax.template @@ -19,6 +19,3 @@ </itemDatas> </highlighting> </language> -<!-- -// kate: space-indent on; indent-width 2; replace-tabs on; ---> diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml index c4cf021de..e57c63ada 100644 --- a/kate/data/update-files.xml +++ b/kate/data/update-files.xml @@ -52,7 +52,7 @@ <Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="6"/> <Definition name="Debian Control" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debiancontrol.xml" version="0.84"/> <Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="2-1"/> -<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.12"/> +<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.13"/> <Definition name="Django HTML Template" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/djangotemplate.xml" version="3"/> <Definition name="Dockerfile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dockerfile.xml" version="1.1"/> <Definition name="MS-DOS Batch" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dosbat.xml" version="0.30"/> @@ -136,6 +136,7 @@ <Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.1"/> <Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/> <Definition name="Troff Mandoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mandoc.xml" version="2"/> +<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.4"/> <Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="4"/> <Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.1"/> <Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="2-2"/> @@ -204,7 +205,7 @@ <Definition name="RSI IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rsiidl.xml" version="3"/> <Definition name="Rich Text Format" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rtf.xml" version="2"/> <Definition name="Ruby" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ruby.xml" version="1.27"/> -<Definition name="Rust" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rust.xml" version="1.0"/> +<Definition name="Rust" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rust.xml" version="1.1"/> <Definition name="R Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/r.xml" version="3-1"/> <Definition name="Sather" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sather.xml" version="2"/> <Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="6"/> diff --git a/kate/data/varnish.xml b/kate/data/varnish.xml index 7f4576356..bebb75a25 100644 --- a/kate/data/varnish.xml +++ b/kate/data/varnish.xml @@ -346,4 +346,3 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/varnishtest.xml b/kate/data/varnishtest.xml index 2fcd7c3e4..33a0c77f6 100644 --- a/kate/data/varnishtest.xml +++ b/kate/data/varnishtest.xml @@ -479,4 +479,3 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/winehq.xml b/kate/data/winehq.xml index 112f67d90..129fe8467 100644 --- a/kate/data/winehq.xml +++ b/kate/data/winehq.xml @@ -31,4 +31,3 @@ </itemDatas> </highlighting> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/yacas.xml b/kate/data/yacas.xml index 12dd07879..f80c98bec 100644 --- a/kate/data/yacas.xml +++ b/kate/data/yacas.xml @@ -233,4 +233,3 @@ <keywords casesensitive="1" weakDeliminator="=`"/> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/data/yacc.xml b/kate/data/yacc.xml index e5e90d260..13fbb5145 100644 --- a/kate/data/yacc.xml +++ b/kate/data/yacc.xml @@ -261,4 +261,3 @@ This code is released under the LGPL as part of tdelibs/kate. </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h index 381e32fa2..c30a6d320 100644 --- a/kate/interfaces/document.h +++ b/kate/interfaces/document.h @@ -61,7 +61,7 @@ class KATEPARTINTERFACES_EXPORT Cursor : public KTextEditor::Cursor class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage { - Q_OBJECT + TQ_OBJECT public: ConfigPage ( TQWidget *parent=0, const char *name=0 ) : KTextEditor::ConfigPage (parent, name) { ; }; @@ -79,7 +79,7 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 ) @@ -188,7 +188,7 @@ class KATEPARTINTERFACES_EXPORT Document : public KTextEditor::Document, public public KTextEditor::MarkInterfaceExtension, public KTextEditor::SelectionInterfaceExt { - Q_OBJECT + TQ_OBJECT public: Document (); diff --git a/kate/interfaces/interfaces.cpp b/kate/interfaces/interfaces.cpp index 9cbb58977..902459c24 100644 --- a/kate/interfaces/interfaces.cpp +++ b/kate/interfaces/interfaces.cpp @@ -100,7 +100,7 @@ Document *document (KTextEditor::Document *doc) if (!doc) return 0; - return ::tqqt_cast<Kate::Document*>(doc); + return ::tqt_cast<Kate::Document*>(doc); } DocumentExt *documentExt (KTextEditor::Document *doc) @@ -121,7 +121,7 @@ View *view (KTextEditor::View *view) if (!view) return 0; - return ::tqqt_cast<Kate::View*>(view); + return ::tqt_cast<Kate::View*>(view); } } diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h index 3b2b8a4e1..fcaf43110 100644 --- a/kate/interfaces/view.h +++ b/kate/interfaces/view.h @@ -43,7 +43,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi public KTextEditor::PopupMenuInterface, public KTextEditor::ViewCursorInterface, public KTextEditor::CodeCompletionInterface, public KTextEditor::DynWordWrapInterface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index dcbc0eecd..c363fdb35 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -59,7 +59,6 @@ tde_add_lut( katejscript.cpp katejscript.lut.h katejscript.cpp ) tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} - DEPENDENCIES dcopidl ) @@ -67,7 +66,7 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC set( target libkatepart ) -configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) tde_add_kpart( ${target} SOURCES dummy.cpp diff --git a/kate/part/katearbitraryhighlight.cpp b/kate/part/katearbitraryhighlight.cpp index a9a4fe37c..1f526b7af 100644 --- a/kate/part/katearbitraryhighlight.cpp +++ b/kate/part/katearbitraryhighlight.cpp @@ -73,8 +73,8 @@ KateAttribute KateArbitraryHighlightRange::merge(TQPtrList<KateSuperRange> range void KateArbitraryHighlight::addHighlightToDocument(KateSuperRangeList* list) { m_docHLs.append(list); - connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotRangeEliminated(KateSuperRange*))); - connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*))); + connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotRangeEliminated(KateSuperRange*))); + connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*))); } void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateView* view) @@ -84,9 +84,9 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi m_viewHLs[view]->append(list); - connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*))); - connect(list, TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*))); - connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*))); + connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*))); + connect(list, TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*))); + connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*))); } void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) { @@ -158,5 +158,3 @@ KateView* KateArbitraryHighlight::viewForRange(KateSuperRange* range) // This must belong to a document-global highlight return 0L; } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h index 10086ec7f..222c82c2e 100644 --- a/kate/part/katearbitraryhighlight.h +++ b/kate/part/katearbitraryhighlight.h @@ -31,7 +31,7 @@ class KateView; class KateArbitraryHighlightRange : public KateSuperRange, public KateAttribute { - Q_OBJECT + TQ_OBJECT public: KateArbitraryHighlightRange(KateSuperCursor* start, KateSuperCursor* end, TQObject* parent = 0L, const char* name = 0L); @@ -59,7 +59,7 @@ public: */ class KateArbitraryHighlight : public TQObject { - Q_OBJECT + TQ_OBJECT public: KateArbitraryHighlight(KateDocument* parent = 0L, const char* name = 0L); @@ -83,5 +83,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateattribute.cpp b/kate/part/kateattribute.cpp index 9ed6349f6..246ed0b0d 100644 --- a/kate/part/kateattribute.cpp +++ b/kate/part/kateattribute.cpp @@ -264,5 +264,3 @@ bool operator !=(const KateAttribute& h1, const KateAttribute& h2) { return !(h1 == h2); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateattribute.h b/kate/part/kateattribute.h index a54279b24..e4e816034 100644 --- a/kate/part/kateattribute.h +++ b/kate/part/kateattribute.h @@ -143,5 +143,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index 9bbe317df..f4a9df273 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -161,7 +161,7 @@ KateAutoIndent::~KateAutoIndent () KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name) : TDEActionMenu (text, parent, name), doc(_doc) { - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewIndentationAction::slotAboutToShow() @@ -170,7 +170,7 @@ void KateViewIndentationAction::slotAboutToShow() popupMenu()->clear (); for (uint z=0; z<modes.size(); ++z) - popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQT_SLOT(setMode(int)), 0, z); + popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQ_SLOT(setMode(int)), 0, z); popupMenu()->setItemChecked (doc->config()->indentationMode(), true); } @@ -187,7 +187,7 @@ KateNormalIndent::KateNormalIndent (KateDocument *_doc) : KateAutoIndent (_doc) { // if highlighting changes, update attributes - connect(_doc, TQT_SIGNAL(hlChanged()), this, TQT_SLOT(updateConfig())); + connect(_doc, TQ_SIGNAL(hlChanged()), this, TQ_SLOT(updateConfig())); } KateNormalIndent::~KateNormalIndent () @@ -479,8 +479,6 @@ void KateCSmartIndent::processLine (KateDocCursor &line) textLine->stringAtPos (firstChar, "private") || textLine->stringAtPos (firstChar, "protected") || textLine->stringAtPos (firstChar, "signals") || - textLine->stringAtPos (firstChar, "Q_SIGNALS") || - textLine->stringAtPos (firstChar, "Q_SLOTS") || textLine->stringAtPos (firstChar, "slots")) { indent = findOpeningBrace(line) + indentWidth; @@ -859,12 +857,8 @@ uint KateCSmartIndent::calcIndent(KateDocCursor &begin, bool needContinue) ch = textLine->getChar(specialIndent + 9); else if (textLine->stringAtPos(specialIndent, "signals")) ch = textLine->getChar(specialIndent + 7); - else if (textLine->stringAtPos(specialIndent, "Q_SIGNALS")) - ch = textLine->getChar(specialIndent + 9); else if (textLine->stringAtPos(specialIndent, "slots")) ch = textLine->getChar(specialIndent + 5); - else if (textLine->stringAtPos(specialIndent, "Q_SLOTS")) - ch = textLine->getChar(specialIndent + 7); if (ch.isNull() || (!ch.isSpace() && ch != '(' && ch != ':')) continue; @@ -2174,8 +2168,8 @@ KateVarIndent::KateVarIndent( KateDocument *doc ) slotVariableChanged( "var-indent-handle-couples", doc->variable( "var-indent-handle-couples" ) ); // update if a setting is changed - connect( doc, TQT_SIGNAL(variableChanged( const TQString&, const TQString&) ), - this, TQT_SLOT(slotVariableChanged( const TQString&, const TQString& )) ); + connect( doc, TQ_SIGNAL(variableChanged( const TQString&, const TQString&) ), + this, TQ_SLOT(slotVariableChanged( const TQString&, const TQString& )) ); } KateVarIndent::~KateVarIndent() @@ -2539,5 +2533,3 @@ void ScriptIndentConfigPage::apply () kdDebug(13030) << "ScriptIndentConfigPagE::apply() was called, save config options now!" << endl; } //END ScriptIndentConfigPage - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h index abdab7777..c14f16ce3 100644 --- a/kate/part/kateautoindent.h +++ b/kate/part/kateautoindent.h @@ -43,7 +43,7 @@ class KateDocument; */ class IndenterConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -56,7 +56,7 @@ class IndenterConfigPage : public TQWidget public slots: /** - * Apply the changes. Save options here, use @p kapp->config() and + * Apply the changes. Save options here, use @p tdeApp->config() and * group [Kate Indenter MyIndenter]. */ virtual void apply () = 0; @@ -69,7 +69,7 @@ class IndenterConfigPage : public TQWidget */ class KateAutoIndent : public TQObject { - Q_OBJECT + TQ_OBJECT /** * Static methods to create and list indention modes @@ -194,7 +194,7 @@ class KateAutoIndent : public TQObject */ class KateViewIndentationAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent = 0, const char* name = 0); @@ -216,7 +216,7 @@ class KateViewIndentationAction : public TDEActionMenu */ class KateNormalIndent : public KateAutoIndent { - Q_OBJECT + TQ_OBJECT public: /** @@ -347,7 +347,7 @@ protected: class KateCSmartIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateCSmartIndent (KateDocument *doc); @@ -378,7 +378,7 @@ class KateCSmartIndent : public KateNormalIndent class KatePythonIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KatePythonIndent (KateDocument *doc); @@ -399,7 +399,7 @@ class KatePythonIndent : public KateNormalIndent class KateXmlIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateXmlIndent (KateDocument *doc); @@ -428,7 +428,7 @@ class KateXmlIndent : public KateNormalIndent class KateCSAndSIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateCSAndSIndent (KateDocument *doc); @@ -491,7 +491,7 @@ class KateCSAndSIndent : public KateNormalIndent */ class KateVarIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: /** @@ -542,7 +542,7 @@ class KateVarIndent : public KateNormalIndent class KateScriptIndent : public KateNormalIndent { - Q_OBJECT + TQ_OBJECT public: KateScriptIndent( KateDocument *doc ); @@ -563,7 +563,7 @@ class KateScriptIndent : public KateNormalIndent class ScriptIndentConfigPage : public IndenterConfigPage { - Q_OBJECT + TQ_OBJECT public: ScriptIndentConfigPage ( TQWidget *parent=0, const char *name=0 ); @@ -577,5 +577,3 @@ class ScriptIndentConfigPage : public IndenterConfigPage }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index 2003b380e..25f00d71b 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -62,7 +62,7 @@ KateBookmarks::KateBookmarks( KateView* view, Sorting sort ) , m_view( view ) , m_sorting( sort ) { - connect (view->getDoc(), TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged())); + connect (view->getDoc(), TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged())); _tries=0; m_bookmarksMenu = 0L; } @@ -75,26 +75,26 @@ void KateBookmarks::createActions( TDEActionCollection* ac ) { m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, TQT_SLOT(toggleBookmark()), + this, TQ_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, - this, TQT_SLOT(clearBookmarks()), + this, TQ_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new TDEAction( i18n("Next Bookmark"), "go-next", ALT + Key_PageDown, - this, TQT_SLOT(goNext()), + this, TQ_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp, - this, TQT_SLOT(goPrevious()), + this, TQ_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); @@ -102,14 +102,14 @@ void KateBookmarks::createActions( TDEActionCollection* ac ) //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); bookmarkMenuAboutToHide(); - connect( m_view, TQT_SIGNAL( gotFocus( Kate::View * ) ), this, TQT_SLOT( slotViewGotFocus( Kate::View * ) ) ); - connect( m_view, TQT_SIGNAL( lostFocus( Kate::View * ) ), this, TQT_SLOT( slotViewLostFocus( Kate::View * ) ) ); + connect( m_view, TQ_SIGNAL( gotFocus( Kate::View * ) ), this, TQ_SLOT( slotViewGotFocus( Kate::View * ) ) ); + connect( m_view, TQ_SIGNAL( lostFocus( Kate::View * ) ), this, TQ_SLOT( slotViewLostFocus( Kate::View * ) ) ); } void KateBookmarks::toggleBookmark () @@ -181,7 +181,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu ) menu.insertItem( TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), - m_view, TQT_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx ); + m_view, TQ_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx ); if ( (*it)->line < line ) { @@ -283,5 +283,3 @@ void KateBookmarks::marksChanged () { m_bookmarkClear->setEnabled( !m_view->getDoc()->marks().isEmpty() ); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h index ae4151812..05215b66a 100644 --- a/kate/part/katebookmarks.h +++ b/kate/part/katebookmarks.h @@ -37,7 +37,7 @@ class TQMenuData; class KateBookmarks : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Sorting { Position, Creation }; @@ -81,6 +81,3 @@ class KateBookmarks : public TQObject }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; -// vim: noet ts=2 diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 66c21696b..bb11afd0e 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -1656,5 +1656,3 @@ void KateBufBlockList::removeInternal (KateBufBlock *buf) } //END KateBufBlockList - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h index 04ee264e8..96765ceba 100644 --- a/kate/part/katebuffer.h +++ b/kate/part/katebuffer.h @@ -340,7 +340,7 @@ class KateBufBlockList */ class KateBuffer : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KateBufBlock; @@ -705,5 +705,3 @@ class KateBuffer : public TQObject }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp index 09dd46f13..0f6cd4e53 100644 --- a/kate/part/katecmds.cpp +++ b/kate/part/katecmds.cpp @@ -110,7 +110,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view, } else if ( cmd == "run-myself" ) { -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo return KateFactory::self()->jscript()->execute(v, v->doc()->text(), errorMsg); #else return 0; @@ -601,5 +601,3 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString & return true; } //END Date - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h index d313be91d..2c53f6536 100644 --- a/kate/part/katecmds.h +++ b/kate/part/katecmds.h @@ -174,5 +174,3 @@ class Date : public Kate::Command } // namespace KateCommands #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index 4617ecb66..0a3dfe771 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -129,11 +129,11 @@ KateCodeCompletion::KateCodeCompletion( KateView* view ) m_completionPopup->setFocusProxy( m_view->m_viewInternal ); m_pArgHint = new KateArgHint( m_view ); - connect( m_pArgHint, TQT_SIGNAL(argHintHidden()), - this, TQT_SIGNAL(argHintHidden()) ); + connect( m_pArgHint, TQ_SIGNAL(argHintHidden()), + this, TQ_SIGNAL(argHintHidden()) ); - connect( m_view, TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(slotCursorPosChanged()) ); + connect( m_view, TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(slotCursorPosChanged()) ); } KateCodeCompletion::~KateCodeCompletion() @@ -163,9 +163,9 @@ void KateCodeCompletion::showCompletionBox( bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionPopup) && - TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox) && - TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox->viewport()) ) + if ( o != m_completionPopup && + o != m_completionListBox && + o != m_completionListBox->viewport() ) return false; if( e->type() == TQEvent::Hide ) @@ -185,7 +185,7 @@ bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e ) } if ( e->type() == TQEvent::MouseButtonPress ) { - TQTimer::singleShot(0, this, TQT_SLOT(showComment())); + TQTimer::singleShot(0, this, TQ_SLOT(showComment())); return false; } @@ -207,7 +207,7 @@ void KateCodeCompletion::handleKey (TQKeyEvent *e) (e->key() == Key_Home ) || (e->key() == Key_End) || (e->key() == Key_Prior) || (e->key() == Key_Next )) { - TQTimer::singleShot(0,this,TQT_SLOT(showComment())); + TQTimer::singleShot(0,this,TQ_SLOT(showComment())); TQApplication::sendEvent( m_completionListBox, (TQEvent*)e ); return; } @@ -324,7 +324,7 @@ void KateCodeCompletion::updateBox( bool ) m_completionListBox->setFocus(); m_completionPopup->show(); - TQTimer::singleShot(0,this,TQT_SLOT(showComment())); + TQTimer::singleShot(0,this,TQ_SLOT(showComment())); } void KateCodeCompletion::showArgHint ( TQStringList functionList, const TQString& strWrapping, const TQString& strDelimiter ) @@ -395,7 +395,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name ) : TQFrame( parent, name, (WFlags)WType_Popup ) { setBackgroundColor( black ); - setPaletteForegroundColor( Qt::black ); + setPaletteForegroundColor( TQt::black ); labelDict.setAutoDelete( true ); layout = new TQVBoxLayout( this, 1, 2 ); @@ -404,7 +404,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name ) m_markCurrentFunction = true; - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( parent ); reset( -1, -1 ); @@ -533,7 +533,7 @@ void KateArgHint::show() bool KateArgHint::eventFilter( TQObject*, TQEvent* e ) { if( isVisible() && e->type() == TQEvent::KeyPress ){ - TQKeyEvent* ke = TQT_TQKEYEVENT( e ); + TQKeyEvent* ke = static_cast<TQKeyEvent*>( e ); if( (ke->state() & ControlButton) && ke->key() == Key_Left ){ setCurrentFunction( currentFunction() - 1 ); ke->accept(); @@ -562,5 +562,3 @@ void KateArgHint::adjustSize( ) if( x() + width() > screen.x() + screen.width() ) move( screen.x() + screen.width() - width(), y() ); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h index 8279d396e..78c68a759 100644 --- a/kate/part/katecodecompletion.h +++ b/kate/part/katecodecompletion.h @@ -46,7 +46,7 @@ class TQVBox; class KateCodeCompletionCommentLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: KateCodeCompletionCommentLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip", @@ -66,7 +66,7 @@ class KateCodeCompletionCommentLabel : public TQLabel class KateCodeCompletion : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KateViewInternal; @@ -116,7 +116,7 @@ class KateCodeCompletion : public TQObject class KateArgHint: public TQFrame { - Q_OBJECT + TQ_OBJECT public: KateArgHint( KateView* =0, const char* =0 ); @@ -160,5 +160,3 @@ class KateArgHint: public TQFrame }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecodefoldinghelpers.cpp b/kate/part/katecodefoldinghelpers.cpp index ab571d9d0..f65c69b22 100644 --- a/kate/part/katecodefoldinghelpers.cpp +++ b/kate/part/katecodefoldinghelpers.cpp @@ -1658,5 +1658,3 @@ void KateCodeFoldingTree::ensureVisible( uint line ) } while( n ); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h index 7feee384e..21faeeb0d 100644 --- a/kate/part/katecodefoldinghelpers.h +++ b/kate/part/katecodefoldinghelpers.h @@ -117,7 +117,7 @@ class KateCodeFoldingTree : public TQObject { friend class KateCodeFoldingNode; - Q_OBJECT + TQ_OBJECT public: KateCodeFoldingTree (KateBuffer *buffer); @@ -218,5 +218,3 @@ class KateCodeFoldingTree : public TQObject }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index ed4eaacd2..981359d1a 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <kfinddialog.h> #include <kreplacedialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kstaticdeleter.h> #include <tqpopupmenu.h> @@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig () m_pluginsSet.fill (true); // init with defaults from config or really hardcoded ones - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kate Document Defaults"); readConfig (config); } @@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig () s_global = this; // init with defaults from config or really hardcoded ones - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kate View Defaults"); readConfig (config); } @@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig () s_global = this; // init with defaults from config or really hardcoded ones - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kate Renderer Defaults"); readConfig (config); } @@ -1155,13 +1155,13 @@ void KateRendererConfig::setSchemaInternal( int schema ) // same std colors like in KateDocument::markColor TQColor mark[7]; - mark[0] = Qt::blue; - mark[1] = Qt::red; - mark[2] = Qt::yellow; - mark[3] = Qt::magenta; - mark[4] = Qt::gray; - mark[5] = Qt::green; - mark[6] = Qt::red; + mark[0] = TQt::blue; + mark[1] = TQt::red; + mark[2] = TQt::yellow; + mark[3] = TQt::magenta; + mark[4] = TQt::gray; + mark[5] = TQt::green; + mark[6] = TQt::red; for (int i = 1; i <= KTextEditor::MarkInterface::reservedMarkersCount(); i++) { TQColor col = config->readColorEntry(TQString("Color MarkType%1").arg(i), &mark[i - 1]); @@ -1425,5 +1425,3 @@ void KateRendererConfig::setShowIndentationLines (bool on) } //END - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h index a698bc35d..f0ec5c62e 100644 --- a/kate/part/kateconfig.h +++ b/kate/part/kateconfig.h @@ -533,5 +533,3 @@ class KateRendererConfig : public KateConfig }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecursor.cpp b/kate/part/katecursor.cpp index dcd7c38bf..8a56daaea 100644 --- a/kate/part/katecursor.cpp +++ b/kate/part/katecursor.cpp @@ -188,5 +188,3 @@ bool KateDocCursor::previousNonSpaceChar() setPos(-1, -1); return false; } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h index 1b1a5322a..5ab41e13f 100644 --- a/kate/part/katecursor.h +++ b/kate/part/katecursor.h @@ -60,7 +60,7 @@ class KateTextCursor return stream; } -#ifndef Q_WS_WIN //not needed +#ifndef TQ_WS_WIN //not needed friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) { KateTextCursor tmp = c1; c1 = c2; @@ -246,5 +246,3 @@ class KateBracketRange : public KateTextRange #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index d5b5b91db..09111d14e 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -66,12 +66,12 @@ #include <knuminput.h> #include <tdeparts/componentfactory.h> #include <tdepopupmenu.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <kregexpeditorinterface.h> #include <krun.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tqbuttongroup.h> @@ -117,7 +117,7 @@ KateConfigPage::KateConfigPage ( TQWidget *parent, const char *name ) : Kate::ConfigPage (parent, name) , m_changed (false) { - connect (this, TQT_SIGNAL(changed()), this, TQT_SLOT(somethingHasChanged ())); + connect (this, TQ_SIGNAL(changed()), this, TQ_SLOT(somethingHasChanged ())); } KateConfigPage::~KateConfigPage () @@ -179,7 +179,7 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) opt[4] = new TQCheckBox(i18n("&Backspace key indents"), keys); TQRadioButton *rb1, *rb2, *rb3; - m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this ); + m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this ); m_tabs->setRadioButtonExclusive( true ); m_tabs->insert( rb1=new TQRadioButton( i18n("Insert indent &characters"), m_tabs ), 0 ); m_tabs->insert( rb2=new TQRadioButton( i18n("I&nsert tab character"), m_tabs ), 1 ); @@ -235,27 +235,27 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(indenterSelected(int))); + connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(indenterSelected(int))); - connect( opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(somethingToggled())); + connect( opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(somethingToggled())); - connect( opt[0], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[1], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[2], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[3], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[4], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[5], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[6], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[7], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); + connect( opt[0], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[1], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[2], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[3], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[4], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[5], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[6], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[7], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); - connect(indentationWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(indentationWidth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); - connect(m_configPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(configPage())); + connect(m_configPage, TQ_SIGNAL(clicked()), this, TQ_SLOT(configPage())); } void KateIndentConfigTab::somethingToggled() { @@ -292,7 +292,7 @@ void KateIndentConfigTab::configPage() if (!page) return; box->setStretchFactor(page, 1); - connect( &dlg, TQT_SIGNAL(okClicked()), page, TQT_SLOT(apply()) ); + connect( &dlg, TQ_SIGNAL(okClicked()), page, TQ_SLOT(apply()) ); dlg.resize(400, 300); dlg.exec(); @@ -357,26 +357,26 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) opt[0] = new TQCheckBox(i18n("Smart ho&me and smart end"), gbCursor); opt[0]->setChecked(configFlags & KateDocumentConfig::cfSmartHome); - connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); opt[1] = new TQCheckBox(i18n("Wrap c&ursor"), gbCursor); opt[1]->setChecked(configFlags & KateDocumentConfig::cfWrapCursor); - connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e6 = new TQCheckBox(i18n("&PageUp/PageDown moves cursor"), gbCursor); e6->setChecked(KateDocumentConfig::global()->pageUpDownMovesCursor()); - connect(e6, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(e6, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e4 = new KIntNumInput(KateViewConfig::global()->autoCenterLines(), gbCursor); e4->setRange(0, 1000000, 1, false); e4->setLabel(i18n("Autocenter cursor (lines):"), AlignVCenter); - connect(e4, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e4, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); layout->addWidget(gbCursor); TQRadioButton *rb1, *rb2; - m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Selection Mode"), this ); + m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Selection Mode"), this ); layout->add (m_tabs); m_tabs->setRadioButtonExclusive( true ); @@ -416,8 +416,8 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); } void KateSelectConfigTab::apply () @@ -473,16 +473,16 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) opt[3] = new TQCheckBox( i18n("&Insert spaces instead of tabulators"), gbWhiteSpace ); opt[3]->setChecked( configFlags & KateDocumentConfig::cfReplaceTabsDyn ); - connect( opt[3], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); + connect( opt[3], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); opt[2] = new TQCheckBox(i18n("&Show tabulators"), gbWhiteSpace); opt[2]->setChecked(configFlags & flags[2]); - connect(opt[2], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[2], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e2 = new KIntNumInput(KateDocumentConfig::global()->tabWidth(), gbWhiteSpace); e2->setRange(1, 16, 1, false); e2->setLabel(i18n("Tab width:"), AlignVCenter); - connect(e2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); mainLayout->addWidget(gbWhiteSpace); @@ -490,35 +490,35 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) opt[0] = new TQCheckBox(i18n("Enable static &word wrap"), gbWordWrap); opt[0]->setChecked(KateDocumentConfig::global()->wordWrap()); - connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); m_wwmarker = new TQCheckBox( i18n("&Show static word wrap marker (if applicable)"), gbWordWrap ); m_wwmarker->setChecked( KateRendererConfig::global()->wordWrapMarker() ); - connect(m_wwmarker, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(m_wwmarker, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e1 = new KIntNumInput(KateDocumentConfig::global()->wordWrapAt(), gbWordWrap); e1->setRange(20, 200, 1, false); e1->setLabel(i18n("Wrap words at:"), AlignVCenter); - connect(e1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); mainLayout->addWidget(gbWordWrap); opt[4] = new TQCheckBox( i18n("Remove &trailing spaces"), this ); mainLayout->addWidget( opt[4] ); opt[4]->setChecked( configFlags & KateDocumentConfig::cfRemoveTrailingDyn ); - connect( opt[4], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); + connect( opt[4], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); opt[1] = new TQCheckBox(i18n("Auto &brackets"), this); mainLayout->addWidget(opt[1]); opt[1]->setChecked(configFlags & flags[1]); - connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e3 = new KIntNumInput(e2, KateDocumentConfig::global()->undoSteps(), this); e3->setRange(0, 1000000, 1, false); e3->setSpecialValueText( i18n("Unlimited") ); e3->setLabel(i18n("Maximum undo steps:"), AlignVCenter); mainLayout->addWidget(e3); - connect(e3, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e3, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); TQHBoxLayout *e5Layout = new TQHBoxLayout(mainLayout); TQLabel *e5Label = new TQLabel(i18n("Smart search t&ext from:"), this); @@ -532,7 +532,7 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) e5->setCurrentItem(KateViewConfig::global()->textToSearchMode()); e5Layout->addWidget(e5); e5Label->setBuddy(e5); - connect(e5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); + connect(e5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); mainLayout->addStretch(); @@ -684,7 +684,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) blay->addWidget(gbBar); - m_bmSort = new TQButtonGroup( 1, Qt::Horizontal, i18n("Sort Bookmarks Menu"), this ); + m_bmSort = new TQButtonGroup( 1, TQt::Horizontal, i18n("Sort Bookmarks Menu"), this ); m_bmSort->setRadioButtonExclusive( true ); m_bmSort->insert( rb1=new TQRadioButton( i18n("By &position"), m_bmSort ), 0 ); m_bmSort->insert( rb2=new TQRadioButton( i18n("By c&reation"), m_bmSort ), 1 ); @@ -744,17 +744,17 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(m_dynwrap, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_dynwrapIndicatorsCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_dynwrapAlignLevel, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect(m_icons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_scrollBarMarks, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_line, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_folding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_collapseTopLevel, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_showIndentLines, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(m_dynwrap, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_dynwrapIndicatorsCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_dynwrapAlignLevel, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect(m_icons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_scrollBarMarks, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_line, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_folding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_collapseTopLevel, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_showIndentLines, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); } KateViewDefaultsConfig::~KateViewDefaultsConfig() @@ -821,7 +821,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * ) KateView* view = (KateView*)m_doc->views().at(0); m_ac = view->editActionCollection(); m_keyChooser = new KKeyChooser( m_ac, this, false ); - connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) ); + connect( m_keyChooser, TQ_SIGNAL( keyChange() ), this, TQ_SLOT( slotChanged() ) ); m_keyChooser->show (); m_ready = true; @@ -895,7 +895,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) dirSearchDepth->setSpecialValueText( i18n("Do not use config file") ); dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter); - TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Backup on Save"), this ); + TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Backup on Save"), this ); layout->addWidget( gb ); cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb ); cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb ); @@ -947,16 +947,16 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) // after initial reload, connect the stuff for the changed () signal // - connect(m_encoding, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_eol, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect( allowEolDetection, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect(blockCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect(removeSpaces, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect( cbLocalFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbRemoteFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect(dirSearchDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect( leBuPrefix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( leBuSuffix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); + connect(m_encoding, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_eol, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect( allowEolDetection, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect(blockCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect(removeSpaces, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect( cbLocalFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbRemoteFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect(dirSearchDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect( leBuPrefix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( leBuSuffix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); } void KateSaveConfigTab::apply() @@ -1130,13 +1130,13 @@ KatePartPluginConfigPage::KatePartPluginConfigPage (TQWidget *parent) : KateConf btnConfigure = new TQPushButton( i18n("Configure..."), this ); btnConfigure->setEnabled( false ); - grid->addWidget( btnConfigure, 1, 0, Qt::AlignRight ); - connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) ); + grid->addWidget( btnConfigure, 1, 0, TQt::AlignRight ); + connect( btnConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigure()) ); - connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); - connect( listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), - this, TQT_SLOT(slotStateChanged(KatePartPluginListItem *, bool))); - connect(listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQT_SLOT(slotChanged())); + connect( listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) ); + connect( listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), + this, TQ_SLOT(slotStateChanged(KatePartPluginListItem *, bool))); + connect(listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQ_SLOT(slotChanged())); } KatePartPluginConfigPage::~KatePartPluginConfigPage () @@ -1266,8 +1266,8 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); hlCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( hlCombo ); - connect( hlCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(hlChanged(int)) ); + connect( hlCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(hlChanged(int)) ); for( int i = 0; i < KateHlManager::self()->highlights(); i++) { if (KateHlManager::self()->hlSection(i).length() > 0) @@ -1276,7 +1276,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) hlCombo->insertItem(KateHlManager::self()->hlNameTranslated(i)); } - TQGroupBox *gbInfo = new TQGroupBox( 1, Qt::Horizontal, i18n("Information"), this ); + TQGroupBox *gbInfo = new TQGroupBox( 1, TQt::Horizontal, i18n("Information"), this ); layout->add (gbInfo); // author @@ -1290,7 +1290,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) new TQLabel( i18n("License:"), hb2 ); license = new TQLabel (hb2); - TQGroupBox *gbProps = new TQGroupBox( 1, Qt::Horizontal, i18n("Properties"), this ); + TQGroupBox *gbProps = new TQGroupBox( 1, TQt::Horizontal, i18n("Properties"), this ); layout->add (gbProps); // file & mime types @@ -1312,7 +1312,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) TQToolButton *btnMTW = new TQToolButton(hbMT); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); // download/new buttons TQHBox *hbBtns = new TQHBox( this ); @@ -1321,7 +1321,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) ((TQBoxLayout*)hbBtns->layout())->addStretch(1); // hmm. hbBtns->setSpacing( KDialog::spacingHint() ); TQPushButton *btnDl = new TQPushButton(i18n("Do&wnload..."), hbBtns); - connect( btnDl, TQT_SIGNAL(clicked()), this, TQT_SLOT(hlDownload()) ); + connect( btnDl, TQ_SIGNAL(clicked()), this, TQ_SLOT(hlDownload()) ); int currentHl = m_doc ? m_doc->hlMode() : 0; hlCombo->setCurrentItem( currentHl ); @@ -1347,9 +1347,9 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) layout->addStretch (); - connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); } KateHlConfigPage::~KateHlConfigPage () @@ -1453,8 +1453,8 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b actionButton (User1)->setIconSet(SmallIconSet("ok")); transferJob = TDEIO::get(KURL(TQString(HLDOWNLOADPATH)), true, true); - connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); + connect(transferJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); // void data( TDEIO::Job *, const TQByteArray &data); resize(450, 400); } @@ -1616,7 +1616,7 @@ KateModOnHdPrompt::KateModOnHdPrompt( KateDocument *doc, TQPushButton *btnDiff = new TQPushButton( i18n("&View Difference"), w ); lo2->addStretch( 1 ); lo2->addWidget( btnDiff ); - connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) ); + connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) ); TQWhatsThis::add( btnDiff, i18n( "Calculates the difference between the editor contents and the disk " "file using diff(1) and opens the diff file with the default application " @@ -1636,11 +1636,11 @@ KateModOnHdPrompt::~KateModOnHdPrompt() void KateModOnHdPrompt::slotDiff() { // Start a TDEProcess that creates a diff - KProcIO *p = new KProcIO(); + TDEProcIO *p = new TDEProcIO(); p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << m_doc->url().path(); - connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); - connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); + connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) ); + connect( p, TQ_SIGNAL(readReady(TDEProcIO*)), this, TQ_SLOT(slotPRead(TDEProcIO*)) ); setCursor( WaitCursor ); @@ -1653,7 +1653,7 @@ void KateModOnHdPrompt::slotDiff() p->closeWhenDone(); } -void KateModOnHdPrompt::slotPRead( KProcIO *p) +void KateModOnHdPrompt::slotPRead( TDEProcIO *p) { // create a file for the diff if we haven't one allready if ( ! m_tmpfile ) @@ -1731,5 +1731,3 @@ void KateModOnHdPrompt::slotUser1() } //END KateModOnHdPrompt - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h index 0f865fcea..32d7cfccd 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -79,7 +79,7 @@ class TQCheckBox; class KateConfigPage : public Kate::ConfigPage { - Q_OBJECT + TQ_OBJECT public: KateConfigPage ( TQWidget *parent=0, const char *name=0 ); @@ -97,7 +97,7 @@ class KateConfigPage : public Kate::ConfigPage class KateGotoLineDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -112,7 +112,7 @@ class KateGotoLineDialog : public KDialogBase class KateIndentConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateIndentConfigTab(TQWidget *parent); @@ -141,7 +141,7 @@ class KateIndentConfigTab : public KateConfigPage class KateSelectConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateSelectConfigTab(TQWidget *parent); @@ -164,7 +164,7 @@ class KateSelectConfigTab : public KateConfigPage class KateEditConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateEditConfigTab(TQWidget *parent); @@ -189,7 +189,7 @@ class KateEditConfigTab : public KateConfigPage class KateViewDefaultsConfig : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateViewDefaultsConfig( TQWidget *parent ); @@ -217,7 +217,7 @@ class KateViewDefaultsConfig : public KateConfigPage class KateEditKeyConfiguration: public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateEditKeyConfiguration( TQWidget* parent, KateDocument* doc ); @@ -240,7 +240,7 @@ class KateEditKeyConfiguration: public KateConfigPage class KateSaveConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateSaveConfigTab( TQWidget *parent ); @@ -265,7 +265,7 @@ class KatePartPluginListItem; class KatePartPluginListView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class KatePartPluginListItem; @@ -282,7 +282,7 @@ class KatePartPluginListView : public TDEListView class TQListViewItem; class KatePartPluginConfigPage : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KatePartPluginConfigPage (TQWidget *parent); @@ -307,7 +307,7 @@ class KatePartPluginConfigPage : public KateConfigPage class KateHlConfigPage : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateHlConfigPage (TQWidget *parent, KateDocument *doc); @@ -341,7 +341,7 @@ class KateHlConfigPage : public KateConfigPage class KateHlDownloadDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KateHlDownloadDialog(TQWidget *parent, const char *name, bool modal); @@ -359,7 +359,7 @@ class KateHlDownloadDialog: public KDialogBase void slotUser1(); }; -class KProcIO; +class TDEProcIO; class TDEProcess; /** * This dialog will prompt the user for what do with a file that is @@ -369,7 +369,7 @@ class TDEProcess; */ class KateModOnHdPrompt : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: enum Status { Reload=1, // 0 is KDialogBase::Cancel @@ -393,7 +393,7 @@ class KateModOnHdPrompt : public KDialogBase void slotUser1(); private slots: - void slotPRead(KProcIO*); ///< Read from the diff process + void slotPRead(TDEProcIO*); ///< Read from the diff process void slotPDone(TDEProcess*); ///< Runs the diff file when done private: diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 1404838c4..7781df55e 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -68,7 +68,7 @@ #include <kencodingfiledialog.h> #include <tdetempfile.h> #include <kmdcodec.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtimer.h> #include <tqfile.h> @@ -171,7 +171,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, setMarksUserChangable( markType01 ); m_undoMergeTimer = new TQTimer(this); - connect(m_undoMergeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(undoCancel())); + connect(m_undoMergeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(undoCancel())); clearMarks (); clearUndo (); @@ -189,24 +189,24 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, m_indenter->updateConfig (); // some nice signals from the buffer - connect(m_buffer, TQT_SIGNAL(tagLines(int,int)), this, TQT_SLOT(tagLines(int,int))); - connect(m_buffer, TQT_SIGNAL(codeFoldingUpdated()),this,TQT_SIGNAL(codeFoldingUpdated())); + connect(m_buffer, TQ_SIGNAL(tagLines(int,int)), this, TQ_SLOT(tagLines(int,int))); + connect(m_buffer, TQ_SIGNAL(codeFoldingUpdated()),this,TQ_SIGNAL(codeFoldingUpdated())); // if the user changes the highlight with the dialog, notify the doc - connect(KateHlManager::self(),TQT_SIGNAL(changed()),TQT_SLOT(internalHlChanged())); + connect(KateHlManager::self(),TQ_SIGNAL(changed()),TQ_SLOT(internalHlChanged())); // signal for the arbitrary HL - connect(m_arbitraryHL, TQT_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQT_SLOT(tagArbitraryLines(KateView*, KateSuperRange*))); + connect(m_arbitraryHL, TQ_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQ_SLOT(tagArbitraryLines(KateView*, KateSuperRange*))); // signals for mod on hd - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(dirty (const TQString &)), - this, TQT_SLOT(slotModOnHdDirty (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(dirty (const TQString &)), + this, TQ_SLOT(slotModOnHdDirty (const TQString &)) ); - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(created (const TQString &)), - this, TQT_SLOT(slotModOnHdCreated (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(created (const TQString &)), + this, TQ_SLOT(slotModOnHdCreated (const TQString &)) ); - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(deleted (const TQString &)), - this, TQT_SLOT(slotModOnHdDeleted (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(deleted (const TQString &)), + this, TQ_SLOT(slotModOnHdDeleted (const TQString &)) ); // update doc name setDocName (""); @@ -220,7 +220,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, setWidget( view ); } - connect(this,TQT_SIGNAL(sigQueryClose(bool *, bool*)),this,TQT_SLOT(slotQueryClose_save(bool *, bool*))); + connect(this,TQ_SIGNAL(sigQueryClose(bool *, bool*)),this,TQ_SLOT(slotQueryClose_save(bool *, bool*))); m_isasking = 0; @@ -356,9 +356,9 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin) KTextEditor::View *KateDocument::createView( TQWidget *parent, const char *name ) { KateView* newView = new KateView( this, parent, name); - connect(newView, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(undoCancel())); + connect(newView, TQ_SIGNAL(cursorPositionChanged()), TQ_SLOT(undoCancel())); if ( s_fileChangedDialogsActivated ) - connect( newView, TQT_SIGNAL(gotFocus( Kate::View * )), this, TQT_SLOT(slotModifiedOnDisk()) ); + connect( newView, TQ_SIGNAL(gotFocus( Kate::View * )), this, TQ_SLOT(slotModifiedOnDisk()) ); return newView; } @@ -1913,13 +1913,13 @@ void KateDocument::writeConfig(TDEConfig *config) void KateDocument::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); readConfig (config); } void KateDocument::writeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); writeConfig (config); config->sync(); } @@ -1984,10 +1984,10 @@ void KateDocument::configDialog() i18n("Configure"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, - kapp->mainWidget() ); + tdeApp->mainWidget() ); -#ifndef Q_WS_WIN //TODO: reenable - KWin::setIcons( kd->winId(), kapp->icon(), kapp->miniIcon() ); +#ifndef TQ_WS_WIN //TODO: reenable + KWin::setIcons( kd->winId(), tdeApp->icon(), tdeApp->miniIcon() ); #endif TQPtrList<KTextEditor::ConfigPage> editorPages; @@ -2305,11 +2305,11 @@ bool KateDocument::openURL( const KURL &url ) m_job = TDEIO::get ( url, false, isProgressInfoEnabled() ); // connect to slots - connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); TQWidget *w = widget (); if (!w && !m_views.isEmpty ()) @@ -2411,7 +2411,7 @@ bool KateDocument::openFile(TDEIO::Job * job) // read dir config (if possible and wanted) if (!m_reloading) - readDirConfig (); + readDirConfig (); // do we have success ? bool success = m_buffer->openFile (m_file); @@ -2521,7 +2521,7 @@ bool KateDocument::save() // get the right permissions, start with safe default mode_t perms = 0600; TDEIO::UDSEntry fentry; - if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget())) + if (TDEIO::NetAccess::stat (url(), fentry, tdeApp->mainWidget())) { kdDebug () << "stating succesfull: " << url() << endl; KFileItem item (fentry, url()); @@ -2530,8 +2530,8 @@ bool KateDocument::save() // first del existing file if any, than copy over the file we have // failure if a: the existing file could not be deleted, b: the file could not be copied - if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() )) - && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) ) + if ( (!TDEIO::NetAccess::exists( u, false, tdeApp->mainWidget() ) || TDEIO::NetAccess::del( u, tdeApp->mainWidget() )) + && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, tdeApp->mainWidget() ) ) { kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl; } @@ -3135,15 +3135,27 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c ) if ((col == 0) && (line == 0)) return; + KateTextLine::Ptr tl = m_buffer->plainLine(line); + if (!tl) + { + return; + } + + // Make sure to handle surrogate pairs correctly + uint fromCol = col - 1; + TQChar prevChar = tl->getChar(col - 1); + if (prevChar.isLowSurrogate() && tl->getChar(col - 2).isHighSurrogate()) + { + fromCol = col - 2; + prevChar = tl->getChar(col - 2); + } + int complement = 0; if (col > 0) { if (config()->configFlags() & KateDocument::cfAutoBrackets) { // if inside empty (), {}, [], '', "" delete both - KateTextLine::Ptr tl = m_buffer->plainLine(line); - if(!tl) return; - TQChar prevChar = tl->getChar(col-1); TQChar nextChar = tl->getChar(col); if ( (prevChar == '"' && nextChar == '"') || @@ -3158,8 +3170,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c ) if (!(config()->configFlags() & KateDocument::cfBackspaceIndents)) { // ordinary backspace - //c.cursor.col--; - removeText(line, col-1, line, col+complement); + removeText(line, fromCol, line, col+complement); } else { @@ -3215,9 +3226,23 @@ void KateDocument::del( KateView *view, const KateTextCursor& c ) return; } - if( c.col() < (int) m_buffer->plainLine(c.line())->length()) + KateTextLine::Ptr tl = m_buffer->plainLine(c.line()); + if (!tl) { - removeText(c.line(), c.col(), c.line(), c.col()+1); + return; + } + uint lineLen = tl->length(); + uint col = (uint)c.col(); + if (col < lineLen) + { + // Make sure to handle surrogate pairs correctly + uint toCol = col + 1; + if (tl->getChar(col).isHighSurrogate() && tl->getChar(col + 1).isLowSurrogate()) + { + toCol = col + 2; + } + + removeText(c.line(), col, c.line(), toCol); } else if ( (uint)c.line() < lastLine() ) { @@ -4654,7 +4679,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) bool found = false; for (TQStringList::size_type i = 0; !found && i < wildcards.size(); ++i) { - TQRegExp wildcard (wildcards[i], true/*Qt::CaseSensitive*/, true/*TQRegExp::Wildcard*/); + TQRegExp wildcard (wildcards[i], true/*TQt::CaseSensitive*/, true/*TQRegExp::Wildcard*/); found = wildcard.exactMatch (nameOfFile); } @@ -4964,7 +4989,7 @@ bool KateDocument::createDigest( TQCString &result ) if ( f.open( IO_ReadOnly) ) { KMD5 md5; - ret = md5.update( TQT_TQIODEVICE_OBJECT(f) ); + ret = md5.update( f ); md5.hexDigest( result ); f.close(); ret = true; @@ -4978,13 +5003,13 @@ TQString KateDocument::reasonedMOHString() const switch( m_modOnHdReason ) { case 1: - return i18n("The file '%1' was modified by another program.").arg( url().prettyURL() ); + return i18n("The file '%1' was modified by another program.").arg( url().pathOrURL() ); break; case 2: - return i18n("The file '%1' was created by another program.").arg( url().prettyURL() ); + return i18n("The file '%1' was created by another program.").arg( url().pathOrURL() ); break; case 3: - return i18n("The file '%1' was deleted by another program.").arg( url().prettyURL() ); + return i18n("The file '%1' was deleted by another program.").arg( url().pathOrURL() ); break; default: return TQString(); @@ -5180,5 +5205,3 @@ bool KateDocument::toggleBlockSelectionMode () //END DEPRECATED //END DEPRECATED STUFF - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index adc0dc92a..c16a86840 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -84,7 +84,7 @@ class KateDocument : public Kate::Document, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT friend class KateViewInternal; friend class KateRenderer; @@ -1070,6 +1070,3 @@ class KateDocument : public Kate::Document, }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; - diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp index b2e43758f..9296773d5 100644 --- a/kate/part/katedocumenthelpers.cpp +++ b/kate/part/katedocumenthelpers.cpp @@ -31,8 +31,8 @@ KateBrowserExtension::KateBrowserExtension( KateDocument* doc ) : KParts::BrowserExtension( doc, "katepartbrowserextension" ), m_doc (doc) { - connect( doc, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( doc, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); emit enableAction( "print", true ); } @@ -52,5 +52,3 @@ void KateBrowserExtension::slotSelectionChanged() if (m_doc->activeView()) emit enableAction( "copy", m_doc->activeView()->hasSelection() ); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h index b604d47ce..0609f6841 100644 --- a/kate/part/katedocumenthelpers.h +++ b/kate/part/katedocumenthelpers.h @@ -35,7 +35,7 @@ class KateDocument; */ class KateBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp index 32ff35846..56bdfa307 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -27,7 +27,7 @@ #include "kateschema.h" #include "katesearch.h" #include "kateconfig.h" -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo #include "katejscript.h" #endif #include "kateluaindentscript.h" @@ -137,7 +137,7 @@ KateFactory::KateFactory () // vm allocator m_vm = new KVMAllocator (); -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo // create script man (search scripts) + register commands m_jscriptManager = new KateJScriptManager (); KateCmd::self()->registerCommand (m_jscriptManager); @@ -251,7 +251,7 @@ void KateFactory::deregisterRenderer ( KateRenderer *renderer ) KateJScript *KateFactory::jscript () { -#ifndef Q_WS_WIN //todo +#ifndef TQ_WS_WIN //todo if (m_jscript) return m_jscript; @@ -272,5 +272,3 @@ KateIndentScript KateFactory::indentScript (const TQString &scriptname) } return result; } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 72fef8781..3b4c3790e 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -23,7 +23,7 @@ #include <tdeparts/factory.h> #include <ktrader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> // katepart version must be a string in double quotes, format: "x.x" @@ -224,7 +224,7 @@ class KateFactory TDEAboutData m_aboutData; /** - * our kinstance + * our TDEInstance */ TDEInstance m_instance; @@ -308,5 +308,3 @@ class KateFactory }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 281bf7e2d..eeecce36a 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -273,16 +273,16 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) TQLabel *lHl = new TQLabel( i18n("&Filetype:"), hbHl ); typeCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( typeCombo ); - connect( typeCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(typeChanged(int)) ); + connect( typeCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(typeChanged(int)) ); TQPushButton *btnnew = new TQPushButton( i18n("&New"), hbHl ); - connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newType()) ); + connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newType()) ); btndel = new TQPushButton( i18n("&Delete"), hbHl ); - connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) ); + connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteType()) ); - gbProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Properties"), this ); + gbProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Properties"), this ); layout->add (gbProps); // file & mime types @@ -312,7 +312,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) TQToolButton *btnMTW = new TQToolButton(hbMT); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); TQLabel *lprio = new TQLabel( i18n("Prio&rity:"), gbProps); priority = new KIntNumInput( gbProps ); @@ -322,12 +322,12 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) reload(); - connect( name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( section, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( varLine, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( name, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( section, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( varLine, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); TQWhatsThis::add( btnnew, i18n("Create a new file type.") ); TQWhatsThis::add( btndel, i18n("Delete the current file type.") ); @@ -519,9 +519,9 @@ void KateViewFileTypeAction::init() m_doc = 0; subMenus.setAutoDelete( true ); - popupMenu()->insertItem ( i18n("None"), this, TQT_SLOT(setType(int)), 0, 0); + popupMenu()->insertItem ( i18n("None"), this, TQ_SLOT(setType(int)), 0, 0); - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewFileTypeAction::updateMenu (Kate::Document *doc) @@ -551,12 +551,12 @@ void KateViewFileTypeAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + subMenus.at(m)->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0, z+1); } else if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + popupMenu()->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0, z+1); } } @@ -593,4 +593,3 @@ void KateViewFileTypeAction::setType (int mode) doc->updateFileType(mode-1, true); } //END KateViewFileTypeAction -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katefiletype.h b/kate/part/katefiletype.h index 7a927636b..c85682249 100644 --- a/kate/part/katefiletype.h +++ b/kate/part/katefiletype.h @@ -78,7 +78,7 @@ class KateFileTypeManager class KateFileTypeConfigTab : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateFileTypeConfigTab( TQWidget *parent ); @@ -114,7 +114,7 @@ class KateFileTypeConfigTab : public KateConfigPage class KateViewFileTypeAction : public Kate::ActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewFileTypeAction(const TQString& text, TQObject* parent = 0, const char* name = 0) diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp index 9d734b6e7..0f8ca30cd 100644 --- a/kate/part/katefont.cpp +++ b/kate/part/katefont.cpp @@ -123,5 +123,3 @@ void KateFontStruct::setFont (const TQFont & font) updateFontData (); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 1adbba2d5..d5af43f57 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -34,14 +34,14 @@ #include <tdeconfig.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kmimetype.h> #include <tdelocale.h> #include <kregexp.h> #include <tdepopupmenu.h> #include <tdeglobalsettings.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kstaticdeleter.h> #include <tdeapplication.h> @@ -1140,7 +1140,7 @@ KateHlContext::KateHlContext (const TQString &_hlId, int attribute, int lineEndC dynamic = _dynamic; dynamicChild = false; noIndentationBasedFolding=_noIndentationBasedFolding; - if (_noIndentationBasedFolding) kdDebug(13010)<<TQString("**********************_noIndentationBasedFolding is TRUE*****************")<<endl; + if (_noIndentationBasedFolding) kdDebug(13010)<<TQString("**********************_noIndentationBasedFolding is true*****************")<<endl; } @@ -1289,7 +1289,7 @@ void KateHighlighting::generateContextStack(int *ctxNum, int ctx, TQMemArray<sho */ int KateHighlighting::makeDynamicContext(KateHlContext *model, const TQStringList *args) { - QPair<KateHlContext *, TQString> key(model, args->front()); + TQPair<KateHlContext *, TQString> key(model, args->front()); short value; if (dynamicCtxs.contains(key)) @@ -1694,7 +1694,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l TQString tmp=s[0]; if (!tmp.isEmpty()) p->defStyleNum=tmp.toInt(); - QRgb col; + TQRgb col; tmp=s[1]; if (!tmp.isEmpty()) { col=tmp.toUInt(0,16); p->setTextColor(col); } @@ -3193,79 +3193,79 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) list.setAutoDelete(true); KateAttribute* normal = new KateAttribute(); - normal->setTextColor(Qt::black); - normal->setSelectedTextColor(Qt::white); + normal->setTextColor(TQt::black); + normal->setSelectedTextColor(TQt::white); list.append(normal); KateAttribute* keyword = new KateAttribute(); - keyword->setTextColor(Qt::black); - keyword->setSelectedTextColor(Qt::white); + keyword->setTextColor(TQt::black); + keyword->setSelectedTextColor(TQt::white); keyword->setBold(true); list.append(keyword); KateAttribute* dataType = new KateAttribute(); - dataType->setTextColor(Qt::darkRed); - dataType->setSelectedTextColor(Qt::white); + dataType->setTextColor(TQt::darkRed); + dataType->setSelectedTextColor(TQt::white); list.append(dataType); KateAttribute* decimal = new KateAttribute(); - decimal->setTextColor(Qt::blue); - decimal->setSelectedTextColor(Qt::cyan); + decimal->setTextColor(TQt::blue); + decimal->setSelectedTextColor(TQt::cyan); list.append(decimal); KateAttribute* basen = new KateAttribute(); - basen->setTextColor(Qt::darkCyan); - basen->setSelectedTextColor(Qt::cyan); + basen->setTextColor(TQt::darkCyan); + basen->setSelectedTextColor(TQt::cyan); list.append(basen); KateAttribute* floatAttribute = new KateAttribute(); - floatAttribute->setTextColor(Qt::darkMagenta); - floatAttribute->setSelectedTextColor(Qt::cyan); + floatAttribute->setTextColor(TQt::darkMagenta); + floatAttribute->setSelectedTextColor(TQt::cyan); list.append(floatAttribute); KateAttribute* charAttribute = new KateAttribute(); - charAttribute->setTextColor(Qt::magenta); - charAttribute->setSelectedTextColor(Qt::magenta); + charAttribute->setTextColor(TQt::magenta); + charAttribute->setSelectedTextColor(TQt::magenta); list.append(charAttribute); KateAttribute* string = new KateAttribute(); string->setTextColor(TQColor("#D00")); - string->setSelectedTextColor(Qt::red); + string->setSelectedTextColor(TQt::red); list.append(string); KateAttribute* comment = new KateAttribute(); - comment->setTextColor(Qt::darkGray); - comment->setSelectedTextColor(Qt::gray); + comment->setTextColor(TQt::darkGray); + comment->setSelectedTextColor(TQt::gray); comment->setItalic(true); list.append(comment); KateAttribute* others = new KateAttribute(); - others->setTextColor(Qt::darkGreen); - others->setSelectedTextColor(Qt::green); + others->setTextColor(TQt::darkGreen); + others->setSelectedTextColor(TQt::green); list.append(others); KateAttribute* alert = new KateAttribute(); - alert->setTextColor(Qt::black); + alert->setTextColor(TQt::black); alert->setSelectedTextColor( TQColor("#FCC") ); alert->setBold(true); alert->setBGColor( TQColor("#FCC") ); list.append(alert); KateAttribute* functionAttribute = new KateAttribute(); - functionAttribute->setTextColor(Qt::darkBlue); - functionAttribute->setSelectedTextColor(Qt::white); + functionAttribute->setTextColor(TQt::darkBlue); + functionAttribute->setSelectedTextColor(TQt::white); list.append(functionAttribute); KateAttribute* regionmarker = new KateAttribute(); - regionmarker->setTextColor(Qt::white); - regionmarker->setBGColor(Qt::gray); - regionmarker->setSelectedTextColor(Qt::gray); + regionmarker->setTextColor(TQt::white); + regionmarker->setBGColor(TQt::gray); + regionmarker->setSelectedTextColor(TQt::gray); list.append(regionmarker); KateAttribute* error = new KateAttribute(); - error->setTextColor(Qt::red); + error->setTextColor(TQt::red); error->setUnderline(true); - error->setSelectedTextColor(Qt::red); + error->setSelectedTextColor(TQt::red); list.append(error); TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); @@ -3281,7 +3281,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) s << ""; TQString tmp; - QRgb col; + TQRgb col; tmp=s[0]; if (!tmp.isEmpty()) { col=tmp.toUInt(0,16); i->setTextColor(col); } @@ -3405,7 +3405,7 @@ void KateViewHighlightAction::init() m_doc = 0; subMenus.setAutoDelete( true ); - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewHighlightAction::updateMenu (Kate::Document *doc) @@ -3437,12 +3437,12 @@ void KateViewHighlightAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + subMenus.at(m)->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0, z); } else if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + popupMenu()->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0, z); } } } @@ -3473,5 +3473,3 @@ void KateViewHighlightAction::setHl (int mode) doc->setHlMode((uint)mode); } //END KateViewHighlightAction - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index 8ff5e31b2..caad80a90 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -251,7 +251,7 @@ class KateHighlighting TQValueVector<KateHlContext*> m_contexts; inline KateHlContext *contextNum (uint n) { if (n < m_contexts.size()) return m_contexts[n]; return 0; } - TQMap< QPair<KateHlContext *, TQString>, short> dynamicCtxs; + TQMap< TQPair<KateHlContext *, TQString>, short> dynamicCtxs; // make them pointers perhaps KateEmbeddedHlInfos embeddedHls; @@ -340,7 +340,7 @@ class KateHighlighting class KateHlManager : public TQObject { - Q_OBJECT + TQ_OBJECT private: KateHlManager(); @@ -408,7 +408,7 @@ class KateHlManager : public TQObject class KateViewHighlightAction: public Kate::ActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewHighlightAction(const TQString& text, TQObject* parent = 0, const char* name = 0) @@ -434,5 +434,3 @@ class KateViewHighlightAction: public Kate::ActionMenu }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index cab335312..2f91e476e 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -34,7 +34,7 @@ #include <unistd.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeconfig.h> @@ -1166,4 +1166,3 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath, f.close(); } //END -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katejscript.h b/kate/part/katejscript.h index 98b2ad85e..2acef8edf 100644 --- a/kate/part/katejscript.h +++ b/kate/part/katejscript.h @@ -229,5 +229,3 @@ class KateIndentJScriptManager: public KateIndentScriptManagerAbstract }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katelinerange.cpp b/kate/part/katelinerange.cpp index 7500b4e8a..8c5b3e395 100644 --- a/kate/part/katelinerange.cpp +++ b/kate/part/katelinerange.cpp @@ -71,5 +71,3 @@ bool operator<= (const KateLineRange& r, const KateTextCursor& c) { return r.line < c.line() || r.startCol <= c.col(); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index 375b0b7d4..f4936ef23 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -29,7 +29,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeglobal.h> @@ -153,7 +153,7 @@ static int katelua_document_insertText(lua_State *L) { lua_error(L); } if ((!lua_isnumber(L,1)) || (!lua_isnumber(L,2)) ||(!lua_isstring(L,3)) ) { - lua_pushstring(L,i18n("document.removeText:Three parameters needed (line,col,text) (number,number,string)").utf8().data()); + lua_pushstring(L,i18n("document.insertText:Three parameters needed (line,col,text) (number,number,string)").utf8().data()); lua_error(L); } lua_pushboolean(L,katelua_doc->insertText((uint)lua_tonumber(L,1),(uint)lua_tonumber(L,2),TQString::fromUtf8(lua_tostring(L,3)))); @@ -525,4 +525,3 @@ void KateLUAIndentScriptManager::parseScriptHeader(const TQString &filePath, //END #endif -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateluaindentscript.h b/kate/part/kateluaindentscript.h index a03a85574..17ad19906 100644 --- a/kate/part/kateluaindentscript.h +++ b/kate/part/kateluaindentscript.h @@ -66,4 +66,3 @@ class KateLUAIndentScriptManager: public KateIndentScriptManagerAbstract #endif #endif -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index e66119747..e6c50e7b3 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -57,7 +57,7 @@ //BEGIN KatePrinter bool KatePrinter::print (KateDocument *doc) { -#ifndef Q_WS_WIN //TODO: reenable +#ifndef TQ_WS_WIN //TODO: reenable KPrinter printer; // docname is now always there, including the right Untitled name @@ -69,7 +69,7 @@ bool KatePrinter::print (KateDocument *doc) printer.addDialogPage( new KatePrintHeaderFooter(&printer, NULL) ); printer.addDialogPage( new KatePrintLayout(&printer, NULL) ); - if ( printer.setup( kapp->mainWidget(), i18n("Print %1").arg(printer.docName()) ) ) + if ( printer.setup( tdeApp->mainWidget(), i18n("Print %1").arg(printer.docName()) ) ) { KateRenderer renderer(doc); //renderer.config()->setSchema (1); @@ -192,9 +192,9 @@ bool KatePrinter::print (KateDocument *doc) tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false); tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false); - tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); - tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); - tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); + tags["h"] = TDEGlobal::locale()->formatTime(dt.time(), false); + tags["y"] = TDEGlobal::locale()->formatDate(dt.date(), true); + tags["Y"] = TDEGlobal::locale()->formatDate(dt.date(), false); tags["f"] = doc->url().fileName(); tags["U"] = doc->url().prettyURL(); if ( selectionOnly ) @@ -228,9 +228,9 @@ bool KatePrinter::print (KateDocument *doc) headerTagList = TQStringList::split('|', headerTags, true); if (!headerBgColor.isValid()) - headerBgColor = Qt::lightGray; + headerBgColor = TQt::lightGray; if (!headerFgColor.isValid()) - headerFgColor = Qt::black; + headerFgColor = TQt::black; } if (useFooter) @@ -255,9 +255,9 @@ bool KatePrinter::print (KateDocument *doc) footerTagList = TQStringList::split('|', footerTags, true); if (!footerBgColor.isValid()) - footerBgColor = Qt::lightGray; + footerBgColor = TQt::lightGray; if (!footerFgColor.isValid()) - footerFgColor = Qt::black; + footerFgColor = TQt::black; // adjust maxheight, so we can know when/where to print footer maxHeight -= footerHeight; } @@ -275,7 +275,7 @@ bool KatePrinter::print (KateDocument *doc) if ( useBox ) { if (!boxColor.isValid()) - boxColor = Qt::black; + boxColor = TQt::black; if (boxWidth < 1) // shouldn't be pssible no more! boxWidth = 1; // set maxwidth to something sensible @@ -307,7 +307,7 @@ bool KatePrinter::print (KateDocument *doc) // get a title and add the height required to draw it TQString _title = i18n("Typographical Conventions for %1").arg(doc->highlight()->name()); - guideHeight += paint.boundingRect( 0, 0, _w, 1000, Qt::AlignTop|Qt::AlignHCenter, _title ).height(); + guideHeight += paint.boundingRect( 0, 0, _w, 1000, TQt::AlignTop|TQt::AlignHCenter, _title ).height(); // see how many columns we can fit in int _widest( 0 ); @@ -417,8 +417,8 @@ bool KatePrinter::print (KateDocument *doc) if (headerTagList.count() == 3) { int valign = ( (useBox||headerDrawBg||useBackground) ? - Qt::AlignVCenter : Qt::AlignTop ); - int align = valign|Qt::AlignLeft; + TQt::AlignVCenter : TQt::AlignTop ); + int align = valign|TQt::AlignLeft; int marg = ( useBox || headerDrawBg ) ? innerMargin : 0; if ( useBox ) marg += boxWidth; TQString s; @@ -427,7 +427,7 @@ bool KatePrinter::print (KateDocument *doc) s = headerTagList[i]; if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s); - align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); + align = valign|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight); } } if ( ! ( headerDrawBg || useBox || useBackground ) ) // draw a 1 px (!?) line to separate header from contents @@ -446,7 +446,7 @@ bool KatePrinter::print (KateDocument *doc) paint.fillRect(0, maxHeight+innerMargin+boxWidth, headerWidth, footerHeight, footerBgColor); if (footerTagList.count() == 3) { - int align = Qt::AlignVCenter|Qt::AlignLeft; + int align = TQt::AlignVCenter|TQt::AlignLeft; int marg = ( useBox || footerDrawBg ) ? innerMargin : 0; if ( useBox ) marg += boxWidth; TQString s; @@ -455,7 +455,7 @@ bool KatePrinter::print (KateDocument *doc) s = footerTagList[i]; if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s); - align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); + align = TQt::AlignVCenter|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight); } } } // done footer @@ -524,7 +524,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setFont( renderer.config()->fontStruct()->myFontBold ); TQRect _r; paint.drawText( _marg, y, pdmWidth-(2*_marg), maxHeight - y, - Qt::AlignTop|Qt::AlignHCenter, + TQt::AlignTop|TQt::AlignHCenter, i18n("Typographical Conventions for %1").arg(doc->highlight()->name()), -1, &_r ); int _w = pdmWidth - (_marg*2) - (innerMargin*2); int _x = _marg + innerMargin; @@ -543,7 +543,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setPen( renderer.attribute(_i)->textColor() ); paint.setFont( renderer.attribute(_i)->font( *renderer.currentFont() ) ); paint.drawText(( _x + ((_i%guideCols)*_cw)), y, _cw, renderer.fontHeight(), - Qt::AlignVCenter|Qt::AlignLeft, _d->name, -1, &_r ); + TQt::AlignVCenter|TQt::AlignLeft, _d->name, -1, &_r ); _i++; if ( _i && ! ( _i%guideCols ) ) y += renderer.fontHeight(); ++_it; @@ -561,7 +561,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setPen( renderer.config()->lineNumberColor() ); paint.drawText( (( useBox || useBackground ) ? innerMargin : 0), y, lineNumberWidth, renderer.fontHeight(), - Qt::AlignRight, TQString("%1").arg( lineCount + 1 ) ); + TQt::AlignRight, TQString("%1").arg( lineCount + 1 ) ); } endCol = renderer.textWidth(doc->kateTextLine(lineCount), startCol, maxWidth, &needWrap); @@ -626,12 +626,12 @@ bool KatePrinter::print (KateDocument *doc) return true; } -#endif //!Q_WS_WIN +#endif //!TQ_WS_WIN return false; } //END KatePrinter -#ifndef Q_WS_WIN //TODO: reenable +#ifndef TQ_WS_WIN //TODO: reenable //BEGIN KatePrintTextSettings KatePrintTextSettings::KatePrintTextSettings( KPrinter * /*printer*/, TQWidget *parent, const char *name ) : KPrintDialogPage( parent, name ) @@ -719,9 +719,9 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * lo2->setStretchFactor( lFontPreview, 1 ); TQPushButton *btnChooseFont = new TQPushButton( i18n("Choo&se Font..."), this ); lo2->addWidget( btnChooseFont ); - connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) ); + connect( btnChooseFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHFFont()) ); // header - gbHeader = new TQGroupBox( 2, Qt::Horizontal, i18n("Header Properties"), this ); + gbHeader = new TQGroupBox( 2, TQt::Horizontal, i18n("Header Properties"), this ); lo->addWidget( gbHeader ); TQLabel *lHeaderFormat = new TQLabel( i18n("&Format:"), gbHeader ); @@ -740,7 +740,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * cbHeaderEnableBgColor = new TQCheckBox( i18n("Bac&kground"), hbHeaderColors ); kcbtnHeaderBg = new KColorButton( hbHeaderColors ); - gbFooter = new TQGroupBox( 2, Qt::Horizontal, i18n("Footer Properties"), this ); + gbFooter = new TQGroupBox( 2, TQt::Horizontal, i18n("Footer Properties"), this ); lo->addWidget( gbFooter ); // footer @@ -764,10 +764,10 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * lo->addStretch( 1 ); // user friendly - connect( cbEnableHeader, TQT_SIGNAL(toggled(bool)), gbHeader, TQT_SLOT(setEnabled(bool)) ); - connect( cbEnableFooter, TQT_SIGNAL(toggled(bool)), gbFooter, TQT_SLOT(setEnabled(bool)) ); - connect( cbHeaderEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQT_SLOT(setEnabled(bool)) ); - connect( cbFooterEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnFooterBg, TQT_SLOT(setEnabled(bool)) ); + connect( cbEnableHeader, TQ_SIGNAL(toggled(bool)), gbHeader, TQ_SLOT(setEnabled(bool)) ); + connect( cbEnableFooter, TQ_SIGNAL(toggled(bool)), gbFooter, TQ_SLOT(setEnabled(bool)) ); + connect( cbHeaderEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQ_SLOT(setEnabled(bool)) ); + connect( cbFooterEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnFooterBg, TQ_SLOT(setEnabled(bool)) ); // set defaults cbEnableHeader->setChecked( true ); @@ -922,7 +922,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons cbEnableBox = new TQCheckBox( i18n("Draw &boxes"), this ); lo->addWidget( cbEnableBox ); - gbBoxProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Box Properties"), this ); + gbBoxProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Box Properties"), this ); lo->addWidget( gbBoxProps ); TQLabel *lBoxWidth = new TQLabel( i18n("W&idth:"), gbBoxProps ); @@ -937,7 +937,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons kcbtnBoxColor = new KColorButton( gbBoxProps ); lBoxColor->setBuddy( kcbtnBoxColor ); - connect( cbEnableBox, TQT_SIGNAL(toggled(bool)), gbBoxProps, TQT_SLOT(setEnabled(bool)) ); + connect( cbEnableBox, TQ_SIGNAL(toggled(bool)), gbBoxProps, TQ_SLOT(setEnabled(bool)) ); lo->addStretch( 1 ); // set defaults: @@ -1000,6 +1000,4 @@ void KatePrintLayout::setOptions( const TQMap<TQString,TQString>& opts ) //END KatePrintLayout #include "kateprinter.moc" -#endif //!Q_WS_WIN - -// kate: space-indent on; indent-width 2; replace-tabs on; +#endif //!TQ_WS_WIN diff --git a/kate/part/kateprinter.h b/kate/part/kateprinter.h index 283c2b58e..ef0040eac 100644 --- a/kate/part/kateprinter.h +++ b/kate/part/kateprinter.h @@ -40,7 +40,7 @@ class KatePrinter static bool print (KateDocument *doc); }; -#ifndef Q_WS_WIN //TODO: reenable +#ifndef TQ_WS_WIN //TODO: reenable //BEGIN Text settings /* Text settings page: @@ -50,7 +50,7 @@ class KatePrinter */ class KatePrintTextSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KatePrintTextSettings( KPrinter *printer, TQWidget *parent=0, const char *name=0 ); ~KatePrintTextSettings(){}; @@ -77,7 +77,7 @@ class KatePrintTextSettings : public KPrintDialogPage class KatePrintHeaderFooter : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KatePrintHeaderFooter( KPrinter *printer, TQWidget *parent=0, const char *name=0 ); ~KatePrintHeaderFooter(){}; @@ -115,7 +115,7 @@ class KatePrintHeaderFooter : public KPrintDialogPage */ class KatePrintLayout : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KatePrintLayout( KPrinter *printer, TQWidget *parent=0, const char *name=0 ); ~KatePrintLayout(){}; @@ -131,6 +131,6 @@ class KatePrintLayout : public KPrintDialogPage KColorButton* kcbtnBoxColor; }; //END Layout -#endif //!Q_WS_WIN +#endif //!TQ_WS_WIN #endif diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp index 48b73d7e5..30a93b817 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -352,7 +352,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // Draws the dashed underline at the start of a folded block of text. if (range->startsInvisibleBlock) { - paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, Qt::DashLine)); + paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, TQt::DashLine)); paint.drawLine(0, fs->fontHeight - 1, xEnd - xStart, fs->fontHeight - 1); } @@ -400,7 +400,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i uint nextCol = curCol + 1; // text + attrib data from line - const uchar *textAttributes = textLine->attributes (); + const uchar *textAttributes = textLine->attributes(); bool noAttribs = !textAttributes; // adjust to startcol ;) @@ -421,26 +421,29 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i while (curCol - startcol < len) { + const TQString &textString = textLine->string(); + int currCharNumCols = textString[curCol].isHighSurrogate() ? 2 : 1; + nextCol = curCol + currCharNumCols; + // make sure curPos is updated correctly. // ### if uncommented, causes an O(n^2) behaviour //Q_ASSERT(curPos == textLine->cursorX(curCol, m_tabWidth)); - TQChar curChar = textLine->string()[curCol]; // Decide if this character is a tab - we treat the spacing differently // TODO: move tab width calculation elsewhere? - bool isTab = curChar == TQChar('\t'); + bool isTab = textString[curCol] == TQChar('\t'); // Determine current syntax highlighting attribute // A bit legacy but doesn't need to change KateAttribute* curAt = (noAttribs || ((*textAttributes) >= atLen)) ? &attr[0] : &attr[*textAttributes]; // X position calculation. Incorrect for fonts with non-zero leftBearing() and rightBearing() results. - // TODO: make internal charWidth() function, use TQFontMetrics::charWidth(). - xPosAfter += curAt->width(*fs, curChar, m_tabWidth); + // TODO: make internal charWidth() function. + xPosAfter += curAt->width(*fs, textString, curCol, m_tabWidth); // Tab special treatment, move to charWidth(). if (isTab) - xPosAfter -= (xPosAfter % curAt->width(*fs, curChar, m_tabWidth)); + xPosAfter -= (xPosAfter % curAt->width(*fs, textString[curCol], m_tabWidth)); // Only draw after the starting X value // Haha, this was always wrong, due to the use of individual char width calculations...?? :( @@ -459,7 +462,9 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i curColor = isSel ? &(curAt->selectedTextColor()) : &(curAt->textColor()); // Incorporate in arbitrary highlighting - if (curAt != oldAt || curColor != oldColor || (superRanges.count() && superRanges.currentBoundary() && *(superRanges.currentBoundary()) == currentPos)) { + if (curAt != oldAt || curColor != oldColor || (superRanges.count() && + superRanges.currentBoundary() && *(superRanges.currentBoundary()) == currentPos)) + { if (superRanges.count() && superRanges.currentBoundary() && *(superRanges.currentBoundary()) == currentPos) customHL = KateArbitraryHighlightRange::merge(superRanges.rangesIncluding(currentPos)); @@ -495,10 +500,10 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i || (superRanges.count() && superRanges.currentBoundary() && *(superRanges.currentBoundary()) == KateTextCursor(line, nextCol)) // it is the end of the line OR - || (curCol - startcol >= len - 1) + || ((curCol - startcol) >= (len - currCharNumCols)) // the rest of the line is trailing whitespace OR - || (curCol + 1 >= trailingWhitespaceColumn) + || (nextCol >= trailingWhitespaceColumn) // indentation lines OR || (showIndentLines() && curCol < lastIndentColumn) @@ -514,7 +519,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // the next char is a tab (removed the "and this isn't" because that's dealt with above) // i.e. we have to draw the current text so the tab can be rendered as above. - || (textLine->string()[nextCol] == TQChar('\t')) + || (textString[nextCol] == TQChar('\t')) // input method edit area || ( m_view && (isIMEdit != m_view->isIMEdit( line, nextCol )) ) @@ -557,7 +562,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // If this is the last block of text, fill up to the end of the line if the // selection stretches that far - if ((curCol >= len - 1) && m_view->lineEndSelected (line, endcol)) + if (curCol >= (len - currCharNumCols) && m_view->lineEndSelected(line, endcol)) width = xEnd - oldXPos; } else @@ -632,7 +637,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i else { // Here's where the money is... - paint.drawText(oldXPos-xStart, y, textLine->string(), blockStartCol, nextCol-blockStartCol); + paint.drawText(oldXPos-xStart, y, textString, blockStartCol, nextCol-blockStartCol); // Draw preedit's underline if (isIMEdit) { @@ -650,7 +655,6 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // variable advancement blockStartCol = nextCol; oldXPos = xPosAfter; - //oldS = s+1; } } // renderNow @@ -681,9 +685,8 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i oldColor = curColor; // col move - curCol++; - nextCol++; - currentPos.setCol(currentPos.col() + 1); + curCol += currCharNumCols; + currentPos.setCol(currentPos.col() + currCharNumCols); // Update the current indentation pos. if (isTab) @@ -756,8 +759,6 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) if (z < len) { width = a->width(*fs, textString, z, m_tabWidth); } else { - // DF: commented out. It happens all the time. - //Q_ASSERT(!m_doc->wrapCursor()); width = a->width(*fs, TQChar(' '), m_tabWidth); } @@ -765,6 +766,11 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) if (z < len && unicode[z] == TQChar('\t')) x -= x % width; + + if (textString[z].isHighSurrogate()) + { + ++z; + } } return x; @@ -803,7 +809,11 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u if (unicode[z] == TQChar('\t')) x -= x % width; - if (unicode[z].isSpace()) + if (textString[z].isHighSurrogate()) + { + ++z; + } + else if (unicode[z].isSpace()) { lastWhiteSpace = z+1; lastWhiteSpaceX = x; @@ -876,7 +886,6 @@ uint KateRenderer::textWidth(const KateTextCursor &cursor) uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) { bool wrapCursor = m_view->wrapCursor(); - int x, oldX; KateFontStruct *fs = config()->fontStruct(); @@ -890,15 +899,17 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) const TQChar *unicode = textLine->text(); const TQString &textString = textLine->string(); - x = oldX = 0; + int x = 0; + int oldX = 0; + int oldZ = 0; + int width = 0; uint z = startCol; while (x < xPos && (!wrapCursor || z < len)) { oldX = x; + oldZ = z; KateAttribute* a = attribute(textLine->attribute(z)); - int width = 0; - if (z < len) width = a->width(*fs, textString, z, m_tabWidth); else @@ -909,11 +920,11 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) if (z < len && unicode[z] == TQChar('\t')) x -= x % width; - z++; + z += textString[z].isHighSurrogate() ? 2 : 1; } if (xPos - oldX < x - xPos && z > 0) { - z--; x = oldX; + z = oldZ; } cursor.setCol(z); return x; @@ -942,23 +953,24 @@ uint KateRenderer::textPos(const KateTextLine::Ptr &textLine, int xPos, uint sta KateFontStruct *fs = config()->fontStruct(); - int x, oldX; - x = oldX = 0; - + int x = 0; + int oldX = 0; + int oldZ = 0; uint z = startCol; const uint len = textLine->length(); const TQString &textString = textLine->string(); while ( (x < xPos) && (z < len)) { oldX = x; + oldZ = z; KateAttribute* a = attribute(textLine->attribute(z)); x += a->width(*fs, textString, z, m_tabWidth); - z++; + z += textString[z].isHighSurrogate() ? 2 : 1; } if ( ( (! nearest) || xPos - oldX < x - xPos ) && z > 0 ) { - z--; + z = oldZ; // newXPos = oldX; }// else newXPos = x; return z; @@ -1028,5 +1040,3 @@ uint KateRenderer::spaceWidth() { return attribute(0)->width(*config()->fontStruct(), TQChar(' '), m_tabWidth); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index f7977fac6..a055a00e5 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem //BEGIN KateSchemaManager TQString KateSchemaManager::normalSchema () { - return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal"); + return tdeApp->aboutData()->appName () + TQString (" - Normal"); } TQString KateSchemaManager::printingSchema () { - return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing"); + return tdeApp->aboutData()->appName () + TQString (" - Printing"); } KateSchemaManager::KateSchemaManager () @@ -310,7 +310,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char m_combobox->insertItem(i18n("Error")); // markType07 m_combobox->setCurrentItem(0); m_markers = new KColorButton(b, "marker_color_button"); - connect( m_combobox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboBoxChanged( int ) ) ); + connect( m_combobox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboBoxChanged( int ) ) ); blay->addWidget(gbTextArea); @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( changed() ), parent->parentWidget(), TQ_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>")); @@ -405,15 +405,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) m_schema = newSchema; // first disconnect all signals otherwise setColor emits changed - m_back ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_selected ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_current ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_bracket ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_wwmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_iconborder->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_tmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_markers ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); + m_back ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_selected ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_current ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_bracket ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_wwmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_iconborder->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_tmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_markers ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_linenumber->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); // If we havent this schema, read in from config file if ( ! m_schemas.contains( newSchema ) ) @@ -431,13 +431,13 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) // same std colors like in KateDocument::markColor TQValueVector <TQColor> mark(KTextEditor::MarkInterface::reservedMarkersCount()); Q_ASSERT(mark.size() > 6); - mark[0] = Qt::blue; - mark[1] = Qt::red; - mark[2] = Qt::yellow; - mark[3] = Qt::magenta; - mark[4] = Qt::gray; - mark[5] = Qt::green; - mark[6] = Qt::red; + mark[0] = TQt::blue; + mark[1] = TQt::red; + mark[2] = TQt::yellow; + mark[3] = TQt::magenta; + mark[4] = TQt::gray; + mark[5] = TQt::green; + mark[6] = TQt::red; SchemaColors c; TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); @@ -475,15 +475,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) } m_markers->setColor( m_schemas [ newSchema ].markerColors[ m_combobox->currentItem() ] ); - connect( m_back , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_selected , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_current , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_bracket , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_wwmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_iconborder, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_tmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_linenumber, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_markers , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_back , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_selected , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_current , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_bracket , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_wwmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_iconborder, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_tmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_linenumber, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_markers , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } void KateSchemaConfigColorTab::apply () @@ -527,9 +527,9 @@ void KateSchemaConfigColorTab::slotMarkerColorChanged( const TQColor& color) void KateSchemaConfigColorTab::slotComboBoxChanged(int index) { // temporarily disconnect the changed-signal because setColor emits changed as well - m_markers->disconnect( TQT_SIGNAL( changed( const TQColor& ) ) ); + m_markers->disconnect( TQ_SIGNAL( changed( const TQColor& ) ) ); m_markers->setColor( m_schemas[m_schema].markerColors[index] ); - connect( m_markers, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_markers, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } //END KateSchemaConfigColorTab @@ -542,10 +542,9 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * TQGridLayout *grid = new TQGridLayout( this, 1, 1 ); m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false ); - m_fontchooser->enableColumn(TDEFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQ_SIGNAL( changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); m_schema = -1; } @@ -583,7 +582,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema ) m_fontchooser->disconnect ( this ); m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) ); m_fonts[ newSchema ] = m_fontchooser->font(); - connect (m_fontchooser, TQT_SIGNAL (fontSelected( const TQFont & )), this, TQT_SLOT (slotFontSelected( const TQFont & ))); + connect (m_fontchooser, TQ_SIGNAL (fontSelected( const TQFont & )), this, TQ_SLOT (slotFontSelected( const TQFont & ))); } //END FontConfig @@ -599,7 +598,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -689,8 +688,8 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); hlCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( hlCombo ); - connect( hlCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(hlChanged(int)) ); + connect( hlCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(hlChanged(int)) ); for( int i = 0; i < KateHlManager::self()->highlights(); i++) { if (KateHlManager::self()->hlSection(i).length() > 0) @@ -716,7 +715,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.<p>You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() @@ -834,20 +833,20 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl ); schemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( schemaCombo ); - connect( schemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(schemaChanged(int)) ); + connect( schemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(schemaChanged(int)) ); TQPushButton *btnnew = new TQPushButton( i18n("&New..."), hbHl ); - connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newSchema()) ); + connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newSchema()) ); btndel = new TQPushButton( i18n("&Delete"), hbHl ); - connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSchema()) ); + connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSchema()) ); m_tabWidget = new TQTabWidget ( this ); m_tabWidget->setMargin (KDialog::marginHint()); layout->add (m_tabWidget); - connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *))); + connect (m_tabWidget, TQ_SIGNAL (currentChanged (TQWidget *)), this, TQ_SLOT (newCurrentPage (TQWidget *))); m_colorTab = new KateSchemaConfigColorTab (m_tabWidget); m_tabWidget->addTab (m_colorTab, i18n("Colors")); @@ -865,7 +864,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc hbHl = new TQHBox( this ); layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); - lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl ); + lHl = new TQLabel( i18n("&Default schema for %1:").arg(tdeApp->aboutData()->programName ()), hbHl ); defaultSchemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( defaultSchemaCombo ); @@ -874,8 +873,8 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc reload(); - connect( defaultSchemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChanged()) ); + connect( defaultSchemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChanged()) ); } KateSchemaConfigPage::~KateSchemaConfigPage () @@ -1004,7 +1003,7 @@ void KateViewSchemaAction::init() m_view = 0; last = 0; - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewSchemaAction::updateMenu (KateView *view) @@ -1024,7 +1023,7 @@ void KateViewSchemaAction::slotAboutToShow() if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0, z+1); + popupMenu()->insertItem ( hlName, this, TQ_SLOT(setSchema(int)), 0, z+1); } } @@ -1061,10 +1060,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) addColumn( i18n("Background Selected") ); if ( showUseDefaults ) addColumn( i18n("Use Default Style") ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), + this, TQ_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); // grap the bg color, selected color and default font normalcol = TDEGlobalSettings::textColor(); bgcol = KateRendererConfig::global()->backgroundColor(); @@ -1094,21 +1093,21 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob if ( showtitle ) m.insertTitle( i->contextName(), KateStyleListItem::ContextName ); - id = m.insertItem( i18n("&Bold"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); + id = m.insertItem( i18n("&Bold"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); m.setItemChecked( id, is->bold() ); - id = m.insertItem( i18n("&Italic"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); + id = m.insertItem( i18n("&Italic"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); m.setItemChecked( id, is->italic() ); - id = m.insertItem( i18n("&Underline"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); + id = m.insertItem( i18n("&Underline"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); m.setItemChecked( id, is->underline() ); - id = m.insertItem( i18n("S&trikeout"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); + id = m.insertItem( i18n("S&trikeout"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); m.setItemChecked( id, is->strikeOut() ); m.insertSeparator(); - m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); - m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); - m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); - m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); + m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); + m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); + m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); + m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); // Unset [some] colors. I could show one only if that button was clicked, but that // would disable setting this with the keyboard (how many aren't doing just @@ -1119,14 +1118,14 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob { m.insertSeparator(); if ( style->itemSet( KateAttribute::BGColor) ) - m.insertItem( i18n("Unset Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 100 ); + m.insertItem( i18n("Unset Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 100 ); if ( style->itemSet( KateAttribute::SelectedBGColor ) ) - m.insertItem( i18n("Unset Selected Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 101 ); + m.insertItem( i18n("Unset Selected Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 101 ); } if ( ! i->isDefault() && ! i->defStyle() ) { m.insertSeparator(); - id = m.insertItem( i18n("Use &Default Style"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); + id = m.insertItem( i18n("Use &Default Style"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); m.setItemChecked( id, i->defStyle() ); } m.exec( globalPos ); @@ -1154,7 +1153,7 @@ void KateStyleListView::unsetColor( int c ) void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) { if ( dynamic_cast<KateStyleListItem*>(i) ) { - if ( btn == Qt::LeftButton && c > 0 ) { + if ( btn == TQt::LeftButton && c > 0 ) { // map pos to item/column and call KateStyleListItem::activate(col, pos) ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); } @@ -1607,5 +1606,3 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, TQListViewItem::paintCell( p, mcg, col, width, align ); } //END - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 77cc112a1..63cc210b5 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -92,7 +92,7 @@ class KateSchemaManager class KateViewSchemaAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0) @@ -127,7 +127,7 @@ class KateViewSchemaAction : public TDEActionMenu */ class KateStyleListView : public TQListView { - Q_OBJECT + TQ_OBJECT friend class KateStyleListItem; @@ -162,7 +162,7 @@ class KateStyleListView : public TQListView class KateSchemaConfigColorTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigColorTab( TQWidget *parent = 0, const char *name = 0 ); @@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged) protected slots: void slotMarkerColorChanged(const TQColor&); @@ -209,7 +209,7 @@ typedef TQMap<int,TQFont> FontMap; // ### remove it class KateSchemaConfigFontTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigFontTab( TQWidget *parent = 0, const char *name = 0 ); @@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged) private: class TDEFontChooser *m_fontchooser; @@ -236,7 +236,7 @@ class KateSchemaConfigFontTab : public TQWidget class KateSchemaConfigFontColorTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigFontColorTab( TQWidget *parent = 0, const char *name = 0 ); @@ -256,7 +256,7 @@ class KateSchemaConfigFontColorTab : public TQWidget class KateSchemaConfigHighlightTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigHighlightTab( TQWidget *parent = 0, const char *name = 0, KateSchemaConfigFontColorTab *page = 0, uint hl = 0 ); @@ -284,7 +284,7 @@ class KateSchemaConfigHighlightTab : public TQWidget class KateSchemaConfigPage : public KateConfigPage { - Q_OBJECT + TQ_OBJECT public: KateSchemaConfigPage ( TQWidget *parent, class KateDocument *doc=0 ); @@ -319,5 +319,3 @@ class KateSchemaConfigPage : public KateConfigPage }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index 930e4d906..b76af856b 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -58,7 +58,7 @@ KateSearch::KateSearch( KateView* view ) m_arbitraryHLList = new KateSuperRangeList(); if (arbitraryHLExample) m_doc->arbitraryHL()->addHighlightToView(m_arbitraryHLList, m_view); - connect(replacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(replaceSlot())); + connect(replacePrompt,TQ_SIGNAL(clicked()),this,TQ_SLOT(replaceSlot())); } KateSearch::~KateSearch() @@ -68,13 +68,13 @@ KateSearch::~KateSearch() void KateSearch::createActions( TDEActionCollection* ac ) { - KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis( + KStdAction::find( this, TQ_SLOT(find()), ac )->setWhatsThis( i18n("Look up the first occurrence of a piece of text or regular expression.")); - KStdAction::findNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis( + KStdAction::findNext( this, TQ_SLOT(slotFindNext()), ac )->setWhatsThis( i18n("Look up the next occurrence of the search phrase.")); - KStdAction::findPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis( + KStdAction::findPrev( this, TQ_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis( i18n("Look up the previous occurrence of the search phrase.")); - KStdAction::replace( this, TQT_SLOT(replace()), ac )->setWhatsThis( + KStdAction::replace( this, TQ_SLOT(replace()), ac )->setWhatsThis( i18n("Look up a piece of text or regular expression and replace the result with some given text.")); } @@ -729,10 +729,10 @@ bool KateSearch::doSearch( const TQString& text ) if (arbitraryHLExample) { KateArbitraryHighlightRange* hl = new KateArbitraryHighlightRange(new KateSuperCursor(m_doc, true, s.cursor), new KateSuperCursor(m_doc, true, s.cursor.line(), s.cursor.col() + s.matchedLength), this); hl->setBold(); - hl->setTextColor(Qt::white); - hl->setBGColor(Qt::black); + hl->setTextColor(TQt::white); + hl->setBGColor(TQt::black); // destroy the highlight upon change - connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated())); + connect(hl, TQ_SIGNAL(contentsChanged()), hl, TQ_SIGNAL(eliminated())); m_arbitraryHLList->append(hl); } @@ -1020,5 +1020,3 @@ void SearchCommand::ifindClear() m_ifindFlags = 0; } //END SearchCommand - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h index 5ae92f568..7ff798325 100644 --- a/kate/part/katesearch.h +++ b/kate/part/katesearch.h @@ -41,7 +41,7 @@ class TDEActionCollection; class KateSearch : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KateDocument; @@ -167,7 +167,7 @@ class KateSearch : public TQObject */ class KateReplacePrompt : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -239,5 +239,3 @@ class SearchCommand : public Kate::Command, public Kate::CommandExtension }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index e68008470..e19f4fb94 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -53,11 +53,11 @@ KateSpell::~KateSpell() void KateSpell::createActions( TDEActionCollection* ac ) { - KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac ); - TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); + KStdAction::spelling( this, TQ_SLOT(spellcheck()), ac ); + TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward")); - m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); + m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text")); } @@ -123,17 +123,17 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl; m_tdespell = new KSpell( m_view, i18n("Spellcheck"), - this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type ); + this, TQ_SLOT(ready(KSpell *)), ksc, true, true, type ); - connect( m_tdespell, TQT_SIGNAL(death()), - this, TQT_SLOT(spellCleanDone()) ); + connect( m_tdespell, TQ_SIGNAL(death()), + this, TQ_SLOT(spellCleanDone()) ); - connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), - this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) ); - connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), - this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) ); - connect( m_tdespell, TQT_SIGNAL(done(const TQString&)), - this, TQT_SLOT(spellResult(const TQString&)) ); + connect( m_tdespell, TQ_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), + this, TQ_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) ); + connect( m_tdespell, TQ_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), + this, TQ_SLOT(corrected(const TQString&, const TQString&, unsigned int)) ); + connect( m_tdespell, TQ_SIGNAL(done(const TQString&)), + this, TQ_SLOT(spellResult(const TQString&)) ); } void KateSpell::ready(KSpell *) @@ -216,6 +216,3 @@ void KateSpell::spellCleanDone() kdDebug (13020) << "SPELLING END" << endl; } //END - - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katespell.h b/kate/part/katespell.h index 9ce41666c..6a5e3ad52 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -32,7 +32,7 @@ class KSpell; class KateSpell : public TQObject { - Q_OBJECT + TQ_OBJECT public: KateSpell( KateView* ); @@ -82,5 +82,3 @@ class KateSpell : public TQObject }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katesupercursor.cpp b/kate/part/katesupercursor.cpp index 89860d496..4b5d02864 100644 --- a/kate/part/katesupercursor.cpp +++ b/kate/part/katesupercursor.cpp @@ -328,15 +328,15 @@ void KateSuperRange::init() setBehaviour(DoNotExpand); // Not necessarily the best implementation - connect(m_start, TQT_SIGNAL(positionDirectlyChanged()), TQT_SIGNAL(contentsChanged())); - connect(m_end, TQT_SIGNAL(positionDirectlyChanged()), TQT_SIGNAL(contentsChanged())); + connect(m_start, TQ_SIGNAL(positionDirectlyChanged()), TQ_SIGNAL(contentsChanged())); + connect(m_end, TQ_SIGNAL(positionDirectlyChanged()), TQ_SIGNAL(contentsChanged())); - connect(m_start, TQT_SIGNAL(positionChanged()), TQT_SLOT(slotEvaluateChanged())); - connect(m_end, TQT_SIGNAL(positionChanged()), TQT_SLOT(slotEvaluateChanged())); - connect(m_start, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged())); - connect(m_end, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged())); - connect(m_start, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted())); - connect(m_end, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted())); + connect(m_start, TQ_SIGNAL(positionChanged()), TQ_SLOT(slotEvaluateChanged())); + connect(m_end, TQ_SIGNAL(positionChanged()), TQ_SLOT(slotEvaluateChanged())); + connect(m_start, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged())); + connect(m_end, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged())); + connect(m_start, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted())); + connect(m_end, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted())); } KateSuperRange::~KateSuperRange() @@ -446,7 +446,7 @@ bool KateSuperRange::boundaryOn(uint lineNum) const void KateSuperRange::slotEvaluateChanged() { - if (sender() == static_cast<TQObject*>(m_start)) { + if (sender() == m_start) { if (m_evaluate) { if (!m_endChanged) { // Only one was changed @@ -484,7 +484,7 @@ void KateSuperRange::slotEvaluateChanged() void KateSuperRange::slotEvaluateUnChanged() { - if (sender() == static_cast<TQObject*>(m_start)) { + if (sender() == m_start) { if (m_evaluate) { if (m_endChanged) { // Only one changed @@ -581,8 +581,8 @@ void KateSuperRangeList::connectAll() if (!m_connect) { m_connect = true; for (KateSuperRange* range = first(); range; range = next()) { - connect(range, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*))); - connect(range, TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated())); + connect(range, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*))); + connect(range, TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated())); } } } @@ -636,7 +636,7 @@ bool KateSuperRangeList::rangesInclude(const KateTextCursor& cursor) void KateSuperRangeList::slotEliminated() { if (sender()) { - KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))); + KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(sender())); emit rangeEliminated(range); if (m_trackingBoundaries) { @@ -727,9 +727,9 @@ int KateSuperRangeList::compareItems(TQPtrCollection::Item item1, TQPtrCollectio TQPtrCollection::Item KateSuperRangeList::newItem(TQPtrCollection::Item d) { if (m_connect) { - connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*))); - connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated())); - connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SIGNAL(tagRange(KateSuperRange*))); + connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*))); + connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated())); + connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SIGNAL(tagRange(KateSuperRange*))); // HACK HACK static_cast<KateSuperRange*>(d)->slotTagRange(); @@ -742,5 +742,3 @@ TQPtrCollection::Item KateSuperRangeList::newItem(TQPtrCollection::Item d) return TQPtrList<KateSuperRange>::newItem(d); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katesupercursor.h b/kate/part/katesupercursor.h index ef0fd378d..270227925 100644 --- a/kate/part/katesupercursor.h +++ b/kate/part/katesupercursor.h @@ -44,7 +44,7 @@ class KateView; **/ class KateSuperCursor : public TQObject, public KateDocCursor, public Kate::Cursor { - Q_OBJECT + TQ_OBJECT public: /** @@ -169,7 +169,7 @@ class KateSuperRange : public TQObject, public KateRange { friend class KateSuperRangeList; - Q_OBJECT + TQ_OBJECT public: /// Determine how the range reacts to characters inserted immediately outside the range. @@ -338,7 +338,7 @@ protected: class KateSuperRangeList : public TQObject, public TQPtrList<KateSuperRange> { - Q_OBJECT + TQ_OBJECT public: /** @@ -459,5 +459,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index ec70c0416..40870e4b8 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -24,7 +24,7 @@ #include <unistd.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeconfig.h> @@ -471,5 +471,3 @@ void KateSyntaxDocument::setupModeList (bool force) // Syncronize with the file katesyntax...rc config.sync(); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katesyntaxdocument.h b/kate/part/katesyntaxdocument.h index 6599c05cd..88e9273f6 100644 --- a/kate/part/katesyntaxdocument.h +++ b/kate/part/katesyntaxdocument.h @@ -160,5 +160,3 @@ class KateSyntaxDocument : public TQDomDocument }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp index 52e07a2e4..5403d0308 100644 --- a/kate/part/katetemplatehandler.cpp +++ b/kate/part/katetemplatehandler.cpp @@ -38,7 +38,7 @@ KateTemplateHandler::KateTemplateHandler( , m_initOk( false ) , m_recursion( false ) { - connect( m_doc, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDocumentDestroyed() ) ); + connect( m_doc, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDocumentDestroyed() ) ); m_ranges = new KateSuperRangeList( false, this ); //false/*,this*/); if ( !m_doc->setTabInterceptor( this ) ) @@ -116,15 +116,15 @@ KateTemplateHandler::KateTemplateHandler( m_doc->tagLines( ( *it ) ->start().line(), ( *it ) ->end().line() ); } - /* connect(doc,TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this, - TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&))); - connect(doc,TQT_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this, - TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/ - connect( doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) ); - connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); - connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); + /* connect(doc,TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this, + TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&))); + connect(doc,TQ_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this, + TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/ + connect( doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) ); + connect( doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); + connect( doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) ); - ( *this ) ( Qt::Key_Tab ); + ( *this ) ( TQt::Key_Tab ); } KateTemplateHandler::~KateTemplateHandler() @@ -283,7 +283,7 @@ void KateTemplateHandler::locateRange( const KateTextCursor& cursor ) bool KateTemplateHandler::operator() ( KKey key ) { - if ( key==Qt::Key_Tab ) + if ( key==TQt::Key_Tab ) { m_currentTabStop++; @@ -324,9 +324,9 @@ void KateTemplateHandler::slotAboutToRemoveText( const KateTextRange &range ) if ( m_doc ) { - disconnect( m_doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) ); - disconnect( m_doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); - disconnect( m_doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); + disconnect( m_doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) ); + disconnect( m_doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); + disconnect( m_doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) ); } deleteLater(); diff --git a/kate/part/katetemplatehandler.h b/kate/part/katetemplatehandler.h index d7d56e074..f50023f46 100644 --- a/kate/part/katetemplatehandler.h +++ b/kate/part/katetemplatehandler.h @@ -29,7 +29,7 @@ class KateDocument; class KateTemplateHandler: public TQObject, public KateKeyInterceptorFunctor { - Q_OBJECT + TQ_OBJECT public: KateTemplateHandler(KateDocument *doc,uint line,uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues); virtual ~KateTemplateHandler(); diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp index 005892607..3dae9ddd2 100644 --- a/kate/part/katetextline.cpp +++ b/kate/part/katetextline.cpp @@ -439,5 +439,3 @@ char *KateTextLine::restore (char *buf) return buf; } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h index 7f14be16c..dec072d9d 100644 --- a/kate/part/katetextline.h +++ b/kate/part/katetextline.h @@ -167,7 +167,7 @@ class KateTextLine : public TDEShared inline uchar *attributes () const { return m_attributes.data(); } /** - * Gets a QString + * Gets a TQString * @return text of line as TQString reference */ inline const TQString& string() const { return m_text; } @@ -452,5 +452,3 @@ class KateTextLine : public TDEShared }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateundo.cpp b/kate/part/kateundo.cpp index c37fb556c..68ce5a735 100644 --- a/kate/part/kateundo.cpp +++ b/kate/part/kateundo.cpp @@ -388,5 +388,3 @@ bool KateUndoGroup::isOnlyType(KateUndoGroup::UndoType type) return true; } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateundo.h b/kate/part/kateundo.h index 9beaf3695..596ae6641 100644 --- a/kate/part/kateundo.h +++ b/kate/part/kateundo.h @@ -137,5 +137,3 @@ class KateUndoGroup }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 57c795914..95e9d1eae 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -131,7 +131,7 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name ) doc->addView( this ); setFocusProxy( m_viewInternal ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); if (!doc->singleViewMode()) { setXMLFile( "katepartui.rc" ); @@ -159,8 +159,8 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name ) slotHlChanged(); /*test texthint - connect(this,TQT_SIGNAL(needTextHint(int, int, TQString &)), - this,TQT_SLOT(slotNeedTextHint(int, int, TQString &))); + connect(this,TQ_SIGNAL(needTextHint(int, int, TQString &)), + this,TQ_SLOT(slotNeedTextHint(int, int, TQString &))); enableTextHints(1000); test texthint*/ } @@ -186,22 +186,22 @@ KateView::~KateView() void KateView::setupConnections() { - connect( m_doc, TQT_SIGNAL(undoChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotNewUndo()) ); - connect( m_doc, TQT_SIGNAL(hlChanged()), - TQT_TQOBJECT(this), TQT_SLOT(slotHlChanged()) ); - connect( m_doc, TQT_SIGNAL(canceled(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled(const TQString&)) ); - connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - TQT_TQOBJECT(this), TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); - connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg())); - connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg())); - connect(m_doc, TQT_SIGNAL(undoChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg())); + connect( m_doc, TQ_SIGNAL(undoChanged()), + this, TQ_SLOT(slotNewUndo()) ); + connect( m_doc, TQ_SIGNAL(hlChanged()), + this, TQ_SLOT(slotHlChanged()) ); + connect( m_doc, TQ_SIGNAL(canceled(const TQString&)), + this, TQ_SLOT(slotSaveCanceled(const TQString&)) ); + connect( m_viewInternal, TQ_SIGNAL(dropEventPass(TQDropEvent*)), + this, TQ_SIGNAL(dropEventPass(TQDropEvent*)) ); + connect(this,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(slotStatusMsg())); + connect(this,TQ_SIGNAL(newStatus()),this,TQ_SLOT(slotStatusMsg())); + connect(m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotStatusMsg())); if ( m_doc->browserView() ) { - connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - TQT_TQOBJECT(this), TQT_SLOT(slotDropEventPass(TQDropEvent*)) ); + connect( this, TQ_SIGNAL(dropEventPass(TQDropEvent*)), + this, TQ_SLOT(slotDropEventPass(TQDropEvent*)) ); } } @@ -212,84 +212,84 @@ void KateView::setupActions() m_toggleWriteLock = 0; - m_cut = a=KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), ac); + m_cut = a=KStdAction::cut(this, TQ_SLOT(cut()), ac); a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard")); - m_paste = a=KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), ac); + m_paste = a=KStdAction::pasteText(this, TQ_SLOT(paste()), ac); a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents")); - m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); + m_copy = a=KStdAction::copy(this, TQ_SLOT(copy()), ac); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); - m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); + m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQ_SLOT(copyHTML()), ac, "edit_copy_html"); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); if (!m_doc->readOnly()) { - a=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), ac); + a=KStdAction::save(this, TQ_SLOT(save()), ac); a->setWhatsThis(i18n("Save the current document")); - a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac); + a=m_editUndo = KStdAction::undo(m_doc, TQ_SLOT(undo()), ac); a->setWhatsThis(i18n("Revert the most recent editing actions")); - a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); + a=m_editRedo = KStdAction::redo(m_doc, TQ_SLOT(redo()), ac); a->setWhatsThis(i18n("Revert the most recent undo operation")); - (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( + (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQ_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( i18n("Use this command to wrap all lines of the current document which are longer than the width of the" " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated" " when the view is resized.")); // setup Tools menu - a=new TDEAction(i18n("&Indent"), "format-indent-more", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); + a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQ_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Unindent"), "format-indent-less", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); + a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQ_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); - a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); + a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQ_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); + a=new TDEAction(i18n("&Align"), 0, this, TQ_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); - a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), + a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQ_SLOT(comment()), ac, "tools_comment"); a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), + a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQ_SLOT(uncomment()), ac, "tools_uncomment"); a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); a = m_toggleWriteLock = new TDEToggleAction( i18n("&Read Only Mode"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ), + this, TQ_SLOT( toggleWriteLock() ), ac, "tools_toggle_write_lock" ); a->setWhatsThis( i18n("Lock/unlock the document for writing") ); - a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT(uppercase()), ac, "tools_uppercase" ); + a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, this, + TQ_SLOT(uppercase()), ac, "tools_uppercase" ); a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT(lowercase()), ac, "tools_lowercase" ); + a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, this, + TQ_SLOT(lowercase()), ac, "tools_lowercase" ); a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), - TQT_SLOT(capitalize()), ac, "tools_capitalize" ); + a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, this, + TQ_SLOT(capitalize()), ac, "tools_capitalize" ); a->setWhatsThis( i18n("Capitalize the selection, or the word under the " "cursor if no text is selected.") ); - a = new TDEAction( i18n("Delete Line"), 0, TQT_TQOBJECT(this), - TQT_SLOT( killLine() ), ac, "tools_delete_line"); + a = new TDEAction( i18n("Delete Line"), 0, this, + TQ_SLOT( killLine() ), ac, "tools_delete_line"); a->setWhatsThis(i18n("Use this to delete the current line.")); - a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), - TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); + a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, this, + TQ_SLOT( joinLines() ), ac, "tools_join_lines" ); a->setWhatsThis(i18n("Use this to join lines together.")); } else @@ -300,19 +300,19 @@ void KateView::setupActions() m_editRedo = 0; } - a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); + a=KStdAction::print( m_doc, TQ_SLOT(print()), ac ); a->setWhatsThis(i18n("Print the current document.")); - a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload"); + a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQ_SLOT(reloadFile()), ac, "file_reload"); a->setWhatsThis(i18n("Reload the current document from disk.")); - a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac); + a=KStdAction::saveAs(this, TQ_SLOT(saveAs()), ac); a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice.")); - a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac); + a=KStdAction::gotoLine(this, TQ_SLOT(gotoLine()), ac); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); - a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); + a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQ_SLOT(configDialog()),ac, "set_confdlg"); a->setWhatsThis(i18n("Configure various aspects of this editor.")); KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight"); @@ -329,45 +329,45 @@ void KateView::setupActions() new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); // html export - a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html"); + a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQ_SLOT(exportAsHTML()), ac, "file_export_html"); a->setWhatsThis(i18n("This command allows you to export the current document" " with all highlighting information into a HTML document.")); - m_selectAll = a=KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAll()), ac); + m_selectAll = a=KStdAction::selectAll(this, TQ_SLOT(selectAll()), ac); a->setWhatsThis(i18n("Select the entire text of the current document.")); - m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac); + m_deSelect = a=KStdAction::deselect(this, TQ_SLOT(clearSelection()), ac); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); - a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); + a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQ_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a->setWhatsThis(i18n("This increases the display font size.")); - a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); + a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQ_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a->setWhatsThis(i18n("This decreases the display font size.")); a= m_toggleBlockSelection = new TDEToggleAction( i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, - TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()), + this, TQ_SLOT(toggleBlockSelectionMode()), ac, "set_verticalSelect"); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); a= m_toggleInsert = new TDEToggleAction( i18n("Overwr&ite Mode"), Key_Insert, - TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()), + this, TQ_SLOT(toggleInsert()), ac, "set_insert" ); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); TDEToggleAction *toggleAction; a= m_toggleDynWrap = toggleAction = new TDEToggleAction( i18n("&Dynamic Word Wrap"), Key_F10, - TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()), + this, TQ_SLOT(toggleDynWordWrap()), ac, "view_dynamic_word_wrap" ); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); - connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int))); + connect(m_setDynWrapIndicators, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDynWrapIndicators(int))); TQStringList list2; list2.append(i18n("&Off")); list2.append(i18n("Follow &Line Numbers")); @@ -376,14 +376,14 @@ void KateView::setupActions() a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction( i18n("Show Folding &Markers"), Key_F9, - TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()), + this, TQ_SLOT(toggleFoldingMarkers()), ac, "view_folding_markers" ); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); toggleAction->setCheckedState(i18n("Hide Folding &Markers")); a= m_toggleIconBar = toggleAction = new TDEToggleAction( i18n("Show &Icon Border"), Key_F6, - TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()), + this, TQ_SLOT(toggleIconBorder()), ac, "view_border"); a=toggleAction; a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance.")); @@ -391,21 +391,21 @@ void KateView::setupActions() a= toggleAction=m_toggleLineNumbers = new TDEToggleAction( i18n("Show &Line Numbers"), Key_F11, - TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()), + this, TQ_SLOT(toggleLineNumbersOn()), ac, "view_line_numbers" ); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); toggleAction->setCheckedState(i18n("Hide &Line Numbers")); a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction( i18n("Show Scroll&bar Marks"), 0, - TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()), + this, TQ_SLOT(toggleScrollBarMarks()), ac, "view_scrollbar_marks"); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks.")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); a = toggleAction = m_toggleWWMarker = new TDEToggleAction( i18n("Show Static &Word Wrap Marker"), 0, - TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ), + this, TQ_SLOT( toggleWWMarker() ), ac, "view_word_wrap_marker" ); a->setWhatsThis( i18n( "Show/hide the Word Wrap Marker, a vertical line drawn at the word " @@ -414,7 +414,7 @@ void KateView::setupActions() a= m_switchCmdLine = new TDEAction( i18n("Switch to Command Line"), Key_F7, - TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()), + this, TQ_SLOT(switchToCmdLine()), ac, "switch_to_cmd_line" ); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); @@ -426,10 +426,10 @@ void KateView::setupActions() list.append("&Macintosh"); m_setEndOfLine->setItems(list); m_setEndOfLine->setCurrentItem (m_doc->config()->eol()); - connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setEol(int))); + connect(m_setEndOfLine, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEol(int))); // encoding menu - new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), TQT_TQOBJECT(ac), "set_encoding"); + new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding"); m_search->createActions( ac ); m_spell->createActions( ac ); @@ -437,144 +437,144 @@ void KateView::setupActions() slotSelectionChanged (); - connect (this, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged())); + connect (this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); } void KateView::setupEditActions() { - m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" ); + m_editActions = new TDEActionCollection( m_viewInternal, this, "edit_actions" ); TDEActionCollection* ac = m_editActions; new TDEAction( i18n("Move Word Left"), CTRL + Key_Left, - TQT_TQOBJECT(this),TQT_SLOT(wordLeft()), + this,TQ_SLOT(wordLeft()), ac, "word_left" ); new TDEAction( i18n("Select Character Left"), SHIFT + Key_Left, - TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()), + this,TQ_SLOT(shiftCursorLeft()), ac, "select_char_left" ); new TDEAction( i18n("Select Word Left"), SHIFT + CTRL + Key_Left, - TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()), + this, TQ_SLOT(shiftWordLeft()), ac, "select_word_left" ); new TDEAction( i18n("Move Word Right"), CTRL + Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(wordRight()), + this, TQ_SLOT(wordRight()), ac, "word_right" ); new TDEAction( i18n("Select Character Right"), SHIFT + Key_Right, - TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()), + this, TQ_SLOT(shiftCursorRight()), ac, "select_char_right" ); new TDEAction( i18n("Select Word Right"), SHIFT + CTRL + Key_Right, - TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()), + this,TQ_SLOT(shiftWordRight()), ac, "select_word_right" ); new TDEAction( i18n("Move to Beginning of Line"), Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(home()), + this, TQ_SLOT(home()), ac, "beginning_of_line" ); new TDEAction( i18n("Move to Beginning of Document"), TDEStdAccel::home(), - TQT_TQOBJECT(this), TQT_SLOT(top()), + this, TQ_SLOT(top()), ac, "beginning_of_document" ); new TDEAction( i18n("Select to Beginning of Line"), SHIFT + Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(shiftHome()), + this, TQ_SLOT(shiftHome()), ac, "select_beginning_of_line" ); new TDEAction( i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, - TQT_TQOBJECT(this), TQT_SLOT(shiftTop()), + this, TQ_SLOT(shiftTop()), ac, "select_beginning_of_document" ); new TDEAction( i18n("Move to End of Line"), Key_End, - TQT_TQOBJECT(this), TQT_SLOT(end()), + this, TQ_SLOT(end()), ac, "end_of_line" ); new TDEAction( i18n("Move to End of Document"), TDEStdAccel::end(), - TQT_TQOBJECT(this), TQT_SLOT(bottom()), + this, TQ_SLOT(bottom()), ac, "end_of_document" ); new TDEAction( i18n("Select to End of Line"), SHIFT + Key_End, - TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()), + this, TQ_SLOT(shiftEnd()), ac, "select_end_of_line" ); new TDEAction( i18n("Select to End of Document"), SHIFT + CTRL + Key_End, - TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()), + this, TQ_SLOT(shiftBottom()), ac, "select_end_of_document" ); new TDEAction( i18n("Select to Previous Line"), SHIFT + Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(shiftUp()), + this, TQ_SLOT(shiftUp()), ac, "select_line_up" ); new TDEAction( i18n("Scroll Line Up"),"", CTRL + Key_Up, - TQT_TQOBJECT(this), TQT_SLOT(scrollUp()), + this, TQ_SLOT(scrollUp()), ac, "scroll_line_up" ); - new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), + new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQ_SLOT(down()), ac, "move_line_down"); - new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), + new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQ_SLOT(up()), ac, "move_line_up"); - new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this), - TQT_SLOT(cursorRight()), ac, "move_cursor_right"); + new TDEAction(i18n("Move Character Right"), Key_Right, this, + TQ_SLOT(cursorRight()), ac, "move_cursor_right"); - new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()), + new TDEAction(i18n("Move Character Left"), Key_Left, this, TQ_SLOT(cursorLeft()), ac, "move_cusor_left"); new TDEAction( i18n("Select to Next Line"), SHIFT + Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(shiftDown()), + this, TQ_SLOT(shiftDown()), ac, "select_line_down" ); new TDEAction( i18n("Scroll Line Down"), CTRL + Key_Down, - TQT_TQOBJECT(this), TQT_SLOT(scrollDown()), + this, TQ_SLOT(scrollDown()), ac, "scroll_line_down" ); new TDEAction( i18n("Scroll Page Up"), TDEStdAccel::prior(), - TQT_TQOBJECT(this), TQT_SLOT(pageUp()), + this, TQ_SLOT(pageUp()), ac, "scroll_page_up" ); new TDEAction( i18n("Select Page Up"), SHIFT + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()), + this, TQ_SLOT(shiftPageUp()), ac, "select_page_up" ); new TDEAction( i18n("Move to Top of View"), CTRL + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(topOfView()), + this, TQ_SLOT(topOfView()), ac, "move_top_of_view" ); new TDEAction( i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, - TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()), + this, TQ_SLOT(shiftTopOfView()), ac, "select_top_of_view" ); new TDEAction( i18n("Scroll Page Down"), TDEStdAccel::next(), - TQT_TQOBJECT(this), TQT_SLOT(pageDown()), + this, TQ_SLOT(pageDown()), ac, "scroll_page_down" ); new TDEAction( i18n("Select Page Down"), SHIFT + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()), + this, TQ_SLOT(shiftPageDown()), ac, "select_page_down" ); new TDEAction( i18n("Move to Bottom of View"), CTRL + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()), + this, TQ_SLOT(bottomOfView()), ac, "move_bottom_of_view" ); new TDEAction( i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, - TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()), + this, TQ_SLOT(shiftBottomOfView()), ac, "select_bottom_of_view" ); new TDEAction( i18n("Move to Matching Bracket"), CTRL + Key_6, - TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()), + this, TQ_SLOT(toMatchingBracket()), ac, "to_matching_bracket" ); new TDEAction( i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, - TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()), + this, TQ_SLOT(shiftToMatchingBracket()), ac, "select_matching_bracket" ); // anders: shortcuts doing any changes should not be created in browserextension @@ -582,40 +582,40 @@ void KateView::setupEditActions() { new TDEAction( i18n("Transpose Characters"), CTRL + Key_T, - TQT_TQOBJECT(this), TQT_SLOT(transpose()), + this, TQ_SLOT(transpose()), ac, "transpose_char" ); new TDEAction( i18n("Delete Line"), CTRL + Key_K, - TQT_TQOBJECT(this), TQT_SLOT(killLine()), + this, TQ_SLOT(killLine()), ac, "delete_line" ); new TDEAction( i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(), - TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()), + this, TQ_SLOT(deleteWordLeft()), ac, "delete_word_left" ); new TDEAction( i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(), - TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()), + this, TQ_SLOT(deleteWordRight()), ac, "delete_word_right" ); new TDEAction(i18n("Delete Next Character"), Key_Delete, - TQT_TQOBJECT(this), TQT_SLOT(keyDelete()), + this, TQ_SLOT(keyDelete()), ac, "delete_next_character"); TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace, - TQT_TQOBJECT(this), TQT_SLOT(backspace()), + this, TQ_SLOT(backspace()), ac, "backspace"); TDEShortcut cut = a->shortcut(); cut.append( KKey( SHIFT + Key_Backspace ) ); a->setShortcut( cut ); } - connect( this, TQT_SIGNAL(gotFocus(Kate::View*)), - TQT_TQOBJECT(this), TQT_SLOT(slotGotFocus()) ); - connect( this, TQT_SIGNAL(lostFocus(Kate::View*)), - TQT_TQOBJECT(this), TQT_SLOT(slotLostFocus()) ); + connect( this, TQ_SIGNAL(gotFocus(Kate::View*)), + this, TQ_SLOT(slotGotFocus()) ); + connect( this, TQ_SIGNAL(lostFocus(Kate::View*)), + this, TQ_SLOT(slotLostFocus()) ); m_editActions->readShortcutSettings( "Katepart Shortcuts" ); @@ -631,18 +631,18 @@ void KateView::setupCodeFolding() { TDEActionCollection *ac=this->actionCollection(); new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, - m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); + m_doc->foldingTree(),TQ_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, - TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); + this,TQ_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, - TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); + this,TQ_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus, - TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); + this,TQ_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); #ifdef DEBUGACCELS - TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this)); - debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); - debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); + TDEAccel* debugAccels = new TDEAccel(this,this); + debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQ_SLOT(dumpRegionTree())); + debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQ_SLOT(testTemplateCode())); debugAccels->setEnabled(true); #endif } @@ -669,16 +669,16 @@ void KateView::slotExpandLocal() void KateView::setupCodeCompletion() { m_codeCompletion = new KateCodeCompletion(this); - connect( m_codeCompletion, TQT_SIGNAL(completionAborted()), - TQT_TQOBJECT(this), TQT_SIGNAL(completionAborted())); - connect( m_codeCompletion, TQT_SIGNAL(completionDone()), - TQT_TQOBJECT(this), TQT_SIGNAL(completionDone())); - connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()), - TQT_TQOBJECT(this), TQT_SIGNAL(argHintHidden())); - connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - TQT_TQOBJECT(this), TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry))); - connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), - TQT_TQOBJECT(this), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); + connect( m_codeCompletion, TQ_SIGNAL(completionAborted()), + this, TQ_SIGNAL(completionAborted())); + connect( m_codeCompletion, TQ_SIGNAL(completionDone()), + this, TQ_SIGNAL(completionDone())); + connect( m_codeCompletion, TQ_SIGNAL(argHintHidden()), + this, TQ_SIGNAL(argHintHidden())); + connect( m_codeCompletion, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry))); + connect( m_codeCompletion, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), + this, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); } void KateView::slotGotFocus() @@ -1921,5 +1921,3 @@ void KateView::getIMSelectionValue( uint *imStartLine, uint *imStart, uint *imEn *imSelEnd = m_imSelEnd; } //END IM INPUT STUFF - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateview.h b/kate/part/kateview.h index 0a00ab1fc..1e113618e 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -62,7 +62,7 @@ class KateView : public Kate::View, public KTextEditor::SelectionInterfaceExt, public KTextEditor::BlockSelectionInterface { - Q_OBJECT + TQ_OBJECT friend class KateViewInternal; friend class KateIconBorder; diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index dd52451b0..948040236 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -65,15 +65,15 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent, , m_savVisibleLines(0) , m_showMarks(false) { - connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderMaybeMoved(int))); - connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged())); + connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderMaybeMoved(int))); + connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged())); m_lines.setAutoDelete(true); } void KateScrollBar::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) m_middleMouseDown = true; TQScrollBar::mousePressEvent(e); @@ -94,7 +94,7 @@ void KateScrollBar::mouseMoveEvent(TQMouseEvent* e) { TQScrollBar::mouseMoveEvent(e); - if (e->state() | Qt::LeftButton) + if (e->state() | TQt::LeftButton) redrawMarks(); } @@ -295,8 +295,8 @@ KateCmdLine::KateCmdLine (KateView *view) , m_command( 0L ) , m_oldCompletionObject( 0L ) { - connect (this, TQT_SIGNAL(returnPressed(const TQString &)), - this, TQT_SLOT(slotReturnPressed(const TQString &))); + connect (this, TQ_SIGNAL(returnPressed(const TQString &)), + this, TQ_SLOT(slotReturnPressed(const TQString &))); completionObject()->insertItems (KateCmd::self()->cmds()); setAutoDeleteCompletionObject( false ); @@ -375,7 +375,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) m_cmdend = 0; m_view->setFocus (); - TQTimer::singleShot( 4000, this, TQT_SLOT(hideMe()) ); + TQTimer::singleShot( 4000, this, TQ_SLOT(hideMe()) ); } void KateCmdLine::hideMe () // unless i have focus ;) @@ -716,7 +716,7 @@ void KateIconBorder::setIconBorderOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setLineNumbersOn( bool enable ) @@ -729,7 +729,7 @@ void KateIconBorder::setLineNumbersOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setDynWrapIndicators( int state ) @@ -742,7 +742,7 @@ void KateIconBorder::setDynWrapIndicators( int state ) updateGeometry (); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setFoldingMarkersOn( bool enable ) @@ -754,7 +754,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } TQSize KateIconBorder::sizeHint() const @@ -953,7 +953,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) if (realLine > -1) if (m_viewInternal->lineRanges[z].startCol == 0) { if (m_lineNumbersOn) - p.drawText( lnX + 1, y, lnWidth-4, h, Qt::AlignRight|Qt::AlignVCenter, TQString("%1").arg( realLine + 1 ) ); + p.drawText( lnX + 1, y, lnWidth-4, h, TQt::AlignRight|TQt::AlignVCenter, TQString("%1").arg( realLine + 1 ) ); } else if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) { p.drawPixmap(lnX + lnWidth - m_arrow.width() - 4, y, m_arrow); } @@ -1069,7 +1069,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e ) { BorderArea area = positionToArea( e->pos() ); if( area == IconBorder) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) { if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() ) m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() ); @@ -1080,7 +1080,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e ) } } else - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { showMarkMenu( cursorOnLine, TQCursor::pos() ); } } @@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) { KateViewConfig::global()->setDefaultMarkType (vec[result-100]); // flush config, otherwise it isn't nessecarily done - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kate View Defaults"); KateViewConfig::global()->writeConfig( config ); } @@ -1170,7 +1170,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name) : TDEActionMenu (text, parent, name), doc(_doc), view (_view) { - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewEncodingAction::slotAboutToShow() @@ -1180,7 +1180,7 @@ void KateViewEncodingAction::slotAboutToShow() popupMenu()->clear (); for (uint z=0; z<modes.size(); ++z) { - popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z); + popupMenu()->insertItem ( modes[z], this, TQ_SLOT(setMode(int)), 0, z); bool found = false; TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found); @@ -1201,5 +1201,3 @@ void KateViewEncodingAction::setMode (int mode) doc->setEncodingSticky( true ); doc->reloadFile(); } - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h index 980d4d1cd..1e162af18 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -47,7 +47,7 @@ namespace Kate { */ class KateScrollBar : public TQScrollBar { - Q_OBJECT + TQ_OBJECT public: KateScrollBar(Orientation orientation, class KateViewInternal *parent, const char* name = 0L); @@ -94,7 +94,7 @@ class KateScrollBar : public TQScrollBar class KateCmdLine : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: KateCmdLine (KateView *view); @@ -121,7 +121,7 @@ class KateCmdLine : public KLineEdit class KateIconBorder : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KateIconBorder( KateViewInternal* internalView, TQWidget *parent ); @@ -184,7 +184,7 @@ class KateIconBorder : public TQWidget class KateViewEncodingAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent = 0, const char* name = 0); @@ -203,5 +203,3 @@ class KateViewEncodingAction : public TDEActionMenu }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index c2b0ca4db..40ab06252 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -57,7 +57,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) , editIsRunning (false) , m_view (view) , m_doc (doc) - , cursor (doc, true, 0, 0, TQT_TQOBJECT(this)) + , cursor (doc, true, 0, 0, this) , possibleTripleClick (false) , m_dummy (0) , m_startPos(doc, true, 0,0) @@ -94,7 +94,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // // scrollbar for lines // - m_lineScroll = new KateScrollBar(Qt::Vertical, this); + m_lineScroll = new KateScrollBar(TQt::Vertical, this); m_lineScroll->show(); m_lineScroll->setTracking (true); @@ -116,14 +116,14 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) m_lineLayout->addWidget(m_dummy); // Hijack the line scroller's controls, so we can scroll nicely for word-wrap - connect(m_lineScroll, TQT_SIGNAL(prevPage()), TQT_SLOT(scrollPrevPage())); - connect(m_lineScroll, TQT_SIGNAL(nextPage()), TQT_SLOT(scrollNextPage())); + connect(m_lineScroll, TQ_SIGNAL(prevPage()), TQ_SLOT(scrollPrevPage())); + connect(m_lineScroll, TQ_SIGNAL(nextPage()), TQ_SLOT(scrollNextPage())); - connect(m_lineScroll, TQT_SIGNAL(prevLine()), TQT_SLOT(scrollPrevLine())); - connect(m_lineScroll, TQT_SIGNAL(nextLine()), TQT_SLOT(scrollNextLine())); + connect(m_lineScroll, TQ_SIGNAL(prevLine()), TQ_SLOT(scrollPrevLine())); + connect(m_lineScroll, TQ_SIGNAL(nextLine()), TQ_SLOT(scrollNextLine())); - connect(m_lineScroll, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(scrollLines(int))); - connect(m_lineScroll, TQT_SIGNAL(sliderMMBMoved(int)), TQT_SLOT(scrollLines(int))); + connect(m_lineScroll, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(scrollLines(int))); + connect(m_lineScroll, TQ_SIGNAL(sliderMMBMoved(int)), TQ_SLOT(scrollLines(int))); // catch wheel events, completing the hijack m_lineScroll->installEventFilter(this); @@ -131,7 +131,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // // scrollbar for columns // - m_columnScroll = new TQScrollBar(Qt::Horizontal,m_view); + m_columnScroll = new TQScrollBar(TQt::Horizontal,m_view); // hide the column scrollbar in the dynamic word wrap mode if (m_view->dynWordWrap()) @@ -142,8 +142,8 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) m_columnScroll->setTracking(true); m_startX = 0; - connect( m_columnScroll, TQT_SIGNAL( valueChanged (int) ), - this, TQT_SLOT( scrollColumns (int) ) ); + connect( m_columnScroll, TQ_SIGNAL( valueChanged (int) ), + this, TQ_SLOT( scrollColumns (int) ) ); // // iconborder ;) @@ -151,13 +151,13 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) leftBorder = new KateIconBorder( this, m_view ); leftBorder->show (); - connect( leftBorder, TQT_SIGNAL(toggleRegionVisibility(unsigned int)), - m_doc->foldingTree(), TQT_SLOT(toggleRegionVisibility(unsigned int))); + connect( leftBorder, TQ_SIGNAL(toggleRegionVisibility(unsigned int)), + m_doc->foldingTree(), TQ_SLOT(toggleRegionVisibility(unsigned int))); - connect( doc->foldingTree(), TQT_SIGNAL(regionVisibilityChangedAt(unsigned int)), - this, TQT_SLOT(slotRegionVisibilityChangedAt(unsigned int))); - connect( doc, TQT_SIGNAL(codeFoldingUpdated()), - this, TQT_SLOT(slotCodeFoldingChanged()) ); + connect( doc->foldingTree(), TQ_SIGNAL(regionVisibilityChangedAt(unsigned int)), + this, TQ_SLOT(slotRegionVisibilityChangedAt(unsigned int))); + connect( doc, TQ_SIGNAL(codeFoldingUpdated()), + this, TQ_SLOT(slotCodeFoldingChanged()) ); displayCursor.setPos(0, 0); cursor.setPos(0, 0); @@ -182,21 +182,21 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) dragInfo.state = diNone; // timers - connect( &m_dragScrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doDragScroll() ) ); + connect( &m_dragScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doDragScroll() ) ); - connect( &m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( scrollTimeout() ) ); + connect( &m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( scrollTimeout() ) ); - connect( &m_cursorTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( cursorTimeout() ) ); + connect( &m_cursorTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( cursorTimeout() ) ); - connect( &m_textHintTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( textHintTimeout() ) ); + connect( &m_textHintTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( textHintTimeout() ) ); // selection changed to set anchor - connect( m_view, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( viewSelectionChanged() ) ); + connect( m_view, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( viewSelectionChanged() ) ); // this is a work arround for RTL desktops @@ -420,7 +420,7 @@ void KateViewInternal::scrollPos(KateTextCursor& c, bool force, bool calledExter Q_ASSERT(lines >= 0); - if (!calledExternally && QABS(viewLinesScrolled) < lines) + if (!calledExternally && TQABS(viewLinesScrolled) < lines) { updateView(false, viewLinesScrolled); @@ -456,7 +456,7 @@ void KateViewInternal::scrollColumns ( int x ) int dx = m_startX - x; m_startX = x; - if (QABS(dx) < width()) + if (TQABS(dx) < width()) scroll(dx, 0); else update(); @@ -1091,11 +1091,44 @@ public: void KateViewInternal::moveChar( Bias bias, bool sel ) { + if (bias == Bias::none) + { + return; + } + + KateTextLine::Ptr tl = m_doc->m_buffer->plainLine(cursor.line()); + if (!tl) + { + return; + } + + // Make sure to handle surrogate pairs correctly + int offset = 0; + int col = cursor.col(); + if (bias == Bias::left_b) + { + offset = -1; + if (tl->getChar(col - 1).isLowSurrogate() && tl->getChar(col - 2).isHighSurrogate()) + { + offset = -2; + } + } + else + { + offset = 1; + if (tl->getChar(col).isHighSurrogate() && tl->getChar(col + 1).isLowSurrogate()) + { + offset = 2; + } + } + KateTextCursor c; - if ( m_view->wrapCursor() ) { - c = WrappingCursor( this, cursor ) += bias; - } else { - c = BoundedCursor( this, cursor ) += bias; + if (m_view->wrapCursor()) + { + c = WrappingCursor( this, cursor ) += offset; + } else + { + c = BoundedCursor( this, cursor ) += offset; } updateSelection( c, sel ); @@ -1216,7 +1249,7 @@ void KateViewInternal::moveEdge( Bias bias, bool sel ) void KateViewInternal::home( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1257,7 +1290,7 @@ void KateViewInternal::home( bool sel ) void KateViewInternal::end( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1687,7 +1720,7 @@ int KateViewInternal::lineMaxCol(const KateLineRange& range) void KateViewInternal::cursorUp(bool sel) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Up, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Up, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1754,7 +1787,7 @@ void KateViewInternal::cursorUp(bool sel) void KateViewInternal::cursorDown(bool sel) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Down, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Down, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1889,7 +1922,7 @@ void KateViewInternal::setAutoCenterLines(int viewLines, bool updateView) void KateViewInternal::pageUp( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageUp, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageUp, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1938,7 +1971,7 @@ void KateViewInternal::pageUp( bool sel ) void KateViewInternal::pageDown( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageDown, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageDown, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2025,7 +2058,7 @@ void KateViewInternal::bottom( bool sel ) void KateViewInternal::top_home( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2037,7 +2070,7 @@ void KateViewInternal::top_home( bool sel ) void KateViewInternal::bottom_end( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2438,7 +2471,7 @@ bool KateViewInternal::isTargetSelected( const TQPoint& p ) bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) { - if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_lineScroll)) + if (obj == m_lineScroll) { // the second condition is to make sure a scroll on the vertical bar doesn't cause a horizontal scroll ;) if (e->type() == TQEvent::Wheel && m_lineScroll->minValue() != m_lineScroll->maxValue()) @@ -2465,7 +2498,7 @@ bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) m_view->m_codeCompletion->abortCompletion(); } - if ((k->key() == Qt::Key_Escape) && !m_view->config()->persistentSelection() ) + if ((k->key() == TQt::Key_Escape) && !m_view->config()->persistentSelection() ) { m_view->clearSelection(); return true; @@ -2525,7 +2558,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) kdDebug (13030) << "hint around" << endl; if( e->key() == Key_Enter || e->key() == Key_Return || - (key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) { + (key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) { m_view->m_codeCompletion->doComplete(); e->accept(); return; @@ -2538,14 +2571,14 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if ((key == Qt::Key_Return) || (key == Qt::Key_Enter)) + if ((key == TQt::Key_Return) || (key == TQt::Key_Enter)) { m_view->keyReturn(); e->accept(); return; } - if ((key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) + if ((key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) { uint ln = cursor.line(); int col = cursor.col(); @@ -2573,7 +2606,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == Qt::Key_Backspace || key == SHIFT + Qt::Key_Backspace) + if (key == TQt::Key_Backspace || key == SHIFT + TQt::Key_Backspace) { m_view->backspace(); e->accept(); @@ -2584,7 +2617,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == Qt::Key_Tab || key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) + if (key == TQt::Key_Tab || key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab) { if (m_doc->invokeTabInterceptor(key)) { e->accept(); @@ -2592,7 +2625,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) } else if (m_doc->configFlags() & KateDocumentConfig::cfTabIndents) { - if( key == Qt::Key_Tab ) + if( key == TQt::Key_Tab ) { if (m_view->hasSelection() || (m_doc->configFlags() & KateDocumentConfig::cfTabIndentsMode)) m_doc->indent( m_view, cursor.line(), 1 ); @@ -2609,7 +2642,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) + if (key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab) { m_doc->indent( m_view, cursor.line(), -1 ); e->accept(); @@ -2693,7 +2726,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e ) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selChangedByUser = false; if (possibleTripleClick) @@ -2820,7 +2853,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selectionMode = Word; if ( e->state() & TQt::ShiftButton ) @@ -2902,7 +2935,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e) } possibleTripleClick = true; - TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQT_SLOT(tripleClickTimeout()) ); + TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQ_SLOT(tripleClickTimeout()) ); scrollX = 0; scrollY = 0; @@ -2927,7 +2960,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selectionMode = Default; // selStartCached.setLine( -1 ); @@ -2956,7 +2989,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) e->accept (); break; - case Qt::MidButton: + case TQt::MidButton: placeCursor( e->pos() ); if( m_doc->isReadWrite() ) @@ -2977,7 +3010,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) { if (dragInfo.state == diPending) { @@ -3263,27 +3296,44 @@ void KateViewInternal::clear() void KateViewInternal::wheelEvent(TQWheelEvent* e) { - if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != Qt::Horizontal) { - // React to this as a vertical event - if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) { - if (e->delta() > 0) - scrollPrevPage(); - else - scrollNextPage(); - } else { - scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines())); - // maybe a menu was opened or a bubbled window title is on us -> we shall erase it - update(); - leftBorder->update(); - } - - } else if (columnScrollingPossible()) { - TQWheelEvent copy = *e; - TQApplication::sendEvent(m_columnScroll, ©); - - } else { - e->ignore(); - } + if (e->state() & ControlButton) + { + if (e->delta() > 0) + { + slotIncFontSizes(); + } + else + { + slotDecFontSizes(); + } + } + else + { + if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != TQt::Horizontal) + { + // React to this as a vertical event + if ( e->state() & ShiftButton ) + { + if (e->delta() > 0) + scrollPrevPage(); + else + scrollNextPage(); + } + else + { + scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines())); + // maybe a menu was opened or a bubbled window title is on us -> we shall erase it + update(); + leftBorder->update(); + } + } else if (columnScrollingPossible()) { + TQWheelEvent copy = *e; + TQApplication::sendEvent(m_columnScroll, ©); + + } else { + e->ignore(); + } + } } void KateViewInternal::startDragScroll() @@ -3492,5 +3542,3 @@ void KateViewInternal::imEndEvent( TQIMEvent *e ) m_imPreeditSelStart = 0; } //END IM INPUT STUFF - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h index 94af8cc30..77fb81e7a 100644 --- a/kate/part/kateviewinternal.h +++ b/kate/part/kateviewinternal.h @@ -52,7 +52,7 @@ enum Bias class KateViewInternal : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KateView; friend class KateIconBorder; @@ -394,5 +394,3 @@ class KateViewInternal : public TQWidget }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 1b6decfe3..972d8a7ea 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -32,7 +32,7 @@ #include <signal.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqimage.h> #include <tqfile.h> #include "test_regression.h" @@ -44,7 +44,7 @@ #include "katefactory.h" #include <tdeio/job.h> #include <tdemainwindow.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobalsettings.h> #include <tqcolor.h> @@ -365,7 +365,7 @@ KJS::Value OutputFunction::call(KJS::ExecState *exec, KJS::Object &thisObj, cons const char failureSnapshotPrefix[] = "testkateregressionrc-FS."; static TQString findMostRecentFailureSnapshot() { - TQDir dir(kapp->dirs()->saveLocation("config"), + TQDir dir(tdeApp->dirs()->saveLocation("config"), TQString(failureSnapshotPrefix)+"*", TQDir::Time, TQDir::Files); return dir[0].mid(sizeof failureSnapshotPrefix - 1); @@ -464,7 +464,7 @@ int main(int argc, char *argv[]) TDEApplication a; a.disableAutoDcopRegistration(); a.setStyle("windows"); - KSimpleConfig cfg( "testkateregressionrc" ); + TDESimpleConfig cfg( "testkateregressionrc" ); cfg.setGroup("Kate Document Defaults"); cfg.writeEntry("Basic Config Flags", KateDocumentConfig::cfBackspaceIndents @@ -492,7 +492,7 @@ int main(int argc, char *argv[]) int rv = 1; { - KSimpleConfig dc( "kdebugrc" ); + TDESimpleConfig dc( "kdebugrc" ); // FIXME adapt to kate static int areas[] = { 1000, 13000, 13001, 13002, 13010, 13020, 13025, 13030, 13033, 13035, @@ -549,10 +549,10 @@ int main(int argc, char *argv[]) baseDir, args->getOption("output"), args->isSet("genoutput")); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )), - regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int ))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )), + regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int ))); regressionTest->m_keepOutput = args->isSet("keep-output"); regressionTest->m_showGui = args->isSet("show"); @@ -563,14 +563,14 @@ int main(int argc, char *argv[]) failureSnapshot = findMostRecentFailureSnapshot(); if (!failureSnapshot.isEmpty()) regressionTest->setFailureSnapshotConfig( - new KSimpleConfig(failureSnapshotPrefix + failureSnapshot, true), + new TDESimpleConfig(failureSnapshotPrefix + failureSnapshot, true), failureSnapshot); } if (args->isSet("save-failures")) { TQString failureSaver = args->getOption("save-failures"); regressionTest->setFailureSnapshotSaver( - new KSimpleConfig(failureSnapshotPrefix + failureSaver, false), + new TDESimpleConfig(failureSnapshotPrefix + failureSaver, false), failureSaver); } @@ -628,7 +628,7 @@ int main(int argc, char *argv[]) link += TQString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>") .arg(regressionTest->m_passes_new) .arg(regressionTest->m_failureComp->group()); - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } } @@ -681,12 +681,12 @@ RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig, TQString s; f.open( IO_WriteOnly | IO_Truncate ); s = "<html><body>Follow the white rabbit"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); f.setName( m_outputDir + "/index.html" ); f.open( IO_WriteOnly | IO_Truncate ); s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); curr = this; @@ -848,7 +848,7 @@ void RegressionTest::createLink( const TQString& test, int failures ) if (failures & NewFailure) link += "</span>"; link += "<br>\n"; - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } @@ -906,7 +906,7 @@ static void pause(int msec) TQTime t; t.start(); do { - kapp->processEvents(); + tdeApp->processEvents(); } while (t.elapsed() < msec); } @@ -1020,7 +1020,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) cl += "<div id='dom' class='diff'>" + domDiff + "</div>"; cl += "</body></html>"; - compare.tqwriteBlock( cl.latin1(), cl.length() ); + compare.writeBlock( cl.latin1(), cl.length() ); compare.close(); } @@ -1068,7 +1068,7 @@ void RegressionTest::testStaticFile(const TQString & filename, const TQStringLis if (!script_error) goto bail_out; - if (m_showGui) kapp->processEvents(); + if (m_showGui) tdeApp->processEvents(); if ( m_genOutput ) { reportResult(checkOutput(filename+"-result"), "result"); @@ -1340,5 +1340,3 @@ void RegressionTest::resizeTopLevelWidget( int w, int h ) } #include "test_regression.moc" - -// kate: indent-width 4 diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h index 2128ce25d..7ef1b9ee1 100644 --- a/kate/part/test_regression.h +++ b/kate/part/test_regression.h @@ -162,7 +162,7 @@ class OutputFunction : public KJS::ObjectImp */ class RegressionTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: RegressionTest(KateDocument *part, TDEConfig *baseConfig, diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 2be5b00fb..889fb98b1 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -37,7 +37,7 @@ #include <tdelocale.h> #include <kmimetype.h> #include <kmimetypechooser.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <kstaticdeleter.h> #include <kurl.h> @@ -66,7 +66,7 @@ AutoBookmarker::AutoBookmarker( TQObject *parent, KTextEditor::ConfigInterfaceExtension() { if ( parent ) - connect( parent, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); + connect( parent, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); } void AutoBookmarker::addView(KTextEditor::View */*view*/) @@ -113,7 +113,7 @@ void AutoBookmarker::slotCompleted() { // get the document info KTextEditor::DocumentInfoInterface *di = - ::tqqt_cast<KTextEditor::DocumentInfoInterface*>(document()); + ::tqt_cast<KTextEditor::DocumentInfoInterface*>(document()); TQString mt; if ( di ) // we can still try match the URL otherwise mt = di->mimeType(); @@ -292,7 +292,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark TQWhatsThis::add( lePattern, i18n( "<p>A regular expression. Matching lines will be bookmarked.</p>" ) ); - connect( lePattern, TQT_SIGNAL(textChanged ( const TQString & ) ),this, TQT_SLOT( slotPatternChanged( const TQString& ) ) ); + connect( lePattern, TQ_SIGNAL(textChanged ( const TQString & ) ),this, TQ_SLOT( slotPatternChanged( const TQString& ) ) ); cbCS = new TQCheckBox( i18n("Case &sensitive"), w ); lo->addMultiCellWidget( cbCS, 1, 1, 0, 2 ); @@ -334,7 +334,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark TQToolButton *btnMTW = new TQToolButton(w); lo->addWidget( btnMTW, 4, 2 ); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); TQWhatsThis::add( btnMTW, i18n( "<p>Click this button to display a checkable list of mimetypes available " "on your system. When used, the file masks entry above will be filled in " @@ -419,10 +419,10 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char lo1->addStretch( 1 ); - connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) ); - connect( btnDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDel()) ); - connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) ); - connect( lvPatterns, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotEdit()) ); + connect( btnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()) ); + connect( btnDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDel()) ); + connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()) ); + connect( lvPatterns, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotEdit()) ); m_ents = new ABEntityList(); m_ents->setAutoDelete( true ); diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h index 9687d8ceb..1f6d1daeb 100644 --- a/kate/plugins/autobookmarker/autobookmarker.h +++ b/kate/plugins/autobookmarker/autobookmarker.h @@ -50,7 +50,7 @@ class AutoBookmarker : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface, public KTextEditor::ConfigInterfaceExtension { - Q_OBJECT + TQ_OBJECT public: AutoBookmarker( TQObject *parent = 0, const char* name = 0, @@ -96,7 +96,7 @@ class ABGlobal class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage { - Q_OBJECT + TQ_OBJECT public: AutoBookmarkerConfigPage( TQWidget *parent, const char *name ); virtual ~AutoBookmarkerConfigPage() {}; @@ -118,7 +118,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage class AutoBookmarkerEntEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmarkEnt *e ); ~AutoBookmarkerEntEditor(){}; diff --git a/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop index 59aa06026..57417e19f 100644 --- a/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop +++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop @@ -1,133 +1,6 @@ [Desktop Entry] Name=KTextEditor Autobookmarker -Name[af]=KTextEditor OutoBoekmerker -Name[be]=Аўтаматычны закладкі -Name[bn]=কে-টেক্সট-এডিটর অটো-মুকমার্কার -Name[br]=Sinedoù emgefreek evit KTextEditor -Name[bs]=KTextEditor automatske zabilješke -Name[ca]=Punts automàtics per al KTextEditor -Name[cs]=Modul automatických odkazů -Name[csb]=Aùtomatné wstôwianié załóżków dlô KTextEditor -Name[de]=KTextEditor: Autom. Lesezeichenmarkierung -Name[el]=Πρόσθετο αυτόματων σελιδοδεικτών του KTextEditor -Name[eo]=KTextEditor Aŭtomata legosignigilo -Name[es]=Automarcadores de KTextEditor -Name[et]=KTextEditori järjehoidjate märkija -Name[eu]=KTextEditor-en laster-markatzaile automatikoa -Name[fa]=چوب الف خودکار KTextEditor -Name[fi]=KTextEditorin automaattinen kirjanmerkkien tekijä -Name[fr]=Signets automatiques KTextEditor -Name[fy]=Automatyske blêdwizer foar de KTekstbewurker -Name[ga]=Leabharmharcálaí Uathoibríoch KTextEditor -Name[gl]=Auto-marcador de KTextEditor -Name[he]= תוסף סימניות אוטומטיות של KTextEditor -Name[hi]=के-टेक्स्ट-एडिटर ऑटोबुकमार्कर -Name[hr]=KTextEditor automatske oznake -Name[hu]=KTextEditor automatikus könyvjelzők -Name[id]=Penandabuku Otomatis KTextEditor -Name[is]=KTextEditor sjálfvirkur bókamerkjari -Name[it]=Segnalibri automatici di KTextEditor -Name[ja]=KTextEditor 自動ブックマーク -Name[ka]=KTextEditor-ის ავტოსანიშნე -Name[kk]=KTextEditor автобетбелгігіші -Name[km]=វត្ថុចំណាំស្វ័យប្រវត្តិ KTextEditor -Name[lb]=Automateschen Lieszeechesetzer fir den KTextEditor -Name[lt]=KTextEditor automatinis žymelių įterpėjas -Name[lv]=KTextEditor automātiskais grāmatzīmju licējs -Name[mk]=KTextEditor Автообележувач -Name[ms]=Penanda buku auto KTextEditor -Name[nb]=Automatisk bokmerke for KTextEditor -Name[nds]=KTextEditor -Leestekensetter -Name[nl]=KTextEditor Autobladwijzers -Name[nn]=Automatisk bokmerke for KTextEditor -Name[pa]=ਕੇਪਾਠਸੰਪਾਦਕ ਸਵੈਬੁੱਕਮਾਰਕਰ -Name[pl]=Automatyczne wstawianie zakładek dla KTextEditor -Name[pt]=Auto-favoritos do KTextEditor -Name[pt_BR]=Marca favoritos automático para Editor de textos -Name[ro]=Semne de carte automate pentru KTextEditor -Name[ru]=Автозакладки KTextEditor -Name[rw]=Mushyirahokimenyetsoyikoresha ya KMuhinduziMwandiko -Name[se]=KTextEditor:a automáhtalaš girjemerkejeaddji -Name[sk]=Automatické záložky pre KTextEditor -Name[sl]=Samodejni zaznamki za KTextEditor -Name[sr]=KTextEditor-ов аутомаркер -Name[sr@Latn]=KTextEditor-ov automarker -Name[sv]=Automatiska bokmärken för Ktexteditor -Name[ta]=கேஉரைதொகுப்பாளர் தானியக்க புத்தக உருவாக்கி -Name[te]=కెటెక్స్ట్ ఎడిటర్ ఆటొబుక్ మార్కర్ -Name[tg]=Хатчӯбмонии худкори KTextEditor -Name[th]=ตั้งที่คั่นหน้าอัตโนมัติ ของ KTextEditor -Name[tr]=KTextEditor Otomatik Sıkkullanılanlar Ekleyici -Name[tt]=KTextEditor'nıñ Aqıllı Bitbilge -Name[uk]=Втулок автоматичних закладок KTextEditor -Name[vi]=Bộ Tự động Đánh dấu KTextEditor -Name[zh_CN]=KTextEditor 自动书签器 Comment=Set bookmarks on lines matching a pattern when documents are loaded -Comment[af]=Stel boekmerke op lyne wat met 'n patroon ooreenstem wanneer dokumente gelaai word. -Comment[be]=Стварае закладкі для радкоў, якія адпавядаюць шаблону -Comment[bg]=Установяване на отметки на редовете, които отговарят на зададен шаблон по време на зареждане на файла -Comment[bn]=ডকুমেন্ট লোড করাকালীন প্রদত্ত নকশার সাথে মেলে এমন সমস্ত লাইন বুকমার্ক করে -Comment[bs]=Podešava zabilješke na linijama koje odgovaraju uzorku pri učitavanju dokumenta -Comment[ca]=Estableix punts a les línies coincidents amb un patró quan es carreguen documents -Comment[cs]=Nastavení záložek do řádek vyhovujících vzoru po nahrání dokumentu -Comment[csb]=Wstôwiô, òb czas wczëtëwaniô, załóżczi w pasownëch liniach do dónegò mùstra -Comment[da]=Sæt bogmærker på linjer der matcher et mønster når dokumenter er indlæst -Comment[de]=Lesezeichen nach bestimmten Mustern auf Zeilen setzen, sobald ein Dokument geladen wird -Comment[el]=Ορίζει σελιδοδείκτες σε γραμμές που ταιριάζουν σε ένα μοτίβο όταν τα έγγραφα φορτώνονται -Comment[eo]=Igas legosignojn en linioj, kiuj konvenas ŝablonon, kiam dokumentoj estas ŝarĝataj -Comment[es]=Pone marcadores en las líneas que coinciden con un patrón definido al cargar documentos. -Comment[et]=Määrab dokumendi avamisel vastavalt mustrile ridadele järjehoidjad -Comment[eu]=Eredu batekin bat datozen lerroen laster-markak ezartzen ditu dokumentuak kargatzean -Comment[fa]=وقتی که مستندات بار میشود، چوب الفها را روی خطوط مطابق با الگو تنظیم کنید -Comment[fi]=Määrittele kirjanmerkkejä riveille, jotka vastaavat kuviota, kun asiakirjoja avataan -Comment[fr]=Positionne des signets sur les lignes qui correspondent à un motif quand les documents sont chargés -Comment[fy]=Blêdwizer ynstelle om by it laden fan dokuminten oerienkomstige patroanen -Comment[ga]=Cruthaigh leabharmharcanna ar línte a mheaitseálann patrún nuair a luchtaítear cáipéisí -Comment[gl]=Pon marcadores en liñas que se axusten a un patrón durante a carga de documentos -Comment[he]=קובע סימניות בשורות המתאים לתבנית מסוימת בעת טעינת מסמך -Comment[hi]=जब दस्तावेज़ लोड हों तो किसी पैटर्न से मेल खाती पंक्तियो में पुस्तचिह्न सेट करें -Comment[hr]=Pri učitavanju dokumenta postavlja oznake na redovima koji odgovaraju određenom uzorku. -Comment[hsb]=Staja při začitanju dokumenta znamjenja na linki, kiž wěstemu mustrej wotpowěduja, -Comment[hu]=Fájl betöltésekor könyvjelzők automatikus létrehozása minta alapján -Comment[id]=Set bookmark in baris yang cocok dengan sebuah pola jika dokumen dimuatkan -Comment[is]=Setur bókamerki á línur sem passa ákveðnu mynstri, þegar skjöl eru lesin -Comment[it]=Imposta dei segnalibri sulle righe corrispondenti a uno schema quando si caricano dei documenti -Comment[ja]=文書が読み込まれたときに、パターンにマッチした行にブックマークを設定します -Comment[ka]=დოკუმენტის ჩატვირთვისას სანიშნეების ნიმუშის მიხედვით მითითება -Comment[kk]=Құжатта үлгі бойынша бетбелгілерді кояды -Comment[km]=កំណត់ការចំណាំត្រង់បន្ទាត់ដែលដូចនឹងឃ្លា ពេលឯកសារត្រូវបានផ្ទុក -Comment[lb]=Setzt Lieszeechen op d'Zeilen, déi ee bestëmmtent Muster enthalen, wann d'Dokument geluede gëtt -Comment[lt]=Įterpia žymeles eilutėse, kurios atitinka tam tikrą derinį, dokumento įkėlimo metu -Comment[lv]=Ielādējot dokumentu, liek grāmatzīmes rindām, kuras atbilst norādītajam paraugam -Comment[mk]=Постава обележувачи на линиите кои се поклопуваат со шема кога документите се вчитуваат -Comment[ms]=Tetapkan penanda buku pada baris yang padan dengan paten apabila dokumen dimuatkan -Comment[nb]=Bestem bokmerke på linjer som passer til et mønster når dokument blir åpnet -Comment[nds]=Sett al bi't Laden Leestekens för Regen, op de en Muster passt -Comment[ne]=कागजात लोड हुँदा बाँन्की मिल्दो पुस्तकचिनोहरू लाइनमा सेट गर्नुहोस् -Comment[nl]=Plaatsen van bladwijzers op regels die voldoen aan een bepaald patroon zodra het document geopend wordt -Comment[nn]=Set bokmerke på linjer som passar til eit mønster når dokument vert opna -Comment[pa]=ਜਦੋਂ ਵੀ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਬੁੱਕਮਾਰਕ ਨੂੰ ਸਤਰ-ਮੇਲ ਤਰਤੀਬ ਨਿਰਧਾਰਿਤ ਕਰੋ -Comment[pl]=W czasie wczytywanie dokumentu ustawia zakładki w liniach pasujących do podanego wzorca -Comment[pt]=Coloca favoritos em linhas que condizem com um padrão quando os documentos são carregados. -Comment[pt_BR]=Configura os favoritos em linhas que combinam com um padrão, quando os documentos forem carregados -Comment[ro]=La încărcarea documentului setează semne de carte la liniile care se potrivesc cu un model de text -Comment[ru]=Установка закладок в текстовом документе по шаблону -Comment[rw]=Gushyiraho ibimenyetso ku mirongo mu guhuza ishusho igihe inyandiko zitangizwa -Comment[se]=Bidjá girjemearkkaid linnjáide mat heivehit dihto minsttáriid go dokumeanttat rahpejuvvot. -Comment[sk]=Nastavuje záložky pri načítaní dokumentu na riadky zodpovedajúce vzorke -Comment[sl]=Nastavi zaznamke v vrsticah, ki se ujemajo vzorcu, ko so dokumenti naloženi -Comment[sr]=Поставља маркере на линијама које се уклапају у узорак када се учитавају документи -Comment[sr@Latn]=Postavlja markere na linijama koje se uklapaju u uzorak kada se učitavaju dokumenti -Comment[sv]=Lägg till bokmärken på rader som motsvarar ett mönster när dokument laddas -Comment[ta]= ஆவணங்கள் பதிவாகும் போது அமைப்பு புத்தகக்குறிப்பு கோடுகள் பொருத்தும் மாதிரி -Comment[te]=పత్రాలు ఎక్కించిన తరువాత బాణీకి సరిపొయిన వరుసల మీద బుక్ మార్కులను ఏర్పరుచును -Comment[tg]=Хатчӯбмонӣ дар старҳои мувофиқи қолиб ҳангоми боркунии ҳуҷҷати матнӣ -Comment[th]=ตั้งที่คั่นหน้าที่การจับคู่บรรทัดและรูปแบบ เมื่อมีการโหลดเอกสาร -Comment[tt]=İstälek açqan çaqta sözgeçkä kileşkän yullarına bitbilgelär quya -Comment[uk]=Встановлює закладки на рядках, що відповідають взірцю, під час завантаження документів -Comment[vi]=Đặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu. -Comment[zh_CN]=文档装入时根据匹配模式自动设置书签 -Comment[zh_TW]=文件載入時以字串比對演算法來設定書籤。 X-TDE-Library=tdetexteditor_autobookmarker X-TDE-ServiceTypes=KTextEditor/Plugin Type=Service diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt index 56bdfd9cd..a487611f8 100644 --- a/kate/plugins/insertfile/CMakeLists.txt +++ b/kate/plugins/insertfile/CMakeLists.txt @@ -29,7 +29,12 @@ link_directories( ##### other data ################################ -install( FILES tdetexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdetexteditor_insertfile.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kate-desktops +) + install( FILES tdetexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_insertfile ) diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index e2e3d354a..ed6cd3c6f 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -76,7 +76,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char view->insertChildClient( this ); setInstance( KGenericFactory<InsertFilePlugin>::instance() ); _job = 0; - (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); + (void) new TDEAction( i18n("Insert File..."), 0, this, TQ_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); setXMLFile( "tdetexteditor_insertfileui.rc" ); } @@ -104,7 +104,7 @@ void InsertFilePluginView::slotInsertFile() KURL destURL; destURL.setPath( _tmpfile ); _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished ( TDEIO::Job * ) ) ); } } diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h index da08a02c7..0f7bfc2c9 100644 --- a/kate/plugins/insertfile/insertfileplugin.h +++ b/kate/plugins/insertfile/insertfileplugin.h @@ -32,7 +32,7 @@ class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: InsertFilePlugin( TQObject *parent = 0, @@ -50,7 +50,7 @@ class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginV class InsertFilePluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: InsertFilePluginView( KTextEditor::View *view, const char *name=0 ); ~InsertFilePluginView() {}; diff --git a/kate/plugins/insertfile/tdetexteditor_insertfile.desktop b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop index 5c1303529..9c630bbd8 100644 --- a/kate/plugins/insertfile/tdetexteditor_insertfile.desktop +++ b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop @@ -1,154 +1,6 @@ [Desktop Entry] Name=KTextEditor Insert File Plugin -Name[af]=KTextEditor Voeg Lêer Inprop Module -Name[ar]=ملحق إدراج ملف لمحرر النصوص -Name[az]=KTextEditor Fayl Əlavəsi Daxil El -Name[be]=Модуль устаўкі файла -Name[bn]=কে-টেক্সট-এডিটর ফাইল অন্তর্ভুক্তি প্লাগ-ইন -Name[bs]=KTextEditor dodatak za ubacivanje datoteke -Name[ca]=Connector del KTextEditor per a inserir fitxers -Name[cs]=Modul pro vkládání souborů -Name[csb]=Plugins editorë wstôwianiô lopków -Name[cy]=Ategyn Mewnosod Ffeil KTextEditor -Name[da]=KTextEditor 'indsæt fil'-plugin -Name[de]=KTextEditor-Erweiterung zum Einfügen von Dateien -Name[el]=Πρόσθετο εισαγωγής αρχείου του KTextEditor -Name[eo]=KTextEditor Enmeti-Dosieron-kromaĵeto -Name[es]=Plugin de inserción de archivos de KTextEditor -Name[et]=KTextEditori faili lisamise plugin -Name[eu]=Fitxategiak txertatzeko KTextEditor-en plugin-a -Name[fa]=وصلۀ پروندۀ درج KTextEditor -Name[fi]=KTextEditorin 'Lisää tiedosto'-laajennus -Name[fr]=Module externe du fichier d'insertion de KTextEditor -Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemmen -Name[ga]=Breiseán KTextEditor chun comhad a ionsá -Name[gl]=Plugin de Inserción de Ficheiro de KTextEditor -Name[he]=תוסף הוספת קובץ ל־KTextEditor -Name[hi]=के-टेक्स्ट-एडिटर फ़ाइल घुसाने का प्लगिन -Name[hr]=KTextEditor dodatak za umetanje datoteka -Name[hu]=KTextEditor fájlbeszúró bővítőmodul -Name[id]=Plugin Penyisipan Berkas KTextEditor -Name[is]=KTextEditor setja inn skrá íforrit -Name[it]=Plugin inserimento file di KTextEditor -Name[ja]=KTextEditor ファイル挿入プラグイン -Name[ka]=ფაილის ჩადგმის KTextEditor-ის მოდული -Name[kk]=KTextEditor файлды ендіру модулі -Name[km]=កម្មវិធីជំនួយរបស់ KTextEditor Insert File -Name[ko]=K글월편집기 파일 끼워넣는 플러그인 -Name[lb]=KTextEditor-Plugin fir Dateien anzefügen -Name[lt]=KTextEditor bylos įterpimo priedas -Name[lv]=KTextEditor faila ievietošanas spraudnis -Name[mk]=KTextEditor приклучок за внес на датотеки -Name[mn]=XML-Plugin Залгаас файлуудын хувьд -Name[ms]=Plug masuk Fail KTextEditor -Name[mt]=Plagin ta' KTextEditor biex iddaħħal fajl -Name[nb]=Programtillegg for 'sett inn fil' i KTextEditor -Name[nds]=KTextEditor-Plugin för't Datei-Infögen -Name[ne]=KTextEditor घुसाउने फाइल प्लगइन -Name[nl]=KTextEditor-plugin voor het invoegen van bestanden -Name[nn]=Programtillegg for innsetjing av fil i skriveprogram -Name[nso]=Tsenyo ya Faele ya Mofetosi wa Sengwalwana sa K -Name[pa]=KTextEditor ਸ਼ਾਮਿਲ ਫਾਇਲ ਪਲੱਗਿੰਨ -Name[pl]=Wtyczka edytora wstawiania plików -Name[pt]='Plugin' de Inserção de Ficheiros do KTextEditor -Name[pt_BR]=Plug-in de Inserção de Arquivos para o Editor de textos -Name[ro]=Modul inserare fişier pentru KTextEditor -Name[ru]=Модуль вставки файла KTextEditor -Name[rw]=Icomeka ryo Kongeramo Idosiye rya KMuhinduziMwandiko -Name[se]=KTextEditor-fiillalasiheami lassemoduvla -Name[sk]=Module pre vloženie súboru KTextEditor -Name[sl]=Vstavek KTextEditor za vstavljanje datotek -Name[sq]=KTextEditor Shtojca: Fute skedën -Name[sr]=KTextEditor прикључак за уметање фајла -Name[sr@Latn]=KTextEditor priključak za umetanje fajla -Name[ss]=I-KTextEditor yingenisa i-plugin yelifayela -Name[sv]=Ktexteditor-insticksprogram för att infoga filer -Name[ta]=கேஉரைதொகுப்பாளர் கோப்பு உள்ளீட்டுச் சொருகுப்பொருள் -Name[te]=కెటెక్స్ట్ ఎడిటర్ దస్త్రాన్ని దూర్చు ప్లగిన్ -Name[tg]=Пуркунандаи KTextEditor барои дарҷи файлҳо -Name[th]=ปลักอินการแทรกแฟ้มของ KTextEditor -Name[tr]=KTextEditor Dosya Yerleştirme Eklentisi -Name[tt]=KTextEditor'nıñ Birem Tığu Quşılması -Name[uk]=Втулок KTextEditor для вставлення файла -Name[uz]=KTextEditor uchun fayldan qoʻyish plagin -Name[uz@cyrillic]=KTextEditor учун файлдан қўйиш плагин -Name[ven]=Musengulusi wa manwalwa K i dzhenisa pulagini ya faela -Name[vi]=Bộ cầm phít Chèn Tập tin KTextEditor -Name[wa]=Tchôke-divins di KTextEditor po stitchî des fitchîs -Name[xh]=KTextEditor Faka Ifayile ye Plagi efakiweyo -Name[zh_CN]=KTextEditor 插入文件插件 -Name[zh_HK]=文字編輯器插入檔案外掛程式 -Name[zh_TW]=文字編輯器插入檔案外掛程式 -Name[zu]=Faka Ifayela Lokungena ngaphakathi le-KTextEditor Comment=Insert any readable file at cursor position -Comment[af]=Voeg enige leesbare lêer in by die merker posisie -Comment[be]=Устаўляе файл у пазіцыю курсора -Comment[bg]=Вмъкване на файл от мястото на курсора -Comment[bn]=কার্সার অবস্থানে যে কোনো (পাঠযোগ্য) ফাইল অন্তর্ভুক্ত করতে পারে -Comment[bs]=Ubacuje bilo koju čitljivu datoteku na poziciju kursora -Comment[ca]=Inserir qualsevol fitxer llegible en la posició del cursor -Comment[cs]=Vloží jakýkoliv čitelný soubor na místo kurzoru -Comment[csb]=Wstôwiô zamkłosc lopkù przë kursorze -Comment[da]=Indsæt en vilkårlig læsbar fil ved markørens position -Comment[de]=Beliebige lesbare Datei an Cursor-Position einfügen -Comment[el]=Εισαγωγή οποιουδήποτε αναγνώσιμου αρχείου στη θέση του δρομέα -Comment[eo]=Enmeti iun legeblan dosieron ĉe la pozicio de la kursoro -Comment[es]=Insertar cualquier archivo legible en la posición del cursor -Comment[et]=Suvalise loetava faili lisamine kursori asukohta -Comment[eu]=Kurtsorearen posizioan fitxategi irakurgarri bat txertatzen du -Comment[fa]=درج هر پروندۀ قابل خواندن در موقعیت مکاننما -Comment[fi]=Lisää mikä tahansa luettava tiedosto kursorin kohdalle -Comment[fr]=Insérer tout fichier lisible à la position du curseur -Comment[fy]=Els lêsber triem by it rinnerke ynfoegje -Comment[gl]=Inserir calquera ficheiro lexíbel na posición do cursor -Comment[he]=מוסיף כל קובץ בר קיראה במיקום הסמן -Comment[hr]=Na položaju pokazivača umetnite bilo koju čitljivu datoteku -Comment[hsb]=Zasunje lubowólnu čitajomnu dataju na poziciji cursora -Comment[hu]=Tetszőleges olvasható fájl beszúrása a kurzorpozíciónál -Comment[id]=Sisipkan berkas apa saja yang bisa dibaca ke posisi kursor -Comment[is]=Setur inn hvaða lesanlegu skrá sem er í stöðu bendilsins -Comment[it]=Inserisce un qualsiasi file leggibile alla posizione del cursore -Comment[ja]=カーソル位置に読み込み可能なファイルを挿入します -Comment[ka]=ნებისმიერი კითხვადი ფაილის კურსორის ადგილას ჩამატება -Comment[kk]=Меңзер көрсететін орынға кез-келген оқылатын файлды ендіру -Comment[km]=បញ្ចូលឯកសារដែលអាចអានបានណាមួយនៅទីតាំងរបស់ទស្សន៍ទ្រនិច -Comment[ko]=커서가 있는 곳에 읽을 수 있는 파일을 끼워 넣습니다 -Comment[lb]=Setzt eng liesbar Datei bei der Cursorpositioun an -Comment[lt]=Įterpią bet kokią skaitomą bylą ties žymekliu -Comment[lv]=Ievieto jebkuru lasāmu failu kursora atrašanās vietā -Comment[mk]=Внесува било која читлива датотека на позицијата на курсорот -Comment[ms]=Sisipkan sebarang fail boleh baca di posisi kursor -Comment[nb]=Sett inn en lesbar fil ved skrivemerket -Comment[nds]=Jichtenseen leesbore Datei bi'n Blinker infögen -Comment[ne]=कर्सर स्थितिमा कुनै पनि पढ्नयोग्य फाइल घुसाउनुहोस् -Comment[nl]=Voeg een willekeurig leesbaar bestand in op de cursorpositie -Comment[nn]=Set inn ei lesbar fil ved skrivemerket -Comment[pa]=ਕੋਈ ਪੜਨਯੋਗ ਫਾਇਲ ਕਰਸਰ ਸਥਿਤੀ ਤੇ ਸ਼ਾਮਿਲ ਕਰੋ -Comment[pl]=Wstawia zawartość pliku w pozycji kursora -Comment[pt]=Insira qualquer ficheiro legível na posição do cursor -Comment[pt_BR]=Insere qualquer arquivo com permissões de leitura na posição do cursor -Comment[ro]=Inserează la poziţia cursorului orice fişier citibil -Comment[ru]=вставка любого читаемого файла в позиции курсора -Comment[rw]=Kongeramo idosiye isomeka ibonetse ku mwanya w'inyoboranyandiko -Comment[se]=Lasiha logahahtti fiilla čállinmearkka sajádahkii -Comment[sk]=Vloží ľubovoľný súbor na pozíciu kurzora -Comment[sl]=Vstavi katerokoli berljivo datoteko na položaju kazalca -Comment[sr]=Убаците било који читљиви фајл на положају курсора -Comment[sr@Latn]=Ubacite bilo koji čitljivi fajl na položaju kursora -Comment[sv]=Infoga vilken läsbar fil som helst vid markörens plats -Comment[ta]=சுட்டும் இடத்தில் படிக்கக்கூடிய கோப்பினை உள்ளிடு -Comment[te]=ములుకు వున్న చోట చదవగలిగే దస్త్రాన్ని దూర్చును -Comment[tg]=Файли хондашавандаи ҳеҷгуна дар мавқеъи курсор ҷойгир мекунад -Comment[th]=ทำการแทรกแฟ้มที่สามารถอ่านได้ที่ตำแหน่งของเคอร์เซอร์ -Comment[tr]=İmleç konumunda herhangi bir dosyanın içeriğini ekle -Comment[tt]=Kürsär urınına, uqıp bulğan birem eçtälegen tığıp östi -Comment[uk]=Вставляє вміст будь-якого файла, який можна прочитати, у позицію курсора -Comment[uz]=Har qanday oʻqib boʻladigan faylni kursorning joyidan qoʻyish -Comment[uz@cyrillic]=Ҳар қандай ўқиб бўладиган файлни курсорнинг жойидан қўйиш -Comment[vi]=Chèn bất kỳ tập tin có khả năng đọc tại vị trí của con chạy. -Comment[zh_CN]=在光标位置插入任何可读文件 -Comment[zh_HK]=在游標處插入任意的檔案 -Comment[zh_TW]=在游標處插入任意的可讀檔案 X-TDE-Library=tdetexteditor_insertfile X-TDE-ServiceTypes=KTextEditor/Plugin Type=Service diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt index 38a042973..a7bef9ac5 100644 --- a/kate/plugins/isearch/CMakeLists.txt +++ b/kate/plugins/isearch/CMakeLists.txt @@ -27,7 +27,12 @@ link_directories( ##### other data ################################ -install( FILES tdetexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdetexteditor_isearch.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kate-desktops +) + install( FILES tdetexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_isearch ) diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 4ee93cb87..306fcf596 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -66,11 +66,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) m_searchForwardAction = new TDEAction( i18n("Search Incrementally"), CTRL+ALT+Key_F, - this, TQT_SLOT(slotSearchForwardAction()), + this, TQ_SLOT(slotSearchForwardAction()), actionCollection(), "edit_isearch" ); m_searchBackwardAction = new TDEAction( i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F, - this, TQT_SLOT(slotSearchBackwardAction()), + this, TQ_SLOT(slotSearchBackwardAction()), actionCollection(), "edit_isearch_reverse" ); m_label = new TQLabel( i18n("I-Search:"), 0L, "tde toolbar widget" ); @@ -84,12 +84,12 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) m_combo->setDuplicatesEnabled( false ); m_combo->setMaximumWidth( 300 ); m_combo->lineEdit()->installEventFilter( this ); - connect( m_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTextChanged(const TQString&)) ); - connect( m_combo, TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(slotReturnPressed(const TQString&)) ); - connect( m_combo, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), - this, TQT_SLOT(slotAddContextMenuItems(TQPopupMenu*)) ); + connect( m_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTextChanged(const TQString&)) ); + connect( m_combo, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotReturnPressed(const TQString&)) ); + connect( m_combo, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), + this, TQ_SLOT(slotAddContextMenuItems(TQPopupMenu*)) ); m_comboAction = new KWidgetAction( m_combo, i18n("Search"), 0, 0, 0, @@ -106,8 +106,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("Case Sensitive"), TDEShortcut(), actionCollection(), "isearch_case_sensitive" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setCaseSensitive(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setCaseSensitive(bool)) ); action->setChecked( m_caseSensitive ); optionMenu->insert( action ); @@ -115,8 +115,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("From Beginning"), TDEShortcut(), actionCollection(), "isearch_from_beginning" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setFromBeginning(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setFromBeginning(bool)) ); action->setChecked( m_fromBeginning ); optionMenu->insert( action ); @@ -124,8 +124,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("Regular Expression"), TDEShortcut(), actionCollection(), "isearch_reg_exp" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setRegExp(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setRegExp(bool)) ); action->setChecked( m_regExp ); optionMenu->insert( action ); @@ -134,8 +134,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) // action = new TDEToggleAction( // i18n("Auto-Wrap Search"), TDEShortcut(), // actionCollection(), "isearch_auto_wrap" ); -// connect( action, TQT_SIGNAL(toggled(bool)), -// this, TQT_SLOT(setAutoWrap(bool)) ); +// connect( action, TQ_SIGNAL(toggled(bool)), +// this, TQ_SLOT(setAutoWrap(bool)) ); // action->setChecked( m_autoWrap ); // optionMenu->insert( action ); @@ -204,7 +204,7 @@ void ISearchPluginView::setAutoWrap( bool autoWrap ) bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_combo->lineEdit()) ) + if( o != m_combo->lineEdit() ) return false; if( e->type() == TQEvent::FocusIn ) { @@ -225,7 +225,7 @@ bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e ) if( e->type() == TQEvent::KeyPress ) { TQKeyEvent *keyEvent = (TQKeyEvent*)e; - if( keyEvent->key() == Qt::Key_Escape ) + if( keyEvent->key() == TQt::Key_Escape ) quitToView( TQString::null ); } @@ -410,13 +410,13 @@ void ISearchPluginView::slotAddContextMenuItems( TQPopupMenu *menu ) if( menu ) { menu->insertSeparator(); menu->insertItem( i18n("Case Sensitive"), this, - TQT_SLOT(setCaseSensitive(bool))); + TQ_SLOT(setCaseSensitive(bool))); menu->insertItem( i18n("From Beginning"), this, - TQT_SLOT(setFromBeginning(bool))); + TQ_SLOT(setFromBeginning(bool))); menu->insertItem( i18n("Regular Expression"), this, - TQT_SLOT(setRegExp(bool))); + TQ_SLOT(setRegExp(bool))); //menu->insertItem( i18n("Auto-Wrap Search"), this, - // TQT_SLOT(setAutoWrap(bool))); + // TQ_SLOT(setAutoWrap(bool))); } } diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h index b11b2a8b6..e1893c516 100644 --- a/kate/plugins/isearch/ISearchPlugin.h +++ b/kate/plugins/isearch/ISearchPlugin.h @@ -34,7 +34,7 @@ class TQLabel; class ISearchPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: ISearchPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); @@ -49,7 +49,7 @@ private: class ISearchPluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: ISearchPluginView( KTextEditor::View *view ); diff --git a/kate/plugins/isearch/tdetexteditor_isearch.desktop b/kate/plugins/isearch/tdetexteditor_isearch.desktop index d4aca1084..a32818e3f 100644 --- a/kate/plugins/isearch/tdetexteditor_isearch.desktop +++ b/kate/plugins/isearch/tdetexteditor_isearch.desktop @@ -1,151 +1,6 @@ [Desktop Entry] Name=KTextEditor Incremental Search Plugin -Name[af]=KTextEditor Inkrementele Soektog Inprop Module -Name[ar]=ملحق بحث تزايدي لمحرر نصوص كيدي -Name[az]=KTextEditor Artan Axtarış Əlavəsi -Name[be]=Модуль паступовага пошуку -Name[bn]=কে-টেক্সট-এডিটর ধারাবাহিক সন্ধান প্লাগ-ইন -Name[bs]=KTextEditor dodatak za inkrementalnu pretragu -Name[ca]=Connector del KTextEditor per a la recerca incremental -Name[cs]=Modul pro postupné vyhledávání -Name[csb]=Pligins editorë do przërostowi szëkbë -Name[cy]=Ategyn Chwiliad Cynyddol KGolyguTestun -Name[da]=KTextEditor inkrementel søgnings-plugin -Name[de]=KTextEditor-Erweiterung zur einengenden Suche -Name[el]=Πρόσθετο αυξητικής αναζήτησης KTextEditor -Name[eo]=KTextEditor Iom-post-Ioma-Serĉo-kromaĵeto -Name[es]=Plugin de búsqueda incremental de KTextEditor -Name[et]=KTextEditori täpsustava otsingu plugin -Name[eu]=KTextEditor-en bilaketa inkrementalerako plugin-a -Name[fa]=وصلۀ جستجوی نموی KTextEditor -Name[fi]=KTextEditorin tarkentuvan haun laajennus -Name[fr]=Module externe de recherche incrémentale pour KTextEditor -Name[fy]=KTextEditor-plugin foar sykaksjes yn meardere stappen -Name[ga]=Breiseán KTextEditor do chuardach incriminteach -Name[gl]=Plugin de Procura Incremental de KTextEditor -Name[he]=תוסף חיפוש חלקי ל־KTextEditor -Name[hi]=के-टेक्स्ट-एडिटर इंक्रीमेंटल सर्च प्लगइन -Name[hr]=KTextEditor dodatak za traženje u koracima -Name[hsb]=KTextEditor Plugin za inkrementelne pytanje -Name[hu]=KTextEditor inkrementális keresési bővítőmodul -Name[id]=Plugin Pencarian Bertahap KTextEditor -Name[is]=KTextEditor þrepaleitar-íforrit -Name[it]=Plugin ricerca incrementale di KTextEditor -Name[ja]=KTextEditor インクリメンタル検索プラグイン -Name[ka]=ნამატი ძიების KTextEditor მოდული -Name[kk]=KTextEditor инкременттік іздеу модулі -Name[km]=កម្មវិធីជំនួយខាងក្នុង KTextEditor Incremental Search -Name[lb]=Inkrementellen Sich-Plugin fir de KTextEditor -Name[lt]=KTextEditor augančios paieškos priedas -Name[lv]=KTextEditor "meklē kamēr raksti" spraudnis -Name[mk]=KTextEditor приклучок за инкрементално пребарување -Name[mn]=Текст боловсруулагчийн нэмэлт хайлтын плугин -Name[ms]=Plug masuk Carian Meningkat KTextEditor -Name[mt]=Plagin ta' KTextEditor għal tfittix inkrementali -Name[nb]=Programtillegg for 'fortløpende søk' i KTextEditor -Name[nds]=KTextEditor-Plugin för "Tast för Tast"-Söök -Name[ne]=KTextEditor बढोत्तरीत खोजी प्लगइन -Name[nl]=KTextEditor-plugin voor incrementele zoekacties -Name[nn]=Programtillegg for inkrementelt søk i skriveprogram -Name[nso]=Tsenyo ya Nyako ya Koketso ya Mofetosi wa Sengwalwana sa K -Name[pa]=KTextEditor ਲਗਾਤਾਰ ਖੋਜ ਪਲੱਗਿੰਨ -Name[pl]=Wtyczka edytora do szukania przyrostowego -Name[pt]='Plugin' de Procura Incremental do KTextEditor -Name[pt_BR]=Plug-in de Busca Incremental para o Editor de textos -Name[ro]=Modul de căutare incrementală pentru KTextEditor -Name[ru]=Модуль поиска по набору KTextEditor -Name[rw]=Icomeka Nyongeragaciro ryo Gushakisha rya KMuhinduziMwandiko -Name[se]=KTextEditor lassáneaddji-ohcan lassemoduvla -Name[sk]=Modul pre inkrementálne hľadanie KTextEditor -Name[sl]=Vstavek KTextEditor za postopno iskanje -Name[sq]=KTextEditor Shtojca: Kërkim përmes Numrimit -Name[sr]=KTextEditor прикључак за инкрементално претраживање -Name[sr@Latn]=KTextEditor priključak za inkrementalno pretraživanje -Name[ss]=I-plugin yekusesha lokungetekako kwe KTextEditor -Name[sv]=Ktexteditor-insticksprogram för inkrementell sökning -Name[ta]=கேஉரை தொகுப்பாளர் படிப்படியான தேடற் சொருகுப்பொருள் -Name[te]=కెటెక్స్ట్ ఎడిటర్ హెచ్చించి వెతుకుటకు ప్లగిన్ -Name[tg]=Пуркунандаи KTextEditor барои ҷустуҷӯи афзоиш -Name[th]=ปลักอินการค้นหาแบบทบเพิ่มของ KTextEditor -Name[tr]=KTextEditor Artımsal Arama Eklentisi -Name[tt]=KTextEditor'nıñ Artıp Ezläw Quşılması -Name[uk]=Втулок KTextEditor для покрокового пошуку -Name[uz]=KTextEditor ketma-ket qidirish plagini -Name[uz@cyrillic]=KTextEditor кетма-кет қидириш плагини -Name[ven]=Pulagini yau toda yo engedzeaho ya musengulusi wa manwalwa a K -Name[vi]=Bộ cầm phít Tìm kiếm Dần dần KTextEditor -Name[xh]=KTextEditor Iplagi yangaphakathi Yokuphendla Ngokunyukayo -Name[zh_CN]=KTextEditor 增量搜索插件 -Name[zh_HK]=KTextEditor 漸進式搜尋外掛程式 -Name[zh_TW]=KTextEditor 漸進式搜尋外掛程式 -Name[zu]=I-Plugin Yosesho Lokwenyuka ngezigaba ze-KTextEditor Comment=Also known as "As you type search" -Comment[af]=Ook bekend as "Soos jy tik soektog" -Comment[be]=Другая назва "пошук пры набіранні" -Comment[bg]=Последователно търсене, известно още като търсене по време на въвеждане на низа -Comment[bn]="টাইপ করাকালীন সন্ধান" হিসাবেও পরিচিত -Comment[bs]=Takođe poznat kao "Pretraga dok kucate" -Comment[ca]=També es coneix com a "Cerca en teclejar" -Comment[cs]=Známý také "Hledání jak napíšete" -Comment[csb]=Tzw. "szëkba òb czas pisaniô" -Comment[da]=Også kendt som "Søg mens du skriver" -Comment[de]=Suchvorgänge beim Tippen -Comment[el]=Επίσης γνωστή και ως "Αναζήτηση κατά την πληκτρολόγηση" -Comment[eo]=Ankaŭ konata kiel "Dumtajpa serĉo" -Comment[es]=También conocido como "Búsqueda mientras teclea" -Comment[et]=Tuntud ka kui "otsimine vastavalt kirjutamisele" -Comment[eu]="Idaztean bilatu" bezala ere ezaguna -Comment[fa]=همچنین شناختهشده به عنوان »وقتی که جستجو را تحریر میکنید« -Comment[fi]=Tunnetaan myös nimellä "Hae kun kirjoitat" -Comment[fr]=Aussi connu comme « Recherche pendant la saisie » -Comment[fy]=Ek bekend as"ûnder it typen sykje" -Comment[ga]=Darbh ainm "Cuardach Beo" freisin -Comment[gl]=Tamén coñecido como "Busca mentres escrebes" -Comment[he]=ידוע גם בתור "חיפוש תוך כדי כתיבה" -Comment[hi]=ऐसे भी जाना जाता है "जैसे जैसे टाइप करते जाएँ- ढूंढते जाएँ" -Comment[hr]=Poznat i kao "As you type search" -Comment[hsb]=Tež znate jako "pytanje při zapodawanju" -Comment[hu]=Más néven "Beírásos keresés" -Comment[id]=Dikenal juga sebagai "Cari sembari mengetik" -Comment[is]=Einnig þekkt sem "Leita meðan þú pikkar" -Comment[it]=Noto anche come "Ricerca mentre scrivi" -Comment[ja]=逐次検索ともいいます -Comment[ka]=იგივეა, რაც ძიება აკრეფის პროცესში -Comment[kk]=Басқаша "Теруге қарай іздеу" деп аталатын -Comment[km]=ក៏ស្គាល់ជា "ស្វែងរក ពេលអ្នកវាយ" -Comment[lb]=Och bekannt als "Sichen, wärend dir antippt" -Comment[lt]=Taip pat žinomas kaip „paieška spausdinimo metu“ -Comment[lv]=Meklē tekstu kamēr Jūs to rakstat -Comment[mk]=Познато и како "пребарување додека куцате" -Comment[ms]=Juga dikenali sebagai "Apabila nada taip cari" -Comment[nb]=Også kjent som søk «etterhvert som du skriver» -Comment[nds]=Direktemang bi't Tippen söken -Comment[ne]="तपाईँले खोजी टाइप गरे जस्तै" को रूपमा पनि चिनिन्छ -Comment[nl]=Ook bekend als "Zoeken terwijl u typt" -Comment[nn]=Òg kjend som søk «etter kvart som du skriv» -Comment[pa]=ਇਸ ਤਰਾਂ ਵੀ ਜਾਣੋ ਕਿ "ਜਿਵੇਂ ਤੁਸੀਂ ਖੋਜ ਲਿਖੀ" -Comment[pl]=Tzw. "wyszukiwanie podczas pisania" -Comment[pt]=Também conhecida como "Procura enquanto escreve" -Comment[pt_BR]=Conhecido também como "Busca como você digitar" -Comment[ro]=Căutare instantanee, pe măsură ce scrieţi modelul de text căutat -Comment[ru]=Поиск по набору символов -Comment[rw]=Nanone bizwi nka "Nk'iyo wanditse ishakisha" -Comment[se]=Maiddái dovddus «oza dađistaga go čálát» namas. -Comment[sk]=Známe aj ako "Hľadanie podľa napísaného textu" -Comment[sl]=Znano tudi kot »Iskanje med tipkanjem« -Comment[sr]=Познато и као „претрага док куцате“ -Comment[sr@Latn]=Poznato i kao „pretraga dok kucate“ -Comment[sv]=Också känt som "Sök medan du skriver" -Comment[ta]="தேடு என்று தட்டச்சிட்டவுடன்" என்றும் அழைக்கப்படும் -Comment[te]="టైపు చెస్తుండగా వెతుకుట "అని కూడా అందురురు -Comment[tg]=Ҳамчун "Ҷустуҷӯи ҳарфчинӣ" машҳур аст -Comment[th]=หรือรู้จักกันอีกอย่างว่า "ค้นหาขณะพิมพ์" -Comment[tr]=Ayrıca "Yazarken ararsın" olarak da bilinir -Comment[tt]=Cıyılu belän beryulı ezli -Comment[uk]=Також відомий як "Пошук за вводом" -Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ». -Comment[zh_CN]=也称为“即输即搜” -Comment[zh_TW]=也稱做「即時搜尋」 X-TDE-Library=tdetexteditor_isearch X-TDE-ServiceTypes=KTextEditor/Plugin Type=Service diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt index 7ceccc10d..593afc743 100644 --- a/kate/plugins/kdatatool/CMakeLists.txt +++ b/kate/plugins/kdatatool/CMakeLists.txt @@ -29,7 +29,12 @@ link_directories( ##### other data ################################ -install( FILES tdetexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdetexteditor_kdatatool.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kate-desktops +) + install( FILES tdetexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_kdatatool ) diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index e14cd9249..00edb8ced 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -76,7 +76,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view ) setInstance( KGenericFactory<KDataToolPlugin>::instance() ); m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); - connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow())); + connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShow())); setXMLFile("tdetexteditor_kdatatoolui.rc"); m_view = view; @@ -151,7 +151,7 @@ void KDataToolPluginView::aboutToShow() m_singleWord_line = line; } else { m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, - TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); + TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); return; } @@ -160,12 +160,12 @@ void KDataToolPluginView::aboutToShow() TDEInstance *inst=instance(); TQValueList<KDataToolInfo> tools; - tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst ); + tools += KDataToolInfo::query( "TQString", "text/plain", inst ); if( m_singleWord ) - tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", inst ); + tools += KDataToolInfo::query( "TQString", "application/x-singleword", inst ); m_actionList = KDataToolAction::dataToolActionList( tools, this, - TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); + TQ_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) { m_menu->insert(ac); @@ -173,7 +173,7 @@ void KDataToolPluginView::aboutToShow() if( m_actionList.isEmpty() ) { m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, - TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); + TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); } } @@ -203,7 +203,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ text = m_wordUnderCursor; TQString mimetype = "text/plain"; - TQString datatype = TQSTRING_OBJECT_NAME_STRING; + TQString datatype = "TQString"; // If unsupported (and if we have a single word indeed), try application/x-singleword if ( !info.mimeTypes().contains( mimetype ) && m_singleWord ) diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h index a217c6f27..b3ef86767 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.h +++ b/kate/plugins/kdatatool/kate_kdatatool.h @@ -36,7 +36,7 @@ class View; class KDataToolPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { - Q_OBJECT + TQ_OBJECT public: KDataToolPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); @@ -51,7 +51,7 @@ public: class KDataToolPluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: KDataToolPluginView( KTextEditor::View *view ); diff --git a/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop index 6f708d640..f799bd84c 100644 --- a/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop +++ b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop @@ -1,167 +1,6 @@ [Desktop Entry] Name=KTextEditor KDataTool Plugin -Name[af]=KTextEditor KDataTool Inprop Module -Name[ar]=ملحق KDataTool لـ KTextEditor -Name[az]=KTextEditor KDataVasitəsi Əlavəsi -Name[be]=Модуль KDataTool -Name[bn]=কে-টেক্সট-এডিটর কে-ডেটা-টুল প্লাগ-ইন -Name[br]=Lugent KTextEditor KDataTool -Name[bs]=KTextEditor KDataTool dodatak -Name[ca]=Connector KDataTool per al KTextEditor -Name[cs]=Modul datového nástroje -Name[csb]=Pligins editorë do òbsłużënkù pòdôwków -Name[cy]=Ategyn KErfynData KGolyguTestun -Name[da]=KTextEditor KDataTool-plugin -Name[de]=KTextEditor-Erweiterung für KDataTool -Name[el]=Πρόσθετο KTextEditor KDataTool -Name[eo]=KTextEditor KDataTool Kromaĵo -Name[es]=Plugin KDataTool de KTextEditor -Name[et]=KTextEditori KDataTool plugin -Name[eu]=KTextEditor-en KDataTool plugin-a -Name[fa]=وصلۀ ابزار KTextEditor KData -Name[fi]=KTextEditor KDataTool -lisäosa -Name[fr]=Module externe KDataTool pour KTextEditor -Name[fy]=KTextEditor-plugin foar KDatatool -Name[ga]=Breiseán KDataTool do KTextEditor -Name[gl]=Plugin KDataTool de KTextEditor -Name[he]=תוסף כלי נתונים ל־KTextEditor -Name[hi]=के-टेक्स्ट-एडिटर के-डाटा-टूल प्लगइन -Name[hr]=KTextEditor dodatak za KDataTool -Name[hu]=KTextEditor KDataTool bővítőmodul -Name[id]=Plugin KDataTool untuk KTextEditor -Name[is]=KTextEditor KDataTool íforrit -Name[it]=Plugin KDataTool di KTextEditor -Name[ja]=KTextEditor KDataTool プラグイン -Name[ka]=მონაცემთა დამუშავების KTextEditor-ის მოდული -Name[kk]=KTextEditor KDataTool модулі -Name[km]=កម្មវិធីជំនួយខាងក្នុង KDataTool KTextEditor -Name[lb]=KTextEditor-KDataTool-Plugin -Name[lt]=KTextEditor KDataTool priedas -Name[lv]=KTextEditor KDataTool spraudnis -Name[mk]=KTextEditor KDataTool приклучок -Name[mn]=Текст боловсруулагчийн өгөгдлийн хэрэгслийн плугин -Name[ms]=Plug masuk KDataTool KTextEditor -Name[mt]=Name=Plagin ta' KTextEditor - KDataTool -Name[nb]=KTextEditor KDataTool-programtillegg -Name[nds]=KTextEditor-Plugin för KDataTool -Name[ne]=KTextEditor KDataTool प्लगइन -Name[nl]=KTextEditor-plugin voor KDatatool -Name[nn]=KDataTool-programtillegg for skriveprogram -Name[nso]=Tsenyo ya Sebereka sa Data ya K ya Mofetosi wa Sengwalwana sa K -Name[pa]=KTextEditor KDataTool ਪਲੱਗਿੰਨ -Name[pl]=Wtyczka edytora do obsługi danych -Name[pt]='Plugin' do KDataTool do KTextEditor -Name[pt_BR]=Plug-in de Ferramenta de Dados para o Editor de textos -Name[ro]=Modul KDataTool pentru KTextEditor -Name[ru]=Модуль обработки данных KTextEditor -Name[rw]=Icyomeka ry'Igikoresho KIbyatanzwe rya KMuhinduziMwandiko -Name[se]=KDataTool-lassemoduvla čállinprográmmaid várás -Name[sk]=Module KDataTool KTextEditor -Name[sl]=Vstavek KTextEditor KDataTool -Name[sq]=KTextEditor Shtojca: KDataTool -Name[sr]=KTextEditor KDataTool прикључак -Name[sr@Latn]=KTextEditor KDataTool priključak -Name[ss]=I-plugin KDataTool ku KTextEditor -Name[sv]=Ktexteditor-insticksprogram med dataverktyg -Name[ta]=கேஉரைதொகுப்பாளர் கேதகவல் கருவி சொருகுப்பொருள் -Name[te]=కెటెక్స్ట్ ఎడిటర్ కెడాటాటూల్ ప్లగిన్ -Name[tg]=Пуркунандаи KTextEditor барои таҳрири додаҳо -Name[th]=ปลักอินเครื่องมือ KData ของ KTextEditor -Name[tr]=KTextEditor KDataTool Eklentisi -Name[tt]=KTextEditor'nıñ Eşkärtü Quşılması -Name[uk]=Втулок KTextEditor KDataTool -Name[uz]=KTextEditor KDataTool plagini -Name[uz@cyrillic]=KTextEditor KDataTool плагини -Name[ven]=Pulagini ya tshishumiswa tsha data ya K ya musengulusi wa manwalwa a K -Name[vi]=Bộ cầm phít Công cụ KData KTextEditor -Name[wa]=Tchôke-divins KDataTool po KTextEditor -Name[xh]=KTextEditor KDataTool Iplagi yangaphakathi -Name[zh_CN]=KTextEditor KDataTool 插件 -Name[zh_HK]=KTextEditor KDataTool 外掛程式 -Name[zh_TW]=KTextEditor KDataTool 外排程式 -Name[zu]=I-Plugin ye-KDataTool ye-KTextEditor Comment=Enable data tools like thesaurus and spell check (if installed) -Comment[af]=Aktiveer data nutsprogramme soos thesaurus en spel bevestig (as geïnstalleer) -Comment[ar]=قم بتفعيل أدوات البيانات مثل المترادفات والتدقيق اﻹملائي (إذا كان منصبا) -Comment[az]=Tezaurus və imla yoxlaması kimi data vasitələrini fəallaşdır (quruludursa) -Comment[be]=Інструменты працы з даннямі: тэзаўрус, спраўджванне правапісу і інш. (калі яны ўстаноўленыя) -Comment[bg]=Поддръжка на текстообработващи инструменти, като проверка на правописа и синонимен речник -Comment[bn]=থিসরার বা বানান পরীক্ষক ইত্যাদি সক্রিয় করে (যদি পাওয়া যায়) -Comment[bs]=Uključi alate za podatke kao što su thesaurus i provjera pravopisa (ako su instalirani) -Comment[ca]=Habilita les eines per a la gestió de dades, com ara el thesaurus i el corrector ortogràfic (si estan instal·lats) -Comment[cs]=Povolí datové nástroje jako tezaurus nebo kontrolu pravopisu, pokud jsou nainstalovány -Comment[csb]=Òbsłużënk nôrzãdzów ôrtu tezaurus ë sprôwdzanié pisënkù -Comment[cy]=Alluogi offer data fel theawrws a cywirydd sillafu (os maent wedi'u gosod) -Comment[da]=Aktivér dataværktøjer som begrebsordbog og stavekontrol (hvis installeret) -Comment[de]=Aktivierung von Dienstprogrammen wie Thesaurus und Rechtschreibprüfung (falls installiert) -Comment[el]=Ενεργοποίηση εργαλείων δεδομένων όπως ο θησαυρός λέξεων και ο ορθογραφικός έλεγχος (αν είναι εγκατεστημένα) -Comment[eo]=Enŝalti ilojn kiel samsignifilon kaj literumilon (se instalitaj) -Comment[es]=Activa herramientas como el thesaurus y el corrector ortográfico (si instalados) -Comment[et]=Andmete tööriistad, näiteks thesaurus ja õigekirja kontroll -Comment[eu]=Gaitu thesaurus-a eta ortografia zuzentzailea bezalako tresnak (instalatua badaude) -Comment[fa]=فعالسازی ابزارهای داده مانند واژهنامه و غلطگیر (در صورت نصب) -Comment[fi]=Käytä datatyökaluja, kuten oikolukua ja sanakirjaa (jos asennettuna) -Comment[fr]=Activer les outils de données comme le thésaurus et la correction orthographique (s'ils sont installés) -Comment[fy]=Aktivearjen fan dataprogramma's, lykas de tesaurus en stavering (wannear't dy ynstallearre binne) -Comment[ga]=Cumasaigh uirlisí mar litreoir agus foclóir (má tá siad ar fáil) -Comment[gl]=Habilitar ferramentas de dados como sinónimos e corrección ortográfica (se están instalados) -Comment[he]=אפשר שימוש בכלי נתונים כגון איגרון ובדיקת איות (אם מותקנים כלים כאלה) -Comment[hi]= डाटा टूल्स जैसे शब्दकोश व वर्तनी जांच को सक्षम करें(यदि स्थापित हों) -Comment[hr]=Omogućavanje alata poput tezaurusa i provjere pravopisa (ako su instalirani) -Comment[hsb]=Staja graty kaž tezawrus abo prawopisnu kontrolu k dispoziciji (jeli instalowane) -Comment[hu]=Adatkezelési eszközök (pl. szinonimaszótár, helyesírás-ellenőrző) támogatása -Comment[id]=Aktifkan perangkat bantu data seperi thesaurus dan pemeriksa ejaan (bila terpasang) -Comment[is]=Virkir gagnatól eins og stafsetningaforrit og leiðréttingar (ef uppsett) -Comment[it]=Abilita gli strumenti per i dati come il dizionario dei sinonimi e il controllo ortografico (se installati) -Comment[ja]=同義語ツールやスペルチェックなどのデータツールを有効にします (インストールされている場合) -Comment[ka]=Warktüüch as Thesaurus oder Klookschriever anmaken (wenn op dien Reekner) -Comment[kk]=Теузаурус пен емле тексеру секілді (егер орнатылған болса) деректерді өңдеу құралдарды пайдалануға мүмкіншілік береді -Comment[km]=ធ្វើឲ្យឧបករណ៍ទិន្នន័យប្រើបាន ដូចជាកម្រងវេវចនសព្ទ និងពិនិត្យអក្ខរាវិរុទ្ធជាដើម (បើបានដំឡើង) -Comment[ko]=(깔려 있다면) 비슷한 말 사전과 맞춤법 검사기 같은 도구를 씁니다 -Comment[lb]=Hëllefsprogrammer, wéi Thésaurus an Rechtschreifkontroll, uschalten (wann installéiert) -Comment[lt]=Įjungia duomenų įrankius, tokius kaip sinonimų žodynas ir rašybos tikrinimas (jei įdiegta) -Comment[lv]=Ieslēdz instalētos datu rīkus kā tēzaurs un pareizrakstības pārbaudītājs -Comment[mk]=Овозможување на алатки како енциклопедија или проверка на правопис (ако се инсталирани) -Comment[mn]=thesaurus and spell check (хэрвээ суусан бол) гэх мэт өгөгдлийн хэрэгслүүдийг нээнэ. -Comment[ms]=Membolehkan alatan data seperti tesaurus dan periksa ejaan(jika dipasang) -Comment[mt]=Ippermetti l-użu ta' għodda bħat-teżawru u spell check (jekk installati) -Comment[nb]=Skru på dataverktøy som ordbok og stavekontroll (hvis det er installert) -Comment[nds]=Warktüüch as Thesaurus oder Klookschriever anmaken (wenn installeert) -Comment[ne]=पर्यायकोष र हिज्जे परीक्षण जस्तै डेटा उपकरणहरू सक्षम पार्नुहोस् (यदि स्थापना भएमा) -Comment[nl]=Activering van hulpprogramma's, zoals de thesaurus en spellingcontrole (indien geïnstalleerd) -Comment[nn]=Tilgang til dataverktøy som ordliste og stavekontroll -Comment[nso]=Kgontsha dibereka tsa data goswana le thesaurus le tebelelo yamongwalo (ge di tsentswe) -Comment[pa]=ਡਾਟਾ ਸੰਦ ਜਿਵੇਂ ਕਿ ਥੀਸਾਰਾਉਸ ਤੇ ਸ਼ਬਦ-ਜੋੜ ਆਦਿ ਯੋਗ(ਜੇਕਰ ਇੰਸਟਾਲ ਹੋਵੇ) -Comment[pl]=Obsługa narzędzi typu tezaurus i sprawdzanie pisowni -Comment[pt]=Activa as ferramentas de dados como os sinónimos e a verificação ortográfica (se estiverem instalados) -Comment[pt_BR]=Habilita as ferramentas de dados, como o Thesaurus e a verificação ortográfica (se instalados) -Comment[ro]=Activează utilitare de date precum dicţionarul şi verificarea ortografică (dacă sînt instalate) -Comment[ru]=позволяет использовать утилиты словаря и проверки орфографии (если они установлены) -Comment[rw]=Gushoboza ibikoresho by'ibyatanzwe nk'impuzansobanuro n'igenzuranyuguti (niba byarakorewe iyinjizaporogaramu) -Comment[se]=Geavat diehtoreaidduid nugo synonymasátnelisttu ja čállindárkkisteami (jos leat sajáiduhttojuvvon) -Comment[sk]=Podpora dátových nástrojov, ako je thesaurus a kontrola pravopisu (ak sú nainštalované) -Comment[sl]=Omogoči orodja za podatke, kot so slovar sopomenk in preverjanje črkovanja (če je nameščen) -Comment[sq]=Lejo veglat për të dhënat sikurse fjalori i sinonimeve dhe korigjuesi i fjalëve (nëse janë të instaluara) -Comment[sr]=Укључије алате као што су ризница и провера правописа (ако су инсталирани) -Comment[sr@Latn]=Uključije alate kao što su riznica i provera pravopisa (ako su instalirani) -Comment[sv]=Aktivera dataverktyg som synonymordlista och stavningskontroll (om installerade) -Comment[ta]=அகராதி, எழுத்துப்பிழை திருத்தி போன்ற தகவல் கருவிகளை இயக்கும் (நிறுவப்பட்டிருந்தால்) -Comment[te]=పదకోశం మరయూ అక్షర తప్పులను పట్టుకొను పనిముట్లను ఉపయోగించు (ఇంస్టాల్ చేసిన పనిచేయును) -Comment[tg]=Иҷозаи истифодаи утилитаи луғат ва тафтиши имлоро (агар онҳо сабт карда шуда бошанд) медиҳад -Comment[th]=เปิดใช้งานเครื่องมือจัดการข้อมูลอย่างเช่น พจนานุกรมคำคล้าย หรือ ตรวจคำสะกด (ถ้าได้ติดตั้งไว้) -Comment[tr]=Thesaurus ve imla denetimi gibi araçları etkinleştir -Comment[tt]=Süznämä belän imla tikşerü kebek qorallar eşlätä (quyılğan bulsalar) -Comment[uk]=Надає доступ до засобів на кшталт словників та перевірки правопису (якщо встановлені) -Comment[uz]=Lugʻat va imloni tekshirish vositalarni yoqish (agar oʻrnatilgan boʻlsa) -Comment[uz@cyrillic]=Луғат ва имлони текшириш воситаларни ёқиш (агар ўрнатилган бўлса) -Comment[ven]=U konisa zwishumiswa zwa data sa bugu nau sedza ha tshipelini (arali zwo dzheniswa) -Comment[vi]=Hiệu lực công cụ dữ liệu như từ điển đồng nghĩa và bộ bắt lỗi chính tả (nếu được cài đặt). -Comment[wa]=Mete en alaedje les usteyes po manaedjî les dnêyes, come les diccionaires ou les coridjreces (si astalés) -Comment[xh]=Yenza izixhobo ze data ezinjenge thesaurus nomkhangeli wopelo (ukuba ifakelwe) -Comment[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的数据工具(如果安装了的话) -Comment[zh_HK]=如果有安裝的話，啟用像同義字字典和拼字檢查等的文字工具 -Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話) -Comment[zu]=Nika amandla amathuluzi edata anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe) X-TDE-Library=tdetexteditor_kdatatool X-TDE-ServiceTypes=KTextEditor/Plugin Type=Service diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt index c09dbda6d..dbdc7e494 100644 --- a/kate/plugins/wordcompletion/CMakeLists.txt +++ b/kate/plugins/wordcompletion/CMakeLists.txt @@ -25,7 +25,12 @@ link_directories( ##### other data ################################ -install( FILES tdetexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdetexteditor_docwordcompletion.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kate-desktops +) + install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_docwordcompletion ) diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 26dce06d0..8ffa241fd 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent, void DocWordCompletionPlugin::readConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup( "DocWordCompletion Plugin" ); m_treshold = config->readNumEntry( "treshold", 3 ); m_autopopup = config->readBoolEntry( "autopopup", true ); @@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig() void DocWordCompletionPlugin::writeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("DocWordCompletion Plugin"); config->writeEntry("autopopup", m_autopopup ); config->writeEntry("treshold", m_treshold ); @@ -146,15 +146,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au setInstance( KGenericFactory<DocWordCompletionPlugin>::instance() ); (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this, - TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" ); + TQ_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" ); (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this, - TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" ); + TQ_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" ); (void) new TDEAction( i18n("Pop Up Completion List"), 0, this, - TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" ); + TQ_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" ); (void) new TDEAction( i18n("Shell Completion"), 0, this, - TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" ); + TQ_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" ); d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this, - TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" ); + TQ_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" ); d->autopopup->setChecked( autopopup ); toggleAutoPopup(); @@ -168,8 +168,8 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au if ( ! e.isEmpty() ) d->autopopup->setEnabled( e == "true" ); - connect( view->document(), TQT_SIGNAL(variableChanged(const TQString &, const TQString &)), - this, TQT_SLOT(slotVariableChanged(const TQString &, const TQString &)) ); + connect( view->document(), TQ_SIGNAL(variableChanged(const TQString &, const TQString &)), + this, TQ_SLOT(slotVariableChanged(const TQString &, const TQString &)) ); } } @@ -203,15 +203,15 @@ void DocWordCompletionPluginView::popupCompletionList( TQString w ) void DocWordCompletionPluginView::toggleAutoPopup() { if ( d->autopopup->isChecked() ) { - if ( ! connect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), - this, TQT_SLOT(autoPopupCompletionList()) )) + if ( ! connect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), + this, TQ_SLOT(autoPopupCompletionList()) )) { - connect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) ); + connect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) ); } } else { - disconnect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) ); - disconnect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), - this, TQT_SLOT(autoPopupCompletionList()) ); + disconnect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) ); + disconnect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), + this, TQ_SLOT(autoPopupCompletionList()) ); } } @@ -551,4 +551,3 @@ void DocWordCompletionConfigPage::defaults() //END DocWordCompletionConfigPage #include "docwordcompletion.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h index 22b469695..e2ff3cfb2 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.h +++ b/kate/plugins/wordcompletion/docwordcompletion.h @@ -44,7 +44,7 @@ class DocWordCompletionPlugin , public KTextEditor::PluginViewInterface , public KTextEditor::ConfigInterfaceExtension { - Q_OBJECT + TQ_OBJECT public: DocWordCompletionPlugin( TQObject *parent = 0, @@ -81,7 +81,7 @@ class DocWordCompletionPlugin class DocWordCompletionPluginView : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: DocWordCompletionPluginView( uint treshold=3, bool autopopup=true, KTextEditor::View *view=0, @@ -113,7 +113,7 @@ class DocWordCompletionPluginView class DocWordCompletionConfigPage : public KTextEditor::ConfigPage { - Q_OBJECT + TQ_OBJECT public: DocWordCompletionConfigPage( DocWordCompletionPlugin *completion, TQWidget *parent, const char *name ); virtual ~DocWordCompletionConfigPage() {}; @@ -130,4 +130,3 @@ class DocWordCompletionConfigPage : public KTextEditor::ConfigPage }; #endif // _DocWordCompletionPlugin_h_ -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop index 934a0a7ba..f51fe3fae 100644 --- a/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop +++ b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop @@ -1,137 +1,6 @@ [Desktop Entry] Name=KTextEditor Word Completion Plugin -Name[af]=KTextEditor Woord Voltooiïng Inprop Module -Name[be]=Модуль заканчэння словаў -Name[bn]=কে-টেক্সট-এডিটর শব্দ পরিপূরণ প্লাগ-ইন -Name[bs]=KTextEditor dodatak za dovršavanje riječi -Name[ca]=Endollable de completar paraules del KTextEditor -Name[cs]=Modul pro doplňování slov -Name[csb]=Plugins editorë do dofùlowaniô słowów -Name[da]=KTextEditor 'ord-kompletterings'-plugin -Name[de]=KTextEditor-Erweiterung für Wortergänzungen -Name[el]=Πρόσθετο συμπλήρωσης λέξεων του KTextEditor -Name[eo]=KTextEditor Vortkompletiga kromaĵo -Name[es]=Plugin de completado de palabras de KTextEditor -Name[et]=KTextEditori sõna lõpetamise plugin -Name[eu]=KTextEditor-en hitzen osaketarako plugin-a -Name[fa]=وصلۀ تکمیل واژۀ KTextEditor -Name[fi]=KTextEditorin sanojen täydennyslaajennus -Name[fr]=Module externe de complètement des mots de KTextEditor -Name[fy]=KTextEditor plugin foar it kompleet meitje fan wurden -Name[ga]=Breiseán Comhlánaithe Focal KTextEditor -Name[gl]=Plugin de Completado de Palabras de KTextEditor -Name[he]=תוסף השלמה אוטומטית של מילים עבור KTextEditor -Name[hi]=के-टेक्स्ट-एडिटर वर्ड कम्प्लीशन प्लगिन -Name[hr]=KTextEditor dodatak za dopunjavanje riječi -Name[hsb]=KTextEditor Plugin za wudospołnjenje słowow -Name[hu]=KTextEditor szókiegészítő bővítőmodul -Name[id]=Plugin Pelengkapan Kata KTextEditor -Name[is]=KTextEditor íforrit til að klára orð -Name[it]=Plugin completamento parole di KTextEditor -Name[ja]=KTextEditor 単語補完プラグイン -Name[ka]=სიტყვების თვითშევსების KTextEditor-ის მოდული -Name[kk]=KTextEditor сөздерді аяқтау модулі -Name[km]=កម្មវិធីជំនួយបំពេញពាក្យរបស់ KTextEditor -Name[ko]=K글월편집기 낱말 완성 플러그인 -Name[lb]=KTextEditor-Wuert-Vervollstännegungs-Plugin -Name[lt]=KTextEditor žodžio užbaigimo priedas -Name[lv]=KTextEditor vārdu pabeigšanas spraudnis -Name[mk]=KTextEditor приклучок за довршување на зборови -Name[ms]=Plug masuk Penyudah Kata Fail KTextEditor -Name[nb]=Programtillegg for ordfullføring i KTextEditor -Name[nds]=KTextEditor-Plugin för Woort-Kompletteren -Name[ne]=KTextEditor शब्द समाप्ति प्लगइन -Name[nl]=KTextEditor-plugin voor het aanvullen van woorden -Name[nn]=Programtillegg for ordfullføring i KTextEditor -Name[pa]=KTextEditor ਪਾਠ ਪੂਰਨ ਪਲੱਗਿੰਨ -Name[pl]=Wtyczka edytora do dopełniania słów -Name[pt]='Plugin' de Completação de Palavras do KTextEditor -Name[pt_BR]=Plug-in de Complementação de Palavras para Editor de textos -Name[ro]=Modul completare cuvinte pentru KTextEditor -Name[ru]=Модуль автодополнения слов KTextEditor -Name[rw]=Icomeka ry'Iyuzuza Jambo rya KMuhinduziUmwandiko -Name[se]=KTextEditor:a sátneollašuhttinlassemoduvla -Name[sk]=Modul pre doplnenie slov pre KTextEditor -Name[sl]=Vstavek KTextEditor za dopolnjevanje besed -Name[sr]=KTextEditor прикључак за довршавање речи -Name[sr@Latn]=KTextEditor priključak za dovršavanje reči -Name[sv]=Ktexteditor-insticksprogram för att komplettera ord -Name[ta]=கேஉரைதொகுப்பாளர் கோப்பு உள்ளீட்டுச் சொருகுப்பொருள் -Name[te]=కెటెక్స్ట్ ఎడిటర్ పద పూరణ ప్లగిన్ -Name[tg]=Модули худиловакунандаи калимаҳои KTextEditor -Name[th]=ปลักอินการเติมคำให้สมบูรณ์ของ KTextEditor -Name[tr]=KTextEditor Kelime Tamamlama Eklentisi -Name[tt]=KTextEditor'nıñ Süz Tulılandıru Östämäse -Name[uk]=Втулок KTextEditor для завершення слів -Name[vi]=Bộ cầm phít Nhập xong Từ KTextEditor -Name[zh_CN]=KTextEditor 单词补全插件 -Name[zh_HK]=KTextEditor 文字自動補齊外掛程式 -Name[zh_TW]=KTextEditor 單字補完外掛程式 Comment=Directional or popup-based completion from words in the document -Comment[af]=Direksionele of opspring gebaseerde woord voltooiïng van woorde in die dokument -Comment[be]=Простае заканчэнне словаў ці выплыўнае вакно з варыянтамі заканчэння -Comment[bg]=Автоматично завършване на думи, базирано на използваните вече думи в документа -Comment[bn]=ডকুমেন্ট-এর অন্যান্য শব্দের উপর ভিত্তি করে পরিপূরণ -Comment[bs]=Direkcionalno ili popup-bazirano dovršavanje za riječi u dokumentu -Comment[ca]=Compleció de paraules del document dirigida o basada en emergents -Comment[cs]=Přímé nebo vyskakovací doplňování slov v dokumentu -Comment[csb]=Dofùlowanié na spòdlëm lëstë słowów w dokùmence -Comment[da]=Retnings- eller popop-baseret fuldstændiggørelse ud fra ord i dokumentet -Comment[de]=Richtungs- oder über Aufklappfenstergesteuerte automatische Vervollständigung von Wörtern in Dokumenten -Comment[el]=Κατευθυντική ή μέσω αναδυόμενων μενού συμπλήρωση από λέξεις μέσα στο έγγραφο -Comment[eo]=Regula aŭ ŝprucbazita kompletigo de vortoj en la dokumento -Comment[es]=Completado de palabras direccional o de menú emergente en el documento. -Comment[et]=Lõpetamine vastavalt suunale või hüpikvariantide alusel dokumendi sõnade põhjal -Comment[eu]=Dokumentuko hitzen osaketarako plugin-a -Comment[fa]=تکمیل جهتدار یا مبنی بر بالاپر از کلمات موجود در سند -Comment[fi]=Asiakirjasta löytyvillä sanoilla täydentäminen -Comment[fr]=Complètement utilisant la direction ou un menu à partir des mots du document -Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of popup-basearje -Comment[gl]=Completado direccional ou baseada en popup a partir de palabras no documento -Comment[he]=השלמת מילים כיווניות או מבוססת תיבת מוקפצות של מילים מהמסמך -Comment[hi]=डायरेक्शनल या पॉपअप-आधारित दस्तावेज़ में शब्द से कम्पलीशन. -Comment[hr]=Usmjereno ili pop-up zasnovano dovršavanje iz riječi u dokumentu -Comment[hsb]=Direktionalne abo na pop-up bazowace wudospołnjowanje za słowa w dokumenće -Comment[hu]=Irány szerinti vagy felbukkanó kiegészítés dokumentum szavai alapján -Comment[id]=Pelengkapan arahan atau popup dari kata di dalam dokumen -Comment[is]=Áttvíst forrit sem getur líka opnað glugga með orðatillögum -Comment[it]=Completamento direzionale o con finestre a comparsa di parole nel documento -Comment[ja]=ポップアップまたはユーザの指示によってドキュメントの単語から補完します -Comment[ka]=დოკუმენტში სიტყვების პირდაპირი მეთოდით ან ჩამოშლადი მენიუთი თვითშევსება -Comment[kk]=Құжаттағы сөздерді аяқтау модулі -Comment[km]=ការបំពេញពាក្យដោយផ្ទាល់ ឬ តាមរយៈការលេចឡើងនៃពាក្យដែលមានក្នុងឯកសារ -Comment[lb]=Direktional oder Opklapp-Fënster-baséiert Vervollstännegung vu Wierder am Dokument -Comment[lt]=Žodžių pabaigimas rašant dokumente pasiūlymus teikiant eilutėje arba iššokančiame meniu -Comment[lv]=Vārdu automātiska pabeigšana izmantojot dokumentā jau esošos vārdus -Comment[mk]=Насочено или скок-базирано довршување од зборови во документот -Comment[ms]=Penyelesaian berarah atau berasaskan popup daripada perkataan dalam dokumen -Comment[nb]=Retningsbestemt eller sprettopp-basert fullføring av ord i dokumentet -Comment[nds]=Richten- oder Opdukbaseert Kompletteren vun Wöör binnen dat Dokment -Comment[ne]=कागजातमा शब्दहरूबाट दिशानिर्देशित वा पपअपमा आधारित समाप्ति -Comment[nl]=Voor het aanvullen van woorden in het document door middel van onder meer pop-ups -Comment[nn]=Retningsbestemt eller sprettopp-basert fullføring av ord i dokumentet -Comment[pa]=ਦਸਤਾਵੇਜ਼ ਵਿੱਚ ਦਿਸ਼ਾਵੀ ਜਾਂ ਪੋਪਅੱਪ ਆਧਾਰਿਤ ਸ਼ਬਦ ਪੂਰਨ -Comment[pl]=Dopełnianie na podstawie listy słów w dokumencie -Comment[pt]=Completação direccional ou por lista de palavras no documento -Comment[pt_BR]=Complementação direcional, ou baseada em popup, de palavras do documento -Comment[ro]=Propune completarea cuvintelor din document dintr-o listă popup sau direcţională -Comment[ru]=Автодополнение слов в документе -Comment[rw]=Irangiza mfatacyerekezo cyangwa rishingiye-kwirambura biva ku magambo yo mu nyandiko -Comment[sk]=Dopĺňanie slov v dokumente priame alebo pomocou dialógu -Comment[sl]=Neposredno ali pojavno dopolnjevanje iz besed v dokumentu -Comment[sr]=Директна или искачућа допуна од речи у документу -Comment[sr@Latn]=Direktna ili iskačuća dopuna od reči u dokumentu -Comment[sv]=Komplettering av ord i dokumentet baserad på ordlista eller dialogruta -Comment[ta]=ஆவணத்திலுள்ள வார்த்தைகளிலிருந்து திசைகள் அல்லது மேல்விரி-சார்ந்த நிறைவு -Comment[te]=పత్రం లోని పదాలు వాడె, దిశా లేక పాప్ అప్ ఆధారిత పద పూరణ -Comment[tg]=Худиловакунандаи калима дар ҳуҷҷат -Comment[th]=การเติมคำให้สมบูรณ์โดยการชี้นำหรือ popup ขึ้นมา จากคำต่างๆ ในเอกสาร -Comment[tr]=Doğrusal veya açılır-kuttu abanlı kelime tamamlama -Comment[tt]=İstälek süzlärenä azaqlarnı yözep çığarıp kürsätä torğan närsä -Comment[uk]=Завершення слів у документі. Пряме або на основі вигулькного меню -Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều hoặc vào bộ bật lên. -Comment[zh_CN]=在文档中基于方向或弹出补全单词 -Comment[zh_TW]=在編輯文件時的單字補完功能 X-TDE-Library=tdetexteditor_docwordcompletion X-TDE-ServiceTypes=KTextEditor/Plugin Type=Service diff --git a/kate/scripts/CMakeLists.txt b/kate/scripts/CMakeLists.txt index 235cedd48..fbb1b3576 100644 --- a/kate/scripts/CMakeLists.txt +++ b/kate/scripts/CMakeLists.txt @@ -11,8 +11,14 @@ ##### other data ################################ +tde_create_translated_desktop( + SOURCE jstest.desktop + DESTINATION ${DATA_INSTALL_DIR}/katepart/scripts + PO_DIR kate-desktops +) + install( FILES - jstest.desktop jstest.js script-indent-c-newline.js + jstest.js script-indent-c-newline.js script-indent-c-char.js sort.js DESTINATION ${DATA_INSTALL_DIR}/katepart/scripts ) diff --git a/kate/scripts/jstest.desktop b/kate/scripts/jstest.desktop index 28619d871..3582f04b5 100644 --- a/kate/scripts/jstest.desktop +++ b/kate/scripts/jstest.desktop @@ -1,119 +1,5 @@ [Desktop Entry] Name=Kate Part JavaScript Test -Name[af]=Kate Deel Javaskript Toets -Name[be]=Праверка сцэнараў JavaScript для Kate -Name[ca]=Prova de la peça JavaScript de Kate -Name[cs]=Kate Part JavaScript test -Name[csb]=Test JavaScript - dzélu Kate -Name[de]=JavaScript-Test für Kate-Komponente -Name[el]=Έλεγχος JavaScript του Kate Part -Name[eo]=Ĝavaskripta testo por Kate dokumenta rigardilo -Name[es]=Prueba JavaScript de Kate Part -Name[et]=Kate komponendi JavaScripti test -Name[eu]=Kate zatiaren JavaScript proba -Name[fa]=آزمون دستنوشتۀ جاوا Kate Part -Name[fi]=Kate Part JavaScript -testi -Name[fr]=Test du module JavaScript pour Kate -Name[fy]=Kate-part JavaSkript-test -Name[ga]=Tástáil JavaScript do Pháirt Kate -Name[gl]=Comprobar Kate Part JavaScript -Name[he]=בדיקת JavaScript של רכיב Kate -Name[hr]=Kate Part JavaScript test -Name[hu]=Kate objektum, Javascript-teszt -Name[id]=Tes JavaScript untuk Part Kate -Name[is]=Kate hluti JavaScript prófun -Name[it]=Prova componente JavaScript per Kate -Name[ja]=Kate Part JavaScript テスト -Name[ka]=JavaScript-ის შემოწმება Kate-ში -Name[kk]=JavaScript скрипттерді Kate редакторында тексеру -Name[km]=ការសាកល្បង Kate Part JavaScript -Name[lb]=Kate Part JavaScript-Test -Name[lt]=Kate Part JavaScript testas -Name[ms]=Ujian JavaScript Bahagian Kate -Name[nb]=Kate Part JavaScript-test -Name[nds]=Kate-Part JavaScript-Test -Name[ne]=केट भाग जाभा स्क्रिप्ट परीक्षण -Name[nl]=Kate-part JavaScript-test -Name[nn]=Kate Part JavaScript-test -Name[pa]=Kate Part JavaScript ਜਾਂਚ -Name[pl]=Test JavaScript osadzalnej części Kate -Name[pt]=Teste de JavaScript do Componente do Kate -Name[pt_BR]=Teste do componente JavaScript do Kate -Name[ro]=Test JavaScript pentru componenta Kate -Name[ru]=Проверка скриптов JavaScript в Kate -Name[rw]=Igerageza rya JavaScript Igice Kate -Name[se]=Kate Part JavaScript-geahččaleapmi -Name[sl]=Test JavaScripta za del Kate -Name[sr]=Проба JavaScript-а Kate-иног дела -Name[sr@Latn]=Proba JavaScript-a Kate-inog dela -Name[sv]=Test av Javaskript för Kates delprogram -Name[ta]=கேட் பகுதி ஜாவாஸ்கிரிப்ட் சோதனை -Name[te]=కేట్ భాగం జావాస్క్రిప్ట్ పరీక్ష -Name[tg]=Санҷиши Қисми Kate-и JavaScript -Name[th]=ทดสอบจาวาสคริปต์ของ Kate -Name[tt]=Kate Part JavaScript Sınaw -Name[uk]=Перевірка скриптів JavaScript в компоненті Kate -Name[vi]=Thử ra JavaScript phần Kate -Name[zh_CN]=Kate 部件 JavaScript 测试 Comment=Script for testing kate part's scripting -Comment[af]=Skript om te toets of Kate se skript masjien werk -Comment[be]=Сцэнар праверкі для Kate -Comment[bg]=Скрипт за тестване на модулите за поддръжка на скриптове -Comment[bs]=Skripta za testiranje podrške Kate part-a za skriptiranje -Comment[ca]=Guió per a provar l'escriptat de les peces Kate -Comment[cs]=Skript pro test skriptování Kate -Comment[csb]=Skript do testowaniô mòżnotë skriptów Kate -Comment[da]=Script til at teste katepart scripter -Comment[de]=Ein Skript zum Testen der Skriptfunktionalität der Kate-Komponente -Comment[el]=Σενάριο για έλεγχο του scripting του Kate Part -Comment[eo]=Skripto por testi la skriptan kapablon de katepart (dokumento kaj rigardilo) -Comment[es]=Guión para probar el part de scripting de kate -Comment[et]=Skript Kate komponendi skriptimisomaduste testimiseks -Comment[eu]=Script-a Kate zatiaren script-ak probatzeko. -Comment[fa]=دستنوشته برای آزمون دستنوشتههایKate Part -Comment[fi]=Skripti kate partin skriptien testaukseen -Comment[fr]=Script testant le module de scripting de Kate -Comment[fy]=Skript foar it testen fan Kate-part's skriptmooglikheid -Comment[gl]=Guión para probar os guións das partes de kate -Comment[he]=תסריט לבדיקה של יכולות התסריט של Kate -Comment[hr]=Skripta za ispitivanje izvršavanje skripti pri 'kate part' -Comment[hu]=Szkript a Kate objektum szkriptkezelőjének ellenőrzéséhez -Comment[id]=Skrip untuk menguji skripting part kate -Comment[is]=Skrifta til að prófa skriftueiginleika Kate hluta -Comment[it]=Script per provare il componente di scripting di kate -Comment[ja]=kate part のスクリプトをテストするためのスクリプト -Comment[ka]=სკრიპტი Kate-ში სკრიპტების შესამოწმებლად -Comment[kk]=Kate редакторында скрипттерді тексеру скрипті -Comment[km]=ស្គ្រីបសម្រាប់សាកល្បងការសរសេររបស់ kate part -Comment[lb]=Skript fir d'Skriptfunktioune vum Kate part ze testen -Comment[lt]=Scenarijus Kate komponento scenarijų rašymo patikrai -Comment[ms]=Skrip untuk menguji penskripan bahagian kate -Comment[nb]=Skript til å teste kate parts skripting -Comment[nds]=En Skript, dat Kate-Part sien Skriptkönen pröven schall -Comment[ne]=केट भागको स्क्रिप्टिङ परीक्षणका लागि स्क्रिप्ट -Comment[nl]=Script voor het testen van Kate-part's scriptmogelijkheid -Comment[nn]=Skript for testing av Kate part-skriptinga -Comment[pa]=kate part ਦੀ ਸਕ੍ਰਿਪਟਿੰਗ ਦੀ ਜਾਂਚ ਲਈ ਸਕ੍ਰਿਪਟ -Comment[pl]=Skrypt do testowania możliwości skryptów Kate -Comment[pt]=Um programa para testar a programação do componente do Kate -Comment[pt_BR]=Script para testes da parte de scripts do kate -Comment[ro]=Script pentru testarea părţii de scripting din Kate -Comment[ru]=Скрипт для проверки поддержки скриптов в Kate -Comment[rw]=Inyandikoporogaramu yo kugenzura kwandika kode by'igice cya kate. -Comment[se]=Skripta mii geahččala Kate part-skriptema -Comment[sk]=Skript pre testovanie skriptovania Kate Part -Comment[sl]=Skript za testiranje delovanja skriptov za del Kate -Comment[sr]=Скрипта за испробавање скриптовања Kate-иног дела -Comment[sr@Latn]=Skripta za isprobavanje skriptovanja Kate-inog dela -Comment[sv]=Skript för att testa skripthantering i Kates delprogram -Comment[ta]=கேட் பகுதியின் எழுத்தாக்க சோதனைக்கான குறுநிரல் -Comment[te]=కేట్ భాగంపు స్క్రిప్టింగ్ ను పరీక్షించుటకు వాడు ఒక స్క్రిప్ట్ -Comment[tg]=Скрипт барои санҷидани скриптгузории қисми kate -Comment[th]=สคริปต์สำหรับทดสอบการเขียนสคริปต์ในส่วนของ Kate -Comment[tt]=Kate Part'nıñ ämerleklären sınawçı qoral -Comment[uk]=Скрипт для перевірки підтримки скриптів в компоненті Kate -Comment[vi]=Tập lệnh để thử ra khả năng điều khiển bằng tập lệnh của phần Kate. -Comment[zh_CN]=测试 kate 部件脚本的脚本 -Comment[zh_TW]=測試 kate part 的文稿 X-Kate-Command=jstest X-Kate-Help=<p>Usage: <code>jstest</code></p> |