diff options
Diffstat (limited to 'kate')
160 files changed, 1240 insertions, 1240 deletions
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 <jowenn@kde.org> - * now <keywords> and <types> is tqreplaced by <list name="XXXX"> + * now <keywords> and <types> is replaced by <list name="XXXX"> 2001-04-20 Christoph Cullmann <cullmann@kde.org> * new configdialog @@ -325,7 +325,7 @@ * Filter - select text, hit <Ctrl+Backslash>, 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 <jowenn@kde.org> * 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 <testcase>.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 <testcase>.txt must be accompanied with a <testcase>.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 <testcase>.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 @@ <keywords casesensitive="0" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <keywords casesensitive="0" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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: <item>EnableMMAP</item> <item>EnableSendfile</item> <item>ExpiresActive</item> -<item>ExtendedtqStatus</item> +<item>ExtendedStatus</item> <item>FileETag</item> <item>ForceLanguagePriority</item> <item>HostnameLookups</item> @@ -453,7 +453,7 @@ v1.0: <item>auth-int</item> <item>never</item> <item>searching</item> -<item>tqfinding</item> +<item>finding</item> <item>always</item> <item>Basic</item> <item>Digest</item> 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 <R.Nagy@pknc.com> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> <!-- - You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php + You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php This is a template for 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). @@ -11,7 +11,7 @@ Look at language.dtd for some documentation of the allowed elements and their attributes. There is also a description of how to validate your syntax file. - You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php + You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php --> <language name="ASN.1" section="Markup" version="1.00" kateversion="2.3" extensions="*.asn*.asn1" mimetype="" author="Philippe Rigault" license="GPL"> <highlighting> @@ -65,5 +65,5 @@ </highlighting> </language> <!-- -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> true </item> <item> umount </item> <item> uname </item> - <item> tqunicode_start </item> - <item> tqunicode_stop </item> + <item> unicode_start </item> + <item> unicode_stop </item> <item> unlink </item> <item> utmpdump </item> <item> uuidgen </item> @@ -284,7 +284,7 @@ <item> expr </item> <item> fbset </item> <item> file </item> - <item> tqfind </item> + <item> find </item> <item> flex </item> <item> flex++ </item> <item> fmt </item> @@ -536,7 +536,7 @@ <RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" /> </context> - <!-- FindOthers tqcontains various rules to mark different shell input --> + <!-- FindOthers contains various rules to mark different shell input --> <context attribute="Normal Text" lineEndContext="#stay" name="FindOthers"> <RegExpr attribute="Escape" context="#stay" String="\\[][;\\$`{}()|&<>* ]" /> <RegExpr attribute="Keyword" context="#stay" String="\\$" /> @@ -574,7 +574,7 @@ <RegExpr attribute="Escape" context="#stay" String="\\[`$\\]" /> </context> - <!-- FindTests tqfinds operators valid in tests --> + <!-- FindTests finds operators valid in tests --> <context attribute="Normal Text" lineEndContext="#stay" name="FindTests"> <RegExpr attribute="Expression" context="#stay" String="-[abcdefghkprstuwxOGLSNozn](?=\s)"/> <RegExpr attribute="Expression" context="#stay" String="-([no]t|ef)(?=\s)"/> 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 @@ <item> relation </item> <item> release </item> <item> rename </item> - <item> tqreplace </item> + <item> replace </item> <item> report </item> <item> rest </item> <item> restore </item> 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 @@ <item> export </item> <item> export_library_dependencies </item> <item> file </item> - <item> tqfind_file </item> - <item> tqfind_library </item> - <item> tqfind_package </item> - <item> tqfind_path </item> - <item> tqfind_program </item> + <item> find_file </item> + <item> find_library </item> + <item> find_package </item> + <item> find_path </item> + <item> find_program </item> <item> fltk_wrap_ui </item> <item> foreach </item> <item> function </item> 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 @@ <item> eval </item> <item> exec </item> <item> exp </item> - <item> tqfind </item> + <item> find </item> <item> floor </item> <item> focus </item> <item> forward </item> @@ -160,7 +160,7 @@ <item> random </item> <item> releaseEvents </item> <item> reload </item> - <item> tqreplace </item> + <item> replace </item> <item> reset </item> <item> resizeBy </item> <item> resizeTo </item> 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 @@ <item> file-write-date </item> <item> fill </item> <item> fill-pointer </item> - <item> tqfind </item> - <item> tqfind-all-symbols </item> - <item> tqfind-class </item> - <item> tqfind-if </item> - <item> tqfind-if-not </item> - <item> tqfind-method </item> - <item> tqfind-package </item> - <item> tqfind-restart </item> - <item> tqfind-symbol </item> + <item> find </item> + <item> find-all-symbols </item> + <item> find-class </item> + <item> find-if </item> + <item> find-if-not </item> + <item> find-method </item> + <item> find-package </item> + <item> find-restart </item> + <item> find-symbol </item> <item> finish-output </item> <item> first </item> <item> fixnum </item> @@ -575,7 +575,7 @@ <item> map-into </item> <item> mapl </item> <item> maplist </item> - <item> tqmask-field </item> + <item> mask-field </item> <item> max </item> <item> member </item> <item> member-if </item> @@ -759,7 +759,7 @@ <item> remprop </item> <item> rename-file </item> <item> rename-package </item> - <item> tqreplace </item> + <item> replace </item> <item> require </item> <item> rest </item> <item> restart </item> 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 @@ <item> Q_GLOBAL_STATIC </item> <item> Q_GLOBAL_STATIC_WITH_ARGS </item> <item> Q_INIT_RESOURCE </item> - <item> TQ_INTERFACES </item> + <item> Q_INTERFACES </item> <item> Q_INVOKABLE </item> <item> Q_NOREPLY </item> <item> Q_OBJECT </item> 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 @@ <item> speak-punctuation </item> <item> speech-rate </item> <item> stress </item> - <item> table-tqlayout </item> + <item> table-layout </item> <item> text-align </item> <item> text-decoration </item> <item> text-decoration-color </item> @@ -143,7 +143,7 @@ <item> text-shadow </item> <item> text-transform </item> <item> top </item> - <item> tqunicode-bidi </item> + <item> unicode-bidi </item> <item> vertical-align </item> <item> visibility </item> <item> voice-family </item> @@ -206,7 +206,7 @@ <item> font-style </item> <item> font-variant </item> <item> font-weight </item> - <item> tqunicode-range </item> + <item> unicode-range </item> <item> units-per-em </item> <item> src </item> <item> panose-1 </item> @@ -539,7 +539,7 @@ </context> <!-- to be included --> - <!-- tqfinds rules and detects nesting --> + <!-- finds rules and detects nesting --> <context attribute="Normal Text" lineEndContext="#stay" name="FindRuleSets"> <RegExpr attribute="Media" context="Media" String="@media\b" /> <RegExpr attribute="At Rule" context="Import" String="@import\b" /> @@ -555,20 +555,20 @@ <IncludeRules context="FindComments" /> </context> - <!-- tqfinds arguments to properties --> + <!-- finds arguments to properties --> <context attribute="Normal Text" lineEndContext="#stay" name="FindValues"> <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|px|in|cm|mm|pt|pc|deg|rad|grad|ms|s|Hz|kHz)\b" /> <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" /> <RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" /> </context> - <!-- tqfinds strings --> + <!-- finds strings --> <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings"> <DetectChar attribute="String" context="StringDQ" char=""" /> <DetectChar attribute="String" context="StringSQ" char="'" /> </context> - <!-- tqfinds comments --> + <!-- finds comments --> <context attribute="Normal Text" lineEndContext="#stay" name="FindComments"> <RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined" /> <RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined" /> 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 <diggory.hardy@gmail.com> - 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 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> end </item> <item> equal </item> <item> exit </item> - <item> tqfind </item> + <item> find </item> <item> float32_to_atom </item> <item> float64_to_atom </item> <item> floor </item> @@ -199,7 +199,7 @@ <list name="GtkKeywords"> <item> addto </item> <item> adjustment </item> - <item> tqalignment </item> + <item> alignment </item> <item> appendto </item> <item> append_page </item> <item> arrow </item> 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 @@ <item> call </item> <item> case </item> <item> common </item> - <item> tqcontains </item> + <item> contains </item> <item> continue </item> <item> cycle </item> <item> deallocate </item> @@ -314,7 +314,7 @@ <item> allocated </item> <item> lbound </item> <item> ubound </item> - <item> tqshape </item> + <item> shape </item> <item> size </item> </list> @@ -343,7 +343,7 @@ <item> pack </item> <item> unpack </item> <!-- Transformational function for reshaping an array --> - <item> retqshape </item> + <item> reshape </item> <!-- Transformational function for replication --> <item> spread </item> <!-- Array shifting functions --> @@ -372,41 +372,41 @@ <contexts> <context attribute="Normal Text" lineEndContext="#stay" name="default" > <IncludeRules context="find_strings" /> - <IncludeRules context="tqfind_decls" /> - <IncludeRules context="tqfind_intrinsics" /> - <IncludeRules context="tqfind_io_stmnts" /> - <IncludeRules context="tqfind_op_and_log" /> - <IncludeRules context="tqfind_numbers" /> - <IncludeRules context="tqfind_preprocessor" /> - <IncludeRules context="tqfind_comments" /> - <IncludeRules context="tqfind_symbols" /> - <IncludeRules context="tqfind_end_stmnts" /> - <IncludeRules context="tqfind_begin_stmnts" /> + <IncludeRules context="find_decls" /> + <IncludeRules context="find_intrinsics" /> + <IncludeRules context="find_io_stmnts" /> + <IncludeRules context="find_op_and_log" /> + <IncludeRules context="find_numbers" /> + <IncludeRules context="find_preprocessor" /> + <IncludeRules context="find_comments" /> + <IncludeRules context="find_symbols" /> + <IncludeRules context="find_end_stmnts" /> + <IncludeRules context="find_begin_stmnts" /> </context> <!--************************END OF THE MAIN CONTEXT*************************--> <!-- This context highlights preprocessor lines --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_preprocessor"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_preprocessor"> <RegExpr attribute="Preprocessor" context="#stay" String="(#|cDEC\$|CDEC\$).*$" column="0"/> </context> <!-- This context highlights operators and the logical values .true. .false. --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_op_and_log"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_op_and_log"> <RegExpr attribute="Logical" context="#stay" String="\.(true|false)\." insensitive="TRUE"/> <RegExpr attribute="Operator" context="#stay" String="\.[A-Za-z]+\."/> <RegExpr attribute="Operator" context="#stay" String="(==|/=|<|<=|>|>=)"/> </context> <!-- This context highlights comments --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_comments"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_comments"> <RegExpr attribute="Comment" context="#stay" String="[cC\*].*$" column="0"/> <RegExpr attribute="Comment" context="#stay" String="!.*$"/> </context> <!-- This context highlights symbols --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_symbols"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_symbols"> <Detect2Chars attribute="Keyword" context="#stay" char="*" char1="*"/> <Detect2Chars attribute="Keyword" context="#stay" char="(" char1="/"/> <Detect2Chars attribute="Keyword" context="#stay" char="/" char1=")"/> @@ -419,21 +419,21 @@ <DetectChar attribute="Normal Text" context="inside_func_paren" char="("/> <DetectChar attribute="Normal Text" context="#pop" char=")"/> <IncludeRules context="find_strings" /> - <IncludeRules context="tqfind_intrinsics" /> - <IncludeRules context="tqfind_numbers" /> + <IncludeRules context="find_intrinsics" /> + <IncludeRules context="find_numbers" /> </context> <!-- The following two contexts match input/output statements --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_io_stmnts"> - <RegExpr attribute="IO Function" context="tqfind_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close)\s*[(]" insensitive="TRUE"/> - <RegExpr attribute="IO Function" context="tqfind_io_paren" String="\bopen\s*[(]" insensitive="TRUE"/> - <RegExpr attribute="IO Function" context="tqfind_io_paren" String="\binquire\s*[(]" insensitive="TRUE"/> + <context attribute="Normal Text" lineEndContext="#stay" name="find_io_stmnts"> + <RegExpr attribute="IO Function" context="find_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close)\s*[(]" insensitive="TRUE"/> + <RegExpr attribute="IO Function" context="find_io_paren" String="\bopen\s*[(]" insensitive="TRUE"/> + <RegExpr attribute="IO Function" context="find_io_paren" String="\binquire\s*[(]" insensitive="TRUE"/> <RegExpr attribute="IO Function" context="format_stmnt" String="\bformat\s*[(]" insensitive="TRUE"/> <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="TRUE"/> <keyword attribute="IO Function" context="#stay" String="io_functions"/> </context> <!-- This context matches parenthesis for the read, write, ... statements --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_io_paren"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_io_paren"> <DetectChar attribute="IO Function" context="#stay" char="*"/> <DetectChar attribute="Normal Text" context="inside_func_paren" char="("/> <DetectChar attribute="IO Function" context="#pop" char=")"/> @@ -441,9 +441,9 @@ <keyword attribute="IO Function" context="#stay" String="inquire_keywords"/> <keyword attribute="IO Function" context="#stay" String="open_keywords"/> <IncludeRules context="find_strings" /> - <IncludeRules context="tqfind_intrinsics" /> - <IncludeRules context="tqfind_numbers" /> - <IncludeRules context="tqfind_symbols" /> + <IncludeRules context="find_intrinsics" /> + <IncludeRules context="find_numbers" /> + <IncludeRules context="find_symbols" /> </context> <!-- This context highlights the text inside the parenthesis of fortran statement --> <context attribute="Normal Text" lineEndContext="#stay" name="format_stmnt"> @@ -452,44 +452,44 @@ <RegExpr attribute="IO Function" context="#stay" String="[0-9]*/" insensitive="TRUE"/> <AnyChar attribute="IO Function" context="#stay" String=":"/> <IncludeRules context="find_strings" /> - <IncludeRules context="tqfind_symbols" /> + <IncludeRules context="find_symbols" /> </context> <!-- The following context matches the begin of program units --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_begin_stmnts"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_begin_stmnts"> <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="TRUE"/> <RegExpr attribute="Keyword" context="#stay" String="\b(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" beginRegion="Unit"/> </context> <!-- The following context matches the end of program units --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_end_stmnts"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_end_stmnts"> <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(program|subroutine|function|module|block\s*data)\b" insensitive="TRUE" endRegion="Unit"/> <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if|select|where|forall|interface)\b" insensitive="TRUE"/> <RegExpr attribute="Keyword" context="#stay" String="\bend\b" insensitive="TRUE" endRegion="Unit"/> </context> <!-- The following two contexts match declarations --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_decls"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_decls"> <RegExpr attribute="Data Type" context="#stay" String="\binteger[\*]\d{1,2}" insensitive="TRUE"/> <RegExpr attribute="Data Type" context="#stay" String="\breal[\*]\d{1,2}" insensitive="TRUE"/> <RegExpr attribute="Data Type" context="#stay" String="\bcomplex[\*]\d{1,2}" insensitive="TRUE"/> <RegExpr attribute="Data Type" context="#stay" String="\bend\s*type\b" insensitive="TRUE"/> <keyword attribute="Data Type" context="#stay" String="types"/> <RegExpr attribute="Data Type" context="#stay" String="^\s*data\b" insensitive="TRUE"/> - <RegExpr attribute="Data Type" context="tqfind_paren" String="^\s*real\s*[(]" insensitive="TRUE"/> + <RegExpr attribute="Data Type" context="find_paren" String="^\s*real\s*[(]" insensitive="TRUE"/> <RegExpr attribute="Data Type" context="#stay" String="^\s*real(?![\w\*])" insensitive="TRUE"/> <RegExpr attribute="Data Type" context="#stay" String="\bcharacter[*][0-9]+\b" insensitive="TRUE"/> - <RegExpr attribute="Data Type" context="tqfind_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="TRUE"/> + <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="TRUE"/> <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|complex|character|logical|intent|dimension)\b" insensitive="TRUE"/> <Detect2Chars attribute="Data Type" context="#stay" char=":" char1=":"/> </context> <!-- This context matches parenthesis in data type declarations, such as in 'real(...)'--> - <context attribute="Data Type" lineEndContext="#pop" name="tqfind_paren"> - <DetectChar attribute="Data Type" context="tqfind_paren" char="("/> + <context attribute="Data Type" lineEndContext="#pop" name="find_paren"> + <DetectChar attribute="Data Type" context="find_paren" char="("/> <DetectChar attribute="Data Type" context="#pop" char=")"/> </context> <!-- The following context matches intrinsic procedures --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_intrinsics"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_intrinsics"> <keyword attribute="Keyword" context="#stay" String="keywords"/> <!-- INTRINSIC PROCEDURES --> <keyword attribute="Elemental Procedure" context="#stay" String="elemental_procs"/> @@ -499,7 +499,7 @@ </context> <!-- The following context matches integer and real numbers --> - <context attribute="Normal Text" lineEndContext="#stay" name="tqfind_numbers"> + <context attribute="Normal Text" lineEndContext="#stay" name="find_numbers"> <!-- Floating-point numbers with optional kind --> <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/> <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="TRUE"/> 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 @@ </comments> </general> </language> -<!-- // kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- // kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> GapInputPcGroup </item> <item> GapInputSCTable </item> <item> GasmanLimits </item> - <item> GasmanMessagetqStatus </item> + <item> GasmanMessageStatus </item> <item> GasmanStatistics </item> <item> GaussianIntegers </item> <item> GaussianRationals </item> @@ -5393,7 +5393,7 @@ <item> PrintCounters </item> <item> PrintFactorsInt </item> <item> PrintFormattedString </item> - <item> PrintFormattingtqStatus </item> + <item> PrintFormattingStatus </item> <item> PrintGAPDocElementTemplates </item> <item> PrintHashWithNames </item> <item> PrintObj </item> @@ -6167,7 +6167,7 @@ <item> SetGapDocHTMLOptions </item> <item> SetGapDocLaTeXOptions </item> <item> SetGapDocTxtOptions </item> - <item> SetGasmanMessagetqStatus </item> + <item> SetGasmanMessageStatus </item> <item> SetGeneralizedPcgs </item> <item> SetGeneratingPairsOfLeftMagmaCongruence </item> <item> SetGeneratingPairsOfMagmaCongruence </item> @@ -6806,7 +6806,7 @@ <item> SetPrimitiveElement </item> <item> SetPrimitiveIdentification </item> <item> SetPrimitiveRoot </item> - <item> SetPrintFormattingtqStatus </item> + <item> SetPrintFormattingStatus </item> <item> SetProjectiveOrder </item> <item> SetPseudoRandomSeed </item> <item> SetPthPowerImages </item> @@ -7179,7 +7179,7 @@ <item> StandardizeTableC </item> <item> StarCyc </item> <item> StateRandom </item> - <item> tqStatusRandom </item> + <item> StatusRandom </item> <item> StepModGauss </item> <item> StopNumConsecSiftToOne </item> <item> StopNumSift </item> @@ -7571,7 +7571,7 @@ <item> TzPrintPairs </item> <item> TzPrintPresentation </item> <item> TzPrintRelators </item> - <item> TzPrinttqStatus </item> + <item> TzPrintStatus </item> <item> TzRelator </item> <item> TzRemoveGenerators </item> <item> TzRenumberGens </item> 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 @@ <item> orchid </item> <item> black </item> </list> - <list name="tqshapes"> + <list name="shapes"> <item> box </item> <item> triangle </item> <item> circle </item> @@ -139,7 +139,7 @@ <RegExpr attribute="Value" context="lineid" String="(foldedge.|edge.|)linestyle *:"/> <RegExpr attribute="Value" context="lineid" String="(foldnode.|node.|)borderstyle *:"/> <RegExpr attribute="Value" context="fishid" String="view *:"/> - <RegExpr attribute="Value" context="tqshapeid" String="(foldnode.|node.|)tqshape"/> + <RegExpr attribute="Value" context="shapeid" String="(foldnode.|node.|)shape"/> <RegExpr attribute="Value" context="lquote" String="(source|target)(name|)"/> <RegExpr attribute="Value" context="lquote" String="title *:"/> <RegExpr attribute="Value" context="lquote" String="(foldnode.|node.|foldedge.|edge.|)label *:"/> @@ -150,7 +150,7 @@ <RegExpr attribute="Value" context="nodelevel" String="(foldnode.|node.|)(level|vertical_?order) *:"/> <RegExpr attribute="Value" context="intval" String="(foldnode.|node.|foldedge.|edge.|)horizontal_?order *:"/> <RegExpr attribute="Value" context="stateid" String="stat(e|us) *:"/> - <RegExpr attribute="Value" context="algid" String="tqlayout_?algorithm *:"/> + <RegExpr attribute="Value" context="algid" String="layout_?algorithm *:"/> <RegExpr attribute="Value" context="boolean" String="crossing_?optimization *:"/> <RegExpr attribute="Value" context="boolean" String="crossing_?phase2 *:"/> <RegExpr attribute="Value" context="boolean" String="(dirty_edge_|display_edge_|displayedge|late_edge_|subgraph_?)labels *:"/> @@ -158,7 +158,7 @@ <RegExpr attribute="Value" context="boolean" String="(nodes|near_?edges|edges|splines) *:"/> <RegExpr attribute="Value" context="classname" String="classname"/> <RegExpr attribute="Value" context="orient" String="orientation *:"/> - <RegExpr attribute="Value" context="nodealign" String="node_tqalignment *:"/> + <RegExpr attribute="Value" context="nodealign" String="node_alignment *:"/> <RegExpr attribute="Value" context="textmode" String="(foldnode.|node.|)textmode *:"/> <RegExpr attribute="Value" context="boolean" String="equal_y_dist *:"/> <RegExpr attribute="Value" context="boolean" String="equal_?ydist *:"/> @@ -175,7 +175,7 @@ <RegExpr attribute="Value" context="intval" String="iconcolors *:"/> <RegExpr attribute="Value" context="intval" String="hidden *:"/> <RegExpr attribute="Value" context="boolean" String="energetic *:"/> - <RegExpr attribute="Value" context="intval" String="tqlayout_(up|down|near|spline)factor *:"/> + <RegExpr attribute="Value" context="intval" String="layout_(up|down|near|spline)factor *:"/> <RegExpr attribute="Value" context="intval" String="border +(x|y) *:"/> <RegExpr attribute="Value" context="intval" String="splinefactor *:"/> <RegExpr attribute="Value" context="floatval" String="(gravity|tempfactor|treefactor) *:"/> @@ -210,8 +210,8 @@ <keyword attribute="Datatype" context="default" String="colors"/> <RegExpr attribute="Datatype" context="default" String="[0-9][0-9]?"/> </context> - <context name="tqshapeid" attribute="Normal" lineEndContext="#stay"> - <keyword attribute="Datatype" context="default" String="tqshapes"/> + <context name="shapeid" attribute="Normal" lineEndContext="#stay"> + <keyword attribute="Datatype" context="default" String="shapes"/> </context> <context name="lquote" attribute="Normal" lineEndContext="#stay"> <DetectChar attribute="String" context="string" char="""/> 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 # <IncludeRules context="##*"> by <IncludeRules context="##*/PHP"> # # Generated languages need a language named 'PHP/PHP', which shall take care of PHP hl itself @@ -46,11 +46,11 @@ else $file =~ s/<language([^>]+)mimetype="[^"]*"/<language$1mimetype=""/s; } -$tqfindphp = "<context name=\"FindPHP\">\n<RegExpr context=\"##PHP/PHP\" String=\"<\\?(?:=|php)?\" lookAhead=\"true\" />\n</context>\n"; +$findphp = "<context name=\"FindPHP\">\n<RegExpr context=\"##PHP/PHP\" String=\"<\\?(?:=|php)?\" lookAhead=\"true\" />\n</context>\n"; $file =~ s/<IncludeRules\s([^>]*)context="##(?!Alerts)([^"]+)"/<IncludeRules $1context="##$2\/PHP"/g; $file =~ s/(<context\s[^>]*>)/$1\n<IncludeRules context="FindPHP" \/>/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 <J.Zaitseff@zap.org.au> 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 @@ <item> fullinfo </item> <item> fullserverinfo </item> <item> game </item> -<item> gameCompletetqStatus </item> +<item> gameCompleteStatus </item> <item> gamedir </item> <item> gamemap </item> <item> gameversion </item> @@ -704,7 +704,7 @@ <item> cg_drawRewards </item> <item> cg_drawSnapshot </item> <item> cg_drawSpreadScale </item> -<item> cg_drawtqStatus </item> +<item> cg_drawStatus </item> <item> cg_drawTeamOverlay </item> <item> cg_drawTimer </item> <item> cg_emptyswitch </item> @@ -833,7 +833,7 @@ <item> cl_rollspeed </item> <item> cl_run </item> <item> cl_running </item> -<item> cl_servertqStatusResendTime </item> +<item> cl_serverStatusResendTime </item> <item> cl_showfps </item> <item> cl_showSend </item> <item> cl_showServerCommands </item> @@ -1699,7 +1699,7 @@ <item> ui_prevClass </item> <item> ui_prevTeam </item> <item> ui_prevWeapon </item> -<item> ui_servertqStatusTimeOut </item> +<item> ui_serverStatusTimeOut </item> <item> ui_singlePlayerActive </item> <item> ui_smallFont </item> <item> ui_spSelection </item> 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 @@ <item> Replace </item> <item> Serial </item> <item> Switches </item> - <item> tqStatusline </item> + <item> Statusline </item> <item> score </item> <item> System_file </item> <item> Verb </item> 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 @@ <item> CompilationMXBean </item> <item> Compiler </item> <item> CompletionService </item> - <item> CompletiontqStatus </item> - <item> CompletiontqStatusHelper </item> + <item> CompletionStatus </item> + <item> CompletionStatusHelper </item> <item> Component </item> <item> ComponentAdapter </item> <item> ComponentColorModel </item> @@ -2542,7 +2542,7 @@ <item> RoleList </item> <item> RoleNotFoundException </item> <item> RoleResult </item> - <item> RoletqStatus </item> + <item> RoleStatus </item> <item> RoleUnresolved </item> <item> RoleUnresolvedList </item> <item> RootPaneContainer </item> @@ -2594,8 +2594,8 @@ <item> SSLContextSpi </item> <item> SSLEngine </item> <item> SSLEngineResult </item> - <item> SSLEngineResult.HandshaketqStatus </item> - <item> SSLEngineResult.tqStatus </item> + <item> SSLEngineResult.HandshakeStatus </item> + <item> SSLEngineResult.Status </item> <item> SSLException </item> <item> SSLHandshakeException </item> <item> SSLKeyException </item> @@ -3174,7 +3174,7 @@ <item> VirtualMachineError </item> <item> Visibility </item> <item> VisibilityHelper </item> - <item> VoicetqStatus </item> + <item> VoiceStatus </item> <item> Void </item> <item> VolatileImage </item> <item> WCharSeqHelper </item> @@ -3303,7 +3303,7 @@ <item> C14NMethodParameterSpec </item> <item> CanonicalizationMethod </item> <item> Characters </item> - <item> ClientInfotqStatus </item> + <item> ClientInfoStatus </item> <item> CollapsedStringAdapter </item> <item> CollatorProvider </item> <item> CommandInfo </item> 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 @@ <item>data</item> <item>defaultChecked</item> <item>defaultSelected</item> - <item>defaulttqStatus</item> + <item>defaultStatus</item> <item>defaultValue</item> <item>description</item> <item>disableExternalCapture</item> @@ -188,7 +188,7 @@ <item>exec</item> <item>fgColor</item> <item>filename</item> - <item>tqfind</item> + <item>find</item> <item>fixed</item> <item>focus</item> <item>fontcolor</item> @@ -305,7 +305,7 @@ <item>refresh</item> <item>releaseEvents</item> <item>reload</item> - <item>tqreplace</item> + <item>replace</item> <item>reset</item> <item>resizeBy</item> <item>resizeTo</item> 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 @@ </highlighting> </language> <!-- -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> Comparable </item> <item> Comparator </item> <item> Compiler </item> - <item> CompletiontqStatus </item> - <item> CompletiontqStatusHelper </item> + <item> CompletionStatus </item> + <item> CompletionStatusHelper </item> <item> Component </item> <item> ComponentAdapter </item> <item> ComponentColorModel </item> @@ -2647,7 +2647,7 @@ <item> VirtualMachineError </item> <item> Visibility </item> <item> VisibilityHelper </item> - <item> VoicetqStatus </item> + <item> VoiceStatus </item> <item> Void </item> <item> VolatileImage </item> <item> WCharSeqHelper </item> 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 @@ <Action name="edit_deselect" group="edit_select_merge" /> <Action name="set_verticalSelect" group="edit_select_merge" /> <Separator group="edit_select_merge" /> - <Action name="edit_tqfind" group="edit_tqfind_merge" /> - <Action name="edit_tqfind_next" group="edit_tqfind_merge" /> - <Action name="edit_tqfind_prev" group="edit_tqfind_merge" /> - <Separator group="edit_tqfind_merge" /> - <Action name="go_goto_line" group="edit_tqfind_merge"/> + <Action name="edit_find" group="edit_find_merge" /> + <Action name="edit_find_next" group="edit_find_merge" /> + <Action name="edit_find_prev" group="edit_find_merge" /> + <Separator group="edit_find_merge" /> + <Action name="go_goto_line" group="edit_find_merge"/> </Menu> <Menu name="view" noMerge="1"><text>&View</text> @@ -90,7 +90,7 @@ </Menu> <ToolBar name="mainToolBar" noMerge="1"><text>Main Toolbar</text> - <Action name="edit_tqfind" group="tqfind_operations" /> + <Action name="edit_find" group="find_operations" /> <Action name="incFontSizes" group="zoom_operations" /> <Action name="decFontSizes" group="zoom_operations" /> </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 @@ <Separator group="edit_select_merge" /> <Action name="set_insert" group="edit_select_merge" /> <Separator group="edit_select_merge" /> - <Action name="edit_tqfind" group="edit_tqfind_merge" /> - <Action name="edit_tqfind_next" group="edit_tqfind_merge" /> - <Action name="edit_tqfind_prev" group="edit_tqfind_merge" /> - <Action name="edit_tqreplace" group="edit_tqfind_merge" /> - <Separator group="edit_tqfind_merge" /> - <Action name="go_goto_line" group="edit_tqfind_merge"/> + <Action name="edit_find" group="edit_find_merge" /> + <Action name="edit_find_next" group="edit_find_merge" /> + <Action name="edit_find_prev" group="edit_find_merge" /> + <Action name="edit_replace" group="edit_find_merge" /> + <Separator group="edit_find_merge" /> + <Action name="go_goto_line" group="edit_find_merge"/> </Menu> <Menu name="view" noMerge="1"><text>&View</text> @@ -116,7 +116,7 @@ <Action name="edit_cut" group="edit_operations" /> <Action name="edit_copy" group="edit_operations" /> <Action name="edit_paste" group="edit_operations" /> - <Action name="edit_tqfind" group="tqfind_operations" /> + <Action name="edit_find" group="find_operations" /> <Action name="incFontSizes" group="zoom_operations" /> <Action name="decFontSizes" group="zoom_operations" /> </ToolBar> 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 > <!-- List item - tqcontains string used in <keyword> + contains string used in <keyword> --> <!ELEMENT item (#PCDATA)> 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 @@ <item>initials</item> <item>internationaliSDNNumber</item> <item>ipHostNumber</item> - <item>ipNettqmaskNumber</item> + <item>ipNetmaskNumber</item> <item>ipNetworkNumber</item> <item>ipProtocolNumber</item> <item>ipServicePort</item> @@ -112,7 +112,7 @@ <item>objectClass</item> <item>oncRpcNumber</item> <item>organizationName</item> - <item>organizationaltqStatus</item> + <item>organizationalStatus</item> <item>organizationalUnitName</item> <item>otherFacsimiletelephoneNumber</item> <item>otherMailbox</item> 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 @@ <!ENTITY markupwithtextargs "markup|bigger|bold|box|bracket|caps|(center|general|left|right)-align|circle|column|combine|concat|dir-column|dynamic|fill-line|finger|fontCaps|fontsize|fraction|halign|hbracket|hcenter-in|hcenter|hspace|huge|italic|justify|larger?|line|lower|magnify|medium|normal-size-(sub|super)|normal-text|normalsize|number|on-the-fly|override|pad-(around|markup|to-box|x)|page-ref|postscript|put-adjacent|raise|roman|rotate|sans|small(er)?|smallCaps|sub|super|teeny|text|tiny|translate(-scaled)?|transparent|typewriter|underline|upright|vcenter|whiteout|with-(color|dimensions|url)|wordwrap(-string)?|(markup|column-|justified-|override-|wordwrap-)lines"> <!ENTITY headervars "dedication|(sub){,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc"> <!ENTITY papervars "annotate-spacing|(print-)?first-page-number|print-page-number|paper-(width|height)|(top|bottom|left|right)-margin|line-width|(head|foot)-separation|page-top-space|ragged-(bottom|last-bottom|right)|page-count|between-system-(space|padding)|page-breaking-between-system-padding|horizontal-shift|(before|after|between)-title-space|printallheaders|indent|force-assignment|input-encoding|output-scale|blank(-after-score|-last)?-page-force|page-limit-inter-system-space(-factor)?|(systemSeparator|(even|odd)(Footer|Header)|(book|score|toc)Title|tocItem)Markup"> - <!ENTITY tqlayoutvars "system-count|indent"> + <!ENTITY layoutvars "system-count|indent"> <!ENTITY performer "Beam|Control_track|Drum_note|Dynamic|Key|Lyric|Note|Piano_pedal|Slur|Staff|Swallow|Tempo|Tie|Time_signature"> <!ENTITY translator "Note_swallow|Rest_swallow|Skip_event_swallow|Timing"> <!ENTITY engraver "Accidental|Ambitus|Arpeggio|Auto_beam|Axis_group|Balloon|Bar|Bar_number|Beam|Bend|Break_align|Breathing_sign|Chord_name|Chord_tremolo|Clef|Cluster_spanner|Collision|Completion_heads|Custos|Default_bar_line|Dot_column|Dots|Drum_notes|Dynamic|Engraver|Extender|Figured_bass|Figured_bass_position|Fingering|Font_size|Forbid_line_break|Fretboard|Glissando|Grace_beam|Grace|Grace_spacing|Grid_line_span|Grid_point|Grob_pq|Hara_kiri|Horizontal_bracket|Hyphen|Instrument_name|Instrument_switch|Key|Laissez_vibrer|Ledger_line|Ligature_bracket|Lyric|Mark|Measure_grouping|Melody|Mensural_ligature|Metronome_mark|Multi_measure_rest|New_fingering|Note_head_line|Note_heads|Note_name|Note_spacing|Ottava_spanner|Output_property|Page_turn|Paper_column|Parenthesis|Part_combine|Percent_repeat|Phrasing_slur|Piano_pedal_align|Piano_pedal|Pitch_squash|Pitched_trill|Repeat_acknowledge|Repeat_tie|Rest_collision|Rest|Rhythmic_column|Script_column|Script|Script_row|Separating_line_group|Slash_repeat|Slur|Spacing|Span_arpeggio|Span_bar|Spanner_break_forbid|Staff_collecting|Staff_symbol|Stanza_number_align|Stanza_number|Stem|String_number|Swallow|System_start_delimiter|Tab_harmonic|Tab_note_heads|Tab_staff_symbol|Text|Text_spanner|Tie|Time_signature|Translator|Trill_spanner|Tuplet|Tweak|Vaticana_ligature|Vertical_align|Vertically_spaced_contexts|Volta"> @@ -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 @@ <item> VaticanaVoice </item> <item> Voice </item> </list> - <list name="tqlayoutobjects"> + <list name="layoutobjects"> <item> Accidental </item> <item> AccidentalCautionary </item> <item> AccidentalPlacement </item> @@ -325,7 +325,7 @@ <item> repeatCommands </item> <item> restNumberThreshold </item> <item> scriptDefinitions </item> - <item> tqshapeNoteStyles </item> + <item> shapeNoteStyles </item> <item> shortInstrumentName </item> <item> shortVocalName </item> <item> skipBars </item> @@ -666,7 +666,7 @@ <RegExpr String="\\(lyric(mode|s)|addlyrics)&b;" context="lyricmode"/> <RegExpr String="\\lyricsto&b;" context="lyricsto"/> <RegExpr String="\\markup(lines)?&b;" attribute="Markup" context="markup"/> - <RegExpr String="\\(header|paper|tqlayout|midi|with)\b" context="section"/> + <RegExpr String="\\(header|paper|layout|midi|with)\b" context="section"/> <RegExpr String="\\(new|context|change)\b" attribute="Keyword" context="context"/> <RegExpr String="\\(un)?set\b" attribute="Keyword" context="set"/> <RegExpr String="\\(override(Property)?|revert)\b" attribute="Keyword" context="override"/> @@ -759,7 +759,7 @@ <Detect2Chars char="#" char1="{" attribute="Scheme Keyword" context="schemelily" beginRegion="schemelily"/> <keyword String="musicexpressions" attribute="Scheme Keyword"/> <keyword String="contexts" attribute="Context"/> - <keyword String="tqlayoutobjects" attribute="Layout Object"/> + <keyword String="layoutobjects" attribute="Layout Object"/> <RegExpr String="[-+]?(\d+(\.\d+)?|\.\d+)" attribute="Scheme Value"/> <RegExpr String="#(t|f|b[-+]?[01.]+|o[-+]?[0-7.]+|d[-+]?[0-9.]+|x[-+]?[0-9a-f.]+)" insensitive="true" attribute="Scheme Value"/> @@ -938,7 +938,7 @@ <IncludeRules context="basic"/> </context> - <!-- \paper, \tqlayout, \midi, \header, \with --> + <!-- \paper, \layout, \midi, \header, \with --> <context name="section" attribute="Keyword" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop"> <DetectChar char="{" attribute="Keyword" context="section2" beginRegion="section"/> @@ -954,9 +954,9 @@ <DetectChar char="}" attribute="Keyword" context="#pop" endRegion="section"/> <DetectChar char="{" attribute="Keyword" context="sectionrules" beginRegion="section"/> <keyword String="contexts" attribute="Context"/> - <keyword String="tqlayoutobjects" attribute="Layout Object"/> + <keyword String="layoutobjects" attribute="Layout Object"/> <keyword String="properties" attribute="Property"/> - <RegExpr String="\b(&headervars;|&papervars;|&tqlayoutvars;)\b" attribute="Variable"/> + <RegExpr String="\b(&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/> <RegExpr String="("?)\b(&engravers;)\b\1" attribute="Engraver"/> <IncludeRules context="default"/> </context> @@ -991,7 +991,7 @@ <DetectSpaces/> <keyword String="contexts" attribute="Context"/> <DetectChar char="."/> - <keyword String="tqlayoutobjects" attribute="Layout Object" context="#pop"/> + <keyword String="layoutobjects" attribute="Layout Object" context="#pop"/> <RegExpr String="[A-Za-z]+(?=\s*\.)" attribute="User Command"/> <RegExpr String="[A-Za-z]+" attribute="User Command" context="#pop"/> </context> @@ -1039,5 +1039,5 @@ </language> <!-- - // kate: space-indent on; indent-width 2; tqreplace-tabs on; dynamic-word-wrap off; + // kate: space-indent on; indent-width 2; replace-tabs on; dynamic-word-wrap off; --> diff --git a/kate/data/lpc.xml b/kate/data/lpc.xml index 611037b40..2b13ef7ff 100644 --- a/kate/data/lpc.xml +++ b/kate/data/lpc.xml @@ -26,7 +26,7 @@ License: Artistic <item> protected </item> <item> static </item> <item> public </item> - <item> notqmask </item> + <item> nomask </item> <item> varargs </item> <item> nosave </item> <item> virtual </item> @@ -162,5 +162,5 @@ License: Artistic </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> <!-- === End of file. === --> 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 @@ </list> <list name="basefunc"> <item> string.byte </item> <item> string.char </item> - <item> string.tqfind </item> <item> string.len </item> + <item> string.find </item> <item> string.len </item> <item> string.lower </item> <item> string.rep </item> <item> string.sub </item> <item> string.upper </item> - <item> string.format </item><item> string.gtqfind </item> + <item> string.format </item><item> string.gfind </item> <item> string.gsub </item> <item> table.concat </item> <item> table.getn </item> <item> table.sort </item> <item> table.insert </item> <item> table.remove </item> @@ -148,7 +148,7 @@ <item> strupper </item> <item> strchar </item> <item> strrep </item> <item> ascii </item> <item> strbyte </item> <item> format </item> - <item> strtqfind </item> <item> gsub </item> + <item> strfind </item> <item> gsub </item> <item> openfile </item> <item> closefile </item> <item> date </item> <item> clock </item> 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 @@ <item> subst </item> <item> patsubst </item> <item> strip </item> - <item> tqfindstring </item> + <item> findstring </item> <item> filter </item> <item> filter-out </item> <item> sort </item> 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 @@ <item> file_search </item> <item> file_type </item> <item> fillarray </item> - <item> tqfindde </item> - <item> tqfind_root </item> + <item> findde </item> + <item> find_root </item> <item> first </item> <item> fix </item> <item> flatten </item> @@ -1610,9 +1610,9 @@ <item> file_search_demo </item> <item> file_search_lisp </item> <item> file_search_maxima </item> - <item> tqfind_root_abs </item> - <item> tqfind_root_error </item> - <item> tqfind_root_rel </item> + <item> find_root_abs </item> + <item> find_root_error </item> + <item> find_root_rel </item> <item> flipflag </item> <item> float2bf </item> <item> fortindent </item> 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 <diggory.hardy@gmail.com> - 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 @@ <item> protected </item> <item> public </item> <item> redeclare </item> - <item> tqreplaceable </item> + <item> replaceable </item> <item> return </item> <item> then </item> <item> true </item> 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 @@ <item> voice </item> <item> grids </item> <item> music </item> - <item> headtqshapes </item> + <item> headshapes </item> <item> block </item> </list> 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., <item>lsl</item> <item>lss</item> <item>ltr</item> - <item>tqmaskmovdqu</item> - <item>tqmaskmovq</item> + <item>maskmovdqu</item> + <item>maskmovq</item> <item>maxpd</item> <item>maxps</item> <item>maxsd</item> @@ -885,4 +885,4 @@ with this program; if not, write to the Free Software Foundation, Inc., </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> Q_D </item> <item> Q_Q </item> <item> Q_DISABLE_COPY </item> - <item> TQ_INTERFACES </item> + <item> Q_INTERFACES </item> <item> Q_FLAGS </item> <item> Q_SCRIPTABLE </item> <item> Q_INVOKABLE </item> 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 @@ </comments> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> file_in_loadpath </item> <item> file_in_path </item> <item> filter </item> - <item> tqfind </item> - <item> tqfind_first_of_in_loadpath </item> + <item> find </item> + <item> find_first_of_in_loadpath </item> <item> finite </item> <item> fix </item> <item> floor </item> @@ -450,7 +450,7 @@ <item> real </item> <item> rehash </item> <item> rename </item> - <item> retqshape </item> + <item> reshape </item> <item> reverse </item> <item> rmdir </item> <item> rmfield </item> @@ -543,7 +543,7 @@ <item> fftn </item> <item> fftw_wisdom </item> <item> filter </item> - <item> tqfind </item> + <item> find </item> <item> fsolve </item> <item> fsolve_options </item> <item> gammainc </item> @@ -748,7 +748,7 @@ <item> fftshift </item> <item> figure </item> <item> fileparts </item> - <item> tqfindstr </item> + <item> findstr </item> <item> f_inv </item> <item> fir2sys </item> <item> flipdim </item> @@ -1079,7 +1079,7 @@ <item> strerror </item> <item> strjust </item> <item> strrep </item> - <item> struct_tqcontains </item> + <item> struct_contains </item> <item> struct_elements </item> <item> studentize </item> <item> sub2ind </item> @@ -1321,7 +1321,7 @@ <item> flog10 </item> <item> fprod </item> <item> freal </item> - <item> fretqshape </item> + <item> freshape </item> <item> fround </item> <item> fsin </item> <item> fsinh </item> @@ -1355,7 +1355,7 @@ <item> __grcla__ </item> <item> __grclf__ </item> <item> __grcmd__ </item> - <item> gretqshape </item> + <item> greshape </item> <item> __grexit__ </item> <item> __grfigure__ </item> <item> __grgetstat__ </item> @@ -1439,7 +1439,7 @@ <item> sinc_gsl </item> <item> spabs </item> <item> sparse </item> - <item> sptqfind </item> + <item> spfind </item> <item> spimag </item> <item> spinv </item> <item> splu </item> @@ -1642,7 +1642,7 @@ <item> filter2 </item> <item> filtfilt </item> <item> filtic </item> - <item> tqfindsym </item> + <item> findsym </item> <item> fir1 </item> <item> fir2 </item> <item> fixedpoint </item> @@ -1877,7 +1877,7 @@ <item> poly2ac </item> <item> poly2ar </item> <item> poly_2_ex </item> - <item> poly2tqmask </item> + <item> poly2mask </item> <item> poly2rc </item> <item> poly2sym </item> <item> poly2th </item> @@ -1988,7 +1988,7 @@ <item> str2double </item> <item> strcmpi </item> <item> stretchlim </item> - <item> strtqfind </item> + <item> strfind </item> <item> strmatch </item> <item> strncmp </item> <item> strncmpi </item> @@ -2216,4 +2216,4 @@ </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item>short</item> <item>sigaction</item> <item>sighandler</item> - <item>sigtqmask</item> + <item>sigmask</item> <item>signal</item> <item>size</item> <item>sizeRequest</item> 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 '<<HEREDELIMITER' as code, or at least ignore it, to eol. Requires the ability to pass the delimiter through a context level. - tqfind a here delimiter like '*END*' (Shell.pm). Requires that when a regex is + find a here delimiter like '*END*' (Shell.pm). Requires that when a regex is inserting a dynamic string, it escapes [*(){}$[] support for more regex extensions, such as (?>), (?{}), (?(cond)yes|no) @@ -356,22 +356,22 @@ <DetectChar attribute="Operator" context="string" char="'" beginRegion="String"/> <DetectChar attribute="Operator" context="Backticked" char="`" /> - <RegExpr attribute="Normal Text" context="tqfind_variable" String="(?:[$@]\S|%[\w{]|\*[^\d\*{\$@%=(])" lookAhead="true" /> + <RegExpr attribute="Normal Text" context="find_variable" String="(?:[$@]\S|%[\w{]|\*[^\d\*{\$@%=(])" lookAhead="true" /> <RegExpr attribute="Keyword" context="#stay" String="<[A-Z0-9_]+>" /> - <RegExpr attribute="Operator" context="tqfind_here_document" String="\s*<<(?=\w+|\s*["'])" beginRegion="HereDocument" /> + <RegExpr attribute="Operator" context="find_here_document" String="\s*<<(?=\w+|\s*["'])" beginRegion="HereDocument" /> <RegExpr attribute="Normal Text" context="#stay" String="\s*\}\s*/" endRegion="Block"/> <RegExpr attribute="Normal Text" context="#stay" String="\s*[)]\s*/" /> <RegExpr attribute="Function" context="sub_name_def" String="\w+::" /> <RegExpr attribute="Normal Text" context="#stay" String="\w+[=]" /> - <RegExpr attribute="Operator" context="tqfind_quoted" String="\bq(?=[qwx]?\s*[^\w\s])" /> - <RegExpr attribute="Operator" context="tqfind_subst" String="\bs(?=\s*[^\w\s\]})])" /> + <RegExpr attribute="Operator" context="find_quoted" String="\bq(?=[qwx]?\s*[^\w\s])" /> + <RegExpr attribute="Operator" context="find_subst" String="\bs(?=\s*[^\w\s\]})])" /> <RegExpr attribute="Operator" context="tr" String="\b(?:tr|y)\s*(?=[^\w\s\]})])" /> - <RegExpr attribute="Operator" context="tqfind_pattern" String="\b(?:m|qr)(?=\s*[^\w\s\]})])" /> + <RegExpr attribute="Operator" context="find_pattern" String="\b(?:m|qr)(?=\s*[^\w\s\]})])" /> <RegExpr attribute="Normal Text" context="#stay" String="[\w_]+\s*/" /> <RegExpr attribute="Normal Text" context="#stay" String="[<>"':]/" /> @@ -383,11 +383,11 @@ </context> <!-- ====== quoted construct central ===== --> - <context name="tqfind_quoted" attribute="Normal Text" lineEndContext="#stay" > + <context name="find_quoted" attribute="Normal Text" lineEndContext="#stay" > <!-- NOTE - qx'not interpolated regex' does not cover newline between "qr" and "'" --> <RegExpr attribute="Operator" context="string_6" String="x\s*(')" beginRegion="String" /> - <AnyChar attribute="Operator" context="tqfind_qqx" String="qx" /> - <DetectChar attribute="Operator" context="tqfind_qw" char="w" /> + <AnyChar attribute="Operator" context="find_qqx" String="qx" /> + <DetectChar attribute="Operator" context="find_qw" char="w" /> <DetectChar attribute="Operator" context="string_2" char="(" beginRegion="String" /> <DetectChar attribute="Operator" context="string_3" char="{" beginRegion="String" /> <DetectChar attribute="Operator" context="string_4" char="[" beginRegion="String" /> @@ -395,7 +395,7 @@ <RegExpr attribute="Operator" context="string_6" String="([^a-zA-Z0-9_\s[\]{}()])" beginRegion="String" /> <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- q[qwx] # == comment, look for the delim on the next line --> </context> - <context name="tqfind_qqx" attribute="Normal Text" lineEndContext="#stay" > + <context name="find_qqx" attribute="Normal Text" lineEndContext="#stay" > <DetectChar attribute="Operator" context="ip_string_2" char="(" beginRegion="String" /> <DetectChar attribute="Operator" context="ip_string_3" char="{" beginRegion="String" /> <DetectChar attribute="Operator" context="ip_string_4" char="[" beginRegion="String" /> @@ -403,7 +403,7 @@ <RegExpr attribute="Operator" context="ip_string_6" String="([^a-zA-Z0-9_\s[\]{}()])" beginRegion="String" /> <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- q[qwx] # == comment, look for the delim on the next line --> </context> - <context name="tqfind_qw" attribute="Normal Text" lineEndContext="#stay" > + <context name="find_qw" attribute="Normal Text" lineEndContext="#stay" > <DetectChar attribute="Operator" context="quote_word_paren" char="(" beginRegion="Wordlist" /> <DetectChar attribute="Operator" context="quote_word_brace" char="{" beginRegion="Wordlist" /> <DetectChar attribute="Operator" context="quote_word_bracket" char="[" beginRegion="Wordlist" /> @@ -416,7 +416,7 @@ <DetectIdentifier /> <RegExpr attribute="String Special Character" context="#stay" String="\\[UuLlEtnaefr]" /> <RegExpr attribute="String (interpolated)" context="#stay" String="\\." /> - <RegExpr attribute="Normal Text" context="tqfind_variable_unsafe" String="(?:[\$@]\S|%[\w{])" lookAhead="true" /> + <RegExpr attribute="Normal Text" context="find_variable_unsafe" String="(?:[\$@]\S|%[\w{])" lookAhead="true" /> </context> <context name="ip_string" attribute="String (interpolated)" lineEndContext="#stay"> <DetectChar attribute="Operator" context="#pop" char=""" endRegion="String"/> @@ -491,7 +491,7 @@ </context> <!-- ====== contexts for s/// ====== --> - <context name="tqfind_subst" attribute="Normal Text" lineEndContext="#stay" > + <context name="find_subst" attribute="Normal Text" lineEndContext="#stay" > <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- s # == comment, look for the delim on the next line --> <DetectChar attribute="Operator" context="subst_curlybrace_pattern" char="{" beginRegion="Pattern" /> <DetectChar attribute="Operator" context="subst_paren_pattern" char="(" beginRegion="Pattern" /> @@ -511,15 +511,15 @@ </context> <context name="subst_curlybrace_middle" attribute="Normal Text" lineEndContext="#stay" > <RegExpr attribute="Comment" context="#stay" String="#.*$" /> - <DetectChar attribute="Operator" context="subst_curlybrace_tqreplace" char="{" beginRegion="Replacement" /> + <DetectChar attribute="Operator" context="subst_curlybrace_replace" char="{" beginRegion="Replacement" /> </context> - <context name="subst_curlybrace_tqreplace" attribute="String (interpolated)" lineEndContext="#stay"> + <context name="subst_curlybrace_replace" attribute="String (interpolated)" lineEndContext="#stay"> <IncludeRules context="ipstring_internal" /> - <DetectChar attribute="Normal Text" context="subst_curlybrace_tqreplace_recursive" char="{" beginRegion="Block" /> + <DetectChar attribute="Normal Text" context="subst_curlybrace_replace_recursive" char="{" beginRegion="Block" /> <RegExpr attribute="Operator" context="#pop#pop#pop#pop" String="\}[cegimosx]*" endRegion="Replacement" /> </context> - <context name="subst_curlybrace_tqreplace_recursive" attribute="String (interpolated)" lineEndContext="#stay" > - <DetectChar attribute="String (interpolated)" context="subst_curlybrace_tqreplace_recursive" char="{" beginRegion="Block" /> + <context name="subst_curlybrace_replace_recursive" attribute="String (interpolated)" lineEndContext="#stay" > + <DetectChar attribute="String (interpolated)" context="subst_curlybrace_replace_recursive" char="{" beginRegion="Block" /> <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="Block" /> <IncludeRules context="ipstring_internal" /> </context> @@ -527,9 +527,9 @@ <context name="subst_paren_pattern" attribute="Pattern" lineEndContext="#stay"> <RegExpr attribute="Comment" context="#stay" String="\s+#.*$" /> <IncludeRules context="regex_pattern_internal_ip" /> - <DetectChar attribute="Operator" context="subst_paren_tqreplace" char="}" endRegion="Pattern" /> + <DetectChar attribute="Operator" context="subst_paren_replace" char="}" endRegion="Pattern" /> </context> - <context name="subst_paren_tqreplace" attribute="String (interpolated)" lineEndContext="#stay"> + <context name="subst_paren_replace" attribute="String (interpolated)" lineEndContext="#stay"> <IncludeRules context="ipstring_internal" /> <DetectChar attribute="Operator" context="#stay" char="(" beginRegion="Replacement" /> <RegExpr attribute="Operator" context="#pop#pop#pop" String="\)[cegimosx]*" endRegion="Replacement" /> @@ -538,9 +538,9 @@ <context name="subst_bracket_pattern" attribute="Pattern" lineEndContext="#stay"> <RegExpr attribute="Comment" context="#stay" String="\s+#.*$" /> <IncludeRules context="regex_pattern_internal_ip" /> - <DetectChar attribute="Operator" context="subst_bracket_tqreplace" char="]" endRegion="Pattern" /> + <DetectChar attribute="Operator" context="subst_bracket_replace" char="]" endRegion="Pattern" /> </context> - <context name="subst_bracket_tqreplace" attribute="String (interpolated)" lineEndContext="#stay"> + <context name="subst_bracket_replace" attribute="String (interpolated)" lineEndContext="#stay"> <IncludeRules context="ipstring_internal" /> <DetectChar attribute="Operator" context="#stay" char="[" beginRegion="Replacement" /> <RegExpr attribute="Operator" context="#pop#pop#pop" String="\][cegimosx]*" endRegion="Replacement" /> @@ -548,10 +548,10 @@ <context name="subst_slash_pattern" attribute="Pattern" lineEndContext="#stay" dynamic="true"> <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\$(?=%1)" dynamic="true" /> - <RegExpr attribute="Operator" context="subst_slash_tqreplace" String="(%1)" dynamic="true" endRegion="Pattern" beginRegion="Replacement" /> + <RegExpr attribute="Operator" context="subst_slash_replace" String="(%1)" dynamic="true" endRegion="Pattern" beginRegion="Replacement" /> <IncludeRules context="regex_pattern_internal_ip" /> </context> - <context name="subst_slash_tqreplace" attribute="String (interpolated)" lineEndContext="#stay" dynamic="true"> + <context name="subst_slash_replace" attribute="String (interpolated)" lineEndContext="#stay" dynamic="true"> <RegExpr attribute="Operator" context="#pop#pop#pop" String="%1[cegimosx]*" dynamic="true" endRegion="Replacement" /> <IncludeRules context="ipstring_internal" /> @@ -560,9 +560,9 @@ <context name="subst_sq_pattern" attribute="Pattern" lineEndContext="#stay"> <RegExpr attribute="Comment" context="#stay" String="\s+#.*$" /> <IncludeRules context="regex_pattern_internal" /> - <DetectChar attribute="Operator" context="subst_sq_tqreplace" char="'" endRegion="Pattern" beginRegion="Pattern" /> + <DetectChar attribute="Operator" context="subst_sq_replace" char="'" endRegion="Pattern" beginRegion="Pattern" /> </context> - <context name="subst_sq_tqreplace" attribute="String" lineEndContext="#stay"> + <context name="subst_sq_replace" attribute="String" lineEndContext="#stay"> <RegExpr attribute="Operator" context="#pop#pop#pop" String="'[cegimosx]*" endRegion="Replacement" /> </context> @@ -574,7 +574,7 @@ </context> <!-- ====== PATTERNs ====== --> - <context name="tqfind_pattern" attribute="Pattern" lineEndContext="#stay"> + <context name="find_pattern" attribute="Pattern" lineEndContext="#stay"> <RegExpr attribute="Comment" context="#stay" String="\s+#.*" /><!-- s # == comment, look for the delim on the next line --> <DetectChar attribute="Operator" context="pattern_brace" char="{" beginRegion="Pattern" /> <DetectChar attribute="Operator" context="pattern_paren" char="(" beginRegion="Pattern" /> @@ -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. --> - <RegExpr attribute="Data Type" context="tqfind_variable_unsafe" String="[$@][^]\s{}()|>']" lookAhead="true" /> + <RegExpr attribute="Data Type" context="find_variable_unsafe" String="[$@][^]\s{}()|>']" lookAhead="true" /> <IncludeRules context="regex_pattern_internal_rules_2" /> </context> <context name="pat_ext" attribute="Pattern Internal Operator" lineEndContext="#stay"> @@ -654,7 +654,7 @@ </context> <!-- ====== Variables ====== --> - <context name="tqfind_variable" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" > + <context name="find_variable" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" > <RegExpr attribute="Special Variable" context="var_detect" String="\$[0-9]+" /> <RegExpr attribute="Special Variable" context="var_detect" String="[@\$](?:[\+\-_]\B|ARGV\b|INC\b)" /> <RegExpr attribute="Special Variable" context="var_detect" String="[%\$](?:INC\b|ENV\b|SIG\b)" /> @@ -670,7 +670,7 @@ <AnyChar attribute="Operator" context="#pop" String="$@%*" /> </context> <!-- This does not check fo a trailing slash, for usage in strings. --> - <context name="tqfind_variable_unsafe" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" > + <context name="find_variable_unsafe" attribute="Data Type" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" > <RegExpr attribute="Special Variable" context="var_detect_unsafe" String="\$[0-9]+" /> <RegExpr attribute="Special Variable" context="var_detect_unsafe" String="[@\$](?:[\+\-_]\B|ARGV\b|INC\b)" /> <RegExpr attribute="Special Variable" context="var_detect_unsafe" String="[%\$](?:INC\b|ENV\b|SIG\b)" /> @@ -728,7 +728,7 @@ </context> <!-- ====== Here Documents ====== --> - <context name="tqfind_here_document" attribute="Normal Text" lineEndContext="#pop" > + <context name="find_here_document" attribute="Normal Text" lineEndContext="#pop" > <RegExpr attribute="Keyword" context="here_document" String="(\w+)\s*;?" /> <RegExpr attribute="Keyword" context="here_document" String="\s*"([^"]+)"\s*;?" /> <RegExpr attribute="Keyword" context="here_document" String="\s*`([^`]+)`\s*;?" /> @@ -774,7 +774,7 @@ <context name="sub_name_def" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop"> <RegExpr attribute="Function" context="#stay" String="\w+" /> - <RegExpr attribute="Normal Text" context="tqfind_variable" String="\$\S" lookAhead="true" /> + <RegExpr attribute="Normal Text" context="find_variable" String="\$\S" lookAhead="true" /> <RegExpr attribute="Normal Text" context="sub_arg_definition" String="\s*\(" /> <Detect2Chars attribute="Normal Text" context="#stay" char=":" char1=":" /> </context> @@ -830,4 +830,4 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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: <item> dba_open </item> <item> dba_optimize </item> <item> dba_popen </item> - <item> dba_tqreplace </item> + <item> dba_replace </item> <item> dba_sync </item> <item> dbase_add_record </item> <item> dbase_close </item> @@ -3736,7 +3736,7 @@ Changes: <item> dbase_numrecords </item> <item> dbase_open </item> <item> dbase_pack </item> - <item> dbase_tqreplace_record </item> + <item> dbase_replace_record </item> <item> dblist </item> <item> dbmclose </item> <item> dbmdelete </item> @@ -3746,7 +3746,7 @@ Changes: <item> dbminsert </item> <item> dbmnextkey </item> <item> dbmopen </item> - <item> dbmtqreplace </item> + <item> dbmreplace </item> <item> dbplus_add </item> <item> dbplus_aql </item> <item> dbplus_chdir </item> @@ -3754,7 +3754,7 @@ Changes: <item> dbplus_curr </item> <item> dbplus_errcode </item> <item> dbplus_errno </item> - <item> dbplus_tqfind </item> + <item> dbplus_find </item> <item> dbplus_first </item> <item> dbplus_flush </item> <item> dbplus_freealllocks </item> @@ -3865,9 +3865,9 @@ Changes: <item> empty </item> <item> end </item> <item> ereg </item> - <item> ereg_tqreplace </item> + <item> ereg_replace </item> <item> eregi </item> - <item> eregi_tqreplace </item> + <item> eregi_replace </item> <item> error_log </item> <item> error_reporting </item> <item> escapeshellarg </item> @@ -4618,7 +4618,7 @@ Changes: <item> ldap_list </item> <item> ldap_mod_add </item> <item> ldap_mod_del </item> - <item> ldap_mod_tqreplace </item> + <item> ldap_mod_replace </item> <item> ldap_modify </item> <item> ldap_next_attribute </item> <item> ldap_next_entry </item> @@ -4676,7 +4676,7 @@ Changes: <item> mb_encode_numericentity </item> <item> mb_ereg </item> <item> mb_ereg_match </item> - <item> mb_ereg_tqreplace </item> + <item> mb_ereg_replace </item> <item> mb_ereg_search </item> <item> mb_ereg_search_getpos </item> <item> mb_ereg_search_getregs </item> @@ -4685,7 +4685,7 @@ Changes: <item> mb_ereg_search_regs </item> <item> mb_ereg_search_setpos </item> <item> mb_eregi </item> - <item> mb_eregi_tqreplace </item> + <item> mb_eregi_replace </item> <item> mb_get_info </item> <item> mb_http_input </item> <item> mb_http_output </item> @@ -4815,7 +4815,7 @@ Changes: <item> msession_create </item> <item> msession_destroy </item> <item> msession_disconnect </item> - <item> msession_tqfind </item> + <item> msession_find </item> <item> msession_get </item> <item> msession_get_array </item> <item> msession_getdata </item> @@ -5146,7 +5146,7 @@ Changes: <item> ncurses_meta </item> <item> ncurses_mouse_trafo </item> <item> ncurses_mouseinterval </item> - <item> ncurses_mousetqmask </item> + <item> ncurses_mousemask </item> <item> ncurses_move </item> <item> ncurses_move_panel </item> <item> ncurses_mvaddch </item> @@ -5181,7 +5181,7 @@ Changes: <item> ncurses_qiflush </item> <item> ncurses_raw </item> <item> ncurses_refresh </item> - <item> ncurses_tqreplace_panel </item> + <item> ncurses_replace_panel </item> <item> ncurses_reset_prog_mode </item> <item> ncurses_reset_shell_mode </item> <item> ncurses_resetty </item> @@ -5247,7 +5247,7 @@ Changes: <item> notes_create_db </item> <item> notes_create_note </item> <item> notes_drop_db </item> - <item> notes_tqfind_note </item> + <item> notes_find_note </item> <item> notes_header_info </item> <item> notes_list_msgs </item> <item> notes_mark_read </item> @@ -5502,7 +5502,7 @@ Changes: <item> pdf_endpath </item> <item> pdf_fill </item> <item> pdf_fill_stroke </item> - <item> pdf_tqfindfont </item> + <item> pdf_findfont </item> <item> pdf_get_buffer </item> <item> pdf_get_font </item> <item> pdf_get_fontname </item> @@ -5737,8 +5737,8 @@ Changes: <item> preg_match </item> <item> preg_match_all </item> <item> preg_quote </item> - <item> preg_tqreplace </item> - <item> preg_tqreplace_callback </item> + <item> preg_replace </item> + <item> preg_replace_callback </item> <item> preg_split </item> <item> prev </item> <item> print </item> @@ -5795,7 +5795,7 @@ Changes: <item> pspell_new_config </item> <item> pspell_new_personal </item> <item> pspell_save_wordlist </item> - <item> pspell_store_tqreplacement </item> + <item> pspell_store_replacement </item> <item> pspell_suggest </item> <item> putenv </item> <item> qdom_error </item> @@ -6026,10 +6026,10 @@ Changes: <item> srand </item> <item> sscanf </item> <item> stat </item> - <item> str_itqreplace </item> + <item> str_ireplace </item> <item> str_pad </item> <item> str_repeat </item> - <item> str_tqreplace </item> + <item> str_replace </item> <item> str_rot13 </item> <item> str_shuffle </item> <item> str_split </item> @@ -6097,7 +6097,7 @@ Changes: <item> substr </item> <item> substr_compare </item> <item> substr_count </item> - <item> substr_tqreplace </item> + <item> substr_replace </item> <item> swf_actiongeturl </item> <item> swf_actiongotoframe </item> <item> swf_actiongotolabel </item> @@ -6119,7 +6119,7 @@ Changes: <item> swf_definetext </item> <item> swf_endbutton </item> <item> swf_enddoaction </item> - <item> swf_endtqshape </item> + <item> swf_endshape </item> <item> swf_endsymbol </item> <item> swf_fontsize </item> <item> swf_fontslant </item> @@ -6147,20 +6147,20 @@ Changes: <item> swf_scale </item> <item> swf_setfont </item> <item> swf_setframe </item> - <item> swf_tqshapearc </item> - <item> swf_tqshapecurveto </item> - <item> swf_tqshapecurveto3 </item> - <item> swf_tqshapefillbitmapclip </item> - <item> swf_tqshapefillbitmaptile </item> - <item> swf_tqshapefilloff </item> - <item> swf_tqshapefillsolid </item> - <item> swf_tqshapelinesolid </item> - <item> swf_tqshapelineto </item> - <item> swf_tqshapemoveto </item> + <item> swf_shapearc </item> + <item> swf_shapecurveto </item> + <item> swf_shapecurveto3 </item> + <item> swf_shapefillbitmapclip </item> + <item> swf_shapefillbitmaptile </item> + <item> swf_shapefilloff </item> + <item> swf_shapefillsolid </item> + <item> swf_shapelinesolid </item> + <item> swf_shapelineto </item> + <item> swf_shapemoveto </item> <item> swf_showframe </item> <item> swf_startbutton </item> <item> swf_startdoaction </item> - <item> swf_starttqshape </item> + <item> swf_startshape </item> <item> swf_startsymbol </item> <item> swf_textwidth </item> <item> swf_translate </item> @@ -6171,7 +6171,7 @@ Changes: <item> swfbitmap.getwidth </item> <item> swfbutton </item> <item> swfbutton.addaction </item> - <item> swfbutton.addtqshape </item> + <item> swfbutton.addshape </item> <item> swfbutton.setaction </item> <item> swfbutton.setdown </item> <item> swfbutton.sethit </item> @@ -6206,8 +6206,8 @@ Changes: <item> swfgradient </item> <item> swfgradient.addentry </item> <item> swfmorph </item> - <item> swfmorph.gettqshape1 </item> - <item> swfmorph.gettqshape2 </item> + <item> swfmorph.getshape1 </item> + <item> swfmorph.getshape2 </item> <item> swfmovie </item> <item> swfmovie.add </item> <item> swfmovie.nextframe </item> @@ -6219,17 +6219,17 @@ Changes: <item> swfmovie.setframes </item> <item> swfmovie.setrate </item> <item> swfmovie.streammp3 </item> - <item> swftqshape </item> - <item> swftqshape.addfill </item> - <item> swftqshape.drawcurve </item> - <item> swftqshape.drawcurveto </item> - <item> swftqshape.drawline </item> - <item> swftqshape.drawlineto </item> - <item> swftqshape.movepen </item> - <item> swftqshape.movepento </item> - <item> swftqshape.setleftfill </item> - <item> swftqshape.setline </item> - <item> swftqshape.setrightfill </item> + <item> swfshape </item> + <item> swfshape.addfill </item> + <item> swfshape.drawcurve </item> + <item> swfshape.drawcurveto </item> + <item> swfshape.drawline </item> + <item> swfshape.drawlineto </item> + <item> swfshape.movepen </item> + <item> swfshape.movepento </item> + <item> swfshape.setleftfill </item> + <item> swfshape.setline </item> + <item> swfshape.setrightfill </item> <item> swfsprite </item> <item> swfsprite.add </item> <item> swfsprite.nextframe </item> @@ -6307,7 +6307,7 @@ Changes: <item> udm_crc32 </item> <item> udm_errno </item> <item> udm_error </item> - <item> udm_tqfind </item> + <item> udm_find </item> <item> udm_free_agent </item> <item> udm_free_ispell_data </item> <item> udm_free_res </item> 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 @@ <item> exit </item> <item> file </item> <item> fill </item> - <item> tqfindfont </item> + <item> findfont </item> <item> flattenpath </item> <item> floor </item> <item> flush </item> @@ -90,7 +90,7 @@ <item> if </item> <item> ifelse </item> <item> image </item> - <item> imagetqmask </item> + <item> imagemask </item> <item> index </item> <item> ineofill </item> <item> infill </item> @@ -221,7 +221,7 @@ <item> currentglobal </item> <item> execform </item> <item> filter </item> - <item> tqfindresource </item> + <item> findresource </item> <item> globaldict </item> <item> makepattern </item> <item> setcolor </item> @@ -353,7 +353,7 @@ <item> currentsystemparams </item> <item> currentuserparams </item> <item> defineresource </item> - <item> tqfindencoding </item> + <item> findencoding </item> <item> gcheck </item> <item> glyphshow </item> <item> languagelevel </item> 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 @@ <item> db_btrees </item> <item> db_chains </item> <item> fail </item> - <item> tqfindall </item> + <item> findall </item> <item> format </item> <item> free </item> <item> msgrecv </item> @@ -109,7 +109,7 @@ <item> retractall </item> <item> save </item> <item> term_bin </item> - <item> term_tqreplace </item> + <item> term_replace </item> <item> term_str </item> <item> trap </item> <item> write </item> 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 @@ <item> CatchSprite </item> <item> CDAudioLength </item> <item> CDAudioName </item> - <item> CDAudiotqStatus </item> + <item> CDAudioStatus </item> <item> CDAudioTrackLength </item> <item> CDAudioTrackSeconds </item> <item> CDAudioTracks </item> @@ -522,7 +522,7 @@ <item> MovieInfo </item> <item> MovieLength </item> <item> MovieSeek </item> - <item> MovietqStatus </item> + <item> MovieStatus </item> <item> MovieWidth </item> <item> NetworkClientEvent </item> <item> NetworkClientID </item> @@ -915,4 +915,4 @@ </comments> </general> </language> -<!-- // kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- // kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> tuple </item> <item> type </item> <item> unichr </item> - <item> tqunicode </item> + <item> unicode </item> <item> vars </item> <item> xrange </item> <item> zip </item> @@ -152,7 +152,7 @@ <item>__rcmp__</item> <item>__hash__</item> <item>__nonzero__</item> - <item>__tqunicode__</item> + <item>__unicode__</item> </list> <list name="exceptions"> <item>ArithmeticError</item> 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 @@ <context attribute="Headline" lineEndContext="#pop" name="Headline"/> <context attribute="Comment" lineEndContext="#pop" name="Comment"/> - <!-- This context is not really used, but tqcontains the common rules --> + <!-- This context is not really used, but contains the common rules --> <context name="CommonRules" lineEndContext="#stay" attribute="Normal Text" > <DetectChar attribute="String" context="string" char="""/> <DetectChar attribute="String" context="string2" char="'"/> 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 @@ <item>redim</item> <item>rem</item> <item>rename</item> - <item>tqreplace$</item> - <item>tqreplacesubstr$</item> + <item>replace$</item> + <item>replacesubstr$</item> <item>resource</item> <item>resourcecount</item> <item>restore</item> @@ -140,7 +140,7 @@ <item>for</item> <item>next</item> <item>with</item> - <item>tqmask</item> + <item>mask</item> <item>and</item> <item>or</item> <item>constructor</item> @@ -270,7 +270,7 @@ <item>borderstyle</item> <item>wordwrap</item> <item>align</item> - <item>tqalignment</item> + <item>alignment</item> <item>font</item> <item>visible</item> <item>enabled</item> @@ -324,7 +324,7 @@ <item>clear</item> <item>underline</item> <item>maxlength</item> - <item>inputtqmask</item> + <item>inputmask</item> <item>forecolor</item> <item></item> <item>backcolor</item> 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. --> - <RegExpr attribute="Operator" context="tqfind_indented_heredoc" String="\s*<<-(?=\w+|["'])" beginRegion="HereDocument" /> - <RegExpr attribute="Operator" context="tqfind_heredoc" String="\s*<<(?=\w+|["'])" beginRegion="HereDocument" /> + <RegExpr attribute="Operator" context="find_indented_heredoc" String="\s*<<-(?=\w+|["'])" beginRegion="HereDocument" /> + <RegExpr attribute="Operator" context="find_heredoc" String="\s*<<(?=\w+|["'])" beginRegion="HereDocument" /> <DetectChar attribute="Operator" char="." context="#stay"/> <Detect2Chars attribute="Operator" char="&" char1="&" context="#stay"/> @@ -648,7 +648,7 @@ <!-- recognize the beginning of a general delimited input format --> <!-- this moves to the next context to separate out the exact nature of the GDL input --> - <RegExpr attribute="GDL input" context="tqfind_gdl_input" String="\s*[%](?=[Qqxw]?[^\s>])" beginRegion="GdlInput" /> + <RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[Qqxw]?[^\s>])" beginRegion="GdlInput" /> </context> <context name="Line Continue" attribute="Ruby Normal Text" lineEndContext="#pop"> @@ -741,11 +741,11 @@ The contexts below support both normal and indented heredocs --> <!-- here we markup the heredoc markers --> - <context name="tqfind_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" > + <context name="find_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" > <RegExpr attribute="Keyword" context="apostrophed_normal_heredoc" String="'(\w+)'" /> <RegExpr attribute="Keyword" context="normal_heredoc" String=""?(\w+)"?" /> </context> - <context name="tqfind_indented_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" > + <context name="find_indented_heredoc" attribute="Ruby Normal Text" lineEndContext="#pop" > <RegExpr attribute="Keyword" context="apostrophed_indented_heredoc" String="'(\w+)'" /> <RegExpr attribute="Keyword" context="indented_heredoc" String=""?(\w+)"?" /> </context> @@ -779,7 +779,7 @@ <!-- General delimited input support The contexts below handle the various gdl formats --> - <context name="tqfind_gdl_input" attribute="Ruby Normal Text" lineEndContext="#pop"> + <context name="find_gdl_input" attribute="Ruby Normal Text" lineEndContext="#pop"> <!-- handle token arrays --> <RegExpr attribute="GDL input" context="gdl_token_array_1" String="w\(" /> 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. --> - <RegExpr attribute="Operator" context="tqfind_indented_heredoc" String="\s*<<-(?=\w+|["'])" beginRegion="HereDocument" /> - <RegExpr attribute="Operator" context="tqfind_heredoc" String="\s*<<(?=\w+|["'])" beginRegion="HereDocument" /> + <RegExpr attribute="Operator" context="find_indented_heredoc" String="\s*<<-(?=\w+|["'])" beginRegion="HereDocument" /> + <RegExpr attribute="Operator" context="find_heredoc" String="\s*<<(?=\w+|["'])" beginRegion="HereDocument" /> <DetectChar attribute="Operator" char="." context="#stay"/> <Detect2Chars attribute="Operator" char="&" char1="&" context="#stay"/> @@ -302,7 +302,7 @@ <!-- recognize the beginning of a general delimited input format --> <!-- this moves to the next context to separate out the exact nature of the GDL input --> - <RegExpr attribute="GDL input" context="tqfind_gdl_input" String="\s*[%](?=[Qqxw]?[^\s])" beginRegion="GdlInput" /> + <RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[Qqxw]?[^\s])" beginRegion="GdlInput" /> <DetectChar attribute="Normal Text" char=")" context="check_div_1"/> <DetectIdentifier attribute="Normal Text" context="check_div_2"/> @@ -438,11 +438,11 @@ The contexts below support both normal and indented heredocs --> <!-- here we markup the heredoc markers --> - <context name="tqfind_heredoc" attribute="Normal Text" lineEndContext="#pop" > + <context name="find_heredoc" attribute="Normal Text" lineEndContext="#pop" > <RegExpr attribute="Keyword" context="apostrophed_normal_heredoc" String="'(\w+)'" /> <RegExpr attribute="Keyword" context="normal_heredoc" String=""?(\w+)"?" /> </context> - <context name="tqfind_indented_heredoc" attribute="Normal Text" lineEndContext="#pop" > + <context name="find_indented_heredoc" attribute="Normal Text" lineEndContext="#pop" > <RegExpr attribute="Keyword" context="apostrophed_indented_heredoc" String="'(\w+)'" /> <RegExpr attribute="Keyword" context="indented_heredoc" String=""?(\w+)"?" /> </context> @@ -476,7 +476,7 @@ <!-- General delimited input support The contexts below handle the various gdl formats --> - <context name="tqfind_gdl_input" attribute="Normal Text" lineEndContext="#pop"> + <context name="find_gdl_input" attribute="Normal Text" lineEndContext="#pop"> <!-- handle token arrays --> <RegExpr attribute="GDL input" context="gdl_token_array_1" String="w\(" /> 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) <item> CompilationMXBean </item> <item> Compiler </item> <item> CompletionService </item> - <item> CompletiontqStatus </item> - <item> CompletiontqStatusHelper </item> + <item> CompletionStatus </item> + <item> CompletionStatusHelper </item> <item> Component </item> <item> ComponentAdapter </item> <item> ComponentColorModel </item> @@ -2613,7 +2613,7 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br) <item> RoleList </item> <item> RoleNotFoundException </item> <item> RoleResult </item> - <item> RoletqStatus </item> + <item> RoleStatus </item> <item> RoleUnresolved </item> <item> RoleUnresolvedList </item> <item> RootPaneContainer </item> @@ -2665,8 +2665,8 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br) <item> SSLContextSpi </item> <item> SSLEngine </item> <item> SSLEngineResult </item> - <item> SSLEngineResult.HandshaketqStatus </item> - <item> SSLEngineResult.tqStatus </item> + <item> SSLEngineResult.HandshakeStatus </item> + <item> SSLEngineResult.Status </item> <item> SSLException </item> <item> SSLHandshakeException </item> <item> SSLKeyException </item> @@ -3245,7 +3245,7 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br) <item> VirtualMachineError </item> <item> Visibility </item> <item> VisibilityHelper </item> - <item> VoicetqStatus </item> + <item> VoiceStatus </item> <item> Void </item> <item> VolatileImage </item> <item> WCharSeqHelper </item> 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 @@ <item> floor </item> <item> fix </item> <item> fit_dat </item> - <item> tqfind_path </item> - <item> tqfindobj </item> - <item> tqfindm </item> - <item> tqfind_freq </item> - <item> tqfind </item> + <item> find_path </item> + <item> findobj </item> + <item> findm </item> + <item> find_freq </item> + <item> find </item> <item> filter </item> <item> fileinfo </item> <item> file </item> 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 @@ <!DOCTYPE language SYSTEM "language.dtd"> <!-- Oracle10g SQL and PL/SQL syntax - ANSI SQL 2003 superset --> <!-- This file is maintained by Anders Lund <anders@alweb.dk> since 2005-11-06 --> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> <language name="SQL" version="1.13" kateversion="2.4" section="Database" extensions="*.sql;*.SQL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL"> <highlighting> <list name="keywords"> 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 @@ <item> pkcross </item> <item> pkequiv </item> <item> pkexamine </item> - <item> pktqshape </item> + <item> pkshape </item> <item> pksumm </item> <item> plot </item> <item> poisson </item> @@ -275,8 +275,8 @@ <item> reg </item> <item> regress </item> <item> rename </item> - <item> tqreplace </item> - <item> retqshape </item> + <item> replace </item> + <item> reshape </item> <item> restore </item> <item> return </item> <item> roc </item> @@ -475,4 +475,4 @@ <keywords casesensitive="1" /> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> <!-- - You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php + You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php This is a template for 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). @@ -11,7 +11,7 @@ Look at language.dtd for some documentation of the allowed elements and their attributes. There is also a description of how to validate your syntax file. - You'll tqfind the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php + You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php --> <language name="" section="" version="1.00" kateversion="2.3" extensions="" mimetype="" author="" license=""> <highlighting> @@ -24,5 +24,5 @@ </highlighting> </language> <!-- -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ <item> load </item> <item> lower </item> <item> lrange </item> - <item> ltqreplace </item> + <item> lreplace </item> <item> lsearch </item> <item> lsort </item> <item> menu </item> @@ -267,7 +267,7 @@ <item> remove </item> <item> rename </item> <item> repeat </item> - <item> tqreplace </item> + <item> replace </item> <item> require </item> <item> rootname </item> <item> scan </item> @@ -344,7 +344,7 @@ <item> entrycget </item> <item> entryconfigure </item> <item> families </item> - <item> tqfind </item> + <item> find </item> <item> flash </item> <item> focus </item> <item> focusmodel </item> @@ -352,7 +352,7 @@ <item> fraction </item> <item> frame </item> <item> generate </item> - <item> tqgeometry </item> + <item> geometry </item> <item> get </item> <item> gettags </item> <item> grid </item> @@ -362,7 +362,7 @@ <item> hide </item> <item> iconbitmap </item> <item> iconify </item> - <item> icontqmask </item> + <item> iconmask </item> <item> iconname </item> <item> iconposition </item> <item> iconwindow </item> 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 @@ </itemDatas> </highlighting> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 <RegExpr> by <IncludeEntities>, this is a kate 2.1 workaround ! + Do not replace the <RegExpr> by <IncludeEntities>, 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 @@ <item> current </item> <item> boolean </item> <item> number </item> - <item> tqcontains </item> + <item> contains </item> <item> name </item> <item> last </item> <item> unparsed-entity-uri </item> @@ -149,7 +149,7 @@ <list name="functions_2.0"> <item> zero-or-one </item> - <item> tqreplace </item> + <item> replace </item> <item> namespace-uri-for-prefix </item> <item> current-grouping-key </item> <item> seconds-from-duration </item> @@ -237,7 +237,7 @@ <item> year-from-dateTime </item> <item> upper-case </item> <item> root </item> - <item> normalize-tqunicode </item> + <item> normalize-unicode </item> <item> empty </item> <item> insert-before </item> <item> document-uri </item> 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 @@ <item>data</item> <item>defaultChecked</item> <item>defaultSelected</item> - <item>defaulttqStatus</item> + <item>defaultStatus</item> <item>defaultValue</item> <item>description</item> <item>disableExternalCapture</item> @@ -190,7 +190,7 @@ <item>exec</item> <item>fgColor</item> <item>filename</item> - <item>tqfind</item> + <item>find</item> <item>fixed</item> <item>focus</item> <item>fontcolor</item> @@ -307,7 +307,7 @@ <item>refresh</item> <item>releaseEvents</item> <item>reload</item> - <item>tqreplace</item> + <item>replace</item> <item>reset</item> <item>resizeBy</item> <item>resizeTo</item> 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 @@ <keywords casesensitive="1" weakDeliminator="=`"/> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> 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 @@ </comments> </general> </language> -<!-- 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/.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<KateSuperRangeList*>(obj)); + int id=m_docHLs.findRef(static_cast<KateSuperRangeList*>(obj)); if (id>=0) m_docHLs.take(id); for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it) @@ -152,11 +152,11 @@ KateView* KateArbitraryHighlight::viewForRange(KateSuperRange* range) { for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::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; z<modes.size(); ++z) - popupMenu()->insertItem ( '&' + 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; i<items.count(); i++) { TQString name = items.at(i)->name; - 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: <elem attr="..." blah="..." /> @@ -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, // <a> // </a> <!-- indentation *already* decreased --> // requires that we discount the </a> 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"<<endl; return; @@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &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 <bastian@kde.org> @@ -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 <bastian@kde.org> * @author Christoph Cullmann <cullmann@kde.org> */ -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 <value>").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() <<endl; + TQString find=splitter.cap(1); + kdDebug(13025)<< "SedReplace: find=" << find.latin1() <<endl; - TQString tqreplace=splitter.cap(2); - exchangeAbbrevs(tqreplace); - kdDebug(13025)<< "SedReplace: tqreplace=" << tqreplace.latin1() <<endl; + TQString replace=splitter.cap(2); + exchangeAbbrevs(replace); + kdDebug(13025)<< "SedReplace: replace=" << replace.latin1() <<endl; - if ( tqfind.tqcontains("\\n") ) + if ( find.contains("\\n") ) { - msg = i18n("Sorry, but Kate is not able to tqreplace newlines, yet"); + msg = i18n("Sorry, but Kate is not able to replace newlines, yet"); return false; } @@ -511,7 +511,7 @@ bool KateCommands::SedReplace::exec (Kate::View *view, const TQString &cmd, TQSt uint numLines=doc->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 <charles@kde.org> - * 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 <j.jacobi@gmx.de> */ @@ -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"<<endl; - m_completionPopup->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<TQLabel> 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; i<count; i++) @@ -681,7 +681,7 @@ bool KateCodeFoldingTree::correctEndings(signed char data, KateCodeFoldingNode * else node->insertChild(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; i<count; i++) @@ -805,7 +805,7 @@ void KateCodeFoldingTree::addOpening(KateCodeFoldingNode *node,signed char nType if (!node->endLineValid) { - 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)<<TQString("KateCodeFoldingTree::lineHasBeenInserted: %1").arg(line)<<endl; #endif -// tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt(line); +// findAndMarkAllNodesforRemovalOpenedOrClosedAt(line); // cleanupUnneededNodes(line); - KateCodeFoldingNode *node = tqfindNodeForLine(line); + KateCodeFoldingNode *node = findNodeForLine(line); // ???????? if (node->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)<<TQString("KateCodeFoldingTree::toggleRegionVisibility() %1").arg(line)<<endl; - tqfindAllNodesOpenedOrClosedAt(line); + findAllNodesOpenedOrClosedAt(line); for (int i=0; i<(int)nodesForLine.count(); i++) { KateCodeFoldingNode *node=nodesForLine.at(i); @@ -1417,7 +1417,7 @@ bool KateCodeFoldingTree::existsOpeningAtLineAfter(unsigned int line, KateCodeFo KateCodeFoldingNode *tmp2; unsigned int startLine=getStartLine(tmp); - if ((tmp2 = tmp->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 "<<line<<" is really hidden ->show block"<<endl; // it looks like we really have to ensure visibility - KateCodeFoldingNode *n = tqfindNodeForLine( line ); + KateCodeFoldingNode *n = findNodeForLine( line ); do { if ( ! n->visible ) toggleRegionVisibility( getStartLine( n ) ); @@ -1659,4 +1659,4 @@ void KateCodeFoldingTree::ensureVisible( uint line ) } -// 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.h b/kate/part/katecodefoldinghelpers.h index 37f90b732..bea6a096c 100644 --- a/kate/part/katecodefoldinghelpers.h +++ b/kate/part/katecodefoldinghelpers.h @@ -79,7 +79,7 @@ class KateCodeFoldingNode inline KateCodeFoldingNode *child (uint index) const { return m_children[index]; } - inline int tqfindChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.tqfind (node, start); } + inline int findChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.find (node, start); } inline void appendChild (KateCodeFoldingNode *node) { m_children.resize(m_children.size()+1); m_children[m_children.size()-1] = node; } @@ -113,7 +113,7 @@ class KateCodeFoldingNode TQMemArray<KateCodeFoldingNode*> m_children; }; -class KateCodeFoldingTree : public TQObject +class KateCodeFoldingTree : public QObject { friend class KateCodeFoldingNode; @@ -123,7 +123,7 @@ class KateCodeFoldingTree : public TQObject KateCodeFoldingTree (KateBuffer *buffer); ~KateCodeFoldingTree (); - KateCodeFoldingNode *tqfindNodeForLine (unsigned int line); + KateCodeFoldingNode *findNodeForLine (unsigned int line); unsigned int getRealLine (unsigned int virtualLine); unsigned int getVirtualLine (unsigned int realLine); @@ -141,7 +141,7 @@ class KateCodeFoldingTree : public TQObject void fixRoot (int endLRel); void clear (); - KateCodeFoldingNode *tqfindNodeForPosition(unsigned int line, unsigned int column); + KateCodeFoldingNode *findNodeForPosition(unsigned int line, unsigned int column); private: KateCodeFoldingNode m_root; @@ -161,7 +161,7 @@ class KateCodeFoldingTree : public TQObject static bool trueVal; - KateCodeFoldingNode *tqfindNodeForLineDescending (KateCodeFoldingNode *, unsigned int, unsigned int, bool oneStepOnly=false); + KateCodeFoldingNode *findNodeForLineDescending (KateCodeFoldingNode *, unsigned int, unsigned int, bool oneStepOnly=false); bool correctEndings (signed char data, KateCodeFoldingNode *node, unsigned int line, unsigned int endCol, int insertPos); @@ -185,8 +185,8 @@ class KateCodeFoldingTree : public TQObject */ bool removeOpening (KateCodeFoldingNode *node,unsigned int line); - void tqfindAndMarkAllNodesforRemovalOpenedOrClosedAt (unsigned int line); - void tqfindAllNodesOpenedOrClosedAt (unsigned int line); + void findAndMarkAllNodesforRemovalOpenedOrClosedAt (unsigned int line); + void findAllNodesOpenedOrClosedAt (unsigned int line); void addNodeToFoundList (KateCodeFoldingNode *node,unsigned int line,int childpos); void addNodeToRemoveList (KateCodeFoldingNode *node,unsigned int line); @@ -219,4 +219,4 @@ class KateCodeFoldingTree : 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/kateconfig.cpp b/kate/part/kateconfig.cpp index 807254889..4b3c2f52b 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec () if (m_encodingSet || isGlobal()) { if (m_encoding.isEmpty() && isGlobal()) - return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding())); + return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding())); else if (m_encoding.isEmpty()) return s_global->codec (); else @@ -1426,4 +1426,4 @@ void KateRendererConfig::setShowIndentationLines (bool on) //END -// 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/kateconfig.h b/kate/part/kateconfig.h index a98afd991..56d094cd0 100644 --- a/kate/part/kateconfig.h +++ b/kate/part/kateconfig.h @@ -534,4 +534,4 @@ class KateRendererConfig : public KateConfig #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/katecursor.cpp b/kate/part/katecursor.cpp index 2c1b0115c..dcd7c38bf 100644 --- a/kate/part/katecursor.cpp +++ b/kate/part/katecursor.cpp @@ -189,4 +189,4 @@ bool KateDocCursor::previousNonSpaceChar() return false; } -// 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/katecursor.h b/kate/part/katecursor.h index 3672262e4..c155abba4 100644 --- a/kate/part/katecursor.h +++ b/kate/part/katecursor.h @@ -61,7 +61,7 @@ class KateTextCursor } #ifndef Q_WS_WIN //not needed - friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) { + friend void qSwap(KateTextCursor & c1, KateTextCursor & c2) { KateTextCursor tmp = c1; c1 = c2; c2 = tmp; @@ -200,7 +200,7 @@ class KateTextRange : public KateRange inline void normalize() { if( m_start > m_end ) - tqSwap(m_start, m_end); + qSwap(m_start, m_end); } protected: @@ -247,4 +247,4 @@ class KateBracketRange : public KateTextRange #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/katedialogs.cpp b/kate/part/katedialogs.cpp index b50e30697..d3a481856 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -147,7 +147,7 @@ const int KateIndentConfigTab::flags[] = { KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) : KateConfigPage(parent) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); int configFlags = KateDocumentConfig::global()->configFlags(); TQVGroupBox *gbAuto = new TQVGroupBox(i18n("Automatic Indentation"), this); @@ -195,14 +195,14 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) opt[6]->setChecked(configFlags & flags[6]); opt[7]->setChecked(configFlags & flags[7]); - tqlayout->addWidget(gbAuto); - tqlayout->addWidget(gbSpaces); - tqlayout->addWidget(opt[1]); - tqlayout->addWidget(opt[2]); - tqlayout->addWidget(keys); - tqlayout->addWidget(m_tabs, 0); + layout->addWidget(gbAuto); + layout->addWidget(gbSpaces); + layout->addWidget(opt[1]); + layout->addWidget(opt[2]); + layout->addWidget(keys); + layout->addWidget(m_tabs, 0); - tqlayout->addStretch(); + layout->addStretch(); // What is this? help TQWhatsThis::add(opt[0], i18n( @@ -352,7 +352,7 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) { int configFlags = KateDocumentConfig::global()->configFlags(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); TQVGroupBox *gbCursor = new TQVGroupBox(i18n("Text Cursor Movement"), this); @@ -373,18 +373,18 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) e4->setLabel(i18n("Autocenter cursor (lines):"), AlignVCenter); connect(e4, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - tqlayout->addWidget(gbCursor); + layout->addWidget(gbCursor); TQRadioButton *rb1, *rb2; m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Selection Mode"), this ); - tqlayout->add (m_tabs); + layout->add (m_tabs); m_tabs->setRadioButtonExclusive( true ); m_tabs->insert( rb1=new TQRadioButton( i18n("&Normal"), m_tabs ), 0 ); m_tabs->insert( rb2=new TQRadioButton( i18n("&Persistent"), m_tabs ), 1 ); - tqlayout->addStretch(); + layout->addStretch(); TQWhatsThis::add(rb1, i18n( "Selections will be overwritten by typed text and will be lost on " @@ -712,7 +712,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) "you to set a maximum width of the screen, as a percentage, after which " "dynamically wrapped lines will no longer be vertically aligned. For " "example, at 50%, lines whose indentation levels are deeper than 50% of " - "the width of the screen will not have vertical tqalignment applied to " + "the width of the screen will not have vertical alignment applied to " "subsequent wrapped lines.</p>")); TQWhatsThis::add(m_line,i18n( "If this option is checked, every new view will display line numbers " @@ -850,10 +850,10 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) : KateConfigPage( parent ) { int configFlags = KateDocumentConfig::global()->configFlags(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); TQVGroupBox *gbEnc = new TQVGroupBox(i18n("File Format"), this); - tqlayout->addWidget( gbEnc ); + layout->addWidget( gbEnc ); TQHBox *e5Layout = new TQHBox(gbEnc); TQLabel *e5Label = new TQLabel(i18n("&Encoding:"), e5Layout); @@ -872,7 +872,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) m_eol->insertItem (i18n("Macintosh")); TQVGroupBox *gbMem = new TQVGroupBox(i18n("Memory Usage"), this); - tqlayout->addWidget( gbMem ); + layout->addWidget( gbMem ); e5Layout = new TQHBox(gbMem); e5Layout->setSpacing (32); @@ -883,13 +883,13 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) blockCountLabel->setBuddy(blockCount); TQVGroupBox *gbWhiteSpace = new TQVGroupBox(i18n("Automatic Cleanups on Load/Save"), this); - tqlayout->addWidget( gbWhiteSpace ); + layout->addWidget( gbWhiteSpace ); removeSpaces = new TQCheckBox(i18n("Re&move trailing spaces"), gbWhiteSpace); removeSpaces->setChecked(configFlags & KateDocument::cfRemoveSpaces); TQVGroupBox *dirConfigBox = new TQVGroupBox(i18n("Folder Config File"), this); - tqlayout->addWidget( dirConfigBox ); + layout->addWidget( dirConfigBox ); dirSearchDepth = new KIntNumInput(KateDocumentConfig::global()->searchDirConfigDepth(), dirConfigBox); dirSearchDepth->setRange(-1, 64, 1, false); @@ -897,7 +897,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter); TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Backup on Save"), this ); - tqlayout->addWidget( gb ); + layout->addWidget( gb ); cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb ); cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb ); @@ -911,7 +911,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) leBuSuffix = new TQLineEdit( hbBuSuffix ); lBuSuffix->setBuddy( leBuSuffix ); - tqlayout->addStretch(); + layout->addStretch(); TQWhatsThis::add(removeSpaces, i18n( "The editor will automatically eliminate extra spaces at the ends of " @@ -1257,11 +1257,11 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) , hlData (0) , m_doc (doc) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); // hl chooser TQHBox *hbHl = new TQHBox( this ); - tqlayout->add (hbHl); + layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); @@ -1278,7 +1278,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) } TQGroupBox *gbInfo = new TQGroupBox( 1, Qt::Horizontal, i18n("Information"), this ); - tqlayout->add (gbInfo); + layout->add (gbInfo); // author TQHBox *hb1 = new TQHBox( gbInfo); @@ -1292,7 +1292,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) license = new TQLabel (hb2); TQGroupBox *gbProps = new TQGroupBox( 1, Qt::Horizontal, i18n("Properties"), this ); - tqlayout->add (gbProps); + layout->add (gbProps); // file & mime types TQHBox *hbFE = new TQHBox( gbProps); @@ -1317,9 +1317,9 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) // download/new buttons TQHBox *hbBtns = new TQHBox( this ); - tqlayout->add (hbBtns); + layout->add (hbBtns); - ((TQBoxLayout*)hbBtns->tqlayout())->addStretch(1); // hmm. + ((TQBoxLayout*)hbBtns->layout())->addStretch(1); // hmm. hbBtns->setSpacing( KDialog::spacingHint() ); TQPushButton *btnDl = new TQPushButton(i18n("Do&wnload..."), hbBtns); connect( btnDl, TQT_SIGNAL(clicked()), this, TQT_SLOT(hlDownload()) ); @@ -1346,7 +1346,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) "Click this button to download new or updated syntax highlight " "descriptions from the Kate website.") ); - tqlayout->addStretch (); + layout->addStretch (); connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); @@ -1388,10 +1388,10 @@ void KateHlConfigPage::hlChanged(int z) return; } - if ( !hlDataDict.tqfind( z ) ) + if ( !hlDataDict.find( z ) ) hlDataDict.insert( z, hl->getData() ); - hlData = hlDataDict.tqfind( z ); + hlData = hlDataDict.find( z ); wildcards->setText(hlData->wildcards); mimetypes->setText(hlData->mimetypes); priority->setValue(hlData->priority); @@ -1737,4 +1737,4 @@ void KateModOnHdPrompt::slotUser1() //END KateModOnHdPrompt -// 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/katedialogs.h b/kate/part/katedialogs.h index e38c6c986..aa6f21f6d 100644 --- a/kate/part/katedialogs.h +++ b/kate/part/katedialogs.h @@ -253,7 +253,7 @@ class KateSaveConfigTab : public KateConfigPage protected: KComboBox *m_encoding, *m_eol; TQCheckBox *cbLocalFiles, *cbRemoteFiles; - TQCheckBox *tqreplaceTabs, *removeSpaces, *allowEolDetection; + TQCheckBox *replaceTabs, *removeSpaces, *allowEolDetection; TQLineEdit *leBuPrefix; TQLineEdit *leBuSuffix; KIntNumInput *dirSearchDepth; @@ -371,7 +371,7 @@ class KateModOnHdPrompt : public KDialogBase { Q_OBJECT public: - enum tqStatus { + enum Status { Reload=1, // 0 is KDialogBase::Cancel Save, Overwrite, diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 77baa7bf0..fe5e22b1d 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -91,7 +91,7 @@ class KatePartPluginItem // KateDocument Constructor // KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, - bool bReadOnly, TQWidget *tqparentWidget, + bool bReadOnly, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name) : Kate::Document(parent, name), m_plugins (KateFactory::self()->plugins().count()), @@ -214,7 +214,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, // if single view mode, like in the konqui embedding, create a default view ;) if ( m_bSingleViewMode ) { - KTextEditor::View *view = createView( tqparentWidget, widgetName ); + KTextEditor::View *view = createView( parentWidget, widgetName ); insertChildClient( view ); view->show(); setWidget( view ); @@ -700,7 +700,7 @@ bool KateDocument::insertText( uint line, uint col, const TQString &s, bool bloc TQString buf; - bool tqreplacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo ); + bool replacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo ); uint tw = config()->tabWidth(); uint insertPosExpanded = insertPos; KateTextLine::Ptr l = m_buffer->line( line ); @@ -734,7 +734,7 @@ bool KateDocument::insertText( uint line, uint col, const TQString &s, bool bloc } else { - if ( tqreplacetabs && ch == '\t' ) + if ( replacetabs && ch == '\t' ) { uint tr = tw - ( insertPosExpanded+buf.length() )%tw; for ( uint i=0; i < tr; i++ ) @@ -1092,7 +1092,7 @@ bool KateDocument::wrapText (uint startLine, uint endLine) // Scan backwards looking for a place to break the line // We are not interested in breaking at the first char // of the line (if it is a space), but we are at the second - // anders: if we can't tqfind a space, try breaking on a word + // anders: if we can't find a space, try breaking on a word // boundry, using KateHighlight::canBreakAt(). // This could be a priority (setting) in the hl/filetype/document int z = 0; @@ -1176,10 +1176,10 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str ) uint tw = config()->tabWidth(); int pos = 0; uint l = 0; - while ( (pos = s.tqfind('\t')) > -1 ) + while ( (pos = s.find('\t')) > -1 ) { l = tw - ( (col + pos)%tw ); - s.tqreplace( pos, 1, TQString().fill( ' ', l ) ); + s.replace( pos, 1, TQString().fill( ' ', l ) ); } } @@ -1187,7 +1187,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str ) editAddUndo (KateUndoGroup::editInsertText, line, col, s.length(), s); - l->insertText (col, s.length(), s.tqunicode()); + l->insertText (col, s.length(), s.unicode()); // removeTrailingSpace(line); // ### nessecary? m_buffer->changeLine(line); @@ -1410,7 +1410,7 @@ bool KateDocument::editInsertLine ( uint line, const TQString &s ) removeTrailingSpace( line ); // old line KateTextLine::Ptr tl = new KateTextLine(); - tl->insertText (0, s.length(), s.tqunicode(), 0); + tl->insertText (0, s.length(), s.unicode(), 0); m_buffer->insertLine(line, tl); m_buffer->changeLine(line); @@ -1568,7 +1568,7 @@ void KateDocument::updateModified() lastRedoGroupWhenSavedIsLastUndo BIT 7 lastRedoGroupWhenSavedIsLastRedo BIT 8 - If you tqfind a new pattern, please add it to the patterns array + If you find a new pattern, please add it to the patterns array */ unsigned char currentPattern = 0; @@ -1833,7 +1833,7 @@ bool KateDocument::searchText (unsigned int startLine, unsigned int startCol, co uint KateDocument::hlMode () { - return KateHlManager::self()->tqfindHl(highlight()); + return KateHlManager::self()->findHl(highlight()); } bool KateDocument::setHlMode (uint mode) @@ -2050,7 +2050,7 @@ void KateDocument::clearMark( uint line ) emit marksChanged(); delete mark; tagLines( line, line ); - tqrepaintViews(true); + repaintViews(true); } void KateDocument::addMark( uint line, uint markType ) @@ -2087,7 +2087,7 @@ void KateDocument::addMark( uint line, uint markType ) emit marksChanged(); tagLines( line, line ); - tqrepaintViews(true); + repaintViews(true); } void KateDocument::removeMark( uint line, uint markType ) @@ -2119,7 +2119,7 @@ void KateDocument::removeMark( uint line, uint markType ) emit marksChanged(); tagLines( line, line ); - tqrepaintViews(true); + repaintViews(true); } TQPtrList<KTextEditor::Mark> KateDocument::marks() @@ -2146,17 +2146,17 @@ void KateDocument::clearMarks() m_marks.clear(); emit marksChanged(); - tqrepaintViews(true); + repaintViews(true); } void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap ) { - m_markPixmaps.tqreplace( type, new TQPixmap( pixmap ) ); + m_markPixmaps.replace( type, new TQPixmap( pixmap ) ); } void KateDocument::setDescription( MarkInterface::MarkTypes type, const TQString& description ) { - m_markDescriptions.tqreplace( type, new TQString( description ) ); + m_markDescriptions.replace( type, new TQString( description ) ); } TQPixmap *KateDocument::markPixmap( MarkInterface::MarkTypes type ) @@ -2254,7 +2254,7 @@ KMimeType::Ptr KateDocument::mimeTypeForContent() buf.resize( bufpos ); int accuracy = 0; - return KMimeType::tqfindByContent( buf, &accuracy ); + return KMimeType::findByContent( buf, &accuracy ); } //END KTextEditor::DocumentInfoInterface @@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url ) w = m_views.first(); if (w) - m_job->setWindow (w->tqtopLevelWidget()); + m_job->setWindow (w->topLevelWidget()); emit started( m_job ); @@ -2395,7 +2395,7 @@ bool KateDocument::openFile(KIO::Job * job) // service type magic to get encoding right // TQString serviceType = m_extension->urlArgs().serviceType.simplifyWhiteSpace(); - int pos = serviceType.tqfind(';'); + int pos = serviceType.find(';'); if (pos != -1) setEncoding (serviceType.mid(pos+1)); @@ -2589,7 +2589,7 @@ bool KateDocument::saveFile() // if (!m_buffer->canEncode () && (KMessageBox::warningContinueCancel(0, - i18n("The selected encoding cannot encode every tqunicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue)) + i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue)) { return false; } @@ -2872,7 +2872,7 @@ void KateDocument::makeAttribs(bool needInvalidate) m_views.at(z)->renderer()->updateAttributes (); if (needInvalidate) - m_buffer->tqinvalidateHighlighting(); + m_buffer->invalidateHighlighting(); tagAll (); } @@ -2934,7 +2934,7 @@ void KateDocument::removeSuperCursor(KateSuperCursor *cursor, bool privateC) { bool KateDocument::ownedView(KateView *view) { // do we own the given view? - return (m_views.tqcontainsRef(view) > 0); + return (m_views.containsRef(view) > 0); } bool KateDocument::isLastView(int numViews) { @@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c ) if (!textLine) return; - if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" "))) + if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" "))) { // gg: in hard wordwrap mode, backspace must also eat the trailing space removeText (line-1, textLine->length()-1, line, 0); @@ -3232,7 +3232,7 @@ void KateDocument::paste ( KateView* view ) if (s.isEmpty()) return; - uint lines = s.tqcontains (TQChar ('\n')); + uint lines = s.contains (TQChar ('\n')); m_undoDontMerge = true; @@ -3399,11 +3399,11 @@ void KateDocument::optimizeLeadingSpace(uint line, int flags, int change) } } - //kdDebug(13020) << "tqreplace With Op: " << line << " " << first_char << " " << space << endl; - tqreplaceWithOptimizedSpace(line, first_char, space, flags); + //kdDebug(13020) << "replace With Op: " << line << " " << first_char << " " << space << endl; + replaceWithOptimizedSpace(line, first_char, space, flags); } -void KateDocument::tqreplaceWithOptimizedSpace(uint line, uint upto_column, uint space, int flags) +void KateDocument::replaceWithOptimizedSpace(uint line, uint upto_column, uint space, int flags) { uint length; TQString new_space; @@ -3908,7 +3908,7 @@ void KateDocument::comment( KateView *v, uint line,uint column, int change) kdDebug(13020)<<"easy approach for uncommenting did not work, trying harder (folding tree)"<<endl; int commentRegion=(highlight()->commentRegion(startAttrib)); if (commentRegion){ - KateCodeFoldingNode *n=foldingTree()->tqfindNodeForPosition(line,column); + KateCodeFoldingNode *n=foldingTree()->findNodeForPosition(line,column); if (n) { KateTextCursor start,end; if ((n->nodeType()==commentRegion) && n->getBegin(foldingTree(), &start) && n->getEnd(foldingTree(), &end)) { @@ -4112,10 +4112,10 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end) m_views.at(z)->tagLines(start, end, true); } -void KateDocument::tqrepaintViews(bool paintOnlyDirty) +void KateDocument::repaintViews(bool paintOnlyDirty) { for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->tqrepaintText(paintOnlyDirty); + m_views.at(z)->repaintText(paintOnlyDirty); } void KateDocument::tagAll() @@ -4157,7 +4157,7 @@ void KateDocument::newBracketMark( const KateTextCursor& cursor, KateBracketRang bm.start() = cursor; - if( !tqfindMatchingBracket( bm.start(), bm.end(), maxLines ) ) + if( !findMatchingBracket( bm.start(), bm.end(), maxLines ) ) return; bm.setValid(true); @@ -4168,7 +4168,7 @@ void KateDocument::newBracketMark( const KateTextCursor& cursor, KateBracketRang bm.setIndentMin(kMin(indentStart, indentEnd)); } -bool KateDocument::tqfindMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines ) +bool KateDocument::findMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines ) { KateTextLine::Ptr textLine = m_buffer->plainLine( start.line() ); if( !textLine ) @@ -4634,7 +4634,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) { // simple check first, no regex // no kate inside, no vars, simple... - if (t.tqfind("kate") < 0) + if (t.find("kate") < 0) return; // found vars, if any @@ -4672,7 +4672,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) TQStringList types (TQStringList::split(';', kvLineMime.cap(1))); // no matching type found - if (!types.tqcontains (mimeType ())) + if (!types.contains (mimeType ())) return; s = kvLineMime.cap(2); @@ -4708,7 +4708,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) // only apply view & renderer config stuff if (onlyViewAndRenderer) { - if ( vvl.tqcontains( var ) ) // FIXME define above + if ( vvl.contains( var ) ) // FIXME define above setViewVariable( var, val ); } else @@ -4722,7 +4722,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) // FIXME should this be optimized to only a few calls? how? else if ( var == "backspace-indents" && checkBoolValue( val, &state ) ) m_config->setConfigFlags( KateDocumentConfig::cfBackspaceIndents, state ); - else if ( var == "tqreplace-tabs" && checkBoolValue( val, &state ) ) + else if ( var == "replace-tabs" && checkBoolValue( val, &state ) ) m_config->setConfigFlags( KateDocumentConfig::cfReplaceTabsDyn, state ); else if ( var == "remove-trailing-space" && checkBoolValue( val, &state ) ) m_config->setConfigFlags( KateDocumentConfig::cfRemoveTrailingDyn, state ); @@ -4744,7 +4744,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) m_config->setConfigFlags( KateDocumentConfig::cfSpaceIndent, state ); else if ( var == "smart-home" && checkBoolValue( val, &state ) ) m_config->setConfigFlags( KateDocumentConfig::cfSmartHome, state ); - else if ( var == "tqreplace-trailing-space-save" && checkBoolValue( val, &state ) ) + else if ( var == "replace-trailing-space-save" && checkBoolValue( val, &state ) ) m_config->setConfigFlags( KateDocumentConfig::cfRemoveSpaces, state ); else if ( var == "auto-insert-doxygen" && checkBoolValue( val, &state) ) m_config->setConfigFlags( KateDocumentConfig::cfDoxygenAutoTyping, state); @@ -4773,7 +4773,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) { TQStringList l; l << "unix" << "dos" << "mac"; - if ( (n = l.tqfindIndex( val.lower() )) != -1 ) + if ( (n = l.findIndex( val.lower() )) != -1 ) m_config->setEol( n ); } else if ( var == "encoding" ) @@ -4791,7 +4791,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) } // VIEW SETTINGS - else if ( vvl.tqcontains( var ) ) + else if ( vvl.contains( var ) ) setViewVariable( var, val ); else { @@ -4862,14 +4862,14 @@ bool KateDocument::checkBoolValue( TQString val, bool *result ) val = val.stripWhiteSpace().lower(); TQStringList l; l << "1" << "on" << "true"; - if ( l.tqcontains( val ) ) + if ( l.contains( val ) ) { *result = true; return true; } l.clear(); l << "0" << "off" << "false"; - if ( l.tqcontains( val ) ) + if ( l.contains( val ) ) { *result = false; return true; @@ -4893,7 +4893,7 @@ bool KateDocument::checkColorValue( TQString val, TQColor &c ) // KTextEditor::variable TQString KateDocument::variable( const TQString &name ) const { - if ( m_storedVariables.tqcontains( name ) ) + if ( m_storedVariables.contains( name ) ) return m_storedVariables[ name ]; return ""; @@ -5172,4 +5172,4 @@ bool KateDocument::toggleBlockSelectionMode () //END DEPRECATED STUFF -// 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/katedocument.h b/kate/part/katedocument.h index ec1de9f9c..46e9e87f8 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -91,7 +91,7 @@ class KateDocument : public Kate::Document, public: KateDocument (bool bSingleViewMode=false, bool bBrowserView=false, bool bReadOnly=false, - TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); + TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); ~KateDocument (); bool closeURL(); @@ -608,7 +608,7 @@ class KateDocument : public Kate::Document, void setConfigFlags (uint flags); // Repaint all of all of the views - void tqrepaintViews(bool paintOnlyDirty = true); + void repaintViews(bool paintOnlyDirty = true); inline KateHighlighting *highlight () { return m_buffer->highlight(); } @@ -671,7 +671,7 @@ class KateDocument : public Kate::Document, private: void optimizeLeadingSpace( uint line, int flags, int change ); - void tqreplaceWithOptimizedSpace( uint line, uint upto_column, uint space, int flags ); + void replaceWithOptimizedSpace( uint line, uint upto_column, uint space, int flags ); bool removeStringFromBegining(int line, TQString &str); bool removeStringFromEnd(int line, TQString &str); @@ -749,7 +749,7 @@ class KateDocument : public Kate::Document, void tagAll(); void newBracketMark( const KateTextCursor& start, KateBracketRange& bm, int maxLines = -1 ); - bool tqfindMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines = -1 ); + bool findMatchingBracket( KateTextCursor& start, KateTextCursor& end, int maxLines = -1 ); private: void guiActivateEvent( KParts::GUIActivateEvent *ev ); @@ -1069,5 +1069,5 @@ class KateDocument : public Kate::Document, #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/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp index a4c41c45d..370be7684 100644 --- a/kate/part/katedocumenthelpers.cpp +++ b/kate/part/katedocumenthelpers.cpp @@ -53,4 +53,4 @@ void KateBrowserExtension::slotSelectionChanged() emit enableAction( "copy", m_doc->activeView()->hasSelection() ); } -// 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/katefactory.cpp b/kate/part/katefactory.cpp index 1fbe67015..64bde8718 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -48,7 +48,7 @@ class KateFactoryPublic : public KParts::Factory public: /** * reimplemented create object method - * @param tqparentWidget parent widget + * @param parentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -56,9 +56,9 @@ class KateFactoryPublic : public KParts::Factory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) + KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { - return KateFactory::self()->createPartObject (tqparentWidget, widgetName, parent, name, classname, args); + return KateFactory::self()->createPartObject (parentWidget, widgetName, parent, name, classname, args); } }; @@ -206,14 +206,14 @@ KateFactory *KateFactory::self () return s_self; } -KParts::Part *KateFactory::createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) +KParts::Part *KateFactory::createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) { TQCString classname( _classname ); bool bWantSingleView = ( classname != "KTextEditor::Document" && classname != "Kate::Document" ); bool bWantBrowserView = ( classname == "Browser/View" ); bool bWantReadOnly = (bWantBrowserView || ( classname == "KParts::ReadOnlyPart" )); - KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, tqparentWidget, widgetName, parent, name); + KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, parentWidget, widgetName, parent, name); part->setReadWrite( !bWantReadOnly ); return part; @@ -273,4 +273,4 @@ KateIndentScript KateFactory::indentScript (const TQString &scriptname) return result; } -// 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/katefactory.h b/kate/part/katefactory.h index 1b37b20e2..0fd939ce3 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -71,7 +71,7 @@ class KateFactory /** * reimplemented create object method - * @param tqparentWidget parent widget + * @param parentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -79,7 +79,7 @@ class KateFactory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, + KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); @@ -309,4 +309,4 @@ class KateFactory #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/katefiletype.cpp b/kate/part/katefiletype.cpp index 269e9972b..11d5e9a46 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -126,7 +126,7 @@ void KateFileTypeManager::save (TQPtrList<KateFileType> *v) for (uint z=0; z < g.count(); z++) { - if (newg.tqfindIndex (g[z]) == -1) + if (newg.findIndex (g[z]) == -1) config.deleteGroup (g[z]); } @@ -187,7 +187,7 @@ int KateFileTypeManager::fileType (KateDocument *doc) for (uint z=0; z < m_types.count(); z++) { - if (m_types.at(z)->mimetypes.tqfindIndex (mt->name()) > -1) + if (m_types.at(z)->mimetypes.findIndex (mt->name()) > -1) types.append (m_types.at(z)); } @@ -264,11 +264,11 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) m_types.setAutoDelete (true); m_lastType = 0; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); // hl chooser TQHBox *hbHl = new TQHBox( this ); - tqlayout->add (hbHl); + layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); TQLabel *lHl = new TQLabel( i18n("&Filetype:"), hbHl ); typeCombo = new TQComboBox( false, hbHl ); @@ -283,7 +283,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) ); gbProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Properties"), this ); - tqlayout->add (gbProps); + layout->add (gbProps); // file & mime types TQLabel *lname = new TQLabel( i18n("N&ame:"), gbProps ); @@ -318,7 +318,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) priority = new KIntNumInput( gbProps ); lprio->setBuddy( priority ); - tqlayout->addStretch(); + layout->addStretch(); reload(); @@ -341,12 +341,12 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) "configuration option, such as highlight, indent-mode, encoding, etc.</p>" "<p>For a full list of known variables, see the manual.</p>") ); TQWhatsThis::add( wildcards, i18n( - "The wildcards tqmask allows you to select files by filename. A typical " - "tqmask uses an asterisk and the file extension, for example " + "The wildcards mask allows you to select files by filename. A typical " + "mask uses an asterisk and the file extension, for example " "<code>*.txt; *.text</code>. The string is a semicolon-separated list " - "of tqmasks.") ); + "of masks.") ); TQWhatsThis::add( mimetypes, i18n( - "The mime type tqmask allows you to select files by mimetype. The string is " + "The mime type mask allows you to select files by mimetype. The string is " "a semicolon-separated list of mimetypes, for example " "<code>text/plain; text/english</code>.") ); TQWhatsThis::add( btnMTW, i18n( @@ -539,9 +539,9 @@ void KateViewFileTypeAction::slotAboutToShow() TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name; TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section; - if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) ) + if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) ) { - if (subMenusName.tqcontains(hlSection) < 1) + if (subMenusName.contains(hlSection) < 1) { subMenusName << hlSection; TQPopupMenu *menu = new TQPopupMenu (); @@ -549,11 +549,11 @@ void KateViewFileTypeAction::slotAboutToShow() popupMenu()->insertItem (hlSection, menu); } - int m = subMenusName.tqfindIndex (hlSection); + int m = subMenusName.findIndex (hlSection); names << hlName; subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); } - else if (names.tqcontains(hlName) < 1) + else if (names.contains(hlName) < 1) { names << hlName; popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); @@ -576,7 +576,7 @@ void KateViewFileTypeAction::slotAboutToShow() const KateFileType *t = 0; if ((t = KateFactory::self()->fileTypeManager()->fileType (doc->fileType()))) { - int i = subMenusName.tqfindIndex (t->section); + int i = subMenusName.findIndex (t->section); if (i >= 0 && subMenus.at(i)) subMenus.at(i)->setItemChecked (doc->fileType()+1, true); else @@ -593,4 +593,4 @@ void KateViewFileTypeAction::setType (int mode) doc->updateFileType(mode-1, true); } //END KateViewFileTypeAction -// 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/katefont.cpp b/kate/part/katefont.cpp index 26a86196c..361ce5cce 100644 --- a/kate/part/katefont.cpp +++ b/kate/part/katefont.cpp @@ -124,4 +124,4 @@ void KateFontStruct::setFont (const TQFont & font) updateFontData (); } -// 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/katehighlight.cpp b/kate/part/katehighlight.cpp index 20270bdfd..50c941c15 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000; inline bool kateInsideString (const TQString &str, TQChar ch) { - const TQChar *tqunicode = str.tqunicode(); + const TQChar *unicode = str.unicode(); const uint len = str.length(); for (uint i=0; i < len; i++) - if (tqunicode[i] == ch) + if (unicode[i] == ch) return true; return false; @@ -445,17 +445,17 @@ void KateHlItem::dynamicSubstitute(TQString &str, const TQStringList *args) { char c = str[i + 1].latin1(); if (c == '%') - str.tqreplace(i, 1, ""); + str.replace(i, 1, ""); else if (c >= '0' && c <= '9') { if ((uint)(c - '0') < args->size()) { - str.tqreplace(i, 2, (*args)[c - '0']); + str.replace(i, 2, (*args)[c - '0']); i += ((*args)[c - '0']).length() - 1; } else { - str.tqreplace(i, 2, ""); + str.replace(i, 2, ""); --i; } } @@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len) if (wordLen < minLen) return 0; - if ( dict[wordLen] && dict[wordLen]->tqfind(TQConstString(text.tqunicode() + offset, wordLen).string()) ) + if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.unicode() + offset, wordLen).string()) ) return offset2; return 0; @@ -968,7 +968,7 @@ KateHlItem *KateHlRegExpr::clone(const TQStringList *args) for (TQStringList::Iterator it = escArgs.begin(); it != escArgs.end(); ++it) { - (*it).tqreplace(TQRegExp("(\\W)"), "\\\\1"); + (*it).replace(TQRegExp("(\\W)"), "\\\\1"); } dynamicSubstitute(regexp, &escArgs); @@ -1035,7 +1035,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len) offset++; // eat the x len--; // these for loops can probably be - // tqreplaced with something else but + // replaced with something else but // for right now they work // check for hexdigits for (i = 0; (len > 0) && (i < 2) && (text[offset] >= '0' && text[offset] <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++) @@ -1293,7 +1293,7 @@ int KateHighlighting::makeDynamicContext(KateHlContext *model, const TQStringLis QPair<KateHlContext *, TQString> key(model, args->front()); short value; - if (dynamicCtxs.tqcontains(key)) + if (dynamicCtxs.contains(key)) value = dynamicCtxs[key]; else { @@ -1367,7 +1367,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine, } else { - // There does an old context stack exist -> tqfind the context at the line start + // There does an old context stack exist -> find the context at the line start ctxNum = ctx[ctx.size()-1]; //context ID of the last character in the previous line //kdDebug(13010) << "\t\tctxNum = " << ctxNum << " contextList[ctxNum] = " << contextList[ctxNum] << endl; // ellis @@ -1931,12 +1931,12 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data, if (!beginRegionStr.isEmpty()) { - regionId = RegionList->tqfindIndex(beginRegionStr); + regionId = RegionList->findIndex(beginRegionStr); if (regionId==-1) // if the region name doesn't already exist, add it to the list { (*RegionList)<<beginRegionStr; - regionId = RegionList->tqfindIndex(beginRegionStr); + regionId = RegionList->findIndex(beginRegionStr); } regionId++; @@ -1946,12 +1946,12 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data, if (!endRegionStr.isEmpty()) { - regionId2 = RegionList->tqfindIndex(endRegionStr); + regionId2 = RegionList->findIndex(endRegionStr); if (regionId2==-1) // if the region name doesn't already exist, add it to the list { (*RegionList)<<endRegionStr; - regionId2 = RegionList->tqfindIndex(endRegionStr); + regionId2 = RegionList->findIndex(endRegionStr); } regionId2 = -regionId2 - 1; @@ -2030,7 +2030,7 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data, m_additionalData[ buildIdentifier ]->deliminator); //Get the entries for the keyword lookup list - keyword->addList(KateHlManager::self()->syntax->tqfinddata("highlighting",stringdata)); + keyword->addList(KateHlManager::self()->syntax->finddata("highlighting",stringdata)); tmpItem=keyword; } else if (dataname=="Float") tmpItem= (new KateHlFloat(attr,context,regionId,regionId2)); @@ -2072,7 +2072,7 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data, TQString KateHighlighting::hlKeyForAttrib( int i ) const { - // tqfind entry. This is faster than TQMap::tqfind. m_hlIndex always has an entry + // find entry. This is faster than TQMap::find. m_hlIndex always has an entry // for key '0' (it is "none"), so the result is always valid. int k = 0; TQMap<int,TQString>::const_iterator it = m_hlIndex.constEnd(); @@ -2088,14 +2088,14 @@ TQString KateHighlighting::hlKeyForAttrib( int i ) const bool KateHighlighting::isInWord( TQChar c, int attrib ) const { - return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.tqfind(c) < 0 + return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.find(c) < 0 && !c.isSpace() && c != '"' && c != '\''; } bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const { static const TQString& sq = KGlobal::staticQString("\"'"); - return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.tqfind(c) != -1) && (sq.tqfind(c) == -1); + return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1); } signed char KateHighlighting::commentRegion(int attr) const { @@ -2206,7 +2206,7 @@ void KateHighlighting::readGlobalKeywordConfig() // remove any weakDelimitars (if any) from the default list and store this list. for (uint s=0; s < weakDeliminator.length(); s++) { - int f = deliminator.tqfind (weakDeliminator[s]); + int f = deliminator.find (weakDeliminator[s]); if (f > -1) deliminator.remove (f, 1); @@ -2365,20 +2365,20 @@ int KateHighlighting::getIdFromString(TQStringList *ContextNameList, TQString tm } } - else if ( tmpLineEndContext.tqcontains("##")) + else if ( tmpLineEndContext.contains("##")) { - int o = tmpLineEndContext.tqfind("##"); + int o = tmpLineEndContext.find("##"); // FIXME at least with 'foo##bar'-style contexts the rules are picked up // but the default attribute is not TQString tmp=tmpLineEndContext.mid(o+2); - if (!embeddedHls.tqcontains(tmp)) embeddedHls.insert(tmp,KateEmbeddedHlInfo()); + if (!embeddedHls.contains(tmp)) embeddedHls.insert(tmp,KateEmbeddedHlInfo()); unres=tmp+':'+tmpLineEndContext.left(o); context=0; } else { - context=ContextNameList->tqfindIndex(buildPrefix+tmpLineEndContext); + context=ContextNameList->findIndex(buildPrefix+tmpLineEndContext); if (context==-1) { context=tmpLineEndContext.toInt(); @@ -2476,8 +2476,8 @@ void KateHighlighting::makeContextList() if (incCtx.endsWith(":")) { kdDebug(13010)<<"Looking up context0 for ruleset "<<incCtx<<endl; incCtx = incCtx.left(incCtx.length()-1); - //try to tqfind the context0 id for a given unresolvedReference - KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.tqfind(incCtx); + //try to find the context0 id for a given unresolvedReference + KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.find(incCtx); if (hlIt!=embeddedHls.end()) *(unresIt.key())=hlIt.data().context0; } @@ -2564,7 +2564,7 @@ void KateHighlighting::handleKateHlIncludeRulesRecursive(KateHlIncludeRules::ite KateHlIncludeRules::iterator it1=it; int ctx=(*it1)->ctx; - // tqfind the last entry for the given context in the KateHlIncludeRules list + // find the last entry for the given context in the KateHlIncludeRules list // this is need if one context includes more than one. This saves us from // updating all insert positions: // eg: context 0: @@ -2765,7 +2765,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0) // only context refernces of type Name, ##Name, and Subname##Name are allowed if (incCtx.startsWith("##") || (!incCtx.startsWith("#"))) { - int incCtxi = incCtx.tqfind("##"); + int incCtxi = incCtx.find("##"); //#stay, #pop is not interesting here if (incCtxi >= 0) { @@ -2777,7 +2777,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0) KateHlIncludeRule *ir=new KateHlIncludeRule(i,m_contexts[i]->items.count(),incCtxN,includeAttrib); //use the same way to determine cross hl file references as other items do - if (!embeddedHls.tqcontains(incSet)) + if (!embeddedHls.contains(incSet)) embeddedHls.insert(incSet,KateEmbeddedHlInfo()); else kdDebug(13010)<<"Skipping embeddedHls.insert for "<<incCtxN<<endl; @@ -2850,7 +2850,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0) //BEGIN Resolve multiline region if possible if (!m_additionalData[ ident ]->multiLineRegion.isEmpty()) { - long commentregionid=RegionList.tqfindIndex( m_additionalData[ ident ]->multiLineRegion ); + long commentregionid=RegionList.findIndex( m_additionalData[ ident ]->multiLineRegion ); if (-1==commentregionid) { errorsAndWarnings+=i18n( "<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>" @@ -3086,7 +3086,7 @@ int KateHlManager::realWildcardFind(const TQString &fileName) if (highlight->priority() > pri) { pri = highlight->priority(); - hl = hlList.tqfindRef (highlight); + hl = hlList.findRef (highlight); } } return hl; @@ -3124,7 +3124,7 @@ int KateHlManager::mimeFind( KateDocument *doc ) if (highlight->priority() > pri) { pri = highlight->priority(); - hl = hlList.tqfindRef (highlight); + hl = hlList.findRef (highlight); } } @@ -3421,9 +3421,9 @@ void KateViewHighlightAction::slotAboutToShow() if (!KateHlManager::self()->hlHidden(z)) { - if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) ) + if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) ) { - if (subMenusName.tqcontains(hlSection) < 1) + if (subMenusName.contains(hlSection) < 1) { subMenusName << hlSection; TQPopupMenu *menu = new TQPopupMenu (); @@ -3431,11 +3431,11 @@ void KateViewHighlightAction::slotAboutToShow() popupMenu()->insertItem ( '&' + hlSection, menu); } - int m = subMenusName.tqfindIndex (hlSection); + int m = subMenusName.findIndex (hlSection); names << hlName; subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); } - else if (names.tqcontains(hlName) < 1) + else if (names.contains(hlName) < 1) { names << hlName; popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); @@ -3454,7 +3454,7 @@ void KateViewHighlightAction::slotAboutToShow() } popupMenu()->setItemChecked (0, false); - int i = subMenusName.tqfindIndex (KateHlManager::self()->hlSection(doc->hlMode())); + int i = subMenusName.findIndex (KateHlManager::self()->hlSection(doc->hlMode())); if (i >= 0 && subMenus.at(i)) subMenus.at(i)->setItemChecked (doc->hlMode(), true); else @@ -3470,4 +3470,4 @@ void KateViewHighlightAction::setHl (int mode) } //END KateViewHighlightAction -// 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/katehighlight.h b/kate/part/katehighlight.h index c8867e2bb..b42fccb62 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -213,7 +213,7 @@ class KateHighlighting inline bool noHighlighting () const { return noHl; }; - // be carefull: all documents hl should be tqinvalidated after calling this method! + // be carefull: all documents hl should be invalidated after calling this method! void dropDynamicContexts(); TQString indentation () { return m_indentation; } @@ -299,7 +299,7 @@ class KateHighlighting * When a highlight is added, a instance of this class is appended to * m_additionalData, and the current position in the attrib and context * arrays are stored in the indexes for look up. You can then use - * hlKeyForAttrib or hlKeyForContext to tqfind the relevant instance of this + * hlKeyForAttrib or hlKeyForContext to find the relevant instance of this * class from m_additionalData. * * If you need to add a property to a highlight, add it here. @@ -338,7 +338,7 @@ class KateHighlighting inline bool allowsFolding(){return folding;} }; -class KateHlManager : public TQObject +class KateHlManager : public QObject { Q_OBJECT @@ -357,7 +357,7 @@ class KateHlManager : public TQObject int detectHighlighting (class KateDocument *doc); - int tqfindHl(KateHighlighting *h) {return hlList.tqfind(h);} + int findHl(KateHighlighting *h) {return hlList.find(h);} TQString identifierForName(const TQString&); // methodes to get the default style count + names @@ -377,7 +377,7 @@ class KateHlManager : public TQObject uint countDynamicCtxs() { return dynamicCtxsCount; }; void setForceNoDCReset(bool b) { forceNoDCReset = b; }; - // be carefull: all documents hl should be tqinvalidated after having successfully called this method! + // be carefull: all documents hl should be invalidated after having successfully called this method! bool resetDynamicCtxs(); signals: @@ -435,4 +435,4 @@ class KateViewHighlightAction: public Kate::ActionMenu #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/katejscript.cpp b/kate/part/katejscript.cpp index dc597a990..75f5fc513 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -62,7 +62,7 @@ UString::UString(const TQString &d) { unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } @@ -1166,4 +1166,4 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath, f.close(); } //END -// 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/katejscript.h b/kate/part/katejscript.h index b439e7754..98b2ad85e 100644 --- a/kate/part/katejscript.h +++ b/kate/part/katejscript.h @@ -64,7 +64,7 @@ class KateJScript /** * creates a JS wrapper object for given KateDocument - * @param exec execution state, to tqfind out interpreter to use + * @param exec execution state, to find out interpreter to use * @param doc document object to wrap * @return new js wrapper object */ @@ -72,7 +72,7 @@ class KateJScript /** * creates a JS wrapper object for given KateView - * @param exec execution state, to tqfind out interpreter to use + * @param exec execution state, to find out interpreter to use * @param view view object to wrap * @return new js wrapper object */ @@ -230,4 +230,4 @@ class KateIndentJScriptManager: public KateIndentScriptManagerAbstract #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/katelinerange.cpp b/kate/part/katelinerange.cpp index 212aaf921..7500b4e8a 100644 --- a/kate/part/katelinerange.cpp +++ b/kate/part/katelinerange.cpp @@ -72,4 +72,4 @@ bool operator<= (const KateLineRange& r, const KateTextCursor& c) return r.line < c.line() || r.startCol <= c.col(); } -// 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/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index f414b4d6d..dbc7d1fa4 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -367,7 +367,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force) if (!m_scripts.isEmpty()) return; - kdDebug()<<"================================================="<<endl<<"Trying to tqfind Lua scripts"<<endl + kdDebug()<<"================================================="<<endl<<"Trying to find Lua scripts"<<endl <<"================================================="<<endl; // We'll store the scripts list in this config @@ -525,4 +525,4 @@ void KateLUAIndentScriptManager::parseScriptHeader(const TQString &filePath, //END #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/kateluaindentscript.h b/kate/part/kateluaindentscript.h index 4b1de0429..a03a85574 100644 --- a/kate/part/kateluaindentscript.h +++ b/kate/part/kateluaindentscript.h @@ -66,4 +66,4 @@ class KateLUAIndentScriptManager: public KateIndentScriptManagerAbstract #endif #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/kateprinter.cpp b/kate/part/kateprinter.cpp index f7869afef..e0dbdc728 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc) // This retrieves all tags, ued or not, but // none of theese operations should be expensive, // and searcing each tag in the format strings is avoided. - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQMap<TQString,TQString> tags; KUser u (KUser::UseRealUserID); @@ -221,7 +221,7 @@ bool KatePrinter::print (KateDocument *doc) while ( pos > -1 ) { rep = tags[reTags.cap( 1 )]; - headerTags.tqreplace( (uint)pos, 2, rep ); + headerTags.replace( (uint)pos, 2, rep ); pos += rep.length(); pos = reTags.search( headerTags, pos ); } @@ -248,7 +248,7 @@ bool KatePrinter::print (KateDocument *doc) while ( pos > -1 ) { rep = tags[reTags.cap( 1 )]; - footerTags.tqreplace( (uint)pos, 2, rep ); + footerTags.replace( (uint)pos, 2, rep ); pos += rep.length(); pos = reTags.search( footerTags, pos ); } @@ -339,7 +339,7 @@ bool KatePrinter::print (KateDocument *doc) // now that we know the vertical amount of space needed, // it is possible to calculate the total number of pages - // if needed, that is if any header/footer tag tqcontains "%P". + // if needed, that is if any header/footer tag contains "%P". if ( headerTagList.grep("%P").count() || footerTagList.grep("%P").count() ) { kdDebug(13020)<<"'%P' found! calculating number of pages..."<<endl; @@ -378,9 +378,9 @@ bool KatePrinter::print (KateDocument *doc) TQString re("%P"); TQStringList::Iterator it; for ( it=headerTagList.begin(); it!=headerTagList.end(); ++it ) - (*it).tqreplace( re, TQString( "%1" ).arg( _pages ) ); + (*it).replace( re, TQString( "%1" ).arg( _pages ) ); for ( it=footerTagList.begin(); it!=footerTagList.end(); ++it ) - (*it).tqreplace( re, TQString( "%1" ).arg( _pages ) ); + (*it).replace( re, TQString( "%1" ).arg( _pages ) ); } } // end prepare block @@ -425,7 +425,7 @@ bool KatePrinter::print (KateDocument *doc) for (int i=0; i<3; i++) { s = headerTagList[i]; - if (s.tqfind("%p") != -1) s.tqreplace("%p", TQString::number(currentPage)); + if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s); align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); } @@ -453,7 +453,7 @@ bool KatePrinter::print (KateDocument *doc) for (int i=0; i<3; i++) { s = footerTagList[i]; - if (s.tqfind("%p") != -1) s.tqreplace("%p", TQString::number(currentPage)); + if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s); align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); } @@ -1002,4 +1002,4 @@ void KatePrintLayout::setOptions( const TQMap<TQString,TQString>& opts ) #include "kateprinter.moc" #endif //!Q_WS_WIN -// 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/katerenderer.cpp b/kate/part/katerenderer.cpp index c5c6992c7..265a98282 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i if (isIMSel && !isTab) { // input method selection - fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground); + fillColor = m_view->colorGroup().color(TQColorGroup::Foreground); } else if (isIMEdit && !isTab) { // XIM support // input method edit area - const TQColorGroup& cg = m_view->tqcolorGroup(); + const TQColorGroup& cg = m_view->colorGroup(); int h1, s1, v1, h2, s2, v2; cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); @@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i if (isIMSel && paintBackground && !isTab) { paint.save(); - paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) ); + paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) ); } // Draw indentation markers. @@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) KateFontStruct *fs = config()->fontStruct(); - const TQChar *tqunicode = textLine->text(); + const TQChar *unicode = textLine->text(); const TQString &textString = textLine->string(); int x = 0; @@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) x += width; - if (z < len && tqunicode[z] == TQChar('\t')) + if (z < len && unicode[z] == TQChar('\t')) x -= x % width; } @@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u *needWrap = false; const uint len = textLine->length(); - const TQChar *tqunicode = textLine->text(); + const TQChar *unicode = textLine->text(); const TQString &textString = textLine->string(); uint z = startcol; @@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u // How should tabs be treated when they word-wrap on a print-out? // if startcol != 0, this messes up (then again, word wrapping messes up anyway) - if (tqunicode[z] == TQChar('\t')) + if (unicode[z] == TQChar('\t')) x -= x % width; - if (tqunicode[z].isSpace()) + if (unicode[z].isSpace()) { lastWhiteSpace = z+1; lastWhiteSpaceX = x; @@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) if (!textLine) return 0; const uint len = textLine->length(); - const TQChar *tqunicode = textLine->text(); + const TQChar *unicode = textLine->text(); const TQString &textString = textLine->string(); x = oldX = 0; @@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) x += width; - if (z < len && tqunicode[z] == TQChar('\t')) + if (z < len && unicode[z] == TQChar('\t')) x -= x % width; z++; @@ -1029,4 +1029,4 @@ uint KateRenderer::spaceWidth() return attribute(0)->width(*config()->fontStruct(), TQChar(' '), m_tabWidth); } -// 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/kateschema.cpp b/kate/part/kateschema.cpp index 9bd0738d9..6e73a9f75 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -244,7 +244,7 @@ uint KateSchemaManager::number (const TQString &name) return 1; int i; - if ((i = m_schemas.tqfindIndex(name)) > -1) + if ((i = m_schemas.findIndex(name)) > -1) return i; return 0; @@ -281,19 +281,19 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Normal text:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_back = new KColorButton(b); b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Selected text:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_selected = new KColorButton(b); b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Current line:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_current = new KColorButton(b); // Markers from kdelibs/interfaces/ktextinterface/markinterface.h @@ -319,31 +319,31 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Left border background:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_iconborder = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Line numbers:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_linenumber = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Bracket highlight:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_bracket = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Word wrap markers:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_wwmarker = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Tab markers:"), b); - label->tqsetAlignment( AlignLeft|AlignVCenter); + label->setAlignment( AlignLeft|AlignVCenter); m_tmarker = new KColorButton(b); blay->addWidget(gbBorder); @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->tqparentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>")); @@ -416,7 +416,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); // If we havent this schema, read in from config file - if ( ! m_schemas.tqcontains( newSchema ) ) + if ( ! m_schemas.contains( newSchema ) ) { // fallback defaults TQColor tmp0 (KGlobalSettings::baseColor()); @@ -545,7 +545,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * m_fontchooser->enableColumn(KFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); m_schema = -1; } @@ -599,7 +599,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -679,11 +679,11 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co m_hlDict.setAutoDelete (true); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); // hl chooser TQHBox *hbHl = new TQHBox( this ); - tqlayout->add (hbHl); + layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); @@ -702,7 +702,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co // styles listview m_styles = new KateStyleListView( this, true ); - tqlayout->addWidget (m_styles, 999); + layout->addWidget (m_styles, 999); hlCombo->setCurrentItem ( hl ); hlChanged ( hl ); @@ -716,7 +716,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.<p>You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() @@ -746,7 +746,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) m_hlDict[m_schema]->setAutoDelete (true); } - if (!m_hlDict[m_schema]->tqfind(m_hl)) + if (!m_hlDict[m_schema]->find(m_hl)) { kdDebug(13030) << "NEW HL, create list" << endl; @@ -775,20 +775,20 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) m_styles->viewport()->setPalette( p ); TQDict<KateStyleListCaption> prefixes; - for ( KateHlItemData *itemData = m_hlDict[m_schema]->tqfind(m_hl)->last(); + for ( KateHlItemData *itemData = m_hlDict[m_schema]->find(m_hl)->last(); itemData != 0L; - itemData = m_hlDict[m_schema]->tqfind(m_hl)->prev()) + itemData = m_hlDict[m_schema]->find(m_hl)->prev()) { kdDebug(13030) << "insert items " << itemData->name << endl; // All stylenames have their language mode prefixed, e.g. HTML:Comment // split them and put them into nice substructures. - int c = itemData->name.tqfind(':'); + int c = itemData->name.find(':'); if ( c > 0 ) { TQString prefix = itemData->name.left(c); TQString name = itemData->name.mid(c+1); - KateStyleListCaption *parent = prefixes.tqfind( prefix ); + KateStyleListCaption *parent = prefixes.find( prefix ); if ( ! parent ) { parent = new KateStyleListCaption( m_styles, prefix ); @@ -826,10 +826,10 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc : KateConfigPage( parent ), m_lastSchema (-1) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); TQHBox *hbHl = new TQHBox( this ); - tqlayout->add (hbHl); + layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl ); schemaCombo = new TQComboBox( false, hbHl ); @@ -845,7 +845,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc m_tabWidget = new TQTabWidget ( this ); m_tabWidget->setMargin (KDialog::marginHint()); - tqlayout->add (m_tabWidget); + layout->add (m_tabWidget); connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *))); @@ -863,7 +863,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc m_tabWidget->addTab (m_highlightTab, i18n("Highlighting Text Styles")); hbHl = new TQHBox( this ); - tqlayout->add (hbHl); + layout->add (hbHl); hbHl->setSpacing( KDialog::spacingHint() ); lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl ); defaultSchemaCombo = new TQComboBox( false, hbHl ); @@ -969,7 +969,7 @@ void KateSchemaConfigPage::newSchema () // soft update, no load from disk KateFactory::self()->schemaManager()->update (false); - int i = KateFactory::self()->schemaManager()->list ().tqfindIndex (t); + int i = KateFactory::self()->schemaManager()->list ().findIndex (t); update (); if (i > -1) @@ -1021,7 +1021,7 @@ void KateViewSchemaAction::slotAboutToShow() { TQString hlName = KateFactory::self()->schemaManager()->list().operator[](z); - if (names.tqcontains(hlName) < 1) + if (names.contains(hlName) < 1) { names << hlName; popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0, z+1); @@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob TQPixmap scl(16,16); scl.fill( i->style()->selectedTextColor() ); TQPixmap bgcl(16,16); - bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() ); + bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() ); TQPixmap sbgcl(16,16); - sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() ); + sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() ); if ( showtitle ) m.insertTitle( i->contextName(), KateStyleListItem::ContextName ); @@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi if ( dynamic_cast<KateStyleListItem*>(i) ) { if ( btn == Qt::LeftButton && c > 0 ) { // map pos to item/column and call KateStyleListItem::activate(col, pos) - ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) ); + ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); } } } @@ -1321,7 +1321,7 @@ void KateStyleListItem::activate( int column, const TQPoint &localPos ) default: return; } - if ( !TQRect( x, 0, w, BoxSize ).tqcontains( localPos ) ) + if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) ) changeProperty( (Property)column ); } @@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle() delete is; is = new KateAttribute( *ds ); updateStyle(); - tqrepaint(); + repaint(); } } @@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column ) break; } - tqrepaint(); + repaint(); } void KateStyleListItem::unsetColor( int c ) @@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int Q_ASSERT( lv ); //### // use a private color group and set the text/highlighted text colors - TQColorGroup mcg = lv->viewport()->tqcolorGroup(); + TQColorGroup mcg = lv->viewport()->colorGroup(); if ( col ) // col 0 is drawn by the superclass method p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) ); @@ -1492,7 +1492,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int } TQFont f ( ((KateStyleListView*)lv)->docfont ); p->setFont( is->font(f) ); - // FIXME - tqrepainting when text is cropped, and the column is enlarged is buggy. + // FIXME - repainting when text is cropped, and the column is enlarged is buggy. // Maybe I need painting the string myself :( // (wilbert) it depends on the font used TQListViewItem::paintCell( p, mcg, col, width, align ); @@ -1602,10 +1602,10 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, Q_ASSERT( lv ); //### // use the same colorgroup as the other items in the viewport - TQColorGroup mcg = lv->viewport()->tqcolorGroup(); + TQColorGroup mcg = lv->viewport()->colorGroup(); TQListViewItem::paintCell( p, mcg, col, width, align ); } //END -// 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/kateschema.h b/kate/part/kateschema.h index 021c8787a..38b15a054 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public QWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) protected slots: void slotMarkerColorChanged(const TQColor&); @@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public QWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) private: class KFontChooser *m_fontchooser; @@ -320,4 +320,4 @@ class KateSchemaConfigPage : public KateConfigPage #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/katesearch.cpp b/kate/part/katesearch.cpp index 987fbb63b..742b57a3f 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -45,7 +45,7 @@ //BEGIN KateSearch TQStringList KateSearch::s_searchList = TQStringList(); -TQStringList KateSearch::s_tqreplaceList = TQStringList(); +TQStringList KateSearch::s_replaceList = TQStringList(); TQString KateSearch::s_pattern = TQString(); static const bool arbitraryHLExample = false; @@ -53,12 +53,12 @@ KateSearch::KateSearch( KateView* view ) : TQObject( view, "kate search" ) , m_view( view ) , m_doc( view->doc() ) - , tqreplacePrompt( new KateReplacePrompt( view ) ) + , replacePrompt( new KateReplacePrompt( view ) ) { m_arbitraryHLList = new KateSuperRangeList(); if (arbitraryHLExample) m_doc->arbitraryHL()->addHighlightToView(m_arbitraryHLList, m_view); - connect(tqreplacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(tqreplaceSlot())); + connect(replacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(replaceSlot())); } KateSearch::~KateSearch() @@ -68,20 +68,20 @@ KateSearch::~KateSearch() void KateSearch::createActions( KActionCollection* ac ) { - KStdAction::tqfind( this, TQT_SLOT(tqfind()), ac )->setWhatsThis( + KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis( i18n("Look up the first occurrence of a piece of text or regular expression.")); - KStdAction::tqfindNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis( + KStdAction::findNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis( i18n("Look up the next occurrence of the search phrase.")); - KStdAction::tqfindPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_tqfind_prev" )->setWhatsThis( + KStdAction::findPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis( i18n("Look up the previous occurrence of the search phrase.")); - KStdAction::tqreplace( this, TQT_SLOT(tqreplace()), ac )->setWhatsThis( - i18n("Look up a piece of text or regular expression and tqreplace the result with some given text.")); + KStdAction::replace( this, TQT_SLOT(replace()), ac )->setWhatsThis( + i18n("Look up a piece of text or regular expression and replace the result with some given text.")); } void KateSearch::addToList( TQStringList& list, const TQString& s ) { if( list.count() > 0 ) { - TQStringList::Iterator it = list.tqfind( s ); + TQStringList::Iterator it = list.find( s ); if( *it != 0L ) list.remove( it ); if( list.count() >= 16 ) @@ -90,30 +90,30 @@ void KateSearch::addToList( TQStringList& list, const TQString& s ) list.prepend( s ); } -void KateSearch::tqfind() +void KateSearch::find() { // if multiline selection around, search in it long searchf = KateViewConfig::global()->searchFlags(); if (m_view->hasSelection() && m_view->selStartLine() != m_view->selEndLine()) searchf |= KFindDialog::SelectedText; - KFindDialog *tqfindDialog = new KFindDialog ( m_view, "", searchf, + KFindDialog *findDialog = new KFindDialog ( m_view, "", searchf, s_searchList, m_view->hasSelection() ); - tqfindDialog->setPattern (getSearchText()); + findDialog->setPattern (getSearchText()); - if( tqfindDialog->exec() == TQDialog::Accepted ) { - s_searchList = tqfindDialog->tqfindHistory () ; + if( findDialog->exec() == TQDialog::Accepted ) { + s_searchList = findDialog->findHistory () ; // Do *not* remove the TQString() wrapping, it fixes a nasty crash - tqfind( TQString(s_searchList.first()), tqfindDialog->options(), true, true ); + find( TQString(s_searchList.first()), findDialog->options(), true, true ); } - delete tqfindDialog; - m_view->tqrepaintText (); + delete findDialog; + m_view->repaintText (); } -void KateSearch::tqfind( const TQString &pattern, long flags, bool add, bool shownotfound ) +void KateSearch::find( const TQString &pattern, long flags, bool add, bool shownotfound ) { KateViewConfig::global()->setSearchFlags( flags ); if( add ) @@ -130,7 +130,7 @@ void KateSearch::tqfind( const TQString &pattern, long flags, bool add, bool sho searchFlags.backward = KateViewConfig::global()->searchFlags() & KFindDialog::FindBackwards; searchFlags.selected = KateViewConfig::global()->searchFlags() & KFindDialog::SelectedText; searchFlags.prompt = false; - searchFlags.tqreplace = false; + searchFlags.replace = false; searchFlags.finished = false; searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression; searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference; @@ -151,7 +151,7 @@ void KateSearch::tqfind( const TQString &pattern, long flags, bool add, bool sho search( searchFlags ); } -void KateSearch::tqreplace() +void KateSearch::replace() { if (!doc()->isReadWrite()) return; @@ -160,33 +160,33 @@ void KateSearch::tqreplace() if (m_view->hasSelection() && m_view->selStartLine() != m_view->selEndLine()) searchf |= KFindDialog::SelectedText; - KReplaceDialog *tqreplaceDialog = new KReplaceDialog ( m_view, "", searchf, - s_searchList, s_tqreplaceList, m_view->hasSelection() ); + KReplaceDialog *replaceDialog = new KReplaceDialog ( m_view, "", searchf, + s_searchList, s_replaceList, m_view->hasSelection() ); - tqreplaceDialog->setPattern (getSearchText()); + replaceDialog->setPattern (getSearchText()); - if( tqreplaceDialog->exec() == TQDialog::Accepted ) { - long opts = tqreplaceDialog->options(); - m_tqreplacement = tqreplaceDialog->tqreplacement(); - s_searchList = tqreplaceDialog->tqfindHistory () ; - s_tqreplaceList = tqreplaceDialog->tqreplacementHistory () ; + if( replaceDialog->exec() == TQDialog::Accepted ) { + long opts = replaceDialog->options(); + m_replacement = replaceDialog->replacement(); + s_searchList = replaceDialog->findHistory () ; + s_replaceList = replaceDialog->replacementHistory () ; // Do *not* remove the TQString() wrapping, it fixes a nasty crash - tqreplace( TQString(s_searchList.first()), m_tqreplacement, opts ); + replace( TQString(s_searchList.first()), m_replacement, opts ); } - delete tqreplaceDialog; + delete replaceDialog; m_view->update (); } -void KateSearch::tqreplace( const TQString& pattern, const TQString &tqreplacement, long flags ) +void KateSearch::replace( const TQString& pattern, const TQString &replacement, long flags ) { if (!doc()->isReadWrite()) return; addToList( s_searchList, pattern ); s_pattern = pattern; - addToList( s_tqreplaceList, tqreplacement ); - m_tqreplacement = tqreplacement; + addToList( s_replaceList, replacement ); + m_replacement = replacement; KateViewConfig::global()->setSearchFlags( flags ); SearchFlags searchFlags; @@ -197,7 +197,7 @@ void KateSearch::tqreplace( const TQString& pattern, const TQString &tqreplaceme searchFlags.backward = KateViewConfig::global()->searchFlags() & KFindDialog::FindBackwards; searchFlags.selected = KateViewConfig::global()->searchFlags() & KFindDialog::SelectedText; searchFlags.prompt = KateViewConfig::global()->searchFlags() & KReplaceDialog::PromptOnReplace; - searchFlags.tqreplace = true; + searchFlags.replace = true; searchFlags.finished = false; searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression; searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference; @@ -216,7 +216,7 @@ void KateSearch::tqreplace( const TQString& pattern, const TQString &tqreplaceme search( searchFlags ); } -void KateSearch::tqfindAgain( bool reverseDirection ) +void KateSearch::findAgain( bool reverseDirection ) { SearchFlags searchFlags; searchFlags.caseSensitive = KateViewConfig::global()->searchFlags() & KFindDialog::CaseSensitive; @@ -226,7 +226,7 @@ void KateSearch::tqfindAgain( bool reverseDirection ) searchFlags.backward = KateViewConfig::global()->searchFlags() & KFindDialog::FindBackwards; searchFlags.selected = KateViewConfig::global()->searchFlags() & KFindDialog::SelectedText; searchFlags.prompt = KateViewConfig::global()->searchFlags() & KReplaceDialog::PromptOnReplace; - searchFlags.tqreplace = false; + searchFlags.replace = false; searchFlags.finished = false; searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression; searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference; @@ -263,14 +263,14 @@ void KateSearch::search( SearchFlags flags ) s.flags.finished = true; } - if( s.flags.tqreplace ) { - tqreplaces = 0; + if( s.flags.replace ) { + replaces = 0; if( s.flags.prompt ) promptReplace(); else - tqreplaceAll(); + replaceAll(); } else { - tqfindAgain(); + findAgain(); } } @@ -301,17 +301,17 @@ void KateSearch::wrapSearch() } // oh, we wrapped around one time allready now ! - // only check that on tqreplace - s.wrapped = s.flags.tqreplace; + // only check that on replace + s.wrapped = s.flags.replace; - tqreplaces = 0; + replaces = 0; s.flags.finished = true; } -void KateSearch::tqfindAgain() +void KateSearch::findAgain() { if( s_pattern.isEmpty() ) { - tqfind(); + find(); return; } @@ -320,7 +320,7 @@ void KateSearch::tqfindAgain() } else if( !s.flags.finished ) { if( askContinue() ) { wrapSearch(); - tqfindAgain(); + findAgain(); } else { if (arbitraryHLExample) m_arbitraryHLList->clear(); } @@ -334,23 +334,23 @@ void KateSearch::tqfindAgain() } } -void KateSearch::tqreplaceAll() +void KateSearch::replaceAll() { doc()->editStart (); while( doSearch( s_pattern ) ) - tqreplaceOne(); + replaceOne(); doc()->editEnd (); if( !s.flags.finished ) { if( askContinue() ) { wrapSearch(); - tqreplaceAll(); + replaceAll(); } } else { KMessageBox::information( view(), - i18n("%n tqreplacement made.","%n tqreplacements made.",tqreplaces), + i18n("%n replacement made.","%n replacements made.",replaces), i18n("Replace") ); } } @@ -359,30 +359,30 @@ void KateSearch::promptReplace() { if ( doSearch( s_pattern ) ) { exposeFound( s.cursor, s.matchedLength ); - tqreplacePrompt->show(); - tqreplacePrompt->setFocus (); + replacePrompt->show(); + replacePrompt->setFocus (); } else if( !s.flags.finished && askContinue() ) { wrapSearch(); promptReplace(); } else { if (arbitraryHLExample) m_arbitraryHLList->clear(); - tqreplacePrompt->hide(); + replacePrompt->hide(); KMessageBox::information( view(), - i18n("%n tqreplacement made.","%n tqreplacements made.",tqreplaces), + i18n("%n replacement made.","%n replacements made.",replaces), i18n("Replace") ); } } -void KateSearch::tqreplaceOne() +void KateSearch::replaceOne() { - TQString tqreplaceWith = m_tqreplacement; + TQString replaceWith = m_replacement; if ( s.flags.regExp && s.flags.useBackRefs ) { // Replace each "\0"..."\9" with the corresponding capture, // "\n" and "\t" with newline and tab, // "\\" with "\", // and remove the "\" for any other sequence. TQRegExp br("\\\\(.)"); - int pos = br.search( tqreplaceWith ); + int pos = br.search( replaceWith ); int ncaps = m_re.numCaptures(); while ( pos >= 0 ) { TQString substitute; @@ -393,7 +393,7 @@ void KateSearch::tqreplaceOne() if (ccap <= ncaps ) { substitute = m_re.cap( ccap ); } else { - kdDebug()<<"KateSearch::tqreplaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<m_re.pattern()<<"'"<<endl; + kdDebug()<<"KateSearch::replaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<m_re.pattern()<<"'"<<endl; break; } } else if ( argument == 'n' ) { @@ -404,27 +404,27 @@ void KateSearch::tqreplaceOne() // handle a validly escaped backslash, or an invalid escape. substitute = argument; } - tqreplaceWith.tqreplace( pos, br.matchedLength(), substitute ); - pos = br.search( tqreplaceWith, pos + substitute.length() ); + replaceWith.replace( pos, br.matchedLength(), substitute ); + pos = br.search( replaceWith, pos + substitute.length() ); } } doc()->editStart(); doc()->removeText( s.cursor.line(), s.cursor.col(), s.cursor.line(), s.cursor.col() + s.matchedLength ); - doc()->insertText( s.cursor.line(), s.cursor.col(), tqreplaceWith ); + doc()->insertText( s.cursor.line(), s.cursor.col(), replaceWith ); doc()->editEnd(), - tqreplaces++; + replaces++; // if we inserted newlines, we better adjust. - uint newlines = tqreplaceWith.tqcontains('\n'); + uint newlines = replaceWith.contains('\n'); if ( newlines ) { if ( ! s.flags.backward ) { s.cursor.setLine( s.cursor.line() + newlines ); - s.cursor.setCol( tqreplaceWith.length() - tqreplaceWith.tqfindRev('\n') ); + s.cursor.setCol( replaceWith.length() - replaceWith.findRev('\n') ); } // selection? if ( s.flags.selected ) @@ -435,17 +435,17 @@ void KateSearch::tqreplaceOne() // adjust selection endcursor if needed if( s.flags.selected && s.cursor.line() == s.selEnd.line() ) { - s.selEnd.setCol(s.selEnd.col() + tqreplaceWith.length() - s.matchedLength ); + s.selEnd.setCol(s.selEnd.col() + replaceWith.length() - s.matchedLength ); } // adjust wrap cursor if needed if( s.cursor.line() == s.wrappedEnd.line() && s.cursor.col() <= s.wrappedEnd.col()) { - s.wrappedEnd.setCol(s.wrappedEnd.col() + tqreplaceWith.length() - s.matchedLength ); + s.wrappedEnd.setCol(s.wrappedEnd.col() + replaceWith.length() - s.matchedLength ); } if( !s.flags.backward ) { - s.cursor.setCol(s.cursor.col() + tqreplaceWith.length()); + s.cursor.setCol(s.cursor.col() + replaceWith.length()); } else if( s.cursor.col() > 0 ) { s.cursor.setCol(s.cursor.col() - 1); } else { @@ -470,12 +470,12 @@ void KateSearch::skipOne() } } -void KateSearch::tqreplaceSlot() { - switch( (Dialog_results)tqreplacePrompt->result() ) { - case srCancel: tqreplacePrompt->hide(); break; - case srAll: tqreplacePrompt->hide(); tqreplaceAll(); break; - case srYes: tqreplaceOne(); promptReplace(); break; - case srLast: tqreplacePrompt->hide(), tqreplaceOne(); break; +void KateSearch::replaceSlot() { + switch( (Dialog_results)replacePrompt->result() ) { + case srCancel: replacePrompt->hide(); break; + case srAll: replacePrompt->hide(); replaceAll(); break; + case srYes: replaceOne(); promptReplace(); break; + case srLast: replacePrompt->hide(), replaceOne(); break; case srNo: skipOne(); promptReplace(); break; } } @@ -483,9 +483,9 @@ void KateSearch::tqreplaceSlot() { bool KateSearch::askContinue() { TQString made = - i18n( "%n tqreplacement made.", - "%n tqreplacements made.", - tqreplaces ); + i18n( "%n replacement made.", + "%n replacements made.", + replaces ); TQString reached = !s.flags.backward ? i18n( "End of document reached." ) : @@ -502,12 +502,12 @@ bool KateSearch::askContinue() i18n( "Continue from the beginning?" ) : i18n( "Continue from the end?" ); - TQString text = s.flags.tqreplace ? + TQString text = s.flags.replace ? made + "\n" + reached + "\n" + question : reached + "\n" + question; return KMessageBox::Yes == KMessageBox::questionYesNo( - view(), text, s.flags.tqreplace ? i18n("Replace") : i18n("Find"), + view(), text, s.flags.replace ? i18n("Replace") : i18n("Find"), KStdGuiItem::cont(), i18n("&Stop") ); } @@ -553,8 +553,8 @@ TQString KateSearch::getSearchText() break; } - str.tqreplace( TQRegExp("^\\n"), "" ); - str.tqreplace( TQRegExp("\\n.*"), "" ); + str.replace( TQRegExp("^\\n"), "" ); + str.replace( TQRegExp("\\n.*"), "" ); return str; } @@ -609,12 +609,12 @@ bool KateSearch::doSearch( const TQString& text ) { KateDocCursor docCursor(line, col, doc()); - // If we're at the top of the document, we're not gonna tqfind anything, so bail. + // If we're at the top of the document, we're not gonna find anything, so bail. if (docCursor.line() == 0 && docCursor.col() == 0) return false; - // Move one step backward before searching, if this is a "tqfind again", we don't - // want to tqfind the same match. + // Move one step backward before searching, if this is a "find again", we don't + // want to find the same match. docCursor.moveBackward(1); line = docCursor.line(); col = docCursor.col(); @@ -816,42 +816,42 @@ void KateReplacePrompt::done (int result) //BEGIN SearchCommand bool SearchCommand::exec(class Kate::View *view, const TQString &cmd, TQString &msg) { - TQString flags, pattern, tqreplacement; - if ( cmd.startsWith( "tqfind" ) ) + TQString flags, pattern, replacement; + if ( cmd.startsWith( "find" ) ) { - static TQRegExp re_tqfind("tqfind(?::([bcersw]*))?\\s+(.+)"); - if ( re_tqfind.search( cmd ) < 0 ) + static TQRegExp re_find("find(?::([bcersw]*))?\\s+(.+)"); + if ( re_find.search( cmd ) < 0 ) { - msg = i18n("Usage: tqfind[:[bcersw]] PATTERN"); + msg = i18n("Usage: find[:[bcersw]] PATTERN"); return false; } - flags = re_tqfind.cap( 1 ); - pattern = re_tqfind.cap( 2 ); + flags = re_find.cap( 1 ); + pattern = re_find.cap( 2 ); } - else if ( cmd.startsWith( "itqfind" ) ) + else if ( cmd.startsWith( "ifind" ) ) { - static TQRegExp re_itqfind("itqfind(?::([bcrs]*))?\\s+(.*)"); - if ( re_itqfind.search( cmd ) < 0 ) + static TQRegExp re_ifind("ifind(?::([bcrs]*))?\\s+(.*)"); + if ( re_ifind.search( cmd ) < 0 ) { - msg = i18n("Usage: itqfind[:[bcrs]] PATTERN"); + msg = i18n("Usage: ifind[:[bcrs]] PATTERN"); return false; } - itqfindClear(); + ifindClear(); return true; } - else if ( cmd.startsWith( "tqreplace" ) ) + else if ( cmd.startsWith( "replace" ) ) { - // Try if the pattern and tqreplacement is quoted, using a quote character ["'] - static TQRegExp re_rep("tqreplace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s+\\2((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$"); + // Try if the pattern and replacement is quoted, using a quote character ["'] + static TQRegExp re_rep("replace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s+\\2((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$"); // Or one quoted argument - TQRegExp re_rep1("tqreplace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$"); + TQRegExp re_rep1("replace(?::([bceprsw]*))?\\s+([\"'])((?:[^\\\\\\\\2]|\\\\.)*)\\2\\s*$"); // Else, it's just one or two (space separated) words - TQRegExp re_rep2("tqreplace(?::([bceprsw]*))?\\s+(\\S+)(.*)"); + TQRegExp re_rep2("replace(?::([bceprsw]*))?\\s+(\\S+)(.*)"); #define unbackslash(s) p=0;\ -while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\ +while ( (p = pattern.find( '\\' + delim, p )) > -1 )\ {\ if ( !p || pattern[p-1] != '\\' )\ pattern.remove( p, 1 );\ @@ -862,15 +862,15 @@ while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\ { flags = re_rep.cap(1); pattern = re_rep.cap( 3 ); - tqreplacement = re_rep.cap( 4 ); + replacement = re_rep.cap( 4 ); int p(0); // unbackslash backslashed delimiter strings // in pattern .. TQString delim = re_rep.cap( 2 ); unbackslash(pattern); - // .. and in tqreplacement - unbackslash(tqreplacement); + // .. and in replacement + unbackslash(replacement); } else if ( re_rep1.search( cmd ) >= 0 ) { @@ -885,35 +885,35 @@ while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\ { flags = re_rep2.cap( 1 ); pattern = re_rep2.cap( 2 ); - tqreplacement = re_rep2.cap( 3 ).stripWhiteSpace(); + replacement = re_rep2.cap( 3 ).stripWhiteSpace(); } else { - msg = i18n("Usage: tqreplace[:[bceprsw]] PATTERN [REPLACEMENT]"); + msg = i18n("Usage: replace[:[bceprsw]] PATTERN [REPLACEMENT]"); return false; } - kdDebug()<<"tqreplace '"<<pattern<<"' with '"<<tqreplacement<<"'"<<endl; + kdDebug()<<"replace '"<<pattern<<"' with '"<<replacement<<"'"<<endl; #undef unbackslash } long f = 0; - if ( flags.tqcontains( 'b' ) ) f |= KFindDialog::FindBackwards; - if ( flags.tqcontains( 'c' ) ) f |= KFindDialog::FromCursor; - if ( flags.tqcontains( 'e' ) ) f |= KFindDialog::SelectedText; - if ( flags.tqcontains( 'r' ) ) f |= KFindDialog::RegularExpression; - if ( flags.tqcontains( 'p' ) ) f |= KReplaceDialog::PromptOnReplace; - if ( flags.tqcontains( 's' ) ) f |= KFindDialog::CaseSensitive; - if ( flags.tqcontains( 'w' ) ) f |= KFindDialog::WholeWordsOnly; - - if ( cmd.startsWith( "tqfind" ) ) + if ( flags.contains( 'b' ) ) f |= KFindDialog::FindBackwards; + if ( flags.contains( 'c' ) ) f |= KFindDialog::FromCursor; + if ( flags.contains( 'e' ) ) f |= KFindDialog::SelectedText; + if ( flags.contains( 'r' ) ) f |= KFindDialog::RegularExpression; + if ( flags.contains( 'p' ) ) f |= KReplaceDialog::PromptOnReplace; + if ( flags.contains( 's' ) ) f |= KFindDialog::CaseSensitive; + if ( flags.contains( 'w' ) ) f |= KFindDialog::WholeWordsOnly; + + if ( cmd.startsWith( "find" ) ) { - ((KateView*)view)->tqfind( pattern, f ); + ((KateView*)view)->find( pattern, f ); return true; } - else if ( cmd.startsWith( "tqreplace" ) ) + else if ( cmd.startsWith( "replace" ) ) { f |= KReplaceDialog::BackReference; // mandatory here? - ((KateView*)view)->tqreplace( pattern, tqreplacement, f ); + ((KateView*)view)->replace( pattern, replacement, f ); return true; } @@ -922,15 +922,15 @@ while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\ bool SearchCommand::help(class Kate::View *, const TQString &cmd, TQString &msg) { - if ( cmd == "tqfind" ) - msg = i18n("<p>Usage: <code>tqfind[:bcersw] PATTERN</code></p>"); + if ( cmd == "find" ) + msg = i18n("<p>Usage: <code>find[:bcersw] PATTERN</code></p>"); - else if ( cmd == "itqfind" ) - msg = i18n("<p>Usage: <code>itqfind:[:bcrs] PATTERN</code>" - "<br>itqfind does incremental or 'as-you-type' search</p>"); + else if ( cmd == "ifind" ) + msg = i18n("<p>Usage: <code>ifind:[:bcrs] PATTERN</code>" + "<br>ifind does incremental or 'as-you-type' search</p>"); else - msg = i18n("<p>Usage: <code>tqreplace[:bceprsw] PATTERN REPLACEMENT</code></p>"); + msg = i18n("<p>Usage: <code>replace[:bceprsw] PATTERN REPLACEMENT</code></p>"); msg += i18n( "<h4><caption>Options</h4><p>" @@ -940,15 +940,15 @@ bool SearchCommand::help(class Kate::View *, const TQString &cmd, TQString &msg) "<br><b>s</b> - Case sensitive search" ); - if ( cmd == "tqfind" ) + if ( cmd == "find" ) msg += i18n( "<br><b>e</b> - Search in selected text only" "<br><b>w</b> - Search whole words only" ); - if ( cmd == "tqreplace" ) + if ( cmd == "replace" ) msg += i18n( - "<br><b>p</b> - Prompt for tqreplace</p>" + "<br><b>p</b> - Prompt for replace</p>" "<p>If REPLACEMENT is not present, an empty string is used.</p>" "<p>If you want to have whitespace in your PATTERN, you need to " "quote both PATTERN and REPLACEMENT with either single or double " @@ -962,30 +962,30 @@ bool SearchCommand::help(class Kate::View *, const TQString &cmd, TQString &msg) TQStringList SearchCommand::cmds() { TQStringList l; - l << "tqfind" << "tqreplace" << "itqfind"; + l << "find" << "replace" << "ifind"; return l; } bool SearchCommand::wantsToProcessText( const TQString &cmdname ) { - return cmdname == "itqfind"; + return cmdname == "ifind"; } void SearchCommand::processText( Kate::View *view, const TQString &cmd ) { - static TQRegExp re_itqfind("itqfind(?::([bcrs]*))?\\s(.*)"); - if ( re_itqfind.search( cmd ) > -1 ) + static TQRegExp re_ifind("ifind(?::([bcrs]*))?\\s(.*)"); + if ( re_ifind.search( cmd ) > -1 ) { - TQString flags = re_itqfind.cap( 1 ); - TQString pattern = re_itqfind.cap( 2 ); + TQString flags = re_ifind.cap( 1 ); + TQString pattern = re_ifind.cap( 2 ); // if there is no setup, or the text length is 0, set up the properties - if ( ! m_itqfindFlags || pattern.isEmpty() ) - itqfindInit( flags ); + if ( ! m_ifindFlags || pattern.isEmpty() ) + ifindInit( flags ); // if there is no fromCursor, add it if this is not the first character - else if ( ! ( m_itqfindFlags & KFindDialog::FromCursor ) && ! pattern.isEmpty() ) - m_itqfindFlags |= KFindDialog::FromCursor; + else if ( ! ( m_ifindFlags & KFindDialog::FromCursor ) && ! pattern.isEmpty() ) + m_ifindFlags |= KFindDialog::FromCursor; // search.. if ( ! pattern.isEmpty() ) @@ -1000,25 +1000,25 @@ void SearchCommand::processText( Kate::View *view, const TQString &cmd ) v->selection().length() + 1 == pattern.length() ) v->setCursorPositionInternal( v->selStartLine(), v->selStartCol() ); - v->tqfind( pattern, m_itqfindFlags, false ); + v->find( pattern, m_ifindFlags, false ); } } } -void SearchCommand::itqfindInit( const TQString &flags ) +void SearchCommand::ifindInit( const TQString &flags ) { long f = 0; - if ( flags.tqcontains( 'b' ) ) f |= KFindDialog::FindBackwards; - if ( flags.tqcontains( 'c' ) ) f |= KFindDialog::FromCursor; - if ( flags.tqcontains( 'r' ) ) f |= KFindDialog::RegularExpression; - if ( flags.tqcontains( 's' ) ) f |= KFindDialog::CaseSensitive; - m_itqfindFlags = f; + if ( flags.contains( 'b' ) ) f |= KFindDialog::FindBackwards; + if ( flags.contains( 'c' ) ) f |= KFindDialog::FromCursor; + if ( flags.contains( 'r' ) ) f |= KFindDialog::RegularExpression; + if ( flags.contains( 's' ) ) f |= KFindDialog::CaseSensitive; + m_ifindFlags = f; } -void SearchCommand::itqfindClear() +void SearchCommand::ifindClear() { - m_itqfindFlags = 0; + m_ifindFlags = 0; } //END SearchCommand -// 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/katesearch.h b/kate/part/katesearch.h index 0e9541069..ebf228dcd 100644 --- a/kate/part/katesearch.h +++ b/kate/part/katesearch.h @@ -39,7 +39,7 @@ class KateSuperRangeList; class KActionCollection; -class KateSearch : public TQObject +class KateSearch : public QObject { Q_OBJECT @@ -55,7 +55,7 @@ class KateSearch : public TQObject bool backward :1; bool selected :1; bool prompt :1; - bool tqreplace :1; + bool replace :1; bool finished :1; bool regExp :1; bool useBackRefs :1; @@ -66,7 +66,7 @@ class KateSearch : public TQObject public: SearchFlags flags; KateTextCursor cursor; - KateTextCursor wrappedEnd; // after wraping around, search/tqreplace until here + KateTextCursor wrappedEnd; // after wraping around, search/replace until here bool wrapped; // have we allready wrapped around ? bool showNotFound; // pop up annoying dialogs? uint matchedLength; @@ -90,52 +90,52 @@ class KateSearch : public TQObject void createActions( KActionCollection* ); public slots: - void tqfind(); + void find(); /** * Search for @p pattern given @p flags - * This is for the commandline "tqfind", and is forwarded by + * This is for the commandline "find", and is forwarded by * KateView. * @param pattern string or regex pattern to search for. * @param flags a OR'ed combination of KFindDialog::Options * @param add wether this string should be added to the recent search list * @param shownotfound wether to pop up "Not round: PATTERN" when that happens. - * That must now be explicitly required -- the tqfind dialog does, but the commandline + * That must now be explicitly required -- the find dialog does, but the commandline * incremental search does not. */ - void tqfind( const TQString &pattern, long flags, bool add=true, bool shownotfound=false ); - void tqreplace(); + void find( const TQString &pattern, long flags, bool add=true, bool shownotfound=false ); + void replace(); /** - * Replace @p pattern with @p tqreplacement given @p flags. - * This is for the commandline "tqreplace" and is forwarded + * Replace @p pattern with @p replacement given @p flags. + * This is for the commandline "replace" and is forwarded * by KateView. * @param pattern string or regular expression to search for - * @param tqreplacement Replacement string. + * @param replacement Replacement string. * @param flags OR'd combination of KFindDialog::Options */ - void tqreplace( const TQString &pattern, const TQString &tqreplacement, long flags ); - void tqfindAgain( bool reverseDirection ); + void replace( const TQString &pattern, const TQString &replacement, long flags ); + void findAgain( bool reverseDirection ); private slots: - void tqreplaceSlot(); - void slotFindNext() { tqfindAgain( false ); } - void slotFindPrev() { tqfindAgain( true ); } + void replaceSlot(); + void slotFindNext() { findAgain( false ); } + void slotFindPrev() { findAgain( true ); } private: static void addToList( TQStringList&, const TQString& ); static void addToSearchList( const TQString& s ) { addToList( s_searchList, s ); } - static void addToReplaceList( const TQString& s ) { addToList( s_tqreplaceList, s ); } + static void addToReplaceList( const TQString& s ) { addToList( s_replaceList, s ); } static TQStringList s_searchList; ///< recent patterns - static TQStringList s_tqreplaceList; ///< recent tqreplacement strings + static TQStringList s_replaceList; ///< recent replacement strings static TQString s_pattern; ///< the string to search for void search( SearchFlags flags ); void wrapSearch(); bool askContinue(); - void tqfindAgain(); + void findAgain(); void promptReplace(); - void tqreplaceAll(); - void tqreplaceOne(); + void replaceAll(); + void replaceOne(); void skipOne(); TQString getSearchText(); @@ -156,14 +156,14 @@ class KateSearch : public TQObject TQValueList<SConfig> m_searchResults; int m_resultIndex; - int tqreplaces; - TQDialog* tqreplacePrompt; - TQString m_tqreplacement; + int replaces; + TQDialog* replacePrompt; + TQString m_replacement; TQRegExp m_re; }; /** - * simple tqreplace prompt dialog + * simple replace prompt dialog */ class KateReplacePrompt : public KDialogBase { @@ -194,7 +194,7 @@ class KateReplacePrompt : public KDialogBase void slotClose (); /** - * tqreplace all pressed + * replace all pressed */ void slotUser1 (); @@ -218,7 +218,7 @@ class KateReplacePrompt : public KDialogBase class SearchCommand : public Kate::Command, public Kate::CommandExtension { public: - SearchCommand() : m_itqfindFlags(0) {;} + SearchCommand() : m_ifindFlags(0) {;} bool exec(class Kate::View *view, const TQString &cmd, TQString &errorMsg); bool help(class Kate::View *, const TQString &, TQString &); TQStringList cmds(); @@ -227,17 +227,17 @@ class SearchCommand : public Kate::Command, public Kate::CommandExtension private: /** - * set up properties for incremental tqfind + * set up properties for incremental find */ - void itqfindInit( const TQString &cmd ); + void ifindInit( const TQString &cmd ); /** - * clear properties for incremental tqfind + * clear properties for incremental find */ - void itqfindClear(); + void ifindClear(); - long m_itqfindFlags; + long m_ifindFlags; }; #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/katespell.cpp b/kate/part/katespell.cpp index 057b39753..6ce2b2a72 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -113,7 +113,7 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to << "ISO 8859-9" << "ISO 8859-13" << "ISO 8859-15" << "UTF-8" << "KOI8-R" << "KOI8-U" << "CP1251" << "CP1255"; - int enc = ksEncodings.tqfindIndex( m_view->doc()->encoding() ); + int enc = ksEncodings.findIndex( m_view->doc()->encoding() ); if ( enc > -1 ) { ksc->setEncoding( enc ); @@ -198,7 +198,7 @@ void KateSpell::spellResult( const TQString& ) void KateSpell::spellCleanDone() { - KSpell::spelltqStatus status = m_kspell->status(); + KSpell::spellStatus status = m_kspell->status(); if( status == KSpell::Error ) { KMessageBox::sorry( 0, @@ -218,4 +218,4 @@ void KateSpell::spellCleanDone() //END -// 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/katespell.h b/kate/part/katespell.h index e815b47ea..f376ece49 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -30,7 +30,7 @@ class KateView; class KAction; class KSpell; -class KateSpell : public TQObject +class KateSpell : public QObject { Q_OBJECT @@ -83,4 +83,4 @@ class KateSpell : 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/katesupercursor.cpp b/kate/part/katesupercursor.cpp index c1895abda..8a2689014 100644 --- a/kate/part/katesupercursor.cpp +++ b/kate/part/katesupercursor.cpp @@ -662,7 +662,7 @@ void KateSuperRangeList::slotDeleted(TQObject* range) m_columnBoundaries.removeRef(r->m_end); } - int index = tqfindRef(r); + int index = findRef(r); if (index != -1) take(index); //else kdDebug(13020)<<"Range not found in list"<<endl; @@ -743,4 +743,4 @@ TQPtrCollection::Item KateSuperRangeList::newItem(TQPtrCollection::Item d) return TQPtrList<KateSuperRange>::newItem(d); } -// 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/katesupercursor.h b/kate/part/katesupercursor.h index 9b4b6a199..ef0fd378d 100644 --- a/kate/part/katesupercursor.h +++ b/kate/part/katesupercursor.h @@ -238,7 +238,7 @@ public: * @todo constrain children when their position changes deliberately; * eliminate() children when they are equivalent to their parents * - * @returns true if the range tqcontains the cursor and no children + * @returns true if the range contains the cursor and no children * also contain it; false otherwise. */ bool owns(const KateTextCursor& cursor) const; @@ -297,7 +297,7 @@ signals: void boundaryDeleted(); /** - * The range now tqcontains no characters (ie. the start and end cursors are the same). + * The range now contains no characters (ie. the start and end cursors are the same). * * To eliminate this range under different conditions, connect the other signal directly * to this signal. @@ -420,7 +420,7 @@ public: signals: /** - * The range now tqcontains no characters (ie. the start and end cursors are the same). + * The range now contains no characters (ie. the start and end cursors are the same). * If autoManage() is true, the range will be deleted after the signal has processed. */ void rangeEliminated(KateSuperRange* range); @@ -460,4 +460,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/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 0930808e9..8e391b620 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -275,7 +275,7 @@ KateSyntaxContextData* KateSyntaxDocument::getGroupInfo(const TQString& mainGrou /** * Returns a list with all the keywords inside the list type */ -TQStringList& KateSyntaxDocument::tqfinddata(const TQString& mainGroup, const TQString& type, bool clearList) +TQStringList& KateSyntaxDocument::finddata(const TQString& mainGroup, const TQString& type, bool clearList) { kdDebug(13010)<<"Create a list of keywords \""<<type<<"\" from \""<<mainGroup<<"\"."<<endl; if (clearList) @@ -472,4 +472,4 @@ void KateSyntaxDocument::setupModeList (bool force) config.sync(); } -// 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/katesyntaxdocument.h b/kate/part/katesyntaxdocument.h index 4204895d0..93deb731d 100644 --- a/kate/part/katesyntaxdocument.h +++ b/kate/part/katesyntaxdocument.h @@ -128,7 +128,7 @@ class KateSyntaxDocument : public QDomDocument /** * Returns a list with all the keywords inside the list type */ - TQStringList& tqfinddata(const TQString& mainGroup,const TQString& type,bool clearList=true); + TQStringList& finddata(const TQString& mainGroup,const TQString& type,bool clearList=true); private: /** @@ -161,4 +161,4 @@ class KateSyntaxDocument : public QDomDocument #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/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp index a4016a0de..52e07a2e4 100644 --- a/kate/part/katetemplatehandler.cpp +++ b/kate/part/katetemplatehandler.cpp @@ -83,7 +83,7 @@ KateTemplateHandler::KateTemplateHandler( if ( rx.cap( 1 ) != "%" || placeholder == value ) buildList.append( KateTemplateHandlerPlaceHolderInfo( pos, value.length(), placeholder ) ); - insertString.tqreplace( pos, rx.matchedLength(), value ); + insertString.replace( pos, rx.matchedLength(), value ); pos += value.length(); opos = pos; } @@ -168,7 +168,7 @@ void KateTemplateHandler::generateRangeTable( uint insertLine, uint insertCol, c ph->ranges.setAutoManage( false ); } - // FIXME handle space/tab tqreplacement correctly make it use of the indenter + // FIXME handle space/tab replacement correctly make it use of the indenter while ( colInText < ( *it ).begin ) { ++col; diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp index 6280c7300..e64b928c7 100644 --- a/kate/part/katetextline.cpp +++ b/kate/part/katetextline.cpp @@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen) int KateTextLine::nextNonSpaceChar(uint pos) const { const uint len = m_text.length(); - const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *unicode = m_text.unicode(); for(uint i = pos; i < len; i++) { - if(!tqunicode[i].isSpace()) + if(!unicode[i].isSpace()) return i; } @@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const if (pos >= (uint)len) pos = len - 1; - const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *unicode = m_text.unicode(); for(int i = pos; i >= 0; i--) { - if(!tqunicode[i].isSpace()) + if(!unicode[i].isSpace()) return i; } @@ -152,20 +152,20 @@ int KateTextLine::lastChar() const const TQChar *KateTextLine::firstNonSpace() const { int first = firstChar(); - return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode(); + return (first > -1) ? ((TQChar*)m_text.unicode())+first : m_text.unicode(); } uint KateTextLine::indentDepth (uint tabwidth) const { uint d = 0; const uint len = m_text.length(); - const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *unicode = m_text.unicode(); for(uint i = 0; i < len; i++) { - if(tqunicode[i].isSpace()) + if(unicode[i].isSpace()) { - if (tqunicode[i] == TQChar('\t')) + if (unicode[i] == TQChar('\t')) d += tabwidth - (d % tabwidth); else d++; @@ -189,11 +189,11 @@ bool KateTextLine::stringAtPos(uint pos, const TQString& match) const // overflow again which (pos+matchlen > len) does not catch; see bugs #129263 and #129580 Q_ASSERT(pos < len); - const TQChar *tqunicode = m_text.tqunicode(); - const TQChar *matchUnicode = match.tqunicode(); + const TQChar *unicode = m_text.unicode(); + const TQChar *matchUnicode = match.unicode(); for (uint i=0; i < matchlen; i++) - if (tqunicode[i+pos] != matchUnicode[i]) + if (unicode[i+pos] != matchUnicode[i]) return false; return true; @@ -206,11 +206,11 @@ bool KateTextLine::startingWith(const TQString& match) const if (matchlen > m_text.length()) return false; - const TQChar *tqunicode = m_text.tqunicode(); - const TQChar *matchUnicode = match.tqunicode(); + const TQChar *unicode = m_text.unicode(); + const TQChar *matchUnicode = match.unicode(); for (uint i=0; i < matchlen; i++) - if (tqunicode[i] != matchUnicode[i]) + if (unicode[i] != matchUnicode[i]) return false; return true; @@ -223,12 +223,12 @@ bool KateTextLine::endingWith(const TQString& match) const if (matchlen > m_text.length()) return false; - const TQChar *tqunicode = m_text.tqunicode(); - const TQChar *matchUnicode = match.tqunicode(); + const TQChar *unicode = m_text.unicode(); + const TQChar *matchUnicode = match.unicode(); uint start = m_text.length() - matchlen; for (uint i=0; i < matchlen; i++) - if (tqunicode[start+i] != matchUnicode[i]) + if (unicode[start+i] != matchUnicode[i]) return false; return true; @@ -239,11 +239,11 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const uint x = 0; const uint n = kMin (pos, m_text.length()); - const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *unicode = m_text.unicode(); for ( uint z = 0; z < n; z++) { - if (tqunicode[z] == TQChar('\t')) + if (unicode[z] == TQChar('\t')) x += tabChars - (x % tabChars); else x++; @@ -257,11 +257,11 @@ uint KateTextLine::lengthWithTabs (uint tabChars) const { uint x = 0; const uint len = m_text.length(); - const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *unicode = m_text.unicode(); for ( uint z = 0; z < len; z++) { - if (tqunicode[z] == TQChar('\t')) + if (unicode[z] == TQChar('\t')) x += tabChars - (x % tabChars); else x++; @@ -278,16 +278,16 @@ bool KateTextLine::searchText (uint startCol, const TQString &text, uint *foundA { int col = startCol; uint l = text.length(); - // allow tqfinding the string ending at eol + // allow finding the string ending at eol if ( col == (int) m_text.length() ) ++startCol; do { - index = m_text.tqfindRev( text, col, casesensitive ); + index = m_text.findRev( text, col, casesensitive ); col--; } while ( col >= 0 && l + index >= startCol ); } else - index = m_text.tqfind (text, startCol, casesensitive); + index = m_text.find (text, startCol, casesensitive); if (index > -1) { @@ -309,7 +309,7 @@ bool KateTextLine::searchText (uint startCol, const TQRegExp ®exp, uint *foun { int col = startCol; - // allow tqfinding the string ending at eol + // allow finding the string ending at eol if ( col == (int) m_text.length() ) ++startCol; do { index = regexp.searchRev (m_text, col); @@ -346,7 +346,7 @@ char *KateTextLine::dump (char *buf, bool withHighlighting) const memcpy(buf, &l, sizeof(uint)); buf += sizeof(uint); - memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l); + memcpy(buf, (char *) m_text.unicode(), sizeof(TQChar)*l); buf += sizeof(TQChar) * l; if (!withHighlighting) @@ -440,4 +440,4 @@ char *KateTextLine::restore (char *buf) return buf; } -// 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/katetextline.h b/kate/part/katetextline.h index a954c87ea..3922d04d0 100644 --- a/kate/part/katetextline.h +++ b/kate/part/katetextline.h @@ -32,10 +32,10 @@ class KateRenderer; class TQTextStream; /** - * The KateTextLine represents a line of text. A text line that tqcontains the + * The KateTextLine represents a line of text. A text line that contains the * text, an attribute for each character, an attribute for the free space * behind the last character and a context number for the syntax highlight. - * The attribute stores the index to a table that tqcontains fonts and colors + * The attribute stores the index to a table that contains fonts and colors * and also if a character is selected. */ class KateTextLine : public KShared @@ -145,16 +145,16 @@ class KateTextLine : public KShared inline TQChar getChar (uint pos) const { return m_text[pos]; } /** - * Gets the text as a tqunicode representation + * Gets the text as a unicode representation * @return text of this line as TQChar array */ - inline const TQChar *text() const { return m_text.tqunicode(); } + inline const TQChar *text() const { return m_text.unicode(); } /** * Highlighting array * The size of this is string().length() * - * This tqcontains the index for the attributes (so you can only + * This contains the index for the attributes (so you can only * have a maximum of 2^8 different highlighting styles in a document) * * To turn this into actual attributes (bold, green, etc), @@ -211,7 +211,7 @@ class KateTextLine : public KShared uint lengthWithTabs (uint tabChars) const; /** - * Can we tqfind the given string at the given position + * Can we find the given string at the given position * @param pos startpostion of given string * @param match string to match at given pos * @return did the string match? @@ -419,7 +419,7 @@ class KateTextLine : public KShared */ private: /** - * text of line as tqunicode + * text of line as unicode */ TQString m_text; @@ -453,4 +453,4 @@ class KateTextLine : public KShared #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/kateundo.cpp b/kate/part/kateundo.cpp index da6a99474..379df16f0 100644 --- a/kate/part/kateundo.cpp +++ b/kate/part/kateundo.cpp @@ -389,4 +389,4 @@ bool KateUndoGroup::isOnlyType(KateUndoGroup::UndoType type) return true; } -// 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/kateundo.h b/kate/part/kateundo.h index 467f5dd58..4d0141189 100644 --- a/kate/part/kateundo.h +++ b/kate/part/kateundo.h @@ -102,7 +102,7 @@ class KateUndoGroup private: /** * singleType - * @return the type if it's only one type, or editInvalid if it tqcontains multiple types. + * @return the type if it's only one type, or editInvalid if it contains multiple types. */ KateUndoGroup::UndoType singleType(); @@ -138,4 +138,4 @@ class KateUndoGroup #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/kateview.cpp b/kate/part/kateview.cpp index a3997ff70..7840e79d5 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -125,7 +125,7 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name ) setPopupMenuInterfaceDCOPSuffix (viewDCOPSuffix()); setSessionConfigInterfaceDCOPSuffix (viewDCOPSuffix()); setViewCursorInterfaceDCOPSuffix (viewDCOPSuffix()); - setViewtqStatusMsgInterfaceDCOPSuffix (viewDCOPSuffix()); + setViewStatusMsgInterfaceDCOPSuffix (viewDCOPSuffix()); setInstance( KateFactory::self()->instance() ); doc->addView( this ); @@ -194,9 +194,9 @@ void KateView::setupConnections() this, TQT_SLOT(slotSaveCanceled(const TQString&)) ); connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)), this, TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); - connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slottqStatusMsg())); - connect(this,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(slottqStatusMsg())); - connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slottqStatusMsg())); + connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg())); + connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg())); + connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotStatusMsg())); if ( m_doc->browserView() ) { @@ -243,13 +243,13 @@ void KateView::setupActions() // setup Tools menu a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, this, TQT_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" - "You can configure whether tabs should be honored and used or tqreplaced with spaces, in the configuration dialog.")); + "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, this, TQT_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); a=new KAction(i18n("&Clean Indentation"), 0, this, TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>" - "You can configure whether tabs should be honored and used or tqreplaced with spaces, in the configuration dialog.")); + "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); a=new KAction(i18n("&Align"), 0, this, TQT_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); @@ -680,7 +680,7 @@ void KateView::slotGotFocus() { m_editActions->accel()->setEnabled( true ); - slottqStatusMsg (); + slotStatusMsg (); } void KateView::slotLostFocus() @@ -693,7 +693,7 @@ void KateView::setDynWrapIndicators(int mode) config()->setDynWordWrapIndicators (mode); } -void KateView::slottqStatusMsg () +void KateView::slotStatusMsg () { TQString ovrstr; if (m_doc->isReadWrite()) @@ -715,14 +715,14 @@ void KateView::slottqStatusMsg () TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString (" "); TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM "); - emit viewtqStatusMsg (s1 + s2 + " " + ovrstr + blockstr + modstr); + emit viewStatusMsg (s1 + s2 + " " + ovrstr + blockstr + modstr); } void KateView::slotSelectionTypeChanged() { m_toggleBlockSelection->setChecked( blockSelectionMode() ); - emit newtqStatus(); + emit newStatus(); } bool KateView::isOverwriteMode() const @@ -733,12 +733,12 @@ bool KateView::isOverwriteMode() const void KateView::reloadFile() { m_doc->reloadFile(); - emit newtqStatus(); + emit newStatus(); } void KateView::slotUpdate() { - emit newtqStatus(); + emit newStatus(); slotNewUndo(); } @@ -753,7 +753,7 @@ void KateView::slotReadWriteChanged () TQStringList l; - l << "edit_tqreplace" << "set_insert" << "tools_spelling" << "tools_indent" + l << "edit_replace" << "set_insert" << "tools_spelling" << "tools_indent" << "tools_unindent" << "tools_cleanIndent" << "tools_align" << "tools_comment" << "tools_uncomment" << "tools_uppercase" << "tools_lowercase" << "tools_capitalize" << "tools_join_lines" << "tools_apply_wordwrap" @@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev ) if ( !m_doc || !m_doc->browserExtension() ) return; emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(), - TQString::tqfromLatin1( "text/plain" ) ); + TQString::fromLatin1( "text/plain" ) ); ev->accept(); } @@ -832,7 +832,7 @@ void KateView::toggleInsert() m_doc->setConfigFlags(m_doc->config()->configFlags() ^ KateDocument::cfOvr); m_toggleInsert->setChecked (isOverwriteMode ()); - emit newtqStatus(); + emit newStatus(); } bool KateView::canDiscard() @@ -1089,29 +1089,29 @@ void KateView::slotNeedTextHint(int line, int col, TQString &text) text=TQString("test %1 %2").arg(line).arg(col); } -void KateView::tqfind() +void KateView::find() { - m_search->tqfind(); + m_search->find(); } -void KateView::tqfind( const TQString& pattern, long flags, bool add ) +void KateView::find( const TQString& pattern, long flags, bool add ) { - m_search->tqfind( pattern, flags, add ); + m_search->find( pattern, flags, add ); } -void KateView::tqreplace() +void KateView::replace() { - m_search->tqreplace(); + m_search->replace(); } -void KateView::tqreplace( const TQString &pattern, const TQString &tqreplacement, long flags ) +void KateView::replace( const TQString &pattern, const TQString &replacement, long flags ) { - m_search->tqreplace( pattern, tqreplacement, flags ); + m_search->replace( pattern, replacement, flags ); } -void KateView::tqfindAgain( bool back ) +void KateView::findAgain( bool back ) { - m_search->tqfindAgain( back ); + m_search->findAgain( back ); } void KateView::slotSelectionChanged () @@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig() // update the text area m_viewInternal->updateView (true); - m_viewInternal->tqrepaint (); + m_viewInternal->repaint (); // update the left border right, for example linenumbers m_viewInternal->leftBorder->updateFont(); - m_viewInternal->leftBorder->tqrepaint (); + m_viewInternal->leftBorder->repaint (); // @@ showIndentLines is not cached anymore. // m_renderer->setShowIndentLines (m_renderer->config()->showIndentationLines()); @@ -1305,7 +1305,7 @@ void KateView::clear () m_viewInternal->clear (); } -void KateView::tqrepaintText (bool paintOnlyDirty) +void KateView::repaintText (bool paintOnlyDirty) { m_viewInternal->paintText(0,0,m_viewInternal->width(),m_viewInternal->height(), paintOnlyDirty); } @@ -1360,7 +1360,7 @@ bool KateView::setSelection( const KateTextCursor& start, const KateTextCursor& tagSelection(oldSelectStart, oldSelectEnd); - tqrepaintText(true); + repaintText(true); emit selectionChanged (); emit m_doc->selectionChanged (); @@ -1405,7 +1405,7 @@ bool KateView::clearSelection(bool redraw, bool finishedChangingSelection) oldSelectEnd = selectEnd; if (redraw) - tqrepaintText(true); + repaintText(true); if (finishedChangingSelection) { @@ -1596,7 +1596,7 @@ void KateView::paste() { m_doc->paste( this ); emit selectionChanged(); - m_viewInternal->tqrepaint(); + m_viewInternal->repaint(); } void KateView::cut() @@ -1736,7 +1736,7 @@ void KateView::lineAsHTML (KateTextLine::Ptr line, uint startCol, uint length, T for (uint curPos=startCol;curPos<(length+startCol);curPos++) { if ( curPos == 0 || line->attribute( curPos ) != line->attribute( curPos - 1 ) && - // Since many highlight files tqcontains itemdatas that have the exact + // Since many highlight files contains itemdatas that have the exact // same styles, join those to keep the HTML text size down KateAttribute(*charAttributes) != KateAttribute(*m_renderer->attribute(line->attribute(curPos))) ) { @@ -1748,7 +1748,7 @@ void KateView::lineAsHTML (KateTextLine::Ptr line, uint startCol, uint length, T charAttributes = m_renderer->attribute(line->attribute(curPos)); - if ( ! stylecache.tqcontains( line->attribute(curPos) ) ) + if ( ! stylecache.contains( line->attribute(curPos) ) ) { TQString textdecoration; TQString style; @@ -1917,4 +1917,4 @@ void KateView::getIMSelectionValue( uint *imStartLine, uint *imStart, uint *imEn } //END IM INPUT STUFF -// 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/kateview.h b/kate/part/kateview.h index aab0a6035..aa428096d 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -56,7 +56,7 @@ class TQGridLayout; // class KateView : public Kate::View, public KTextEditor::SessionConfigInterface, - public KTextEditor::ViewtqStatusMsgInterface, + public KTextEditor::ViewStatusMsgInterface, public KTextEditor::TextHintInterface, public KTextEditor::SelectionInterface, public KTextEditor::SelectionInterfaceExt, @@ -270,7 +270,7 @@ class KateView : public Kate::View, void clear (); - void tqrepaintText (bool paintOnlyDirty = false); + void repaintText (bool paintOnlyDirty = false); void updateView (bool changed = false); //END @@ -376,14 +376,14 @@ class KateView : public Kate::View, public slots: int getEol(); void setEol( int eol ); - void tqfind(); - void tqfind( const TQString&, long, bool add=true ); ///< proxy for KateSearch - void tqreplace(); - void tqreplace( const TQString&, const TQString &, long ); ///< proxy for KateSearch - /** Highly confusing but KateSearch::tqfindAgain() is backwards too. */ - void tqfindAgain( bool back ); - void tqfindAgain() { tqfindAgain( false ); } - void tqfindPrev() { tqfindAgain( true ); } + void find(); + void find( const TQString&, long, bool add=true ); ///< proxy for KateSearch + void replace(); + void replace( const TQString&, const TQString &, long ); ///< proxy for KateSearch + /** Highly confusing but KateSearch::findAgain() is backwards too. */ + void findAgain( bool back ); + void findAgain() { findAgain( false ); } + void findPrev() { findAgain( true ); } void setFoldingMarkersOn( bool enable ); // Not in Kate::View, but should be void setIconBorder( bool enable ); @@ -420,7 +420,7 @@ class KateView : public Kate::View, signals: void gotFocus( Kate::View* ); void lostFocus( Kate::View* ); - void newtqStatus(); // Not in Kate::View, but should be (Kate app connects to it) + void newStatus(); // Not in Kate::View, but should be (Kate app connects to it) // // Extras @@ -443,7 +443,7 @@ class KateView : public Kate::View, signals: void dropEventPass(TQDropEvent*); - void viewtqStatusMsg (const TQString &msg); + void viewStatusMsg (const TQString &msg); public: bool setCursorPositionInternal( uint line, uint col, uint tabwidth = 1, bool calledExternally = false ); @@ -459,7 +459,7 @@ class KateView : public Kate::View, void slotGotFocus(); void slotLostFocus(); void slotDropEventPass( TQDropEvent* ev ); - void slottqStatusMsg(); + void slotStatusMsg(); void slotSaveCanceled( const TQString& error ); void slotExpandToplevel(); void slotCollapseLocal(); diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index 663255714..da88676bc 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -170,7 +170,7 @@ void KateScrollBar::recomputeMarksPositions(bool forceFullUpdate) if (tree) { - KateCodeFoldingNode *node = tree->tqfindNodeForLine(line); + KateCodeFoldingNode *node = tree->findNodeForLine(line); while (node) { @@ -244,7 +244,7 @@ class KateCmdLnWhatsThis : public QWhatsThis Kate::Command *cmd = KateCmd::self()->queryCommand( name ); if ( cmd ) { - if ( cmd->help( (Kate::View*)m_parent->tqparentWidget(), name, s ) ) + if ( cmd->help( (Kate::View*)m_parent->parentWidget(), name, s ) ) return beg + name + mid + s + end; else return beg + name + mid + i18n("No help for '%1'").arg( name ) + end; @@ -380,7 +380,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) void KateCmdLine::hideMe () // unless i have focus ;) { - if ( isVisibleTo(tqparentWidget()) && ! hasFocus() ) { + if ( isVisibleTo(parentWidget()) && ! hasFocus() ) { m_view->toggleCmdLine (); } } @@ -697,7 +697,7 @@ KateIconBorder::KateIconBorder ( KateViewInternal* internalView, TQWidget *paren , m_cachedLNWidth( 0 ) , m_maxCharWidth( 0 ) { - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); setBackgroundMode( NoBackground ); @@ -757,7 +757,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable ) TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); } -TQSize KateIconBorder::tqsizeHint() const +TQSize KateIconBorder::sizeHint() const { int w = 0; @@ -866,7 +866,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) { // we went from n0 ->n9 lines or vice verca // this causes an extra updateGeometry() first time the line numbers - // are displayed, but tqsizeHint() is supposed to be const so we can't set + // are displayed, but sizeHint() is supposed to be const so we can't set // the cached value there. m_cachedLNWidth = lnWidth; m_oldBackgroundColor = m_view->renderer()->config()->iconBarColor(); @@ -1202,4 +1202,4 @@ void KateViewEncodingAction::setMode (int mode) doc->reloadFile(); } -// 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/kateviewhelpers.h b/kate/part/kateviewhelpers.h index 6ba067aea..8e3fa94b3 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -127,7 +127,7 @@ class KateIconBorder : public QWidget KateIconBorder( KateViewInternal* internalView, TQWidget *parent ); // VERY IMPORTANT ;) - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void updateFont(); int lineNumberWidth() const; @@ -204,4 +204,4 @@ class KateViewEncodingAction : public KActionMenu #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/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 8508bd3d0..77f98643d 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -89,7 +89,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // cursor cursor.setMoveOnInsert (true); - // tqinvalidate selStartCached, or keyb selection is screwed initially + // invalidate selStartCached, or keyb selection is screwed initially selStartCached.setLine( -1 ); // // scrollbar for lines @@ -284,7 +284,7 @@ KateTextCursor KateViewInternal::endPos() const } Q_ASSERT(false); - kdDebug(13030) << "WARNING: could not tqfind a lineRange at all" << endl; + kdDebug(13030) << "WARNING: could not find a lineRange at all" << endl; return KateTextCursor(-1, -1); } @@ -765,7 +765,7 @@ void KateViewInternal::makeVisible (const KateTextCursor& c, uint endCol, bool f { //kdDebug() << "MakeVisible start [" << startPos().line << "," << startPos().col << "] end [" << endPos().line << "," << endPos().col << "] -> request: [" << c.line << "," << c.col << "]" <<endl;// , new start [" << scroll.line << "," << scroll.col << "] lines " << (linesDisplayed() - 1) << " height " << height() << endl; // if the line is in a folded region, unfold all the way up - //if ( m_doc->foldingTree()->tqfindNodeForLine( c.line )->visible ) + //if ( m_doc->foldingTree()->findNodeForLine( c.line )->visible ) // kdDebug()<<"line ("<<c.line<<") should be visible"<<endl; if ( force ) @@ -871,7 +871,7 @@ void KateViewInternal::updateMicroFocusHint() { int line = displayViewLine(displayCursor, true); /* Check for hasFocus() to avoid crashes in QXIMInputContext as in bug #131266. - This is only a workaround until somebody can tqfind the real reason of the crash + This is only a workaround until somebody can find the real reason of the crash (probably it's in Qt). */ if (line == -1 || !hasFocus()) return; @@ -1825,7 +1825,7 @@ void KateViewInternal::cursorToMatchingBracket( bool sel ) { KateTextCursor start( cursor ), end; - if( !m_doc->tqfindMatchingBracket( start, end ) ) + if( !m_doc->findMatchingBracket( start, end ) ) return; // The cursor is now placed just to the left of the matching bracket. @@ -2486,7 +2486,7 @@ bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) width() - scrollMargin * 2, height() - scrollMargin * 2 ); - if ( !doNotScrollRegion.tqcontains( currentPoint ) ) + if ( !doNotScrollRegion.contains( currentPoint ) ) { startDragScroll(); // Keep sending move events @@ -2759,7 +2759,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e ) } else { - selStartCached.setLine( -1 ); // tqinvalidate + selStartCached.setLine( -1 ); // invalidate } if( !( e->state() & Qt::ShiftButton ) && isTargetSelected( e->pos() ) ) @@ -3074,7 +3074,7 @@ void KateViewInternal::resizeEvent(TQResizeEvent* e) bool dirtied = false; for (uint i = 0; i < lineRanges.count(); i++) { - // tqfind the first dirty line + // find the first dirty line // the word wrap updateView algorithm is forced to check all lines after a dirty one if (lineRanges[i].wrap || (!expandedHorizontally && (lineRanges[i].endX - lineRanges[i].startX) > width())) { @@ -3493,4 +3493,4 @@ void KateViewInternal::imEndEvent( TQIMEvent *e ) } //END IM INPUT STUFF -// 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/kateviewinternal.h b/kate/part/kateviewinternal.h index a78c0cbe9..9b0a940be 100644 --- a/kate/part/kateviewinternal.h +++ b/kate/part/kateviewinternal.h @@ -221,7 +221,7 @@ class KateViewInternal : public QWidget int scrollX; int scrollY; - Qt::tqCursorShape m_mouseCursor; + Qt::CursorShape m_mouseCursor; KateSuperCursor cursor; KateTextCursor displayCursor; @@ -310,20 +310,20 @@ class KateViewInternal : public QWidget // Returns the lineRange of the specified realLine + viewLine. KateLineRange range(uint realLine, int viewLine); - // tqfind the view line of cursor c (0 = same line, 1 = down one, etc.) + // find the view line of cursor c (0 = same line, 1 = down one, etc.) uint viewLine(const KateTextCursor& realCursor); - // tqfind the view line of the cursor, relative to the display (0 = top line of view, 1 = second line, etc.) + // find the view line of the cursor, relative to the display (0 = top line of view, 1 = second line, etc.) // if limitToVisible is true, only lines which are currently visible will be searched for, and -1 returned if the line is not visible. int displayViewLine(const KateTextCursor& virtualCursor, bool limitToVisible = false); - // tqfind the index of the last view line for a specific line + // find the index of the last view line for a specific line uint lastViewLine(uint realLine); // count the number of view lines for a real line uint viewLineCount(uint realLine); - // tqfind the cursor offset by (offset) view lines from a cursor. + // find the cursor offset by (offset) view lines from a cursor. // when keepX is true, the column position will be calculated based on the x // position of the specified cursor. KateTextCursor viewLineOffset(const KateTextCursor& virtualCursor, int offset, bool keepX = false); @@ -394,4 +394,4 @@ class KateViewInternal : public QWidget #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/test_regression.cpp b/kate/part/test_regression.cpp index b81081b15..e3f9f52e6 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -364,7 +364,7 @@ KJS::Value OutputFunction::call(KJS::ExecState *exec, KJS::Object &thisObj, cons const char failureSnapshotPrefix[] = "testkateregressionrc-FS."; -static TQString tqfindMostRecentFailureSnapshot() { +static TQString findMostRecentFailureSnapshot() { TQDir dir(kapp->dirs()->saveLocation("config"), TQString(failureSnapshotPrefix)+"*", TQDir::Time, TQDir::Files); @@ -515,7 +515,7 @@ int main(int argc, char *argv[]) KateDocument *part = new KateDocument(/*bSingleViewMode*/true, /*bBrowserView*/false, /*bReadOnly*/false, - /*tqparentWidget*/toplevel, + /*parentWidget*/toplevel, /*widgetName*/"testkate"); part->readConfig(&cfg); @@ -560,7 +560,7 @@ int main(int argc, char *argv[]) { TQString failureSnapshot = args->getOption("cmp-failures"); if (failureSnapshot.isEmpty()) - failureSnapshot = tqfindMostRecentFailureSnapshot(); + failureSnapshot = findMostRecentFailureSnapshot(); if (!failureSnapshot.isEmpty()) regressionTest->setFailureSnapshotConfig( new KSimpleConfig(failureSnapshotPrefix + failureSnapshot, true), @@ -659,7 +659,7 @@ RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig, m_view = static_cast<KateView *>(m_part->widget()); m_baseConfig = baseConfig; m_baseDir = baseDir; - m_baseDir = m_baseDir.tqreplace( "//", "/" ); + m_baseDir = m_baseDir.replace( "//", "/" ); if ( m_baseDir.endsWith( "/" ) ) m_baseDir = m_baseDir.left( m_baseDir.length() - 1 ); if (outputDir.isEmpty()) @@ -740,7 +740,7 @@ void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname TQStringList RegressionTest::concatListFiles(const TQString &relPath, const TQString &filename) { TQStringList cmds; - int pos = relPath.tqfindRev('/'); + int pos = relPath.findRev('/'); if (pos >= 0) cmds += concatListFiles(relPath.left(pos), filename); cmds += readListFile(m_baseDir + "/tests/" + relPath + "/" + filename); @@ -779,12 +779,12 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur TQString filename = sourceDir[fileno]; TQString relFilename = relPath.isEmpty() ? filename : relPath+"/"+filename; - if (filename.startsWith(".") || ignoreFiles.tqcontains(filename) ) + if (filename.startsWith(".") || ignoreFiles.contains(filename) ) continue; int failure_type = NoFailure; - if ( failureFiles.tqcontains( filename ) ) + if ( failureFiles.contains( filename ) ) failure_type |= AllFailure; - if ( failureFiles.tqcontains ( filename + "-result" ) ) + if ( failureFiles.contains ( filename + "-result" ) ) failure_type |= ResultFailure; runTests(relFilename, false, failure_type); } @@ -855,7 +855,7 @@ void RegressionTest::createLink( const TQString& test, int failures ) /** returns the path in a way that is relatively reachable from base. * @param base base directory (must not include trailing slash) * @param path directory/file to be relatively reached by base - * @return path with all elements tqreplaced by .. and concerning path elements + * @return path with all elements replaced by .. and concerning path elements * to be relatively reachable from base. */ static TQString makeRelativePath(const TQString &base, const TQString &path) @@ -869,10 +869,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.tqfind('/', pos); + int newpos = absBase.find('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); // kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl; // kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl; // kdDebug() << "pos: " << pos << " newpos: " << newpos << endl; @@ -886,11 +886,11 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) TQString rel; { - TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); // generate as many .. as there are path elements in relBase if (relBase.string().length() > 0) { - for (int i = relBase.string().tqcontains('/'); i > 0; --i) + for (int i = relBase.string().contains('/'); i > 0; --i) rel += "../"; rel += ".."; if (relPath.string().length() > 0) rel += "/"; @@ -935,13 +935,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & ResultFailure ) { domDiff += "<pre>"; - FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" ) + FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { TQString line = is->readLine(); - line = line.tqreplace( '<', "<" ); - line = line.tqreplace( '>', ">" ); + line = line.replace( '<', "<" ); + line = line.replace( '>', ">" ); domDiff += line + "\n"; } delete is; @@ -1026,7 +1026,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) void RegressionTest::testStaticFile(const TQString & filename, const TQStringList &commands) { - tqApp->mainWidget()->resize( 800, 600); // restore size + qApp->mainWidget()->resize( 800, 600); // restore size // Set arguments KParts::URLArgs args; @@ -1271,7 +1271,7 @@ void RegressionTest::printDescription(const TQString& description) if (!description.isEmpty()) { TQString desc = description; - desc.tqreplace( '\n', ' ' ); + desc.replace( '\n', ' ' ); printf(" [%s]", desc.latin1()); } @@ -1291,7 +1291,7 @@ void RegressionTest::createMissingDirs(const TQString & filename) pathComponents.prepend(parentDir.absFilePath()); while (!parentDir.exists()) { TQString parentPath = parentDir.absFilePath(); - int slashPos = parentPath.tqfindRev('/'); + int slashPos = parentPath.findRev('/'); if (slashPos < 0) break; parentPath = parentPath.left(slashPos); @@ -1334,7 +1334,7 @@ bool RegressionTest::svnIgnored( const TQString &filename ) void RegressionTest::resizeTopLevelWidget( int w, int h ) { - tqApp->mainWidget()->resize( w, h ); + qApp->mainWidget()->resize( w, h ); // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event TQApplication::sendPostedEvents( 0, TQEvent::Resize ); } diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h index 6ee708db8..ee4f8fdfa 100644 --- a/kate/part/test_regression.h +++ b/kate/part/test_regression.h @@ -82,7 +82,7 @@ class KateViewObject : public KJS::ObjectImp virtual KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const; private: - // evil hack I: class tqlayout of katejscript/KateJSView must be duplicated + // evil hack I: class layout of katejscript/KateJSView must be duplicated // here, structurally as well as functionally KateView *view; // end evil hack @@ -160,7 +160,7 @@ class OutputFunction : public KJS::ObjectImp /** * @internal */ -class RegressionTest : public TQObject +class RegressionTest : public QObject { Q_OBJECT public: diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 833aa629c..c03fcefe0 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -124,7 +124,7 @@ void AutoBookmarker::slotCompleted() fileName = document()->url().fileName(); ABEntityList *l = ABGlobal::self()->entities(); - // for each item, if either tqmask matches + // for each item, if either mask matches // * apply if onLoad is true ABEntityListIterator it( *l ); int n( 0 ); @@ -132,11 +132,11 @@ void AutoBookmarker::slotCompleted() AutoBookmarkEnt *e; while ( ( e = it.current() ) != 0 ) { - found = ( !e->mimetqmask.count() && !e->filetqmask.count() ); // no preferences + found = ( !e->mimemask.count() && !e->filemask.count() ); // no preferences if ( ! found ) - found = ( ! mt.isEmpty() && e->mimetqmask.tqcontains( mt ) ); + found = ( ! mt.isEmpty() && e->mimemask.contains( mt ) ); if ( ! found ) - for( TQStringList::Iterator it1 = e->filetqmask.begin(); it1 != e->filetqmask.end(); ++it1 ) + for( TQStringList::Iterator it1 = e->filemask.begin(); it1 != e->filemask.end(); ++it1 ) { TQRegExp re(*it1, true, true); if ( ( found = ( ( re.search( fileName ) > -1 ) && ( re.matchedLength() == (int)fileName.length() ) ) ) ) @@ -206,13 +206,13 @@ void ABGlobal::readConfig() while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) ) { config->setGroup( TQString("autobookmark%1").arg( n ) ); - TQStringList filetqmask = config->readListEntry( "filetqmask", ';' ); - TQStringList mimetqmask = config->readListEntry( "mimetqmask", ';' ); + TQStringList filemask = config->readListEntry( "filemask", ';' ); + TQStringList mimemask = config->readListEntry( "mimemask", ';' ); int flags = config->readNumEntry( "flags", 1 ); AutoBookmarkEnt *e = new AutoBookmarkEnt( config->readEntry( "pattern", "" ), - filetqmask, - mimetqmask, + filemask, + mimemask, flags ); @@ -239,8 +239,8 @@ void ABGlobal::writeConfig() AutoBookmarkEnt *e = m_ents->at( i ); config->setGroup( TQString("autobookmark%1").arg( i ) ); config->writeEntry( "pattern", e->pattern ); - config->writeEntry( "filetqmask", e->filetqmask, ';' ); - config->writeEntry( "mimetqmask", e->mimetqmask, ';' ); + config->writeEntry( "filemask", e->filemask, ';' ); + config->writeEntry( "mimemask", e->mimemask, ';' ); config->writeEntry( "flags", e->flags ); } @@ -264,8 +264,8 @@ class AutoBookmarkEntItem : public QListViewItem void redo() { setText( 0, ent->pattern ); - setText( 1, ent->mimetqmask.join("; ") ); - setText( 2, ent->filetqmask.join("; ") ); + setText( 1, ent->mimemask.join("; ") ); + setText( 2, ent->filemask.join("; ") ); } AutoBookmarkEnt *ent; }; @@ -274,7 +274,7 @@ class AutoBookmarkEntItem : public QListViewItem //BEGIN AutoBookmarkerEntEditor // Dialog for editing a single autobookmark entity // * edit the pattern -// * set the file/mime type tqmasks +// * set the file/mime type masks AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmarkEnt *e ) : KDialogBase( parent, "autobookmark_ent_editor", true, i18n("Edit Entry"), @@ -310,19 +310,19 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark "do not know what that is, please read the appendix on regular expressions " "in the kate manual.</p>") ); - l = new TQLabel( i18n("&File tqmask:"), w ); - leFileMask = new TQLineEdit( e->filetqmask.join( "; " ), w ); + l = new TQLabel( i18n("&File mask:"), w ); + leFileMask = new TQLineEdit( e->filemask.join( "; " ), w ); l->setBuddy( leFileMask ); lo->addWidget( l, 3, 0 ); lo->addMultiCellWidget( leFileMask, 3, 3, 1, 2 ); TQWhatsThis::add( leFileMask, i18n( - "<p>A list of filename tqmasks, separated by semicolons. This can be used " + "<p>A list of filename masks, separated by semicolons. This can be used " "to limit the usage of this entity to files with matching names.</p>" "<p>Use the wizard button to the right of the mimetype entry below to " "easily fill out both lists.</p>" ) ); l = new TQLabel( i18n("MIME &types:"), w ); - leMimeTypes = new TQLineEdit( e->mimetqmask.join( "; " ), w ); + leMimeTypes = new TQLineEdit( e->mimemask.join( "; " ), w ); l->setBuddy( leMimeTypes ); lo->addWidget( l, 4, 0 ); lo->addWidget( leMimeTypes, 4, 1 ); @@ -330,7 +330,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark "<p>A list of mime types, separated by semicolon. This can be used to " "limit the usage of this entity to files with matching mime types.</p>" "<p>Use the wizard button on the right to get a list of existing file " - "types to choose from, using it will fill in the file tqmasks as well.</p>" ) ); + "types to choose from, using it will fill in the file masks as well.</p>" ) ); TQToolButton *btnMTW = new TQToolButton(w); lo->addWidget( btnMTW, 4, 2 ); @@ -338,8 +338,8 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); TQWhatsThis::add( btnMTW, i18n( "<p>Click this button to display a checkable list of mimetypes available " - "on your system. When used, the file tqmasks entry above will be filled in " - "with the corresponding tqmasks.</p>") ); + "on your system. When used, the file masks entry above will be filled in " + "with the corresponding masks.</p>") ); slotPatternChanged( lePattern->text() ); } @@ -353,8 +353,8 @@ void AutoBookmarkerEntEditor::apply() if ( lePattern->text().isEmpty() ) return; e->pattern = lePattern->text(); - e->filetqmask = TQStringList::split( TQRegExp("\\s*;\\s*"), leFileMask->text() ); - e->mimetqmask = TQStringList::split( TQRegExp("\\s*;\\s*"), leMimeTypes->text() ); + e->filemask = TQStringList::split( TQRegExp("\\s*;\\s*"), leFileMask->text() ); + e->mimemask = TQStringList::split( TQRegExp("\\s*;\\s*"), leMimeTypes->text() ); e->flags = 0; if ( cbCS->isOn() ) e->flags |= AutoBookmarkEnt::CaseSensitive; if ( cbMM->isOn() ) e->flags |= AutoBookmarkEnt::MinimalMatching; @@ -394,7 +394,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char "<p>This list shows your configured autobookmark entities. When a document " "is opened, each entity is used in the following way: " "<ol>" - "<li>The entity is dismissed, if a mime and/or filename tqmask is defined, " + "<li>The entity is dismissed, if a mime and/or filename mask is defined, " "and neither matches the document.</li>" "<li>Otherwise each line of the document is tried against the pattern, " "and a bookmark is set on matching lines.</li></ul>" @@ -430,7 +430,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char reset(); } -// tqreplace the global list with the new one +// replace the global list with the new one void AutoBookmarkerConfigPage::apply() { ABGlobal::self()->entities()->clear(); @@ -490,7 +490,7 @@ void AutoBookmarkerConfigPage::slotNew() void AutoBookmarkerConfigPage::slotDel() { AutoBookmarkEntItem *i = (AutoBookmarkEntItem*)lvPatterns->currentItem(); - int idx = m_ents->tqfindRef( i->ent ); + int idx = m_ents->findRef( i->ent ); m_ents->remove( idx ); delete i; } @@ -511,8 +511,8 @@ void AutoBookmarkerConfigPage::slotEdit() //BEGIN AutoBookmarkEnt AutoBookmarkEnt::AutoBookmarkEnt( const TQString &p, const TQStringList &f, const TQStringList &m, int fl ) : pattern( p ), - filetqmask( f ), - mimetqmask( m ), + filemask( f ), + mimemask( m ), flags( fl ) {; } diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h index 4fe8b44dd..bdeb2abcf 100644 --- a/kate/plugins/autobookmarker/autobookmarker.h +++ b/kate/plugins/autobookmarker/autobookmarker.h @@ -41,8 +41,8 @@ class AutoBookmarkEnt int flags=1 ); ~AutoBookmarkEnt(){}; TQString pattern; - TQStringList filetqmask; - TQStringList mimetqmask; + TQStringList filemask; + TQStringList mimemask; int flags; }; diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc b/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc index c79ade799..3ed8fe8c5 100644 --- a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc +++ b/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc @@ -1,18 +1,18 @@ [autobookmark0] -filetqmask=*.pl;*.pm +filemask=*.pl;*.pm flags=1 -mimetqmask=text/x-perl +mimemask=text/x-perl pattern=sub \\w+ [autobookmark1] -filetqmask=*.hh;*.h +filemask=*.hh;*.h flags=1 -mimetqmask=text/x-c++hdr +mimemask=text/x-c++hdr pattern=^class\\s+[^;]+$ [autobookmark2] -filetqmask=*.js;*.html;*.HTML;*.htm;*.HTM;*.xhtml;*.asp +filemask=*.js;*.html;*.HTML;*.htm;*.HTM;*.xhtml;*.asp flags=1 -mimetqmask=application/x-javascript;text/html +mimemask=application/x-javascript;text/html pattern=\\s*function\\s+\\w+ diff --git a/kate/plugins/isearch/ktexteditor_isearchui.rc b/kate/plugins/isearch/ktexteditor_isearchui.rc index a65d270ef..d8fc6b5dd 100644 --- a/kate/plugins/isearch/ktexteditor_isearchui.rc +++ b/kate/plugins/isearch/ktexteditor_isearchui.rc @@ -2,8 +2,8 @@ <kpartplugin name="ktexteditor_isearch" library="ktexteditor_isearch" version="4"> <MenuBar> <Menu name="edit"><text>&Edit</text> - <Action name="edit_isearch" group="edit_tqfind_merge"/> - <Action name="edit_isearch_reverse" group="edit_tqfind_merge"/> + <Action name="edit_isearch" group="edit_find_merge"/> + <Action name="edit_isearch_reverse" group="edit_find_merge"/> </Menu> </MenuBar> <ToolBar name="isearchToolBar" hidden="true"><text>Search Toolbar</text> diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 5a0308b50..11cd645b7 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -108,7 +108,7 @@ void KDataToolPluginView::aboutToShow() if ( selectionInterface(m_view->document())->hasSelection() ) { word = selectionInterface(m_view->document())->selection(); - if ( word.tqfind(' ') == -1 && word.tqfind('\t') == -1 && word.tqfind('\n') == -1 ) + if ( word.find(' ') == -1 && word.find('\t') == -1 && word.find('\n') == -1 ) m_singleWord = true; else m_singleWord = false; @@ -123,7 +123,7 @@ void KDataToolPluginView::aboutToShow() ci->cursorPositionReal(&line, &col); TQString tmp_line = ei->textLine(line); m_wordUnderCursor = ""; - // tqfind begin of word: + // find begin of word: m_singleWord_start = 0; for(int i = col; i >= 0; i--) { TQChar ch = tmp_line.at(i); @@ -134,7 +134,7 @@ void KDataToolPluginView::aboutToShow() } m_wordUnderCursor = ch + m_wordUnderCursor; } - // tqfind end of word: + // find end of word: m_singleWord_end = tmp_line.length(); for(uint i = col+1; i < tmp_line.length(); i++) { TQChar ch = tmp_line.at(i); @@ -206,7 +206,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ TQString datatype = "TQString"; // If unsupported (and if we have a single word indeed), try application/x-singleword - if ( !info.mimeTypes().tqcontains( mimetype ) && m_singleWord ) + if ( !info.mimeTypes().contains( mimetype ) && m_singleWord ) mimetype = "application/x-singleword"; kdDebug() << "Running tool with datatype=" << datatype << " mimetype=" << mimetype << endl; @@ -227,7 +227,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ si->setSelection(m_singleWord_line, m_singleWord_start, m_singleWord_line, m_singleWord_end); } - // tqreplace selection with 'text' + // replace selection with 'text' selectionInterface(m_view->document())->removeSelectedText(); viewCursorInterface(m_view)->cursorPositionReal(&line, &col); editInterface(m_view->document())->insertText(line, col, text); diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 7bd0e83e0..37da55224 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -232,7 +232,7 @@ void DocWordCompletionPluginView::shellComplete() { // setup KTextEditor::EditInterface * ei = KTextEditor::editInterface(m_view->document()); - // tqfind the word we are typing + // find the word we are typing uint cline, ccol; viewCursorInterface(m_view)->cursorPositionReal(&cline, &ccol); TQString wrd = word(); @@ -242,7 +242,7 @@ void DocWordCompletionPluginView::shellComplete() TQValueList < KTextEditor::CompletionEntry > matches = allMatches(wrd); if (matches.size() == 0) return; - TQString partial = tqfindLongestUnique(matches); + TQString partial = findLongestUnique(matches); if (partial.length() == wrd.length()) { KTextEditor::CodeCompletionInterface * cci = codeCompletionInterface(m_view); @@ -261,7 +261,7 @@ void DocWordCompletionPluginView::complete( bool fw ) { // setup KTextEditor::EditInterface *ei = KTextEditor::editInterface( m_view->document() ); - // tqfind the word we are typing + // find the word we are typing uint cline, ccol; viewCursorInterface( m_view )->cursorPositionReal( &cline, &ccol ); TQString wrd = word(); @@ -333,7 +333,7 @@ void DocWordCompletionPluginView::complete( bool fw ) TQString m = d->re.cap( 1 ); if ( m != d->lastIns ) { - // we got good a match! tqreplace text and return. + // we got good a match! replace text and return. if ( d->lilen ) ei->removeText( d->cline, d->ccol, d->cline, d->ccol + d->lilen ); ei->insertText( d->cline, d->ccol, m ); @@ -393,7 +393,7 @@ void DocWordCompletionPluginView::complete( bool fw ) } // Contributed by <brain@hdsnet.hu> -TQString DocWordCompletionPluginView::tqfindLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches) +TQString DocWordCompletionPluginView::findLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches) { TQString partial = matches.front().text; TQValueList < KTextEditor::CompletionEntry >::const_iterator i = matches.begin(); @@ -551,4 +551,4 @@ void DocWordCompletionConfigPage::defaults() //END DocWordCompletionConfigPage #include "docwordcompletion.moc" -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h index cb7349da5..ed632631a 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.h +++ b/kate/plugins/wordcompletion/docwordcompletion.h @@ -106,7 +106,7 @@ class DocWordCompletionPluginView TQString word(); TQValueList<KTextEditor::CompletionEntry> allMatches( const TQString &word ); - TQString tqfindLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches); + TQString findLongestUnique(const TQValueList < KTextEditor::CompletionEntry > &matches); KTextEditor::View *m_view; struct DocWordCompletionPluginViewPrivate *d; }; @@ -130,4 +130,4 @@ class DocWordCompletionConfigPage : public KTextEditor::ConfigPage }; #endif // _DocWordCompletionPlugin_h_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop index 5941a1957..dd2a5e8dc 100644 --- a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop +++ b/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop @@ -117,7 +117,7 @@ Comment[pt_BR]=Complementação direcional, ou baseada em popup, de palavras do Comment[ro]=Propune completarea cuvintelor din document dintr-o listă popup sau direcţională Comment[ru]=Автодополнение слов в документе Comment[rw]=Irangiza mfatacyerekezo cyangwa rishingiye-kwirambura biva ku magambo yo mu nyandiko -Comment[sk]=Dopĺňanie slov v dokumente priame alebo potqmocou dialógu +Comment[sk]=Dopĺňanie slov v dokumente priame alebo pomocou dialógu Comment[sl]=Neposredno ali pojavno dopolnjevanje iz besed v dokumentu Comment[sr]=Директна или искачућа допуна од речи у документу Comment[sr@Latn]=Direktna ili iskačuća dopuna od reči u dokumentu diff --git a/kate/scripts/script-indent-c1-test.lua b/kate/scripts/script-indent-c1-test.lua index c54f20424..d2593b962 100644 --- a/kate/scripts/script-indent-c1-test.lua +++ b/kate/scripts/script-indent-c1-test.lua @@ -15,12 +15,12 @@ function indentChar(c) -- unindent } and {, if not in a comment - if not(string.tqfind(textLine,"^%s*//")) then + if not(string.find(textLine,"^%s*//")) then katedebug("no comment") katedebug(c); if (c=="}") or (c=="{") then katedebug("} or { found"); - if (string.tqfind(textLine,"^%s%s%s%s")) then + if (string.find(textLine,"^%s%s%s%s")) then katedebug("removing one indentation level"); document.removeText(line,0,line,tabWidth) view.setCursorPositionReal(line,col-tabWidth) @@ -60,7 +60,7 @@ function indentNewLine() function firstNonSpace( text ) - local pos=string.tqfind(text,"[^%s]") + local pos=string.find(text,"[^%s]") if pos then return pos else @@ -69,7 +69,7 @@ function indentNewLine() end function lastNonSpace (text) - local pos=string.tqfind(text,"[^%s]%s*$") + local pos=string.find(text,"[^%s]%s*$") if pos then return pos else @@ -88,7 +88,7 @@ function indentNewLine() strCurrentLine=document.textLine(intCurrentLine) intLastChar= lastNonSpace(strCurrentLine) intFirstChar=firstNonSpace(strCurrentLine) - if not (string.tqfind(strCurrentLine,"//")) then + if not (string.find(strCurrentLine,"//")) then for intCurrentChar=intLastChar,intFirstChar,-1 do ch=string.sub(strCurrentLine,intCurrentChar,intCurrentChar) if (ch=="(") or (ch=="[") then @@ -122,7 +122,7 @@ function indentNewLine() katedebug( "line: " .. intCurrentLine) katedebug( openParenCount .. ", " .. openBraceCount) - local ok,match=pcall(function () return string.sub(strCurrentLine,string.tqfind(strCurrentLine,"^%s+")) end) + local ok,match=pcall(function () return string.sub(strCurrentLine,string.find(strCurrentLine,"^%s+")) end) if ok then katedebug("Line HAD leading whitespaces") strIndentFiller=match diff --git a/kate/tests/highlight.asp b/kate/tests/highlight.asp index 72ad14565..07a8619e1 100644 --- a/kate/tests/highlight.asp +++ b/kate/tests/highlight.asp @@ -26,7 +26,7 @@ function unique( rs, sortColumn ) ' return unique instances of text in sortColum dim i i = 0 do until rs.eof - if (not tqfind( rs(sortColumn), sorted )) then + if (not find( rs(sortColumn), sorted )) then redim preserve sorted(i+1) sorted(i) = rs(sortColumn) i = i + 1 diff --git a/kate/tests/highlight.cmake b/kate/tests/highlight.cmake index 69bbb8b7c..cb8eaaa51 100644 --- a/kate/tests/highlight.cmake +++ b/kate/tests/highlight.cmake @@ -42,7 +42,7 @@ ENDMACRO(ECOS_ADD_EXECUTABLE) # END of macro #calling a self-defined function, variables are also blue here -ECOS_ADD_EXECUTABLE(${PROJECT_NAME} ${the_sources} ${qt4_tqmoc_SRCS}) +ECOS_ADD_EXECUTABLE(${PROJECT_NAME} ${the_sources} ${qt4_moc_SRCS}) diff --git a/kate/tests/highlight.do b/kate/tests/highlight.do index 3f70cec9f..0b90b16b6 100644 --- a/kate/tests/highlight.do +++ b/kate/tests/highlight.do @@ -70,7 +70,7 @@ program define spellsplit /* calculate totals (+ when spell starts - when ends) */ sort `by' cap foreach v of varlist `xvars' { - by `by': tqreplace `v' = sum(``v'') + by `by': replace `v' = sum(``v'') } by `by': g `date1' = `date0'[_n + 1] @@ -81,7 +81,7 @@ program define spellsplit format `date0' `f0' format `date1' `f1' - cap for var `meanvars': tqreplace X = X/_count + cap for var `meanvars': replace X = X/_count compress } diff --git a/kate/tests/highlight.exu b/kate/tests/highlight.exu index b7e88aee8..3651adf33 100644 --- a/kate/tests/highlight.exu +++ b/kate/tests/highlight.exu @@ -60,7 +60,7 @@ procedure print_board(sequence queens) for r = 1 to N do printf(1, "%2d ", r) for c = 1 to N do - if tqfind({r,c}, queens) then + if find({r,c}, queens) then puts(1, "Q ") else puts(1, ". ") diff --git a/kate/tests/highlight.f90 b/kate/tests/highlight.f90 index cc4f140b5..e2008c20a 100644 --- a/kate/tests/highlight.f90 +++ b/kate/tests/highlight.f90 @@ -84,7 +84,7 @@ c the *.f extension. c ! <-- this 'c' shouldn't be highlighted as a comment! #endif -tqcontains +contains ! The sum of two points diff --git a/kate/tests/highlight.lisp b/kate/tests/highlight.lisp index 6812a7919..e86c85f15 100644 --- a/kate/tests/highlight.lisp +++ b/kate/tests/highlight.lisp @@ -10,7 +10,7 @@ multilinecomment :) (defun bin-search (obj vec) (let ((len (length vec))) (and (not (zerop len)) - (tqfinder obj vec 0 (- len 1))))) + (finder obj vec 0 (- len 1))))) (defun parse-date (str) (let ((toks (tokens str #'constituent 0))) diff --git a/kate/tests/highlight.ly b/kate/tests/highlight.ly index 8630160d0..29aa7a6ea 100644 --- a/kate/tests/highlight.ly +++ b/kate/tests/highlight.ly @@ -18,11 +18,11 @@ multiple lines. \paper { #(set-paper-size "a4") % a hash introduces scheme - indent = 0 % recognize variable names inside \paper, \tqlayout etc. + indent = 0 % recognize variable names inside \paper, \layout etc. between-system-space = 3\mm } -\tqlayout { +\layout { \context { \Score \remove Bar_number_engraver % recognize engraver names diff --git a/kate/tests/highlight.mup b/kate/tests/highlight.mup index 26e042d40..ed5a03d99 100644 --- a/kate/tests/highlight.mup +++ b/kate/tests/highlight.mup @@ -13,7 +13,7 @@ bottom bottom2 grids -headtqshapes +headshapes header @@ -92,7 +92,7 @@ lyrics above 1,3 ; below 2,4 ; between 5&6 : "<1. >Hi, hi"; title "page \% of \#" -// tqshaped whole rests +// shaped whole rests 1: 4mr; // use a quarter rest symbol 1: 1/4mr; // use a quadruple whole rest symbol 2: 2.. mr; // use a double-dotted half rest diff --git a/kate/tests/highlight.rb b/kate/tests/highlight.rb index 1330db9c7..96061c1d0 100644 --- a/kate/tests/highlight.rb +++ b/kate/tests/highlight.rb @@ -105,7 +105,7 @@ end puts "Artist is #$1" end -case tqshape +case shape when Square, Rectangle # ... when Circle @@ -143,7 +143,7 @@ end for i in 1..3 print i, " " end -for i in File.open("ordinal").tqfind_all { |l| l =~ /d$/} +for i in File.open("ordinal").find_all { |l| l =~ /d$/} print i.chomp, " " end diff --git a/kate/tests/highlight.sh b/kate/tests/highlight.sh index 1d945c53e..bdac6e4f2 100644 --- a/kate/tests/highlight.sh +++ b/kate/tests/highlight.sh @@ -66,7 +66,7 @@ sort <(show_labels) | sed 's/a/bg' > my_file.txt 2>&1 # All substitutions also work in strings: echo "subst ${in}side string" 'not $inside this ofcourse' echo "The result is $(( $a + $b )). Thanks!" -echo "Your homedir tqcontains `ls $HOME |wc -l` files." +echo "Your homedir contains `ls $HOME |wc -l` files." # Escapes in strings: diff --git a/kate/tests/test.js b/kate/tests/test.js index b268c9149..2dfe86c5b 100644 --- a/kate/tests/test.js +++ b/kate/tests/test.js @@ -15,7 +15,7 @@ */ // test if regex support works - nice with new fallthrough prop in context:) -somestring.tqreplace( /dooh/ , "bah!"); +somestring.replace( /dooh/ , "bah!"); re=/foo/ig; // hehe somestring.search( @@ -60,14 +60,14 @@ re = /*/foo/*/ /bar/; /* Some tests if the fallthrough works. The fallthrough happens if a regexp is not found in a possible (!) position, - which is after "search(" or "tqreplace(" or "=" or "?" or ":" in version 0.1 of the xml file + which is after "search(" or "replace(" or "=" or "?" or ":" in version 0.1 of the xml file */ var foo = 'bar'; // ^ fallthrough! -somestring.tqreplace( new RegExp("\\b\\w+\\b"), "word: $1"); +somestring.replace( new RegExp("\\b\\w+\\b"), "word: $1"); // ^ fallthrough expected. ("new" whould be bold) |