From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kate/COPYING.LIB | 14 +- kate/ChangeLog | 4 +- kate/Makefile.am | 2 +- kate/README.testing | 16 +- kate/data/ada.xml | 2 +- kate/data/ahdl.xml | 2 +- kate/data/apache.xml | 4 +- kate/data/asm-avr.xml | 2 +- kate/data/asn1.xml | 6 +- kate/data/bash.xml | 10 +- kate/data/cg.xml | 2 +- kate/data/clipper.xml | 2 +- kate/data/cmake.xml | 10 +- kate/data/coldfusion.xml | 4 +- kate/data/commonlisp.xml | 22 +- kate/data/cpp.xml | 2 +- kate/data/css.xml | 14 +- kate/data/d.xml | 2 +- kate/data/ddoc.xml | 2 +- kate/data/erlang.xml | 2 +- kate/data/euphoria.xml | 4 +- kate/data/fortran.xml | 74 +++--- kate/data/freebasic.xml | 2 +- kate/data/gap.xml | 12 +- kate/data/gdl.xml | 14 +- kate/data/generate-php.pl | 6 +- kate/data/gnuassembler.xml | 2 +- kate/data/idconsole.xml | 8 +- kate/data/ilerpg.xml | 2 +- kate/data/inform.xml | 2 +- kate/data/java.xml | 14 +- kate/data/javascript.xml | 6 +- kate/data/json.xml | 2 +- kate/data/jsp.xml | 6 +- kate/data/katefiletyperc | 2 +- kate/data/katepart.desktop | 2 +- kate/data/katepartreadonlyui.rc | 12 +- kate/data/katepartui.rc | 14 +- kate/data/language.dtd | 6 +- kate/data/ldif.xml | 4 +- kate/data/lex.xml | 2 +- kate/data/lilypond.xml | 22 +- kate/data/lpc.xml | 4 +- kate/data/lua.xml | 6 +- kate/data/makefile.xml | 2 +- kate/data/maxima.xml | 10 +- kate/data/mergetagtext.xml | 2 +- kate/data/modelica.xml | 2 +- kate/data/mup.xml | 2 +- kate/data/nasm.xml | 6 +- kate/data/objectivecpp.xml | 2 +- kate/data/ocaml.xml | 2 +- kate/data/octave.xml | 26 +- kate/data/opal.xml | 2 +- kate/data/perl.xml | 66 ++--- kate/data/php.xml | 94 +++---- kate/data/postscript.xml | 8 +- kate/data/prolog.xml | 4 +- kate/data/purebasic.xml | 6 +- kate/data/python.xml | 4 +- kate/data/r.xml | 2 +- kate/data/rapidq.xml | 10 +- kate/data/rhtml.xml | 12 +- kate/data/ruby.xml | 12 +- kate/data/scala.xml | 12 +- kate/data/sci.xml | 10 +- kate/data/sql.xml | 2 +- kate/data/stata.xml | 8 +- kate/data/syntax.template | 6 +- kate/data/tcl.xml | 10 +- kate/data/winehq.xml | 2 +- kate/data/xslt.xml | 8 +- kate/data/xul.xml | 6 +- kate/data/yacas.xml | 2 +- kate/data/yacc.xml | 4 +- kate/interfaces/.kateconfig | 2 +- kate/interfaces/view.h | 16 +- kate/part/.kateconfig | 2 +- kate/part/configure.in.in | 2 +- kate/part/katearbitraryhighlight.cpp | 6 +- kate/part/katearbitraryhighlight.h | 4 +- kate/part/kateattribute.cpp | 2 +- kate/part/kateattribute.h | 2 +- kate/part/kateautoindent.cpp | 134 +++++----- kate/part/kateautoindent.h | 14 +- kate/part/katebookmarks.cpp | 8 +- kate/part/katebookmarks.h | 4 +- kate/part/katebuffer.cpp | 62 ++--- kate/part/katebuffer.h | 24 +- kate/part/katecmds.cpp | 80 +++--- kate/part/katecmds.h | 30 +-- kate/part/katecodecompletion.cpp | 20 +- kate/part/katecodecompletion.h | 8 +- kate/part/katecodefoldinghelpers.cpp | 82 +++--- kate/part/katecodefoldinghelpers.h | 16 +- kate/part/kateconfig.cpp | 4 +- kate/part/kateconfig.h | 2 +- kate/part/katecursor.cpp | 2 +- kate/part/katecursor.h | 6 +- kate/part/katedialogs.cpp | 60 ++--- kate/part/katedialogs.h | 4 +- kate/part/katedocument.cpp | 88 +++--- kate/part/katedocument.h | 10 +- kate/part/katedocumenthelpers.cpp | 2 +- kate/part/katefactory.cpp | 12 +- kate/part/katefactory.h | 6 +- kate/part/katefiletype.cpp | 32 +-- kate/part/katefont.cpp | 2 +- kate/part/katehighlight.cpp | 74 +++--- kate/part/katehighlight.h | 12 +- kate/part/katejscript.cpp | 4 +- kate/part/katejscript.h | 6 +- kate/part/katelinerange.cpp | 2 +- kate/part/kateluaindentscript.cpp | 4 +- kate/part/kateluaindentscript.h | 2 +- kate/part/kateprinter.cpp | 18 +- kate/part/katerenderer.cpp | 22 +- kate/part/kateschema.cpp | 76 +++--- kate/part/kateschema.h | 6 +- kate/part/katesearch.cpp | 296 ++++++++++----------- kate/part/katesearch.h | 66 ++--- kate/part/katespell.cpp | 6 +- kate/part/katespell.h | 4 +- kate/part/katesupercursor.cpp | 4 +- kate/part/katesupercursor.h | 8 +- kate/part/katesyntaxdocument.cpp | 4 +- kate/part/katesyntaxdocument.h | 4 +- kate/part/katetemplatehandler.cpp | 4 +- kate/part/katetextline.cpp | 54 ++-- kate/part/katetextline.h | 16 +- kate/part/kateundo.cpp | 2 +- kate/part/kateundo.h | 4 +- kate/part/kateview.cpp | 68 ++--- kate/part/kateview.h | 26 +- kate/part/kateviewhelpers.cpp | 14 +- kate/part/kateviewhelpers.h | 4 +- kate/part/kateviewinternal.cpp | 18 +- kate/part/kateviewinternal.h | 12 +- kate/part/test_regression.cpp | 44 +-- kate/part/test_regression.h | 4 +- kate/plugins/autobookmarker/autobookmarker.cpp | 54 ++-- kate/plugins/autobookmarker/autobookmarker.h | 4 +- .../autobookmarker/ktexteditor_autobookmarkerrc | 12 +- kate/plugins/isearch/ktexteditor_isearchui.rc | 4 +- kate/plugins/kdatatool/kate_kdatatool.cpp | 10 +- kate/plugins/wordcompletion/docwordcompletion.cpp | 12 +- kate/plugins/wordcompletion/docwordcompletion.h | 4 +- .../ktexteditor_docwordcompletion.desktop | 2 +- kate/scripts/script-indent-c1-test.lua | 12 +- kate/tests/highlight.asp | 2 +- kate/tests/highlight.cmake | 2 +- kate/tests/highlight.do | 4 +- kate/tests/highlight.exu | 2 +- kate/tests/highlight.f90 | 2 +- kate/tests/highlight.lisp | 2 +- kate/tests/highlight.ly | 4 +- kate/tests/highlight.mup | 4 +- kate/tests/highlight.rb | 4 +- kate/tests/highlight.sh | 2 +- kate/tests/test.js | 6 +- 160 files changed, 1240 insertions(+), 1240 deletions(-) (limited to 'kate') diff --git a/kate/COPYING.LIB b/kate/COPYING.LIB index 6113583d2..a96b5730d 100644 --- a/kate/COPYING.LIB +++ b/kate/COPYING.LIB @@ -94,7 +94,7 @@ will lead to faster development of free libraries. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former tqcontains code derived from the library, while the latter only +former contains code derived from the library, while the latter only works together with the library. Note that it is possible for a library to be covered by the ordinary @@ -104,7 +104,7 @@ General Public License rather than by this special one. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library which -tqcontains a notice placed by the copyright holder or other authorized +contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Library General Public License (also called "this License"). Each licensee is addressed as "you". @@ -123,7 +123,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it tqcontains, plus any associated +all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -225,7 +225,7 @@ source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. - 5. A program that tqcontains no derivative of any portion of the + 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and @@ -233,7 +233,7 @@ therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it -tqcontains portions of the Library), rather than a "work that uses the +contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. @@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure tqlayouts and accessors, and small macros and small inline +structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the @@ -324,7 +324,7 @@ permitted, and provided that you do these two things: b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining - where to tqfind the accompanying uncombined form of the same work. + where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any diff --git a/kate/ChangeLog b/kate/ChangeLog index edd33b64e..21fc54ba5 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -190,7 +190,7 @@ * now the pluginconfig pages work ;) 2001-04-24 Joseph Wenninger - * now and is tqreplaced by + * now and is replaced by 2001-04-20 Christoph Cullmann * new configdialog @@ -325,7 +325,7 @@ * Filter - select text, hit , and enter an OS command. we pipe the selected text thru that command, such as "sort", and then - tqreplace the selection with the result. Impress your friends. + replace the selection with the result. Impress your friends. 2001-02-21 Joseph Wenninger * Makefile.am's : correction for linking diff --git a/kate/Makefile.am b/kate/Makefile.am index 4e2601ca5..180e86dab 100644 --- a/kate/Makefile.am +++ b/kate/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = AUTHORS COPYING.LIB ChangeLog NEWS README TODO messages: $(EXTRACTRC) ./*/*.rc >> rc.cpp $(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp - $(XGETTEXT) `tqfind . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot + $(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts include ../admin/Doxyfile.am diff --git a/kate/README.testing b/kate/README.testing index d0143cc1a..037271027 100644 --- a/kate/README.testing +++ b/kate/README.testing @@ -3,7 +3,7 @@ Author: Leo Savernik -Kate tqcontains regression tests to ensure that fixed bugs do not reappear in +Kate contains regression tests to ensure that fixed bugs do not reappear in newer versions. To facilitate regression testing, a dedicated application testkateregression will execute the regression tests and compare them to the expecting results, indicating passed as well as failed testcases. @@ -13,7 +13,7 @@ expecting results, indicating passed as well as failed testcases. -------------------------- We tried to make regression testing for Kate as easy as possible such that you -can run it before each commit and tqfind out regressions caused by your changes +can run it before each commit and find out regressions caused by your changes before they are shipped as part of a release. Running all regression tests works by simply invoking @@ -117,8 +117,8 @@ and consists of two subdirectories baseline tests -The latter, tests, tqcontains a directory hierarchy for all testcases to be run -by testkateregression. The former, baseline, tqcontains results as they are +The latter, tests, contains a directory hierarchy for all testcases to be run +by testkateregression. The former, baseline, contains results as they are expected by correct operation. Mismatch between the output of a test and its baseline is considered to be a failure. @@ -154,16 +154,16 @@ of failures but they don't cause testkateregression to return a failure code. ------------------------- A testcase is comprised of a simple plain text file .txt which may -be located in any subdirectory under tests. This file tqcontains the *initial* +be located in any subdirectory under tests. This file contains the *initial* content the testcase operates on. Each .txt must be accompanied with a .txt-script which -tqcontains the actual tests to be performed on the testcase. It consists of +contains the actual tests to be performed on the testcase. It consists of simple JavaScript-statements for direct interfacing with Kate. Last but not least, a .txt-result exists under the baseline -subdirectory, which tqcontains a mirrored directory hierarchy of tests. This very -file tqcontains the expected *result* of the performed tests. +subdirectory, which contains a mirrored directory hierarchy of tests. This very +file contains the expected *result* of the performed tests. 7. Writing a simple testcase diff --git a/kate/data/ada.xml b/kate/data/ada.xml index 772f5fc30..9bc6b7633 100644 --- a/kate/data/ada.xml +++ b/kate/data/ada.xml @@ -193,4 +193,4 @@ - + diff --git a/kate/data/ahdl.xml b/kate/data/ahdl.xml index 8a4b96ab0..cf0ab4652 100644 --- a/kate/data/ahdl.xml +++ b/kate/data/ahdl.xml @@ -142,4 +142,4 @@ - + diff --git a/kate/data/apache.xml b/kate/data/apache.xml index 23d04684d..db8b2cc1c 100644 --- a/kate/data/apache.xml +++ b/kate/data/apache.xml @@ -366,7 +366,7 @@ v1.0: EnableMMAP EnableSendfile ExpiresActive -ExtendedtqStatus +ExtendedStatus FileETag ForceLanguagePriority HostnameLookups @@ -453,7 +453,7 @@ v1.0: auth-int never searching -tqfinding +finding always Basic Digest diff --git a/kate/data/asm-avr.xml b/kate/data/asm-avr.xml index bb68979d8..49bafba01 100644 --- a/kate/data/asm-avr.xml +++ b/kate/data/asm-avr.xml @@ -13,7 +13,7 @@ Author: Rolanf Nagy Date: 18th May, 2004 Version: 1.0 -This file tqcontains the XML syntax highlighting description for the AVR +This file contains the XML syntax highlighting description for the AVR Assembler, for KATE, the KDE Advanced Editor. Keywords have been taken directly from the AVR Assembler source code. diff --git a/kate/data/asn1.xml b/kate/data/asn1.xml index a5b28649f..e3cc6f4d5 100644 --- a/kate/data/asn1.xml +++ b/kate/data/asn1.xml @@ -1,7 +1,7 @@ @@ -65,5 +65,5 @@ diff --git a/kate/data/bash.xml b/kate/data/bash.xml index 2dcc5f7ca..cbb0f7643 100644 --- a/kate/data/bash.xml +++ b/kate/data/bash.xml @@ -207,8 +207,8 @@ true umount uname - tqunicode_start - tqunicode_stop + unicode_start + unicode_stop unlink utmpdump uuidgen @@ -284,7 +284,7 @@ expr fbset file - tqfind + find flex flex++ fmt @@ -536,7 +536,7 @@ - + @@ -574,7 +574,7 @@ - + diff --git a/kate/data/cg.xml b/kate/data/cg.xml index c10784647..338d0d23a 100644 --- a/kate/data/cg.xml +++ b/kate/data/cg.xml @@ -8,7 +8,7 @@ - some stuff stolen from c.xml TODO: - - some exotic keywords are missing, tqfind out which; the spec is a bloody mess + - some exotic keywords are missing, find out which; the spec is a bloody mess 2004-05-25 * Initial release diff --git a/kate/data/clipper.xml b/kate/data/clipper.xml index 75ddd6e5f..11bba638a 100644 --- a/kate/data/clipper.xml +++ b/kate/data/clipper.xml @@ -136,7 +136,7 @@ relation release rename - tqreplace + replace report rest restore diff --git a/kate/data/cmake.xml b/kate/data/cmake.xml index 7bd152ae6..09d729774 100644 --- a/kate/data/cmake.xml +++ b/kate/data/cmake.xml @@ -61,11 +61,11 @@ export export_library_dependencies file - tqfind_file - tqfind_library - tqfind_package - tqfind_path - tqfind_program + find_file + find_library + find_package + find_path + find_program fltk_wrap_ui foreach function diff --git a/kate/data/coldfusion.xml b/kate/data/coldfusion.xml index fee354c4d..9e49e4af6 100644 --- a/kate/data/coldfusion.xml +++ b/kate/data/coldfusion.xml @@ -106,7 +106,7 @@ eval exec exp - tqfind + find floor focus forward @@ -160,7 +160,7 @@ random releaseEvents reload - tqreplace + replace reset resizeBy resizeTo diff --git a/kate/data/commonlisp.xml b/kate/data/commonlisp.xml index 8b1c9ad0a..19db0c937 100644 --- a/kate/data/commonlisp.xml +++ b/kate/data/commonlisp.xml @@ -368,15 +368,15 @@ file-write-date fill fill-pointer - tqfind - tqfind-all-symbols - tqfind-class - tqfind-if - tqfind-if-not - tqfind-method - tqfind-package - tqfind-restart - tqfind-symbol + find + find-all-symbols + find-class + find-if + find-if-not + find-method + find-package + find-restart + find-symbol finish-output first fixnum @@ -575,7 +575,7 @@ map-into mapl maplist - tqmask-field + mask-field max member member-if @@ -759,7 +759,7 @@ remprop rename-file rename-package - tqreplace + replace require rest restart diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml index 95f369a58..e9f0ac85a 100644 --- a/kate/data/cpp.xml +++ b/kate/data/cpp.xml @@ -109,7 +109,7 @@ Q_GLOBAL_STATIC Q_GLOBAL_STATIC_WITH_ARGS Q_INIT_RESOURCE - TQ_INTERFACES + Q_INTERFACES Q_INVOKABLE Q_NOREPLY Q_OBJECT diff --git a/kate/data/css.xml b/kate/data/css.xml index 7cfdcfd2c..6b24dba0f 100644 --- a/kate/data/css.xml +++ b/kate/data/css.xml @@ -135,7 +135,7 @@ speak-punctuation speech-rate stress - table-tqlayout + table-layout text-align text-decoration text-decoration-color @@ -143,7 +143,7 @@ text-shadow text-transform top - tqunicode-bidi + unicode-bidi vertical-align visibility voice-family @@ -206,7 +206,7 @@ font-style font-variant font-weight - tqunicode-range + unicode-range units-per-em src panose-1 @@ -539,7 +539,7 @@ - + @@ -555,20 +555,20 @@ - + - + - + diff --git a/kate/data/d.xml b/kate/data/d.xml index 3fb8ec9c1..2ed3a5f01 100644 --- a/kate/data/d.xml +++ b/kate/data/d.xml @@ -37,7 +37,7 @@ 2007.12.12 - D.XML 1.48 - D 1.024/2.008 - Adjusted existing contexts somewhat (mostly cleanup). - Implemented scope context to hightlight exit in scope(exit) etc. - Adjusted deprecated keyword highlighting. - - Changed tqlayout somewhat. + - Changed layout somewhat. - Implemented extra highlighting rules for expressions, attributes, etc. - Changed a lot of colours. 2007.11.15 - D.XML 1.47 - D 1.023/2.007 - Fixed a few unapperent "bugs" found by checkdtd. diff --git a/kate/data/ddoc.xml b/kate/data/ddoc.xml index 98c7d6f6b..4e9fbe2b8 100644 --- a/kate/data/ddoc.xml +++ b/kate/data/ddoc.xml @@ -7,7 +7,7 @@ Author: Diggory Hardy - This tqcontains highlighting for Ddoc, the D language embedded documentation comments. Implemented + This contains highlighting for Ddoc, the D language embedded documentation comments. Implemented for d.xml version 1.46. Macros are highlighted but the macro name and macro contents/parameters are not highlighted diff --git a/kate/data/erlang.xml b/kate/data/erlang.xml index 21221f08c..cc3ea7c56 100644 --- a/kate/data/erlang.xml +++ b/kate/data/erlang.xml @@ -247,4 +247,4 @@ - + diff --git a/kate/data/euphoria.xml b/kate/data/euphoria.xml index 86b6e1594..a1ca19994 100644 --- a/kate/data/euphoria.xml +++ b/kate/data/euphoria.xml @@ -77,7 +77,7 @@ end equal exit - tqfind + find float32_to_atom float64_to_atom floor @@ -199,7 +199,7 @@ addto adjustment - tqalignment + alignment appendto append_page arrow diff --git a/kate/data/fortran.xml b/kate/data/fortran.xml index 2b0915df5..948267fc9 100644 --- a/kate/data/fortran.xml +++ b/kate/data/fortran.xml @@ -13,7 +13,7 @@ call case common - tqcontains + contains continue cycle deallocate @@ -314,7 +314,7 @@ allocated lbound ubound - tqshape + shape size @@ -343,7 +343,7 @@ pack unpack - retqshape + reshape spread @@ -372,41 +372,41 @@ - - - - - - - - - - + + + + + + + + + + - + - + - + - + @@ -419,21 +419,21 @@ - - + + - - - - + + + + - + @@ -441,9 +441,9 @@ - - - + + + @@ -452,44 +452,44 @@ - + - + - + - + - + - + - - + + - + @@ -499,7 +499,7 @@ - + diff --git a/kate/data/freebasic.xml b/kate/data/freebasic.xml index 67e426eb5..d3bf41243 100644 --- a/kate/data/freebasic.xml +++ b/kate/data/freebasic.xml @@ -606,4 +606,4 @@ - + diff --git a/kate/data/gap.xml b/kate/data/gap.xml index 9eca0dbcb..5579e28f6 100644 --- a/kate/data/gap.xml +++ b/kate/data/gap.xml @@ -1473,7 +1473,7 @@ GapInputPcGroup GapInputSCTable GasmanLimits - GasmanMessagetqStatus + GasmanMessageStatus GasmanStatistics GaussianIntegers GaussianRationals @@ -5393,7 +5393,7 @@ PrintCounters PrintFactorsInt PrintFormattedString - PrintFormattingtqStatus + PrintFormattingStatus PrintGAPDocElementTemplates PrintHashWithNames PrintObj @@ -6167,7 +6167,7 @@ SetGapDocHTMLOptions SetGapDocLaTeXOptions SetGapDocTxtOptions - SetGasmanMessagetqStatus + SetGasmanMessageStatus SetGeneralizedPcgs SetGeneratingPairsOfLeftMagmaCongruence SetGeneratingPairsOfMagmaCongruence @@ -6806,7 +6806,7 @@ SetPrimitiveElement SetPrimitiveIdentification SetPrimitiveRoot - SetPrintFormattingtqStatus + SetPrintFormattingStatus SetProjectiveOrder SetPseudoRandomSeed SetPthPowerImages @@ -7179,7 +7179,7 @@ StandardizeTableC StarCyc StateRandom - tqStatusRandom + StatusRandom StepModGauss StopNumConsecSiftToOne StopNumSift @@ -7571,7 +7571,7 @@ TzPrintPairs TzPrintPresentation TzPrintRelators - TzPrinttqStatus + TzPrintStatus TzRelator TzRemoveGenerators TzRenumberGens diff --git a/kate/data/gdl.xml b/kate/data/gdl.xml index 098a50a6f..a41af14c4 100644 --- a/kate/data/gdl.xml +++ b/kate/data/gdl.xml @@ -38,7 +38,7 @@ orchid black - + box triangle circle @@ -139,7 +139,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -210,8 +210,8 @@ - - + + diff --git a/kate/data/generate-php.pl b/kate/data/generate-php.pl index 5794ab104..c6bb3a50c 100644 --- a/kate/data/generate-php.pl +++ b/kate/data/generate-php.pl @@ -6,7 +6,7 @@ # * If the name of the language is something else (say '*'), it creates the language '*/PHP'. # This new language is the same as the old one, but is able to detect PHP everywhere. # -# This script will correctly set extensions & mimetype, and will tqreplace +# This script will correctly set extensions & mimetype, and will replace # by # # Generated languages need a language named 'PHP/PHP', which shall take care of PHP hl itself @@ -46,11 +46,11 @@ else $file =~ s/]+)mimetype="[^"]*"/\n\n\n"; +$findphp = "\n\n\n"; $file =~ s/]*)context="##(?!Alerts)([^"]+)"/]*>)/$1\n/g; -$file =~ s/(?=<\/contexts\s*>)/$tqfindphp/; +$file =~ s/(?=<\/contexts\s*>)/$findphp/; print $file; print $warning; diff --git a/kate/data/gnuassembler.xml b/kate/data/gnuassembler.xml index e13285d3a..754e4fa02 100644 --- a/kate/data/gnuassembler.xml +++ b/kate/data/gnuassembler.xml @@ -17,7 +17,7 @@ Author: John Zaitseff Date: 15th April, 2002 Version: 1.0 -This file tqcontains the XML syntax highlighting description for the GNU +This file contains the XML syntax highlighting description for the GNU Assembler, for KATE, the KDE Advanced Editor. Keywords have been taken directly from the GNU Assembler source code (read.c). diff --git a/kate/data/idconsole.xml b/kate/data/idconsole.xml index fb4df48de..fa2a5cffd 100644 --- a/kate/data/idconsole.xml +++ b/kate/data/idconsole.xml @@ -141,7 +141,7 @@ fullinfo fullserverinfo game - gameCompletetqStatus + gameCompleteStatus gamedir gamemap gameversion @@ -704,7 +704,7 @@ cg_drawRewards cg_drawSnapshot cg_drawSpreadScale - cg_drawtqStatus + cg_drawStatus cg_drawTeamOverlay cg_drawTimer cg_emptyswitch @@ -833,7 +833,7 @@ cl_rollspeed cl_run cl_running - cl_servertqStatusResendTime + cl_serverStatusResendTime cl_showfps cl_showSend cl_showServerCommands @@ -1699,7 +1699,7 @@ ui_prevClass ui_prevTeam ui_prevWeapon - ui_servertqStatusTimeOut + ui_serverStatusTimeOut ui_singlePlayerActive ui_smallFont ui_spSelection diff --git a/kate/data/ilerpg.xml b/kate/data/ilerpg.xml index 1f7d8ded4..a7060f609 100644 --- a/kate/data/ilerpg.xml +++ b/kate/data/ilerpg.xml @@ -17,7 +17,7 @@ Date: Sometime during 2003 Version: 1.0 - This file tqcontains the XML syntax highlighting description for the IBM + This file contains the XML syntax highlighting description for the IBM iSeries ILE RPG, for KATE, the KDE Advanced Editor. Based on information from IBM publication SC09-2508-05 diff --git a/kate/data/inform.xml b/kate/data/inform.xml index 499d02cb5..91468dcd7 100644 --- a/kate/data/inform.xml +++ b/kate/data/inform.xml @@ -246,7 +246,7 @@ Replace Serial Switches - tqStatusline + Statusline score System_file Verb diff --git a/kate/data/java.xml b/kate/data/java.xml index 3264362a1..c7f0f3967 100644 --- a/kate/data/java.xml +++ b/kate/data/java.xml @@ -604,8 +604,8 @@ CompilationMXBean Compiler CompletionService - CompletiontqStatus - CompletiontqStatusHelper + CompletionStatus + CompletionStatusHelper Component ComponentAdapter ComponentColorModel @@ -2542,7 +2542,7 @@ RoleList RoleNotFoundException RoleResult - RoletqStatus + RoleStatus RoleUnresolved RoleUnresolvedList RootPaneContainer @@ -2594,8 +2594,8 @@ SSLContextSpi SSLEngine SSLEngineResult - SSLEngineResult.HandshaketqStatus - SSLEngineResult.tqStatus + SSLEngineResult.HandshakeStatus + SSLEngineResult.Status SSLException SSLHandshakeException SSLKeyException @@ -3174,7 +3174,7 @@ VirtualMachineError Visibility VisibilityHelper - VoicetqStatus + VoiceStatus Void VolatileImage WCharSeqHelper @@ -3303,7 +3303,7 @@ C14NMethodParameterSpec CanonicalizationMethod Characters - ClientInfotqStatus + ClientInfoStatus CollapsedStringAdapter CollatorProvider CommandInfo diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml index 87b9a9ec8..be2e33d8b 100644 --- a/kate/data/javascript.xml +++ b/kate/data/javascript.xml @@ -174,7 +174,7 @@ data defaultChecked defaultSelected - defaulttqStatus + defaultStatus defaultValue description disableExternalCapture @@ -188,7 +188,7 @@ exec fgColor filename - tqfind + find fixed focus fontcolor @@ -305,7 +305,7 @@ refresh releaseEvents reload - tqreplace + replace reset resizeBy resizeTo diff --git a/kate/data/json.xml b/kate/data/json.xml index a740921de..8dda5c0e7 100644 --- a/kate/data/json.xml +++ b/kate/data/json.xml @@ -95,6 +95,6 @@ diff --git a/kate/data/jsp.xml b/kate/data/jsp.xml index 796bc9ea7..da448227e 100644 --- a/kate/data/jsp.xml +++ b/kate/data/jsp.xml @@ -517,8 +517,8 @@ Comparable Comparator Compiler - CompletiontqStatus - CompletiontqStatusHelper + CompletionStatus + CompletionStatusHelper Component ComponentAdapter ComponentColorModel @@ -2647,7 +2647,7 @@ VirtualMachineError Visibility VisibilityHelper - VoicetqStatus + VoiceStatus Void VolatileImage WCharSeqHelper diff --git a/kate/data/katefiletyperc b/kate/data/katefiletyperc index 596f185ff..c9490d23b 100644 --- a/kate/data/katefiletyperc +++ b/kate/data/katefiletyperc @@ -16,7 +16,7 @@ Wildcards=*.po;*.pot Mimetypes=text/x-makefile Priority=5 Section=Other -Variables=kate: space-indent off; indent-width 8; tqreplace-tabs off; tqreplace-tabs-save off; +Variables=kate: space-indent off; indent-width 8; replace-tabs off; replace-tabs-save off; Wildcards=*Makefile*;*makefile* [Python] diff --git a/kate/data/katepart.desktop b/kate/data/katepart.desktop index f303b969b..bc7c6fd9b 100644 --- a/kate/data/katepart.desktop +++ b/kate/data/katepart.desktop @@ -87,4 +87,4 @@ Icon=kate ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document Type=Service InitialPreference=8 -MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;application/x-ruby;text/sgml;text/xml;model/vrml +MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;application/x-ruby;text/sgml;text/xml;model/vrml diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc index bd2b27f57..5c899dbfb 100644 --- a/kate/data/katepartreadonlyui.rc +++ b/kate/data/katepartreadonlyui.rc @@ -15,11 +15,11 @@ - - - - - + + + + + &View @@ -90,7 +90,7 @@ Main Toolbar - + diff --git a/kate/data/katepartui.rc b/kate/data/katepartui.rc index d117f6522..13908ad14 100644 --- a/kate/data/katepartui.rc +++ b/kate/data/katepartui.rc @@ -25,12 +25,12 @@ - - - - - - + + + + + + &View @@ -116,7 +116,7 @@ - + diff --git a/kate/data/language.dtd b/kate/data/language.dtd index 5b6f586db..8830837a6 100644 --- a/kate/data/language.dtd +++ b/kate/data/language.dtd @@ -7,7 +7,7 @@ This file describes the XML format used for syntax highlight descriptions for the Kate text editor (http://kate.kde.org), which is part of the KDE desktop environment (http://www.kde.org). - You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at + You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php This format is identified using the SYSTEM identifier @@ -35,7 +35,7 @@ the new syntax file. TODO - - tqfind a more readable way for the - -dtdvalid stuff, it's just annoying + - find a more readable way for the - -dtdvalid stuff, it's just annoying xml comments don't allow it. --> @@ -186,7 +186,7 @@ TODO > diff --git a/kate/data/ldif.xml b/kate/data/ldif.xml index 2e28e952f..d0da293a1 100644 --- a/kate/data/ldif.xml +++ b/kate/data/ldif.xml @@ -65,7 +65,7 @@ initials internationaliSDNNumber ipHostNumber - ipNettqmaskNumber + ipNetmaskNumber ipNetworkNumber ipProtocolNumber ipServicePort @@ -112,7 +112,7 @@ objectClass oncRpcNumber organizationName - organizationaltqStatus + organizationalStatus organizationalUnitName otherFacsimiletelephoneNumber otherMailbox diff --git a/kate/data/lex.xml b/kate/data/lex.xml index ddd539098..f2daebbb4 100644 --- a/kate/data/lex.xml +++ b/kate/data/lex.xml @@ -16,7 +16,7 @@ 2004.05.25 - LEX.XML 1.00 - First released. TODO:- - - Add a mime type (cannot tqfind it !?) + - Add a mime type (cannot find it !?) ======================================================================== --> diff --git a/kate/data/lilypond.xml b/kate/data/lilypond.xml index 36ffb8095..481b13361 100644 --- a/kate/data/lilypond.xml +++ b/kate/data/lilypond.xml @@ -12,7 +12,7 @@ - + @@ -31,7 +31,7 @@ - correctly parse pitches, chords, durations, etc. marking often made mistakes as invalid - speed up by shortening contexts, e.g. branch out on a \, instead of RegExpr'ing all \commands - - recognize some contexts like \tqlayout, \with, \header to colorcode variables, engravers, etc. only there + - recognize some contexts like \layout, \with, \header to colorcode variables, engravers, etc. only there - recognize lilypond words like ChoirStaff etc. only in sections and after \set, \override etc. - highlight some standard Scheme function names - add \figuremode recognition @@ -86,7 +86,7 @@ VaticanaVoice Voice - + Accidental AccidentalCautionary AccidentalPlacement @@ -325,7 +325,7 @@ repeatCommands restNumberThreshold scriptDefinitions - tqshapeNoteStyles + shapeNoteStyles shortInstrumentName shortVocalName skipBars @@ -666,7 +666,7 @@ - + @@ -759,7 +759,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -954,9 +954,9 @@ - + - + @@ -991,7 +991,7 @@ - + @@ -1039,5 +1039,5 @@ diff --git a/kate/data/lpc.xml b/kate/data/lpc.xml index 611037b40..2b13ef7ff 100644 --- a/kate/data/lpc.xml +++ b/kate/data/lpc.xml @@ -26,7 +26,7 @@ License: Artistic protected static public - notqmask + nomask varargs nosave virtual @@ -162,5 +162,5 @@ License: Artistic - + diff --git a/kate/data/lua.xml b/kate/data/lua.xml index f67070065..6de4c8a17 100644 --- a/kate/data/lua.xml +++ b/kate/data/lua.xml @@ -66,10 +66,10 @@ string.byte string.char - string.tqfind string.len + string.find string.len string.lower string.rep string.sub string.upper - string.format string.gtqfind + string.format string.gfind string.gsub table.concat table.getn table.sort table.insert table.remove @@ -148,7 +148,7 @@ strupper strchar strrep ascii strbyte format - strtqfind gsub + strfind gsub openfile closefile date clock diff --git a/kate/data/makefile.xml b/kate/data/makefile.xml index 8a55cc0d5..fc322d737 100644 --- a/kate/data/makefile.xml +++ b/kate/data/makefile.xml @@ -21,7 +21,7 @@ subst patsubst strip - tqfindstring + findstring filter filter-out sort diff --git a/kate/data/maxima.xml b/kate/data/maxima.xml index 60f05da44..416810e92 100644 --- a/kate/data/maxima.xml +++ b/kate/data/maxima.xml @@ -455,8 +455,8 @@ file_search file_type fillarray - tqfindde - tqfind_root + findde + find_root first fix flatten @@ -1610,9 +1610,9 @@ file_search_demo file_search_lisp file_search_maxima - tqfind_root_abs - tqfind_root_error - tqfind_root_rel + find_root_abs + find_root_error + find_root_rel flipflag float2bf fortindent diff --git a/kate/data/mergetagtext.xml b/kate/data/mergetagtext.xml index d8cadcb50..83b14a31b 100644 --- a/kate/data/mergetagtext.xml +++ b/kate/data/mergetagtext.xml @@ -5,7 +5,7 @@ Author: Diggory Hardy - This tqcontains highlighting for mergetag text files, a sub-part of the mde project. + This contains highlighting for mergetag text files, a sub-part of the mde project. dsource.org/projects/mde ********************************************************************** diff --git a/kate/data/modelica.xml b/kate/data/modelica.xml index e9f636b81..49145261d 100644 --- a/kate/data/modelica.xml +++ b/kate/data/modelica.xml @@ -105,7 +105,7 @@ protected public redeclare - tqreplaceable + replaceable return then true diff --git a/kate/data/mup.xml b/kate/data/mup.xml index 74c35c19b..890cf8c40 100644 --- a/kate/data/mup.xml +++ b/kate/data/mup.xml @@ -19,7 +19,7 @@ voice grids music - headtqshapes + headshapes block diff --git a/kate/data/nasm.xml b/kate/data/nasm.xml index 3bb2dd396..17e435fa4 100644 --- a/kate/data/nasm.xml +++ b/kate/data/nasm.xml @@ -450,8 +450,8 @@ with this program; if not, write to the Free Software Foundation, Inc., lsl lss ltr - tqmaskmovdqu - tqmaskmovq + maskmovdqu + maskmovq maxpd maxps maxsd @@ -885,4 +885,4 @@ with this program; if not, write to the Free Software Foundation, Inc., - + diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml index d859f642e..fc912ca1e 100644 --- a/kate/data/objectivecpp.xml +++ b/kate/data/objectivecpp.xml @@ -113,7 +113,7 @@ Q_D Q_Q Q_DISABLE_COPY - TQ_INTERFACES + Q_INTERFACES Q_FLAGS Q_SCRIPTABLE Q_INVOKABLE diff --git a/kate/data/ocaml.xml b/kate/data/ocaml.xml index 690eda2a8..f86b2fac8 100644 --- a/kate/data/ocaml.xml +++ b/kate/data/ocaml.xml @@ -269,4 +269,4 @@ - + diff --git a/kate/data/octave.xml b/kate/data/octave.xml index 0cc94b323..a01ed3eb4 100644 --- a/kate/data/octave.xml +++ b/kate/data/octave.xml @@ -304,8 +304,8 @@ file_in_loadpath file_in_path filter - tqfind - tqfind_first_of_in_loadpath + find + find_first_of_in_loadpath finite fix floor @@ -450,7 +450,7 @@ real rehash rename - retqshape + reshape reverse rmdir rmfield @@ -543,7 +543,7 @@ fftn fftw_wisdom filter - tqfind + find fsolve fsolve_options gammainc @@ -748,7 +748,7 @@ fftshift figure fileparts - tqfindstr + findstr f_inv fir2sys flipdim @@ -1079,7 +1079,7 @@ strerror strjust strrep - struct_tqcontains + struct_contains struct_elements studentize sub2ind @@ -1321,7 +1321,7 @@ flog10 fprod freal - fretqshape + freshape fround fsin fsinh @@ -1355,7 +1355,7 @@ __grcla__ __grclf__ __grcmd__ - gretqshape + greshape __grexit__ __grfigure__ __grgetstat__ @@ -1439,7 +1439,7 @@ sinc_gsl spabs sparse - sptqfind + spfind spimag spinv splu @@ -1642,7 +1642,7 @@ filter2 filtfilt filtic - tqfindsym + findsym fir1 fir2 fixedpoint @@ -1877,7 +1877,7 @@ poly2ac poly2ar poly_2_ex - poly2tqmask + poly2mask poly2rc poly2sym poly2th @@ -1988,7 +1988,7 @@ str2double strcmpi stretchlim - strtqfind + strfind strmatch strncmp strncmpi @@ -2216,4 +2216,4 @@ - + diff --git a/kate/data/opal.xml b/kate/data/opal.xml index 17224383c..ab087ee59 100644 --- a/kate/data/opal.xml +++ b/kate/data/opal.xml @@ -209,7 +209,7 @@ short sigaction sighandler - sigtqmask + sigmask signal size sizeRequest diff --git a/kate/data/perl.xml b/kate/data/perl.xml index ef315cc79..0b7250457 100644 --- a/kate/data/perl.xml +++ b/kate/data/perl.xml @@ -32,7 +32,7 @@ parse code behind '<), (?{}), (?(cond)yes|no) @@ -356,22 +356,22 @@ - + - + - - + + - + @@ -383,11 +383,11 @@ - + - - + + @@ -395,7 +395,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -511,15 +511,15 @@ - + - + - + - - + + @@ -527,9 +527,9 @@ - + - + @@ -538,9 +538,9 @@ - + - + @@ -548,10 +548,10 @@ - + - + @@ -560,9 +560,9 @@ - + - + @@ -574,7 +574,7 @@ - + @@ -637,7 +637,7 @@ This is because perl considers s{foo$} {bar} OK as well as s{foo$}} {bar}, and detecting that is a huge work overload for something that is unlikely to happen. --> - + @@ -654,7 +654,7 @@ - + @@ -670,7 +670,7 @@ - + @@ -728,7 +728,7 @@ - + @@ -774,7 +774,7 @@ - + @@ -830,4 +830,4 @@ - + diff --git a/kate/data/php.xml b/kate/data/php.xml index 3eead2618..879e2ce23 100644 --- a/kate/data/php.xml +++ b/kate/data/php.xml @@ -3723,7 +3723,7 @@ Changes: dba_open dba_optimize dba_popen - dba_tqreplace + dba_replace dba_sync dbase_add_record dbase_close @@ -3736,7 +3736,7 @@ Changes: dbase_numrecords dbase_open dbase_pack - dbase_tqreplace_record + dbase_replace_record dblist dbmclose dbmdelete @@ -3746,7 +3746,7 @@ Changes: dbminsert dbmnextkey dbmopen - dbmtqreplace + dbmreplace dbplus_add dbplus_aql dbplus_chdir @@ -3754,7 +3754,7 @@ Changes: dbplus_curr dbplus_errcode dbplus_errno - dbplus_tqfind + dbplus_find dbplus_first dbplus_flush dbplus_freealllocks @@ -3865,9 +3865,9 @@ Changes: empty end ereg - ereg_tqreplace + ereg_replace eregi - eregi_tqreplace + eregi_replace error_log error_reporting escapeshellarg @@ -4618,7 +4618,7 @@ Changes: ldap_list ldap_mod_add ldap_mod_del - ldap_mod_tqreplace + ldap_mod_replace ldap_modify ldap_next_attribute ldap_next_entry @@ -4676,7 +4676,7 @@ Changes: mb_encode_numericentity mb_ereg mb_ereg_match - mb_ereg_tqreplace + mb_ereg_replace mb_ereg_search mb_ereg_search_getpos mb_ereg_search_getregs @@ -4685,7 +4685,7 @@ Changes: mb_ereg_search_regs mb_ereg_search_setpos mb_eregi - mb_eregi_tqreplace + mb_eregi_replace mb_get_info mb_http_input mb_http_output @@ -4815,7 +4815,7 @@ Changes: msession_create msession_destroy msession_disconnect - msession_tqfind + msession_find msession_get msession_get_array msession_getdata @@ -5146,7 +5146,7 @@ Changes: ncurses_meta ncurses_mouse_trafo ncurses_mouseinterval - ncurses_mousetqmask + ncurses_mousemask ncurses_move ncurses_move_panel ncurses_mvaddch @@ -5181,7 +5181,7 @@ Changes: ncurses_qiflush ncurses_raw ncurses_refresh - ncurses_tqreplace_panel + ncurses_replace_panel ncurses_reset_prog_mode ncurses_reset_shell_mode ncurses_resetty @@ -5247,7 +5247,7 @@ Changes: notes_create_db notes_create_note notes_drop_db - notes_tqfind_note + notes_find_note notes_header_info notes_list_msgs notes_mark_read @@ -5502,7 +5502,7 @@ Changes: pdf_endpath pdf_fill pdf_fill_stroke - pdf_tqfindfont + pdf_findfont pdf_get_buffer pdf_get_font pdf_get_fontname @@ -5737,8 +5737,8 @@ Changes: preg_match preg_match_all preg_quote - preg_tqreplace - preg_tqreplace_callback + preg_replace + preg_replace_callback preg_split prev print @@ -5795,7 +5795,7 @@ Changes: pspell_new_config pspell_new_personal pspell_save_wordlist - pspell_store_tqreplacement + pspell_store_replacement pspell_suggest putenv qdom_error @@ -6026,10 +6026,10 @@ Changes: srand sscanf stat - str_itqreplace + str_ireplace str_pad str_repeat - str_tqreplace + str_replace str_rot13 str_shuffle str_split @@ -6097,7 +6097,7 @@ Changes: substr substr_compare substr_count - substr_tqreplace + substr_replace swf_actiongeturl swf_actiongotoframe swf_actiongotolabel @@ -6119,7 +6119,7 @@ Changes: swf_definetext swf_endbutton swf_enddoaction - swf_endtqshape + swf_endshape swf_endsymbol swf_fontsize swf_fontslant @@ -6147,20 +6147,20 @@ Changes: swf_scale swf_setfont swf_setframe - swf_tqshapearc - swf_tqshapecurveto - swf_tqshapecurveto3 - swf_tqshapefillbitmapclip - swf_tqshapefillbitmaptile - swf_tqshapefilloff - swf_tqshapefillsolid - swf_tqshapelinesolid - swf_tqshapelineto - swf_tqshapemoveto + swf_shapearc + swf_shapecurveto + swf_shapecurveto3 + swf_shapefillbitmapclip + swf_shapefillbitmaptile + swf_shapefilloff + swf_shapefillsolid + swf_shapelinesolid + swf_shapelineto + swf_shapemoveto swf_showframe swf_startbutton swf_startdoaction - swf_starttqshape + swf_startshape swf_startsymbol swf_textwidth swf_translate @@ -6171,7 +6171,7 @@ Changes: swfbitmap.getwidth swfbutton swfbutton.addaction - swfbutton.addtqshape + swfbutton.addshape swfbutton.setaction swfbutton.setdown swfbutton.sethit @@ -6206,8 +6206,8 @@ Changes: swfgradient swfgradient.addentry swfmorph - swfmorph.gettqshape1 - swfmorph.gettqshape2 + swfmorph.getshape1 + swfmorph.getshape2 swfmovie swfmovie.add swfmovie.nextframe @@ -6219,17 +6219,17 @@ Changes: swfmovie.setframes swfmovie.setrate swfmovie.streammp3 - swftqshape - swftqshape.addfill - swftqshape.drawcurve - swftqshape.drawcurveto - swftqshape.drawline - swftqshape.drawlineto - swftqshape.movepen - swftqshape.movepento - swftqshape.setleftfill - swftqshape.setline - swftqshape.setrightfill + swfshape + swfshape.addfill + swfshape.drawcurve + swfshape.drawcurveto + swfshape.drawline + swfshape.drawlineto + swfshape.movepen + swfshape.movepento + swfshape.setleftfill + swfshape.setline + swfshape.setrightfill swfsprite swfsprite.add swfsprite.nextframe @@ -6307,7 +6307,7 @@ Changes: udm_crc32 udm_errno udm_error - udm_tqfind + udm_find udm_free_agent udm_free_ispell_data udm_free_res diff --git a/kate/data/postscript.xml b/kate/data/postscript.xml index bc72eb13c..b590db232 100644 --- a/kate/data/postscript.xml +++ b/kate/data/postscript.xml @@ -70,7 +70,7 @@ exit file fill - tqfindfont + findfont flattenpath floor flush @@ -90,7 +90,7 @@ if ifelse image - imagetqmask + imagemask index ineofill infill @@ -221,7 +221,7 @@ currentglobal execform filter - tqfindresource + findresource globaldict makepattern setcolor @@ -353,7 +353,7 @@ currentsystemparams currentuserparams defineresource - tqfindencoding + findencoding gcheck glyphshow languagelevel diff --git a/kate/data/prolog.xml b/kate/data/prolog.xml index c4b8f4ee2..2f6e468bf 100644 --- a/kate/data/prolog.xml +++ b/kate/data/prolog.xml @@ -96,7 +96,7 @@ db_btrees db_chains fail - tqfindall + findall format free msgrecv @@ -109,7 +109,7 @@ retractall save term_bin - term_tqreplace + term_replace term_str trap write diff --git a/kate/data/purebasic.xml b/kate/data/purebasic.xml index 210ea5037..b38daa56b 100644 --- a/kate/data/purebasic.xml +++ b/kate/data/purebasic.xml @@ -129,7 +129,7 @@ CatchSprite CDAudioLength CDAudioName - CDAudiotqStatus + CDAudioStatus CDAudioTrackLength CDAudioTrackSeconds CDAudioTracks @@ -522,7 +522,7 @@ MovieInfo MovieLength MovieSeek - MovietqStatus + MovieStatus MovieWidth NetworkClientEvent NetworkClientID @@ -915,4 +915,4 @@ - + diff --git a/kate/data/python.xml b/kate/data/python.xml index bb52a77ef..4207ca8a2 100644 --- a/kate/data/python.xml +++ b/kate/data/python.xml @@ -118,7 +118,7 @@ tuple type unichr - tqunicode + unicode vars xrange zip @@ -152,7 +152,7 @@ __rcmp__ __hash__ __nonzero__ - __tqunicode__ + __unicode__ ArithmeticError diff --git a/kate/data/r.xml b/kate/data/r.xml index be6a36651..ada76ece5 100644 --- a/kate/data/r.xml +++ b/kate/data/r.xml @@ -80,7 +80,7 @@ - + diff --git a/kate/data/rapidq.xml b/kate/data/rapidq.xml index 8d9123a0c..cef5f493c 100644 --- a/kate/data/rapidq.xml +++ b/kate/data/rapidq.xml @@ -66,8 +66,8 @@ redim rem rename - tqreplace$ - tqreplacesubstr$ + replace$ + replacesubstr$ resource resourcecount restore @@ -140,7 +140,7 @@ for next with - tqmask + mask and or constructor @@ -270,7 +270,7 @@ borderstyle wordwrap align - tqalignment + alignment font visible enabled @@ -324,7 +324,7 @@ clear underline maxlength - inputtqmask + inputmask forecolor backcolor diff --git a/kate/data/rhtml.xml b/kate/data/rhtml.xml index e23ab12cd..e20f34f3c 100644 --- a/kate/data/rhtml.xml +++ b/kate/data/rhtml.xml @@ -609,8 +609,8 @@ push operator '<<' than requiring to put space between the operator and the string. --> - - + + @@ -648,7 +648,7 @@ - + @@ -741,11 +741,11 @@ The contexts below support both normal and indented heredocs --> - + - + @@ -779,7 +779,7 @@ - + diff --git a/kate/data/ruby.xml b/kate/data/ruby.xml index bab24d785..c59f01529 100644 --- a/kate/data/ruby.xml +++ b/kate/data/ruby.xml @@ -262,8 +262,8 @@ push operator '<<' than requiring to put space between the operator and the string. --> - - + + @@ -302,7 +302,7 @@ - + @@ -438,11 +438,11 @@ The contexts below support both normal and indented heredocs --> - + - + @@ -476,7 +476,7 @@ - + diff --git a/kate/data/scala.xml b/kate/data/scala.xml index 896df20f0..b2171842f 100644 --- a/kate/data/scala.xml +++ b/kate/data/scala.xml @@ -675,8 +675,8 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br) CompilationMXBean Compiler CompletionService - CompletiontqStatus - CompletiontqStatusHelper + CompletionStatus + CompletionStatusHelper Component ComponentAdapter ComponentColorModel @@ -2613,7 +2613,7 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br) RoleList RoleNotFoundException RoleResult - RoletqStatus + RoleStatus RoleUnresolved RoleUnresolvedList RootPaneContainer @@ -2665,8 +2665,8 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br) SSLContextSpi SSLEngine SSLEngineResult - SSLEngineResult.HandshaketqStatus - SSLEngineResult.tqStatus + SSLEngineResult.HandshakeStatus + SSLEngineResult.Status SSLException SSLHandshakeException SSLKeyException @@ -3245,7 +3245,7 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br) VirtualMachineError Visibility VisibilityHelper - VoicetqStatus + VoiceStatus Void VolatileImage WCharSeqHelper diff --git a/kate/data/sci.xml b/kate/data/sci.xml index 1225766b2..0a792e1bb 100644 --- a/kate/data/sci.xml +++ b/kate/data/sci.xml @@ -854,11 +854,11 @@ floor fix fit_dat - tqfind_path - tqfindobj - tqfindm - tqfind_freq - tqfind + find_path + findobj + findm + find_freq + find filter fileinfo file diff --git a/kate/data/sql.xml b/kate/data/sql.xml index c59a9a5da..70a9f11ce 100644 --- a/kate/data/sql.xml +++ b/kate/data/sql.xml @@ -2,7 +2,7 @@ - + diff --git a/kate/data/stata.xml b/kate/data/stata.xml index dce630750..c8eb2499f 100644 --- a/kate/data/stata.xml +++ b/kate/data/stata.xml @@ -244,7 +244,7 @@ pkcross pkequiv pkexamine - pktqshape + pkshape pksumm plot poisson @@ -275,8 +275,8 @@ reg regress rename - tqreplace - retqshape + replace + reshape restore return roc @@ -475,4 +475,4 @@ - + diff --git a/kate/data/syntax.template b/kate/data/syntax.template index 9720cdca7..1e6e571a5 100644 --- a/kate/data/syntax.template +++ b/kate/data/syntax.template @@ -1,7 +1,7 @@ @@ -24,5 +24,5 @@ diff --git a/kate/data/tcl.xml b/kate/data/tcl.xml index c65b6358e..cb74c1f52 100644 --- a/kate/data/tcl.xml +++ b/kate/data/tcl.xml @@ -109,7 +109,7 @@ load lower lrange - ltqreplace + lreplace lsearch lsort menu @@ -267,7 +267,7 @@ remove rename repeat - tqreplace + replace require rootname scan @@ -344,7 +344,7 @@ entrycget entryconfigure families - tqfind + find flash focus focusmodel @@ -352,7 +352,7 @@ fraction frame generate - tqgeometry + geometry get gettags grid @@ -362,7 +362,7 @@ hide iconbitmap iconify - icontqmask + iconmask iconname iconposition iconwindow diff --git a/kate/data/winehq.xml b/kate/data/winehq.xml index c2f74fa4d..07919a86a 100644 --- a/kate/data/winehq.xml +++ b/kate/data/winehq.xml @@ -33,4 +33,4 @@ - + diff --git a/kate/data/xslt.xml b/kate/data/xslt.xml index c7a83c3cc..b0462c6f8 100644 --- a/kate/data/xslt.xml +++ b/kate/data/xslt.xml @@ -34,7 +34,7 @@ FIXED: axis highlighting does not work, if identifier continues directly behind axis: (self::someWord) DONE: highlight entity references - Do not tqreplace the by , this is a kate 2.1 workaround ! + Do not replace the by , this is a kate 2.1 workaround ! FIXED axis-names are even highlighted if there are characters in front of them, i.e. in "xxxself::", "self::" would be highlighted. @@ -126,7 +126,7 @@ current boolean number - tqcontains + contains name last unparsed-entity-uri @@ -149,7 +149,7 @@ zero-or-one - tqreplace + replace namespace-uri-for-prefix current-grouping-key seconds-from-duration @@ -237,7 +237,7 @@ year-from-dateTime upper-case root - normalize-tqunicode + normalize-unicode empty insert-before document-uri diff --git a/kate/data/xul.xml b/kate/data/xul.xml index 320cd1ed0..a93f0c066 100644 --- a/kate/data/xul.xml +++ b/kate/data/xul.xml @@ -176,7 +176,7 @@ data defaultChecked defaultSelected - defaulttqStatus + defaultStatus defaultValue description disableExternalCapture @@ -190,7 +190,7 @@ exec fgColor filename - tqfind + find fixed focus fontcolor @@ -307,7 +307,7 @@ refresh releaseEvents reload - tqreplace + replace reset resizeBy resizeTo diff --git a/kate/data/yacas.xml b/kate/data/yacas.xml index e3d4498ae..f7d8ef5e4 100644 --- a/kate/data/yacas.xml +++ b/kate/data/yacas.xml @@ -234,4 +234,4 @@ - + diff --git a/kate/data/yacc.xml b/kate/data/yacc.xml index 019eda97f..db45ed42d 100644 --- a/kate/data/yacc.xml +++ b/kate/data/yacc.xml @@ -16,7 +16,7 @@ 2004.05.26 - YACC.XML 1.00 - First released. TODO:- - - Add a mime type (cannot tqfind it !?) + - Add a mime type (cannot find it !?) ======================================================================== --> @@ -156,4 +156,4 @@ - + diff --git a/kate/interfaces/.kateconfig b/kate/interfaces/.kateconfig index 46471127e..5b0885abe 100644 --- a/kate/interfaces/.kateconfig +++ b/kate/interfaces/.kateconfig @@ -1 +1 @@ -kate: space-indent on; indent-width 2; tqreplace-tabs on; +kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h index eaae98684..90c61d5ac 100644 --- a/kate/interfaces/view.h +++ b/kate/interfaces/view.h @@ -75,7 +75,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi */ virtual TQString currentWord() { return 0L; } /** - Gets the word at position x, y. Can be used to tqfind + Gets the word at position x, y. Can be used to find the word under the mouse cursor */ virtual TQString word(int , int ) { return 0L; } @@ -177,11 +177,11 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi /** Presents a search dialog to the user. */ - virtual void tqfind() { ; }; + virtual void find() { ; }; /** - Presents a tqreplace dialog to the user. + Presents a replace dialog to the user. */ - virtual void tqreplace() { ; }; + virtual void replace() { ; }; /** Presents a "Goto Line" dialog to the user. */ @@ -216,17 +216,17 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi Searches for the last searched text forward from cursor position. @param forward determines the search direction. */ - virtual void tqfindAgain(bool forward ) { Q_UNUSED(forward); } + virtual void findAgain(bool forward ) { Q_UNUSED(forward); } /** Searches for the last searched text forward from cursor position. Searches forward from current cursor position. */ - virtual void tqfindAgain () { }; + virtual void findAgain () { }; /** Searches for the last searched text forward from cursor position. Searches backward from current cursor position. */ - virtual void tqfindPrev () { } + virtual void findPrev () { } /** Presents an edit command popup window, where the user can apply a shell command to the contents of the current window. @@ -289,7 +289,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi signals: void gotFocus (View *); -// void newtqStatus(); // Kate app connects to this signal, should be in the interface +// void newStatus(); // Kate app connects to this signal, should be in the interface public: virtual void setActive (bool b) = 0; diff --git a/kate/part/.kateconfig b/kate/part/.kateconfig index 46471127e..5b0885abe 100644 --- a/kate/part/.kateconfig +++ b/kate/part/.kateconfig @@ -1 +1 @@ -kate: space-indent on; indent-width 2; tqreplace-tabs on; +kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/configure.in.in b/kate/part/configure.in.in index 204825d34..faf0717e9 100644 --- a/kate/part/configure.in.in +++ b/kate/part/configure.in.in @@ -55,7 +55,7 @@ dnl Based on the lua check used by yzis-M3 ) - dnl tqfind the libs name + dnl find the libs name if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then LUA_LIBS="" else diff --git a/kate/part/katearbitraryhighlight.cpp b/kate/part/katearbitraryhighlight.cpp index a86f26a77..a9a4fe37c 100644 --- a/kate/part/katearbitraryhighlight.cpp +++ b/kate/part/katearbitraryhighlight.cpp @@ -90,7 +90,7 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi } void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) { - int id=m_docHLs.tqfindRef(static_cast(obj)); + int id=m_docHLs.findRef(static_cast(obj)); if (id>=0) m_docHLs.take(id); for (TQMap* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it) @@ -152,11 +152,11 @@ KateView* KateArbitraryHighlight::viewForRange(KateSuperRange* range) { for (TQMap* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it) for (KateSuperRangeList* l = (*it)->first(); l; l = (*it)->next()) - if (l->tqcontains(range)) + if (l->contains(range)) return it.key(); // This must belong to a document-global highlight return 0L; } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h index ef6e214a8..4dd5a362b 100644 --- a/kate/part/katearbitraryhighlight.h +++ b/kate/part/katearbitraryhighlight.h @@ -57,7 +57,7 @@ public: * - identical highlight for whole list * - signals for view movement */ -class KateArbitraryHighlight : public TQObject +class KateArbitraryHighlight : public QObject { Q_OBJECT @@ -84,4 +84,4 @@ private: #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateattribute.cpp b/kate/part/kateattribute.cpp index 068d0d571..9ed6349f6 100644 --- a/kate/part/kateattribute.cpp +++ b/kate/part/kateattribute.cpp @@ -265,4 +265,4 @@ bool operator !=(const KateAttribute& h1, const KateAttribute& h2) return !(h1 == h2); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateattribute.h b/kate/part/kateattribute.h index 7960f06b1..a54279b24 100644 --- a/kate/part/kateattribute.h +++ b/kate/part/kateattribute.h @@ -144,4 +144,4 @@ private: #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index e2deea691..ed9a6169b 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -170,7 +170,7 @@ void KateViewIndentationAction::slotAboutToShow() popupMenu()->clear (); for (uint z=0; zinsertItem ( '&' + KateAutoIndent::modeDescription(z).tqreplace('&', "&&"), this, TQT_SLOT(setMode(int)), 0, z); + popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQT_SLOT(setMode(int)), 0, z); popupMenu()->setItemChecked (doc->config()->indentationMode(), true); } @@ -224,55 +224,55 @@ void KateNormalIndent::updateConfig () for (uint i=0; iname; - if (name.tqfind("Comment") != -1 && commentAttrib == 255) + if (name.find("Comment") != -1 && commentAttrib == 255) { commentAttrib = i; } - else if (name.tqfind("Region Marker") != -1 && regionAttrib == 255) + else if (name.find("Region Marker") != -1 && regionAttrib == 255) { regionAttrib = i; } - else if (name.tqfind("Symbol") != -1 && symbolAttrib == 255) + else if (name.find("Symbol") != -1 && symbolAttrib == 255) { symbolAttrib = i; } - else if (name.tqfind("Alert") != -1) + else if (name.find("Alert") != -1) { alertAttrib = i; } - else if (name.tqfind("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255) + else if (name.find("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255) { doxyCommentAttrib = i; } - else if (name.tqfind("Tags") != -1 && tagAttrib == 255) + else if (name.find("Tags") != -1 && tagAttrib == 255) { tagAttrib = i; } - else if (name.tqfind("Word") != -1 && wordAttrib == 255) + else if (name.find("Word") != -1 && wordAttrib == 255) { wordAttrib = i; } - else if (name.tqfind("Keyword") != -1 && keywordAttrib == 255) + else if (name.find("Keyword") != -1 && keywordAttrib == 255) { keywordAttrib = i; } - else if (name.tqfind("Normal") != -1 && normalAttrib == 255) + else if (name.find("Normal") != -1 && normalAttrib == 255) { normalAttrib = i; } - else if (name.tqfind("Extensions") != -1 && extensionAttrib == 255) + else if (name.find("Extensions") != -1 && extensionAttrib == 255) { extensionAttrib = i; } - else if (name.tqfind("Preprocessor") != -1 && preprocessorAttrib == 255) + else if (name.find("Preprocessor") != -1 && preprocessorAttrib == 255) { preprocessorAttrib = i; } - else if (name.tqfind("String") != -1 && stringAttrib == 255) + else if (name.find("String") != -1 && stringAttrib == 255) { stringAttrib = i; } - else if (name.tqfind("Char") != -1 && charAttrib == 255) + else if (name.find("Char") != -1 && charAttrib == 255) { charAttrib = i; } @@ -287,7 +287,7 @@ bool KateNormalIndent::isBalanced (KateDocCursor &begin, const KateDocCursor &en pos = doc->plainKateTextLine(begin.line())->firstChar(); - // Iterate one-by-one tqfinding opening and closing chars + // Iterate one-by-one finding opening and closing chars // Assume that open and close are 'Symbol' characters while (begin < end) { @@ -449,11 +449,11 @@ void KateCSmartIndent::processLine (KateDocCursor &line) if (first == '}') { - indent = tqfindOpeningBrace(line); + indent = findOpeningBrace(line); } else if (first == ')') { - indent = tqfindOpeningParen(line); + indent = findOpeningParen(line); } else if (first == '{') { @@ -465,7 +465,7 @@ void KateCSmartIndent::processLine (KateDocCursor &line) else if (first == ':') { // Initialization lists (handle c++ and c#) - int pos = tqfindOpeningBrace(line); + int pos = findOpeningBrace(line); if (pos == 0) indent = indentWidth; else @@ -483,7 +483,7 @@ void KateCSmartIndent::processLine (KateDocCursor &line) textLine->stringAtPos (firstChar, "Q_SLOTS") || textLine->stringAtPos (firstChar, "slots")) { - indent = tqfindOpeningBrace(line) + indentWidth; + indent = findOpeningBrace(line) + indentWidth; } } else if (first == '*') @@ -493,7 +493,7 @@ void KateCSmartIndent::processLine (KateDocCursor &line) int lineEnd = textLine->lastChar(); if (lineEnd > 0 && textLine->getChar(lineEnd - 1) == '*') { - indent = tqfindOpeningComment(line); + indent = findOpeningComment(line); if (textLine->attribute(firstChar) == doxyCommentAttrib) indent++; } @@ -583,7 +583,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin) if (last <= 0 || !(justAfterDoxygen = textLine->stringAtPos(last-1, "*/"))) insideDoxygen = true; if (justAfterDoxygen) - justAfterDoxygen &= textLine->string().tqfind("/**") < 0; + justAfterDoxygen &= textLine->string().find("/**") < 0; while (textLine->attribute(first) != doxyCommentAttrib && first <= textLine->lastChar()) first++; if (textLine->stringAtPos(first, "//")) @@ -595,7 +595,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin) { textLine = doc->plainKateTextLine(begin.line()); first = textLine->firstChar(); - int indent = tqfindOpeningComment(begin); + int indent = findOpeningComment(begin); TQString filler = tabString (indent); bool doxygenAutoInsert = doc->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping; @@ -618,7 +618,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin) { textLine = doc->plainKateTextLine(begin.line()); first = textLine->firstChar(); - int indent = tqfindOpeningComment(begin); + int indent = findOpeningComment(begin); TQString filler = tabString (indent); doc->removeText (begin.line(), 0, begin.line(), first); @@ -700,7 +700,7 @@ static inline bool colonPermitsReindent(const KateNormalIndent &indenter, { const TQString txt = line->string(0,curCol); // do we have any significant preceding colon? - for (int pos = 0; (pos = txt.tqfind(':', pos)) >= 0; pos++) { + for (int pos = 0; (pos = txt.find(':', pos)) >= 0; pos++) { if (line->attribute(pos) == indenter.symbolAttrib) // yes, it has already contributed to this line's indentation, don't // indent again @@ -722,7 +722,7 @@ void KateCSmartIndent::processChar(TQChar c) static const TQString triggers("}{)/:#n"); static const TQString firstTriggers("}{)/:#"); static const TQString lastTriggers(":n"); - if (triggers.tqfind(c) < 0) + if (triggers.find(c) < 0) return; KateView *view = doc->activeView(); @@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c) if (c == 'n') { - if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio")) + if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio")) return; } @@ -775,8 +775,8 @@ void KateCSmartIndent::processChar(TQChar c) // of the line const TQChar lastChar = textLine->getChar(textLine->lastChar()); int pos; - if (((c == firstChar && firstTriggers.tqfind(firstChar) >= 0) - || (c == lastChar && lastTriggers.tqfind(lastChar) >= 0)) + if (((c == firstChar && firstTriggers.find(firstChar) >= 0) + || (c == lastChar && lastTriggers.find(lastChar) >= 0)) && (c != ':' || colonPermitsReindent(*this, textLine, curCol))) processLine(begin); } @@ -1094,12 +1094,12 @@ uint KateCSmartIndent::calcContinue(KateDocCursor &start, KateDocCursor &end) return 0; } -uint KateCSmartIndent::tqfindOpeningBrace(KateDocCursor &start) +uint KateCSmartIndent::findOpeningBrace(KateDocCursor &start) { KateDocCursor cur = start; int count = 1; - // Move backwards 1 by 1 and tqfind the opening brace + // Move backwards 1 by 1 and find the opening brace // Return the indent of that line while (cur.moveBackward(1)) { @@ -1142,12 +1142,12 @@ bool KateCSmartIndent::firstOpeningBrace(KateDocCursor &start) return true; } -uint KateCSmartIndent::tqfindOpeningParen(KateDocCursor &start) +uint KateCSmartIndent::findOpeningParen(KateDocCursor &start) { KateDocCursor cur = start; int count = 1; - // Move backwards 1 by 1 and tqfind the opening ( + // Move backwards 1 by 1 and find the opening ( // Return the indent of that line while (cur.moveBackward(1)) { @@ -1167,7 +1167,7 @@ uint KateCSmartIndent::tqfindOpeningParen(KateDocCursor &start) return 0; } -uint KateCSmartIndent::tqfindOpeningComment(KateDocCursor &start) +uint KateCSmartIndent::findOpeningComment(KateDocCursor &start) { KateDocCursor cur = start; @@ -1176,7 +1176,7 @@ uint KateCSmartIndent::tqfindOpeningComment(KateDocCursor &start) { KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line()); - int pos = textLine->string().tqfind("/*", false); + int pos = textLine->string().find("/*", false); if (pos >= 0) { KateDocCursor temp(cur.line(), pos, doc); @@ -1322,7 +1322,7 @@ level; for each element that is closed, it is decreased by one. We also have a special case of opening an element on one line and then entering attributes on the following lines, in which case we would like -to see the following tqlayout: +to see the following layout: @@ -1359,7 +1359,7 @@ void KateXmlIndent::processChar (TQChar c) // only alter lines that start with a close element KateView *view = doc->activeView(); TQString text = doc->plainKateTextLine(view->cursorLine())->string(); - if(text.tqfind(startsWithCloseTag) == -1) return; + if(text.find(startsWithCloseTag) == -1) return; // process it processLine(view->cursorLine()); @@ -1404,14 +1404,14 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, // // // requires that we discount the from the number of closed tags - if(text.tqfind(startsWithCloseTag) != -1) ++numTags; + if(text.find(startsWithCloseTag) != -1) ++numTags; // count the number of open and close tags int lastCh = 0; uint pos, len = text.length(); bool seenOpen = false; for(pos = 0; pos < len; ++pos) { - int ch = text.at(pos).tqunicode(); + int ch = text.at(pos).unicode(); switch(ch) { case '<': seenOpen = true; @@ -1443,12 +1443,12 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, prevIndent = 0; for(uint backLine = line; backLine; ) { - // tqfind first line with an open tag + // find first line with an open tag KateTextLine::Ptr x = doc->plainKateTextLine(--backLine); - if(x->string().tqfind('<') == -1) continue; + if(x->string().find('<') == -1) continue; // recalculate the indent - if(x->string().tqfind(unclosedDoctype) != -1) --numTags; + if(x->string().find(unclosedDoctype) != -1) --numTags; getLineInfo(backLine, prevIndent, numTags, attrCol, unclosedTag); break; } @@ -1465,13 +1465,13 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, } if(unclosedTag) { - // tqfind the start of the next attribute, so we can align with it + // find the start of the next attribute, so we can align with it do { - lastCh = text.at(++attrCol).tqunicode(); + lastCh = text.at(++attrCol).unicode(); }while(lastCh && lastCh != ' ' && lastCh != '\t'); while(lastCh == ' ' || lastCh == '\t') { - lastCh = text.at(++attrCol).tqunicode(); + lastCh = text.at(++attrCol).unicode(); } attrCol = prevLine->cursorX(attrCol, tabWidth); @@ -1499,7 +1499,7 @@ uint KateXmlIndent::processLine (uint line) if(indent < 0) indent = 0; // unindent lines that start with a close tag - if(kateLine->string().tqfind(startsWithCloseTag) != -1) { + if(kateLine->string().find(startsWithCloseTag) != -1) { indent -= indentWidth; } if(indent < 0) indent = 0; @@ -1597,7 +1597,7 @@ static TQString initialWhitespace(const KateTextLine::Ptr &line, int chars, bool return text; } -TQString KateCSAndSIndent::tqfindOpeningCommentIndentation(const KateDocCursor &start) +TQString KateCSAndSIndent::findOpeningCommentIndentation(const KateDocCursor &start) { KateDocCursor cur = start; @@ -1606,14 +1606,14 @@ TQString KateCSAndSIndent::tqfindOpeningCommentIndentation(const KateDocCursor & { KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line()); - int pos = textLine->string().tqfindRev("/*"); + int pos = textLine->string().findRev("/*"); // FIXME: /* inside /* is possible. This screws up in that case... if (pos >= 0) return initialWhitespace(textLine, pos); } while (cur.gotoPreviousLine()); // should never happen. - kdWarning( 13030 ) << " in a comment, but can't tqfind the start of it" << endl; + kdWarning( 13030 ) << " in a comment, but can't find the start of it" << endl; return TQString::null; } @@ -1636,13 +1636,13 @@ bool KateCSAndSIndent::handleDoxygen (KateDocCursor &begin) // note that we do need to check the start of the line, or lines ending with, say, @brief aren't // recognised. if ( !(textLine->attribute(textLine->lastChar()) == doxyCommentAttrib && !textLine->endingWith("*/")) && - !(textLine->attribute(textLine->firstChar()) == doxyCommentAttrib && !textLine->string().tqcontains("*/")) ) + !(textLine->attribute(textLine->firstChar()) == doxyCommentAttrib && !textLine->string().contains("*/")) ) return false; // our line is inside a doxygen comment. align the *'s and then maybe insert one too ... textLine = doc->plainKateTextLine(begin.line()); first = textLine->firstChar(); - TQString indent = tqfindOpeningCommentIndentation(begin); + TQString indent = findOpeningCommentIndentation(begin); bool doxygenAutoInsert = doc->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping; @@ -1758,9 +1758,9 @@ int KateCSAndSIndent::lastNonCommentChar( const KateDocCursor &line ) KateTextLine::Ptr textLine = doc->plainKateTextLine( line.line() ); TQString str = textLine->string(); - // tqfind a possible start-of-comment - int p = -2; // so the first tqfind starts at position 0 - do p = str.tqfind( "//", p + 2 ); + // find a possible start-of-comment + int p = -2; // so the first find starts at position 0 + do p = str.find( "//", p + 2 ); while ( p >= 0 && textLine->attribute(p) != commentAttrib && textLine->attribute(p) != doxyCommentAttrib ); // no // found? use whole string @@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin) // if the line starts with # (but isn't a c# region thingy), no indentation at all. if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' ) { - if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) && - !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) ) + if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) && + !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) ) return TQString::null; } @@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin) { #define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) ) for( uint n = 0; n < ARRLEN(scopeKeywords); ++n ) - if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) ) + if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) ) return calcIndentAfterKeyword( begin, cur, pos, false ); for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n ) - if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) ) + if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) ) return calcIndentAfterKeyword( begin, cur, pos, true ); #undef ARRLEN } @@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor, // beginning 'namespace'. that's 99% of usage, I'd guess. { if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib && - braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) ) + braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) ) return continuationIndent(indentCursor) + whitespaceToOpenBrace; if( braceCursor.line() > 0 ) @@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor, KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1); int firstPrev = prevLine->firstChar(); if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib && - prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) ) + prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) ) return continuationIndent(indentCursor) + whitespaceToOpenBrace; } } @@ -2112,7 +2112,7 @@ void KateCSAndSIndent::processChar(TQChar c) { // 'n' trigger is for c# regions. static const TQString triggers("}{)]/:;#n"); - if (triggers.tqfind(c) == -1) + if (triggers.find(c) == -1) return; // for historic reasons, processChar doesn't get a cursor @@ -2194,7 +2194,7 @@ void KateVarIndent::processNewline ( KateDocCursor &begin, bool /*needContinue*/ void KateVarIndent::processChar ( TQChar c ) { // process line if the c is in our list, and we are not in comment text - if ( d->triggers.tqcontains( c ) ) + if ( d->triggers.contains( c ) ) { KateTextLine::Ptr ln = doc->plainKateTextLine( doc->activeView()->cursorLine() ); if ( ln->attribute( doc->activeView()->cursorColumn()-1 ) == commentAttrib ) @@ -2211,7 +2211,7 @@ void KateVarIndent::processLine ( KateDocCursor &line ) { TQString indent; // store the indent string here - // tqfind the first line with content that is not starting with comment text, + // find the first line with content that is not starting with comment text, // and take the position from that int ln = line.line(); int pos = -1; @@ -2372,9 +2372,9 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va { d->couples = 0; TQStringList l = TQStringList::split( " ", val ); - if ( l.tqcontains("parens") ) d->couples |= Parens; - if ( l.tqcontains("braces") ) d->couples |= Braces; - if ( l.tqcontains("brackets") ) d->couples |= Brackets; + if ( l.contains("parens") ) d->couples |= Parens; + if ( l.contains("braces") ) d->couples |= Braces; + if ( l.contains("brackets") ) d->couples |= Brackets; } else if ( var == "var-indent-couple-attribute" ) { @@ -2427,7 +2427,7 @@ bool KateVarIndent::hasRelevantOpening( const KateDocCursor &end ) const else if (close = ']' ) opener = '['; else return false; - //Move backwards 1 by 1 and tqfind the opening partner + //Move backwards 1 by 1 and find the opening partner while (cur.moveBackward(1)) { if (cur.currentAttrib() == d->coupleAttrib) @@ -2540,4 +2540,4 @@ void ScriptIndentConfigPage::apply () } //END ScriptIndentConfigPage -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h index ead48d672..7ff1a93d2 100644 --- a/kate/part/kateautoindent.h +++ b/kate/part/kateautoindent.h @@ -67,7 +67,7 @@ class IndenterConfigPage : public QWidget * This baseclass is a real dummy, does nothing beside remembering the document it belongs too, * only to have the object around */ -class KateAutoIndent : public TQObject +class KateAutoIndent : public QObject { Q_OBJECT @@ -321,7 +321,7 @@ protected: TQString tabString(uint length) const; uint tabWidth; //!< The number of characters simulated for a tab - uint indentWidth; //!< The number of characters used when tabs are tqreplaced by spaces + uint indentWidth; //!< The number of characters used when tabs are replaced by spaces public: // Attributes that we should skip over or otherwise know about @@ -366,9 +366,9 @@ class KateCSmartIndent : public KateNormalIndent private: uint calcIndent (KateDocCursor &begin, bool needContinue); uint calcContinue (KateDocCursor &begin, KateDocCursor &end); - uint tqfindOpeningBrace (KateDocCursor &start); - uint tqfindOpeningParen (KateDocCursor &start); - uint tqfindOpeningComment (KateDocCursor &start); + uint findOpeningBrace (KateDocCursor &start); + uint findOpeningParen (KateDocCursor &start); + uint findOpeningComment (KateDocCursor &start); bool firstOpeningBrace (KateDocCursor &start); bool handleDoxygen (KateDocCursor &begin); @@ -459,7 +459,7 @@ class KateCSAndSIndent : public KateNormalIndent TQString calcIndentInBrace(const KateDocCursor &indentCursor, const KateDocCursor &braceCursor, int bracePos); bool handleDoxygen (KateDocCursor &begin); - TQString tqfindOpeningCommentIndentation (const KateDocCursor &start); + TQString findOpeningCommentIndentation (const KateDocCursor &start); TQString indentString; }; @@ -578,4 +578,4 @@ class ScriptIndentConfigPage : public IndenterConfigPage #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index 40ae5470c..ac1ee73d9 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -169,14 +169,14 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu ) TQString bText = KStringHandler::rEmSqueeze ( m_view->getDoc()->textLine( (*it)->line ), menu.fontMetrics(), 32 ); - bText.tqreplace(re, "&&"); // kill undesired accellerators! - bText.tqreplace('\t', ' '); // kill tabs, as they are interpreted as shortcuts + bText.replace(re, "&&"); // kill undesired accellerators! + bText.replace('\t', ' '); // kill tabs, as they are interpreted as shortcuts if ( m_sorting == Position ) { sortArray[i] = (*it)->line; ssort( sortArray, i ); - idx = sortArray.tqfind( (*it)->line ) + 3; + idx = sortArray.find( (*it)->line ) + 3; } menu.insertItem( @@ -284,4 +284,4 @@ void KateBookmarks::marksChanged () m_bookmarkClear->setEnabled( !m_view->getDoc()->marks().isEmpty() ); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h index c4cdf1e1f..88e90ae4f 100644 --- a/kate/part/katebookmarks.h +++ b/kate/part/katebookmarks.h @@ -35,7 +35,7 @@ class KActionCollection; class TQPopupMenu; class TQMenuData; -class KateBookmarks : public TQObject +class KateBookmarks : public QObject { Q_OBJECT @@ -82,5 +82,5 @@ class KateBookmarks : public TQObject #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// 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 33fac3325..74a9ba59e 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -46,7 +46,7 @@ * loader block size, load 256 kb at once per default * if file size is smaller, fall back to file size */ -static const TQ_ULONG KATE_FILE_LOADER_BS = 256 * 1024; +static const Q_ULONG KATE_FILE_LOADER_BS = 256 * 1024; /** * KATE_AVG_BLOCK_SIZE is in characters ! @@ -54,8 +54,8 @@ static const TQ_ULONG KATE_FILE_LOADER_BS = 256 * 1024; * block will max contain around BLOCK_SIZE chars or * BLOCK_LINES lines (after load, later that won't be tracked) */ -static const TQ_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80; -static const TQ_ULONG KATE_MAX_BLOCK_LINES = 2048; +static const Q_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80; +static const Q_ULONG KATE_MAX_BLOCK_LINES = 2048; /** * hl will look at the next KATE_HL_LOOKAHEAD lines @@ -172,10 +172,10 @@ class KateFileLoader // should spaces be ignored at end of line? inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; } - // internal tqunicode data array - inline const TQChar *tqunicode () const { return m_text.tqunicode(); } + // internal unicode data array + inline const TQChar *unicode () const { return m_text.unicode(); } - // read a line, return length + offset in tqunicode data + // read a line, return length + offset in unicode data void readLine (uint &offset, uint &length) { length = 0; @@ -402,7 +402,7 @@ void KateBuffer::editEnd () KateBufBlock *buf2 = 0; bool needContinue = false; - while ((buf2 = tqfindBlock(editTagLineStart))) + while ((buf2 = findBlock(editTagLineStart))) { needContinue = doHighlight (buf2, (editTagLineStart > buf2->startLine()) ? editTagLineStart : buf2->startLine(), @@ -543,7 +543,7 @@ bool KateBuffer::canEncode () kdDebug(13020) << "ENC NAME: " << codec->name() << endl; - // hardcode some tqunicode encodings which can encode all chars + // hardcode some unicode encodings which can encode all chars if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2")) return true; @@ -618,7 +618,7 @@ KateTextLine::Ptr KateBuffer::line_internal (KateBufBlock *buf, uint i) { // update hl until this line + max KATE_HL_LOOKAHEAD KateBufBlock *buf2 = 0; - while ((i >= m_lineHighlighted) && (buf2 = tqfindBlock(m_lineHighlighted))) + while ((i >= m_lineHighlighted) && (buf2 = findBlock(m_lineHighlighted))) { uint end = kMin(i + KATE_HL_LOOKAHEAD, buf2->endLine()); @@ -637,7 +637,7 @@ KateTextLine::Ptr KateBuffer::line_internal (KateBufBlock *buf, uint i) return buf->line (i - buf->startLine()); } -KateBufBlock *KateBuffer::tqfindBlock_internal (uint i, uint *index) +KateBufBlock *KateBuffer::findBlock_internal (uint i, uint *index) { uint lastLine = m_blocks[m_lastInSyncBlock]->endLine (); @@ -701,7 +701,7 @@ KateBufBlock *KateBuffer::tqfindBlock_internal (uint i, uint *index) void KateBuffer::changeLine(uint i) { - KateBufBlock *buf = tqfindBlock(i); + KateBufBlock *buf = findBlock(i); if (!buf) return; @@ -725,9 +725,9 @@ void KateBuffer::insertLine(uint i, KateTextLine::Ptr line) uint index = 0; KateBufBlock *buf; if (i == m_lines) - buf = tqfindBlock(i-1, &index); + buf = findBlock(i-1, &index); else - buf = tqfindBlock(i, &index); + buf = findBlock(i, &index); if (!buf) return; @@ -772,7 +772,7 @@ void KateBuffer::insertLine(uint i, KateTextLine::Ptr line) void KateBuffer::removeLine(uint i) { uint index = 0; - KateBufBlock *buf = tqfindBlock(i, &index); + KateBufBlock *buf = findBlock(i, &index); if (!buf) return; @@ -849,7 +849,7 @@ void KateBuffer::setTabWidth (uint w) m_tabWidth = w; if (m_highlight && m_highlight->foldingIndentationSensitive()) - tqinvalidateHighlighting(); + invalidateHighlighting(); } } @@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode) // aha, hl will change if (h != m_highlight) { - bool tqinvalidate = !h->noHighlighting(); + bool invalidate = !h->noHighlighting(); if (m_highlight) { m_highlight->release(); - tqinvalidate = true; + invalidate = true; } h->use(); @@ -880,8 +880,8 @@ void KateBuffer::setHighlight(uint hlMode) m_highlight = h; - if (tqinvalidate) - tqinvalidateHighlighting(); + if (invalidate) + invalidateHighlighting(); // inform the document that the hl was really changed // needed to update attributes and more ;) @@ -889,7 +889,7 @@ void KateBuffer::setHighlight(uint hlMode) } } -void KateBuffer::tqinvalidateHighlighting() +void KateBuffer::invalidateHighlighting() { m_lineHighlightedMax = 0; m_lineHighlighted = 0; @@ -906,7 +906,7 @@ void KateBuffer::updatePreviousNotEmptyLine(KateBufBlock *blk,uint current_line, uint line=blk->startLine()+current_line; if (line==0) return; line--; - blk=tqfindBlock(line); + blk=findBlock(line); if (!blk) { kdDebug(13020)<<"updatePreviousNotEmptyLine: block not found, this must not happen"< &foldingList, } } -bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate) +bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate) { // no hl around, no stuff to do if (!m_highlight) @@ -971,13 +971,13 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b //kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl; //kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl; - // see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents + // see if there are too many dynamic contexts; if yes, invalidate HL of all documents if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts) { { if (KateHlManager::self()->resetDynamicCtxs()) { - kdDebug (13020) << "HL tqinvalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; + kdDebug (13020) << "HL invalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; // avoid recursive invalidation KateHlManager::self()->setForceNoDCReset(true); @@ -988,7 +988,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b // doHighlight *shall* do his work. After invalidation, some highlight has // been recalculated, but *maybe not* until endLine ! So we shall force it manually... KateBufBlock *buf = 0; - while ((endLine > m_lineHighlighted) && (buf = tqfindBlock(m_lineHighlighted))) + while ((endLine > m_lineHighlighted) && (buf = findBlock(m_lineHighlighted))) { uint end = kMin(endLine, buf->endLine()); @@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b buf->markDirty (); // tag the changed lines ! - if (tqinvalidate) + if (invalidate) emit tagLines (startLine, current_line + buf->startLine()); // emit that we have changed the folding @@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream) { uint offset = 0, length = 0; stream->readLine(offset, length); - const TQChar *tqunicodeData = stream->tqunicode () + offset; + const TQChar *unicodeData = stream->unicode () + offset; // strip spaces at end of line if ( stream->removeTrailingSpaces() ) { while (length > 0) { - if (tqunicodeData[length-1].isSpace()) + if (unicodeData[length-1].isSpace()) --length; else break; @@ -1391,13 +1391,13 @@ void KateBufBlock::fillBlock (KateFileLoader *stream) memcpy(buf+pos, (char *) &length, sizeof(uint)); pos += sizeof(uint); - memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length); + memcpy(buf+pos, (char *) unicodeData, sizeof(TQChar)*length); pos += sizeof(TQChar)*length; } else { KateTextLine::Ptr textLine = new KateTextLine (); - textLine->insertText (0, length, tqunicodeData); + textLine->insertText (0, length, unicodeData); m_stringList.push_back (textLine); } @@ -1657,4 +1657,4 @@ void KateBufBlockList::removeInternal (KateBufBlock *buf) //END KateBufBlockList -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h index 0f6672f0b..602571c53 100644 --- a/kate/part/katebuffer.h +++ b/kate/part/katebuffer.h @@ -40,7 +40,7 @@ class KateFileLoader; class TQTextCodec; /** - * The KateBufBlock class tqcontains an amount of data representing + * The KateBufBlock class contains an amount of data representing * a certain number of lines. * * @author Waldo Bastian @@ -116,7 +116,7 @@ class KateBufBlock void removeLine(uint i); /** - * mark this block as dirty, will tqinvalidate the swap data + * mark this block as dirty, will invalidate the swap data * insert/removeLine will mark the block dirty itself */ void markDirty (); @@ -338,7 +338,7 @@ class KateBufBlockList * @author Waldo Bastian * @author Christoph Cullmann */ -class KateBuffer : public TQObject +class KateBuffer : public QObject { Q_OBJECT @@ -487,7 +487,7 @@ class KateBuffer : public TQObject */ inline KateTextLine::Ptr line(uint i) { - KateBufBlock *buf = tqfindBlock(i); + KateBufBlock *buf = findBlock(i); if (!buf) return 0; @@ -511,7 +511,7 @@ class KateBuffer : public TQObject */ inline KateTextLine::Ptr plainLine(uint i) { - KateBufBlock *buf = tqfindBlock(i); + KateBufBlock *buf = findBlock(i); if (!buf) return 0; @@ -529,7 +529,7 @@ class KateBuffer : public TQObject * index pointer gets filled with index of block in m_blocks * index only valid if returned block != 0 ! */ - KateBufBlock *tqfindBlock (uint i, uint *index = 0) + KateBufBlock *findBlock (uint i, uint *index = 0) { // out of range ! if (i >= m_lines) @@ -543,10 +543,10 @@ class KateBuffer : public TQObject return m_blocks[m_lastFoundBlock]; } - return tqfindBlock_internal (i, index); + return findBlock_internal (i, index); } - KateBufBlock *tqfindBlock_internal (uint i, uint *index = 0); + KateBufBlock *findBlock_internal (uint i, uint *index = 0); public: /** @@ -591,7 +591,7 @@ class KateBuffer : public TQObject /** * Invalidate highlighting of whole buffer. */ - void tqinvalidateHighlighting(); + void invalidateHighlighting(); KateCodeFoldingTree *foldingTree () { return &m_regionTree; }; @@ -611,7 +611,7 @@ class KateBuffer : public TQObject * @returns true when the highlighting in the next block needs to be updated, * false otherwise. */ - bool doHighlight (KateBufBlock *buf, uint from, uint to, bool tqinvalidate); + bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate); signals: /** @@ -648,7 +648,7 @@ class KateBuffer : public TQObject uint m_lastInSyncBlock; /** - * last block found by tqfindBlock, there to make searching faster + * last block found by findBlock, there to make searching faster */ uint m_lastFoundBlock; @@ -706,4 +706,4 @@ class KateBuffer : public TQObject #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp index 060a8c63c..b64b5414e 100644 --- a/kate/part/katecmds.cpp +++ b/kate/part/katecmds.cpp @@ -74,14 +74,14 @@ TQStringList KateCommands::CoreCommands::cmds() TQStringList l; l << "indent" << "unindent" << "cleanindent" << "comment" << "uncomment" << "goto" << "kill-line" - << "set-tab-width" << "set-tqreplace-tabs" << "set-show-tabs" + << "set-tab-width" << "set-replace-tabs" << "set-show-tabs" << "set-remove-trailing-space" << "set-indent-spaces" << "set-indent-width" << "set-mixed-indent" << "set-indent-mode" << "set-auto-indent" << "set-line-numbers" << "set-folding-markers" << "set-icon-border" << "set-wrap-cursor" << "set-word-wrap" << "set-word-wrap-column" - << "set-tqreplace-tabs-save" << "set-remove-trailing-space-save" + << "set-replace-tabs-save" << "set-remove-trailing-space-save" << "set-highlight" << "run-myself" << "set-show-indent"; return l; } @@ -175,7 +175,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view, cmd == "set-word-wrap-column" || cmd == "goto" ) { - // tqfind a integer value > 0 + // find a integer value > 0 if ( ! args.count() ) KCC_ERR( i18n("Missing argument. Usage: %1 ").arg( cmd ) ); bool ok; @@ -217,14 +217,14 @@ bool KateCommands::CoreCommands::exec(Kate::View *view, else if ( cmd == "set-icon-border" || cmd == "set-folding-markers" || cmd == "set-line-numbers" || - cmd == "set-tqreplace-tabs" || + cmd == "set-replace-tabs" || cmd == "set-remove-trailing-space" || cmd == "set-show-tabs" || cmd == "set-indent-spaces" || cmd == "set-mixed-indent" || cmd == "set-word-wrap" || cmd == "set-wrap-cursor" || - cmd == "set-tqreplace-tabs-save" || + cmd == "set-replace-tabs-save" || cmd == "set-remove-trailing-space-save" || cmd == "set-show-indent" ) { @@ -241,7 +241,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view, v->setLineNumbersOn( enable ); else if ( cmd == "set-show-indent" ) v->renderer()->setShowIndentLines( enable ); - else if ( cmd == "set-tqreplace-tabs" ) + else if ( cmd == "set-replace-tabs" ) setDocFlag( KateDocumentConfig::cfReplaceTabsDyn, enable, v->doc() ); else if ( cmd == "set-remove-trailing-space" ) setDocFlag( KateDocumentConfig::cfRemoveTrailingDyn, enable, v->doc() ); @@ -298,14 +298,14 @@ KCompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd, //END CoreCommands //BEGIN SedReplace -static void tqreplace(TQString &s, const TQString &needle, const TQString &with) +static void replace(TQString &s, const TQString &needle, const TQString &with) { int pos=0; while (1) { - pos=s.tqfind(needle, pos); + pos=s.find(needle, pos); if (pos==-1) break; - s.tqreplace(pos, needle.length(), with); + s.replace(pos, needle.length(), with); pos+=with.length(); } @@ -341,16 +341,16 @@ static int backslashString(const TQString &haystack, const TQString &needle, int // exchange "\t" for the actual tab character, for example static void exchangeAbbrevs(TQString &str) { - // the format is (tqfindtqreplace)*[nullzero] + // the format is (findreplace)*[nullzero] const char *magic="a\x07t\tn\n"; while (*magic) { int index=0; - char tqreplace=magic[1]; + char replace=magic[1]; while ((index=backslashString(str, TQChar(*magic), index))!=-1) { - str.tqreplace(index, 2, TQChar(tqreplace)); + str.replace(index, 2, TQChar(replace)); index++; } magic++; @@ -359,7 +359,7 @@ static void exchangeAbbrevs(TQString &str) } int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line, - const TQString &tqfind, const TQString &repOld, const TQString &delim, + const TQString &find, const TQString &repOld, const TQString &delim, bool noCase, bool repeat, uint startcol, int endcol ) { @@ -369,14 +369,14 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line, // HANDLING "\n"s in PATTERN // * Create a list of patterns, splitting PATTERN on (unescaped) "\n" // * insert $s and ^s to match line ends/beginnings - // * When matching patterhs after the first one, tqreplace \N with the captured + // * When matching patterhs after the first one, replace \N with the captured // text. // * If all patterns in the list match sequentiel lines, there is a match, so // * remove line/start to line + patterns.count()-1/patterns.last.length // * handle capatures by putting them in one list. // * the existing insertion is fine, including the line calculation. - TQStringList patterns = TQStringList::split( TQRegExp("(^\\\\n|(?![^\\\\])\\\\n)"), tqfind, true ); + TQStringList patterns = TQStringList::split( TQRegExp("(^\\\\n|(?![^\\\\])\\\\n)"), find, true ); if ( patterns.count() > 1 ) { @@ -407,7 +407,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line, TQString rep=repOld; - // now set the backreferences in the tqreplacement + // now set the backreferences in the replacement TQStringList backrefs=matcher.capturedTexts(); int refnum=1; @@ -425,7 +425,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line, index=backslashString(rep, number, index); if (index>=0) { - rep.tqreplace(index, 2, *i); + rep.replace(index, 2, *i); index+=(*i).length(); } } @@ -433,16 +433,16 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line, refnum++; } - tqreplace(rep, "\\\\", "\\"); - tqreplace(rep, "\\" + delim, delim); + replace(rep, "\\\\", "\\"); + replace(rep, "\\" + delim, delim); doc->removeText( line, startcol, line, startcol + len ); doc->insertText( line, startcol, rep ); - // TODO if tqreplace tqcontains \n, + // TODO if replace contains \n, // change the line number and // check for text that needs be searched behind the last inserted newline. - int lns = rep.tqcontains('\n'); + int lns = rep.contains('\n'); if ( lns ) { line += lns; @@ -451,8 +451,8 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line, { // if ( endcol >= startcol + len ) endcol -= (startcol + len); - uint sc = rep.length() - rep.tqfindRev('\n') - 1; - matches += sedMagic( doc, line, tqfind, repOld, delim, noCase, repeat, sc, endcol ); + uint sc = rep.length() - rep.findRev('\n') - 1; + matches += sedMagic( doc, line, find, repOld, delim, noCase, repeat, sc, endcol ); } } @@ -486,16 +486,16 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt TQRegExp splitter( TQString("^[$%]?s\\s*") + d + "((?:[^\\\\\\" + d + "]|\\\\.)*)\\" + d +"((?:[^\\\\\\" + d + "]|\\\\.)*)\\" + d + "[ig]{0,2}$" ); if (splitter.search(cmd)<0) return false; - TQString tqfind=splitter.cap(1); - kdDebug(13025)<< "SedReplace: tqfind=" << tqfind.latin1() <numLines(); for (int line=0; (uint)line < numLines; line++) { - res += sedMagic( doc, line, tqfind, tqreplace, d, !noCase, repeat ); + res += sedMagic( doc, line, find, replace, d, !noCase, repeat ); if ( ! repeat && res ) break; } } @@ -524,7 +524,7 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt if ( startline == doc->selEndLine() ) endcol = doc->selEndCol(); - res += sedMagic( doc, startline, tqfind, tqreplace, d, !noCase, repeat, startcol, endcol ); + res += sedMagic( doc, startline, find, replace, d, !noCase, repeat, startcol, endcol ); /*if ( startcol )*/ startcol = 0; @@ -534,10 +534,10 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt else // just this line { int line=view->cursorLine(); - res += sedMagic(doc, line, tqfind, tqreplace, d, !noCase, repeat); + res += sedMagic(doc, line, find, replace, d, !noCase, repeat); } - msg = i18n("1 tqreplacement done", "%n tqreplacements done",res ); + msg = i18n("1 replacement done", "%n replacements done",res ); doc->editEnd(); @@ -562,7 +562,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt int base=10; if (cmd[0]=='x' || cmd.left(2)=="0x") { - cmd.tqreplace(TQRegExp("^0?x"), ""); + cmd.replace(TQRegExp("^0?x"), ""); base=16; } else if (cmd[0]=='0') @@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt view->insertText(TQString(buf)); } else - { // do the tqunicode thing + { // do the unicode thing TQChar c(number); view->insertText(TQString(&c, 1)); } @@ -593,13 +593,13 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString & if (cmd.left(4) != "date") return false; - if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0) - view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5))); + if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0) + view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5))); else - view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss")); + view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); return true; } //END Date -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h index fad54e85a..55c8d807b 100644 --- a/kate/part/katecmds.h +++ b/kate/part/katecmds.h @@ -64,11 +64,11 @@ class CoreCommands : public Kate::Command, public Kate::CommandExtension /** * -- Charles Samuels - * Support vim/sed tqfind and tqreplace - * s/search/tqreplace/ tqfind search, tqreplace with tqreplace on this line - * %s/search/tqreplace/ do the same to the whole file - * s/search/tqreplace/i do the S. and R., but case insensitively - * $s/search/tqreplace/ do the search are tqreplacement to the selection only + * Support vim/sed find and replace + * s/search/replace/ find search, replace with replace on this line + * %s/search/replace/ do the same to the whole file + * s/search/replace/i do the S. and R., but case insensitively + * $s/search/replace/ do the search are replacement to the selection only * * $s/// is currently unsupported **/ @@ -94,17 +94,17 @@ class SedReplace : public Kate::Command private: /** - * Searches one line and does the tqreplacement in the document. - * If @p tqreplace tqcontains any newline characters, the reamaining part of the + * Searches one line and does the replacement in the document. + * If @p replace contains any newline characters, the reamaining part of the * line is searched, and the @p line set to the last line number searched. - * @return the number of tqreplacements performed. + * @return the number of replacements performed. * @param doc a pointer to the document to work on * @param line the number of the line to search. This may be changed by the * function, if newlines are inserted. - * @param tqfind A regular expression pattern to use for searching - * @param tqreplace a template for tqreplacement. Backspaced integers are - * tqreplaced with captured texts from the regular expression. - * @param delim the delimiter character from the command. In the tqreplacement + * @param find A regular expression pattern to use for searching + * @param replace a template for replacement. Backspaced integers are + * replaced with captured texts from the regular expression. + * @param delim the delimiter character from the command. In the replacement * text backsplashes preceeding this character are removed. * @param nocase parameter for matching the reqular expression. * @param repeat If false, the search is stopped after the first match. @@ -113,13 +113,13 @@ class SedReplace : public Kate::Command * If it is -1, the whole line is used. */ static int sedMagic(KateDocument *doc, int &line, - const TQString &tqfind, const TQString &tqreplace, const TQString &delim, + const TQString &find, const TQString &replace, const TQString &delim, bool noCase, bool repeat, uint startcol=0, int endcol=-1); }; /** - * insert a tqunicode or ascii character + * insert a unicode or ascii character * base 9+1: 1234 * hex: 0x1234 or x1234 * octal: 01231 @@ -175,4 +175,4 @@ class Date : public Kate::Command } // namespace KateCommands #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index 6fecd4c9e..cee99f9d4 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -47,7 +47,7 @@ /** * This class is used as the codecompletion listbox. It can be resized according to its contents, - * therfor the needed size is provided by tqsizeHint(); + * therfor the needed size is provided by sizeHint(); *@short Listbox showing codecompletion *@author Jonas B. Jacobi */ @@ -61,7 +61,7 @@ class KateCCListBox : public QListBox { } - TQSize tqsizeHint() const + TQSize sizeHint() const { int count = this->count(); int height = 20; @@ -124,7 +124,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view ) m_completionListBox->installEventFilter( this ); - m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); + m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2)); m_completionPopup->installEventFilter( this ); m_completionPopup->setFocusProxy( m_view->m_viewInternal ); @@ -305,7 +305,7 @@ void KateCodeCompletion::updateBox( bool ) } kdDebug(13035)<<"KateCodeCompletion::updateBox: Resizing widget"<resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); + m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2)); TQPoint p = m_view->mapToGlobal( m_view->cursorCoordinates() ); int x = p.x(); int y = p.y() ; @@ -384,7 +384,7 @@ void KateCodeCompletion::showComment() m_completionListBox->ensureCurrentVisible(); finalPoint.setY( - m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect( + m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect( m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y()); m_commentLabel->move(finalPoint); @@ -398,8 +398,8 @@ KateArgHint::KateArgHint( KateView* parent, const char* name ) setPaletteForegroundColor( Qt::black ); labelDict.setAutoDelete( true ); - tqlayout = new TQVBoxLayout( this, 1, 2 ); - tqlayout->setAutoAdd( true ); + layout = new TQVBoxLayout( this, 1, 2 ); + layout->setAutoAdd( true ); editorView = parent; m_markCurrentFunction = true; @@ -460,8 +460,8 @@ void KateArgHint::cursorPositionChanged( KateView* view, int line, int col ) TQRegExp chrconst_rx( "'[^']*'" ); text = text - .tqreplace( strconst_rx, "\"\"" ) - .tqreplace( chrconst_rx, "''" ); + .replace( strconst_rx, "\"\"" ) + .replace( chrconst_rx, "''" ); int index = 0; while( index < (int)text.length() ){ @@ -563,4 +563,4 @@ void KateArgHint::adjustSize( ) move( screen.x() + screen.width() - width(), y() ); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h index 52fd6c70f..34d620599 100644 --- a/kate/part/katecodecompletion.h +++ b/kate/part/katecodecompletion.h @@ -57,14 +57,14 @@ class KateCodeCompletionCommentLabel : public QLabel setAutoMask( false ); setFrameStyle( TQFrame::Plain | TQFrame::Box ); setLineWidth( 1 ); - tqsetAlignment( AlignAuto | AlignTop ); + setAlignment( AlignAuto | AlignTop ); polish(); setText(text); adjustSize(); } }; -class KateCodeCompletion : public TQObject +class KateCodeCompletion : public QObject { Q_OBJECT @@ -156,9 +156,9 @@ class KateArgHint: public QFrame int m_currentCol; KateView* editorView; TQIntDict labelDict; - TQLayout* tqlayout; + TQLayout* layout; }; #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/part/katecodefoldinghelpers.cpp b/kate/part/katecodefoldinghelpers.cpp index 78db2ad15..91b4da88a 100644 --- a/kate/part/katecodefoldinghelpers.cpp +++ b/kate/part/katecodefoldinghelpers.cpp @@ -217,10 +217,10 @@ void KateCodeFoldingTree::getLineInfo(KateLineInfo *info, unsigned int line) { KateCodeFoldingNode *node = m_root.child(i); - if ((node->startLineRel<=line) && (line<=node->startLineRel+node->endLineRel)) // we found a node, which tqcontains the given line -> do a complete lookup + if ((node->startLineRel<=line) && (line<=node->startLineRel+node->endLineRel)) // we found a node, which contains the given line -> do a complete lookup { info->topLevel = false; //we are definitly not toplevel - tqfindAllNodesOpenedOrClosedAt(line); //lookup all nodes, which start or and at the given line + findAllNodesOpenedOrClosedAt(line); //lookup all nodes, which start or and at the given line for ( KateCodeFoldingNode *node = nodesForLine.first(); node; node = nodesForLine.next() ) { @@ -253,7 +253,7 @@ void KateCodeFoldingTree::getLineInfo(KateLineInfo *info, unsigned int line) } -KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLine(unsigned int line) +KateCodeFoldingNode *KateCodeFoldingTree::findNodeForLine(unsigned int line) { if (m_root.noChildren()) // does we have child list + nodes ? return &m_root; @@ -266,7 +266,7 @@ KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLine(unsigned int line) if ((node->startLineRel<=line) && (line<=node->startLineRel+node->endLineRel)) { // a region surounds the line, look in the next deeper hierarchy step - return tqfindNodeForLineDescending(node,line,0); + return findNodeForLineDescending(node,line,0); } } @@ -274,7 +274,7 @@ KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLine(unsigned int line) } -KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLineDescending ( KateCodeFoldingNode *node, +KateCodeFoldingNode *KateCodeFoldingTree::findNodeForLineDescending ( KateCodeFoldingNode *node, unsigned int line, unsigned int offset, bool oneStepOnly ) { if (node->noChildren()) @@ -289,22 +289,22 @@ KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForLineDescending ( KateCode if ((subNode->startLineRel+offset<=line) && (line<=subNode->endLineRel+subNode->startLineRel+offset)) //warning fix me for invalid ends { - // a subnode tqcontains the line. + // a subnode contains the line. // if oneStepOnly is true, we don't want to search for the deepest node, just return the found one if (oneStepOnly) return subNode; else - return tqfindNodeForLineDescending (subNode,line,offset); // look into the next deeper hierarchy step + return findNodeForLineDescending (subNode,line,offset); // look into the next deeper hierarchy step } } return node; // the current node has no sub nodes, or the line couldn'te be found within a subregion } -KateCodeFoldingNode *KateCodeFoldingTree::tqfindNodeForPosition(unsigned int line, unsigned int column) +KateCodeFoldingNode *KateCodeFoldingTree::findNodeForPosition(unsigned int line, unsigned int column) { - KateCodeFoldingNode *node=tqfindNodeForLine(line); + KateCodeFoldingNode *node=findNodeForLine(line); if (node==&m_root) return &m_root; @@ -395,11 +395,11 @@ void KateCodeFoldingTree::updateLine(unsigned int line, something_changed = false; - tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(line); + findAndMarkAllNodesforRemovalOpenedOrClosedAt(line); if (regionChanges->isEmpty()) { - // KateCodeFoldingNode *node=tqfindNodeForLine(line); + // KateCodeFoldingNode *node=findNodeForLine(line); // if (node->type!=0) // if (getStartLine(node)+node->endLineRel==line) removeEnding(node,line); } @@ -421,7 +421,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line, regionChanges->resize (regionChanges->size()-2); int insertPos=-1; - KateCodeFoldingNode *node = tqfindNodeForLine(line); + KateCodeFoldingNode *node = findNodeForLine(line); if (data<0) { @@ -445,7 +445,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line, if ((getStartLine(node)==line) && (node->type!=0)) { - insertPos=node->parentNode->tqfindChild(node); + insertPos=node->parentNode->findChild(node); node = node->parentNode; } else @@ -467,7 +467,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line, { if (correctEndings(data,node,line,charPos,insertPos)) { - insertPos=node->parentNode->tqfindChild(node)+1; + insertPos=node->parentNode->findChild(node)+1; node=node->parentNode; } else @@ -484,7 +484,7 @@ void KateCodeFoldingTree::updateLine(unsigned int line, something_changed = true; node->appendChild(newNode); addOpening(newNode, data, regionChanges, line,charPos); - insertPos = node->tqfindChild(newNode)+1; + insertPos = node->findChild(newNode)+1; } else { @@ -538,7 +538,7 @@ bool KateCodeFoldingTree::removeOpening(KateCodeFoldingNode *node,unsigned int l } KateCodeFoldingNode *parent = node->parentNode; - int mypos = parent->tqfindChild(node); + int mypos = parent->findChild(node); if (mypos > -1) { @@ -553,7 +553,7 @@ bool KateCodeFoldingTree::removeOpening(KateCodeFoldingNode *node,unsigned int l } // remove the node - //mypos = parent->tqfindChild(node); + //mypos = parent->findChild(node); bool endLineValid = node->endLineValid; int endLineRel = node->endLineRel; uint endCol=node->endCol; @@ -583,7 +583,7 @@ bool KateCodeFoldingTree::removeEnding(KateCodeFoldingNode *node,unsigned int /* if (node->type < 0) { // removes + deletes - int i = parent->tqfindChild (node); + int i = parent->findChild (node); if (i >= 0) { KateCodeFoldingNode *child = parent->takeChild(i); @@ -594,7 +594,7 @@ bool KateCodeFoldingTree::removeEnding(KateCodeFoldingNode *node,unsigned int /* return true; } - int mypos = parent->tqfindChild(node); + int mypos = parent->findChild(node); int count = parent->childCount(); for (int i=mypos+1; iinsertChild(insertPos,newNode); - // tqfind correct position + // find correct position return false; } else @@ -728,7 +728,7 @@ bool KateCodeFoldingTree::correctEndings(signed char data, KateCodeFoldingNode * if (node->parentNode) { - correctEndings(data,node->parentNode,bakEndLine, bakEndCol,node->parentNode->tqfindChild(node)+1); // ???? + correctEndings(data,node->parentNode,bakEndLine, bakEndCol,node->parentNode->findChild(node)+1); // ???? } else { @@ -742,7 +742,7 @@ bool KateCodeFoldingTree::correctEndings(signed char data, KateCodeFoldingNode * void KateCodeFoldingTree::moveSubNodesUp(KateCodeFoldingNode *node) { - int mypos = node->parentNode->tqfindChild(node); + int mypos = node->parentNode->findChild(node); int removepos=-1; int count = node->childCount(); for (int i=0; iendLineValid) { - int current = parent->tqfindChild(node); + int current = parent->findChild(node); int count = parent->childCount()-(current+1); node->endLineRel = parent->endLineRel - node->startLineRel; @@ -1007,7 +1007,7 @@ void KateCodeFoldingTree::addOpening_further_iterations(KateCodeFoldingNode *nod { something_changed = true; KateCodeFoldingNode *newNode = new KateCodeFoldingNode(node, data, line-startLine); - node->insertChild(current, newNode); //tqfind the correct position later + node->insertChild(current, newNode); //find the correct position later } addOpening(node->child(current), data, list, line,charPos); @@ -1040,10 +1040,10 @@ void KateCodeFoldingTree::lineHasBeenRemoved(unsigned int line) #endif //line ++; - tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(line); //It's an ugly solution + findAndMarkAllNodesforRemovalOpenedOrClosedAt(line); //It's an ugly solution cleanupUnneededNodes(line); //It's an ugly solution - KateCodeFoldingNode *node = tqfindNodeForLine(line); + KateCodeFoldingNode *node = findNodeForLine(line); //????? if (node->endLineValid) { int startLine = getStartLine(node); @@ -1083,7 +1083,7 @@ void KateCodeFoldingTree::decrementBy1(KateCodeFoldingNode *node, KateCodeFoldin node->endLineValid = false; node->endLineRel--; - for (uint i=node->tqfindChild(after)+1; i < node->childCount(); ++i) + for (uint i=node->findChild(after)+1; i < node->childCount(); ++i) node->child(i)->startLineRel--; if (node->parentNode) @@ -1103,10 +1103,10 @@ void KateCodeFoldingTree::lineHasBeenInserted(unsigned int line) kdDebug(13000)<endLineValid) { int startLine=getStartLine(node); @@ -1140,7 +1140,7 @@ void KateCodeFoldingTree::incrementBy1(KateCodeFoldingNode *node, KateCodeFoldin { node->endLineRel++; - for (uint i=node->tqfindChild(after)+1; i < node->childCount(); ++i) + for (uint i=node->findChild(after)+1; i < node->childCount(); ++i) node->child(i)->startLineRel++; if (node->parentNode) @@ -1148,14 +1148,14 @@ void KateCodeFoldingTree::incrementBy1(KateCodeFoldingNode *node, KateCodeFoldin } -void KateCodeFoldingTree::tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(unsigned int line) +void KateCodeFoldingTree::findAndMarkAllNodesforRemovalOpenedOrClosedAt(unsigned int line) { #ifdef __GNUC__ #warning "FIXME: make this multiple region changes per line save"; #endif // return; markedForDeleting.clear(); - KateCodeFoldingNode *node = tqfindNodeForLine(line); + KateCodeFoldingNode *node = findNodeForLine(line); if (node->type == 0) return; @@ -1186,7 +1186,7 @@ void KateCodeFoldingTree::addNodeToRemoveList(KateCodeFoldingNode *node,unsigned } if ((startLine+node->endLineRel==line) || ((node->endLineValid==false) && (node->deleteOpening))) { - int myPos=node->parentNode->tqfindChild(node); // this has to be implemented nicely + int myPos=node->parentNode->findChild(node); // this has to be implemented nicely if ((int)node->parentNode->childCount()>myPos+1) addNodeToRemoveList(node->parentNode->child(myPos+1),line); add=true; @@ -1199,10 +1199,10 @@ void KateCodeFoldingTree::addNodeToRemoveList(KateCodeFoldingNode *node,unsigned } -void KateCodeFoldingTree::tqfindAllNodesOpenedOrClosedAt(unsigned int line) +void KateCodeFoldingTree::findAllNodesOpenedOrClosedAt(unsigned int line) { nodesForLine.clear(); - KateCodeFoldingNode *node = tqfindNodeForLine(line); + KateCodeFoldingNode *node = findNodeForLine(line); if (node->type == 0) return; @@ -1214,7 +1214,7 @@ void KateCodeFoldingTree::tqfindAllNodesOpenedOrClosedAt(unsigned int line) while (node->parentNode) { - addNodeToFoundList(node->parentNode, line, node->parentNode->tqfindChild(node)); + addNodeToFoundList(node->parentNode, line, node->parentNode->findChild(node)); node = node->parentNode; } #if JW_DEBUG @@ -1272,7 +1272,7 @@ void KateCodeFoldingTree::cleanupUnneededNodes(unsigned int line) #endif if (node->endLineValid) // just delete it, it has been opened and closed on this line { - int f = node->parentNode->tqfindChild (node); + int f = node->parentNode->findChild (node); if (f >= 0) delete node->parentNode->takeChild(f); @@ -1332,7 +1332,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line) hiddenLinesCountCacheValid = false; kdDebug(13000)<child(tmp->tqfindChild(node) + 1)) + if ((tmp2 = tmp->child(tmp->findChild(node) + 1)) && ((tmp2->startLineRel + startLine) == line)) return true; @@ -1650,7 +1650,7 @@ void KateCodeFoldingTree::ensureVisible( uint line ) kdDebug(13000)<<"line "<