diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /languages/php | |
parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/php')
-rw-r--r-- | languages/php/README.dox | 2 | ||||
-rw-r--r-- | languages/php/data/phpfunctions | 68 | ||||
-rw-r--r-- | languages/php/doc/php.toc | 228 | ||||
-rw-r--r-- | languages/php/phpcodecompletion.cpp | 48 | ||||
-rw-r--r-- | languages/php/phpcodecompletion.h | 1 | ||||
-rw-r--r-- | languages/php/phpconfigdata.h | 1 | ||||
-rw-r--r-- | languages/php/phpconfigwidget.cpp | 6 | ||||
-rw-r--r-- | languages/php/phpconfigwidget.h | 3 | ||||
-rw-r--r-- | languages/php/phpconfigwidgetbase.ui | 98 | ||||
-rw-r--r-- | languages/php/phperrorview.cpp | 24 | ||||
-rw-r--r-- | languages/php/phperrorview.h | 3 | ||||
-rw-r--r-- | languages/php/phpfile.cpp | 54 | ||||
-rw-r--r-- | languages/php/phpfile.h | 1 | ||||
-rw-r--r-- | languages/php/phphtmlview.h | 1 | ||||
-rw-r--r-- | languages/php/phpinfodlg.ui | 14 | ||||
-rw-r--r-- | languages/php/phpnewclassdlg.cpp | 14 | ||||
-rw-r--r-- | languages/php/phpnewclassdlg.h | 3 | ||||
-rw-r--r-- | languages/php/phpnewclassdlgbase.ui | 26 | ||||
-rw-r--r-- | languages/php/phpparser.cpp | 8 | ||||
-rw-r--r-- | languages/php/phpparser.h | 4 | ||||
-rw-r--r-- | languages/php/phpsupport_event.h | 6 | ||||
-rw-r--r-- | languages/php/phpsupportpart.cpp | 8 | ||||
-rw-r--r-- | languages/php/phpsupportpart.h | 5 |
23 files changed, 313 insertions, 313 deletions
diff --git a/languages/php/README.dox b/languages/php/README.dox index 14e69997..57d1b1b8 100644 --- a/languages/php/README.dox +++ b/languages/php/README.dox @@ -14,7 +14,7 @@ all include files from your script. \maintainer <a href="mailto:n.escuder AT intra-links.com">Escuder Nicolas</a> \feature PHP language support -\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=php+support&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">php support component at Bugzilla database</a> diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions index d0897bd5..d43bcb72 100644 --- a/languages/php/data/phpfunctions +++ b/languages/php/data/phpfunctions @@ -150,7 +150,7 @@ db:string dblist(void) db:int dbmopen(string filename, string mode) db:bool dbmclose(int dbm_identifier) db:int dbminsert(int dbm_identifier, string key, string value) -db:int dbmreplace(int dbm_identifier, string key, string value) +db:int dbmtqreplace(int dbm_identifier, string key, string value) db:string dbmfetch(int dbm_identifier, string key) db:int dbmexists(int dbm_identifier, string key) db:int dbmdelete(int dbm_identifier, string key) @@ -165,7 +165,7 @@ dba:string dba_firstkey(int handle) dba:string dba_nextkey(int handle) dba:bool dba_delete(string key, int handle) dba:bool dba_insert(string key, string value, int handle) -dba:bool dba_replace(string key, string value, int handle) +dba:bool dba_tqreplace(string key, string value, int handle) dba:bool dba_optimize(int handle) dba:bool dba_sync(int handle) dbase:int dbase_open(string name, int mode) @@ -184,7 +184,7 @@ domxml:string domxml_attrname([int dir_handle]) domxml:class domxml_node(string name) domxml:string domxml_lastchild([int node]) domxml:string domxml_parent([int node]) -domxml:string domxml_children([int node]) +domxml:string domxml_tqchildren([int node]) domxml:string domxml_getattr([int node,] string attrname) domxml:bool domxml_setattr([int node,] string attrname, string value) domxml:array domxml_attributes([int node]) @@ -199,7 +199,7 @@ domxml:string domxml_add_root([int doc_handle,] string name) domxml:class domxml_new_xmldoc(string version) domxml:string node_namespace([int node]) domxml:string node_attributes([int node]) -domxml:string node_children([int node]) +domxml:string node_tqchildren([int node]) domxml:class xmltree(string xmldoc) dotnet:int dotnet_load(string module_name) exif:string read_exif_data(string filename) @@ -341,11 +341,11 @@ hw:hwdoc hw_gettext(int link, int objid [, int rootid]) hw:void hw_edittext(int link, hwdoc doc) hw:hwdoc hw_getcgi(int link, int objid) hw:int hw_getremote(int link, int objid) -hw:[array|int] hw_getremotechildren(int link, string objrec) +hw:[array|int] hw_getremotetqchildren(int link, string objrec) hw:void hw_setlinkroot(int link, int rootid) hw:hwdoc hw_pipedocument(int link, int objid) hw:hwdoc hw_pipecgi(int link, int objid) -hw:void hw_insertdocument(int link, int parentid, hwdoc doc) +hw:void hw_insertdocument(int link, int tqparentid, hwdoc doc) hw:hwdoc hw_new_document(string objrec, string data, int size) hw:void hw_free_document(hwdoc doc) hw:void hw_outputdocument(hwdoc doc) @@ -358,10 +358,10 @@ hw:int hw_documentsize(hwdoc doc) hw:int hw_document_size(hwdoc doc) hw:string hw_documentattributes(hwdoc doc) hw:string hw_document_attributes(hwdoc doc) -hw:array hw_getparentsobj(int link, int objid) -hw:array hw_getparents(int link, int objid) -hw:array hw_children(int link, int objid) -hw:array hw_childrenobj(int link, int objid) +hw:array hw_gettqparentsobj(int link, int objid) +hw:array hw_gettqparents(int link, int objid) +hw:array hw_tqchildren(int link, int objid) +hw:array hw_tqchildrenobj(int link, int objid) hw:array hw_getchildcoll(int link, int objid) hw:array hw_getchildcollobj(int link, int objid) hw:int hw_docbyanchor(int link, int anchorid) @@ -379,8 +379,8 @@ hw:void hw_identify(int link, string username, string password) hw:array hw_objrec2array(string objrec, [array format]) hw:string hw_array2objrec(array objarr) hw:array hw_incollections(int link, array objids, array collids, int para) -hw:void hw_inscoll(int link, int parentid, array objarr) -hw:void hw_insdoc(int link, int parentid, string objrec [, string text]) +hw:void hw_inscoll(int link, int tqparentid, array objarr) +hw:void hw_insdoc(int link, int tqparentid, string objrec [, string text]) hw:int hw_getsrcbydestobj(int link, int destid) hw:int hw_mapid(int link, int serverid, int destid) hw:string hw_getrellink(int link, int rootid, int sourceid, int destid) @@ -559,7 +559,7 @@ ldap:array ldap_explode_dn(string dn, int with_attrib) ldap:string ldap_dn2ufn(string dn) ldap:int ldap_add(int link, string dn, array entry) ldap:int ldap_modify(int link, string dn, array entry) -ldap:int ldap_mod_replace(int link, string dn, array entry) +ldap:int ldap_mod_tqreplace(int link, string dn, array entry) ldap:int ldap_mod_add(int link, string dn, array entry) ldap:int ldap_mod_del(int link, string dn, array entry) ldap:int ldap_delete(int link, string dn) @@ -861,7 +861,7 @@ ovrimos:int ovrimos_rollback(int connection_id) ovrimos:int ovrimos_setoption(int conn_id|result_id, int which, int option, int value) pcre:int preg_match(string pattern, string subject [, array subpatterns]) pcre:int preg_match_all(string pattern, string subject, array subpatterns [, int order]) -pcre:string preg_replace(string|array regex, string|array replace, string|array subject [, int limit]) +pcre:string preg_tqreplace(string|array regex, string|array tqreplace, string|array subject [, int limit]) pcre:array preg_split(string pattern, string subject [, int limit [, int flags]]) pcre:string preg_quote(string str, string delim_char) pcre:array preg_grep(string regex, array input) @@ -928,7 +928,7 @@ pdf:void pdf_setgray(int pdfdoc, double value) pdf:void pdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue) pdf:void pdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue) pdf:void pdf_setrgbcolor(int pdfdoc, double red, double green, double blue) -pdf:int pdf_add_outline(int pdfdoc, string text [, int parent, int open]); +pdf:int pdf_add_outline(int pdfdoc, string text [, int tqparent, int open]); pdf:void pdf_set_transition(int pdfdoc, int transition) pdf:void pdf_set_duration(int pdfdoc, double duration) pdf:int pdf_open_gif(int pdf, string giffile) @@ -1287,7 +1287,7 @@ file:int fseek(int fp, int offset [, int whence]) file:int mkdir(string pathname, int mode) file:int rmdir(string dirname) file:int readfile(string filename [, int use_include_path]) -file:int umask([int mask]) +file:int umask([int tqmask]) file:int fpassthru(int fp) file:int rename(string old_name, string new_name) file:int unlink(string filename) @@ -1403,15 +1403,15 @@ rand:int mt_getrandmax(void) quot_print:string quoted_printable_decode(string str) reg:int ereg(string pattern, string string [, array registers]) reg:int eregi(string pattern, string string [, array registers]) -reg:string ereg_replace(string pattern, string replacement, string string) -reg:string eregi_replace(string pattern, string replacement, string string]) +reg:string ereg_tqreplace(string pattern, string replacement, string string) +reg:string eregi_tqreplace(string pattern, string replacement, string string]) reg:array split(string pattern, string string [, int limit]) reg:array spliti(string pattern, string string [, int limit]) reg:string sql_regcase(string string) soundex:string soundex(string str) string:string bin2hex(string data) -string:int strspn(string str, string mask) -string:int strcspn(string str, string mask) +string:int strspn(string str, string tqmask) +string:int strcspn(string str, string tqmask) string:string rtrim(string str) string:string chop(string str) string:string trim(string str) @@ -1434,7 +1434,7 @@ string:int strrpos(string haystack, string needle) string:string strrchr(string haystack, string needle) string:string chunk_split(string str [, int chunklen [, string ending]]) string:string substr(string str, int start [, int length]) -string:string substr_replace(string str, string repl, int start [, int length]) +string:string substr_tqreplace(string str, string repl, int start [, int length]) string:string quotemeta(string str) string:int ord(string character) string:string chr(int ascii) @@ -1447,7 +1447,7 @@ string:string addcslashes(string str, string charlist) string:string addslashes(string str) string:string stripcslashes(string str) string:string stripslashes(string str) -string:string str_replace(string needle, string str, string haystack) +string:string str_tqreplace(string needle, string str, string haystack) string:string hebrev(string str [, int max_chars_per_line]) string:string hebrevc(string str [, int max_chars_per_line]) string:string nl2br(string str) @@ -1501,18 +1501,18 @@ swf:void swf_actiongotolabel(string label) swf:void swf_defineline(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_definerect(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_definepoly(int obj_id, array coords, int npoints, double width) -swf:void swf_startshape(int objid) -swf:void swf_shapelinesolid(double r, double g, double b, double a, double width) -swf:void swf_shapefilloff(void) -swf:void swf_shapefillsolid(double r, double g, double b, double a) -swf:void swf_shapefillbitmapclip(int bitmapid) -swf:void swf_shapefillbitmaptile(int bitmapid) -swf:void swf_shapemoveto(double x, double y) -swf:void swf_shapelineto(double x, double y) -swf:void swf_shapecurveto(double x1, double y1, double x2, double y2) -swf:void swf_shapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3) -swf:void swf_shapearc(double x, double y, double r, double ang1, double ang2) -swf:void swf_endshape(void) +swf:void swf_starttqshape(int objid) +swf:void swf_tqshapelinesolid(double r, double g, double b, double a, double width) +swf:void swf_tqshapefilloff(void) +swf:void swf_tqshapefillsolid(double r, double g, double b, double a) +swf:void swf_tqshapefillbitmapclip(int bitmapid) +swf:void swf_tqshapefillbitmaptile(int bitmapid) +swf:void swf_tqshapemoveto(double x, double y) +swf:void swf_tqshapelineto(double x, double y) +swf:void swf_tqshapecurveto(double x1, double y1, double x2, double y2) +swf:void swf_tqshapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3) +swf:void swf_tqshapearc(double x, double y, double r, double ang1, double ang2) +swf:void swf_endtqshape(void) swf:void swf_definefont(int fontid, string name) swf:void swf_setfont(int fontid) swf:void swf_fontsize(double height) diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc index f09df62e..f3feeef8 100644 --- a/languages/php/doc/php.toc +++ b/languages/php/doc/php.toc @@ -557,11 +557,11 @@ <tocsect2 name="Predefined Constants" url="recode.constants.php"/> <tocsect2 name="Recode Functions" url="ref.recode.php"/> </tocsect1> -<tocsect1 name="Unicode" url="book.unicode.php"> - <tocsect2 name="Introduction" url="intro.unicode.php"/> - <tocsect2 name="Installing/Configuring" url="unicode.setup.php"/> - <tocsect2 name="Predefined Constants" url="unicode.constants.php"/> - <tocsect2 name="Unicode Functions" url="ref.unicode.php"/> +<tocsect1 name="Unicode" url="book.tqunicode.php"> + <tocsect2 name="Introduction" url="intro.tqunicode.php"/> + <tocsect2 name="Installing/Configuring" url="tqunicode.setup.php"/> + <tocsect2 name="Predefined Constants" url="tqunicode.constants.php"/> + <tocsect2 name="Unicode Functions" url="ref.tqunicode.php"/> </tocsect1> <tocsect1 name="Exif" url="book.exif.php"> <tocsect2 name="Introduction" url="intro.exif.php"/> @@ -688,7 +688,7 @@ <tocsect2 name="SWFMorph" url="class.swfmorph.php"/> <tocsect2 name="SWFMovie" url="class.swfmovie.php"/> <tocsect2 name="SWFPrebuiltClip" url="class.swfprebuiltclip.php"/> - <tocsect2 name="SWFShape" url="class.swfshape.php"/> + <tocsect2 name="SWFShape" url="class.swftqshape.php"/> <tocsect2 name="SWFSound" url="class.swfsound.php"/> <tocsect2 name="SWFSoundInstance" url="class.swfsoundinstance.php"/> <tocsect2 name="SWFSprite" url="class.swfsprite.php"/> @@ -806,7 +806,7 @@ <tocsect2 name="DirectoryIterator" url="class.directoryiterator.php"/> <tocsect2 name="FilterIterator" url="class.filteriterator.php"/> <tocsect2 name="LimitIterator" url="class.limititerator.php"/> - <tocsect2 name="ParentIterator" url="class.parentiterator.php"/> + <tocsect2 name="ParentIterator" url="class.tqparentiterator.php"/> <tocsect2 name="RecursiveDirectoryIterator" url="class.recursivedirectoryiterator.php"/> <tocsect2 name="RecursiveIteratorIterator" url="class.recursiveiteratoriterator.php"/> <tocsect2 name="SimpleXMLIterator" url="class.simplexmliterator.php"/> @@ -1477,7 +1477,7 @@ <entry name="zend_thread_id" url="function.zend-thread-id.php"/> <entry name="zend_version" url="function.zend-version.php"/> <entry name="Runkit_Sandbox" url="runkit.sandbox.php"/> -<entry name="Runkit_Sandbox_Parent" url="runkit.sandbox-parent.php"/> +<entry name="Runkit_Sandbox_Parent" url="runkit.sandbox-tqparent.php"/> <entry name="runkit_class_adopt" url="function.runkit-class-adopt.php"/> <entry name="runkit_class_emancipate" url="function.runkit-class-emancipate.php"/> <entry name="runkit_constant_add" url="function.runkit-constant-add.php"/> @@ -1629,7 +1629,7 @@ <entry name="newt_checkbox_set_flags" url="function.newt-checkbox-set-flags.php"/> <entry name="newt_checkbox_set_value" url="function.newt-checkbox-set-value.php"/> <entry name="newt_checkbox_tree_add_item" url="function.newt-checkbox-tree-add-item.php"/> -<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-find-item.php"/> +<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-tqfind-item.php"/> <entry name="newt_checkbox_tree_get_current" url="function.newt-checkbox-tree-get-current.php"/> <entry name="newt_checkbox_tree_get_entry_value" url="function.newt-checkbox-tree-get-entry-value.php"/> <entry name="newt_checkbox_tree_get_multi_selection" url="function.newt-checkbox-tree-get-multi-selection.php"/> @@ -1805,7 +1805,7 @@ <entry name="ncurses_meta" url="function.ncurses-meta.php"/> <entry name="ncurses_mouse_trafo" url="function.ncurses-mouse-trafo.php"/> <entry name="ncurses_mouseinterval" url="function.ncurses-mouseinterval.php"/> -<entry name="ncurses_mousemask" url="function.ncurses-mousemask.php"/> +<entry name="ncurses_mousetqmask" url="function.ncurses-mousetqmask.php"/> <entry name="ncurses_move_panel" url="function.ncurses-move-panel.php"/> <entry name="ncurses_move" url="function.ncurses-move.php"/> <entry name="ncurses_mvaddch" url="function.ncurses-mvaddch.php"/> @@ -1840,7 +1840,7 @@ <entry name="ncurses_qiflush" url="function.ncurses-qiflush.php"/> <entry name="ncurses_raw" url="function.ncurses-raw.php"/> <entry name="ncurses_refresh" url="function.ncurses-refresh.php"/> -<entry name="ncurses_replace_panel" url="function.ncurses-replace-panel.php"/> +<entry name="ncurses_replace_panel" url="function.ncurses-tqreplace-panel.php"/> <entry name="ncurses_reset_prog_mode" url="function.ncurses-reset-prog-mode.php"/> <entry name="ncurses_reset_shell_mode" url="function.ncurses-reset-shell-mode.php"/> <entry name="ncurses_resetty" url="function.ncurses-resetty.php"/> @@ -2245,7 +2245,7 @@ <entry name="dba_open" url="function.dba-open.php"/> <entry name="dba_optimize" url="function.dba-optimize.php"/> <entry name="dba_popen" url="function.dba-popen.php"/> -<entry name="dba_replace" url="function.dba-replace.php"/> +<entry name="dba_tqreplace" url="function.dba-tqreplace.php"/> <entry name="dba_sync" url="function.dba-sync.php"/> <entry name="dbx_close" url="function.dbx-close.php"/> <entry name="dbx_compare" url="function.dbx-compare.php"/> @@ -2411,7 +2411,7 @@ <entry name="dbase_numrecords" url="function.dbase-numrecords.php"/> <entry name="dbase_open" url="function.dbase-open.php"/> <entry name="dbase_pack" url="function.dbase-pack.php"/> -<entry name="dbase_replace_record" url="function.dbase-replace-record.php"/> +<entry name="dbase_replace_record" url="function.dbase-tqreplace-record.php"/> <entry name="dbplus_add" url="function.dbplus-add.php"/> <entry name="dbplus_aql" url="function.dbplus-aql.php"/> <entry name="dbplus_chdir" url="function.dbplus-chdir.php"/> @@ -2419,7 +2419,7 @@ <entry name="dbplus_curr" url="function.dbplus-curr.php"/> <entry name="dbplus_errcode" url="function.dbplus-errcode.php"/> <entry name="dbplus_errno" url="function.dbplus-errno.php"/> -<entry name="dbplus_find" url="function.dbplus-find.php"/> +<entry name="dbplus_tqfind" url="function.dbplus-find.php"/> <entry name="dbplus_first" url="function.dbplus-first.php"/> <entry name="dbplus_flush" url="function.dbplus-flush.php"/> <entry name="dbplus_freealllocks" url="function.dbplus-freealllocks.php"/> @@ -3581,7 +3581,7 @@ <entry name="mb_encode_mimeheader" url="function.mb-encode-mimeheader.php"/> <entry name="mb_encode_numericentity" url="function.mb-encode-numericentity.php"/> <entry name="mb_ereg_match" url="function.mb-ereg-match.php"/> -<entry name="mb_ereg_replace" url="function.mb-ereg-replace.php"/> +<entry name="mb_ereg_tqreplace" url="function.mb-ereg-tqreplace.php"/> <entry name="mb_ereg_search_getpos" url="function.mb-ereg-search-getpos.php"/> <entry name="mb_ereg_search_getregs" url="function.mb-ereg-search-getregs.php"/> <entry name="mb_ereg_search_init" url="function.mb-ereg-search-init.php"/> @@ -3590,7 +3590,7 @@ <entry name="mb_ereg_search_setpos" url="function.mb-ereg-search-setpos.php"/> <entry name="mb_ereg_search" url="function.mb-ereg-search.php"/> <entry name="mb_ereg" url="function.mb-ereg.php"/> -<entry name="mb_eregi_replace" url="function.mb-eregi-replace.php"/> +<entry name="mb_eregi_tqreplace" url="function.mb-eregi-tqreplace.php"/> <entry name="mb_eregi" url="function.mb-eregi.php"/> <entry name="mb_get_info" url="function.mb-get-info.php"/> <entry name="mb_http_input" url="function.mb-http-input.php"/> @@ -3644,12 +3644,12 @@ <entry name="recode_file" url="function.recode-file.php"/> <entry name="recode_string" url="function.recode-string.php"/> <entry name="recode" url="function.recode.php"/> -<entry name="unicode_decode" url="function.unicode-decode.php"/> -<entry name="unicode_encode" url="function.unicode-encode.php"/> -<entry name="unicode_get_error_mode" url="function.unicode-get-error-mode.php"/> -<entry name="unicode_get_subst_char" url="function.unicode-get-subst-char.php"/> -<entry name="unicode_set_error_mode" url="function.unicode-set-error-mode.php"/> -<entry name="unicode_set_subst_char" url="function.unicode-set-subst-char.php"/> +<entry name="tqunicode_decode" url="function.tqunicode-decode.php"/> +<entry name="tqunicode_encode" url="function.tqunicode-encode.php"/> +<entry name="tqunicode_get_error_mode" url="function.tqunicode-get-error-mode.php"/> +<entry name="tqunicode_get_subst_char" url="function.tqunicode-get-subst-char.php"/> +<entry name="tqunicode_set_error_mode" url="function.tqunicode-set-error-mode.php"/> +<entry name="tqunicode_set_subst_char" url="function.tqunicode-set-subst-char.php"/> <entry name="exif_imagetype" url="function.exif-imagetype.php"/> <entry name="exif_read_data" url="function.exif-read-data.php"/> <entry name="exif_tagname" url="function.exif-tagname.php"/> @@ -3841,7 +3841,7 @@ <entry name="Imagick::getImageFilename" url="function.imagick-getimagefilename.php"/> <entry name="Imagick::getImageFormat" url="function.imagick-getimageformat.php"/> <entry name="Imagick::getImageGamma" url="function.imagick-getimagegamma.php"/> -<entry name="Imagick::getImageGeometry" url="function.imagick-getimagegeometry.php"/> +<entry name="Imagick::getImageGeometry" url="function.imagick-getimagetqgeometry.php"/> <entry name="Imagick::getImageGreenPrimary" url="function.imagick-getimagegreenprimary.php"/> <entry name="Imagick::getImageHeight" url="function.imagick-getimageheight.php"/> <entry name="Imagick::getImageHistogram" url="function.imagick-getimagehistogram.php"/> @@ -3853,7 +3853,7 @@ <entry name="Imagick::getImageMagickLicense" url="function.imagick-getimagemagicklicense.php"/> <entry name="Imagick::getImageMatte" url="function.imagick-getimagematte.php"/> <entry name="Imagick::getImageMatteColor" url="function.imagick-getimagemattecolor.php"/> -<entry name="Imagick::getImageOrientation" url="function.imagick-getimageorientation.php"/> +<entry name="Imagick::getImageQt::Orientation" url="function.imagick-getimageorientation.php"/> <entry name="Imagick::getImagePage" url="function.imagick-getimagepage.php"/> <entry name="Imagick::getImagePixelColor" url="function.imagick-getimagepixelcolor.php"/> <entry name="Imagick::getImageProfile" url="function.imagick-getimageprofile.php"/> @@ -3980,7 +3980,7 @@ <entry name="Imagick::setImageMatte" url="function.imagick-setimagematte.php"/> <entry name="Imagick::setImageMatteColor" url="function.imagick-setimagemattecolor.php"/> <entry name="Imagick::setImageOpacity" url="function.imagick-setimageopacity.php"/> -<entry name="Imagick::setImageOrientation" url="function.imagick-setimageorientation.php"/> +<entry name="Imagick::setImageQt::Orientation" url="function.imagick-setimageorientation.php"/> <entry name="Imagick::setImagePage" url="function.imagick-setimagepage.php"/> <entry name="Imagick::setImageProfile" url="function.imagick-setimageprofile.php"/> <entry name="Imagick::setImageProperty" url="function.imagick-setimageproperty.php"/> @@ -4026,7 +4026,7 @@ <entry name="Imagick::transverseImage" url="function.imagick-transverseimage.php"/> <entry name="Imagick::trimImage" url="function.imagick-trimimage.php"/> <entry name="Imagick::uniqueImageColors" url="function.imagick-uniqueimagecolors.php"/> -<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharpmaskimage.php"/> +<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharptqmaskimage.php"/> <entry name="Imagick::valid" url="function.imagick-valid.php"/> <entry name="Imagick::vignetteImage" url="function.imagick-vignetteimage.php"/> <entry name="Imagick::waveImage" url="function.imagick-waveimage.php"/> @@ -4067,7 +4067,7 @@ <entry name="ImagickDraw::getStrokeMiterLimit" url="function.imagickdraw-getstrokemiterlimit.php"/> <entry name="ImagickDraw::getStrokeOpacity" url="function.imagickdraw-getstrokeopacity.php"/> <entry name="ImagickDraw::getStrokeWidth" url="function.imagickdraw-getstrokewidth.php"/> -<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettextalignment.php"/> +<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettexttqalignment.php"/> <entry name="ImagickDraw::getTextAntialias" url="function.imagickdraw-gettextantialias.php"/> <entry name="ImagickDraw::getTextDecoration" url="function.imagickdraw-gettextdecoration.php"/> <entry name="ImagickDraw::getTextEncoding" url="function.imagickdraw-gettextencoding.php"/> @@ -4138,7 +4138,7 @@ <entry name="ImagickDraw::setStrokeOpacity" url="function.imagickdraw-setstrokeopacity.php"/> <entry name="ImagickDraw::setStrokePatternURL" url="function.imagickdraw-setstrokepatternurl.php"/> <entry name="ImagickDraw::setStrokeWidth" url="function.imagickdraw-setstrokewidth.php"/> -<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settextalignment.php"/> +<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settexttqalignment.php"/> <entry name="ImagickDraw::setTextAntialias" url="function.imagickdraw-settextantialias.php"/> <entry name="ImagickDraw::setTextDecoration" url="function.imagickdraw-settextdecoration.php"/> <entry name="ImagickDraw::setTextEncoding" url="function.imagickdraw-settextencoding.php"/> @@ -4512,7 +4512,7 @@ <entry name="HaruDoc::getEncoder" url="function.harudoc-getencoder.php"/> <entry name="HaruDoc::getFont" url="function.harudoc-getfont.php"/> <entry name="HaruDoc::getInfoAttr" url="function.harudoc-getinfoattr.php"/> -<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagelayout.php"/> +<entry name="HaruDoc::getPageLayout" url="function.harudoc-getpagetqlayout.php"/> <entry name="HaruDoc::getPageMode" url="function.harudoc-getpagemode.php"/> <entry name="HaruDoc::getStreamSize" url="function.harudoc-getstreamsize.php"/> <entry name="HaruDoc::insertPage" url="function.harudoc-insertpage.php"/> @@ -4534,7 +4534,7 @@ <entry name="HaruDoc::setInfoAttr" url="function.harudoc-setinfoattr.php"/> <entry name="HaruDoc::setInfoDateAttr" url="function.harudoc-setinfodateattr.php"/> <entry name="HaruDoc::setOpenAction" url="function.harudoc-setopenaction.php"/> -<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagelayout.php"/> +<entry name="HaruDoc::setPageLayout" url="function.harudoc-setpagetqlayout.php"/> <entry name="HaruDoc::setPageMode" url="function.harudoc-setpagemode.php"/> <entry name="HaruDoc::setPagesConfiguration" url="function.harudoc-setpagesconfiguration.php"/> <entry name="HaruDoc::setPassword" url="function.harudoc-setpassword.php"/> @@ -4639,7 +4639,7 @@ <entry name="HaruFont::getEncodingName" url="function.harufont-getencodingname.php"/> <entry name="HaruFont::getFontName" url="function.harufont-getfontname.php"/> <entry name="HaruFont::getTextWidth" url="function.harufont-gettextwidth.php"/> -<entry name="HaruFont::getUnicodeWidth" url="function.harufont-getunicodewidth.php"/> +<entry name="HaruFont::getUnicodeWidth" url="function.harufont-gettqunicodewidth.php"/> <entry name="HaruFont::getXHeight" url="function.harufont-getxheight.php"/> <entry name="HaruFont::measureText" url="function.harufont-measuretext.php"/> <entry name="HaruImage::getBitsPerComponent" url="function.haruimage-getbitspercomponent.php"/> @@ -4647,11 +4647,11 @@ <entry name="HaruImage::getHeight" url="function.haruimage-getheight.php"/> <entry name="HaruImage::getSize" url="function.haruimage-getsize.php"/> <entry name="HaruImage::getWidth" url="function.haruimage-getwidth.php"/> -<entry name="HaruImage::setColorMask" url="function.haruimage-setcolormask.php"/> -<entry name="HaruImage::setMaskImage" url="function.haruimage-setmaskimage.php"/> +<entry name="HaruImage::setColorMask" url="function.haruimage-setcolortqmask.php"/> +<entry name="HaruImage::setMaskImage" url="function.haruimage-settqmaskimage.php"/> <entry name="HaruEncoder::getByteType" url="function.haruencoder-getbytetype.php"/> <entry name="HaruEncoder::getType" url="function.haruencoder-gettype.php"/> -<entry name="HaruEncoder::getUnicode" url="function.haruencoder-getunicode.php"/> +<entry name="HaruEncoder::getUnicode" url="function.haruencoder-gettqunicode.php"/> <entry name="HaruEncoder::getWritingMode" url="function.haruencoder-getwritingmode.php"/> <entry name="HaruOutline::setDestination" url="function.haruoutline-setdestination.php"/> <entry name="HaruOutline::setOpened" url="function.haruoutline-setopened.php"/> @@ -4679,7 +4679,7 @@ <entry name="SWFBitmap->getWidth()" url="function.swfbitmap.getwidth.php"/> <entry name="SWFButton->addAction()" url="function.swfbutton.addaction.php"/> <entry name="SWFButton->addASound()" url="function.swfbutton.addasound.php"/> -<entry name="SWFButton->addShape()" url="function.swfbutton.addshape.php"/> +<entry name="SWFButton->addShape()" url="function.swfbutton.addtqshape.php"/> <entry name="SWFButton->__construct()" url="function.swfbutton.construct.php"/> <entry name="SWFButton->setAction()" url="function.swfbutton.setaction.php"/> <entry name="SWFButton->setDown()" url="function.swfbutton.setdown.php"/> @@ -4689,7 +4689,7 @@ <entry name="SWFButton->setUp()" url="function.swfbutton.setup.php"/> <entry name="SWFDisplayItem->addAction()" url="function.swfdisplayitem.addaction.php"/> <entry name="SWFDisplayItem->addColor()" url="function.swfdisplayitem.addcolor.php"/> -<entry name="SWFDisplayItem->endMask()" url="function.swfdisplayitem.endmask.php"/> +<entry name="SWFDisplayItem->endMask()" url="function.swfdisplayitem.endtqmask.php"/> <entry name="SWFDisplayItem->getRot()" url="function.swfdisplayitem.getrot.php"/> <entry name="SWFDisplayItem->getX()" url="function.swfdisplayitem.getx.php"/> <entry name="SWFDisplayItem->getXScale()" url="function.swfdisplayitem.getxscale.php"/> @@ -4706,7 +4706,7 @@ <entry name="SWFDisplayItem->scale()" url="function.swfdisplayitem.scale.php"/> <entry name="SWFDisplayItem->scaleTo()" url="function.swfdisplayitem.scaleto.php"/> <entry name="SWFDisplayItem->setDepth()" url="function.swfdisplayitem.setdepth.php"/> -<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.setmasklevel.php"/> +<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.settqmasklevel.php"/> <entry name="SWFDisplayItem->setMatrix()" url="function.swfdisplayitem.setmatrix.php"/> <entry name="SWFDisplayItem->setName()" url="function.swfdisplayitem.setname.php"/> <entry name="SWFDisplayItem->setRatio()" url="function.swfdisplayitem.setratio.php"/> @@ -4723,7 +4723,7 @@ <entry name="SWFFont->getAscent()" url="function.swffont.getascent.php"/> <entry name="SWFFont->getDescent()" url="function.swffont.getdescent.php"/> <entry name="SWFFont->getLeading()" url="function.swffont.getleading.php"/> -<entry name="SWFFont->getShape()" url="function.swffont.getshape.php"/> +<entry name="SWFFont->getShape()" url="function.swffont.gettqshape.php"/> <entry name="SWFFont->getUTF8Width()" url="function.swffont.getutf8width.php"/> <entry name="SWFFont->getWidth()" url="function.swffont.getwidth.php"/> <entry name="SWFFontChar->addChars()" url="function.swffontchar.addchars.php"/> @@ -4731,8 +4731,8 @@ <entry name="SWFGradient->addEntry()" url="function.swfgradient.addentry.php"/> <entry name="SWFGradient->__construct()" url="function.swfgradient.construct.php"/> <entry name="SWFMorph->__construct()" url="function.swfmorph.construct.php"/> -<entry name="SWFMorph->getShape1()" url="function.swfmorph.getshape1.php"/> -<entry name="SWFMorph->getShape2()" url="function.swfmorph.getshape2.php"/> +<entry name="SWFMorph->getShape1()" url="function.swfmorph.gettqshape1.php"/> +<entry name="SWFMorph->getShape2()" url="function.swfmorph.gettqshape2.php"/> <entry name="SWFMovie->add()" url="function.swfmovie.add.php"/> <entry name="SWFMovie->addExport()" url="function.swfmovie.addexport.php"/> <entry name="SWFMovie->addFont()" url="function.swfmovie.addfont.php"/> @@ -4754,22 +4754,22 @@ <entry name="SWFMovie->streamMP3()" url="function.swfmovie.streammp3.php"/> <entry name="SWFMovie->writeExports()" url="function.swfmovie.writeexports.php"/> <entry name="SWFPrebuiltClip->__construct()" url="function.swfprebuiltclip.construct.php"/> -<entry name="SWFShape->addFill()" url="function.swfshape.addfill.php"/> -<entry name="SWFShape->__construct()" url="function.swfshape.construct.php"/> -<entry name="SWFShape->drawArc()" url="function.swfshape.drawarc.php"/> -<entry name="SWFShape->drawCircle()" url="function.swfshape.drawcircle.php"/> -<entry name="SWFShape->drawCubic()" url="function.swfshape.drawcubic.php"/> -<entry name="SWFShape->drawCubicTo()" url="function.swfshape.drawcubicto.php"/> -<entry name="SWFShape->drawCurve()" url="function.swfshape.drawcurve.php"/> -<entry name="SWFShape->drawCurveTo()" url="function.swfshape.drawcurveto.php"/> -<entry name="SWFShape->drawGlyph()" url="function.swfshape.drawglyph.php"/> -<entry name="SWFShape->drawLine()" url="function.swfshape.drawline.php"/> -<entry name="SWFShape->drawLineTo()" url="function.swfshape.drawlineto.php"/> -<entry name="SWFShape->movePen()" url="function.swfshape.movepen.php"/> -<entry name="SWFShape->movePenTo()" url="function.swfshape.movepento.php"/> -<entry name="SWFShape->setLeftFill()" url="function.swfshape.setleftfill.php"/> -<entry name="SWFShape->setLine()" url="function.swfshape.setline.php"/> -<entry name="SWFShape->setRightFill()" url="function.swfshape.setrightfill.php"/> +<entry name="SWFShape->addFill()" url="function.swftqshape.addfill.php"/> +<entry name="SWFShape->__construct()" url="function.swftqshape.construct.php"/> +<entry name="SWFShape->drawArc()" url="function.swftqshape.drawarc.php"/> +<entry name="SWFShape->drawCircle()" url="function.swftqshape.drawcircle.php"/> +<entry name="SWFShape->drawCubic()" url="function.swftqshape.drawcubic.php"/> +<entry name="SWFShape->drawCubicTo()" url="function.swftqshape.drawcubicto.php"/> +<entry name="SWFShape->drawCurve()" url="function.swftqshape.drawcurve.php"/> +<entry name="SWFShape->drawCurveTo()" url="function.swftqshape.drawcurveto.php"/> +<entry name="SWFShape->drawGlyph()" url="function.swftqshape.drawglyph.php"/> +<entry name="SWFShape->drawLine()" url="function.swftqshape.drawline.php"/> +<entry name="SWFShape->drawLineTo()" url="function.swftqshape.drawlineto.php"/> +<entry name="SWFShape->movePen()" url="function.swftqshape.movepen.php"/> +<entry name="SWFShape->movePenTo()" url="function.swftqshape.movepento.php"/> +<entry name="SWFShape->setLeftFill()" url="function.swftqshape.setleftfill.php"/> +<entry name="SWFShape->setLine()" url="function.swftqshape.setline.php"/> +<entry name="SWFShape->setRightFill()" url="function.swftqshape.setrightfill.php"/> <entry name="SWFSound" url="function.swfsound.construct.php"/> <entry name="SWFSoundInstance->loopCount()" url="function.swfsoundinstance.loopcount.php"/> <entry name="SWFSoundInstance->loopInPoint()" url="function.swfsoundinstance.loopinpoint.php"/> @@ -5063,7 +5063,7 @@ <entry name="ps_show_xy" url="function.ps-show-xy.php"/> <entry name="ps_show2" url="function.ps-show2.php"/> <entry name="ps_show" url="function.ps-show.php"/> -<entry name="ps_string_geometry" url="function.ps-string-geometry.php"/> +<entry name="ps_string_tqgeometry" url="function.ps-string-tqgeometry.php"/> <entry name="ps_stringwidth" url="function.ps-stringwidth.php"/> <entry name="ps_stroke" url="function.ps-stroke.php"/> <entry name="ps_symbol_name" url="function.ps-symbol-name.php"/> @@ -5096,7 +5096,7 @@ <entry name="swf_definetext" url="function.swf-definetext.php"/> <entry name="swf_endbutton" url="function.swf-endbutton.php"/> <entry name="swf_enddoaction" url="function.swf-enddoaction.php"/> -<entry name="swf_endshape" url="function.swf-endshape.php"/> +<entry name="swf_endtqshape" url="function.swf-endtqshape.php"/> <entry name="swf_endsymbol" url="function.swf-endsymbol.php"/> <entry name="swf_fontsize" url="function.swf-fontsize.php"/> <entry name="swf_fontslant" url="function.swf-fontslant.php"/> @@ -5124,20 +5124,20 @@ <entry name="swf_scale" url="function.swf-scale.php"/> <entry name="swf_setfont" url="function.swf-setfont.php"/> <entry name="swf_setframe" url="function.swf-setframe.php"/> -<entry name="swf_shapearc" url="function.swf-shapearc.php"/> -<entry name="swf_shapecurveto3" url="function.swf-shapecurveto3.php"/> -<entry name="swf_shapecurveto" url="function.swf-shapecurveto.php"/> -<entry name="swf_shapefillbitmapclip" url="function.swf-shapefillbitmapclip.php"/> -<entry name="swf_shapefillbitmaptile" url="function.swf-shapefillbitmaptile.php"/> -<entry name="swf_shapefilloff" url="function.swf-shapefilloff.php"/> -<entry name="swf_shapefillsolid" url="function.swf-shapefillsolid.php"/> -<entry name="swf_shapelinesolid" url="function.swf-shapelinesolid.php"/> -<entry name="swf_shapelineto" url="function.swf-shapelineto.php"/> -<entry name="swf_shapemoveto" url="function.swf-shapemoveto.php"/> +<entry name="swf_tqshapearc" url="function.swf-tqshapearc.php"/> +<entry name="swf_tqshapecurveto3" url="function.swf-tqshapecurveto3.php"/> +<entry name="swf_tqshapecurveto" url="function.swf-tqshapecurveto.php"/> +<entry name="swf_tqshapefillbitmapclip" url="function.swf-tqshapefillbitmapclip.php"/> +<entry name="swf_tqshapefillbitmaptile" url="function.swf-tqshapefillbitmaptile.php"/> +<entry name="swf_tqshapefilloff" url="function.swf-tqshapefilloff.php"/> +<entry name="swf_tqshapefillsolid" url="function.swf-tqshapefillsolid.php"/> +<entry name="swf_tqshapelinesolid" url="function.swf-tqshapelinesolid.php"/> +<entry name="swf_tqshapelineto" url="function.swf-tqshapelineto.php"/> +<entry name="swf_tqshapemoveto" url="function.swf-tqshapemoveto.php"/> <entry name="swf_showframe" url="function.swf-showframe.php"/> <entry name="swf_startbutton" url="function.swf-startbutton.php"/> <entry name="swf_startdoaction" url="function.swf-startdoaction.php"/> -<entry name="swf_startshape" url="function.swf-startshape.php"/> +<entry name="swf_starttqshape" url="function.swf-starttqshape.php"/> <entry name="swf_startsymbol" url="function.swf-startsymbol.php"/> <entry name="swf_textwidth" url="function.swf-textwidth.php"/> <entry name="swf_translate" url="function.swf-translate.php"/> @@ -5288,7 +5288,7 @@ <entry name="parsekit_compile_string" url="function.parsekit-compile-string.php"/> <entry name="parsekit_func_arginfo" url="function.parsekit-func-arginfo.php"/> <entry name="class_implements" url="function.class-implements.php"/> -<entry name="class_parents" url="function.class-parents.php"/> +<entry name="class_parents" url="function.class-tqparents.php"/> <entry name="iterator_count" url="function.iterator-count.php"/> <entry name="iterator_to_array" url="function.iterator-to-array.php"/> <entry name="spl_autoload_call" url="function.spl-autoload-call.php"/> @@ -5318,8 +5318,8 @@ <entry name="CachingIterator::rewind" url="cachingiterator.rewind.php"/> <entry name="CachingIterator::__toString" url="cachingiterator.tostring.php"/> <entry name="CachingIterator::valid" url="cachingiterator.valid.php"/> -<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.getchildren.php"/> -<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.haschildren.php"/> +<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.gettqchildren.php"/> +<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.hastqchildren.php"/> <entry name="DirectoryIterator::__construct" url="directoryiterator.construct.php"/> <entry name="DirectoryIterator::current" url="directoryiterator.current.php"/> <entry name="DirectoryIterator::getATime" url="directoryiterator.getatime.php"/> @@ -5356,12 +5356,12 @@ <entry name="LimitIterator::rewind" url="limititerator.rewind.php"/> <entry name="LimitIterator::seek" url="limititerator.seek.php"/> <entry name="LimitIterator::valid" url="limititerator.valid.php"/> -<entry name="ParentIterator::getChildren" url="parentiterator.getchildren.php"/> -<entry name="ParentIterator::hasChildren" url="parentiterator.haschildren.php"/> -<entry name="ParentIterator::next" url="parentiterator.next.php"/> -<entry name="ParentIterator::rewind" url="parentiterator.rewind.php"/> -<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.getchildren.php"/> -<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.haschildren.php"/> +<entry name="ParentIterator::getChildren" url="tqparentiterator.gettqchildren.php"/> +<entry name="ParentIterator::hasChildren" url="tqparentiterator.hastqchildren.php"/> +<entry name="ParentIterator::next" url="tqparentiterator.next.php"/> +<entry name="ParentIterator::rewind" url="tqparentiterator.rewind.php"/> +<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.gettqchildren.php"/> +<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.hastqchildren.php"/> <entry name="RecursiveDirectoryIterator::key" url="recursivedirectoryiterator.key.php"/> <entry name="RecursiveDirectoryIterator::next" url="recursivedirectoryiterator.next.php"/> <entry name="RecursiveDirectoryIterator::rewind" url="recursivedirectoryiterator.rewind.php"/> @@ -5373,8 +5373,8 @@ <entry name="RecursiveIteratorIterator::rewind" url="recursiveiteratoriterator.rewind.php"/> <entry name="RecursiveIteratorIterator::valid" url="recursiveiteratoriterator.valid.php"/> <entry name="SimpleXMLIterator::current" url="simplexmliterator.current.php"/> -<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.getchildren.php"/> -<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.haschildren.php"/> +<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.gettqchildren.php"/> +<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.hastqchildren.php"/> <entry name="SimpleXMLIterator::key" url="simplexmliterator.key.php"/> <entry name="SimpleXMLIterator::next" url="simplexmliterator.next.php"/> <entry name="SimpleXMLIterator::rewind" url="simplexmliterator.rewind.php"/> @@ -5509,7 +5509,7 @@ <entry name="tidy_set_encoding" url="function.tidy-set-encoding.php"/> <entry name="tidy_setopt" url="function.tidy-setopt.php"/> <entry name="tidy_warning_count" url="function.tidy-warning-count.php"/> -<entry name="tidyNode->hasChildren" url="function.tidynode-haschildren.php"/> +<entry name="tidyNode->hasChildren" url="function.tidynode-hastqchildren.php"/> <entry name="tidyNode->hasSiblings" url="function.tidynode-hassiblings.php"/> <entry name="tidyNode->isAsp" url="function.tidynode-isasp.php"/> <entry name="tidyNode->isComment" url="function.tidynode-iscomment.php"/> @@ -5517,7 +5517,7 @@ <entry name="tidyNode->isJste" url="function.tidynode-isjste.php"/> <entry name="tidyNode->isPhp" url="function.tidynode-isphp.php"/> <entry name="tidyNode->isText" url="function.tidynode-istext.php"/> -<entry name="tidyNode::getParent" url="function.tidynode-getparent.php"/> +<entry name="tidyNode::getParent" url="function.tidynode-gettqparent.php"/> <entry name="token_get_all" url="function.token-get-all.php"/> <entry name="token_name" url="function.token-name.php"/> <entry name="base64_decode" url="function.base64-decode.php"/> @@ -5594,8 +5594,8 @@ <entry name="ftp_systype" url="function.ftp-systype.php"/> <entry name="hw_Array2Objrec" url="function.hw-array2objrec.php"/> <entry name="hw_changeobject" url="function.hw-changeobject.php"/> -<entry name="hw_Children" url="function.hw-children.php"/> -<entry name="hw_ChildrenObj" url="function.hw-childrenobj.php"/> +<entry name="hw_Children" url="function.hw-tqchildren.php"/> +<entry name="hw_ChildrenObj" url="function.hw-tqchildrenobj.php"/> <entry name="hw_Close" url="function.hw-close.php"/> <entry name="hw_Connect" url="function.hw-connect.php"/> <entry name="hw_connection_info" url="function.hw-connection-info.php"/> @@ -5625,11 +5625,11 @@ <entry name="hw_GetObjectByQueryColl" url="function.hw-getobjectbyquerycoll.php"/> <entry name="hw_GetObjectByQueryCollObj" url="function.hw-getobjectbyquerycollobj.php"/> <entry name="hw_GetObjectByQueryObj" url="function.hw-getobjectbyqueryobj.php"/> -<entry name="hw_GetParents" url="function.hw-getparents.php"/> -<entry name="hw_GetParentsObj" url="function.hw-getparentsobj.php"/> +<entry name="hw_GetParents" url="function.hw-gettqparents.php"/> +<entry name="hw_GetParentsObj" url="function.hw-gettqparentsobj.php"/> <entry name="hw_getrellink" url="function.hw-getrellink.php"/> <entry name="hw_GetRemote" url="function.hw-getremote.php"/> -<entry name="hw_getremotechildren" url="function.hw-getremotechildren.php"/> +<entry name="hw_getremotetqchildren" url="function.hw-getremotetqchildren.php"/> <entry name="hw_GetSrcByDestObj" url="function.hw-getsrcbydestobj.php"/> <entry name="hw_GetText" url="function.hw-gettext.php"/> <entry name="hw_getusername" url="function.hw-getusername.php"/> @@ -5661,7 +5661,7 @@ <entry name="hw_api_attribute" url="function.hwapi-attribute.php"/> <entry name="hw_api->checkin" url="function.hwapi-checkin.php"/> <entry name="hw_api->checkout" url="function.hwapi-checkout.php"/> -<entry name="hw_api->children" url="function.hwapi-children.php"/> +<entry name="hw_api->tqchildren" url="function.hwapi-tqchildren.php"/> <entry name="hw_api_content->mimetype" url="function.hwapi-content-mimetype.php"/> <entry name="hw_api_content->read" url="function.hwapi-content-read.php"/> <entry name="hw_api->content" url="function.hwapi-content.php"/> @@ -5672,7 +5672,7 @@ <entry name="hw_api->dstofsrcanchor" url="function.hwapi-dstofsrcanchor.php"/> <entry name="hw_api_error->count" url="function.hwapi-error-count.php"/> <entry name="hw_api_error->reason" url="function.hwapi-error-reason.php"/> -<entry name="hw_api->find" url="function.hwapi-find.php"/> +<entry name="hw_api->tqfind" url="function.hwapi-find.php"/> <entry name="hw_api->ftstat" url="function.hwapi-ftstat.php"/> <entry name="hwapi_hgcsp" url="function.hwapi-hgcsp.php"/> <entry name="hw_api->hwstat" url="function.hwapi-hwstat.php"/> @@ -5696,11 +5696,11 @@ <entry name="hw_api_object->value" url="function.hwapi-object-value.php"/> <entry name="hw_api->object" url="function.hwapi-object.php"/> <entry name="hw_api->objectbyanchor" url="function.hwapi-objectbyanchor.php"/> -<entry name="hw_api->parents" url="function.hwapi-parents.php"/> +<entry name="hw_api->tqparents" url="function.hwapi-tqparents.php"/> <entry name="hw_api_reason->description" url="function.hwapi-reason-description.php"/> <entry name="hw_api_reason->type" url="function.hwapi-reason-type.php"/> <entry name="hw_api->remove" url="function.hwapi-remove.php"/> -<entry name="hw_api->replace" url="function.hwapi-replace.php"/> +<entry name="hw_api->tqreplace" url="function.hwapi-tqreplace.php"/> <entry name="hw_api->setcommittedversion" url="function.hwapi-setcommittedversion.php"/> <entry name="hw_api->srcanchors" url="function.hwapi-srcanchors.php"/> <entry name="hw_api->srcsofdst" url="function.hwapi-srcsofdst.php"/> @@ -5727,11 +5727,11 @@ <entry name="HttpMessage::getHeader" url="function.httpmessage-getheader.php"/> <entry name="HttpMessage::getHeaders" url="function.httpmessage-getheaders.php"/> <entry name="HttpMessage::getHttpVersion" url="function.httpmessage-gethttpversion.php"/> -<entry name="HttpMessage::getParentMessage" url="function.httpmessage-getparentmessage.php"/> +<entry name="HttpMessage::getParentMessage" url="function.httpmessage-gettqparentmessage.php"/> <entry name="HttpMessage::getRequestMethod" url="function.httpmessage-getrequestmethod.php"/> <entry name="HttpMessage::getRequestUrl" url="function.httpmessage-getrequesturl.php"/> <entry name="HttpMessage::getResponseCode" url="function.httpmessage-getresponsecode.php"/> -<entry name="HttpMessage::getResponseStatus" url="function.httpmessage-getresponsestatus.php"/> +<entry name="HttpMessage::getResponsetqStatus" url="function.httpmessage-getresponsestatus.php"/> <entry name="HttpMessage::getType" url="function.httpmessage-gettype.php"/> <entry name="HttpMessage::guessContentType" url="function.httpmessage-guesscontenttype.php"/> <entry name="HttpMessage::prepend" url="function.httpmessage-prepend.php"/> @@ -5743,7 +5743,7 @@ <entry name="HttpMessage::setRequestMethod" url="function.httpmessage-setrequestmethod.php"/> <entry name="HttpMessage::setRequestUrl" url="function.httpmessage-setrequesturl.php"/> <entry name="HttpMessage::setResponseCode" url="function.httpmessage-setresponsecode.php"/> -<entry name="HttpMessage::setResponseStatus" url="function.httpmessage-setresponsestatus.php"/> +<entry name="HttpMessage::setResponsetqStatus" url="function.httpmessage-setresponsestatus.php"/> <entry name="HttpMessage::setType" url="function.httpmessage-settype.php"/> <entry name="HttpMessage::toMessageTypeObject" url="function.httpmessage-tomessagetypeobject.php"/> <entry name="HttpMessage::toString" url="function.httpmessage-tostring.php"/> @@ -5788,7 +5788,7 @@ <entry name="HttpRequest::getResponseHeader" url="function.httprequest-getresponseheader.php"/> <entry name="HttpRequest::getResponseInfo" url="function.httprequest-getresponseinfo.php"/> <entry name="HttpRequest::getResponseMessage" url="function.httprequest-getresponsemessage.php"/> -<entry name="HttpRequest::getResponseStatus" url="function.httprequest-getresponsestatus.php"/> +<entry name="HttpRequest::getResponsetqStatus" url="function.httprequest-getresponsestatus.php"/> <entry name="HttpRequest::getSslOptions" url="function.httprequest-getssloptions.php"/> <entry name="HttpRequest::getUrl" url="function.httprequest-geturl.php"/> <entry name="HttpRequest::resetCookies" url="function.httprequest-resetcookies.php"/> @@ -5929,7 +5929,7 @@ <entry name="ldap_list" url="function.ldap-list.php"/> <entry name="ldap_mod_add" url="function.ldap-mod-add.php"/> <entry name="ldap_mod_del" url="function.ldap-mod-del.php"/> -<entry name="ldap_mod_replace" url="function.ldap-mod-replace.php"/> +<entry name="ldap_mod_tqreplace" url="function.ldap-mod-tqreplace.php"/> <entry name="ldap_modify" url="function.ldap-modify.php"/> <entry name="ldap_next_attribute" url="function.ldap-next-attribute.php"/> <entry name="ldap_next_entry" url="function.ldap-next-entry.php"/> @@ -5951,7 +5951,7 @@ <entry name="notes_create_db" url="function.notes-create-db.php"/> <entry name="notes_create_note" url="function.notes-create-note.php"/> <entry name="notes_drop_db" url="function.notes-drop-db.php"/> -<entry name="notes_find_note" url="function.notes-find-note.php"/> +<entry name="notes_find_note" url="function.notes-tqfind-note.php"/> <entry name="notes_header_info" url="function.notes-header-info.php"/> <entry name="notes_list_msgs" url="function.notes-list-msgs.php"/> <entry name="notes_mark_read" url="function.notes-mark-read.php"/> @@ -5970,12 +5970,12 @@ <entry name="Memcache::flush" url="function.memcache-flush.php"/> <entry name="Memcache::get" url="function.memcache-get.php"/> <entry name="Memcache::getExtendedStats" url="function.memcache-getextendedstats.php"/> -<entry name="Memcache::getServerStatus" url="function.memcache-getserverstatus.php"/> +<entry name="Memcache::getServertqStatus" url="function.memcache-getserverstatus.php"/> <entry name="Memcache::getStats" url="function.memcache-getstats.php"/> <entry name="Memcache::getVersion" url="function.memcache-getversion.php"/> <entry name="Memcache::increment" url="function.memcache-increment.php"/> <entry name="Memcache::pconnect" url="function.memcache-pconnect.php"/> -<entry name="Memcache::replace" url="function.memcache-replace.php"/> +<entry name="Memcache::tqreplace" url="function.memcache-tqreplace.php"/> <entry name="Memcache::set" url="function.memcache-set.php"/> <entry name="Memcache::setCompressThreshold" url="function.memcache-setcompressthreshold.php"/> <entry name="Memcache::setServerParams" url="function.memcache-setserverparams.php"/> @@ -5992,7 +5992,7 @@ <entry name="udm_crc32" url="function.udm-crc32.php"/> <entry name="udm_errno" url="function.udm-errno.php"/> <entry name="udm_error" url="function.udm-error.php"/> -<entry name="udm_find" url="function.udm-find.php"/> +<entry name="udm_tqfind" url="function.udm-find.php"/> <entry name="udm_free_agent" url="function.udm-free-agent.php"/> <entry name="udm_free_ispell_data" url="function.udm-free-ispell-data.php"/> <entry name="udm_free_res" url="function.udm-free-res.php"/> @@ -6250,7 +6250,7 @@ <entry name="msession_create" url="function.msession-create.php"/> <entry name="msession_destroy" url="function.msession-destroy.php"/> <entry name="msession_disconnect" url="function.msession-disconnect.php"/> -<entry name="msession_find" url="function.msession-find.php"/> +<entry name="msession_tqfind" url="function.msession-find.php"/> <entry name="msession_get_array" url="function.msession-get-array.php"/> <entry name="msession_get_data" url="function.msession-get-data.php"/> <entry name="msession_get" url="function.msession-get.php"/> @@ -6304,12 +6304,12 @@ <entry name="preg_match_all" url="function.preg-match-all.php"/> <entry name="preg_match" url="function.preg-match.php"/> <entry name="preg_quote" url="function.preg-quote.php"/> -<entry name="preg_replace_callback" url="function.preg-replace-callback.php"/> -<entry name="preg_replace" url="function.preg-replace.php"/> +<entry name="preg_replace_callback" url="function.preg-tqreplace-callback.php"/> +<entry name="preg_tqreplace" url="function.preg-tqreplace.php"/> <entry name="preg_split" url="function.preg-split.php"/> -<entry name="ereg_replace" url="function.ereg-replace.php"/> +<entry name="ereg_tqreplace" url="function.ereg-tqreplace.php"/> <entry name="ereg" url="function.ereg.php"/> -<entry name="eregi_replace" url="function.eregi-replace.php"/> +<entry name="eregi_tqreplace" url="function.eregi-tqreplace.php"/> <entry name="eregi" url="function.eregi.php"/> <entry name="split" url="function.split.php"/> <entry name="spliti" url="function.spliti.php"/> @@ -6364,10 +6364,10 @@ <entry name="sprintf" url="function.sprintf.php"/> <entry name="sscanf" url="function.sscanf.php"/> <entry name="str_getcsv" url="function.str-getcsv.php"/> -<entry name="str_ireplace" url="function.str-ireplace.php"/> +<entry name="str_itqreplace" url="function.str-itqreplace.php"/> <entry name="str_pad" url="function.str-pad.php"/> <entry name="str_repeat" url="function.str-repeat.php"/> -<entry name="str_replace" url="function.str-replace.php"/> +<entry name="str_tqreplace" url="function.str-tqreplace.php"/> <entry name="str_rot13" url="function.str-rot13.php"/> <entry name="str_shuffle" url="function.str-shuffle.php"/> <entry name="str_split" url="function.str-split.php"/> @@ -6401,7 +6401,7 @@ <entry name="strtr" url="function.strtr.php"/> <entry name="substr_compare" url="function.substr-compare.php"/> <entry name="substr_count" url="function.substr-count.php"/> -<entry name="substr_replace" url="function.substr-replace.php"/> +<entry name="substr_tqreplace" url="function.substr-tqreplace.php"/> <entry name="substr" url="function.substr.php"/> <entry name="trim" url="function.trim.php"/> <entry name="ucfirst" url="function.ucfirst.php"/> @@ -6494,7 +6494,7 @@ <entry name="get_declared_classes" url="function.get-declared-classes.php"/> <entry name="get_declared_interfaces" url="function.get-declared-interfaces.php"/> <entry name="get_object_vars" url="function.get-object-vars.php"/> -<entry name="get_parent_class" url="function.get-parent-class.php"/> +<entry name="get_parent_class" url="function.get-tqparent-class.php"/> <entry name="interface_exists" url="function.interface-exists.php"/> <entry name="is_a" url="function.is-a.php"/> <entry name="is_subclass_of" url="function.is-subclass-of.php"/> @@ -6571,7 +6571,7 @@ <entry name="is_resource" url="function.is-resource.php"/> <entry name="is_scalar" url="function.is-scalar.php"/> <entry name="is_string" url="function.is-string.php"/> -<entry name="is_unicode" url="function.is-unicode.php"/> +<entry name="is_tqunicode" url="function.is-tqunicode.php"/> <entry name="isset" url="function.isset.php"/> <entry name="print_r" url="function.print-r.php"/> <entry name="serialize" url="function.serialize.php"/> @@ -6856,12 +6856,12 @@ <entry name="DomNode->node_type" url="function.domnode-node-type.php"/> <entry name="DomNode->node_value" url="function.domnode-node-value.php"/> <entry name="DomNode->owner_document" url="function.domnode-owner-document.php"/> -<entry name="DomNode->parent_node" url="function.domnode-parent-node.php"/> +<entry name="DomNode->tqparent_node" url="function.domnode-tqparent-node.php"/> <entry name="DomNode->prefix" url="function.domnode-prefix.php"/> <entry name="DomNode->previous_sibling" url="function.domnode-previous-sibling.php"/> <entry name="DomNode->remove_child" url="function.domnode-remove-child.php"/> -<entry name="DomNode->replace_child" url="function.domnode-replace-child.php"/> -<entry name="DomNode->replace_node" url="function.domnode-replace-node.php"/> +<entry name="DomNode->replace_child" url="function.domnode-tqreplace-child.php"/> +<entry name="DomNode->replace_node" url="function.domnode-tqreplace-node.php"/> <entry name="DomNode->set_content" url="function.domnode-set-content.php"/> <entry name="DomNode->set_name" url="function.domnode-set-name.php"/> <entry name="DomNode->set_namespace" url="function.domnode-set-namespace.php"/> @@ -6916,7 +6916,7 @@ <entry name="SimpleXMLElement->addChild()" url="function.simplexml-element-addChild.php"/> <entry name="SimpleXMLElement->asXML()" url="function.simplexml-element-asXML.php"/> <entry name="SimpleXMLElement->attributes()" url="function.simplexml-element-attributes.php"/> -<entry name="SimpleXMLElement->children()" url="function.simplexml-element-children.php"/> +<entry name="SimpleXMLElement->tqchildren()" url="function.simplexml-element-tqchildren.php"/> <entry name="SimpleXMLElement->__construct()" url="function.simplexml-element-construct.php"/> <entry name="SimpleXMLElement->getDocNamespaces()" url="function.simplexml-element-getDocNamespaces.php"/> <entry name="SimpleXMLElement->getName()" url="function.simplexml-element-getName.php"/> diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index b2b1eb33..8f0a9298 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -146,9 +146,9 @@ void PHPCodeCompletion::cursorPositionChanged(){ } if (m_config->getCodeHinting()) { - int pos1 = lineStr.findRev("(", col - 1); - int pos2 = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1); - int pos3 = lineStr.findRev(")", col); + int pos1 = lineStr.tqfindRev("(", col - 1); + int pos2 = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1); + int pos3 = lineStr.tqfindRev(")", col); if (pos1 > pos2 && pos1 != -1 && pos3 < pos1) { TQString line = lineStr.mid(pos2 + 1, pos1 - pos2 - 1).stripWhiteSpace(); @@ -163,7 +163,7 @@ void PHPCodeCompletion::cursorPositionChanged(){ return; } - int pos = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); + int pos = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); TQString line = lineStr.mid(pos + 1, col - pos).stripWhiteSpace(); if (checkForVariable(line, col)) { @@ -180,7 +180,7 @@ kdDebug(9018) << "end checkForGlobalFunction" << endl; return; } - pos = lineStr.stripWhiteSpace().findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); + pos = lineStr.stripWhiteSpace().tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); line = lineStr.mid(pos + 1, col - pos); if (checkForNew(line, col)) { @@ -214,7 +214,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { kdDebug(9018) << "checkForStaticFunction" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.find("::") == -1) + if (line.tqfind("::") == -1) return false; TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); @@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) { FunctionDom nFunc = *funcIt; - if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) { + if ((function.isEmpty() || nFunc->name().tqstartsWith(function, FALSE)) && nFunc->isStatic()) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = nFunc->name(); @@ -267,7 +267,7 @@ bool PHPCodeCompletion::checkForNew(TQString line, int col){ kdDebug(9018) << "checkForNew" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.find("new ", 0, FALSE) == -1) + if (line.tqfind("new ", 0, FALSE) == -1) return false; TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); @@ -297,7 +297,7 @@ bool PHPCodeCompletion::checkForExtends(TQString line, int col){ kdDebug(9018) << "checkForExtends" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.find("extends", 0, FALSE) == -1) + if (line.tqfind("extends", 0, FALSE) == -1) return false; TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); @@ -316,12 +316,12 @@ bool PHPCodeCompletion::checkForVariable(TQString line, int col){ TQValueList<KTextEditor::CompletionEntry> list; TQString args; - if (line.find("->") == -1) { + if (line.tqfind("->") == -1) { return false; } if (line.left(2) != "->") { - int pos = line.findRev("->"); + int pos = line.tqfindRev("->"); args = line.mid(pos + 2, line.length() - pos); line = line.mid(0, pos); } @@ -362,10 +362,10 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString ClassList::Iterator classIt; for (classIt = classList.begin(); classIt != classList.end(); ++classIt) { ClassDom nClass = *classIt; - if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) { + if (name == NULL || name.isEmpty() || nClass->name().tqstartsWith(name, FALSE)) { KTextEditor::CompletionEntry e; - TQStringList::Iterator it = added.find(nClass->name()); + TQStringList::Iterator it = added.tqfind(nClass->name()); if (it == added.end()) { e.text = nClass->name(); list.append(e); @@ -383,7 +383,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars if (classname.isEmpty()) { TQValueList<FunctionCompletionEntry>::Iterator it; for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) { - if((*it).text.startsWith(function, FALSE)){ + if((*it).text.tqstartsWith(function, FALSE)){ KTextEditor::CompletionEntry e; e = (*it); list.append(e); @@ -393,7 +393,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList methodList = m_model->globalNamespace()->functionList(); FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { - if ((*methodIt)->name().startsWith(function, FALSE)){ + if ((*methodIt)->name().tqstartsWith(function, FALSE)){ KTextEditor::CompletionEntry e; e.text = (*methodIt)->name(); ArgumentDom pArg = (*methodIt)->argumentList().first(); @@ -416,7 +416,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { FunctionDom pMethod = *methodIt; - if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) { + if (function.isEmpty() || pMethod->name().tqstartsWith(function, FALSE)) { KTextEditor::CompletionEntry e; ArgumentDom arg = pMethod->argumentList().first(); @@ -430,7 +430,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars VariableList::Iterator attrIt; for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) { VariableDom pVar = *attrIt; - if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) { + if (function.isEmpty() || pVar->name().tqstartsWith(function, FALSE)) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = pVar->name(); @@ -526,13 +526,13 @@ TQString PHPCodeCompletion::getCurrentClassName() { return Class.cap(2); } } - return TQString::null; + return TQString(); } TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) { kdDebug(9018) << "getClassName " << varName << "::" << classname << endl; - if (varName.find("$") == 0) + if (varName.tqfind("$") == 0) varName = varName.mid(1); if (varName.lower() == "this") @@ -577,7 +577,7 @@ TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) { for(int i = m_currentLine; i >= 0; i--){ TQString line = m_editInterface->textLine(i); - if (!line.isNull() && line.find(varName,0 , FALSE) != -1) { + if (!line.isNull() && line.tqfind(varName,0 , FALSE) != -1) { if (createmember.search(line) != -1) { TQString right = createmember.cap(1).stripWhiteSpace(); @@ -640,7 +640,7 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) { if (m_argWidgetShow == true) return false; - if (line.find("::") != -1) { + if (line.tqfind("::") != -1) { TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); Static.setCaseSensitive(FALSE); @@ -658,8 +658,8 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) { } } - if (line.findRev("->") != -1) { - int pos1 = line.findRev("->"); + if (line.tqfindRev("->") != -1) { + int pos1 = line.tqfindRev("->"); TQString classname; TQString function = line.mid(pos1 + 2); @@ -706,7 +706,7 @@ kdDebug(9018) << "checkForArgHint 0 " << line << endl; } void PHPCodeCompletion::setStatusBar(TQString expr, TQString type) { - m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").arg(expr).arg(type), 1000 ); + m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").tqarg(expr).tqarg(type), 1000 ); } #include "phpcodecompletion.moc" diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h index 505bdcbd..b036beb7 100644 --- a/languages/php/phpcodecompletion.h +++ b/languages/php/phpcodecompletion.h @@ -47,6 +47,7 @@ public: class PHPCodeCompletion : public TQObject { Q_OBJECT + TQ_OBJECT public: PHPCodeCompletion(PHPSupportPart *phpSupport, PHPConfigData *config); diff --git a/languages/php/phpconfigdata.h b/languages/php/phpconfigdata.h index 49c49da8..d43661e1 100644 --- a/languages/php/phpconfigdata.h +++ b/languages/php/phpconfigdata.h @@ -30,6 +30,7 @@ class PHPConfigData : public TQObject { Q_OBJECT + TQ_OBJECT signals: void configStored(); diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 5b5dfda7..41f3c2fe 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -16,8 +16,8 @@ using namespace std; -PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* parent, const char* name, WFlags fl ) - : PHPConfigWidgetBase( parent, name, fl ) +PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* tqparent, const char* name, WFlags fl ) + : PHPConfigWidgetBase( tqparent, name, fl ) { configData = data; m_phpInfo = ""; @@ -77,7 +77,7 @@ PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* parent, const ch */ PHPConfigWidget::~PHPConfigWidget() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void PHPConfigWidget::accept() diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h index c404643c..84425de9 100644 --- a/languages/php/phpconfigwidget.h +++ b/languages/php/phpconfigwidget.h @@ -9,9 +9,10 @@ class PHPConfigData; class PHPConfigWidget : public PHPConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - PHPConfigWidget( PHPConfigData* data,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + PHPConfigWidget( PHPConfigData* data,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~PHPConfigWidget(); public slots: diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 8cfae9dc..0c926873 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PHPConfigWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PHPConfigWidgetBase</cstring> </property> @@ -19,11 +19,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>TabWidget1</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1_2</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useCurrentFile_radio</cstring> </property> @@ -59,7 +59,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useDefaultFile_radio</cstring> </property> @@ -77,7 +77,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox13</cstring> </property> @@ -88,7 +88,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>codeCompletion_checkbox</cstring> </property> @@ -96,7 +96,7 @@ <string>&Enable code completion</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>codeHinting_checkbox</cstring> </property> @@ -106,7 +106,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox14</cstring> </property> @@ -117,7 +117,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3_3_2_2</cstring> </property> @@ -133,7 +133,7 @@ <cstring>include_path_edit</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>realtimeParsing_checkbox</cstring> </property> @@ -153,14 +153,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>170</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>PixmapLabel1</cstring> </property> @@ -181,7 +181,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -192,7 +192,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>select_label</cstring> </property> @@ -200,7 +200,7 @@ <string>Please select how KDevelop should execute your scripts.</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup3</cstring> </property> @@ -211,7 +211,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>callPHPDirectly_radio</cstring> </property> @@ -222,7 +222,7 @@ <string>Ca&lling the PHP interpreter directly</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -230,7 +230,7 @@ <string><font size="+1">The php executable is called directly. Ideal for developers who want to develop terminal or graphical applications in PHP. You need a correctly installed php cgi version.</font></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -238,7 +238,7 @@ You need a correctly installed php cgi version.</font></string> <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>callWebserver_radio</cstring> </property> @@ -246,7 +246,7 @@ You need a correctly installed php cgi version.</font></string> <string>Using an &existing webserver (local or remote)</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -254,7 +254,7 @@ You need a correctly installed php cgi version.</font></string> <string><font size="+1">Uses an existing webserver. The pages are previewed in the internal web browser. Please make sure that the webserver was compiled with PHP support.</font></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -272,7 +272,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>171</height> @@ -281,7 +281,7 @@ the internal web browser. Please make sure that the webserver was compiled with </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -292,7 +292,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -318,7 +318,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -327,7 +327,7 @@ the internal web browser. Please make sure that the webserver was compiled with </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -338,7 +338,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3_2</cstring> </property> @@ -349,9 +349,9 @@ the internal web browser. Please make sure that the webserver was compiled with <cstring>exe_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -362,11 +362,11 @@ the internal web browser. Please make sure that the webserver was compiled with <cstring>exe_edit</cstring> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>exe_button</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>0</height> @@ -379,7 +379,7 @@ the internal web browser. Please make sure that the webserver was compiled with <string>...</string> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>about_button</cstring> </property> @@ -389,7 +389,7 @@ the internal web browser. Please make sure that the webserver was compiled with </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -403,9 +403,9 @@ the internal web browser. Please make sure that the webserver was compiled with <cstring>ini_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -419,14 +419,14 @@ the internal web browser. Please make sure that the webserver was compiled with <bool>true</bool> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>phpini_button</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>0</height> @@ -441,7 +441,7 @@ the internal web browser. Please make sure that the webserver was compiled with </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>zend_checkbox</cstring> </property> @@ -449,9 +449,9 @@ the internal web browser. Please make sure that the webserver was compiled with <string>Load &Zend extension:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -465,14 +465,14 @@ the internal web browser. Please make sure that the webserver was compiled with <bool>false</bool> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>zend_button</cstring> </property> <property name="enabled"> <bool>false</bool> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>0</height> @@ -497,7 +497,7 @@ the internal web browser. Please make sure that the webserver was compiled with <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>343</height> @@ -550,12 +550,12 @@ the internal web browser. Please make sure that the webserver was compiled with <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>slotAboutClicked()</slot> <slot>slotPHPExeButtonClicked()</slot> <slot>slotPHPIniButtonClicked()</slot> <slot>slotZendButtonClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index e5d479ec..241adb44 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -56,13 +56,13 @@ class ProblemItem: public KListViewItem { public: - ProblemItem( TQListView* parent, const TQString& problem, + ProblemItem( TQListView* tqparent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) {} + : KListViewItem( tqparent, problem, file, line, column ) {} - ProblemItem( TQListViewItem* parent, const TQString& problem, + ProblemItem( TQListViewItem* tqparent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) {} + : KListViewItem( tqparent, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ @@ -77,8 +77,8 @@ public: }; -PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* name ) - : TQWidget( parent, name ? name : "problemreporter" ), +PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ? name : "problemreporter" ), m_phpSupport( part ), m_document( 0 ), m_markIface( 0 ) @@ -133,8 +133,8 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* m_gridLayout->addWidget(m_tabBar,0,0); m_gridLayout->addMultiCellWidget(m_widgetStack,1,1,0,2); - m_gridLayout->addWidget(m_filterLabel,0,1,Qt::AlignRight); - m_gridLayout->addWidget(m_filterEdit,0,2,Qt::AlignLeft); + m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight); + m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft); connect( m_filterEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotFilter()) ); connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotFilter()) ); @@ -151,7 +151,7 @@ void PHPErrorView::slotFilter() if(!m_tabBar->isTabEnabled(4)) m_tabBar->setTabEnabled(4,true); - m_tabBar->tab(4)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() )); + m_tabBar->tab(4)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() )); m_tabBar->setCurrentTab(4); m_filteredList->clear(); @@ -166,7 +166,7 @@ void PHPErrorView::filterList(KListView* listview, const TQString& level) { TQListViewItemIterator it( listview ); while ( it.current() ) { - if ( it.current()->text(3).contains(m_filterEdit->text(),false)) + if ( it.current()->text(3).tqcontains(m_filterEdit->text(),false)) new KListViewItem(m_filteredList,level, it.current()->text(0),it.current()->text(1),it.current()->text(2),it.current()->text(3)); ++it; @@ -308,7 +308,7 @@ void PHPErrorView::reportProblem( int level, const TQString& fileName, int line, } TQString msg = text; - msg = msg.replace( TQRegExp("\n"), "" ); + msg = msg.tqreplace( TQRegExp("\n"), "" ); TQString relFileName = fileName; relFileName.remove(m_phpSupport->project()->projectDirectory()); @@ -390,7 +390,7 @@ TQString PHPErrorView::levelToString( int level ) const return TQString( i18n("Fixme") ); default: - return TQString::null; + return TQString(); } } diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h index 48dbd846..ec41eb51 100644 --- a/languages/php/phperrorview.h +++ b/languages/php/phperrorview.h @@ -56,8 +56,9 @@ enum Errors class PHPErrorView: public TQWidget { Q_OBJECT + TQ_OBJECT public: - PHPErrorView( PHPSupportPart* part, TQWidget* parent=0, const char* name=0 ); + PHPErrorView( PHPSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); virtual ~PHPErrorView(); void removeAllProblems( const TQString& filename ); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index d54028da..6e258569 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -138,7 +138,7 @@ void PHPFile::Analyse() { } bool PHPFile::ParseClass(TQString line, int lineNo) { - if (line.find("class ", 0, FALSE) == -1) + if (line.tqfind("class ", 0, FALSE) == -1) return FALSE; TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); @@ -159,7 +159,7 @@ bool PHPFile::ParseClass(TQString line, int lineNo) { } bool PHPFile::ParseFunction(TQString line, int lineNo) { - if (line.find("function", 0, FALSE) == -1) + if (line.tqfind("function", 0, FALSE) == -1) return FALSE; TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$"); @@ -198,7 +198,7 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) { } bool PHPFile::ParseVariable(TQString line, int lineNo) { - if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1) + if (line.tqfind("var") == -1 && line.tqfind("public") == -1 && line.tqfind("private") == -1 && line.tqfind("protected") == -1) return FALSE; TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$"); @@ -227,7 +227,7 @@ bool PHPFile::ParseVariable(TQString line, int lineNo) { } bool PHPFile::ParseThisMember(TQString line, int lineNo) { - if (line.find("$this->", 0, FALSE) == -1) + if (line.tqfind("$this->", 0, FALSE) == -1) return FALSE; TQRegExp createthis; @@ -240,7 +240,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { return TRUE; } - if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { + if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) { createthis.setPattern("\\$(this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createthis.search(line) != -1) { if (AddVariable(createthis.cap(1), "boolean", lineNo, TRUE) == FALSE) @@ -249,7 +249,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { } } - if (line.find("new", 0, FALSE) != -1) { + if (line.tqfind("new", 0, FALSE) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createthis.search(line) != -1) { if (AddVariable(createthis.cap(1), createthis.cap(2), lineNo, TRUE) == FALSE) @@ -258,7 +258,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { } } - if (line.find("array", 0, FALSE) != -1) { + if (line.tqfind("array", 0, FALSE) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createthis.search(line) != -1) { if (AddVariable(createthis.cap(1), "array", lineNo, TRUE) == FALSE) @@ -271,7 +271,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { } bool PHPFile::ParseMember(TQString line, int lineNo) { - if (line.find("$", 0, FALSE) == -1) + if (line.tqfind("$", 0, FALSE) == -1) return FALSE; /// @todo Ajouter plus de test .... @@ -293,7 +293,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { return TRUE; } - if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { + if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createmember.search(line) != -1) { if (AddVariable(createmember.cap(1), "boolean", lineNo) == FALSE) @@ -302,7 +302,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { } } - if (line.find("new", 0, FALSE) != -1) { + if (line.tqfind("new", 0, FALSE) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createmember.search(line) != -1) { if (AddVariable(createmember.cap(1), createmember.cap(2), lineNo) == FALSE) @@ -311,7 +311,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { } } - if (line.find("array", 0, FALSE) != -1) { + if (line.tqfind("array", 0, FALSE) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createmember.search(line) != -1) { if (AddVariable(createmember.cap(1), "array", lineNo) == FALSE) @@ -326,7 +326,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { bool PHPFile::ParseReturn(TQString line, int lineNo) { TQString rettype; - if (line.find("return", 0, FALSE) == -1) + if (line.tqfind("return", 0, FALSE) == -1) return FALSE; TQRegExp typeex; @@ -337,7 +337,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { TQString varname = typeex.cap(2).ascii(); rettype = varname; - if (varname.find("$") == 0) { + if (varname.tqfind("$") == 0) { /// @todo search in variable /* varname = varname.mid(1); @@ -346,7 +346,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { while ( it != m_vars.end() ) { Action *p = *it++; - if (p->parent() == current && p->name() == varname) { + if (p->tqparent() == current && p->name() == varname) { rettype = p->args(); } } @@ -357,7 +357,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { rettype = "null"; } - if (rettype.find("$") == 0) + if (rettype.tqfind("$") == 0) kdDebug(9018) << "ParseReturn value" << " " << rettype.latin1() << endl; } @@ -366,7 +366,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { } bool PHPFile::ParseTodo(TQString line, int lineNo) { - if (line.find("todo", 0, FALSE) == -1) + if (line.tqfind("todo", 0, FALSE) == -1) return FALSE; TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); @@ -381,7 +381,7 @@ bool PHPFile::ParseTodo(TQString line, int lineNo) { } bool PHPFile::ParseFixme(TQString line, int lineNo) { - if (line.find("fixme", 0, FALSE) == -1) + if (line.tqfind("fixme", 0, FALSE) == -1) return FALSE; TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); @@ -411,14 +411,14 @@ void PHPFile::ParseSource() { line = (*it).local8Bit(); if (!line.isNull()) { - if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1) { + if (line.tqfind("include", 0, FALSE) != -1 || line.tqfind("require", 0, FALSE) != -1) { if (includere.search(line) != -1) { TQStringList include_path; include_path = include_path.split(":", m_part->getIncludePath()); include_path.append(URLUtil::directory(fileName()) + "/"); include_path.append(""); - TQStringList list = includere.capturedTexts(); + TQStringList list = includere.tqcapturedTexts(); for ( TQStringList::Iterator it = include_path.begin(); it != include_path.end(); ++it ) { TQString abso = URLUtil::canonicalPath(*it + "/" + list[3]); @@ -432,16 +432,16 @@ void PHPFile::ParseSource() { if ( inMethod == TRUE ) { - bracketFuncOpen += line.contains("{"); - bracketFuncClose += line.contains("}"); + bracketFuncOpen += line.tqcontains("{"); + bracketFuncClose += line.tqcontains("}"); if (bracketFuncOpen == bracketFuncClose && bracketFuncOpen != 0 && bracketFuncClose != 0) { CloseFunction( lineNo ); } } if ( inMethod == FALSE ) { - bracketOpen += line.contains("{"); - bracketClose += line.contains("}"); + bracketOpen += line.tqcontains("{"); + bracketClose += line.tqcontains("}"); if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass == TRUE) { CloseClass( lineNo ); } @@ -449,8 +449,8 @@ void PHPFile::ParseSource() { if ( inClass == FALSE ) { if (ParseClass(line, lineNo) == TRUE) { - bracketOpen = line.contains("{"); - bracketClose = line.contains("}"); + bracketOpen = line.tqcontains("{"); + bracketClose = line.tqcontains("}"); } } @@ -459,8 +459,8 @@ void PHPFile::ParseSource() { } if (ParseFunction(line, lineNo) == TRUE) { - bracketFuncOpen = line.contains("{"); - bracketFuncClose = line.contains("}"); + bracketFuncOpen = line.tqcontains("{"); + bracketFuncClose = line.tqcontains("}"); } if ( inMethod == TRUE ) diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index b8aad71b..d790ca66 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -47,6 +47,7 @@ */ class PHPFile : public TQObject { Q_OBJECT + TQ_OBJECT public: PHPFile(PHPSupportPart *phpSupport, const TQString& fileName); diff --git a/languages/php/phphtmlview.h b/languages/php/phphtmlview.h index e135cfa7..91d4a195 100644 --- a/languages/php/phphtmlview.h +++ b/languages/php/phphtmlview.h @@ -27,6 +27,7 @@ class PHPSupportPart; class PHPHTMLView : public KDevHTMLPart { Q_OBJECT + TQ_OBJECT public: PHPHTMLView(PHPSupportPart *part); ~PHPHTMLView(); diff --git a/languages/php/phpinfodlg.ui b/languages/php/phpinfodlg.ui index 77de8304..5d048211 100644 --- a/languages/php/phpinfodlg.ui +++ b/languages/php/phpinfodlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PHPInfoDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>PHPInfoDlg</cstring> </property> @@ -19,12 +19,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QMultiLineEdit" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQMultiLineEdit" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>php_edit</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>ok_button</cstring> </property> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -82,6 +82,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 282e6c01..9227e8ff 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -30,7 +30,7 @@ using namespace std; -PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent, const char *name) : PHPNewClassDlgBase(parent,name,true) { +PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *tqparent, const char *name) : PHPNewClassDlgBase(tqparent,name,true) { m_filenameModified = false; KCompletion *comp = new KCompletion(); comp->setItems(baseClassNames); @@ -104,14 +104,14 @@ void PHPNewClassDlg::accept(){ // generate the sourcecode for the class if(m_baseClassEdit->text().isEmpty()){ - text = text.replace(TQRegExp("extends BASECLASS"),""); - text = text.replace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),""); + text = text.tqreplace(TQRegExp("extends BASECLASS"),""); + text = text.tqreplace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),""); }else{ - text = text.replace(TQRegExp("BASECLASS"),m_baseClassEdit->text()); + text = text.tqreplace(TQRegExp("BASECLASS"),m_baseClassEdit->text()); } - text = text.replace(TQRegExp("CLASSNAME"),m_classNameEdit->text()); - text = text.replace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper()); - text = text.replace(TQRegExp("AUTHOR"),"not implemented"); + text = text.tqreplace(TQRegExp("CLASSNAME"),m_classNameEdit->text()); + text = text.tqreplace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper()); + text = text.tqreplace(TQRegExp("AUTHOR"),"not implemented"); file.setName(absFileName); if(file.open(IO_WriteOnly)){ diff --git a/languages/php/phpnewclassdlg.h b/languages/php/phpnewclassdlg.h index 14db74b2..a5bbcb55 100644 --- a/languages/php/phpnewclassdlg.h +++ b/languages/php/phpnewclassdlg.h @@ -27,8 +27,9 @@ class PHPNewClassDlg : public PHPNewClassDlgBase { Q_OBJECT + TQ_OBJECT public: - PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent=0, const char *name=0); + PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *tqparent=0, const char *name=0); ~PHPNewClassDlg(); protected slots: void classNameTextChanged(const TQString&); diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui index 5b4df7c1..5084fb51 100644 --- a/languages/php/phpnewclassdlgbase.ui +++ b/languages/php/phpnewclassdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>PHPNewClassDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>m_ClassDLG</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -40,14 +40,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="5" column="3" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="5" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>m_okButton</cstring> </property> @@ -58,7 +58,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="5" column="5" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="5" column="5" rowspan="1" colspan="2"> <property name="name"> <cstring>m_cancelButton</cstring> </property> @@ -76,7 +76,7 @@ <cstring>m_classNameEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -87,7 +87,7 @@ <cstring>m_baseClassEdit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -98,7 +98,7 @@ <cstring>m_classTemplate</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -109,7 +109,7 @@ <cstring>m_dirEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -120,7 +120,7 @@ <cstring>m_fileNameEdit</cstring> </property> </widget> - <widget class="QToolButton" row="2" column="6"> + <widget class="TQToolButton" row="2" column="6"> <property name="name"> <cstring>m_dirButton</cstring> </property> @@ -141,7 +141,7 @@ <cstring>m_dirEdit</cstring> </property> </widget> - <widget class="QTextEdit" row="4" column="0" rowspan="1" colspan="7"> + <widget class="TQTextEdit" row="4" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>m_classTemplate</cstring> </property> @@ -193,8 +193,8 @@ class CLASSNAME extends BASECLASS { <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index a0f1179e..a4b5185e 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -50,7 +50,7 @@ bool PHPParser::hasFile( const TQString& fileName ) { // kdDebug(9018) << "hasFile " << fileName.latin1() << endl; TQString abso = URLUtil::canonicalPath(fileName); - TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso); + TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso); if ( it == m_files.end() ) return false; @@ -67,7 +67,7 @@ void PHPParser::addFile( const TQString& fileName ) kdDebug(9018) << "addFile " << fileName.latin1() << endl; TQFileInfo fi( abso ); - if ((fi.extension().contains("inc") || fi.extension().contains("php") || fi.extension().contains("html") || fi.extension().contains("php3") || !fi.extension()) && !fi.extension().contains("~")) { + if ((fi.extension().tqcontains("inc") || fi.extension().tqcontains("php") || fi.extension().tqcontains("html") || fi.extension().tqcontains("php3") || !fi.extension()) && !fi.extension().tqcontains("~")) { m_files.insert(abso, new PHPFile(m_part, abso)); } } @@ -76,7 +76,7 @@ void PHPParser::removeFile( const TQString& fileName ) { // kdDebug(9018) << "removeFile " << fileName.latin1() << endl; TQString abso = URLUtil::canonicalPath(fileName); - TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso); + TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso); if ( it != m_files.end()) { PHPFile *file = it.data(); @@ -104,7 +104,7 @@ void PHPParser::reparseFile( const TQString& fileName ) { kdDebug(9018) << "reparseFile" << endl; TQString abso = URLUtil::canonicalPath(fileName); - TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso); + TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso); if ( it != m_files.end()) { PHPFile *file = it.data(); diff --git a/languages/php/phpparser.h b/languages/php/phpparser.h index 24687ea3..87093b06 100644 --- a/languages/php/phpparser.h +++ b/languages/php/phpparser.h @@ -21,11 +21,7 @@ #include <tqthread.h> -#if QT_VERSION < 0x030100 -#include <kdevmutex.h> -#else #include <tqmutex.h> -#endif #include <codemodel.h> diff --git a/languages/php/phpsupport_event.h b/languages/php/phpsupport_event.h index 09c5f49e..28713efb 100644 --- a/languages/php/phpsupport_event.h +++ b/languages/php/phpsupport_event.h @@ -23,11 +23,7 @@ #include <tqevent.h> #include <tqvaluelist.h> -#if QT_VERSION < 0x030100 -#include <kdevmutex.h> -#else #include <tqmutex.h> -#endif enum { @@ -46,7 +42,7 @@ enum Event_AddFixme }; -class FileParseEvent: public QCustomEvent +class FileParseEvent: public TQCustomEvent { public: FileParseEvent(long event, const TQString& fileName ) diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index d31bc933..3dbf4211 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -69,8 +69,8 @@ using namespace std; static const KDevPluginInfo data("kdevphpsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) ) -PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart") +PHPSupportPart::PHPSupportPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, tqparent, name ? name : "PHPSupportPart") { m_htmlView = 0; m_parser = 0; @@ -354,7 +354,7 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, TQString buf = buffer; if (configData->getInvocationMode() == PHPConfigData::Shell) - buf.replace("\n", "<br>"); + buf.tqreplace("\n", "<br>"); m_htmlView->write(buf); } @@ -364,7 +364,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, TQString buf = buffer; if (configData->getInvocationMode() == PHPConfigData::Shell) - buf.replace("\n", "<br>"); + buf.tqreplace("\n", "<br>"); m_htmlView->write(buf); } diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 9d294642..f2b0d79c 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -44,9 +44,10 @@ class PHPFile; class PHPSupportPart : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - PHPSupportPart( TQObject *parent, const char *name, const TQStringList & ); + PHPSupportPart( TQObject *tqparent, const char *name, const TQStringList & ); ~PHPSupportPart(); PHPErrorView *ErrorView(); @@ -111,7 +112,7 @@ private: TQGuardedPtr<TQProgressBar> progressBar; TQStringList::Iterator it; TQStringList files; - TQMap< TQString, QPair<uint, uint> > pcs; + TQMap< TQString, TQPair<uint, uint> > pcs; TQDataStream stream; TQFile file; |