diff -Nru dbus-1-tqt-3.5.13/cmake/modules/.svn/entries dbus-1-tqt-3.5.13/cmake/modules/.svn/entries --- dbus-1-tqt-3.5.13/cmake/modules/.svn/entries 2011-08-08 15:41:14.000000000 -0500 +++ dbus-1-tqt-3.5.13/cmake/modules/.svn/entries 2011-08-10 23:09:04.000000000 -0500 @@ -1,7 +1,7 @@ 10 dir -1245821 +1246279 svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/cmake/modules svn://anonsvn.kde.org/home/kde diff -Nru dbus-1-tqt-3.5.13/cmake/.svn/entries dbus-1-tqt-3.5.13/cmake/.svn/entries --- dbus-1-tqt-3.5.13/cmake/.svn/entries 2011-08-08 15:41:14.000000000 -0500 +++ dbus-1-tqt-3.5.13/cmake/.svn/entries 2011-08-10 23:09:04.000000000 -0500 @@ -1,7 +1,7 @@ 10 dir -1245821 +1246279 svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/cmake svn://anonsvn.kde.org/home/kde diff -Nru dbus-1-tqt-3.5.13/COPYING.GPL dbus-1-tqt-3.5.13/COPYING.GPL --- dbus-1-tqt-3.5.13/COPYING.GPL 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/COPYING.GPL 2011-08-10 23:09:00.000000000 -0500 @@ -65,7 +65,7 @@ GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -102,7 +102,7 @@ stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -160,7 +160,7 @@ The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff -Nru dbus-1-tqt-3.5.13/debian/changelog dbus-1-tqt-3.5.13/debian/changelog --- dbus-1-tqt-3.5.13/debian/changelog 2011-08-08 15:41:55.000000000 -0500 +++ dbus-1-tqt-3.5.13/debian/changelog 2011-08-10 23:09:30.000000000 -0500 @@ -1,8 +1,8 @@ -dbus-1-tqt (4:3.5.13-0ubuntu7+r1245170+pr27~natty) natty; urgency=low +dbus-1-tqt (4:3.5.13-0ubuntu7+r1246260+pr34~natty) natty; urgency=low * Automated svn build - -- root Mon, 08 Aug 2011 15:41:55 -0500 + -- root Wed, 10 Aug 2011 23:09:30 -0500 dbus-1-tqt (0.9-0ubuntu1) maverick; urgency=low diff -Nru dbus-1-tqt-3.5.13/INSTALL dbus-1-tqt-3.5.13/INSTALL --- dbus-1-tqt-3.5.13/INSTALL 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/INSTALL 2011-08-10 23:09:00.000000000 -0500 @@ -17,7 +17,7 @@ to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' -tqcontains results you don't want to keep, you may remove or edit it. +contains results you don't want to keep, you may remove or edit it. The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need `configure.in' if you want to change @@ -37,7 +37,7 @@ 2. Type `gmake' to compile the package. Or if you're using a Linux powered machine, or if make is GNU make, type `make'. You can check with make --version. KDE requires GNU make to build, if - gmake is appropriate, tqreplace any instance below of make with gmake. + gmake is appropriate, replace any instance below of make with gmake. It will give output similar to: #make --version GNU Make version 3.78.1, by Richard Stallman and Roland McGrath. @@ -119,7 +119,7 @@ package recognizes. For packages that use the X Window System, `configure' can usually -tqfind the X include and library files automatically, but if it doesn't, +find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. diff -Nru dbus-1-tqt-3.5.13/.svn/entries dbus-1-tqt-3.5.13/.svn/entries --- dbus-1-tqt-3.5.13/.svn/entries 2011-08-08 15:41:13.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/entries 2011-08-10 23:09:00.000000000 -0500 @@ -1,14 +1,14 @@ 10 dir -1245821 +1246279 svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/dbus-1-tqt svn://anonsvn.kde.org/home/kde -2011-08-05T17:12:16.170467Z -1245170 +2011-08-10T22:19:39.656833Z +1246260 tpearson has-props @@ -168,10 +168,10 @@ -2011-07-05T19:59:36.412466Z -2632067c094bb4d79d518065c180fb32 -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +bc653e642a3953fe5a8dd086f1744fed +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -194,7 +194,7 @@ -5654 +5642 tqdbusconnection_p.h file @@ -202,10 +202,10 @@ -2011-07-05T19:59:36.412466Z -4b3b2565ad4115532dec9a9d280375b8 -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +9b476a55ef65397beb73f01f59fd9708 +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -228,7 +228,7 @@ -3853 +3851 tqdbusobjectpath.cpp file @@ -236,10 +236,10 @@ -2011-07-22T20:56:41.816484Z -f97aefb759a5b8bc65644771692a35b8 -2011-07-09T02:23:29.815599Z -1240522 +2011-08-11T04:09:00.046139Z +637916d2f14ba3c70cb9e03e0f8b2978 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -262,7 +262,7 @@ -2170 +2168 tqdbusmessage.cpp file @@ -304,10 +304,10 @@ -2011-07-05T19:59:36.412466Z -f490876c8650f23c74656a3f9bf80a59 -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +7af106a46bee4c264793fde6c962d942 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -330,7 +330,7 @@ -7039 +7037 tools dir @@ -341,10 +341,10 @@ -2011-07-05T19:59:36.412466Z -e6f9922c06c52b093e785e90b512a31c -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +ccd319d9572178358f25746bd09e2019 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -367,7 +367,7 @@ -7972 +7966 tqdbusmarshall.cpp file @@ -409,10 +409,10 @@ -2011-08-05T17:17:38.057392Z -b45a15def93c848abdd21847f2f1ee27 -2011-08-05T17:12:16.170467Z -1245170 +2011-08-11T04:09:00.046139Z +3c69a96ed810547cfc87af6f066836f6 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -435,7 +435,7 @@ -24580 +24570 COPYING file @@ -471,14 +471,14 @@ 451 -tqdbusdatalist.cpp +COPYING.AFL file 2011-07-05T19:59:36.422467Z -afefbbb3afb4acdf798d80bc56a695d4 +ff3ca8d67fd7be53acb2a88e1e8a99ba 2011-04-21T23:56:57.358890Z 1228687 tpearson @@ -503,16 +503,16 @@ -18799 +9033 -COPYING.AFL +tqdbusdatalist.cpp file 2011-07-05T19:59:36.422467Z -ff3ca8d67fd7be53acb2a88e1e8a99ba +afefbbb3afb4acdf798d80bc56a695d4 2011-04-21T23:56:57.358890Z 1228687 tpearson @@ -537,7 +537,7 @@ -9033 +18799 tqdbusdataconverter.h file @@ -545,10 +545,10 @@ -2011-07-05T19:59:36.422467Z -d5dee479c868319e7540b1104fa2f164 -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +e1261e4b207fbf0dd280c80274e84532 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -571,7 +571,7 @@ -6902 +6900 subdirs file @@ -607,14 +607,14 @@ 24 -tqdbusmessage_p.h +NEWS file 2011-07-05T19:59:36.422467Z -97585644e8b4ff4f55f53deac6524fff +d41d8cd98f00b204e9800998ecf8427e 2011-04-21T23:56:57.358890Z 1228687 tpearson @@ -639,16 +639,16 @@ -1470 +0 -NEWS +tqdbusmessage_p.h file 2011-07-05T19:59:36.422467Z -d41d8cd98f00b204e9800998ecf8427e +97585644e8b4ff4f55f53deac6524fff 2011-04-21T23:56:57.358890Z 1228687 tpearson @@ -673,16 +673,16 @@ -0 +1470 -tqdbusvariant.h +CMakeLists.txt file 2011-07-05T19:59:36.422467Z -051555b67b73e3065f084e181d7183e8 +4becc45fe66808569994837fc515e277 2011-04-21T23:56:57.358890Z 1228687 tpearson @@ -707,16 +707,16 @@ -3493 +3025 -CMakeLists.txt +tqdbusvariant.h file 2011-07-05T19:59:36.422467Z -4becc45fe66808569994837fc515e277 +051555b67b73e3065f084e181d7183e8 2011-04-21T23:56:57.358890Z 1228687 tpearson @@ -741,7 +741,7 @@ -3025 +3493 stamp-h.in file @@ -783,10 +783,10 @@ -2011-07-05T19:59:36.422467Z -27eeac322e533a5a5c25d12bb3780e3f -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +99ecb73cd2d0a66b45095835eb0fe534 +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -809,7 +809,7 @@ -1470 +1468 tqdbusdatamap.h file @@ -845,16 +845,16 @@ 40405 -tqdbusdata.h +tqdbusintegrator.cpp file -2011-07-05T19:59:36.422467Z -f70caa8b13b28bc8ee8d8b0602071aab -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +8819d72671e17a79a9c60783e293724d +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -877,18 +877,18 @@ -38907 +18930 -tqdbusintegrator.cpp +tqdbusdata.h file -2011-07-05T19:59:36.422467Z -b0225fdc7d908a25d88d7cac87470fca -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +845da96ee0019d0c2e6a7a7caa2bf4be +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -911,7 +911,7 @@ -18948 +38905 tqdbusatomic.h file @@ -987,10 +987,10 @@ -2011-07-05T19:59:36.422467Z -f5c353d0c5602a8cfdf7a51fadf05b45 -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +5c213a7de3f013310bd272cdb6eb7a24 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -1013,7 +1013,7 @@ -18279 +18273 tqdbusproxy.h file @@ -1021,10 +1021,10 @@ -2011-08-05T17:17:38.057392Z -4a267628006a6660ae407d372db7a557 -2011-08-05T17:12:16.170467Z -1245170 +2011-08-11T04:09:00.046139Z +5ccd2700c234308b9ae9b53ed9b1d42c +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -1047,7 +1047,7 @@ -20684 +20666 tqdbusobjectpath.h file @@ -1055,10 +1055,10 @@ -2011-07-22T20:56:41.816484Z -104d81ea826c6e4013271374eefa006b -2011-07-09T02:23:29.815599Z -1240522 +2011-08-11T04:09:00.046139Z +f85f360c252b2f97ffb1e7064a1f2b44 +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -1081,7 +1081,7 @@ -3653 +3647 tqdbusmacros.h file @@ -1191,10 +1191,10 @@ -2011-07-05T19:59:36.432469Z -83b099d5fda54a7518ad50c3115997cf -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.046139Z +cdb933e55418f5872fa463c3bce59ca3 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -1217,7 +1217,7 @@ -13947 +13945 tqdbusconnection.cpp file @@ -1225,10 +1225,10 @@ -2011-07-05T19:59:36.432469Z -cebfef0ec62792a6a8ea09244b2c0c27 -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.057392Z +45aa7e084690464fd2690939296a96c5 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -1251,7 +1251,7 @@ -11096 +11088 tqdbusdataconverter.cpp file @@ -1327,10 +1327,10 @@ -2011-07-05T19:59:36.432469Z -cf7699904e9529013b8246d2491153d4 -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:09:00.057392Z +8e5743b555ab7ca5c584cb94474596f6 +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -1353,7 +1353,7 @@ -1632 +1628 tqdbusmarshall.h file diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/COPYING.GPL.svn-base dbus-1-tqt-3.5.13/.svn/text-base/COPYING.GPL.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/COPYING.GPL.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/COPYING.GPL.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -65,7 +65,7 @@ GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -102,7 +102,7 @@ stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -160,7 +160,7 @@ The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/INSTALL.svn-base dbus-1-tqt-3.5.13/.svn/text-base/INSTALL.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/INSTALL.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/INSTALL.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -17,7 +17,7 @@ to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' -tqcontains results you don't want to keep, you may remove or edit it. +contains results you don't want to keep, you may remove or edit it. The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need `configure.in' if you want to change @@ -37,7 +37,7 @@ 2. Type `gmake' to compile the package. Or if you're using a Linux powered machine, or if make is GNU make, type `make'. You can check with make --version. KDE requires GNU make to build, if - gmake is appropriate, tqreplace any instance below of make with gmake. + gmake is appropriate, replace any instance below of make with gmake. It will give output similar to: #make --version GNU Make version 3.78.1, by Richard Stallman and Roland McGrath. @@ -119,7 +119,7 @@ package recognizes. For packages that use the X Window System, `configure' can usually -tqfind the X include and library files automatically, but if it doesn't, +find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.cpp.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.cpp.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.cpp.svn-base 2011-08-10 23:09:00.000000000 -0500 @@ -66,7 +66,7 @@ if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name)) return default_connection; - ConnectionHash::const_iterator it = connectionHash.tqfind(name); + ConnectionHash::const_iterator it = connectionHash.find(name); return (it != connectionHash.end() ? it.data() : 0); } @@ -78,7 +78,7 @@ d = default_connection; default_connection = 0; } else { - ConnectionHash::iterator it = connectionHash.tqfind(name); + ConnectionHash::iterator it = connectionHash.find(name); if (it == connectionHash.end()) return; @@ -334,7 +334,7 @@ if (!d || !d->connection || !object || path.isEmpty()) return false; - TQT_DBusConnectionPrivate::ObjectMap::const_iterator it = d->registeredObjects.tqfind(path); + TQT_DBusConnectionPrivate::ObjectMap::const_iterator it = d->registeredObjects.find(path); if (it != d->registeredObjects.end()) return false; @@ -348,7 +348,7 @@ if (!d || !d->connection || path.isEmpty()) return; - TQT_DBusConnectionPrivate::ObjectMap::iterator it = d->registeredObjects.tqfind(path); + TQT_DBusConnectionPrivate::ObjectMap::iterator it = d->registeredObjects.find(path); if (it == d->registeredObjects.end()) return ; diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.h.svn-base 2011-08-05 12:17:38.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection.h.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -195,7 +195,7 @@ */ SystemBus, - // TODO tqfind out about ActivationBus purpose + // TODO find out about ActivationBus purpose ActivationBus }; @@ -560,7 +560,7 @@ * * Equivalent to calling addConnection(SessionBus); * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see addConnection(BusType,const TQString&); @@ -575,7 +575,7 @@ * * Equivalent to calling addConnection(SystemBus); * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see addConnection(BusType,const TQString&); @@ -610,7 +610,7 @@ * @param type the #BusType of the bus to connect to * @param name the name to use for TQT_DBusConnection's connection sharing * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see closeConnection() @@ -631,7 +631,7 @@ * socket address * @param name the name to use for TQT_DBusConnection's connection sharing * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see closeConnection() diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection_p.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection_p.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection_p.h.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusconnection_p.h.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -62,7 +62,7 @@ TQ_OBJECT public: - TQT_DBusConnectionPrivate(TQObject *tqparent = 0); + TQT_DBusConnectionPrivate(TQObject *parent = 0); ~TQT_DBusConnectionPrivate(); void bindToApplication(); diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdataconverter.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdataconverter.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdataconverter.h.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdataconverter.h.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -82,7 +82,7 @@ * TQT_DBusDataConverter::convertFromTQT_DBusData(dbusData, rect); * @endcode * - * @note The bindings library tqcontains the spezialisations for TQRect, TQPoint and TQSize. + * @note The bindings library contains the spezialisations for TQRect, TQPoint and TQSize. */ class TQDBUS_EXPORT TQT_DBusDataConverter { diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdata.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdata.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdata.h.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusdata.h.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -330,7 +330,7 @@ bool operator!=(const TQT_DBusData& other) const; /** - * @brief Checks whether the data object tqcontains a valid content + * @brief Checks whether the data object contains a valid content * * This is equal to checking type() for not being #Invalid * diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.cpp.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.cpp.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.cpp.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -107,7 +107,7 @@ if (errorTypesByName.isEmpty()) qDBusErrorSetupNameMapping(); - ErrorNameMap::const_iterator it = errorTypesByName.tqfind(name); + ErrorNameMap::const_iterator it = errorTypesByName.find(name); if (it != errorTypesByName.end()) return it.data(); return TQT_DBusError::UserDefined; diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.h.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbuserror.h.svn-base 2011-08-10 23:09:00.000000000 -0500 @@ -229,7 +229,7 @@ * @brief An type signature is not valid * * A possible cause is a TQT_DBusVariant with an invalid signature, i.e. - * the transported signature is empty, tqcontains unknown type characters + * the transported signature is empty, contains unknown type characters * or has mismatched container enclosings. * * @note in case a service implementation wants to indicate that a method diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusintegrator.cpp.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusintegrator.cpp.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusintegrator.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusintegrator.cpp.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -145,7 +145,7 @@ } } // FIXME-QT4 d->watchers.insertMulti(fd, watcher); - TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.tqfind(fd); + TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it == d->watchers.end()) { it = d->watchers.insert(fd, TQT_DBusConnectionPrivate::WatcherList()); @@ -165,7 +165,7 @@ TQT_DBusConnectionPrivate *d = static_cast(data); int fd = dbus_watch_get_unix_fd(watch); - TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.tqfind(fd); + TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) { TQT_DBusConnectionPrivate::WatcherList& list = *it; @@ -207,7 +207,7 @@ TQT_DBusConnectionPrivate *d = static_cast(data); int fd = dbus_watch_get_unix_fd(watch); - TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.tqfind(fd); + TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) { TQT_DBusConnectionPrivate::WatcherList& list = *it; for (TQT_DBusConnectionPrivate::WatcherList::iterator wit = list.begin(); wit != list.end(); @@ -271,8 +271,8 @@ return tp; } -TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *tqparent) - : TQObject(tqparent), ref(1), mode(InvalidMode), connection(0), server(0), +TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *parent) + : TQObject(parent), ref(1), mode(InvalidMode), connection(0), server(0), dispatcher(0) { static const int msgType = registerMessageMetaType(); @@ -357,7 +357,7 @@ void TQT_DBusConnectionPrivate::socketRead(int fd) { // FIXME-QT4 TQHashIterator it(watchers); - WatcherHash::const_iterator it = watchers.tqfind(fd); + WatcherHash::const_iterator it = watchers.find(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { @@ -374,7 +374,7 @@ void TQT_DBusConnectionPrivate::socketWrite(int fd) { // FIXME-QT4 TQHashIterator it(watchers); - WatcherHash::const_iterator it = watchers.tqfind(fd); + WatcherHash::const_iterator it = watchers.find(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { @@ -466,7 +466,7 @@ { TQT_DBusMessage msg = TQT_DBusMessage::fromDBusMessage(message); - ObjectMap::iterator it = registeredObjects.tqfind(msg.path()); + ObjectMap::iterator it = registeredObjects.find(msg.path()); if (it == registeredObjects.end()) return false; @@ -559,7 +559,7 @@ { //qDebug("Pending Call Result received"); TQT_DBusConnectionPrivate* d = reinterpret_cast(user_data); - TQT_DBusConnectionPrivate::PendingCallMap::iterator it = d->pendingCalls.tqfind(pending); + TQT_DBusConnectionPrivate::PendingCallMap::iterator it = d->pendingCalls.find(pending); DBusMessage *dbusReply = dbus_pending_call_steal_reply(pending); diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.cpp.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.cpp.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.cpp.svn-base 2011-07-22 15:56:41.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.cpp.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -53,7 +53,7 @@ { if (length() == 1) return TQT_DBusObjectPath(); - int index = tqfindRev('/'); + int index = findRev('/'); if (index == -1) return TQT_DBusObjectPath(); diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.h.svn-base 2011-07-22 15:56:41.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusobjectpath.h.svn-base 2011-08-10 23:09:00.000000000 -0500 @@ -58,7 +58,7 @@ TQT_DBusObjectPath(const TQCString& other); /** - * @brief Creates an object path for an object as a child of the tqparent node + * @brief Creates an object path for an object as a child of the parent node * * This is basically like specifying a directory and a file name to create * the file's full path. @@ -90,11 +90,11 @@ bool isValid() const; /** - * @brief Returns the object path of this path's tqparent node + * @brief Returns the object path of this path's parent node * * This is basically like getting the directory of an file path * - * @return the tqparent node's object path or an empty and invalid object + * @return the parent node's object path or an empty and invalid object * if this is already the root node */ TQT_DBusObjectPath parentNode() const; diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.cpp.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.cpp.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.cpp.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -48,15 +48,15 @@ TQT_DBusError error; }; -TQT_DBusProxy::TQT_DBusProxy(TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), +TQT_DBusProxy::TQT_DBusProxy(TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { } TQT_DBusProxy::TQT_DBusProxy(const TQT_DBusConnection& connection, - TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), + TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { setConnection(connection); @@ -64,8 +64,8 @@ TQT_DBusProxy::TQT_DBusProxy(const TQString& service, const TQString& path, const TQString& interface, const TQT_DBusConnection& connection, - TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), + TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { setConnection(connection); diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.h.svn-base 2011-08-05 12:17:38.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusproxy.h.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -245,10 +245,10 @@ * This basic constructor allows to create a proxy and specify the peer * object and interface later on. * - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(TQObject* tqparent = 0, const char* name = 0); + TQT_DBusProxy(TQObject* parent = 0, const char* name = 0); /** * @brief Creates a proxy on a given connection without binding it to a @@ -262,10 +262,10 @@ * filtering for a specific peer. * * @param connection the D-Bus connection to work on - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* tqparent = 0, + TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* parent = 0, const char* name = 0); /** @@ -279,12 +279,12 @@ * @param path the peer object's path within its host application * @param interface the interface to work with * @param connection the D-Bus connection to work on - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ TQT_DBusProxy(const TQString& service, const TQString& path, const TQString& interface, const TQT_DBusConnection& connection, - TQObject* tqparent = 0, const char* name = 0); + TQObject* parent = 0, const char* name = 0); /** * @brief Destroys the proxy instance diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.cpp.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.cpp.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.cpp.svn-base 2011-08-10 23:09:00.000000000 -0500 @@ -24,8 +24,8 @@ #include "tqdbusserver.h" #include "tqdbusconnection_p.h" -TQT_DBusServer::TQT_DBusServer(const TQString &addr, TQObject *tqparent) - : TQObject(tqparent) +TQT_DBusServer::TQT_DBusServer(const TQString &addr, TQObject *parent) + : TQObject(parent) { d = new TQT_DBusConnectionPrivate(this); diff -Nru dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.h.svn-base dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.h.svn-base --- dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.h.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/.svn/text-base/tqdbusserver.h.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - TQT_DBusServer(const TQString &address, TQObject *tqparent = 0); + TQT_DBusServer(const TQString &address, TQObject *parent = 0); bool isConnected() const; TQT_DBusError lastError() const; diff -Nru dbus-1-tqt-3.5.13/tools/dbusxml2qt3/classgen.cpp dbus-1-tqt-3.5.13/tools/dbusxml2qt3/classgen.cpp --- dbus-1-tqt-3.5.13/tools/dbusxml2qt3/classgen.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/dbusxml2qt3/classgen.cpp 2011-08-10 23:08:59.000000000 -0500 @@ -401,7 +401,7 @@ stream << " TQ_OBJECT" << endl; stream << "public:" << endl; stream << " " << classData.name - << "(const TQString& service, const TQString& path, TQObject* tqparent = 0, const char* name = 0);" << endl; + << "(const TQString& service, const TQString& path, TQObject* parent = 0, const char* name = 0);" << endl; stream << endl; stream << " virtual ~" << classData.name << "();" << endl; diff -Nru dbus-1-tqt-3.5.13/tools/dbusxml2qt3/main.cpp dbus-1-tqt-3.5.13/tools/dbusxml2qt3/main.cpp --- dbus-1-tqt-3.5.13/tools/dbusxml2qt3/main.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/dbusxml2qt3/main.cpp 2011-08-10 23:08:59.000000000 -0500 @@ -42,7 +42,7 @@ bool checkForOption(const OptionMap& options, const TQString& option) { - return options.tqfind(option) != options.end(); + return options.find(option) != options.end(); } int main(int argc, char** argv) @@ -336,7 +336,7 @@ exit(3); } - nodeClassName.tqreplace('/', "_"); + nodeClassName.replace('/', "_"); } TQStringList nameParts = TQStringList::split("::", nodeClassName); @@ -451,7 +451,7 @@ bool testAndSetOption(OptionMap& options, const TQString& option, const TQString& value) { - OptionMap::iterator it = options.tqfind(option); + OptionMap::iterator it = options.find(option); if (it == options.end()) { options.insert(option, value); diff -Nru dbus-1-tqt-3.5.13/tools/dbusxml2qt3/methodgen.cpp dbus-1-tqt-3.5.13/tools/dbusxml2qt3/methodgen.cpp --- dbus-1-tqt-3.5.13/tools/dbusxml2qt3/methodgen.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/dbusxml2qt3/methodgen.cpp 2011-08-10 23:08:59.000000000 -0500 @@ -133,8 +133,8 @@ } else if (signature.startsWith("a{")) { - int from = signature.tqfind("{"); - int to = signature.tqfindRev("}"); + int from = signature.find("{"); + int to = signature.findRev("}"); if (from == -1 || to == -1 || (to - from - 1) < 2) return false; TQString dictSignature = signature.mid(from + 1, (to - from - 1)); @@ -600,8 +600,8 @@ { Property property; property.name = element.attribute("name"); - property.read = element.attribute("access").tqfind("read") != -1; - property.write = element.attribute("access").tqfind("write") != -1; + property.read = element.attribute("access").find("read") != -1; + property.write = element.attribute("access").find("write") != -1; TQString annotation = propertyAnnotations[TQString("Property%1").arg(propertyCount)]; @@ -754,7 +754,7 @@ if (method.async) { stream << " int _asyncCallId = 0;" << endl; - stream << " while (m_asyncCalls.tqfind(_asyncCallId) != m_asyncCalls.end())" + stream << " while (m_asyncCalls.find(_asyncCallId) != m_asyncCalls.end())" << endl; stream << " {" << endl; stream << " ++_asyncCallId;" << endl; @@ -976,12 +976,12 @@ stream << endl; stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = m_asyncCalls.tqfind(asyncCallId);" << endl; - stream << " if (tqfindIt == m_asyncCalls.end()) return;" << endl; + stream << " TQMap::iterator findIt = m_asyncCalls.find(asyncCallId);" << endl; + stream << " if (findIt == m_asyncCalls.end()) return;" << endl; stream << endl; - stream << " TQT_DBusMessage call = tqfindIt.data();" << endl; - stream << " m_asyncCalls.erase(tqfindIt);" << endl; + stream << " TQT_DBusMessage call = findIt.data();" << endl; + stream << " m_asyncCalls.erase(findIt);" << endl; stream << endl; stream << " TQT_DBusMessage reply = TQT_DBusMessage::methodReply(call);" @@ -1029,12 +1029,12 @@ stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = m_asyncCalls.tqfind(asyncCallId);" << endl; - stream << " if (tqfindIt == m_asyncCalls.end()) return;" << endl; + stream << " TQMap::iterator findIt = m_asyncCalls.find(asyncCallId);" << endl; + stream << " if (findIt == m_asyncCalls.end()) return;" << endl; stream << endl; - stream << " TQT_DBusMessage call = tqfindIt.data();" << endl; - stream << " m_asyncCalls.erase(tqfindIt);" << endl; + stream << " TQT_DBusMessage call = findIt.data();" << endl; + stream << " m_asyncCalls.erase(findIt);" << endl; stream << endl; stream << " TQT_DBusMessage reply = TQT_DBusMessage::methodError(call, error);" @@ -1124,8 +1124,8 @@ void MethodGenerator::writeProxyBegin(const Class& classData, TQTextStream& stream) { stream << classData.name << "::" << classData.name - << "(const TQString& service, const TQString& path, TQObject* tqparent, const char* name)" << endl; - stream << " : TQObject(tqparent, name)," << endl; + << "(const TQString& service, const TQString& path, TQObject* parent, const char* name)" << endl; + stream << " : TQObject(parent, name)," << endl; stream << " m_baseProxy(new TQT_DBusProxy())" << endl; stream << "{" << endl; stream << " m_baseProxy->setInterface(\"" @@ -1544,12 +1544,12 @@ << "::slotHandleAsyncReply(int asyncCallId, const TQT_DBusMessage& message)" << endl; stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = " - << "m_asyncCalls.tqfind(asyncCallId);" << endl; - stream << " if (tqfindIt == m_asyncCalls.end()) return;" << endl; + stream << " TQMap::iterator findIt = " + << "m_asyncCalls.find(asyncCallId);" << endl; + stream << " if (findIt == m_asyncCalls.end()) return;" << endl; stream << endl; - stream << " const TQString signalName = tqfindIt.data();" << endl; - stream << " m_asyncCalls.erase(tqfindIt);" << endl; + stream << " const TQString signalName = findIt.data();" << endl; + stream << " m_asyncCalls.erase(findIt);" << endl; stream << endl; TQValueList::const_iterator it = classData.asyncReplySignals.begin(); @@ -1722,12 +1722,12 @@ stream << "bool " << classData.name << "::handleMethodCall(const TQT_DBusMessage& message)" << endl; stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = " - << "m_private->interfaces.tqfind(message.interface());" << endl; - stream << " if (tqfindIt == m_private->interfaces.end()) return false;" + stream << " TQMap::iterator findIt = " + << "m_private->interfaces.find(message.interface());" << endl; + stream << " if (findIt == m_private->interfaces.end()) return false;" << endl; stream << endl; - stream << " return delegateMethodCall(message, tqfindIt.data());" << endl; + stream << " return delegateMethodCall(message, findIt.data());" << endl; stream << "}" << endl; stream << endl; diff -Nru dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/entries dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/entries --- dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/entries 2011-08-08 15:41:13.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/entries 2011-08-10 23:09:00.000000000 -0500 @@ -1,14 +1,14 @@ 10 dir -1245821 +1246279 svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/dbus-1-tqt/tools/dbusxml2qt3 svn://anonsvn.kde.org/home/kde -2011-04-21T23:56:57.358890Z -1228687 +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -32,10 +32,10 @@ -2011-07-05T19:59:36.132466Z -3f3ab59d55fedb5e7bb789589a07b3ad -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:08:59.857394Z +1e1d995929ee32e1203188be6d550a7e +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -58,7 +58,7 @@ -35816 +35814 methodgen.h file @@ -168,10 +168,10 @@ -2011-07-05T19:59:36.132466Z -7222a09832b3f6473e621d5d3004aa3b -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:08:59.857394Z +bea919d6c9d361995792ddf4b9a53a42 +2011-08-10T06:08:18.560003Z +1246075 tpearson @@ -194,7 +194,7 @@ -22100 +22094 methodgen.cpp file @@ -202,10 +202,10 @@ -2011-07-05T19:59:36.132466Z -19eb04546224388e1e1fb0df1d1c838a -2011-04-21T23:56:57.358890Z -1228687 +2011-08-11T04:08:59.857394Z +bd644e9468f22bd32cfcd19fae4a9014 +2011-08-10T22:19:39.656833Z +1246260 tpearson @@ -228,5 +228,5 @@ -59998 +59946 diff -Nru dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/classgen.cpp.svn-base dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/classgen.cpp.svn-base --- dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/classgen.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/classgen.cpp.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -401,7 +401,7 @@ stream << " TQ_OBJECT" << endl; stream << "public:" << endl; stream << " " << classData.name - << "(const TQString& service, const TQString& path, TQObject* tqparent = 0, const char* name = 0);" << endl; + << "(const TQString& service, const TQString& path, TQObject* parent = 0, const char* name = 0);" << endl; stream << endl; stream << " virtual ~" << classData.name << "();" << endl; diff -Nru dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/main.cpp.svn-base dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/main.cpp.svn-base --- dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/main.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/main.cpp.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -42,7 +42,7 @@ bool checkForOption(const OptionMap& options, const TQString& option) { - return options.tqfind(option) != options.end(); + return options.find(option) != options.end(); } int main(int argc, char** argv) @@ -336,7 +336,7 @@ exit(3); } - nodeClassName.tqreplace('/', "_"); + nodeClassName.replace('/', "_"); } TQStringList nameParts = TQStringList::split("::", nodeClassName); @@ -451,7 +451,7 @@ bool testAndSetOption(OptionMap& options, const TQString& option, const TQString& value) { - OptionMap::iterator it = options.tqfind(option); + OptionMap::iterator it = options.find(option); if (it == options.end()) { options.insert(option, value); diff -Nru dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/methodgen.cpp.svn-base dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/methodgen.cpp.svn-base --- dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/methodgen.cpp.svn-base 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/dbusxml2qt3/.svn/text-base/methodgen.cpp.svn-base 2011-08-10 23:08:59.000000000 -0500 @@ -133,8 +133,8 @@ } else if (signature.startsWith("a{")) { - int from = signature.tqfind("{"); - int to = signature.tqfindRev("}"); + int from = signature.find("{"); + int to = signature.findRev("}"); if (from == -1 || to == -1 || (to - from - 1) < 2) return false; TQString dictSignature = signature.mid(from + 1, (to - from - 1)); @@ -600,8 +600,8 @@ { Property property; property.name = element.attribute("name"); - property.read = element.attribute("access").tqfind("read") != -1; - property.write = element.attribute("access").tqfind("write") != -1; + property.read = element.attribute("access").find("read") != -1; + property.write = element.attribute("access").find("write") != -1; TQString annotation = propertyAnnotations[TQString("Property%1").arg(propertyCount)]; @@ -754,7 +754,7 @@ if (method.async) { stream << " int _asyncCallId = 0;" << endl; - stream << " while (m_asyncCalls.tqfind(_asyncCallId) != m_asyncCalls.end())" + stream << " while (m_asyncCalls.find(_asyncCallId) != m_asyncCalls.end())" << endl; stream << " {" << endl; stream << " ++_asyncCallId;" << endl; @@ -976,12 +976,12 @@ stream << endl; stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = m_asyncCalls.tqfind(asyncCallId);" << endl; - stream << " if (tqfindIt == m_asyncCalls.end()) return;" << endl; + stream << " TQMap::iterator findIt = m_asyncCalls.find(asyncCallId);" << endl; + stream << " if (findIt == m_asyncCalls.end()) return;" << endl; stream << endl; - stream << " TQT_DBusMessage call = tqfindIt.data();" << endl; - stream << " m_asyncCalls.erase(tqfindIt);" << endl; + stream << " TQT_DBusMessage call = findIt.data();" << endl; + stream << " m_asyncCalls.erase(findIt);" << endl; stream << endl; stream << " TQT_DBusMessage reply = TQT_DBusMessage::methodReply(call);" @@ -1029,12 +1029,12 @@ stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = m_asyncCalls.tqfind(asyncCallId);" << endl; - stream << " if (tqfindIt == m_asyncCalls.end()) return;" << endl; + stream << " TQMap::iterator findIt = m_asyncCalls.find(asyncCallId);" << endl; + stream << " if (findIt == m_asyncCalls.end()) return;" << endl; stream << endl; - stream << " TQT_DBusMessage call = tqfindIt.data();" << endl; - stream << " m_asyncCalls.erase(tqfindIt);" << endl; + stream << " TQT_DBusMessage call = findIt.data();" << endl; + stream << " m_asyncCalls.erase(findIt);" << endl; stream << endl; stream << " TQT_DBusMessage reply = TQT_DBusMessage::methodError(call, error);" @@ -1124,8 +1124,8 @@ void MethodGenerator::writeProxyBegin(const Class& classData, TQTextStream& stream) { stream << classData.name << "::" << classData.name - << "(const TQString& service, const TQString& path, TQObject* tqparent, const char* name)" << endl; - stream << " : TQObject(tqparent, name)," << endl; + << "(const TQString& service, const TQString& path, TQObject* parent, const char* name)" << endl; + stream << " : TQObject(parent, name)," << endl; stream << " m_baseProxy(new TQT_DBusProxy())" << endl; stream << "{" << endl; stream << " m_baseProxy->setInterface(\"" @@ -1544,12 +1544,12 @@ << "::slotHandleAsyncReply(int asyncCallId, const TQT_DBusMessage& message)" << endl; stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = " - << "m_asyncCalls.tqfind(asyncCallId);" << endl; - stream << " if (tqfindIt == m_asyncCalls.end()) return;" << endl; + stream << " TQMap::iterator findIt = " + << "m_asyncCalls.find(asyncCallId);" << endl; + stream << " if (findIt == m_asyncCalls.end()) return;" << endl; stream << endl; - stream << " const TQString signalName = tqfindIt.data();" << endl; - stream << " m_asyncCalls.erase(tqfindIt);" << endl; + stream << " const TQString signalName = findIt.data();" << endl; + stream << " m_asyncCalls.erase(findIt);" << endl; stream << endl; TQValueList::const_iterator it = classData.asyncReplySignals.begin(); @@ -1722,12 +1722,12 @@ stream << "bool " << classData.name << "::handleMethodCall(const TQT_DBusMessage& message)" << endl; stream << "{" << endl; - stream << " TQMap::iterator tqfindIt = " - << "m_private->interfaces.tqfind(message.interface());" << endl; - stream << " if (tqfindIt == m_private->interfaces.end()) return false;" + stream << " TQMap::iterator findIt = " + << "m_private->interfaces.find(message.interface());" << endl; + stream << " if (findIt == m_private->interfaces.end()) return false;" << endl; stream << endl; - stream << " return delegateMethodCall(message, tqfindIt.data());" << endl; + stream << " return delegateMethodCall(message, findIt.data());" << endl; stream << "}" << endl; stream << endl; diff -Nru dbus-1-tqt-3.5.13/tools/.svn/entries dbus-1-tqt-3.5.13/tools/.svn/entries --- dbus-1-tqt-3.5.13/tools/.svn/entries 2011-08-08 15:41:13.000000000 -0500 +++ dbus-1-tqt-3.5.13/tools/.svn/entries 2011-08-10 23:08:59.000000000 -0500 @@ -1,14 +1,14 @@ 10 dir -1245821 +1246279 svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/dbus-1-tqt/tools svn://anonsvn.kde.org/home/kde -2011-04-21T23:56:57.358890Z -1228687 +2011-08-10T22:19:39.656833Z +1246260 tpearson diff -Nru dbus-1-tqt-3.5.13/tqdbusconnection.cpp dbus-1-tqt-3.5.13/tqdbusconnection.cpp --- dbus-1-tqt-3.5.13/tqdbusconnection.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusconnection.cpp 2011-08-10 23:09:00.000000000 -0500 @@ -66,7 +66,7 @@ if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name)) return default_connection; - ConnectionHash::const_iterator it = connectionHash.tqfind(name); + ConnectionHash::const_iterator it = connectionHash.find(name); return (it != connectionHash.end() ? it.data() : 0); } @@ -78,7 +78,7 @@ d = default_connection; default_connection = 0; } else { - ConnectionHash::iterator it = connectionHash.tqfind(name); + ConnectionHash::iterator it = connectionHash.find(name); if (it == connectionHash.end()) return; @@ -334,7 +334,7 @@ if (!d || !d->connection || !object || path.isEmpty()) return false; - TQT_DBusConnectionPrivate::ObjectMap::const_iterator it = d->registeredObjects.tqfind(path); + TQT_DBusConnectionPrivate::ObjectMap::const_iterator it = d->registeredObjects.find(path); if (it != d->registeredObjects.end()) return false; @@ -348,7 +348,7 @@ if (!d || !d->connection || path.isEmpty()) return; - TQT_DBusConnectionPrivate::ObjectMap::iterator it = d->registeredObjects.tqfind(path); + TQT_DBusConnectionPrivate::ObjectMap::iterator it = d->registeredObjects.find(path); if (it == d->registeredObjects.end()) return ; diff -Nru dbus-1-tqt-3.5.13/tqdbusconnection.h dbus-1-tqt-3.5.13/tqdbusconnection.h --- dbus-1-tqt-3.5.13/tqdbusconnection.h 2011-08-05 12:17:38.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusconnection.h 2011-08-10 23:09:00.000000000 -0500 @@ -195,7 +195,7 @@ */ SystemBus, - // TODO tqfind out about ActivationBus purpose + // TODO find out about ActivationBus purpose ActivationBus }; @@ -560,7 +560,7 @@ * * Equivalent to calling addConnection(SessionBus); * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see addConnection(BusType,const TQString&); @@ -575,7 +575,7 @@ * * Equivalent to calling addConnection(SystemBus); * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see addConnection(BusType,const TQString&); @@ -610,7 +610,7 @@ * @param type the #BusType of the bus to connect to * @param name the name to use for TQT_DBusConnection's connection sharing * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see closeConnection() @@ -631,7 +631,7 @@ * socket address * @param name the name to use for TQT_DBusConnection's connection sharing * - * @return a connection handle. Check isConnected() to tqfind out if the + * @return a connection handle. Check isConnected() to find out if the * connection attempt has been successfull * * @see closeConnection() diff -Nru dbus-1-tqt-3.5.13/tqdbusconnection_p.h dbus-1-tqt-3.5.13/tqdbusconnection_p.h --- dbus-1-tqt-3.5.13/tqdbusconnection_p.h 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusconnection_p.h 2011-08-10 23:09:00.000000000 -0500 @@ -62,7 +62,7 @@ TQ_OBJECT public: - TQT_DBusConnectionPrivate(TQObject *tqparent = 0); + TQT_DBusConnectionPrivate(TQObject *parent = 0); ~TQT_DBusConnectionPrivate(); void bindToApplication(); diff -Nru dbus-1-tqt-3.5.13/tqdbusdataconverter.h dbus-1-tqt-3.5.13/tqdbusdataconverter.h --- dbus-1-tqt-3.5.13/tqdbusdataconverter.h 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusdataconverter.h 2011-08-10 23:09:00.000000000 -0500 @@ -82,7 +82,7 @@ * TQT_DBusDataConverter::convertFromTQT_DBusData(dbusData, rect); * @endcode * - * @note The bindings library tqcontains the spezialisations for TQRect, TQPoint and TQSize. + * @note The bindings library contains the spezialisations for TQRect, TQPoint and TQSize. */ class TQDBUS_EXPORT TQT_DBusDataConverter { diff -Nru dbus-1-tqt-3.5.13/tqdbusdata.h dbus-1-tqt-3.5.13/tqdbusdata.h --- dbus-1-tqt-3.5.13/tqdbusdata.h 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusdata.h 2011-08-10 23:09:00.000000000 -0500 @@ -330,7 +330,7 @@ bool operator!=(const TQT_DBusData& other) const; /** - * @brief Checks whether the data object tqcontains a valid content + * @brief Checks whether the data object contains a valid content * * This is equal to checking type() for not being #Invalid * diff -Nru dbus-1-tqt-3.5.13/tqdbuserror.cpp dbus-1-tqt-3.5.13/tqdbuserror.cpp --- dbus-1-tqt-3.5.13/tqdbuserror.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbuserror.cpp 2011-08-10 23:09:00.000000000 -0500 @@ -107,7 +107,7 @@ if (errorTypesByName.isEmpty()) qDBusErrorSetupNameMapping(); - ErrorNameMap::const_iterator it = errorTypesByName.tqfind(name); + ErrorNameMap::const_iterator it = errorTypesByName.find(name); if (it != errorTypesByName.end()) return it.data(); return TQT_DBusError::UserDefined; diff -Nru dbus-1-tqt-3.5.13/tqdbuserror.h dbus-1-tqt-3.5.13/tqdbuserror.h --- dbus-1-tqt-3.5.13/tqdbuserror.h 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbuserror.h 2011-08-10 23:09:00.000000000 -0500 @@ -229,7 +229,7 @@ * @brief An type signature is not valid * * A possible cause is a TQT_DBusVariant with an invalid signature, i.e. - * the transported signature is empty, tqcontains unknown type characters + * the transported signature is empty, contains unknown type characters * or has mismatched container enclosings. * * @note in case a service implementation wants to indicate that a method diff -Nru dbus-1-tqt-3.5.13/tqdbusintegrator.cpp dbus-1-tqt-3.5.13/tqdbusintegrator.cpp --- dbus-1-tqt-3.5.13/tqdbusintegrator.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusintegrator.cpp 2011-08-10 23:09:00.000000000 -0500 @@ -145,7 +145,7 @@ } } // FIXME-QT4 d->watchers.insertMulti(fd, watcher); - TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.tqfind(fd); + TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it == d->watchers.end()) { it = d->watchers.insert(fd, TQT_DBusConnectionPrivate::WatcherList()); @@ -165,7 +165,7 @@ TQT_DBusConnectionPrivate *d = static_cast(data); int fd = dbus_watch_get_unix_fd(watch); - TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.tqfind(fd); + TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) { TQT_DBusConnectionPrivate::WatcherList& list = *it; @@ -207,7 +207,7 @@ TQT_DBusConnectionPrivate *d = static_cast(data); int fd = dbus_watch_get_unix_fd(watch); - TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.tqfind(fd); + TQT_DBusConnectionPrivate::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) { TQT_DBusConnectionPrivate::WatcherList& list = *it; for (TQT_DBusConnectionPrivate::WatcherList::iterator wit = list.begin(); wit != list.end(); @@ -271,8 +271,8 @@ return tp; } -TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *tqparent) - : TQObject(tqparent), ref(1), mode(InvalidMode), connection(0), server(0), +TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *parent) + : TQObject(parent), ref(1), mode(InvalidMode), connection(0), server(0), dispatcher(0) { static const int msgType = registerMessageMetaType(); @@ -357,7 +357,7 @@ void TQT_DBusConnectionPrivate::socketRead(int fd) { // FIXME-QT4 TQHashIterator it(watchers); - WatcherHash::const_iterator it = watchers.tqfind(fd); + WatcherHash::const_iterator it = watchers.find(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { @@ -374,7 +374,7 @@ void TQT_DBusConnectionPrivate::socketWrite(int fd) { // FIXME-QT4 TQHashIterator it(watchers); - WatcherHash::const_iterator it = watchers.tqfind(fd); + WatcherHash::const_iterator it = watchers.find(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { @@ -466,7 +466,7 @@ { TQT_DBusMessage msg = TQT_DBusMessage::fromDBusMessage(message); - ObjectMap::iterator it = registeredObjects.tqfind(msg.path()); + ObjectMap::iterator it = registeredObjects.find(msg.path()); if (it == registeredObjects.end()) return false; @@ -559,7 +559,7 @@ { //qDebug("Pending Call Result received"); TQT_DBusConnectionPrivate* d = reinterpret_cast(user_data); - TQT_DBusConnectionPrivate::PendingCallMap::iterator it = d->pendingCalls.tqfind(pending); + TQT_DBusConnectionPrivate::PendingCallMap::iterator it = d->pendingCalls.find(pending); DBusMessage *dbusReply = dbus_pending_call_steal_reply(pending); diff -Nru dbus-1-tqt-3.5.13/tqdbusobjectpath.cpp dbus-1-tqt-3.5.13/tqdbusobjectpath.cpp --- dbus-1-tqt-3.5.13/tqdbusobjectpath.cpp 2011-07-22 15:56:41.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusobjectpath.cpp 2011-08-10 23:09:00.000000000 -0500 @@ -53,7 +53,7 @@ { if (length() == 1) return TQT_DBusObjectPath(); - int index = tqfindRev('/'); + int index = findRev('/'); if (index == -1) return TQT_DBusObjectPath(); diff -Nru dbus-1-tqt-3.5.13/tqdbusobjectpath.h dbus-1-tqt-3.5.13/tqdbusobjectpath.h --- dbus-1-tqt-3.5.13/tqdbusobjectpath.h 2011-07-22 15:56:41.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusobjectpath.h 2011-08-10 23:09:00.000000000 -0500 @@ -58,7 +58,7 @@ TQT_DBusObjectPath(const TQCString& other); /** - * @brief Creates an object path for an object as a child of the tqparent node + * @brief Creates an object path for an object as a child of the parent node * * This is basically like specifying a directory and a file name to create * the file's full path. @@ -90,11 +90,11 @@ bool isValid() const; /** - * @brief Returns the object path of this path's tqparent node + * @brief Returns the object path of this path's parent node * * This is basically like getting the directory of an file path * - * @return the tqparent node's object path or an empty and invalid object + * @return the parent node's object path or an empty and invalid object * if this is already the root node */ TQT_DBusObjectPath parentNode() const; diff -Nru dbus-1-tqt-3.5.13/tqdbusproxy.cpp dbus-1-tqt-3.5.13/tqdbusproxy.cpp --- dbus-1-tqt-3.5.13/tqdbusproxy.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusproxy.cpp 2011-08-10 23:09:00.000000000 -0500 @@ -48,15 +48,15 @@ TQT_DBusError error; }; -TQT_DBusProxy::TQT_DBusProxy(TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), +TQT_DBusProxy::TQT_DBusProxy(TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { } TQT_DBusProxy::TQT_DBusProxy(const TQT_DBusConnection& connection, - TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), + TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { setConnection(connection); @@ -64,8 +64,8 @@ TQT_DBusProxy::TQT_DBusProxy(const TQString& service, const TQString& path, const TQString& interface, const TQT_DBusConnection& connection, - TQObject* tqparent, const char* name) - : TQObject(tqparent, (name ? name : "TQT_DBusProxy")), + TQObject* parent, const char* name) + : TQObject(parent, (name ? name : "TQT_DBusProxy")), d(new Private()) { setConnection(connection); diff -Nru dbus-1-tqt-3.5.13/tqdbusproxy.h dbus-1-tqt-3.5.13/tqdbusproxy.h --- dbus-1-tqt-3.5.13/tqdbusproxy.h 2011-08-05 12:17:38.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusproxy.h 2011-08-10 23:09:00.000000000 -0500 @@ -245,10 +245,10 @@ * This basic constructor allows to create a proxy and specify the peer * object and interface later on. * - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(TQObject* tqparent = 0, const char* name = 0); + TQT_DBusProxy(TQObject* parent = 0, const char* name = 0); /** * @brief Creates a proxy on a given connection without binding it to a @@ -262,10 +262,10 @@ * filtering for a specific peer. * * @param connection the D-Bus connection to work on - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ - TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* tqparent = 0, + TQT_DBusProxy(const TQT_DBusConnection& connection, TQObject* parent = 0, const char* name = 0); /** @@ -279,12 +279,12 @@ * @param path the peer object's path within its host application * @param interface the interface to work with * @param connection the D-Bus connection to work on - * @param tqparent TQObject tqparent + * @param parent TQObject parent * @param name TQObject name */ TQT_DBusProxy(const TQString& service, const TQString& path, const TQString& interface, const TQT_DBusConnection& connection, - TQObject* tqparent = 0, const char* name = 0); + TQObject* parent = 0, const char* name = 0); /** * @brief Destroys the proxy instance diff -Nru dbus-1-tqt-3.5.13/tqdbusserver.cpp dbus-1-tqt-3.5.13/tqdbusserver.cpp --- dbus-1-tqt-3.5.13/tqdbusserver.cpp 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusserver.cpp 2011-08-10 23:09:00.000000000 -0500 @@ -24,8 +24,8 @@ #include "tqdbusserver.h" #include "tqdbusconnection_p.h" -TQT_DBusServer::TQT_DBusServer(const TQString &addr, TQObject *tqparent) - : TQObject(tqparent) +TQT_DBusServer::TQT_DBusServer(const TQString &addr, TQObject *parent) + : TQObject(parent) { d = new TQT_DBusConnectionPrivate(this); diff -Nru dbus-1-tqt-3.5.13/tqdbusserver.h dbus-1-tqt-3.5.13/tqdbusserver.h --- dbus-1-tqt-3.5.13/tqdbusserver.h 2011-07-05 14:59:36.000000000 -0500 +++ dbus-1-tqt-3.5.13/tqdbusserver.h 2011-08-10 23:09:00.000000000 -0500 @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - TQT_DBusServer(const TQString &address, TQObject *tqparent = 0); + TQT_DBusServer(const TQString &address, TQObject *parent = 0); bool isConnected() const; TQT_DBusError lastError() const;