Browse Source

Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 10 years ago
parent
commit
f7e71d4771
1403 changed files with 11183 additions and 10958 deletions
  1. +5
    -5
      KDE2PORTING.html
  2. +5
    -5
      KDE3PORTING.html
  3. +1
    -1
      arts/kde/kartsdispatcher.h
  4. +3
    -3
      arts/kde/kartsserver.cpp
  5. +1
    -1
      arts/kde/kartsserver.h
  6. +1
    -1
      arts/kde/kaudioconverter.h
  7. +1
    -1
      arts/kde/kaudiorecordstream.h
  8. +1
    -1
      arts/kde/kconverttest.h
  9. +2
    -2
      arts/kde/kioinputstream_impl.cpp
  10. +4
    -4
      arts/kde/kplayobject.cc
  11. +2
    -2
      arts/kde/kplayobject.h
  12. +1
    -1
      arts/kde/kplayobjectcreator.h
  13. +2
    -2
      arts/kde/kplayobjectfactory.cc
  14. +1
    -1
      arts/kde/kplayobjectfactory_p.h
  15. +9
    -9
      arts/kde/kvideowidget.cpp
  16. +1
    -1
      arts/kde/kvideowidget.h
  17. +7
    -7
      arts/knotify/knotify.cpp
  18. +2
    -2
      dcop/KDE-ICE/ICEmsg.h
  19. +16
    -16
      dcop/client/dcop.cpp
  20. +5
    -5
      dcop/client/dcopfind.cpp
  21. +1
    -1
      dcop/client/dcopstart.cpp
  22. +20
    -20
      dcop/client/marshall.cpp
  23. +62
    -62
      dcop/dcopclient.cpp
  24. +4
    -3
      dcop/dcopclient.h
  25. +1
    -1
      dcop/dcopidl/main.cpp
  26. +2
    -2
      dcop/dcopidl/scanner.cc
  27. +1
    -0
      dcop/dcopidl/scanner.ll
  28. +1
    -1
      dcop/dcopidl/yacc.cc
  29. +1
    -1
      dcop/dcopidl/yacc.yy
  30. +3
    -3
      dcop/dcopidl2cpp/main.cpp
  31. +2
    -2
      dcop/dcopidl2cpp/skel.cpp
  32. +5
    -5
      dcop/dcopidl2cpp/stub.cpp
  33. +1
    -1
      dcop/dcopidl2cpp/stubimpl.cpp
  34. +3
    -3
      dcop/dcopobject.cpp
  35. +4
    -4
      dcop/dcopref.cpp
  36. +1
    -1
      dcop/dcopref.h
  37. +28
    -28
      dcop/dcopserver.cpp
  38. +3
    -3
      dcop/dcopserver.h
  39. +9
    -9
      dcop/dcopsignals.cpp
  40. +6
    -6
      dcop/kdatastream.h
  41. +2
    -2
      dcop/testdcop.h
  42. +1
    -1
      dnssd/domainbrowser.cpp
  43. +1
    -1
      dnssd/domainbrowser.h
  44. +1
    -1
      dnssd/query.h
  45. +2
    -2
      dnssd/remoteservice.cpp
  46. +2
    -2
      dnssd/responder.cpp
  47. +1
    -1
      dnssd/responder.h
  48. +4
    -4
      dnssd/sdevent.h
  49. +4
    -4
      dnssd/servicebase.cpp
  50. +1
    -1
      dnssd/servicebrowser.cpp
  51. +1
    -1
      dnssd/servicebrowser.h
  52. +4
    -4
      interfaces/khexedit/byteseditinterface.h
  53. +1
    -1
      interfaces/khexedit/charcolumninterface.h
  54. +1
    -1
      interfaces/khexedit/clipboardinterface.h
  55. +1
    -1
      interfaces/khexedit/valuecolumninterface.h
  56. +1
    -1
      interfaces/khexedit/zoominterface.h
  57. +1
    -1
      interfaces/kimproxy/interface/kimiface.h
  58. +5
    -5
      interfaces/kimproxy/library/kimproxy.cpp
  59. +2
    -2
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  60. +1
    -1
      interfaces/kmediaplayer/player.h
  61. +1
    -1
      interfaces/kmediaplayer/view.h
  62. +2
    -2
      interfaces/kregexpeditor/kregexpeditorinterface.h
  63. +1
    -1
      interfaces/kscript/scriptinterface.h
  64. +1
    -1
      interfaces/ktexteditor/blockselectioninterface.cpp
  65. +1
    -1
      interfaces/ktexteditor/clipboardinterface.cpp
  66. +1
    -1
      interfaces/ktexteditor/codecompletioninterface.cpp
  67. +2
    -2
      interfaces/ktexteditor/configinterface.cpp
  68. +2
    -2
      interfaces/ktexteditor/configinterfaceextension.cpp
  69. +1
    -1
      interfaces/ktexteditor/configinterfaceextension.h
  70. +1
    -1
      interfaces/ktexteditor/cursorinterface.cpp
  71. +1
    -1
      interfaces/ktexteditor/dynwordwrapinterface.cpp
  72. +1
    -1
      interfaces/ktexteditor/editinterface.cpp
  73. +1
    -1
      interfaces/ktexteditor/editinterfaceext.cpp
  74. +1
    -1
      interfaces/ktexteditor/editinterfaceext.h
  75. +1
    -1
      interfaces/ktexteditor/editor.h
  76. +3
    -3
      interfaces/ktexteditor/editorchooser.cpp
  77. +2
    -2
      interfaces/ktexteditor/editorchooser.h
  78. +3
    -3
      interfaces/ktexteditor/editorchooser_ui.ui
  79. +1
    -1
      interfaces/ktexteditor/encodinginterface.cpp
  80. +1
    -1
      interfaces/ktexteditor/highlightinginterface.cpp
  81. +3
    -3
      interfaces/ktexteditor/ktexteditor.cpp
  82. +1
    -1
      interfaces/ktexteditor/markinterface.cpp
  83. +1
    -1
      interfaces/ktexteditor/markinterfaceextension.cpp
  84. +1
    -1
      interfaces/ktexteditor/plugin.h
  85. +1
    -1
      interfaces/ktexteditor/popupmenuinterface.cpp
  86. +1
    -1
      interfaces/ktexteditor/printinterface.cpp
  87. +1
    -1
      interfaces/ktexteditor/searchinterface.cpp
  88. +2
    -2
      interfaces/ktexteditor/selectioninterface.cpp
  89. +2
    -2
      interfaces/ktexteditor/selectioninterfaceext.cpp
  90. +3
    -3
      interfaces/ktexteditor/sessionconfiginterface.cpp
  91. +2
    -2
      interfaces/ktexteditor/templateinterface.cpp
  92. +1
    -1
      interfaces/ktexteditor/texthintinterface.cpp
  93. +1
    -1
      interfaces/ktexteditor/undointerface.cpp
  94. +1
    -1
      interfaces/ktexteditor/variableinterface.cpp
  95. +1
    -1
      interfaces/ktexteditor/viewcursorinterface.cpp
  96. +1
    -1
      interfaces/ktexteditor/viewstatusmsginterface.cpp
  97. +1
    -1
      interfaces/ktexteditor/wordwrapinterface.cpp
  98. +1
    -1
      interfaces/terminal/kde_terminal_interface.h
  99. +3
    -3
      interfaces/terminal/test/main.cc
  100. +3
    -3
      kab/addressbook.cc
  101. +3
    -3
      kab/addressbook.h
  102. +2
    -2
      kab/kabapi.cc
  103. +8
    -8
      kab/qconfigDB.cc
  104. +1
    -1
      kab/qconfigDB.h
  105. +10
    -10
      kabc/address.cpp
  106. +1
    -1
      kabc/addressbook.cpp
  107. +1
    -1
      kabc/addressbook.h
  108. +2
    -2
      kabc/addresseedialog.cpp
  109. +1
    -1
      kabc/addresseedialog.h
  110. +4
    -4
      kabc/addresseehelper.cpp
  111. +1
    -1
      kabc/addresseelist.cpp
  112. +14
    -14
      kabc/addresslineedit.cpp
  113. +2
    -2
      kabc/agent.cpp
  114. +3
    -3
      kabc/distributionlist.cpp
  115. +1
    -1
      kabc/distributionlist.h
  116. +1
    -1
      kabc/distributionlistdialog.h
  117. +1
    -1
      kabc/distributionlisteditor.h
  118. +1
    -1
      kabc/errorhandler.cpp
  119. +6
    -6
      kabc/formats/binaryformat.cpp
  120. +2
    -2
      kabc/kab2kabc.cpp
  121. +3
    -3
      kabc/ldapclient.cpp
  122. +2
    -2
      kabc/ldapclient.h
  123. +4
    -4
      kabc/ldapconfigwidget.cpp
  124. +1
    -1
      kabc/ldapconfigwidget.h
  125. +1
    -1
      kabc/ldapurl.cpp
  126. +1
    -1
      kabc/ldif.cpp
  127. +60
    -60
      kabc/ldifconverter.cpp
  128. +1
    -1
      kabc/ldifconverter.h
  129. +1
    -1
      kabc/lock.h
  130. +3
    -3
      kabc/plugins/ldapkio/resourceldapkio.cpp
  131. +2
    -2
      kabc/plugins/sql/resourcesql.cpp
  132. +1
    -1
      kabc/plugins/sql/resourcesqlconfig.cpp
  133. +1
    -1
      kabc/resource.cpp
  134. +8
    -8
      kabc/scripts/addressee.src.cpp
  135. +1
    -1
      kabc/tests/testldapclient.h
  136. +1
    -1
      kabc/tests/testlock.h
  137. +1
    -1
      kabc/vcard/AdrParam.cpp
  138. +4
    -4
      kabc/vcard/ContentLine.cpp
  139. +2
    -2
      kabc/vcard/DateValue.cpp
  140. +1
    -1
      kabc/vcard/GeoValue.cpp
  141. +1
    -1
      kabc/vcard/RToken.cpp
  142. +1
    -1
      kabc/vcard/SourceParam.cpp
  143. +1
    -1
      kabc/vcard/URIValue.cpp
  144. +1
    -1
      kabc/vcard/UTCValue.cpp
  145. +4
    -4
      kabc/vcard/VCard.cpp
  146. +2
    -2
      kabc/vcard/VCardEntity.cpp
  147. +1
    -1
      kabc/vcard/include/VCardRToken.h
  148. +1
    -1
      kabc/vcard21parser.cpp
  149. +3
    -3
      kabc/vcardformatimpl.cpp
  150. +1
    -1
      kabc/vcardparser/testwrite.cpp
  151. +3
    -3
      kabc/vcardparser/vcard.cpp
  152. +2
    -2
      kabc/vcardparser/vcardline.cpp
  153. +3
    -3
      kabc/vcardparser/vcardparser.cpp
  154. +10
    -10
      kabc/vcardtool.cpp
  155. +3
    -3
      kate/interfaces/interfaces.cpp
  156. +1
    -1
      kate/part/katearbitraryhighlight.h
  157. +36
    -36
      kate/part/kateautoindent.cpp
  158. +2
    -2
      kate/part/kateautoindent.h
  159. +1
    -1
      kate/part/katebookmarks.cpp
  160. +1
    -1
      kate/part/katebookmarks.h
  161. +21
    -21
      kate/part/katebuffer.cpp
  162. +4
    -4
      kate/part/katebuffer.h
  163. +5
    -5
      kate/part/katecmds.cpp
  164. +1
    -1
      kate/part/katecmds.h
  165. +5
    -5
      kate/part/katecodecompletion.cpp
  166. +4
    -4
      kate/part/katecodecompletion.h
  167. +1
    -1
      kate/part/katecodefoldinghelpers.h
  168. +1
    -1
      kate/part/kateconfig.cpp
  169. +2
    -2
      kate/part/katecursor.h
  170. +3
    -3
      kate/part/katedialogs.cpp
  171. +17
    -17
      kate/part/katedocument.cpp
  172. +2
    -2
      kate/part/katedocument.h
  173. +5
    -5
      kate/part/katefactory.cpp
  174. +2
    -2
      kate/part/katefactory.h
  175. +1
    -1
      kate/part/katefont.h
  176. +8
    -8
      kate/part/katehighlight.cpp
  177. +4
    -4
      kate/part/katehighlight.h
  178. +1
    -1
      kate/part/katejscript.cpp
  179. +3
    -3
      kate/part/kateprinter.cpp
  180. +10
    -10
      kate/part/katerenderer.cpp
  181. +22
    -22
      kate/part/kateschema.cpp
  182. +7
    -7
      kate/part/kateschema.h
  183. +3
    -3
      kate/part/katesearch.cpp
  184. +1
    -1
      kate/part/katesearch.h
  185. +1
    -1
      kate/part/katespell.h
  186. +1
    -1
      kate/part/katesyntaxdocument.h
  187. +22
    -22
      kate/part/katetextline.cpp
  188. +3
    -3
      kate/part/katetextline.h
  189. +7
    -7
      kate/part/kateview.cpp
  190. +1
    -1
      kate/part/kateview.h
  191. +5
    -5
      kate/part/kateviewhelpers.cpp
  192. +3
    -3
      kate/part/kateviewhelpers.h
  193. +2
    -2
      kate/part/kateviewinternal.cpp
  194. +2
    -2
      kate/part/kateviewinternal.h
  195. +9
    -9
      kate/part/test_regression.cpp
  196. +1
    -1
      kate/part/test_regression.h
  197. +1
    -1
      kate/plugins/autobookmarker/autobookmarker.cpp
  198. +1
    -1
      kate/plugins/kdatatool/kate_kdatatool.cpp
  199. +7
    -7
      kcert/kcertpart.cc
  200. +1
    -1
      kcert/kcertpart.h
  201. +19
    -19
      kconf_update/kconf_update.cpp
  202. +8
    -8
      kdecore/fixx11h.h
  203. +19
    -19
      kdecore/kaboutdata.cpp
  204. +12
    -12
      kdecore/kaccel.cpp
  205. +8
    -8
      kdecore/kaccelbase.cpp
  206. +21
    -21
      kdecore/kaccelmanager.cpp
  207. +2
    -2
      kdecore/kaccelmanager_private.h
  208. +3
    -3
      kdecore/kallocator.cpp
  209. +50
    -50
      kdecore/kapplication.cpp
  210. +7
    -5
      kdecore/kapplication.h
  211. +11
    -1
      kdecore/kasyncio.h
  212. +1
    -0
      kdecore/kbufferedio.h
  213. +1
    -1
      kdecore/kcalendarsystemfactory.h
  214. +5
    -5
      kdecore/kcalendarsystemgregorian.cpp
  215. +9
    -9
      kdecore/kcalendarsystemhebrew.cpp
  216. +2
    -2
      kdecore/kcalendarsystemhijri.cpp
  217. +2
    -2
      kdecore/kcalendarsystemjalali.cpp
  218. +1
    -1
      kdecore/kcatalogue.cpp
  219. +19
    -19
      kdecore/kcharsets.cpp
  220. +4
    -4
      kdecore/kcheckaccelerators.cpp
  221. +1
    -1
      kdecore/kcheckaccelerators.h
  222. +19
    -19
      kdecore/kclipboard.cpp
  223. +1
    -1
      kdecore/kclipboard.h
  224. +7
    -7
      kdecore/kcmdlineargs.cpp
  225. +6
    -6
      kdecore/kcompletion.cpp
  226. +2
    -2
      kdecore/kcompletion.h
  227. +2
    -2
      kdecore/kcompletion_private.h
  228. +1
    -1
      kdecore/kcompletionbase.cpp
  229. +5
    -5
      kdecore/kconfig.cpp
  230. +33
    -33
      kdecore/kconfig_compiler/kconfig_compiler.cpp
  231. +3
    -3
      kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
  232. +24
    -24
      kdecore/kconfig_compiler/tests/test1.cpp.ref
  233. +9
    -9
      kdecore/kconfig_compiler/tests/test1.h.ref
  234. +33
    -33
      kdecore/kconfig_compiler/tests/test2.cpp.ref
  235. +11
    -11
      kdecore/kconfig_compiler/tests/test2.h.ref
  236. +11
    -11
      kdecore/kconfig_compiler/tests/test3.cpp.ref
  237. +4
    -4
      kdecore/kconfig_compiler/tests/test3.h.ref
  238. +24
    -24
      kdecore/kconfig_compiler/tests/test4.cpp.ref
  239. +4
    -4
      kdecore/kconfig_compiler/tests/test4.h.ref
  240. +24
    -24
      kdecore/kconfig_compiler/tests/test5.cpp.ref
  241. +4
    -4
      kdecore/kconfig_compiler/tests/test5.h.ref
  242. +9
    -9
      kdecore/kconfig_compiler/tests/test6.cpp.ref
  243. +3
    -3
      kdecore/kconfig_compiler/tests/test6.h.ref
  244. +9
    -9
      kdecore/kconfig_compiler/tests/test7.cpp.ref
  245. +3
    -3
      kdecore/kconfig_compiler/tests/test7.h.ref
  246. +5
    -5
      kdecore/kconfig_compiler/tests/test8a.cpp.ref
  247. +2
    -2
      kdecore/kconfig_compiler/tests/test8a.h.ref
  248. +8
    -8
      kdecore/kconfig_compiler/tests/test8b.cpp.ref
  249. +3
    -3
      kdecore/kconfig_compiler/tests/test8b.h.ref
  250. +8
    -8
      kdecore/kconfig_compiler/tests/test9.cpp.ref
  251. +3
    -3
      kdecore/kconfig_compiler/tests/test9.h.ref
  252. +1
    -1
      kdecore/kconfig_compiler/tests/test9main.cpp
  253. +44
    -44
      kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
  254. +10
    -10
      kdecore/kconfigbackend.cpp
  255. +34
    -34
      kdecore/kconfigbase.cpp
  256. +14
    -13
      kdecore/kconfigbase.h
  257. +9
    -9
      kdecore/kconfigdialogmanager.cpp
  258. +19
    -19
      kdecore/kconfigskeleton.cpp
  259. +25
    -25
      kdecore/kconfigskeleton.h
  260. +9
    -9
      kdecore/kdcoppropertyproxy.cpp
  261. +15
    -15
      kdecore/kde-config.cpp.in
  262. +14
    -14
      kdecore/kdebug.cpp
  263. +7
    -7
      kdecore/kdebug.h
  264. +1
    -1
      kdecore/kdelibs_export.h
  265. +4
    -4
      kdecore/kdemacros.h.in
  266. +16
    -16
      kdecore/kdesktopfile.cpp
  267. +4
    -4
      kdecore/kextsock.cpp
  268. +9
    -4
      kdecore/kextsock.h
  269. +8
    -8
      kdecore/kgenericfactory.h
  270. +55
    -55
      kdecore/kgenericfactory.tcc
  271. +3
    -3
      kdecore/kglobal.cpp
  272. +1
    -1
      kdecore/kglobalaccel.h
  273. +3
    -3
      kdecore/kglobalaccel_win.cpp
  274. +17
    -17
      kdecore/kglobalaccel_x11.cpp
  275. +3
    -3
      kdecore/kglobalsettings.cpp
  276. +53
    -53
      kdecore/kiconeffect.cpp
  277. +20
    -20
      kdecore/kiconloader.cpp
  278. +1
    -1
      kdecore/kiconloader_p.h
  279. +6
    -6
      kdecore/kicontheme.cpp
  280. +2
    -2
      kdecore/kidna.cpp
  281. +10
    -10
      kdecore/kkeyserver_x11.cpp
  282. +6
    -6
      kdecore/klibloader.cpp
  283. +3
    -3
      kdecore/klibloader.h
  284. +58
    -58
      kdecore/klocale.cpp
  285. +2
    -2
      kdecore/klocale.h
  286. +17
    -17
      kdecore/kmacroexpander.cpp
  287. +2
    -2
      kdecore/kmanagerselection.cpp
  288. +6
    -2
      kdecore/kmanagerselection.h
  289. +64
    -64
      kdecore/kmdcodec.cpp
  290. +34
    -34
      kdecore/kmdcodec.h
  291. +1
    -1
      kdecore/kmimesourcefactory.cpp
  292. +3
    -3
      kdecore/kmultipledrag.cpp
  293. +2
    -2
      kdecore/kmultipledrag.h
  294. +7
    -7
      kdecore/knotifyclient.cpp
  295. +3
    -3
      kdecore/kpalette.cpp
  296. +1
    -1
      kdecore/kprocctrl.cpp
  297. +1
    -1
      kdecore/kprocctrl.h
  298. +3
    -3
      kdecore/kprocess.h
  299. +1
    -1
      kdecore/kprocio.cpp
  300. +1
    -1
      kdecore/kprocio.h
  301. +7
    -7
      kdecore/kprotocolinfo_kdecore.cpp
  302. +1
    -1
      kdecore/kprotocolinfofactory.cpp
  303. +8
    -4
      kdecore/kqiodevicegzip_p.cpp
  304. +7
    -3
      kdecore/kqiodevicegzip_p.h
  305. +2
    -2
      kdecore/kregexp.h
  306. +5
    -5
      kdecore/krfcdate.cpp
  307. +10
    -10
      kdecore/krootprop.cpp
  308. +3
    -3
      kdecore/ksavefile.cpp
  309. +1
    -1
      kdecore/ksavefile.h
  310. +25
    -25
      kdecore/kshell.cpp
  311. +4
    -4
      kdecore/kshortcut.cpp
  312. +2
    -2
      kdecore/kshortcutmenu.cpp
  313. +1
    -1
      kdecore/ksimpleconfig.cpp
  314. +6
    -2
      kdecore/ksock.h
  315. +10
    -10
      kdecore/ksockaddr.cpp
  316. +3
    -3
      kdecore/ksockaddr.h
  317. +49
    -49
      kdecore/kstandarddirs.cpp
  318. +1
    -1
      kdecore/kstandarddirs.h
  319. +60
    -60
      kdecore/kstartupinfo.cpp
  320. +6
    -1
      kdecore/kstartupinfo.h
  321. +2
    -2
      kdecore/kstdaccel.cpp
  322. +15
    -15
      kdecore/kstringhandler.cpp
  323. +27
    -24
      kdecore/ksycoca.cpp
  324. +3
    -3
      kdecore/ksycoca.h
  325. +21
    -21
      kdecore/ksycocadict.cpp
  326. +4
    -4
      kdecore/ksycocadict.h
  327. +2
    -2
      kdecore/ksycocaentry.h
  328. +18
    -18
      kdecore/ksycocafactory.cpp
  329. +2
    -2
      kdecore/ktempdir.cpp
  330. +1
    -1
      kdecore/ktempfile.cpp
  331. +20
    -20
      kdecore/ktimezones.cpp
  332. +36
    -36
      kdecore/kurl.cpp
  333. +5
    -5
      kdecore/kurl.h
  334. +5
    -5
      kdecore/kurldrag.cpp
  335. +2
    -2
      kdecore/kurldrag.h
  336. +2
    -2
      kdecore/kuser.cpp
  337. +4
    -4
      kdecore/kvmallocator.cpp
  338. +10
    -10
      kdecore/kwin.cpp
  339. +6
    -6
      kdecore/kwinmodule.cpp
  340. +5
    -1
      kdecore/kwinmodule.h
  341. +1
    -1
      kdecore/kxmessages.cpp
  342. +6
    -1
      kdecore/kxmessages.h
  343. +1
    -1
      kdecore/libintl.cpp
  344. +57
    -57
      kdecore/malloc/malloc.c
  345. +9
    -9
      kdecore/netsupp.cpp
  346. +24
    -24
      kdecore/netsupp.h
  347. +6
    -6
      kdecore/netwm.cpp
  348. +12
    -12
      kdecore/network/kbufferedsocket.cpp
  349. +10
    -9
      kdecore/network/kbufferedsocket.h
  350. +26
    -18
      kdecore/network/kclientsocketbase.cpp
  351. +20
    -10
      kdecore/network/kclientsocketbase.h
  352. +3
    -3
      kdecore/network/kdatagramsocket.cpp
  353. +4
    -3
      kdecore/network/kdatagramsocket.h
  354. +7
    -7
      kdecore/network/khttpproxysocketdevice.cpp
  355. +5
    -5
      kdecore/network/kiobuffer.h
  356. +27
    -27
      kdecore/network/kresolver.cpp
  357. +6
    -5
      kdecore/network/kresolver.h
  358. +1
    -1
      kdecore/network/kresolver_p.h
  359. +15
    -15
      kdecore/network/kresolverstandardworkers.cpp
  360. +1
    -1
      kdecore/network/kresolverstandardworkers_p.h
  361. +4
    -4
      kdecore/network/kreverseresolver.cpp
  362. +3
    -2
      kdecore/network/kreverseresolver.h
  363. +1
    -1
      kdecore/network/kserversocket.cpp
  364. +1
    -0
      kdecore/network/kserversocket.h
  365. +43
    -43
      kdecore/network/ksocketaddress.cpp
  366. +29
    -29
      kdecore/network/ksocketaddress.h
  367. +1
    -1
      kdecore/network/ksocketbase.cpp
  368. +12
    -8
      kdecore/network/ksocketbase.h
  369. +16
    -16
      kdecore/network/ksocketbuffer.cpp
  370. +10
    -10
      kdecore/network/ksocketbuffer_p.h
  371. +10
    -10
      kdecore/network/ksocketdevice.cpp
  372. +8
    -8
      kdecore/network/ksocketdevice.h
  373. +7
    -7
      kdecore/network/ksockssocketdevice.cpp
  374. +6
    -6
      kdecore/network/ksockssocketdevice.h
  375. +6
    -6
      kdecore/network/ksrvresolverworker.cpp
  376. +5
    -4
      kdecore/network/ksrvresolverworker_p.h
  377. +2
    -2
      kdecore/network/kstreamsocket.cpp
  378. +1
    -0
      kdecore/network/kstreamsocket.h
  379. +14
    -14
      kdecore/svgicons/ksvgiconengine.cpp
  380. +46
    -46
      kdecore/svgicons/ksvgiconpainter.cpp
  381. +4
    -4
      kdecore/svgicons/ksvgiconpainter.h
  382. +1
    -1
      kdecore/tests/kcalendartest.cpp
  383. +1
    -1
      kdecore/tests/kconfigtestgui.cpp
  384. +1
    -1
      kdecore/tests/kconfigtestgui.h
  385. +1
    -1
      kdecore/tests/kipctest.h
  386. +14
    -14
      kdecore/tests/klocaletest.cpp
  387. +1
    -1
      kdecore/tests/klocaletest.h
  388. +3
    -3
      kdecore/tests/kmdcodectest.cpp
  389. +1
    -1
      kdecore/tests/kprocesstest.h
  390. +1
    -1
      kdecore/tests/kprociotest.h
  391. +4
    -4
      kdecore/tests/kresolvertest.cpp
  392. +1
    -1
      kdecore/tests/ktimezonestest.cpp
  393. +20
    -20
      kded/kbuildservicefactory.cpp
  394. +9
    -9
      kded/kbuildservicegroupfactory.cpp
  395. +20
    -20
      kded/kbuildservicetypefactory.cpp
  396. +37
    -37
      kded/kbuildsycoca.cpp
  397. +1
    -1
      kded/kbuildsycoca.h
  398. +13
    -13
      kded/kctimefactory.cpp
  399. +4
    -4
      kded/kctimefactory.h
  400. +1
    -1
      kded/kde-menu.cpp
  401. +9
    -9
      kded/kded.cpp
  402. +2
    -2
      kded/kded.h
  403. +2
    -2
      kded/kdedmodule.cpp
  404. +7
    -7
      kded/khostname.cpp
  405. +39
    -39
      kded/vfolder_menu.cpp
  406. +1
    -1
      kded/vfolder_menu.h
  407. +5
    -5
      kdefx/kdrawutil.cpp
  408. +1
    -1
      kdefx/kdrawutil.h
  409. +296
    -296
      kdefx/kimageeffect.cpp
  410. +24
    -24
      kdefx/kpixmap.cpp
  411. +1
    -1
      kdefx/kpixmap.h
  412. +2
    -2
      kdefx/kpixmapeffect.cpp
  413. +92
    -93
      kdefx/kstyle.cpp
  414. +26
    -25
      kdefx/kstyle.h
  415. +4
    -4
      kdeprint/cups/cupsaddsmb2.cpp
  416. +1
    -1
      kdeprint/cups/cupsdconf2/addressdialog.cpp
  417. +2
    -2
      kdeprint/cups/cupsdconf2/cupsdcomment.cpp
  418. +12
    -12
      kdeprint/cups/cupsdconf2/cupsdconf.cpp
  419. +1
    -1
      kdeprint/cups/cupsdconf2/cupsddialog.cpp
  420. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdpage.h
  421. +2
    -2
      kdeprint/cups/cupsdconf2/cupsdsplash.cpp
  422. +1
    -1
      kdeprint/cups/cupsdconf2/editlist.h
  423. +2
    -2
      kdeprint/cups/cupsdconf2/portdialog.cpp
  424. +1
    -1
      kdeprint/cups/cupsdconf2/qdirlineedit.h
  425. +1
    -1
      kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
  426. +1
    -1
      kdeprint/cups/cupsdconf2/qdirmultilineedit.h
  427. +1
    -1
      kdeprint/cups/cupsdconf2/sizewidget.cpp
  428. +1
    -1
      kdeprint/cups/cupsdconf2/sizewidget.h
  429. +2
    -2
      kdeprint/cups/cupsinfos.cpp
  430. +4
    -4
      kdeprint/cups/image.cpp
  431. +3
    -3
      kdeprint/cups/imageposition.cpp
  432. +2
    -2
      kdeprint/cups/imageposition.h
  433. +3
    -3
      kdeprint/cups/imagepreview.cpp
  434. +2
    -2
      kdeprint/cups/imagepreview.h
  435. +1
    -1
      kdeprint/cups/ippreportdlg.cpp
  436. +1
    -1
      kdeprint/cups/ipprequest.cpp
  437. +5
    -5
      kdeprint/cups/kcupsprinterimpl.cpp
  438. +1
    -1
      kdeprint/cups/kmcupsconfigwidget.h
  439. +4
    -4
      kdeprint/cups/kmcupsjobmanager.cpp
  440. +21
    -21
      kdeprint/cups/kmcupsmanager.cpp
  441. +1
    -1
      kdeprint/cups/kmpropusers.cpp
  442. +2
    -2
      kdeprint/cups/kmwbanners.cpp
  443. +2
    -2
      kdeprint/cups/kmwfax.cpp
  444. +1
    -1
      kdeprint/cups/kmwipp.cpp
  445. +3
    -3
      kdeprint/cups/kmwippprinter.cpp
  446. +3
    -3
      kdeprint/cups/kmwippselect.cpp
  447. +2
    -2
      kdeprint/cups/kmwother.cpp
  448. +2
    -2
      kdeprint/cups/kpimagepage.cpp
  449. +4
    -4
      kdeprint/cups/kptagspage.cpp
  450. +2
    -2
      kdeprint/cups/kptagspage.h
  451. +1
    -1
      kdeprint/cups/kptextpage.cpp
  452. +3
    -3
      kdeprint/driver.cpp
  453. +1
    -1
      kdeprint/driver.h
  454. +3
    -3
      kdeprint/driveritem.cpp
  455. +1
    -1
      kdeprint/driveritem.h
  456. +1
    -1
      kdeprint/driverview.h
  457. +2
    -2
      kdeprint/droptionview.h
  458. +1
    -1
      kdeprint/foomatic/kfoomaticprinterimpl.cpp
  459. +3
    -3
      kdeprint/foomatic/kmfoomaticmanager.cpp
  460. +3
    -3
      kdeprint/foomatic2loader.cpp
  461. +2
    -2
      kdeprint/kdeprintcheck.cpp
  462. +5
    -5
      kdeprint/kdeprintd.cpp
  463. +1
    -1
      kdeprint/kfilelist.cpp
  464. +2
    -2
      kdeprint/kfilelist.h
  465. +2
    -2
      kdeprint/kmdbentry.cpp
  466. +3
    -3
      kdeprint/kmfactory.cpp
  467. +1
    -1
      kdeprint/kmjob.cpp
  468. +2
    -2
      kdeprint/kmjobmanager.cpp
  469. +1
    -1
      kdeprint/kmjobmanager.h
  470. +2
    -2
      kdeprint/kmmanager.cpp
  471. +1
    -1
      kdeprint/kmmanager.h
  472. +1
    -1
      kdeprint/kmprinter.cpp
  473. +3
    -3
      kdeprint/kmspecialmanager.cpp
  474. +1
    -1
      kdeprint/kmspecialmanager.h
  475. +3
    -3
      kdeprint/kmthreadjob.cpp
  476. +1
    -1
      kdeprint/kmthreadjob.h
  477. +1
    -1
      kdeprint/kmuimanager.h
  478. +2
    -2
      kdeprint/kpcopiespage.cpp
  479. +6
    -6
      kdeprint/kpfilterpage.cpp
  480. +6
    -6
      kdeprint/kpgeneralpage.cpp
  481. +1
    -1
      kdeprint/kpipeprocess.h
  482. +2
    -2
      kdeprint/kpposterpage.cpp
  483. +6
    -6
      kdeprint/kpqtpage.cpp
  484. +17
    -17
      kdeprint/kprintaction.cpp
  485. +7
    -7
      kdeprint/kprintaction.h
  486. +4
    -4
      kdeprint/kprintdialog.cpp
  487. +1
    -1
      kdeprint/kprintdialogpage.h
  488. +6
    -6
      kdeprint/kprinter.cpp
  489. +3
    -3
      kdeprint/kprinterimpl.cpp
  490. +1
    -1
      kdeprint/kprinterimpl.h
  491. +1
    -1
      kdeprint/kprintpreview.cpp
  492. +6
    -6
      kdeprint/kxmlcommand.cpp
  493. +2
    -2
      kdeprint/kxmlcommand.h
  494. +2
    -2
      kdeprint/lpd/gschecker.cpp
  495. +1
    -1
      kdeprint/lpd/gschecker.h
  496. +1
    -1
      kdeprint/lpd/klpdprinterimpl.cpp
  497. +34
    -34
      kdeprint/lpd/kmlpdmanager.cpp
  498. +12
    -12
      kdeprint/lpd/lpdtools.cpp
  499. +2
    -2
      kdeprint/lpdunix/klpdunixprinterimpl.cpp
  500. +5
    -5
      kdeprint/lpdunix/kmlpdunixmanager.cpp

+ 5
- 5
KDE2PORTING.html View File

@ -18,7 +18,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<UL>
<LI><A HREF="#gettingstarted">Getting Started</A></LI>
<LI><A HREF="#general">Global changes</A></LI>
<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
<LI><A HREF="#autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></LI>
<LI><A HREF="#KApplication">KApplication</A></LI>
<LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
<LI><A HREF="#KLocale">KLocale</A></LI>
@ -95,12 +95,12 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<H3><A NAME="automoc">automoc/am_edit, Makefile.am tags</A></H3>
<H3><A NAME="autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></H3>
On the subject of the compilation framework, automoc has been removed from
On the subject of the compilation framework, autotqmoc has been removed from
the admin directory. It has been replaced by am_edit which provides a lot of
additional features.<P>
METASOURCES=AUTO still does the job of generating the appropriate moc files,
METASOURCES=AUTO still does the job of generating the appropriate tqmoc files,
but in addition, you should use KDE_ICON for the icons representing the application
(and naming those icons conforming to lo16-app-&lt;appname&gt;.png), and install
the application-specific icons under $(kde_datadir)/&lt;appname&gt;/pics.
@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
to klocale-&gt;translate with i18n.<P>
The return value of i18n is also no longer a const char*,
but a unicode TQString.<P>
but a tqunicode TQString.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>


+ 5
- 5
KDE3PORTING.html View File

@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.
<p>The API for Kicker panel applets and extensions has changed. Panels can now be
left/top, center, or right/bottom aligned, and applets and extensions may receive
notification about a change in alignment.
notification about a change in tqalignment.
<H4>KPanelApplet</H4>
<p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
Instead you should reimplement positionChange() and alignmentChange() to be
notified of changes in the position and alignment of the panel on which your applet
Instead you should reimplement positionChange() and tqalignmentChange() to be
notified of changes in the position and tqalignment of the panel on which your applet
resides. In addition, the popupDirection() method and the Direction enum are
deprecated. Instead you should use the position() method and Position enum. Applets that use
the deprecated methods will still work with KDE 3, but may not compile or work with
@ -661,8 +661,8 @@ a future version.
<H4>KPanelExtension</H4>
<p>There is a new method alignmentChange() that your extension should reimplement if
it needs to know about changes in alignment.
<p>There is a new method tqalignmentChange() that your extension should reimplement if
it needs to know about changes in tqalignment.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<p>


+ 1
- 1
arts/kde/kartsdispatcher.h View File

@ -61,7 +61,7 @@ namespace Arts
* }
* \endcode
*/
class KDE_EXPORT KArtsDispatcher : public QObject
class KDE_EXPORT KArtsDispatcher : public TQObject
{
Q_OBJECT
public:


+ 3
- 3
arts/kde/kartsserver.cpp View File

@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
X11CommConfig.sync();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data();
if(rt)
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
else
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );


+ 1
- 1
arts/kde/kartsserver.h View File

@ -34,7 +34,7 @@
* artsd on KDE startup, but at the very least there will always be third
* party PlayObjects that will crash. So, this is necessary.
*/
class KDE_ARTS_EXPORT KArtsServer : public QObject
class KDE_ARTS_EXPORT KArtsServer : public TQObject
{
Q_OBJECT


+ 1
- 1
arts/kde/kaudioconverter.h View File

@ -29,7 +29,7 @@
class KURL;
class TQString;
class KAudioConverter : public QObject
class KAudioConverter : public TQObject
{
Q_OBJECT
public:


+ 1
- 1
arts/kde/kaudiorecordstream.h View File

@ -38,7 +38,7 @@ namespace Arts { class StereoEffectStack; }
* @author Matthias Kretz <kretz@kde.org>
* @since 3.2
*/
class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject
{
Q_OBJECT


+ 1
- 1
arts/kde/kconverttest.h View File

@ -24,7 +24,7 @@
#include <tqobject.h>
class KConvertTest : public QObject
class KConvertTest : public TQObject
{
Q_OBJECT
public:


+ 2
- 2
arts/kde/kioinputstream_impl.cpp View File

@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
m_job = KIO::get(m_url, false, false);
m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
@ -213,7 +213,7 @@ void KIOInputStream_impl::processQueue()
void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
{
processQueue();
packet->size = std::min(m_packetSize, m_data.size());
packet->size = std::min(m_packetSize, (unsigned int)m_data.size());
kdDebug( 400 ) << "STREAMING: Filling one DataPacket with " << packet->size << " bytes of the stream!" << endl;
if (!m_finished) {


+ 4
- 4
arts/kde/kplayobject.cc View File

@ -65,7 +65,7 @@ void KPlayObject::halt()
TQString KPlayObject::description()
{
return TQString::fromLatin1(object().description().c_str());
return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KPlayObject::currentTime()
@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
TQString KPlayObject::mediaName()
{
return TQString::fromLatin1(object().mediaName().c_str());
return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KPlayObject::state()
@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
return TQString::fromLatin1(object().description().c_str());
return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KDE::PlayObject::currentTime()
@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
return TQString::fromLatin1(object().mediaName().c_str());
return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KDE::PlayObject::state()


+ 2
- 2
arts/kde/kplayobject.h View File

@ -27,7 +27,7 @@
#include <kurl.h>
#include <tqobject.h>
class KDE_EXPORT KPlayObject : public QObject
class KDE_EXPORT KPlayObject : public TQObject
{
Q_OBJECT
public:
@ -185,7 +185,7 @@ class PlayObjectFactory;
* internal state until the real Arts::PlayObject got created, afterwards
* the state of the Arts::PlayObject will be returned.
*/
class KDE_EXPORT PlayObject : public QObject
class KDE_EXPORT PlayObject : public TQObject
{
Q_OBJECT
public:


+ 1
- 1
arts/kde/kplayobjectcreator.h View File

@ -29,7 +29,7 @@
namespace KDE {
class PlayObjectCreator : public QObject
class PlayObjectCreator : public TQObject
{
Q_OBJECT
public:


+ 2
- 2
arts/kde/kplayobjectfactory.cc View File

@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
}
// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
{
// we rely on the delivered mimetype if it's a local file
d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );
@ -202,7 +202,7 @@ TQStringList KDE::PlayObjectFactory::mimeTypes(void)
for(vector<string>::iterator mimetype = mimetypes->begin();
mimetype != mimetypes->end(); ++mimetype)
{
TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace();
TQString name = TQString(TQString::fromLocal8Bit((*mimetype).c_str())).stripWhiteSpace();
if(KMimeType::mimeType(name))
results.append(name);
}


+ 1
- 1
arts/kde/kplayobjectfactory_p.h View File

@ -29,7 +29,7 @@ namespace KDE
/**
* @internal
*/
class POFHelper : public QObject
class POFHelper : public TQObject
{
friend class PlayObjectFactory;
Q_OBJECT


+ 9
- 9
arts/kde/kvideowidget.cpp View File

@ -92,8 +92,8 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
void KVideoWidget::init(void)
{
setMinimumSize(0, 0);
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
setFocusPolicy( ClickFocus );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
setFocusPolicy( TQ_ClickFocus );
fullscreenWidget = 0;
poVideo = Arts::VideoPlayObject::null();
@ -102,16 +102,16 @@ void KVideoWidget::init(void)
// Setup actions
new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
actionCollection(), "fullscreen_mode" );
new KRadioAction( i18n("&Half Size"), ALT+Key_0,
this, TQT_SLOT(halfSizeActivated()),
TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
actionCollection(), "half_size" );
new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
this, TQT_SLOT(normalSizeActivated()),
TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
actionCollection(), "normal_size" );
new KRadioAction( i18n("&Double Size"), ALT+Key_2,
this, TQT_SLOT(doubleSizeActivated()),
TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
actionCollection(), "double_size" );
((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
}
setBackgroundMode( PaletteBackground );
repaint();
tqrepaint();
// Resize GUI
videoWidth = 0;
@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
doubleSizeActivated();
}
TQSize KVideoWidget::sizeHint() const
TQSize KVideoWidget::tqsizeHint() const
{
return TQSize( videoWidth, videoHeight );
}
@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event )
emit mouseButtonPressed( event->button(), pos, event->state() );
// ### Remove in KDE4
if ( event->button() == RightButton )
if ( event->button() == Qt::RightButton )
emit rightButtonPressed( pos );
}


+ 1
- 1
arts/kde/kvideowidget.h View File

@ -36,7 +36,7 @@ public:
bool isNormalSize();
bool isDoubleSize();
TQSize sizeHint() const;
TQSize tqsizeHint() const;
virtual int heightForWidth ( int w ) const;


+ 7
- 7
arts/knotify/knotify.cpp View File

@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
if ( !event.isEmpty() ) {
// get config file
if ( d->events.contains( fromApp ) ) {
if ( d->events.tqcontains( fromApp ) ) {
eventsFile = d->events[fromApp];
} else {
eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
d->events.insert( fromApp, eventsFile );
}
if ( d->configs.contains( fromApp) ) {
if ( d->configs.tqcontains( fromApp) ) {
configFile = d->configs[fromApp];
} else {
configFile=new KConfig(fromApp+".eventsrc",true,false);
@ -550,7 +550,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
return false; // Skip
}
proc->clearArguments();
(*proc) << d->externalPlayer << TQFile::encodeName( soundFile );
(*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data();
d->externalPlayerEventId = eventId;
proc->start(KProcess::NotifyOnExit);
return true;
@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
// append msg
TQTextStream strm( &logFile );
strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
// close file
@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
TQTextStream strm( stderr, IO_WriteOnly );
// output msg
strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
return true;
@ -695,7 +695,7 @@ void KNotify::playTimeout()
++it;
if ( (*current)->state() != Arts::posPlaying )
{
TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
if ( eit != d->playObjectEventMap.end() )
{
soundFinished( *eit, PlayedOK );
@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
void KNotify::abortFirstPlayObject()
{
#ifndef WITHOUT_ARTS
TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
if ( it != d->playObjectEventMap.end() )
{
soundFinished( it.data(), Aborted );


+ 2
- 2
dcop/KDE-ICE/ICEmsg.h View File

@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
/*
* Write pad bytes. Used to force 32 or 64 bit alignment.
* Write pad bytes. Used to force 32 or 64 bit tqalignment.
* A maxium of 7 pad bytes can be specified.
*/
@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
/*
* Read pad bytes (for 32 or 64 bit alignment).
* Read pad bytes (for 32 or 64 bit tqalignment).
* A maxium of 7 pad bytes can be specified.
*/


+ 16
- 16
dcop/client/dcop.cpp View File

@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj )
int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );
TQString f = func; // Qt is better with tqunicode strings, so use one.
int left = f.tqfind( '(' );
int right = f.tqfind( ')' );
if ( right < left )
{
@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
return( 1 );
}
for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
int l = (*it).find( '(' );
int l = (*it).tqfind( '(' );
int s;
if (l > 0)
s = (*it).findRev( ' ', l);
s = (*it).tqfindRev( ' ', l);
else
s = (*it).find( ' ' );
s = (*it).tqfind( ' ' );
if ( s < 0 )
s = 0;
@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
if ( l > 0 && (*it).mid( s, l - s ) == func ) {
realfunc = (*it).mid( s );
const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
uint a = arguments.contains(',');
const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
uint a = arguments.tqcontains(',');
if ( (a==0 && !arguments.isEmpty()) || a>0)
a++;
if ( a == args.count() )
@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
return( 1 );
}
f = realfunc;
left = f.find( '(' );
right = f.find( ')' );
left = f.tqfind( '(' );
right = f.tqfind( ')' );
}
doit:
@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
TQString lt = (*it).simplifyWhiteSpace();
int s = lt.find(' ');
int s = lt.tqfind(' ');
// If there are spaces in the name, there may be two
// reasons: the parameter name is still there, ie.
@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
//
s=1;
while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
{
s++;
}
@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
QCStringList params;
DCOPClient *client = 0L;
int retval = 0;
if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
{
int delimPos = args[ 0 ].findRev( ',' );
int delimPos = args[ 0 ].tqfindRev( ',' );
if( delimPos == -1 )
{
cerr_ << "Error: '" << args[ 0 ]
@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
}
else if( !sessionName.isEmpty() )
{
if( sessions.contains( sessionName ) )
if( sessions.tqcontains( sessionName ) )
{
sessions.clear();
sessions.append( sessionName );
@ -861,7 +861,7 @@ int main( int argc, char** argv )
if (prog[prog.length()-1] != '*')
{
// Strip a trailing -<PID> part.
int i = prog.findRev('-');
int i = prog.tqfindRev('-');
if ((i >= 0) && prog.mid(i+1).toLong())
{
prog = prog.left(i);


+ 5
- 5
dcop/client/dcopfind.cpp View File

@ -40,9 +40,9 @@ static bool bLaunchApp = 0;
bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );
TQString f = func; // Qt is better with tqunicode strings, so use one.
int left = f.tqfind( '(' );
int right = f.tqfind( ')' );
if ( right < left )
{
@ -66,7 +66,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
TQString lt = (*it).simplifyWhiteSpace();
int s = lt.find(' ');
int s = lt.tqfind(' ');
// If there are spaces in the name, there may be two
// reasons: the parameter name is still there, ie.
@ -86,7 +86,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
//
s=1;
while (s < (int)partl.count() && intTypes.contains(partl[s]))
while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
{
s++;
}


+ 1
- 1
dcop/client/dcopstart.cpp View File

@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
void startApp(const char *_app, int argc, const char **args)
{
const char *function = 0;
TQString app = TQString::fromLatin1(_app);
TQString app = TQString::tqfromLatin1(_app);
if (app.endsWith(".desktop"))
function = "start_service_by_desktop_path(TQString,TQStringList)";
else


+ 20
- 20
dcop/client/marshall.cpp View File

@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
{
TQCString result;
if ( type == "int" || type == "Q_INT32" )
if ( type == "int" || type == "TQ_INT32" )
{
int i;
stream >> i;
result.setNum( i );
} else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" )
} else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" )
{
uint i;
stream >> i;
@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
double d;
stream >> d;
result.setNum( d, 'f' );
} else if ( type == "Q_INT64" ) {
Q_INT64 i;
} else if ( type == "TQ_INT64" ) {
TQ_INT64 i;
stream >> i;
result.sprintf( "%lld", i );
} else if ( type == "Q_UINT64" ) {
Q_UINT64 i;
} else if ( type == "TQ_UINT64" ) {
TQ_UINT64 i;
stream >> i;
result.sprintf( "%llu", i );
} else if ( type == "bool" )
@ -163,7 +163,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
{
TQColor c;
stream >> c;
result = c.name().local8Bit();
result = TQString(c.name()).local8Bit();
} else if ( type == "TQSize" )
{
TQSize s;
@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
} else if ( type == "TQVariant" )
{
Q_INT32 type;
TQ_INT32 type;
stream >> type;
return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) );
} else if ( type == "DCOPRef" )
@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
result = r.url().local8Bit();
} else if ( type.left( 11 ) == "TQValueList<" )
{
if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
return result;
TQString nestedType = type.mid( 11, type.length() - 12 );
@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
if ( nestedType.isEmpty() )
return result;
Q_UINT32 count;
TQ_UINT32 count;
stream >> count;
Q_UINT32 i = 0;
TQ_UINT32 i = 0;
for (; i < count; ++i )
{
TQCString arg = demarshal( stream, nestedType );
@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
}
} else if ( type.left( 5 ) == "TQMap<" )
{
int commaPos = type.find( ',', 5 );
int commaPos = type.tqfind( ',', 5 );
if ( commaPos == -1 )
return result;
if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
return result;
TQString keyType = type.mid( 5, commaPos - 5 );
TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
Q_UINT32 count;
TQ_UINT32 count;
stream >> count;
Q_UINT32 i = 0;
TQ_UINT32 i = 0;
for (; i < count; ++i )
{
TQCString key = demarshal( stream, keyType );
@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
arg << s.toUInt();
else if ( type == "unsigned int" )
arg << s.toUInt();
else if ( type == "Q_INT32" )
else if ( type == "TQ_INT32" )
arg << s.toInt();
else if ( type == "Q_INT64" ) {
else if ( type == "TQ_INT64" ) {
TQVariant qv = TQVariant( s );
arg << qv.toLongLong();
}
else if ( type == "Q_UINT32" )
else if ( type == "TQ_UINT32" )
arg << s.toUInt();
else if ( type == "Q_UINT64" ) {
else if ( type == "TQ_UINT64" ) {
TQVariant qv = TQVariant( s );
arg << qv.toULongLong();
}
@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
marshall( dummy_arg, args, j, type );
count++;
}
arg << (Q_UINT32) count;
arg << (TQ_UINT32) count;
// Parse the list for real
while (true) {
if( i > args.count() )


+ 62
- 62
dcop/dcopclient.cpp View File

@ -97,13 +97,13 @@ client_map_t *cliMap()
DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
{
return cliMap()->find(_appId.data());
return cliMap()->tqfind(_appId.data());
}
static
void registerLocalClient( const TQCString &_appId, DCOPClient *client )
{
cliMap()->replace(_appId.data(), client);
cliMap()->tqreplace(_appId.data(), client);
}
static
@ -141,7 +141,7 @@ public:
TQCString* replyType;
TQByteArray* replyData;
int replyId;
Q_INT32 transactionId;
TQ_INT32 transactionId;
TQCString calledApp;
TQGuardedPtr<TQObject> replyObject;
TQCString replySlot;
@ -173,7 +173,7 @@ public:
TQCString defaultObject;
TQPtrList<DCOPClientTransaction> *transactionList;
bool transaction;
Q_INT32 transactionId;
TQ_INT32 transactionId;
int opcode;
// Special key values:
@ -205,7 +205,7 @@ public:
class DCOPClientTransaction
{
public:
Q_INT32 id;
TQ_INT32 id;
CARD32 key;
TQCString senderId;
};
@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
disp = "NODISPLAY";
int i;
if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0)
if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
disp.truncate(i);
if (!old)
{
while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0)
disp[i] = '_';
}
@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
case DCOPReplyWait:
if ( replyStruct ) {
TQCString calledApp, app;
Q_INT32 id;
TQ_INT32 id;
TQDataStream ds( dataReceived, IO_ReadOnly );
ds >> calledApp >> app >> id;
replyStruct->transactionId = id;
@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
{
TQDataStream ds( dataReceived, IO_ReadOnly );
TQCString calledApp, app;
Q_INT32 id;
TQ_INT32 id;
ds >> calledApp >> app >> id;
if (replyStruct && (id == replyStruct->transactionId) && (calledApp == replyStruct->calledApp))
@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
TQByteArray reply;
TQDataStream replyStream( reply, IO_WriteOnly );
Q_INT32 id = c->transactionId();
TQ_INT32 id = c->transactionId();
if (id) {
// Call delayed. Send back the transaction ID.
replyStream << d->appId << fromApp << id;
@ -672,9 +672,9 @@ bool DCOPClient::attach()
void DCOPClient::bindToApp()
{
// check if we have a qApp instantiated. If we do,
// check if we have a tqApp instantiated. If we do,
// we can create a TQSocketNotifier and use it for receiving data.
if (qApp) {
if (tqApp) {
if ( d->notifier )
delete d->notifier;
d->notifier = new TQSocketNotifier(socket(),
@ -690,7 +690,7 @@ void DCOPClient::suspend()
if (!d->notifier)
return;
#endif
assert(d->notifier); // Suspending makes no sense if we didn't had a qApp yet
assert(d->notifier); // Suspending makes no sense if we didn't had a tqApp yet
d->notifier->setEnabled(false);
}
@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
DCOPAuthCount,
const_cast<char **>(DCOPAuthNames),
DCOPClientAuthProcs, 0L)) < 0) {
emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
return false;
}
@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
TQCString fName = dcopServerFile();
TQFile f(TQFile::decodeName(fName));
if (!f.open(IO_ReadOnly)) {
emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
return false;
}
int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
// Should we abort ?
}
contents[size] = '\0';
int pos = contents.find('\n');
int pos = contents.tqfind('\n');
if ( pos == -1 ) // Shouldn't happen
{
qDebug("Only one line in dcopserver file !: %s", contents.data());
@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
emit attachFailed(TQString::fromLatin1( errBuf ));
emit attachFailed(TQString::tqfromLatin1( errBuf ));
return false;
}
fcntl(socket(), F_SETFL, FD_CLOEXEC);
@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
emit attachFailed(TQString::fromLatin1( errBuf ));
emit attachFailed(TQString::tqfromLatin1( errBuf ));
return false;
} else if (setupstat == IceProtocolAlreadyActive) {
if (bClearServerAddr) {
@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
d->serverAddr = 0;
}
/* should not happen because 3rd arg to IceOpenConnection was 0. */
emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
return false;
}
@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
return false;
}
@ -1017,7 +1017,7 @@ TQCString DCOPClient::normalizeFunctionSignature( const TQCString& fun ) {
if ( fun.isEmpty() ) // nothing to do
return fun.copy();
TQCString result( fun.size() );
char *from = fun.data();
char *from = const_cast<TQCString&>(fun).data();
char *to = result.data();
char *first = to;
char last = 0;
@ -1056,7 +1056,7 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId,
if ( localClient ) {
bool saveTransaction = d->transaction;
Q_INT32 saveTransactionId = d->transactionId;
TQ_INT32 saveTransactionId = d->transactionId;
TQCString saveSenderId = d->senderId;
d->senderId = 0; // Local call
@ -1167,13 +1167,13 @@ bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj,
if ( (phase == 1) && localClient ) {
// In phase 1 we do all local clients
bool saveTransaction = d->transaction;
Q_INT32 saveTransactionId = d->transactionId;
TQ_INT32 saveTransactionId = d->transactionId;
TQCString saveSenderId = d->senderId;
d->senderId = 0; // Local call
result = localClient->find( remApp, remObj, remFun, data, replyType, replyData );
Q_INT32 id = localClient->transactionId();
TQ_INT32 id = localClient->transactionId();
if (id) {
// Call delayed. We have to wait till it has been processed.
do {
@ -1298,7 +1298,7 @@ void DCOPClient::setNotifications(bool enabled)
{
TQByteArray data;
TQDataStream ds(data, IO_WriteOnly);
ds << static_cast<Q_INT8>(enabled);
ds << static_cast<TQ_INT8>(enabled);
TQCString replyType;
TQByteArray reply;
@ -1310,7 +1310,7 @@ void DCOPClient::setDaemonMode( bool daemonMode )
{
TQByteArray data;
TQDataStream ds(data, IO_WriteOnly);
ds << static_cast<Q_INT8>( daemonMode );
ds << static_cast<TQ_INT8>( daemonMode );
TQCString replyType;
TQByteArray reply;