From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/DESIGN.iconloading | 2 +- kdecore/DESIGN.kconfig | 4 +- kdecore/Mainpage.dox | 2 +- kdecore/Makefile.am | 2 +- kdecore/README.kiosk | 20 +- kdecore/README.kstartupinfo | 6 +- kdecore/README.user_profiles | 4 +- kdecore/all_languages.desktop | 2 +- kdecore/configure.in.in | 10 +- kdecore/fakes.c | 6 +- kdecore/fixx11h.h | 32 +-- kdecore/kaboutdata.cpp | 8 +- kdecore/kaccel.cpp | 22 +- kdecore/kaccel.h | 12 +- kdecore/kaccelaction.cpp | 10 +- kdecore/kaccelaction.h | 16 +- kdecore/kaccelbase.cpp | 20 +- kdecore/kaccelbase.h | 4 +- kdecore/kaccelmanager.cpp | 74 ++--- kdecore/kaccelmanager.h | 2 +- kdecore/kaccelmanager_private.h | 14 +- kdecore/kaccelprivate.h | 2 +- kdecore/kallocator.cpp | 6 +- kdecore/kapplication.cpp | 80 +++--- kdecore/kapplication.h | 52 ++-- kdecore/kapplication_win.cpp | 2 +- kdecore/kbufferedio.h | 4 +- kdecore/kcalendarsystemfactory.h | 2 +- kdecore/kcalendarsystemgregorian.cpp | 2 +- kdecore/kcalendarsystemhebrew.cpp | 14 +- kdecore/kcalendarsystemhijri.cpp | 2 +- kdecore/kcalendarsystemjalali.cpp | 2 +- kdecore/kcatalogue.cpp | 8 +- kdecore/kcharsets.cpp | 46 ++-- kdecore/kcharsets.h | 4 +- kdecore/kcheckaccelerators.cpp | 8 +- kdecore/kcheckaccelerators.h | 4 +- kdecore/kclipboard.cpp | 10 +- kdecore/kclipboard.h | 2 +- kdecore/kcmdlineargs.cpp | 32 +-- kdecore/kcmdlineargs.h | 4 +- kdecore/kcompletion.cpp | 64 ++--- kdecore/kcompletion.h | 18 +- kdecore/kcompletion_private.h | 4 +- kdecore/kcompletionbase.cpp | 2 +- kdecore/kconfig.cpp | 12 +- kdecore/kconfig.h | 8 +- kdecore/kconfig_compiler/README.dox | 8 +- kdecore/kconfig_compiler/example/example.kcfg | 2 +- kdecore/kconfig_compiler/example/general_base.ui | 4 +- kdecore/kconfig_compiler/example/myoptions_base.ui | 4 +- kdecore/kconfig_compiler/kconfig_compiler.cpp | 78 +++--- .../tests/kconfigcompiler_test.cpp | 6 +- kdecore/kconfig_compiler/tests/test1.cpp.ref | 48 ++-- kdecore/kconfig_compiler/tests/test1.h.ref | 18 +- kdecore/kconfig_compiler/tests/test1.kcfg | 2 +- kdecore/kconfig_compiler/tests/test2.cpp.ref | 66 ++--- kdecore/kconfig_compiler/tests/test2.h.ref | 22 +- kdecore/kconfig_compiler/tests/test3.cpp.ref | 22 +- kdecore/kconfig_compiler/tests/test3.h.ref | 8 +- kdecore/kconfig_compiler/tests/test4.cpp.ref | 48 ++-- kdecore/kconfig_compiler/tests/test4.h.ref | 8 +- kdecore/kconfig_compiler/tests/test5.cpp.ref | 48 ++-- kdecore/kconfig_compiler/tests/test5.h.ref | 8 +- kdecore/kconfig_compiler/tests/test6.cpp.ref | 18 +- kdecore/kconfig_compiler/tests/test6.h.ref | 6 +- kdecore/kconfig_compiler/tests/test7.cpp.ref | 18 +- kdecore/kconfig_compiler/tests/test7.h.ref | 6 +- kdecore/kconfig_compiler/tests/test8a.cpp.ref | 10 +- kdecore/kconfig_compiler/tests/test8a.h.ref | 4 +- kdecore/kconfig_compiler/tests/test8b.cpp.ref | 16 +- kdecore/kconfig_compiler/tests/test8b.h.ref | 6 +- kdecore/kconfig_compiler/tests/test9.cpp.ref | 16 +- kdecore/kconfig_compiler/tests/test9.h.ref | 6 +- kdecore/kconfig_compiler/tests/test9.kcfg | 2 +- kdecore/kconfig_compiler/tests/test9main.cpp | 2 +- .../kconfig_compiler/tests/test_dpointer.cpp.ref | 88 +++--- kdecore/kconfigbackend.cpp | 26 +- kdecore/kconfigbase.cpp | 82 +++--- kdecore/kconfigbase.h | 40 +-- kdecore/kconfigdialogmanager.cpp | 28 +- kdecore/kconfigdialogmanager.h | 6 +- kdecore/kconfigskeleton.cpp | 30 +-- kdecore/kconfigskeleton.h | 54 ++-- kdecore/kcrash.cpp | 14 +- kdecore/kdcoppropertyproxy.cpp | 18 +- kdecore/kde-config.cpp.cmake | 52 ++-- kdecore/kde-config.cpp.in | 52 ++-- kdecore/kdebug.areas | 16 +- kdecore/kdebug.cpp | 14 +- kdecore/kdebug.h | 6 +- kdecore/kdelibs_export.h | 2 +- kdecore/kdemacros.h.cmake | 8 +- kdecore/kdemacros.h.in | 8 +- kdecore/kdesktopfile.cpp | 28 +- kdecore/kdesktopfile.h | 4 +- kdecore/kentities.c | 6 +- kdecore/kentities.gperf | 2 +- kdecore/kextsock.cpp | 16 +- kdecore/kextsock.h | 22 +- kdecore/kgenericfactory.h | 14 +- kdecore/kgenericfactory.tcc | 66 ++--- kdecore/kglobal.cpp | 6 +- kdecore/kglobal.h | 4 +- kdecore/kglobalaccel.h | 6 +- kdecore/kglobalaccel_win.cpp | 12 +- kdecore/kglobalaccel_x11.cpp | 18 +- kdecore/kglobalsettings.cpp | 18 +- kdecore/kglobalsettings.h | 18 +- kdecore/kiconeffect.cpp | 102 +++---- kdecore/kiconloader.cpp | 72 ++--- kdecore/kiconloader.h | 8 +- kdecore/kiconloader_p.h | 4 +- kdecore/kicontheme.cpp | 22 +- kdecore/kicontheme.h | 4 +- kdecore/kidna.cpp | 4 +- kdecore/kinstance.cpp | 2 +- kdecore/kkeynative.h | 30 +-- kdecore/kkeynative_x11.cpp | 6 +- kdecore/kkeyserver_x11.cpp | 28 +- kdecore/kkeyserver_x11.h | 82 +++--- kdecore/klibloader.cpp | 12 +- kdecore/klibloader.h | 10 +- kdecore/klocale.cpp | 116 ++++---- kdecore/klocale.h | 24 +- kdecore/kmacroexpander.cpp | 46 ++-- kdecore/kmacroexpander.h | 2 +- kdecore/kmanagerselection.cpp | 4 +- kdecore/kmanagerselection.h | 6 +- kdecore/kmdcodec.cpp | 130 ++++----- kdecore/kmdcodec.h | 68 ++--- kdecore/kmimesourcefactory.cpp | 2 +- kdecore/kmimesourcefactory.h | 4 +- kdecore/kmountpoint.cpp | 4 +- kdecore/kmultipledrag.cpp | 10 +- kdecore/kmultipledrag.h | 4 +- kdecore/knotifyclient.cpp | 14 +- kdecore/knotifyclient.h | 4 +- kdecore/kpalette.cpp | 2 +- kdecore/kpalette.h | 2 +- kdecore/kprocctrl.cpp | 2 +- kdecore/kprocctrl.h | 2 +- kdecore/kprocess.cpp | 2 +- kdecore/kprocess.h | 6 +- kdecore/kprocio.cpp | 2 +- kdecore/kprocio.h | 4 +- kdecore/kprotocolinfo_kdecore.cpp | 14 +- kdecore/kprotocolinfofactory.cpp | 2 +- kdecore/kpty.cpp | 6 +- kdecore/kqiodevicegzip_p.cpp | 8 +- kdecore/kqiodevicegzip_p.h | 4 +- kdecore/kregexp.h | 4 +- kdecore/krfcdate.cpp | 12 +- kdecore/krfcdate.h | 2 +- kdecore/krootprop.cpp | 22 +- kdecore/ksavefile.cpp | 6 +- kdecore/ksavefile.h | 2 +- kdecore/kshell.cpp | 42 +-- kdecore/kshell.h | 4 +- kdecore/kshortcut.cpp | 12 +- kdecore/kshortcut.h | 36 +-- kdecore/kshortcutlist.cpp | 2 +- kdecore/kshortcutmenu.cpp | 4 +- kdecore/ksimpleconfig.cpp | 2 +- kdecore/ksimpleconfig.h | 2 +- kdecore/ksock.h | 6 +- kdecore/ksockaddr.cpp | 20 +- kdecore/ksockaddr.h | 6 +- kdecore/ksocks.cpp | 2 +- kdecore/kstandarddirs.cpp | 106 ++++---- kdecore/kstandarddirs.h | 22 +- kdecore/kstartupinfo.cpp | 146 +++++----- kdecore/kstartupinfo.h | 16 +- kdecore/kstdaccel.cpp | 10 +- kdecore/kstdaccel.h | 10 +- kdecore/kstringhandler.cpp | 32 +-- kdecore/kstringhandler.h | 10 +- kdecore/ksycoca.cpp | 36 +-- kdecore/ksycoca.h | 8 +- kdecore/ksycocadict.cpp | 22 +- kdecore/ksycocadict.h | 10 +- kdecore/ksycocaentry.h | 2 +- kdecore/ksycocafactory.cpp | 16 +- kdecore/ktempdir.cpp | 2 +- kdecore/ktempdir.h | 2 +- kdecore/ktempfile.cpp | 2 +- kdecore/ktimezones.cpp | 48 ++-- kdecore/ktimezones.h | 6 +- kdecore/kurl.cpp | 72 ++--- kdecore/kurl.h | 22 +- kdecore/kurldrag.cpp | 10 +- kdecore/kurldrag.h | 8 +- kdecore/kuser.cpp | 4 +- kdecore/kuser.h | 6 +- kdecore/kvmallocator.cpp | 8 +- kdecore/kwin.cpp | 44 +-- kdecore/kwin.h | 8 +- kdecore/kwinmodule.cpp | 22 +- kdecore/kwinmodule.h | 10 +- kdecore/kxmessages.cpp | 6 +- kdecore/kxmessages.h | 2 +- kdecore/libintl.cpp | 8 +- kdecore/libqt-mt.nmcheck | 4 +- kdecore/libqt-mt_weak.nmcheck | 14 +- kdecore/malloc/README | 2 +- kdecore/malloc/malloc.c | 164 +++++------ kdecore/netsupp.cpp | 30 +-- kdecore/netsupp.h | 52 ++-- kdecore/netwm.cpp | 300 ++++++++++----------- kdecore/netwm.h | 68 ++--- kdecore/netwm_def.h | 6 +- kdecore/netwm_p.h | 8 +- kdecore/network/Makefile.am | 2 +- kdecore/network/kbufferedsocket.cpp | 24 +- kdecore/network/kbufferedsocket.h | 18 +- kdecore/network/kclientsocketbase.cpp | 32 +-- kdecore/network/kclientsocketbase.h | 22 +- kdecore/network/kdatagramsocket.cpp | 6 +- kdecore/network/kdatagramsocket.h | 6 +- kdecore/network/khttpproxysocketdevice.cpp | 14 +- kdecore/network/kiobuffer.h | 10 +- kdecore/network/knetworkinterface.h | 2 +- kdecore/network/kresolver.cpp | 60 ++--- kdecore/network/kresolver.h | 28 +- kdecore/network/kresolver_p.h | 8 +- kdecore/network/kresolvermanager.cpp | 28 +- kdecore/network/kresolverstandardworkers.cpp | 46 ++-- kdecore/network/kresolverstandardworkers_p.h | 2 +- kdecore/network/kresolverworkerbase.h | 4 +- kdecore/network/kreverseresolver.cpp | 6 +- kdecore/network/kreverseresolver.h | 6 +- kdecore/network/kserversocket.cpp | 4 +- kdecore/network/kserversocket.h | 4 +- kdecore/network/ksocketaddress.cpp | 86 +++--- kdecore/network/ksocketaddress.h | 60 ++--- kdecore/network/ksocketbase.h | 32 +-- kdecore/network/ksocketbuffer.cpp | 36 +-- kdecore/network/ksocketbuffer_p.h | 20 +- kdecore/network/ksocketdevice.cpp | 20 +- kdecore/network/ksocketdevice.h | 18 +- kdecore/network/ksockssocketdevice.cpp | 14 +- kdecore/network/ksockssocketdevice.h | 12 +- kdecore/network/ksrvresolverworker.cpp | 10 +- kdecore/network/ksrvresolverworker_p.h | 8 +- kdecore/network/kstreamsocket.cpp | 2 +- kdecore/svgicons/ksvgiconengine.cpp | 34 +-- kdecore/svgicons/ksvgiconpainter.cpp | 162 +++++------ kdecore/svgicons/ksvgiconpainter.h | 8 +- kdecore/tests/kcalendartest.cpp | 2 +- kdecore/tests/kconfigtestgui.cpp | 2 +- kdecore/tests/kconfigtestgui.h | 2 +- kdecore/tests/kipctest.h | 2 +- kdecore/tests/klocaletest.cpp | 28 +- kdecore/tests/kmacroexpandertest.cpp | 10 +- kdecore/tests/kmdcodectest.cpp | 10 +- kdecore/tests/kprocesstest.h | 2 +- kdecore/tests/kprociotest.h | 2 +- kdecore/tests/kresolvertest.cpp | 8 +- kdecore/tests/kstddirstest.cpp | 2 +- kdecore/tests/ktimezonestest.cpp | 2 +- kdecore/tests/kurltest.cpp | 8 +- kdecore/tests/testqtargs.cpp | 2 +- kdecore/vsnprintf.c | 2 +- 263 files changed, 2674 insertions(+), 2674 deletions(-) (limited to 'kdecore') diff --git a/kdecore/DESIGN.iconloading b/kdecore/DESIGN.iconloading index ceb2ffbce..636cf4445 100644 --- a/kdecore/DESIGN.iconloading +++ b/kdecore/DESIGN.iconloading @@ -55,7 +55,7 @@ can copy this pixmap: XGCValues values; GC gc = XCreateGC(qt_xdisplay(), src, 0, &values); XCopyArea(qt_xdisplay(), src, p.handle(), gc, 0, 0, 30, 30, 0, 0); - // p contains now 30x30 pixels of test.png. + // p tqcontains now 30x30 pixels of test.png. The only hard part is then to publish the icons in a way that applications know what to copy. I'm thinking about a ksycoca-sort-of index that diff --git a/kdecore/DESIGN.kconfig b/kdecore/DESIGN.kconfig index e683566cb..6ee59b708 100644 --- a/kdecore/DESIGN.kconfig +++ b/kdecore/DESIGN.kconfig @@ -1,4 +1,4 @@ -kconfigdata.h contains definitions of the data formats used by kconfig. +kconfigdata.h tqcontains definitions of the data formats used by kconfig. Configuration entries are stored as "KEntry". They are indexed with "KEntryKey". The primary store is a "KEntryMap" which is defined as a QMap from "KEntryKey" @@ -10,7 +10,7 @@ are grouped in the QMap as well. The start of a group is indicated with a KEntryKey with an empty mKey and a dummy KEntry. This allows us to search for the start of the group and then to -iterate until we end up in another group. That way we will find all entries +iterate until we end up in another group. That way we will tqfind all entries of a certain group. Entries that are localised with the _current_ locale are stored with bLocal diff --git a/kdecore/Mainpage.dox b/kdecore/Mainpage.dox index fea4b533a..7e3cc61f0 100644 --- a/kdecore/Mainpage.dox +++ b/kdecore/Mainpage.dox @@ -14,7 +14,7 @@ If you are unsure where to start, have a look at the tutorials on the Trinity project site to get you going. -If you know what you are looking for, you should be able to find it in +If you know what you are looking for, you should be able to tqfind it in the class list or the modules list. diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am index b5a9c5a80..478c0e70a 100644 --- a/kdecore/Makefile.am +++ b/kdecore/Makefile.am @@ -166,7 +166,7 @@ EXTRA_DIST = generate_keys.sh $(kdebug_DATA) \ kcharsets.lo: kentities.c parser: kentities.gperf - cd $(srcdir) && gperf -a -L "ANSI-C" -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c + cd $(srcdir) && gperf -a -L "ANSI-C" -E -C -c -o -t -k '*' -Nkde_tqfindEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c bin_PROGRAMS = kde-config kgrantpty diff --git a/kdecore/README.kiosk b/kdecore/README.kiosk index cd59f8db3..f84a09829 100644 --- a/kdecore/README.kiosk +++ b/kdecore/README.kiosk @@ -155,10 +155,10 @@ action/edit_copy action/edit_paste action/edit_select_all action/edit_deselect -action/edit_find -action/edit_find_next -action/edit_find_last -action/edit_replace +action/edit_tqfind +action/edit_tqfind_next +action/edit_tqfind_last +action/edit_tqreplace action/view_actual_size action/view_fit_to_page action/view_fit_to_width @@ -267,9 +267,9 @@ action/add_bookmark action/edit_bookmarks action/clear_terminal action/reset_clear_terminal -action/find_history -action/find_next -action/find_previous +action/tqfind_history +action/tqfind_next +action/tqfind_previous action/save_history action/clear_history action/clear_all_histories @@ -535,7 +535,7 @@ open - This controls which files can be opened by the user in applications. rule_3=open,,,,file,,$TMP,true Note that with the above, users would still be able to open files from the internet. Note that the user is also given access to $TMP in order to - ensure correct operation of KDE applications. $TMP is replaced with the + ensure correct operation of KDE applications. $TMP is tqreplaced with the temporary directory that KDE uses for this user. Some remarks: @@ -627,8 +627,8 @@ variables. In order to use this the entry must be marked with [$e]. Example: Name[$e]=$USER -When the "Name" entry is read $USER will be replaced with the value of the -$USER environment variable. Note that the application will replace $USER +When the "Name" entry is read $USER will be tqreplaced with the value of the +$USER environment variable. Note that the application will tqreplace $USER with the value of the environment variable after saving. To prevent this combine the $e option with $i (immmutable) option. diff --git a/kdecore/README.kstartupinfo b/kdecore/README.kstartupinfo index 233ccde1e..ee02b2b78 100644 --- a/kdecore/README.kstartupinfo +++ b/kdecore/README.kstartupinfo @@ -68,9 +68,9 @@ MapNotify= - this key is obsolete - true is equivalent to X-KDE-StartupNotify=true and no X-KDE-WMClass set - false is equivalent to X-KDE-StartupNotify=true and X-KDE-WMClass=0 - - many .desktop files in KDE ( especially in kdebase/kappfinder ) + - many .desktop files in KDE ( especially in kdebase/kapptqfinder ) seem to have MapNotify=false even though it's not needed, this - needs to be checked and replaced by the needed X-KDE-* values, + needs to be checked and tqreplaced by the needed X-KDE-* values, often just X-KDE-StartupNotify=true should be enough The best way to check if the entries are set correctly is to start @@ -216,7 +216,7 @@ Text entries in the messages : ------------------------------ Every entry is of the form =. Value may be either a number -or a string. If the string contains spaces, it must be quoted ("), all +or a string. If the string tqcontains spaces, it must be quoted ("), all backslashes and quotes (") must be escaped by backslashes. If this ever becomes more than an internal KDE standard, non-standard entry names should start with an underscore. diff --git a/kdecore/README.user_profiles b/kdecore/README.user_profiles index 4fb43b757..243ad5ffa 100644 --- a/kdecore/README.user_profiles +++ b/kdecore/README.user_profiles @@ -26,7 +26,7 @@ Mapping profiles to individual users ==================================== The mapping file can contain a [Users] section for mapping profiles to -an individual user. The [Users] section contains the user's account name +an individual user. The [Users] section tqcontains the user's account name followed by one or more profiles as follow: [Users] @@ -68,7 +68,7 @@ which profile(s) belongs to that group. This looks as follows: For each group that a user is part of, the corresponding profile(s) are used. The order in which the groups are listed in the "groups" entry, determines the resulting order of all the applicable profiles. If multiple profiles are applicable to a -particular user and a profile contains settings that conflict with settings in +particular user and a profile tqcontains settings that conflict with settings in another profile then the settings in the earlier listed profile take precedent. So if, based on the example above, a user is part of the "pkgs" group then the diff --git a/kdecore/all_languages.desktop b/kdecore/all_languages.desktop index 2f36efff6..1a333a62c 100644 --- a/kdecore/all_languages.desktop +++ b/kdecore/all_languages.desktop @@ -7681,7 +7681,7 @@ Name[zu]=Isi-Osithani [om] Name=Oromo Name[ar]=الأورومو -Name[az]=Oromoca +Name[az]=Orotqmoca Name[be]=Арома Name[bg]=Афан Оромо Name[bn]=ওরোমো diff --git a/kdecore/configure.in.in b/kdecore/configure.in.in index b2fe9bd6e..6d24e15a4 100644 --- a/kdecore/configure.in.in +++ b/kdecore/configure.in.in @@ -1,7 +1,7 @@ -dnl Compile in the exec prefix to help kstddirs in finding dynamic libs +dnl Compile in the exec prefix to help kstddirs in tqfinding dynamic libs AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading]) -dnl Compile in kde_bindir to safely find kdesu_stub. +dnl Compile in kde_bindir to safely tqfind kdesu_stub. if test "$exec_prefix" = "NONE"; then bindir_str="\"$prefix/bin\"" else @@ -97,7 +97,7 @@ AC_CHECK_FUNCS([getaddrinfo], AC_CHECK_FUNCS([freeaddrinfo getnameinfo gai_strerror], : , [ kde_gai_ok=false - AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be replaced]) + AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be tqreplaced]) AC_DEFINE(GETADDRINFO_RETURNS_UNIX, 1, [Define if getaddrinfo returns AF_UNIX sockets]) break ]) @@ -134,7 +134,7 @@ AC_CHECK_FUNCS([getaddrinfo], ], [ AC_MSG_RESULT(no) - AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be replaced]) + AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be tqreplaced]) ], [ AC_MSG_RESULT(cross compiling. We hope so) @@ -180,7 +180,7 @@ AC_ARG_WITH(libart, if test "x$with_libart" != xno; then KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [ - AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) + AC_MSG_WARN([Could not tqfind libart anywhere, check http://www.levien.com/libart/]) ]) if test -n "$LIBART_CONFIG"; then diff --git a/kdecore/fakes.c b/kdecore/fakes.c index 14f162eca..1b5ed1c19 100644 --- a/kdecore/fakes.c +++ b/kdecore/fakes.c @@ -182,7 +182,7 @@ int seteuid(uid_t euid) SUFFIX_LEN tells us how long is (it can be zero length). The last six characters of TEMPLATE before must be "XXXXXX"; - they are replaced with a string that makes the filename unique. + they are tqreplaced with a string that makes the filename unique. Returns a file descriptor open on the file for reading and writing. */ @@ -230,7 +230,7 @@ KDECORE_EXPORT int mkstemps (char* _template, int suffix_len) with (module 2^32). */ value += 7777; } - /* We return the null string if we can't find a unique file name. */ + /* We return the null string if we can't tqfind a unique file name. */ _template[0] = '\0'; return -1; } @@ -261,7 +261,7 @@ KDECORE_EXPORT int mkstemp (char* _template) The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the filename unique. + they are tqreplaced with a string that makes the filename unique. Returns a file descriptor open on the file for reading and writing. */ diff --git a/kdecore/fixx11h.h b/kdecore/fixx11h.h index ec8e53ab9..2672c59d1 100644 --- a/kdecore/fixx11h.h +++ b/kdecore/fixx11h.h @@ -4,7 +4,7 @@ /* Usage: If you get compile errors caused by X11 includes (the line - where first error appears contains word like None, Unsorted, + where first error appears tqcontains word like None, Unsorted, Below, etc.), put #include in the .cpp file (not .h file!) between the place where X11 headers are included and the place where the file with compile @@ -21,7 +21,7 @@ The original X11 symbols are still accessible (e.g. for None) as X::None, XNone, and also still - None, unless name lookup finds different None + None, unless name lookup tqfinds different None first (in the current class, etc.) Use 'Unsorted', 'Bool' and 'index' as templates. @@ -168,25 +168,25 @@ const int GrayScale = XGrayScale; #endif // Affects: Should be without side effects. -#ifdef Status -#ifndef FIXX11H_Status -#define FIXX11H_Status -typedef Status XStatus; -#undef Status -typedef XStatus Status; +#ifdef tqStatus +#ifndef FIXX11H_tqStatus +#define FIXX11H_tqStatus +typedef tqStatus XtqStatus; +#undef tqStatus +typedef XtqStatus tqStatus; #endif -#undef Status +#undef tqStatus #endif // Affects: Should be without side effects. -#ifdef CursorShape -#ifndef FIXX11H_CursorShape -#define FIXX11H_CursorShape -const int XCursorShape = CursorShape; -#undef CursorShape -const int CursorShape = CursorShape; +#ifdef tqCursorShape +#ifndef FIXX11H_tqCursorShape +#define FIXX11H_tqCursorShape +const int XtqCursorShape = tqCursorShape; +#undef tqCursorShape +const int tqCursorShape = tqCursorShape; #endif -#undef CursorShape +#undef tqCursorShape #endif // template ---> diff --git a/kdecore/kaboutdata.cpp b/kdecore/kaboutdata.cpp index 423166c18..1a71423b1 100644 --- a/kdecore/kaboutdata.cpp +++ b/kdecore/kaboutdata.cpp @@ -296,7 +296,7 @@ KAboutData::setProgramLogo(const TQImage& image) QString KAboutData::version() const { - return TQString::fromLatin1(mVersion); + return TQString::tqfromLatin1(mVersion); } QString @@ -311,13 +311,13 @@ KAboutData::shortDescription() const QString KAboutData::homepage() const { - return TQString::fromLatin1(mHomepageAddress); + return TQString::tqfromLatin1(mHomepageAddress); } QString KAboutData::bugAddress() const { - return TQString::fromLatin1(mBugEmailAddress); + return TQString::tqfromLatin1(mBugEmailAddress); } const TQValueList @@ -384,7 +384,7 @@ KAboutData::translators() const QString KAboutData::aboutTranslationTeam() { - return i18n("replace this with information about your translation team", + return i18n("tqreplace this with information about your translation team", "

KDE is translated into many languages thanks to the work " "of the translation teams all over the world.

" "

For more information on KDE internationalization " diff --git a/kdecore/kaccel.cpp b/kdecore/kaccel.cpp index 5cd2195cb..a0ffbede2 100644 --- a/kdecore/kaccel.cpp +++ b/kdecore/kaccel.cpp @@ -120,10 +120,10 @@ bool qt_try_modal( TQWidget *, XEvent * ); bool KAccelEventHandler::x11Event( XEvent* pEvent ) { - if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) + if( TQWidget::keyboardGrabber() || !kapp->tqfocusWidget() ) return false; - if ( !qt_try_modal(kapp->focusWidget(), pEvent) ) + if ( !qt_try_modal(kapp->tqfocusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { @@ -144,7 +144,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent ) ke.ignore(); g_bAccelActivated = false; - kapp->sendEvent( kapp->focusWidget(), &ke ); + kapp->sendEvent( kapp->tqfocusWidget(), &ke ); // If the Override event was accepted from a non-KAccel widget, // then kill the next AccelOverride in KApplication::notify. @@ -206,7 +206,7 @@ bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable ) bool KAccelPrivate::removeAction( const TQString& sAction ) { - // FIXME: getID() doesn't contains any useful + // FIXME: getID() doesn't tqcontains any useful // information! Use mapIDToAction. --ellis, 2/May/2002 // Or maybe KAccelBase::remove() takes care of TQAccel indirectly... KAccelAction* pAction = actions().actionPtr( sAction ); @@ -278,7 +278,7 @@ bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& } } //kdWarning(125) << kdBacktrace() << endl; - kdWarning(125) << "Didn't find key in m_mapIDToKey." << endl; + kdWarning(125) << "Didn't tqfind key in m_mapIDToKey." << endl; return false; } @@ -295,7 +295,7 @@ bool KAccelPrivate::disconnectKey( const KKeyServer::Key& key ) } } //kdWarning(125) << kdBacktrace() << endl; - kdWarning(125) << "Didn't find key in m_mapIDTokey." << endl; + kdWarning(125) << "Didn't tqfind key in m_mapIDTokey." << endl; return false; } @@ -303,7 +303,7 @@ void KAccelPrivate::slotKeyPressed( int id ) { kdDebug(125) << "KAccelPrivate::slotKeyPressed( " << id << " )" << endl; - if( m_mapIDToKey.contains( id ) ) { + if( m_mapIDToKey.tqcontains( id ) ) { KKey key = m_mapIDToKey[id]; KKeySequence seq( key ); TQPopupMenu* pMenu = createPopupMenu( m_pWatch, seq ); @@ -357,7 +357,7 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent ) if( (*it) == keyCodeQt ) { int nID = it.key(); kdDebug(125) << "shortcut found!" << endl; - if( m_mapIDToAction.contains( nID ) ) { + if( m_mapIDToAction.tqcontains( nID ) ) { // TODO: reduce duplication between here and slotMenuActivated KAccelAction* pAction = m_mapIDToAction[nID]; if( !pAction->isEnabled() ) @@ -608,14 +608,14 @@ void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action if( !pAction || s.isEmpty() ) return; - int i = s.find( '\t' ); + int i = s.tqfind( '\t' ); TQString k = pAction->shortcut().seq(0).toString(); if( k.isEmpty() ) return; if ( i >= 0 ) - s.replace( i+1, s.length()-i, k ); + s.tqreplace( i+1, s.length()-i, k ); else { s += '\t'; s += k; @@ -646,7 +646,7 @@ int KAccel::currentKey( const TQString& sAction ) const return 0; } -TQString KAccel::findKey( int key ) const +TQString KAccel::tqfindKey( int key ) const { KAccelAction* pAction = d->actionPtr( KKey(key) ); if( pAction ) diff --git a/kdecore/kaccel.h b/kdecore/kaccel.h index 7bdf9e0e7..53073f29e 100644 --- a/kdecore/kaccel.h +++ b/kdecore/kaccel.h @@ -39,7 +39,7 @@ class KAccelPrivate; * through application configuration files or through the * KKeyChooser GUI. * - * A KAccel contains a list of accelerator actions. + * A KAccel tqcontains a list of accelerator actions. * * For example, CTRL+Key_P could be a shortcut for printing a document. The key * codes are listed in tqnamespace.h. "Print" could be the action name for printing. @@ -96,10 +96,10 @@ class KDECORE_EXPORT KAccel : public TQAccel public: /** * Creates a new KAccel that watches @p pParent, which is also - * the QObject's parent. + * the TQObject's parent. * * @param pParent the parent and widget to watch for key strokes - * @param psName the name of the QObject + * @param psName the name of the TQObject */ KAccel( TQWidget* pParent, const char* psName = 0 ); @@ -107,8 +107,8 @@ class KDECORE_EXPORT KAccel : public TQAccel * Creates a new KAccel that watches @p watch. * * @param watch the widget to watch for key strokes - * @param parent the parent of the QObject - * @param psName the name of the QObject + * @param parent the parent of the TQObject + * @param psName the name of the TQObject */ KAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 ); virtual ~KAccel(); @@ -376,7 +376,7 @@ class KDECORE_EXPORT KAccel : public TQAccel * Return the name of the accelerator item with the keycode @p key, * or TQString::null if the item cannot be found. */ - TQString findKey( int key ) const KDE_DEPRECATED; + TQString tqfindKey( int key ) const KDE_DEPRECATED; #endif // !KDE_NO_COMPAT protected: diff --git a/kdecore/kaccelaction.cpp b/kdecore/kaccelaction.cpp index 856bbefdc..b7ea84ca5 100644 --- a/kdecore/kaccelaction.cpp +++ b/kdecore/kaccelaction.cpp @@ -177,9 +177,9 @@ void KAccelAction::clearShortcut() m_cut.clear(); } -bool KAccelAction::contains( const KKeySequence& seq ) +bool KAccelAction::tqcontains( const KKeySequence& seq ) { - return m_cut.contains( seq ); + return m_cut.tqcontains( seq ); for( uint i = 0; i < m_cut.count(); i++ ) { if( m_cut.seq(i) == seq ) return true; @@ -217,7 +217,7 @@ void KAccelAction::useFourModifierKeys( bool b ) // If we're 'turning off' the meta key or, if we're turning it on, // the keyboard must actually have a meta key. if( b && !KKeyNative::keyboardHasWinKey() ) - kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n"; + kdDebug(125) << "Tried to use four modifier keys on a keyboard tqlayout without a Meta key.\n"; } KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); KGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true); @@ -409,7 +409,7 @@ KAccelAction* KAccelActions::actionPtr( KKeySequence cut ) for( uint i = 0; i < m_nSize; i++ ) { if( m_prgActions[i] == 0 ) kdWarning(125) << "KAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl; - else if( m_prgActions[i]->contains( cut ) ) + else if( m_prgActions[i]->tqcontains( cut ) ) return m_prgActions[i]; } return 0; @@ -495,7 +495,7 @@ bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pCon 1) KAccelSequence = "Meta+X" 1) KKeySequence = Meta+X 2) KAccelSequence = "Asterisk" - 1) KKeySequence = Shift+8 (English layout) + 1) KKeySequence = Shift+8 (English tqlayout) 2) KKeySequence = Keypad_Asterisk 2) KKeySequence = "Alt+F2" 1) KAccelSequence = "Alt+F2" diff --git a/kdecore/kaccelaction.h b/kdecore/kaccelaction.h index d55e4517c..934c694b4 100644 --- a/kdecore/kaccelaction.h +++ b/kdecore/kaccelaction.h @@ -60,7 +60,7 @@ class KConfigBase; * 1) KKey = "Meta+X" * 1) Meta+X * 2) KKey = "Asterisk" - * 1) Shift+8 (English layout) + * 1) Shift+8 (English tqlayout) * 2) Keypad_Asterisk * \endcode * @short An accelerator action @@ -296,12 +296,12 @@ class KDECORE_EXPORT KAccelAction void clearShortcut(); /** - * Checks whether the action's shortcut contains the given key sequence. + * Checks whether the action's shortcut tqcontains the given key sequence. * @param keySeq the key sequence to check - * @return true if the shortcut contains the given sequence - * @see KShortcut::contains() + * @return true if the shortcut tqcontains the given sequence + * @see KShortcut::tqcontains() */ - bool contains( const KKeySequence &keySeq ); + bool tqcontains( const KKeySequence &keySeq ); /** * Returns the string representation of the action's shortcut. @@ -333,8 +333,8 @@ class KDECORE_EXPORT KAccelAction m_sLabel /**< Label of accel. User-visible. */, m_sWhatsThis /**< WhatsThis help for accel. User-visible. */; KShortcut m_cut /**< Shortcut actually assigned. */; - KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier layout */, - m_cutDefault4 /**< Default shortcur in 4-modifier layout */; + KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier tqlayout */, + m_cutDefault4 /**< Default shortcur in 4-modifier tqlayout */; const TQObject* m_pObjSlot /**< Object we will send signals to. */; const char* m_psMethodSlot /**< Slot we send signals to, in m_pObjSlot */; bool m_bConfigurable /**< Can this accel be configured by the user? */, @@ -405,7 +405,7 @@ class KDECORE_EXPORT KAccelActions /** * Updates the shortcuts of all actions in this object * with the shortcuts from the given object. - * @param shortcuts the collection that contains the new + * @param shortcuts the collection that tqcontains the new * shortcuts */ void updateShortcuts( KAccelActions &shortcuts ); diff --git a/kdecore/kaccelbase.cpp b/kdecore/kaccelbase.cpp index 4ba4c9c3b..5f513c354 100644 --- a/kdecore/kaccelbase.cpp +++ b/kdecore/kaccelbase.cpp @@ -77,7 +77,7 @@ const KAccelAction* KAccelBase::actionPtr( const TQString& sAction ) const KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key ) { - if( !m_mapKeyToAction.contains( key ) ) + if( !m_mapKeyToAction.tqcontains( key ) ) return 0; // Note: If more than one action is connected to a single key, nil will be returned. return m_mapKeyToAction[key].pAction; @@ -206,8 +206,8 @@ KAccelBase read in a config entry split by ';' - find key sequences to disconnect - find new key sequences to connect + tqfind key sequences to disconnect + tqfind new key sequences to connect check for conflicts with implicit keys disconnect conflicting implicit keys connect new key sequences @@ -355,7 +355,7 @@ bool KAccelBase::updateConnections() if( bNonUnique ) { // Remove connection to single action if there is one - if( m_mapKeyToAction.contains( key ) ) { + if( m_mapKeyToAction.tqcontains( key ) ) { KAccelAction* pAction = m_mapKeyToAction[key].pAction; if( pAction ) { m_mapKeyToAction.remove( key ); @@ -378,7 +378,7 @@ bool KAccelBase::updateConnections() const KKeyServer::Key& key = it.key(); KAccelAction* pAction = (*it).pAction; // If this key is longer used or it points to a different action now, - if( !mapKeyToAction.contains( key ) || mapKeyToAction[key].pAction != pAction ) { + if( !mapKeyToAction.tqcontains( key ) || mapKeyToAction[key].pAction != pAction ) { if( pAction ) { disconnectKey( *pAction, key ); pAction->decConnections(); @@ -393,7 +393,7 @@ bool KAccelBase::updateConnections() for( KKeyToActionMap::iterator it = mapKeyToAction.begin(); it != mapKeyToAction.end(); ++it ) { const KKeyServer::Key& key = it.key(); KAccelAction* pAction = (*it).pAction; - if( !m_mapKeyToAction.contains( key ) || m_mapKeyToAction[key].pAction != pAction ) { + if( !m_mapKeyToAction.tqcontains( key ) || m_mapKeyToAction[key].pAction != pAction ) { // TODO: Decide what to do if connect fails. // Probably should remove this item from map. if( pAction ) { @@ -470,7 +470,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction ) //if( !key.isNull() ) { if( key.sym() ) { - if( !m_mapKeyToAction.contains( key ) ) { + if( !m_mapKeyToAction.tqcontains( key ) ) { // If this is a single-key shortcut, if( pAction->shortcut().seq(iSeq).count() == 1 ) { m_mapKeyToAction[key] = ActionInfo( pAction, iSeq, iVari ); @@ -481,7 +481,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction ) else { m_mapKeyToAction[key] = ActionInfo( 0, 0, 0 ); // Insert into non-unique list if it's not already there. - if( m_rgActionsNonUnique.findIndex( pAction ) == -1 ) + if( m_rgActionsNonUnique.tqfindIndex( pAction ) == -1 ) m_rgActionsNonUnique.append( pAction ); if( connectKey( key ) ) pAction->incConnections(); @@ -523,7 +523,7 @@ bool KAccelBase::removeConnection( KAccelAction* pAction ) //for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it ) // kdDebug(125) << "\tKey: " << it.key().toString() << " => '" << (*it)->m_sName << "'" << " " << *it << endl; - if( m_rgActionsNonUnique.findIndex( pAction ) >= 0 ) { + if( m_rgActionsNonUnique.tqfindIndex( pAction ) >= 0 ) { mtemp_pActionRemoving = pAction; bool b = updateConnections(); mtemp_pActionRemoving = 0; @@ -591,7 +591,7 @@ TQPopupMenu* KAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence& // If an action has already been inserted into the menu // and we have a label instead of an action here, // then indicate that we should insert a separator before the next menu entry. - if( bActionInserted && !pAction->isConfigurable() && pAction->name().contains( ':' ) ) + if( bActionInserted && !pAction->isConfigurable() && pAction->name().tqcontains( ':' ) ) bInsertSeparator = true; for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) { diff --git a/kdecore/kaccelbase.h b/kdecore/kaccelbase.h index 07e3f4833..d619e1bdc 100644 --- a/kdecore/kaccelbase.h +++ b/kdecore/kaccelbase.h @@ -42,7 +42,7 @@ class TQWidget; * key bindings through application configuration files or through the * KKeyChooser GUI. * - * A KAccel contains a list of accelerator items. Each accelerator item + * A KAccel tqcontains a list of accelerator items. Each accelerator item * consists of an action name and a keyboard code combined with modifiers * (Shift, Ctrl and Alt.) * @@ -101,7 +101,7 @@ class TQWidget; * id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc())); * it might be a good idea to insert the standard action before as * a->insertStdItem( KStdAccel::Print, i18n("Print Document") ) - * as well, so that the user can easily find the corresponding function. + * as well, so that the user can easily tqfind the corresponding function. * * This technique works for other actions as well. Your "scroll up" function * in a menu could be done with diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp index 1b5ea4d24..e65434c7f 100644 --- a/kdecore/kaccelmanager.cpp +++ b/kdecore/kaccelmanager.cpp @@ -64,7 +64,7 @@ class KAcceleratorManagerPrivate - internal helper class - This class does all the work to find accelerators for a hierarchy of + This class does all the work to tqfind accelerators for a hierarchy of widgets. *********************************************************************/ @@ -144,7 +144,7 @@ bool KAcceleratorManagerPrivate::standardName(const TQString &str) { if (!kaccmp_sns) kaccmp_sns_d.setObject(kaccmp_sns, new TQStringList(KStdAction::internal_stdNames())); - return kaccmp_sns->contains(str); + return kaccmp_sns->tqcontains(str); } KAcceleratorManagerPrivate::Item::~Item() @@ -201,8 +201,8 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use contents << it->m_content; } - // find the right accelerators - KAccelManagerAlgorithm::findAccelerators(contents, used); + // tqfind the right accelerators + KAccelManagerAlgorithm::tqfindAccelerators(contents, used); // write them back into the widgets int cnt = -1; @@ -223,7 +223,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use { if (it->m_index >= 0) { - TQMenuItem *mitem = menuBar->findItem(menuBar->idAt(it->m_index)); + TQMenuItem *mitem = menuBar->tqfindItem(menuBar->idAt(it->m_index)); if (mitem) { checkChange(contents[cnt]); @@ -239,12 +239,12 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use if ( dynamic_cast( it->m_widget ) && it->m_widget->inherits("KURLLabel") ) continue; - int tprop = it->m_widget->metaObject()->findProperty("text", true); + int tprop = it->m_widget->tqmetaObject()->tqfindProperty("text", true); if (tprop != -1) { if (checkChange(contents[cnt])) it->m_widget->setProperty("text", contents[cnt].accelerated()); } else { - tprop = it->m_widget->metaObject()->findProperty("title", true); + tprop = it->m_widget->tqmetaObject()->tqfindProperty("title", true); if (tprop != -1 && checkChange(contents[cnt])) it->m_widget->setProperty("title", contents[cnt].accelerated()); } @@ -265,12 +265,12 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item) TQObjectList *childList = widget->queryList("TQWidget", 0, false, false); for ( TQObject *it = childList->first(); it; it = childList->next() ) { - TQWidget *w = static_cast(it); + TQWidget *w = static_cast(static_cast(it)); if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast(w) == NULL ) ) continue; - if ( KAcceleratorManagerPrivate::ignored_widgets.find( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() ) + if ( KAcceleratorManagerPrivate::ignored_widgets.tqfind( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() ) continue; manageWidget(w, item); @@ -340,9 +340,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) { TQString content; TQVariant variant; - int tprop = w->metaObject()->findProperty("text", true); + int tprop = w->tqmetaObject()->tqfindProperty("text", true); if (tprop != -1) { - const TQMetaProperty* p = w->metaObject()->property( tprop, true ); + const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); if ( p && p->isValid() ) w->qt_property( tprop, 1, &variant ); else @@ -350,9 +350,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) } if (tprop == -1) { - tprop = w->metaObject()->findProperty("title", true); + tprop = w->tqmetaObject()->tqfindProperty("title", true); if (tprop != -1) { - const TQMetaProperty* p = w->metaObject()->property( tprop, true ); + const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); if ( p && p->isValid() ) w->qt_property( tprop, 1, &variant ); } @@ -409,7 +409,7 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item) for (uint i=0; icount(); ++i) { - mitem = mbar->findItem(mbar->idAt(i)); + mitem = mbar->tqfindItem(mbar->idAt(i)); if (!mitem) continue; @@ -478,18 +478,18 @@ void KAcceleratorManager::last_manage(TQString &added, TQString &changed, TQStr KAccelString::KAccelString(const TQString &input, int initialWeight) : m_pureText(input), m_weight() { - m_orig_accel = m_pureText.find("(!)&"); + m_orig_accel = m_pureText.tqfind("(!)&"); if (m_orig_accel != -1) m_pureText.remove(m_orig_accel, 4); - m_orig_accel = m_pureText.find("(&&)"); + m_orig_accel = m_pureText.tqfind("(&&)"); if (m_orig_accel != -1) - m_pureText.replace(m_orig_accel, 4, "&"); + m_pureText.tqreplace(m_orig_accel, 4, "&"); m_origText = m_pureText; - if (m_pureText.contains('\t')) - m_pureText = m_pureText.left(m_pureText.find('\t')); + if (m_pureText.tqcontains('\t')) + m_pureText = m_pureText.left(m_pureText.tqfind('\t')); m_orig_accel = m_accel = stripAccelerator(m_pureText); @@ -519,7 +519,7 @@ TQString KAccelString::accelerated() const oa += 4; } if (m_orig_accel >= 0) - result.replace(oa, 1, "(&&)"); + result.tqreplace(oa, 1, "(&&)"); } } else { if (m_accel >= 0 && m_orig_accel != m_accel) { @@ -598,7 +598,7 @@ int KAccelString::stripAccelerator(TQString &text) while (p >= 0) { - p = text.find('&', p)+1; + p = text.tqfind('&', p)+1; if (p <= 0 || p >= (int)text.length()) return -1; @@ -626,7 +626,7 @@ int KAccelString::maxWeight(int &index, const TQString &used) index = -1; for (uint pos=0; pos max) { max = m_weight[pos]; @@ -648,7 +648,7 @@ void KAccelString::dump() /********************************************************************* - findAccelerators - the algorithm determining the new accelerators + tqfindAccelerators - the algorithm determining the new accelerators The algorithm is very crude: @@ -666,7 +666,7 @@ void KAccelString::dump() The disadvantages: - * it does not try to find as many accelerators as possible + * it does not try to tqfind as many accelerators as possible TODO: @@ -679,9 +679,9 @@ void KAccelString::dump() *********************************************************************/ -void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString &used) +void KAccelManagerAlgorithm::tqfindAccelerators(KAccelStringList &result, TQString &used) { - kdDebug(131) << "findAccelerators\n"; + kdDebug(131) << "tqfindAccelerators\n"; KAccelStringList accel_strings = result; // initally remove all accelerators @@ -694,7 +694,7 @@ void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString { int max = 0, index = -1, accel = -1; - // find maximum weight + // tqfind maximum weight for (uint i=0; icount()) { - findMenuEntries(m_entries); + tqfindMenuEntries(m_entries); calculateAccelerators(); m_count = m_popup->count(); } else { KAccelStringList entries; - findMenuEntries(entries); + tqfindMenuEntries(entries); if (entries != m_entries) { m_entries = entries; @@ -766,16 +766,16 @@ void KPopupAccelManager::aboutToShow() void KPopupAccelManager::calculateAccelerators() { - // find the new accelerators + // tqfind the new accelerators TQString used; - KAccelManagerAlgorithm::findAccelerators(m_entries, used); + KAccelManagerAlgorithm::tqfindAccelerators(m_entries, used); // change the menu entries setMenuEntries(m_entries); } -void KPopupAccelManager::findMenuEntries(KAccelStringList &list) +void KPopupAccelManager::tqfindMenuEntries(KAccelStringList &list) { TQMenuItem *mitem; TQString s; @@ -785,7 +785,7 @@ void KPopupAccelManager::findMenuEntries(KAccelStringList &list) // read out the menu entries for (uint i=0; icount(); i++) { - mitem = m_popup->findItem(m_popup->idAt(i)); + mitem = m_popup->tqfindItem(m_popup->idAt(i)); if (mitem->isSeparator()) continue; @@ -793,7 +793,7 @@ void KPopupAccelManager::findMenuEntries(KAccelStringList &list) // in full menus, look at entries with global accelerators last int weight = 50; - if (s.contains('\t')) + if (s.tqcontains('\t')) weight = 0; list.append(KAccelString(s, weight)); @@ -812,7 +812,7 @@ void KPopupAccelManager::setMenuEntries(const KAccelStringList &list) uint cnt = 0; for (uint i=0; icount(); i++) { - mitem = m_popup->findItem(m_popup->idAt(i)); + mitem = m_popup->tqfindItem(m_popup->idAt(i)); if (mitem->isSeparator()) continue; @@ -845,8 +845,8 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack) bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e ) { - if ( e->type() == TQEvent::Show && qApp->activeWindow() ) { - KAcceleratorManager::manage( qApp->activeWindow() ); + if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) { + KAcceleratorManager::manage( tqApp->activeWindow() ); watched->removeEventFilter( this ); } return false; diff --git a/kdecore/kaccelmanager.h b/kdecore/kaccelmanager.h index 21655fd9c..ed8fd0081 100644 --- a/kdecore/kaccelmanager.h +++ b/kdecore/kaccelmanager.h @@ -30,7 +30,7 @@ class TQString; /** * KDE Accelerator manager. * - * This class can be used to find a valid and working set of + * This class can be used to tqfind a valid and working set of * accelerators for any widget. * * @author Matthias Hoelzer-Kluepfel diff --git a/kdecore/kaccelmanager_private.h b/kdecore/kaccelmanager_private.h index fbb5d1857..cd3f30a12 100644 --- a/kdecore/kaccelmanager_private.h +++ b/kdecore/kaccelmanager_private.h @@ -32,7 +32,7 @@ class TQWidgetStack; /** * A string class handling accelerators. * - * This class contains a string and knowledge about accelerators. + * This class tqcontains a string and knowledge about accelerators. * It keeps a list weights, telling how valuable each character * would be as an accelerator. * @@ -81,7 +81,7 @@ typedef TQValueList KAccelStringList; /** - * This class encapsulates the algorithm finding the 'best' + * This class encapsulates the algorithm tqfinding the 'best' * distribution of accelerators in a hierarchy of widgets. * * @author Matthias Hoelzer-Kluepfel @@ -113,8 +113,8 @@ public: STANDARD_ACCEL = 300 }; - /// Method to call to find the best distribution of accelerators. - static void findAccelerators(KAccelStringList &result, TQString &used); + /// Method to call to tqfind the best distribution of accelerators. + static void tqfindAccelerators(KAccelStringList &result, TQString &used); }; @@ -131,7 +131,7 @@ class TQPopupMenu; * @author Matthias Hoelzer-Kluepfel */ -class KPopupAccelManager : public QObject +class KPopupAccelManager : public TQObject { Q_OBJECT @@ -154,7 +154,7 @@ private: void calculateAccelerators(); - void findMenuEntries(KAccelStringList &list); + void tqfindMenuEntries(KAccelStringList &list); void setMenuEntries(const KAccelStringList &list); TQPopupMenu *m_popup; @@ -164,7 +164,7 @@ private: }; -class QWidgetStackAccelManager : public QObject +class QWidgetStackAccelManager : public TQObject { Q_OBJECT diff --git a/kdecore/kaccelprivate.h b/kdecore/kaccelprivate.h index 0a6cdc19b..7b616acbe 100644 --- a/kdecore/kaccelprivate.h +++ b/kdecore/kaccelprivate.h @@ -47,7 +47,7 @@ class KDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase void slotShowMenu(); void slotMenuActivated( int iAction ); - bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject + bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject }; #endif // !__KACCELPRIVATE_H diff --git a/kdecore/kallocator.cpp b/kdecore/kallocator.cpp index c02bbf3ff..16c1b3625 100644 --- a/kdecore/kallocator.cpp +++ b/kdecore/kallocator.cpp @@ -183,9 +183,9 @@ void KZoneAllocator::delBlock(MemBlock *b) void * KZoneAllocator::allocate(size_t _size) { - // Use the size of (void *) as alignment - const size_t alignment = sizeof(void *) - 1; - _size = (_size + alignment) & ~alignment; + // Use the size of (void *) as tqalignment + const size_t tqalignment = sizeof(void *) - 1; + _size = (_size + tqalignment) & ~tqalignment; if ((unsigned long) _size + blockOffset > blockSize) { diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index 3dc8ca77d..08e6c7652 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -170,7 +170,7 @@ static Atom kde_xdnd_drop; #endif // duplicated from patched Qt, so that there won't be unresolved symbols if Qt gets -// replaced by unpatched one +// tqreplaced by unpatched one KDECORE_EXPORT bool qt_qclipboard_bailout_hack = false; template class TQPtrList; @@ -250,7 +250,7 @@ public: IceIOErrorHandler oldIceIOErrorHandler; KCheckAccelerators* checkAccelerators; TQString overrideStyle; - TQString geometry_arg; + TQString tqgeometry_arg; TQCString startup_id; TQTimer* app_started_timer; KAppDCOPInterface *m_KAppDCOPInterface; @@ -466,7 +466,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) // We have a keypress for a lineedit... TQKeyEvent *kevent = static_cast(event); KKey key(kevent); - if (_selectAll.contains(key)) + if (_selectAll.tqcontains(key)) { if (t == TQEvent::KeyPress) { @@ -503,7 +503,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) { // We have a keypress for a multilineedit... TQKeyEvent *kevent = static_cast(event); - if (_selectAll.contains(KKey(kevent))) + if (_selectAll.tqcontains(KKey(kevent))) { if (t == TQEvent::KeyPress) { @@ -519,7 +519,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) } if( t == TQEvent::Show && receiver->isWidgetType()) { - TQWidget* w = static_cast< TQWidget* >( receiver ); + TQWidget* w = static_cast< TQWidget* >( static_cast(receiver) ); #if defined Q_WS_X11 if( w->isTopLevel() && !startupId().isEmpty() && !static_cast(event)->spontaneous()) // TODO better done using window group leader? KStartupInfo::setWindowStartupId( w->winId(), startupId()); @@ -765,7 +765,7 @@ class KDETranslator : public TQTranslator { public: KDETranslator(TQObject *parent) : TQTranslator(parent, "kdetranslator") {} - virtual TQTranslatorMessage findMessage(const char* context, + virtual TQTranslatorMessage tqfindMessage(const char* context, const char *sourceText, const char* message) const { @@ -832,7 +832,7 @@ void KApplication::init(bool GUIenabled) smw = 0; - // Initial KIPC event mask. + // Initial KIPC event tqmask. #if defined Q_WS_X11 kipcEventMask = (1 << KIPC::StyleChanged) | (1 << KIPC::PaletteChanged) | (1 << KIPC::FontChanged) | (1 << KIPC::BackgroundChanged) | @@ -901,7 +901,7 @@ void KApplication::init(bool GUIenabled) TQMimeSourceFactory::addFactory( oldDefaultFactory ); } - d->checkAccelerators = new KCheckAccelerators( this ); + d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) ); } #ifdef Q_WS_MACX @@ -934,16 +934,16 @@ void KApplication::init(bool GUIenabled) // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage, // which makes it impossible to use the -reverse cmdline switch with KDE apps bool rtl = reverseLayout(); - installTranslator(new KDETranslator(this)); + installTranslator(new KDETranslator(TQT_TQOBJECT(this))); setReverseLayout( rtl ); if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in " "left-to-right languages (as english) or to 'RTL' in right-to-left " - "languages (such as Hebrew and Arabic) to get proper widget layout." ) == "RTL") + "languages (such as Hebrew and Arabic) to get proper widget tqlayout." ) == "RTL") setReverseLayout( !rtl ); // install appdata resource type KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") - + TQString::fromLatin1(name()) + '/'); + + TQString::tqfromLatin1(name()) + '/'); pSessionConfig = 0L; bSessionManagement = true; @@ -1179,9 +1179,9 @@ void KApplication::propagateSessionManager() TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv(DISPLAY); // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.find(':')) >= 0) + while( (i = display.tqfind(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -1222,7 +1222,7 @@ void KApplication::commitData( QSessionManager& sm ) if ( sm.allowsInteraction() ) { TQWidgetList done; - TQWidgetList *list = TQApplication::topLevelWidgets(); + TQWidgetList *list = TQApplication::tqtopLevelWidgets(); bool canceled = false; TQWidget* w = list->first(); while ( !canceled && w ) { @@ -1233,12 +1233,12 @@ void KApplication::commitData( QSessionManager& sm ) if ( !canceled ) done.append( w ); delete list; // one never knows... - list = TQApplication::topLevelWidgets(); + list = TQApplication::tqtopLevelWidgets(); w = list->first(); } else { w = list->next(); } - while ( w && done.containsRef( w ) ) + while ( w && done.tqcontainsRef( w ) ) w = list->next(); } delete list; @@ -1380,9 +1380,9 @@ void KApplication::startKdeinit() return; // whoever held the lock has already started dcopserver } // Try to launch kdeinit. - TQString srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit")); + TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit")); if (srv.isEmpty()) - srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); + srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) @@ -1467,7 +1467,7 @@ static const KCmdLineOptions qt_options[] = #ifdef Q_WS_QWS { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0}, #endif - { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0}, + { "reverse", I18N_NOOP("mirrors the whole tqlayout of widgets"), 0}, KCmdLineLastOption }; @@ -1481,7 +1481,7 @@ static const KCmdLineOptions kde_options[] = { "nocrashhandler", I18N_NOOP("Disable crash handler, to get core dumps"), 0}, { "waitforwm", I18N_NOOP("Waits for a WM_NET compatible windowmanager"), 0}, { "style