Browse Source

Finished remaining porting to new TQt API

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 10 years ago
parent
commit
bab4089069
417 changed files with 2873 additions and 3534 deletions
  1. +2
    -2
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  2. +1
    -0
      interfaces/ktexteditor/document.h
  3. +1
    -0
      interfaces/ktexteditor/editor.h
  4. +2
    -2
      interfaces/ktexteditor/editorchooser.cpp
  5. +3
    -3
      interfaces/ktexteditor/editorchooser_ui.ui
  6. +3
    -3
      interfaces/ktexteditor/templateinterface.cpp
  7. +1
    -1
      kabc/addresseedialog.cpp
  8. +3
    -3
      kabc/addresseehelper.cpp
  9. +3
    -3
      kabc/addresslineedit.cpp
  10. +2
    -2
      kabc/distributionlistdialog.cpp
  11. +2
    -2
      kabc/distributionlisteditor.cpp
  12. +3
    -3
      kabc/formats/binaryformat.cpp
  13. +3
    -3
      kabc/kab2kabc.cpp
  14. +1
    -1
      kabc/ldapclient.cpp
  15. +2
    -2
      kabc/ldapconfigwidget.cpp
  16. +3
    -2
      kabc/ldapconfigwidget.h
  17. +1
    -1
      kabc/ldapurl.cpp
  18. +2
    -2
      kabc/ldif.cpp
  19. +7
    -7
      kabc/ldifconverter.cpp
  20. +1
    -1
      kabc/plugins/dir/resourcedirconfig.cpp
  21. +1
    -1
      kabc/plugins/file/resourcefileconfig.cpp
  22. +24
    -24
      kabc/plugins/ldapkio/resourceldapkio.cpp
  23. +1
    -1
      kabc/plugins/ldapkio/resourceldapkioconfig.cpp
  24. +1
    -1
      kabc/plugins/net/resourcenetconfig.cpp
  25. +2
    -2
      kabc/resourceselectdialog.cpp
  26. +9
    -9
      kabc/scripts/addressee.src.cpp
  27. +40
    -40
      kabc/scripts/entrylist
  28. +2
    -2
      kabc/scripts/field.src.cpp
  29. +5
    -5
      kabc/scripts/makeaddressee
  30. +2
    -2
      kabc/vcard/ContentLine.cpp
  31. +6
    -6
      kabc/vcard/DateValue.cpp
  32. +1
    -1
      kabc/vcard/Entity.cpp
  33. +2
    -2
      kabc/vcard/Enum.cpp
  34. +2
    -2
      kabc/vcard/LangValue.cpp
  35. +1
    -1
      kabc/vcard/OrgValue.cpp
  36. +2
    -2
      kabc/vcard/Param.cpp
  37. +1
    -1
      kabc/vcard/TextListValue.cpp
  38. +2
    -2
      kabc/vcard/URIValue.cpp
  39. +2
    -2
      kabc/vcard/include/VCardAdrParam.h
  40. +4
    -4
      kabc/vcard/include/VCardContentLine.h
  41. +2
    -2
      kabc/vcard/include/VCardEmailParam.h
  42. +1
    -1
      kabc/vcard/include/VCardVCard.h
  43. +52
    -52
      kabc/vcard21parser.cpp
  44. +7
    -7
      kabc/vcardformatimpl.cpp
  45. +1
    -1
      kabc/vcardparser/vcardline.cpp
  46. +4
    -4
      kabc/vcardparser/vcardparser.cpp
  47. +21
    -21
      kabc/vcardtool.cpp
  48. +2
    -2
      kate/part/katearbitraryhighlight.cpp
  49. +7
    -7
      kate/part/kateautoindent.cpp
  50. +1
    -1
      kate/part/katebuffer.cpp
  51. +4
    -4
      kate/part/katecmds.cpp
  52. +9
    -9
      kate/part/katecodecompletion.cpp
  53. +1
    -1
      kate/part/katecodecompletion.h
  54. +3
    -3
      kate/part/katecodefoldinghelpers.cpp
  55. +1
    -1
      kate/part/katecodefoldinghelpers.h
  56. +4
    -4
      kate/part/katedialogs.cpp
  57. +16
    -16
      kate/part/katedocument.cpp
  58. +7
    -7
      kate/part/katefiletype.cpp
  59. +23
    -23
      kate/part/katehighlight.cpp
  60. +1
    -1
      kate/part/katejscript.cpp
  61. +3
    -3
      kate/part/kateprinter.cpp
  62. +2
    -2
      kate/part/katerenderer.cpp
  63. +9
    -9
      kate/part/kateschema.cpp
  64. +4
    -4
      kate/part/katesearch.cpp
  65. +1
    -1
      kate/part/katespell.cpp
  66. +4
    -4
      kate/part/katesupercursor.cpp
  67. +3
    -3
      kate/part/katetextline.cpp
  68. +98
    -98
      kate/part/kateview.cpp
  69. +8
    -8
      kate/part/kateviewhelpers.cpp
  70. +30
    -30
      kate/part/kateviewinternal.cpp
  71. +2
    -1
      kate/part/kateviewinternal.h
  72. +1
    -1
      kate/plugins/isearch/ISearchPlugin.cpp
  73. +1
    -1
      kate/plugins/kdatatool/kate_kdatatool.cpp
  74. +3
    -3
      kcert/kcertpart.cc
  75. +2
    -2
      kcmshell/main.cpp
  76. +10
    -10
      kdeprint/cups/cupsaddsmb2.cpp
  77. +6
    -6
      kdeprint/cups/cupsaddsmb2.h
  78. +3
    -3
      kdeprint/cups/cupsdconf2/addressdialog.cpp
  79. +2
    -2
      kdeprint/cups/cupsdconf2/addressdialog.h
  80. +6
    -6
      kdeprint/cups/cupsdconf2/browsedialog.cpp
  81. +2
    -2
      kdeprint/cups/cupsdconf2/browsedialog.h
  82. +7
    -7
      kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
  83. +3
    -3
      kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
  84. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdcomment.cpp
  85. +16
    -16
      kdeprint/cups/cupsdconf2/cupsdconf.cpp
  86. +8
    -8
      kdeprint/cups/cupsdconf2/cupsdconf.h
  87. +19
    -19
      kdeprint/cups/cupsdconf2/cupsddialog.cpp
  88. +1
    -1
      kdeprint/cups/cupsdconf2/cupsddirpage.cpp
  89. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
  90. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdfilterpage.h
  91. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdjobspage.cpp
  92. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdjobspage.h
  93. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdlogpage.cpp
  94. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdlogpage.h
  95. +3
    -3
      kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
  96. +2
    -2
      kdeprint/cups/cupsdconf2/cupsdnetworkpage.h
  97. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
  98. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdsecuritypage.h
  99. +4
    -4
      kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
  100. +3
    -3
      kdeprint/cups/cupsdconf2/cupsdserverpage.h
  101. +6
    -6
      kdeprint/cups/cupsdconf2/cupsdsplash.cpp
  102. +3
    -3
      kdeprint/cups/cupsdconf2/editlist.cpp
  103. +1
    -1
      kdeprint/cups/cupsdconf2/editlist.h
  104. +11
    -11
      kdeprint/cups/cupsdconf2/locationdialog.cpp
  105. +2
    -2
      kdeprint/cups/cupsdconf2/locationdialog.h
  106. +7
    -7
      kdeprint/cups/cupsdconf2/portdialog.cpp
  107. +3
    -3
      kdeprint/cups/cupsdconf2/portdialog.h
  108. +2
    -2
      kdeprint/cups/cupsdconf2/qdirlineedit.cpp
  109. +2
    -2
      kdeprint/cups/cupsdconf2/qdirlineedit.h
  110. +8
    -8
      kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
  111. +1
    -1
      kdeprint/cups/cupsdconf2/qdirmultilineedit.h
  112. +5
    -5
      kdeprint/cups/cupsinfos.cpp
  113. +4
    -4
      kdeprint/cups/cupsinfos.h
  114. +2
    -2
      kdeprint/cups/imageposition.cpp
  115. +1
    -1
      kdeprint/cups/imagepreview.cpp
  116. +9
    -9
      kdeprint/cups/ippreportdlg.cpp
  117. +9
    -9
      kdeprint/cups/ipprequest.cpp
  118. +9
    -9
      kdeprint/cups/kcupsprinterimpl.cpp
  119. +1
    -1
      kdeprint/cups/kmconfigcupsdir.cpp
  120. +1
    -1
      kdeprint/cups/kmconfigcupsdir.h
  121. +11
    -11
      kdeprint/cups/kmcupsconfigwidget.cpp
  122. +2
    -2
      kdeprint/cups/kmcupsconfigwidget.h
  123. +16
    -16
      kdeprint/cups/kmcupsjobmanager.cpp
  124. +45
    -45
      kdeprint/cups/kmcupsmanager.cpp
  125. +4
    -4
      kdeprint/cups/kmpropbanners.cpp
  126. +2
    -2
      kdeprint/cups/kmpropbanners.h
  127. +4
    -4
      kdeprint/cups/kmpropquota.cpp
  128. +3
    -3
      kdeprint/cups/kmpropquota.h
  129. +4
    -4
      kdeprint/cups/kmpropusers.cpp
  130. +1
    -1
      kdeprint/cups/kmpropusers.h
  131. +9
    -9
      kdeprint/cups/kmwbanners.cpp
  132. +2
    -2
      kdeprint/cups/kmwbanners.h
  133. +4
    -4
      kdeprint/cups/kmwfax.cpp
  134. +1
    -1
      kdeprint/cups/kmwipp.cpp
  135. +12
    -12
      kdeprint/cups/kmwippprinter.cpp
  136. +3
    -3
      kdeprint/cups/kmwippprinter.h
  137. +4
    -4
      kdeprint/cups/kmwippselect.cpp
  138. +4
    -4
      kdeprint/cups/kmwother.cpp
  139. +1
    -1
      kdeprint/cups/kmwother.h
  140. +5
    -5
      kdeprint/cups/kmwquota.cpp
  141. +4
    -4
      kdeprint/cups/kmwquota.h
  142. +7
    -7
      kdeprint/cups/kmwusers.cpp
  143. +1
    -1
      kdeprint/cups/kmwusers.h
  144. +6
    -6
      kdeprint/cups/kphpgl2page.cpp
  145. +1
    -1
      kdeprint/cups/kphpgl2page.h
  146. +21
    -21
      kdeprint/cups/kpimagepage.cpp
  147. +2
    -2
      kdeprint/cups/kpimagepage.h
  148. +11
    -11
      kdeprint/cups/kpschedulepage.cpp
  149. +4
    -4
      kdeprint/cups/kpschedulepage.h
  150. +8
    -8
      kdeprint/cups/kptagspage.cpp
  151. +1
    -1
      kdeprint/cups/kptagspage.h
  152. +13
    -13
      kdeprint/cups/kptextpage.cpp
  153. +3
    -3
      kdeprint/cups/kptextpage.h
  154. +6
    -6
      kdeprint/driver.cpp
  155. +1
    -1
      kdeprint/driver.h
  156. +2
    -2
      kdeprint/driverview.cpp
  157. +15
    -15
      kdeprint/droptionview.cpp
  158. +8
    -8
      kdeprint/droptionview.h
  159. +4
    -4
      kdeprint/foomatic2loader.cpp
  160. +1
    -0
      kdeprint/foomatic2loader.h
  161. +1
    -1
      kdeprint/fooparser.cpp
  162. +6
    -6
      kdeprint/fooparser.y
  163. +1
    -1
      kdeprint/kdeprintcheck.cpp
  164. +9
    -9
      kdeprint/kdeprintd.cpp
  165. +9
    -9
      kdeprint/kfilelist.cpp
  166. +1
    -1
      kdeprint/kfilelist.h
  167. +9
    -9
      kdeprint/kmdbentry.h
  168. +10
    -10
      kdeprint/kmfactory.cpp
  169. +7
    -7
      kdeprint/kmfactory.h
  170. +5
    -5
      kdeprint/kmmanager.cpp
  171. +1
    -1
      kdeprint/kmprinter.cpp
  172. +17
    -17
      kdeprint/kmprinter.h
  173. +3
    -3
      kdeprint/kmspecialmanager.cpp
  174. +5
    -5
      kdeprint/kmthreadjob.cpp
  175. +1
    -1
      kdeprint/kmuimanager.cpp
  176. +10
    -10
      kdeprint/kmvirtualmanager.cpp
  177. +13
    -13
      kdeprint/kpcopiespage.cpp
  178. +6
    -6
      kdeprint/kpcopiespage.h
  179. +1
    -1
      kdeprint/kpdriverpage.cpp
  180. +3
    -3
      kdeprint/kpfileselectpage.cpp
  181. +19
    -19
      kdeprint/kpfilterpage.cpp
  182. +3
    -3
      kdeprint/kpfilterpage.h
  183. +40
    -39
      kdeprint/kpgeneralpage.cpp
  184. +5
    -5
      kdeprint/kpgeneralpage.h
  185. +4
    -4
      kdeprint/kpmarginpage.cpp
  186. +1
    -1
      kdeprint/kpposterpage.cpp
  187. +17
    -17
      kdeprint/kpqtpage.cpp
  188. +3
    -3
      kdeprint/kpqtpage.h
  189. +26
    -26
      kdeprint/kprintdialog.cpp
  190. +8
    -8
      kdeprint/kprinter.cpp
  191. +1
    -1
      kdeprint/kprinter.h
  192. +27
    -27
      kdeprint/kprinterimpl.cpp
  193. +1
    -1
      kdeprint/kprinterpropertydialog.cpp
  194. +2
    -2
      kdeprint/kprinterpropertydialog.h
  195. +8
    -8
      kdeprint/kprintpreview.cpp
  196. +2
    -2
      kdeprint/kprintprocess.cpp
  197. +41
    -41
      kdeprint/kxmlcommand.cpp
  198. +46
    -46
      kdeprint/lpdunix/kmlpdunixmanager.cpp
  199. +20
    -20
      kdeprint/lpr/apshandler.cpp
  200. +6
    -6
      kdeprint/lpr/editentrydialog.cpp
  201. +8
    -8
      kdeprint/lpr/editentrydialog.h
  202. +3
    -3
      kdeprint/lpr/kmconfiglpr.cpp
  203. +1
    -1
      kdeprint/lpr/kmconfiglpr.h
  204. +1
    -1
      kdeprint/lpr/kmlprjobmanager.cpp
  205. +15
    -15
      kdeprint/lpr/kmlprmanager.cpp
  206. +1
    -1
      kdeprint/lpr/kmlprmanager.h
  207. +15
    -15
      kdeprint/lpr/lpchelper.cpp
  208. +1
    -1
      kdeprint/lpr/lpchelper.h
  209. +5
    -5
      kdeprint/lpr/lpqhelper.cpp
  210. +1
    -1
      kdeprint/lpr/lpqhelper.h
  211. +7
    -7
      kdeprint/lpr/lprhandler.cpp
  212. +2
    -2
      kdeprint/lpr/lprhandler.h
  213. +28
    -28
      kdeprint/lpr/lprngtoolhandler.cpp
  214. +2
    -2
      kdeprint/lpr/lprngtoolhandler.h
  215. +8
    -8
      kdeprint/lpr/lprsettings.cpp
  216. +40
    -40
      kdeprint/lpr/matichandler.cpp
  217. +2
    -2
      kdeprint/lpr/matichandler.h
  218. +2
    -2
      kdeprint/lpr/matichelper.cpp
  219. +1
    -1
      kdeprint/lpr/printcapentry.cpp
  220. +7
    -7
      kdeprint/lpr/printcapentry.h
  221. +2
    -2
      kdeprint/lpr/printcapreader.cpp
  222. +13
    -13
      kdeprint/management/cjanuswidget.cpp
  223. +4
    -4
      kdeprint/management/cjanuswidget.h
  224. +3
    -3
      kdeprint/management/kiconselectaction.cpp
  225. +4
    -4
      kdeprint/management/kmconfigcommand.cpp
  226. +2
    -2
      kdeprint/management/kmconfigdialog.cpp
  227. +12
    -12
      kdeprint/management/kmconfigfilter.cpp
  228. +2
    -2
      kdeprint/management/kmconfigfilter.h
  229. +19
    -19
      kdeprint/management/kmconfigfonts.cpp
  230. +2
    -2
      kdeprint/management/kmconfigfonts.h
  231. +10
    -10
      kdeprint/management/kmconfiggeneral.cpp
  232. +3
    -3
      kdeprint/management/kmconfiggeneral.h
  233. +3
    -3
      kdeprint/management/kmconfigjobs.cpp
  234. +4
    -4
      kdeprint/management/kmconfigpreview.cpp
  235. +1
    -1
      kdeprint/management/kmconfigpreview.h
  236. +7
    -7
      kdeprint/management/kmdbcreator.cpp
  237. +1
    -1
      kdeprint/management/kmdbcreator.h
  238. +12
    -12
      kdeprint/management/kmdriverdb.cpp
  239. +14
    -14
      kdeprint/management/kmdriverdbwidget.cpp
  240. +7
    -7
      kdeprint/management/kmdriverdbwidget.h
  241. +1
    -1
      kdeprint/management/kmiconview.cpp
  242. +8
    -8
      kdeprint/management/kminfopage.cpp
  243. +3
    -3
      kdeprint/management/kminfopage.h
  244. +23
    -23
      kdeprint/management/kminstancepage.cpp
  245. +14
    -14
      kdeprint/management/kmjobviewer.cpp
  246. +5
    -5
      kdeprint/management/kmjobviewer.h
  247. +1
    -1
      kdeprint/management/kmlistview.cpp
  248. +28
    -28
      kdeprint/management/kmmainview.cpp
  249. +3
    -3
      kdeprint/management/kmmainview.h
  250. +1
    -1
      kdeprint/management/kmprinterview.cpp
  251. +4
    -4
      kdeprint/management/kmpropbackend.cpp
  252. +2
    -2
      kdeprint/management/kmpropbackend.h
  253. +3
    -3
      kdeprint/management/kmpropcontainer.cpp
  254. +1
    -1
      kdeprint/management/kmpropcontainer.h
  255. +5
    -5
      kdeprint/management/kmpropdriver.cpp
  256. +3
    -3
      kdeprint/management/kmpropdriver.h
  257. +1
    -1
      kdeprint/management/kmpropertypage.cpp
  258. +4
    -4
      kdeprint/management/kmpropgeneral.cpp
  259. +3
    -3
      kdeprint/management/kmpropgeneral.h
  260. +3
    -3
      kdeprint/management/kmpropmembers.cpp
  261. +1
    -1
      kdeprint/management/kmpropmembers.h
  262. +14
    -14
      kdeprint/management/kmspecialprinterdlg.cpp
  263. +4
    -4
      kdeprint/management/kmspecialprinterdlg.h
  264. +5
    -5
      kdeprint/management/kmwbackend.cpp
  265. +2
    -2
      kdeprint/management/kmwbackend.h
  266. +10
    -10
      kdeprint/management/kmwclass.cpp
  267. +1
    -1
      kdeprint/management/kmwdriver.cpp
  268. +4
    -4
      kdeprint/management/kmwdriverselect.cpp
  269. +1
    -1
      kdeprint/management/kmwdriverselect.h
  270. +12
    -12
      kdeprint/management/kmwdrivertest.cpp
  271. +5
    -5
      kdeprint/management/kmwdrivertest.h
  272. +5
    -5
      kdeprint/management/kmwend.cpp
  273. +1
    -1
      kdeprint/management/kmwend.h
  274. +6
    -6
      kdeprint/management/kmwfile.cpp
  275. +2
    -2
      kdeprint/management/kmwinfobase.cpp
  276. +1
    -1
      kdeprint/management/kmwinfobase.h
  277. +2
    -2
      kdeprint/management/kmwinfopage.cpp
  278. +6
    -6
      kdeprint/management/kmwizard.cpp
  279. +3
    -3
      kdeprint/management/kmwizard.h
  280. +13
    -13
      kdeprint/management/kmwlocal.cpp
  281. +3
    -3
      kdeprint/management/kmwlocal.h
  282. +5
    -5
      kdeprint/management/kmwpassword.cpp
  283. +9
    -9
      kdeprint/management/kmwsmb.cpp
  284. +1
    -1
      kdeprint/management/kmwsmb.h
  285. +8
    -8
      kdeprint/management/kmwsocket.cpp
  286. +1
    -1
      kdeprint/management/kmwsocket.h
  287. +14
    -14
      kdeprint/management/kmwsocketutil.cpp
  288. +3
    -3
      kdeprint/management/kmwsocketutil.h
  289. +89
    -89
      kdeprint/management/kxmlcommanddlg.cpp
  290. +14
    -14
      kdeprint/management/kxmlcommanddlg.h
  291. +18
    -18
      kdeprint/management/kxmlcommandselector.cpp
  292. +5
    -5
      kdeprint/management/kxmlcommandselector.h
  293. +12
    -12
      kdeprint/management/networkscanner.cpp
  294. +2
    -2
      kdeprint/management/networkscanner.h
  295. +16
    -16
      kdeprint/management/smbview.cpp
  296. +4
    -4
      kdeprint/management/smbview.h
  297. +10
    -10
      kdeprint/marginpreview.cpp
  298. +1
    -1
      kdeprint/marginpreview.h
  299. +1
    -1
      kdeprint/marginwidget.cpp
  300. +2
    -2
      kdeprint/marginwidget.h
  301. +1
    -1
      kdeprint/messagewindow.cpp
  302. +6
    -6
      kdeprint/plugincombobox.cpp
  303. +3
    -3
      kdeprint/plugincombobox.h
  304. +4
    -4
      kdeprint/posterpreview.cpp
  305. +1
    -1
      kdeprint/ppdloader.cpp
  306. +1
    -1
      kdeprint/ppdparser.cpp
  307. +1
    -1
      kdeprint/ppdparser.y
  308. +2
    -2
      kdeprint/ppdscanner.cpp
  309. +2
    -2
      kdeprint/ppdscanner.l
  310. +3
    -3
      kdeprint/printerfilter.h
  311. +1
    -1
      kdeprint/rlpr/kmconfigproxy.cpp
  312. +3
    -3
      kdeprint/rlpr/kmproprlpr.cpp
  313. +2
    -2
      kdeprint/rlpr/kmproprlpr.h
  314. +4
    -4
      kdeprint/rlpr/kmproxywidget.cpp
  315. +3
    -3
      kdeprint/rlpr/kmproxywidget.h
  316. +10
    -10
      kdeprint/rlpr/kmrlprmanager.cpp
  317. +1
    -1
      kdeprint/rlpr/kmrlprmanager.h
  318. +22
    -22
      kdeprint/rlpr/kmwrlpr.cpp
  319. +1
    -1
      kdeprint/rlpr/kmwrlpr.h
  320. +24
    -24
      kdeprint/tools/escputil/escpwidget.cpp
  321. +3
    -3
      kdeprint/tools/escputil/escpwidget.h
  322. +2
    -2
      kdeprint/treecombobox.cpp
  323. +2
    -2
      kdeprint/treecombobox.h
  324. +1
    -1
      kdeprint/util.cpp
  325. +15
    -15
      kdewidgets/kde.widgets
  326. +1
    -1
      kdewidgets/makekdewidgets.cpp
  327. +3
    -3
      khtml/css/css_stylesheetimpl.cpp
  328. +3
    -3
      khtml/css/css_valueimpl.cpp
  329. +6
    -6
      khtml/css/csshelper.cpp
  330. +8
    -8
      khtml/css/cssstyleselector.cpp
  331. +7
    -7
      khtml/ecma/kjs_binding.cpp
  332. +1
    -1
      khtml/ecma/kjs_binding.h
  333. +23
    -23
      khtml/ecma/kjs_debugwin.cpp
  334. +1
    -1
      khtml/ecma/kjs_dom.cpp
  335. +1
    -1
      khtml/ecma/kjs_events.cpp
  336. +2
    -2
      khtml/ecma/kjs_navigator.cpp
  337. +9
    -9
      khtml/ecma/kjs_window.cpp
  338. +3
    -3
      khtml/ecma/xmlhttprequest.cpp
  339. +0
    -685
      khtml/html/html_elementimpl.cpp
  340. +14
    -8
      khtml/html/html_formimpl.cpp
  341. +10
    -10
      khtml/html/html_inlineimpl.cpp
  342. +11
    -11
      khtml/htmlpageinfo.ui
  343. +2
    -2
      khtml/java/kjavaappletserver.cpp
  344. +1
    -1
      khtml/java/kjavaappletviewer.cpp
  345. +2
    -2
      khtml/java/kjavaappletwidget.cpp
  346. +1
    -1
      khtml/java/kjavaappletwidget.h
  347. +1
    -1
      khtml/java/kjavaprocess.cpp
  348. +13
    -13
      khtml/khtml_ext.cpp
  349. +1
    -1
      khtml/khtml_factory.cpp
  350. +2
    -2
      khtml/khtml_pagecache.cpp
  351. +79
    -79
      khtml/khtml_part.cpp
  352. +1
    -1
      khtml/khtml_printsettings.cpp
  353. +3
    -3
      khtml/khtml_printsettings.h
  354. +2
    -2
      khtml/khtml_settings.cc
  355. +1
    -1
      khtml/khtml_settings.h
  356. +4
    -4
      khtml/khtmldefaults.h
  357. +68
    -64
      khtml/khtmlview.cpp
  358. +8
    -8
      khtml/kjserrordlg.ui
  359. +2
    -2
      khtml/kmultipart/kmultipart.cpp
  360. +1
    -1
      khtml/misc/knsplugininstaller.cpp
  361. +18
    -18
      khtml/misc/loader.cpp
  362. +4
    -4
      khtml/misc/loader_jpeg.cpp
  363. +1
    -1
      khtml/rendering/font.cpp
  364. +1
    -1
      khtml/rendering/render_box.cpp
  365. +5
    -5
      khtml/rendering/render_canvas.cpp
  366. +22
    -22
      khtml/rendering/render_form.cpp
  367. +1
    -1
      khtml/rendering/render_form.h
  368. +2
    -2
      khtml/rendering/render_frames.cpp
  369. +2
    -2
      khtml/rendering/render_frames.h
  370. +1
    -1
      khtml/rendering/render_generated.cpp
  371. +3
    -3
      khtml/rendering/render_image.cpp
  372. +3
    -3
      khtml/rendering/render_layer.cpp
  373. +9
    -9
      khtml/rendering/render_list.cpp
  374. +6
    -6
      khtml/rendering/render_object.cpp
  375. +42
    -42
      khtml/rendering/render_replaced.cpp
  376. +1
    -1
      khtml/rendering/render_table.cpp
  377. +6
    -6
      khtml/rendering/render_text.cpp
  378. +1
    -1
      khtml/rendering/render_text.h
  379. +8
    -8
      khtml/xml/dom2_eventsimpl.cpp
  380. +4
    -4
      khtml/xml/dom2_eventsimpl.h
  381. +5
    -5
      khtml/xml/dom_docimpl.cpp
  382. +4
    -4
      khtml/xml/dom_nodeimpl.cpp
  383. +3
    -3
      khtml/xml/dom_restyler.cpp
  384. +3
    -3
      khtml/xml/dom_stringimpl.cpp
  385. +1
    -1
      khtml/xml/xml_tokenizer.cpp
  386. +9
    -9
      kinit/autostart.cpp
  387. +6
    -6
      kinit/kdostartupconfig.cpp
  388. +10
    -10
      kinit/kinit.cpp
  389. +5
    -5
      kinit/klauncher.cpp
  390. +17
    -17
      kmdi/kmdi/dockcontainer.cpp
  391. +4
    -4
      kmdi/kmdi/guiclient.cpp
  392. +2
    -2
      kmdi/kmdi/mainwindow.cpp
  393. +10
    -10
      kmdi/kmdi/tabwidget.cpp
  394. +1
    -1
      kmdi/kmdi/toolviewaccessor.cpp
  395. +11
    -7
      kmdi/kmdichildarea.cpp
  396. +56
    -56
      kmdi/kmdichildfrm.cpp
  397. +2
    -2
      kmdi/kmdichildfrm.h
  398. +6
    -6
      kmdi/kmdichildfrmcaption.cpp
  399. +17
    -17
      kmdi/kmdichildview.cpp
  400. +1
    -1
      kmdi/kmdichildview.h
  401. +20
    -20
      kmdi/kmdidockcontainer.cpp
  402. +3
    -3
      kmdi/kmdifocuslist.cpp
  403. +1
    -1
      kmdi/kmdifocuslist.h
  404. +4
    -4
      kmdi/kmdiguiclient.cpp
  405. +10
    -10
      kmdi/kmdimainfrm.cpp
  406. +1
    -1
      kmdi/kmdimainfrm.h
  407. +10
    -6
      kmdi/kmditaskbar.cpp
  408. +1
    -1
      kmdi/kmditoolviewaccessor.cpp
  409. +1
    -1
      kparts/componentfactory.h
  410. +1
    -1
      krandr/ktimerdialog.cpp
  411. +8
    -8
      krandr/randr.h
  412. +1
    -1
      kspell2/broker.cpp
  413. +2
    -2
      kspell2/plugins/ispell/ispell_checker.cpp
  414. +3
    -3
      kspell2/settings.cpp
  415. +6
    -6
      kspell2/ui/configui.ui
  416. +13
    -13
      kspell2/ui/dialog.cpp
  417. +16
    -16
      kspell2/ui/kspell2ui.ui

+ 2
- 2
interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp View File

@ -25,7 +25,7 @@ protected:
{
Q_UNUSED(className);
Q_UNUSED(args);
return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name );
return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
}
};
@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate
public:
KFileAudioPreviewPrivate( TQWidget *parent )
{
player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString::null, parent );
player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
}
~KFileAudioPreviewPrivate()


+ 1
- 0
interfaces/ktexteditor/document.h View File

@ -33,6 +33,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
friend class PrivateDocument;
Q_OBJECT
TQ_OBJECT
public:
Document ( TQObject *parent = 0, const char *name = 0 );


+ 1
- 0
interfaces/ktexteditor/editor.h View File

@ -41,6 +41,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
friend class PrivateEditor;
Q_OBJECT
TQ_OBJECT
public:
/**


+ 2
- 2
interfaces/ktexteditor/editorchooser.cpp View File

@ -57,7 +57,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
{
if ((*it)->desktopEntryName().contains(editor))
{
d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name()));
d->chooser->editorCombo->insertItem(TQString(i18n("System Default (%1)").arg((*it)->name())));
break;
}
}
@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
else
{
int idx=d->elements.findIndex(editor);
int idx=d->elements.tqfindIndex(editor);
idx=idx+1;
d->chooser->editorCombo->setCurrentItem(idx);
}


+ 3
- 3
interfaces/ktexteditor/editorchooser_ui.ui View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditorChooser_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>EditorChooser</cstring>
</property>
@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@ -44,7 +44,7 @@
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<property name="name">
<cstring>editorCombo</cstring>
</property>


+ 3
- 3
interfaces/ktexteditor/templateinterface.cpp View File

@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
KABC::StdAddressBook *addrBook = 0;
KABC::Addressee userAddress;
TQDateTime datetime = TQDateTime::tqcurrentDateTime();
TQDate date = datetime.date();
TQTime time = datetime.time();
TQDate date = TQT_TQDATE_OBJECT(datetime.date());
TQTime time = TQT_TQTIME_OBJECT(datetime.time());
TQMap<TQString,TQString>::Iterator it;
for ( it = map.begin(); it != map.end(); ++it )
@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
}
}
TQString placeholder = rx.cap( 1 );
if ( ! enhancedInitValues.contains( placeholder ) )
if ( ! enhancedInitValues.tqcontains( placeholder ) )
enhancedInitValues[ placeholder ] = "";
pos += rx.matchedLength();


+ 1
- 1
kabc/addresseedialog.cpp View File

@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
topLayout->addLayout( selectedLayout );
topLayout->setSpacing( spacingHint() );
TQGroupBox *selectedGroup = new TQGroupBox( 1, Horizontal, i18n("Selected"),
TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"),
topWidget );
selectedLayout->addWidget( selectedGroup );


+ 3
- 3
kabc/addresseehelper.cpp View File

@ -92,17 +92,17 @@ void AddresseeHelper::initSettings()
bool AddresseeHelper::containsTitle( const TQString& title ) const
{
return mTitles.tqfind( title ) != mTitles.end();
return mTitles.find( title ) != mTitles.end();
}
bool AddresseeHelper::containsPrefix( const TQString& prefix ) const
{
return mPrefixes.tqfind( prefix ) != mPrefixes.end();
return mPrefixes.find( prefix ) != mPrefixes.end();
}
bool AddresseeHelper::containsSuffix( const TQString& suffix ) const
{
return mSuffixes.tqfind( suffix ) != mSuffixes.end();
return mSuffixes.find( suffix ) != mSuffixes.end();
}
bool AddresseeHelper::tradeAsFamilyName() const


+ 3
- 3
kabc/addresslineedit.cpp View File

@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e )
{
if (m_useCompletion && (e->button() == MidButton))
if (m_useCompletion && (e->button() == Qt::MidButton))
{
m_smartPaste = true;
KLineEdit::mouseReleaseEvent(e);
@ -293,7 +293,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
TQString prevAddr;
TQString s(text());
int n = s.findRev(',');
int n = s.tqfindRev(',');
if (n >= 0)
{
@ -465,7 +465,7 @@ void AddressLineEdit::startLoadingLDAPEntries()
TQString s( *s_LDAPText );
// TODO cache last?
TQString prevAddr;
int n = s.findRev(',');
int n = s.tqfindRev(',');
if (n>= 0)
{
prevAddr = s.left(n+1) + ' ';


+ 2
- 2
kabc/distributionlistdialog.cpp View File

@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString &curren
TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame );
topLayout->addWidget( mButtonGroup );
@ -100,7 +100,7 @@ TQString EmailSelector::getEmail( const TQStringList &emails, const TQString &cu
return result;
}
class EntryItem : public QListViewItem
class EntryItem : public TQListViewItem
{
public:
EntryItem( TQListView *parent, const Addressee &addressee,


+ 2
- 2
kabc/distributionlisteditor.cpp View File

@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString
TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame );
mButtonGroup->setRadioButtonExclusive( true );
topLayout->addWidget( mButtonGroup );
@ -80,7 +80,7 @@ TQString EmailSelectDialog::getEmail( const TQStringList &emails, const TQString
return result;
}
class EditEntryItem : public QListViewItem
class EditEntryItem : public TQListViewItem
{
public:
EditEntryItem( TQListView *parent, const Addressee &addressee,


+ 3
- 3
kabc/formats/binaryformat.cpp View File

@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
}
// set real number of entries
stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
stream.tqdevice()->at( 2 * sizeof( TQ_UINT32 ) );
stream << counter;
}
@ -140,12 +140,12 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const
}
if ( magic != 0x2e93e ) {
kdError() << i18n("File '%1' is not binary format.").arg( file->name() ) << endl;
kdError() << TQString(i18n("File '%1' is not binary format.").arg( file->name() )) << endl;
return false;
}
if ( version != BINARY_FORMAT_VERSION ) {
kdError() << i18n("File '%1' is the wrong version.").arg( file->name() ) << endl;
kdError() << TQString(i18n("File '%1' is the wrong version.").arg( file->name() )) << endl;
return false;
}


+ 3
- 3
kabc/kab2kabc.cpp View File

@ -58,7 +58,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
TQString comment;
if ( entry.at( entry.length() -1 ) == ')' ) {
int br = entry.findRev( '(' );
int br = entry.tqfindRev( '(' );
if ( br >= 0 ) {
comment = entry.mid( br + 1, entry.length() - br - 2 );
entry.truncate( br );
@ -68,7 +68,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
}
}
int posSpace = entry.findRev( ' ' );
int posSpace = entry.tqfindRev( ' ' );
if ( posSpace < 0 ) {
email = entry;
if ( !comment.isEmpty() ) {
@ -91,7 +91,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
}
if ( name.at( name.length() -1 ) == ')' ) {
int br = name.findRev( '(' );
int br = name.tqfindRev( '(' );
if ( br >= 0 ) {
comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
name.truncate( br );


+ 1
- 1
kabc/ldapclient.cpp View File

@ -408,7 +408,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
}
LdapResult sr;
sr.clientNumber = mClients.findIndex( (*it1).client );
sr.clientNumber = mClients.tqfindIndex( (*it1).client );
sr.name = name;
sr.email = mail;
resList.append( sr );


+ 2
- 2
kabc/ldapconfigwidget.cpp View File

@ -607,8 +607,8 @@ void LdapConfigWidget::setFlags( int flags )
// First delete all the child widgets.
// FIXME: I hope it's correct
const TQObjectList *ch = children();
TQObjectList ch2 = *ch;
const TQObjectList ch = childrenListObject();
TQObjectList ch2 = ch;
TQObject *obj;
TQWidget *widget;


+ 3
- 2
kabc/ldapconfigwidget.h View File

@ -50,7 +50,8 @@ namespace KABC {
class KABC_EXPORT LdapConfigWidget : public TQWidget
{
Q_OBJECT
Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
TQ_OBJECT
TQ_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
Q_PROPERTY( TQString user READ user WRITE setUser )
Q_PROPERTY( TQString password READ password WRITE setPassword )
Q_PROPERTY( TQString bindDN READ bindDN WRITE setBindDN )
@ -69,7 +70,7 @@ namespace KABC {
Q_PROPERTY( bool authSASL READ isAuthSASL WRITE setAuthSASL )
Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
Q_PROPERTY( int timeLimit READ timeLimit WRITE setTimeLimit )
Q_SETS ( LCW_Flags )
TQ_SETS ( LCW_Flags )
public:


+ 1
- 1
kabc/ldapurl.cpp View File

@ -58,7 +58,7 @@ void LDAPUrl::setDn( const TQString &dn)
bool LDAPUrl::hasExtension( const TQString &key ) const
{
return m_extensions.contains( key );
return m_extensions.tqcontains( key );
}
LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const


+ 2
- 2
kabc/ldif.cpp View File

@ -178,7 +178,7 @@ bool LDIF::splitControl( const TQCString &line, TQString &oid, bool &critical,
critical = false;
bool url = splitLine( line, tmp, value );
kdDebug(5700) << "splitControl: value: " << TQString::fromUtf8(value, value.size()) << endl;
kdDebug(5700) << "splitControl: value: " << TQString(TQString::fromUtf8(value, value.size())) << endl;
if ( tmp.isEmpty() ) {
tmp = TQString::fromUtf8( value, value.size() );
value.resize( 0 );
@ -211,7 +211,7 @@ LDIF::ParseVal LDIF::processLine()
if ( attrLower == "version" ) {
if ( !mDn.isEmpty() ) retval = Err;
} else if ( attrLower == "dn" ) {
kdDebug(5700) << "ldapentry dn: " << TQString::fromUtf8( mVal, mVal.size() ) << endl;
kdDebug(5700) << "ldapentry dn: " << TQString(TQString::fromUtf8( mVal, mVal.size() )) << endl;
mDn = TQString::fromUtf8( mVal, mVal.size() );
mModType = Mod_None;
retval = NewEntry;


+ 7
- 7
kabc/ldifconverter.cpp View File

@ -87,11 +87,11 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
const Address workAddr = addr.address( Address::Work );
ldif_out( t, "dn", TQString( "cn=%1,mail=%2" )
.arg( addr.formattedName().simplifyWhiteSpace() )
.arg( TQString(addr.formattedName()).simplifyWhiteSpace() )
.arg( addr.preferredEmail() ) );
ldif_out( t, "givenname", addr.givenName() );
ldif_out( t, "sn", addr.familyName() );
ldif_out( t, "cn", addr.formattedName().simplifyWhiteSpace() );
ldif_out( t, "cn", TQString(addr.formattedName()).simplifyWhiteSpace() );
ldif_out( t, "uid", addr.uid() );
ldif_out( t, "nickname", addr.nickName() );
ldif_out( t, "xmozillanickname", addr.nickName() );
@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
ldif_out( t, "homeurl", addr.url().prettyURL() );
ldif_out( t, "description", addr.note() );
if (addr.revision().isValid())
ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) );
ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) );
t << "objectclass: top\n";
t << "objectclass: person\n";
@ -271,7 +271,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
}
if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 )
if ( a.emails().tqfindIndex( value ) == -1 )
a.insertEmail( value );
return true;
}
@ -489,8 +489,8 @@ addComment:
if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
return true;
kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
.arg(a.formattedName()).arg(fieldname).arg(value);
kdWarning() << TQString(TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
.arg(a.formattedName()).arg(fieldname).arg(value));
return true;
}
@ -554,7 +554,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
}
// generate the new string and split it to 72 chars/line
TQCString txt = (formatStr.arg(value)).utf8();
TQCString txt = TQString(formatStr.arg(value)).utf8();
if (allowEncode) {
len = txt.length();


+ 1
- 1
kabc/plugins/dir/resourcedirconfig.cpp View File

@ -82,7 +82,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
return;
}
mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
mFileNameEdit->setURL( resource->path() );
if ( mFileNameEdit->url().isEmpty() )


+ 1
- 1
kabc/plugins/file/resourcefileconfig.cpp View File

@ -86,7 +86,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res )
return;
}
mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
mFileNameEdit->setURL( resource->fileName() );
if ( mFileNameEdit->url().isEmpty() )


+ 24
- 24
kabc/plugins/ldapkio/resourceldapkio.cpp View File

@ -122,8 +122,8 @@ ResourceLDAPKIO::~ResourceLDAPKIO()
void ResourceLDAPKIO::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
dummy.setFocusPolicy( TQWidget::NoFocus );
TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy);
tqApp->enter_loop();
qt_leave_modal(&dummy);
@ -308,7 +308,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
}
tmp += "\n";
kdDebug(7125) << "ldif: " << TQString::fromUtf8(tmp) << endl;
kdDebug(7125) << "ldif: " << TQString(TQString::fromUtf8(tmp)) << endl;
ldif = tmp;
return true;
}
@ -330,49 +330,49 @@ void ResourceLDAPKIO::init()
handle them in the load() method below.
These are the default values
*/
if ( !mAttributes.contains("objectClass") )
if ( !mAttributes.tqcontains("objectClass") )
mAttributes.insert( "objectClass", "inetOrgPerson" );
if ( !mAttributes.contains("commonName") )
if ( !mAttributes.tqcontains("commonName") )
mAttributes.insert( "commonName", "cn" );
if ( !mAttributes.contains("formattedName") )
if ( !mAttributes.tqcontains("formattedName") )
mAttributes.insert( "formattedName", "displayName" );
if ( !mAttributes.contains("familyName") )
if ( !mAttributes.tqcontains("familyName") )
mAttributes.insert( "familyName", "sn" );
if ( !mAttributes.contains("givenName") )
if ( !mAttributes.tqcontains("givenName") )
mAttributes.insert( "givenName", "givenName" );
if ( !mAttributes.contains("mail") )
if ( !mAttributes.tqcontains("mail") )
mAttributes.insert( "mail", "mail" );
if ( !mAttributes.contains("mailAlias") )
if ( !mAttributes.tqcontains("mailAlias") )
mAttributes.insert( "mailAlias", "" );
if ( !mAttributes.contains("phoneNumber") )
if ( !mAttributes.tqcontains("phoneNumber") )
mAttributes.insert( "phoneNumber", "homePhone" );
if ( !mAttributes.contains("telephoneNumber") )
if ( !mAttributes.tqcontains("telephoneNumber") )
mAttributes.insert( "telephoneNumber", "telephoneNumber" );
if ( !mAttributes.contains("facsimileTelephoneNumber") )
if ( !mAttributes.tqcontains("facsimileTelephoneNumber") )
mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" );
if ( !mAttributes.contains("mobile") )
if ( !mAttributes.tqcontains("mobile") )
mAttributes.insert( "mobile", "mobile" );
if ( !mAttributes.contains("pager") )
if ( !mAttributes.tqcontains("pager") )
mAttributes.insert( "pager", "pager" );
if ( !mAttributes.contains("description") )
if ( !mAttributes.tqcontains("description") )
mAttributes.insert( "description", "description" );
if ( !mAttributes.contains("title") )
if ( !mAttributes.tqcontains("title") )
mAttributes.insert( "title", "title" );
if ( !mAttributes.contains("street") )
if ( !mAttributes.tqcontains("street") )
mAttributes.insert( "street", "street" );
if ( !mAttributes.contains("state") )
if ( !mAttributes.tqcontains("state") )
mAttributes.insert( "state", "st" );
if ( !mAttributes.contains("city") )
if ( !mAttributes.tqcontains("city") )
mAttributes.insert( "city", "l" );
if ( !mAttributes.contains("organization") )
if ( !mAttributes.tqcontains("organization") )
mAttributes.insert( "organization", "o" );
if ( !mAttributes.contains("postalcode") )
if ( !mAttributes.tqcontains("postalcode") )
mAttributes.insert( "postalcode", "postalCode" );
if ( !mAttributes.contains("uid") )
if ( !mAttributes.tqcontains("uid") )
mAttributes.insert( "uid", "uid" );
if ( !mAttributes.contains("jpegPhoto") )
if ( !mAttributes.tqcontains("jpegPhoto") )
mAttributes.insert( "jpegPhoto", "jpegPhoto" );
d->mLDAPUrl = KURL();


+ 1
- 1
kabc/plugins/ldapkio/resourceldapkioconfig.cpp View File

@ -281,7 +281,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
for ( i = 1; i < mMapCombo->count(); i++ ) {
TQDictIterator<KLineEdit> it2( mLineEditDict );
for ( ; it2.current(); ++it2 ) {
if ( mMapList[ i ].contains( it2.currentKey() ) ) {
if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) {
if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
} else {
if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break;


+ 1
- 1
kabc/plugins/net/resourcenetconfig.cpp View File

@ -79,7 +79,7 @@ void ResourceNetConfig::loadSettings( KRES::Resource *res )
return;
}
mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
mUrlEdit->setURL( resource->url().url() );
}


+ 2
- 2
kabc/resourceselectdialog.cpp View File

@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
KButtonBox *buttonBox = new KButtonBox( this );
buttonBox->addStretch();
buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) );
buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) );
buttonBox->layout();
mainLayout->addWidget( buttonBox );


+ 9
- 9
kabc/scripts/addressee.src.cpp View File

@ -212,11 +212,11 @@ void Addressee::setNameFromString( const TQString &s )
setName( str );
// clear all name parts
setPrefix( TQString::null );
setGivenName( TQString::null );
setAdditionalName( TQString::null );
setFamilyName( TQString::null );
setSuffix( TQString::null );
setPrefix( TQString() );
setGivenName( TQString() );
setAdditionalName( TQString() );
setFamilyName( TQString() );
setSuffix( TQString() );
if ( str.isEmpty() )
return;
@ -391,7 +391,7 @@ TQString Addressee::fullEmail( const TQString &email ) const
} else {
e = email;
}
if ( e.isEmpty() ) return TQString::null;
if ( e.isEmpty() ) return TQString();
TQString text;
if ( realName().isEmpty() )
@ -444,7 +444,7 @@ void Addressee::removeEmail( const TQString &email )
TQString Addressee::preferredEmail() const
{
if ( mData->emails.count() == 0 ) return TQString::null;
if ( mData->emails.count() == 0 ) return TQString();
else return mData->emails.first();
}
@ -755,7 +755,7 @@ void Addressee::insertCategory( const TQString &c )
detach();
mData->empty = false;
if ( mData->categories.findIndex( c ) != -1 ) return;
if ( mData->categories.tqfindIndex( c ) != -1 ) return;
mData->categories.append( c );
}
@ -772,7 +772,7 @@ void Addressee::removeCategory( const TQString &c )
bool Addressee::hasCategory( const TQString &c ) const
{
return ( mData->categories.findIndex( c ) != -1 );
return ( mData->categories.tqfindIndex( c ) != -1 );
}
void Addressee::setCategories( const TQStringList &c )


+ 40
- 40
kabc/scripts/entrylist View File

@ -13,64 +13,64 @@
# Field Category : Categories the field belongs to (see Field::FieldCategory).
# Output function: Function used to convert type to string for debug output (optional)
ALE,name,,QString,name
ALE,name,,TQString,name
ALFE,formatted name,,QString,formattedName,Frequent
ALFE,formatted name,,TQString,formattedName,Frequent
ALFE,family name,,QString,familyName,Frequent
ALFE,given name,,QString,givenName,Frequent
ALFE,additional names,,QString,additionalName
ALFE,honorific prefixes,,QString,prefix
ALFE,honorific suffixes,,QString,suffix
ALFE,family name,,TQString,familyName,Frequent
ALFE,given name,,TQString,givenName,Frequent
ALFE,additional names,,TQString,additionalName
ALFE,honorific prefixes,,TQString,prefix
ALFE,honorific suffixes,,TQString,suffix
ALFE,nick name,,QString,nickName,Personal
ALFE,nick name,,TQString,nickName,Personal
ALFE,birthday,,QDateTime,birthday,Personal,.toString()
ALFE,birthday,,TQDateTime,birthday,Personal,.toString()
#Address address
LF,home address street,,QString,homeAddressStreet,Address|Personal
LF,home address city,,QString,homeAddressLocality,Address|Personal
LF,home address state,,QString,homeAddressRegion,Address|Personal
LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
LF,home address country,,QString,homeAddressCountry,Address|Personal
LF,home address label,,QString,homeAddressLabel,Address|Personal
LF,business address street,,QString,businessAddressStreet,Address|Organization
LF,business address city,,QString,businessAddressLocality,Address|Organization
LF,business address state,,QString,businessAddressRegion,Address|Organization
LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization
LF,business address country,,QString,businessAddressCountry,Address|Organization
LF,business address label,,QString,businessAddressLabel,Address|Organization
LF,home address street,,TQString,homeAddressStreet,Address|Personal
LF,home address city,,TQString,homeAddressLocality,Address|Personal
LF,home address state,,TQString,homeAddressRegion,Address|Personal
LF,home address zip code,,TQString,homeAddressPostalCode,Address|Personal
LF,home address country,,TQString,homeAddressCountry,Address|Personal
LF,home address label,,TQString,homeAddressLabel,Address|Personal
LF,business address street,,TQString,businessAddressStreet,Address|Organization
LF,business address city,,TQString,businessAddressLocality,Address|Organization
LF,business address state,,TQString,businessAddressRegion,Address|Organization
LF,business address zip code,,TQString,businessAddressPostalCode,Address|Organization
LF,business address country,,TQString,businessAddressCountry,Address|Organization
LF,business address label,,TQString,businessAddressLabel,Address|Organization
#phoneNumbers
LF,home phone,,QString,homePhone,Personal|Frequent
LF,business phone,,QString,businessPhone,Organization|Frequent
LF,mobile phone,,QString,mobilePhone,Frequent
LF,home fax,,QString,homeFax
LF,business fax,,QString,businessFax
LF,car phone,,QString,carPhone
LF,ISDN,,QString,isdn
LF,pager,,QString,pager
LF,home phone,,TQString,homePhone,Personal|Frequent
LF,business phone,,TQString,businessPhone,Organization|Frequent
LF,mobile phone,,TQString,mobilePhone,Frequent
LF,home fax,,TQString,homeFax
LF,business fax,,TQString,businessFax
LF,car phone,,TQString,carPhone
LF,ISDN,,TQString,isdn
LF,pager,,TQString,pager
#emails
LF,email address,,QString,email,Email|Frequent
LF,email address,,TQString,email,Email|Frequent
ALFE,mail client,,QString,mailer,Email
ALFE,mail client,,TQString,mailer,Email
ALE,time zone,,TimeZone,timeZone,,.asString()
ALE,geographic position,,Geo,geo,,.asString()
ALFE,title,person,QString,title,Organization
ALFE,role,person in organization,QString,role,Organization
ALFE,organization,,QString,organization,Organization
ALFE,department,,QString,department,Organization
ALFE,title,person,TQString,title,Organization
ALFE,role,person in organization,TQString,role,Organization
ALFE,organization,,TQString,organization,Organization
ALFE,department,,TQString,department,Organization
ALFE,note,,QString,note
ALFE,note,,TQString,note
ALE,product identifier,,QString,productId
ALE,revision date,,QDateTime,revision,,.toString()
ALE,product identifier,,TQString,productId
ALE,revision date,,TQDateTime,revision,,.toString()
ALE,sort string,,QString,sortString
ALE,sort string,,TQString,sortString
ALF,homepage,,KURL,url,,.url()


+ 2
- 2
kabc/scripts/field.src.cpp View File

@ -344,7 +344,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
return true;
}
case FieldImpl::Birthday:
a.setBirthday( TQDate::fromString( value, Qt::ISODate ) );
a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) );
return true;
case FieldImpl::CustomField:
a.insertCustom( mImpl->app(), mImpl->key(), value );
@ -360,7 +360,7 @@ TQString Field::sortKey( const KABC::Addressee &a )
--CASEVALUE--
case FieldImpl::Birthday:
if ( a.birthday().isValid() ) {
TQDate date = a.birthday().date();
TQDate date = TQT_TQDATE_OBJECT(a.birthday().date());
TQString key;
key.sprintf( "%02d-%02d", date.month(), date.day() );
return key;


+ 5
- 5
kabc/scripts/makeaddressee View File

@ -55,7 +55,7 @@ if (!open( H_OUT, ">../addressee.h" ) ) {
print H_OUT " /**\n";
print H_OUT " Return translated label for $entryNames[$i] field.\n";
print H_OUT " */\n";
print H_OUT " static QString $entryNames[$i]Label();\n\n";
print H_OUT " static TQString $entryNames[$i]Label();\n\n";
}
} else {
print H_OUT;
@ -100,7 +100,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
$labelwords[$j] = ucfirst $labelwords[$j];
}
$label = join ' ', @labelwords;
print CPP_OUT "QString Addressee::$entryNames[$i]Label()\n{\n";
print CPP_OUT "TQString Addressee::$entryNames[$i]Label()\n{\n";
if ( $entryComments[$i] ) {
print CPP_OUT " return i18n(\"$entryComments[$i]\",\"$label\");\n";
} else {
@ -112,7 +112,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] =~ /E/ ) {
if ( $entryNames[$i] !~ "revision" ) {
if ( $entryTypes[$i] =~ "QString" ) {
if ( $entryTypes[$i] =~ "TQString" ) {
print CPP_OUT " if ( mData->$entryNames[$i] != a.mData->$entryNames[$i] &&\n";
print CPP_OUT " !( mData->$entryNames[$i].isEmpty() && a.mData->$entryNames[$i].isEmpty() ) ) {\n";
print CPP_OUT " kdDebug(5700) << \"$entryNames[$i] differs\" << endl;\n";
@ -184,7 +184,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] !~ /A/ ) { next; }
if ( $entryCtrl[$i] !~ /F/ ) { next; }
if ( $entryTypes[$i] ne "QString" ) { next; }
if ( $entryTypes[$i] ne "TQString" ) { next; }
print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
print CPP_OUT " return a.$entryNames[$i]();\n";
}
@ -192,7 +192,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] !~ /A/ ) { next; }
if ( $entryCtrl[$i] !~ /F/ ) { next; }
if ( $entryTypes[$i] ne "QString" ) { next; }
if ( $entryTypes[$i] ne "TQString" ) { next; }
print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
print CPP_OUT " a.set" . ucfirst($entryNames[$i]) . "( value );\n";
print CPP_OUT " return true;\n";


+ 2
- 2
kabc/vcard/ContentLine.cpp View File

@ -140,7 +140,7 @@ ContentLine::_parse()
vDebug("parse");
// Unqote newlines
strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
strRep_ = strRep_.tqreplace( TQRegExp( "\\\\n" ), "\n" );
int split = strRep_.tqfind(':');
@ -275,7 +275,7 @@ ContentLine::_assemble()
}
// Quote newlines
line = line.replace( TQRegExp( "\n" ), "\\n" );
line = line.tqreplace( TQRegExp( "\n" ), "\\n" );
// Fold lines longer than 72 chars
const int maxLen = 72;


+ 6
- 6
kabc/vcard/DateValue.cpp View File

@ -173,7 +173,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// DATE
dateStr.replace(TQRegExp("-"), "");
dateStr.tqreplace(TQRegExp("-"), "");
kdDebug(5710) << "dateStr: " << dateStr << endl;
@ -208,7 +208,7 @@ DateValue::_parse()
//////////////////////////////////////////////////// SECOND FRACTION
int secFracSep = timeStr.findRev(',');
int secFracSep = timeStr.tqfindRev(',');
if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
@ -217,7 +217,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// HMS
timeStr.replace(TQRegExp(":"), "");
timeStr.tqreplace(TQRegExp(":"), "");
hour_ = timeStr.left(2).toInt();
minute_ = timeStr.mid(2, 2).toInt();
@ -398,7 +398,7 @@ DateValue::setZoneMinute(unsigned int i)
assembled_ = false;
}
QDate
TQDate
DateValue::qdate()
{
parse();
@ -406,7 +406,7 @@ DateValue::qdate()
return d;
}
QTime
TQTime
DateValue::qtime()
{
parse();
@ -415,7 +415,7 @@ DateValue::qtime()
return t;
}
QDateTime
TQDateTime
DateValue::qdt()
{
parse();


+ 1
- 1
kabc/vcard/Entity.cpp View File

@ -99,7 +99,7 @@ Entity::~Entity()
// empty
}
QCString
TQCString
Entity::asString()
{
// vDebug("Entity::asString()");


+ 2
- 2
kabc/vcard/Enum.cpp View File

@ -31,7 +31,7 @@ using namespace VCARD;
// There are 31 possible types, not including extensions.
// URI is a custom field designed to store the upstream URI for each contact
// in order to handle certain limited CardDAV systems such as Zimbra
const QCString
const TQCString
VCARD::paramNames [] =
{
"NAME",
@ -228,7 +228,7 @@ VCARD::EntityTypeToValueType(EntityType e)
return t;
}
QCString
TQCString
VCARD::EntityTypeToParamName(EntityType e)
{
if ( e > EntityUnknown ) e = EntityUnknown;


+ 2
- 2
kabc/vcard/LangValue.cpp View File

@ -97,14 +97,14 @@ LangValue::_assemble()
strRep_ += TQCString('-') + it.current();
}
QCString
TQCString
LangValue::primary()
{
parse();
return primary_;
}
QStrList
TQStrList
LangValue::subtags()
{
parse();


+ 1
- 1
kabc/vcard/OrgValue.cpp View File

@ -98,7 +98,7 @@ OrgValue::numValues()
return valueList_.count();
}
QCString
TQCString
OrgValue::value(unsigned int i)
{
parse();


+ 2
- 2
kabc/vcard/Param.cpp View File

@ -116,13 +116,13 @@ Param::setValue(const TQCString & value)
assembled_ = false;
}
QCString
TQCString
Param::name()
{
return name_;
}
QCString
TQCString
Param::value()
{
return value_;


+ 1
- 1
kabc/vcard/TextListValue.cpp View File

@ -98,7 +98,7 @@ TextListValue::numValues()
return valueList_.count();
}
QCString
TQCString
TextListValue::value(unsigned int i)
{
parse();


+ 2
- 2
kabc/vcard/URIValue.cpp View File

@ -103,14 +103,14 @@ URIValue::_assemble()
strRep_ = scheme_ + ':' + schemeSpecificPart_;
}
QCString
TQCString
URIValue::scheme()
{
parse();
return scheme_;
}
QCString
TQCString
URIValue::schemeSpecificPart()
{
parse();


+ 2
- 2
kabc/vcard/include/VCardAdrParam.h View File

@ -56,8 +56,8 @@ class KVCARD_EXPORT AdrParam : public Param
private:
QStrList adrTypeList_;
QCString textParam_;
TQStrList adrTypeList_;
TQCString textParam_;
};
}


+ 4
- 4
kabc/vcard/include/VCardContentLine.h View File

@ -39,8 +39,8 @@ class KVCARD_EXPORT ContentLine : public Entity
#include "ContentLine-generated.h"
QCString group() { parse(); return group_; }
QCString name() { parse(); return name_; }
TQCString group() { parse(); return group_; }
TQCString name() { parse(); return name_; }
Value * value() { parse(); return value_; }
ParamList paramList() { parse(); return paramList_; }
ParamType paramType() { parse(); return paramType_; }
@ -63,8 +63,8 @@ class KVCARD_EXPORT ContentLine : public Entity
private:
QCString group_;
QCString name_;
TQCString group_;
TQCString name_;
TQPtrList<Param> paramList_;
Value * value_;


+ 2
- 2
kabc/vcard/include/VCardEmailParam.h View File

@ -36,7 +36,7 @@ class KVCARD_EXPORT EmailParam : public Param
#include "EmailParam-generated.h"
QCString emailType() { parse(); return emailType_; }
TQCString emailType() { parse(); return emailType_; }
bool pref() { parse(); return pref_; }
void