Browse Source

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 10 years ago
parent
commit
cc74f360bb
  1. 10
      doc/ksplashml/index.docbook
  2. 2
      drkonqi/debugger.cpp
  3. 6
      drkonqi/krashconf.cpp
  4. 2
      kate/app/kateapp.cpp
  5. 2
      kate/app/kateapp.h
  6. 4
      kate/app/kateconfigdialog.cpp
  7. 8
      kate/app/katedocmanager.cpp
  8. 8
      kate/app/katedocmanager.h
  9. 8
      kate/app/kateexternaltools.cpp
  10. 2
      kate/app/kateexternaltools.h
  11. 6
      kate/app/katefilelist.cpp
  12. 4
      kate/app/katefilelist.h
  13. 10
      kate/app/katefileselector.cpp
  14. 6
      kate/app/katefileselector.h
  15. 4
      kate/app/kategrepdialog.h
  16. 2
      kate/app/katemain.h
  17. 14
      kate/app/katemainwindow.cpp
  18. 8
      kate/app/katemainwindow.h
  19. 10
      kate/app/katemdi.cpp
  20. 10
      kate/app/katemdi.h
  21. 18
      kate/app/katesession.cpp
  22. 4
      kate/app/katesession.h
  23. 4
      kate/app/kateviewmanager.cpp
  24. 6
      kate/app/kateviewmanager.h
  25. 4
      kate/app/kateviewspace.cpp
  26. 6
      kate/app/kateviewspace.h
  27. 8
      kate/app/kateviewspacecontainer.cpp
  28. 10
      kate/app/kateviewspacecontainer.h
  29. 20
      kate/app/kwritemain.cpp
  30. 12
      kate/app/kwritemain.h
  31. 2
      kcminit/main.cpp
  32. 6
      kcontrol/TODO
  33. 8
      kcontrol/access/kaccess.cpp
  34. 14
      kcontrol/access/kcmaccess.cpp
  35. 2
      kcontrol/access/kcmaccess.h
  36. 8
      kcontrol/accessibility/accessibility.cpp
  37. 2
      kcontrol/accessibility/accessibilityconfigwidget.ui
  38. 16
      kcontrol/arts/arts.cpp
  39. 4
      kcontrol/arts/arts.h
  40. 2
      kcontrol/background/bgadvanced.cpp
  41. 4
      kcontrol/background/bgdialog.cpp
  42. 2
      kcontrol/background/bgdialog.h
  43. 6
      kcontrol/background/bgrender.cpp
  44. 8
      kcontrol/background/bgrender.h
  45. 6
      kcontrol/background/bgsettings.cpp
  46. 12
      kcontrol/background/bgsettings.h
  47. 4
      kcontrol/background/main.cpp
  48. 6
      kcontrol/background/main.h
  49. 14
      kcontrol/bell/bell.cpp
  50. 2
      kcontrol/bell/bell.h
  51. 4
      kcontrol/clock/dtime.cpp
  52. 2
      kcontrol/clock/main.cpp
  53. 2
      kcontrol/clock/main.h
  54. 2
      kcontrol/clock/tzone.cpp
  55. 20
      kcontrol/colors/colorscm.cpp
  56. 4
      kcontrol/colors/colorscm.h
  57. 2
      kcontrol/colors/widgetcanvas.cpp
  58. 30
      kcontrol/componentchooser/componentchooser.cpp
  59. 22
      kcontrol/componentchooser/componentchooser.h
  60. 4
      kcontrol/componentchooser/kcm_componentchooser.cpp
  61. 2
      kcontrol/componentchooser/kcm_componentchooser.h
  62. 8
      kcontrol/crypto/crypto.cpp
  63. 6
      kcontrol/crypto/crypto.h
  64. 8
      kcontrol/css/kcmcss.cpp
  65. 2
      kcontrol/css/kcmcss.h
  66. 12
      kcontrol/display/display.cpp
  67. 4
      kcontrol/display/display.h
  68. 6
      kcontrol/displayconfig/displayconfig.cpp
  69. 10
      kcontrol/displayconfig/displayconfig.h
  70. 2
      kcontrol/dnssd/configdialog.ui
  71. 4
      kcontrol/dnssd/kcmdnssd.cpp
  72. 2
      kcontrol/ebrowsing/filteropts.cpp
  73. 2
      kcontrol/ebrowsing/filteropts.h
  74. 14
      kcontrol/ebrowsing/main.cpp
  75. 4
      kcontrol/ebrowsing/main.h
  76. 6
      kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
  77. 2
      kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
  78. 2
      kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
  79. 2
      kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
  80. 2
      kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
  81. 4
      kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
  82. 2
      kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
  83. 12
      kcontrol/energy/energy.cpp
  84. 6
      kcontrol/energy/energy.h
  85. 2
      kcontrol/filetypes/control.cpp
  86. 2
      kcontrol/filetypes/filetypesview.cpp
  87. 2
      kcontrol/filetypes/filetypesview.h
  88. 20
      kcontrol/filetypes/typeslistitem.cpp
  89. 2
      kcontrol/filetypes/typeslistitem.h
  90. 16
      kcontrol/fonts/fonts.cpp
  91. 2
      kcontrol/fonts/fonts.h
  92. 2
      kcontrol/hwmanager/hwmanager.cpp
  93. 6
      kcontrol/hwmanager/hwmanager.h
  94. 2
      kcontrol/iccconfig/iccconfig.cpp
  95. 6
      kcontrol/iccconfig/iccconfig.h
  96. 6
      kcontrol/icons/icons.cpp
  97. 6
      kcontrol/icons/icons.h
  98. 12
      kcontrol/icons/iconthemes.cpp
  99. 2
      kcontrol/icons/iconthemes.h
  100. 2
      kcontrol/icons/main.cpp
  101. 6
      kcontrol/icons/main.h
  102. 4
      kcontrol/info/info.cpp
  103. 2
      kcontrol/info/info.h
  104. 6
      kcontrol/info/info_netbsd.cpp
  105. 26
      kcontrol/info/main.cpp
  106. 2
      kcontrol/info/memory.cpp
  107. 2
      kcontrol/info/memory.h
  108. 10
      kcontrol/input/core/themepage.cpp
  109. 2
      kcontrol/input/logitechmouse.cpp
  110. 2
      kcontrol/input/logitechmouse.h
  111. 4
      kcontrol/input/main.cpp
  112. 16
      kcontrol/input/mouse.cpp
  113. 6
      kcontrol/input/mouse.h
  114. 12
      kcontrol/input/xcursor/themepage.cpp
  115. 16
      kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
  116. 10
      kcontrol/ioslaveinfo/kcmioslaveinfo.h
  117. 4
      kcontrol/joystick/joystick.cpp
  118. 2
      kcontrol/joystick/joystick.h
  119. 2
      kcontrol/kcontrol/aboutwidget.h
  120. 2
      kcontrol/kcontrol/kcrootonly.cpp
  121. 2
      kcontrol/kcontrol/kcrootonly.h
  122. 4
      kcontrol/kcontrol/main.cpp
  123. 2
      kcontrol/kcontrol/moduleIface.cpp
  124. 8
      kcontrol/kcontrol/modules.cpp
  125. 4
      kcontrol/kcontrol/modules.h
  126. 16
      kcontrol/kcontrol/proxywidget.cpp
  127. 6
      kcontrol/kcontrol/proxywidget.h
  128. 4
      kcontrol/kcontrol/toplevel.cpp
  129. 14
      kcontrol/kded/kcmkded.cpp
  130. 6
      kcontrol/kded/kcmkded.h
  131. 10
      kcontrol/keys/kaccelaction.h
  132. 8
      kcontrol/keys/keyconfig.cpp
  133. 2
      kcontrol/keys/keyconfig.h
  134. 10
      kcontrol/keys/main.cpp
  135. 2
      kcontrol/keys/main.h
  136. 4
      kcontrol/keys/modifiers.cpp
  137. 20
      kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
  138. 8
      kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
  139. 4
      kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
  140. 4
      kcontrol/kfontinst/kcmfontinst/KFileFontView.h
  141. 6
      kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp
  142. 4
      kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
  143. 198
      kcontrol/kfontinst/kio/KioFonts.cpp
  144. 4
      kcontrol/kfontinst/kio/KioFonts.h
  145. 12
      kcontrol/kfontinst/lib/FcEngine.cpp
  146. 2
      kcontrol/kfontinst/lib/KfiConstants.h
  147. 8
      kcontrol/kfontinst/lib/Misc.cpp
  148. 12
      kcontrol/kfontinst/viewpart/FontViewPart.cpp
  149. 4
      kcontrol/kfontinst/viewpart/FontViewerApp.cpp
  150. 6
      kcontrol/kicker/advancedDialog.cpp
  151. 4
      kcontrol/kicker/applettab_impl.cpp
  152. 6
      kcontrol/kicker/extensionInfo.cpp
  153. 10
      kcontrol/kicker/hidingconfig.cpp
  154. 2
      kcontrol/kicker/hidingconfig.h
  155. 10
      kcontrol/kicker/lookandfeelconfig.cpp
  156. 2
      kcontrol/kicker/lookandfeelconfig.h
  157. 6
      kcontrol/kicker/lookandfeeltab_impl.cpp
  158. 2
      kcontrol/kicker/lookandfeeltab_kcm.cpp
  159. 2
      kcontrol/kicker/lookandfeeltab_kcm.h
  160. 16
      kcontrol/kicker/main.cpp
  161. 2
      kcontrol/kicker/main.h
  162. 10
      kcontrol/kicker/menuconfig.cpp
  163. 2
      kcontrol/kicker/menuconfig.h
  164. 8
      kcontrol/kicker/menutab_impl.cpp
  165. 10
      kcontrol/kicker/positionconfig.cpp
  166. 2
      kcontrol/kicker/positionconfig.h
  167. 20
      kcontrol/kio/cache.cpp
  168. 2
      kcontrol/kio/cache.h
  169. 4
      kcontrol/kio/kcookiesmain.cpp
  170. 2
      kcontrol/kio/kcookiesmain.h
  171. 2
      kcontrol/kio/kcookiesmanagement.cpp
  172. 2
      kcontrol/kio/kcookiesmanagement.h
  173. 6
      kcontrol/kio/kcookiespolicies.cpp
  174. 2
      kcontrol/kio/kcookiespolicies.h
  175. 8
      kcontrol/kio/kproxydlg.cpp
  176. 8
      kcontrol/kio/kproxydlg.h
  177. 56
      kcontrol/kio/ksaveioconfig.cpp
  178. 6
      kcontrol/kio/ksaveioconfig.h
  179. 22
      kcontrol/kio/main.cpp
  180. 10
      kcontrol/kio/main.h
  181. 6
      kcontrol/kio/netpref.cpp
  182. 2
      kcontrol/kio/netpref.h
  183. 8
      kcontrol/kio/smbrodlg.cpp
  184. 2
      kcontrol/kio/smbrodlg.h
  185. 6
      kcontrol/kio/socks.cpp
  186. 2
      kcontrol/kio/socks.h
  187. 4
      kcontrol/kio/useragentdlg.cpp
  188. 6
      kcontrol/kio/useragentdlg.h
  189. 10
      kcontrol/knotify/knotify.cpp
  190. 2
      kcontrol/knotify/knotify.h
  191. 12
      kcontrol/konq/behaviour.cpp
  192. 8
      kcontrol/konq/behaviour.h
  193. 10
      kcontrol/konq/browser.cpp
  194. 14
      kcontrol/konq/browser.h
  195. 10
      kcontrol/konq/desktop.cpp
  196. 2
      kcontrol/konq/desktop.h
  197. 14
      kcontrol/konq/desktopbehavior_impl.cpp
  198. 14
      kcontrol/konq/desktopbehavior_impl.h
  199. 8
      kcontrol/konq/fontopts.cpp
  200. 8
      kcontrol/konq/fontopts.h
  201. 28
      kcontrol/konq/main.cpp
  202. 8
      kcontrol/konq/previews.cpp
  203. 4
      kcontrol/konq/previews.h
  204. 40
      kcontrol/konq/rootopts.cpp
  205. 10
      kcontrol/konq/rootopts.h
  206. 2
      kcontrol/konqhtml/advancedTabDialog.cpp
  207. 4
      kcontrol/konqhtml/advancedTabDialog.h
  208. 6
      kcontrol/konqhtml/appearance.cpp
  209. 6
      kcontrol/konqhtml/appearance.h
  210. 2
      kcontrol/konqhtml/domainlistview.cpp
  211. 6
      kcontrol/konqhtml/domainlistview.h
  212. 4
      kcontrol/konqhtml/filteropts.cpp
  213. 8
      kcontrol/konqhtml/filteropts.h
  214. 14
      kcontrol/konqhtml/htmlopts.cpp
  215. 6
      kcontrol/konqhtml/htmlopts.h
  216. 8
      kcontrol/konqhtml/javaopts.cpp
  217. 12
      kcontrol/konqhtml/javaopts.h
  218. 6
      kcontrol/konqhtml/jsopts.cpp
  219. 10
      kcontrol/konqhtml/jsopts.h
  220. 2
      kcontrol/konqhtml/jspolicies.cpp
  221. 4
      kcontrol/konqhtml/jspolicies.h
  222. 4
      kcontrol/konqhtml/khttpoptdlg.cpp
  223. 6
      kcontrol/konqhtml/khttpoptdlg.h
  224. 24
      kcontrol/konqhtml/main.cpp
  225. 6
      kcontrol/konqhtml/main.h
  226. 20
      kcontrol/konqhtml/pluginopts.cpp
  227. 20
      kcontrol/konqhtml/pluginopts.h
  228. 2
      kcontrol/konqhtml/policies.cpp
  229. 6
      kcontrol/konqhtml/policies.h
  230. 6
      kcontrol/konsole/kcmkonsole.cpp
  231. 2
      kcontrol/konsole/kcmkonsole.h
  232. 10
      kcontrol/krdb/krdb.cpp
  233. 54
      kcontrol/kthememanager/ktheme.cpp
  234. 18
      kcontrol/kthememanager/ktheme.h
  235. 10
      kcontrol/kthememanager/kthememanager.cpp
  236. 2
      kcontrol/kthememanager/kthememanager.h
  237. 8
      kcontrol/launch/kcmlaunch.cpp
  238. 2
      kcontrol/launch/kcmlaunch.h
  239. 2
      kcontrol/locale/kcmlocale.cpp
  240. 4
      kcontrol/locale/localemon.cpp
  241. 4
      kcontrol/locale/localenum.cpp
  242. 4
      kcontrol/locale/localeother.cpp
  243. 4
      kcontrol/locale/localetime.cpp
  244. 2
      kcontrol/locale/main.cpp
  245. 10
      kcontrol/locale/toplevel.cpp
  246. 8
      kcontrol/locale/toplevel.h
  247. 2
      kcontrol/nics/nic.cpp
  248. 2
      kcontrol/nics/nic.h
  249. 8
      kcontrol/performance/kcmperformance.cpp
  250. 4
      kcontrol/performance/kcmperformance.h
  251. 4
      kcontrol/performance/konqueror.cpp
  252. 4
      kcontrol/performance/system.cpp
  253. 4
      kcontrol/privacy/kprivacymanager.cpp
  254. 18
      kcontrol/privacy/privacy.cpp
  255. 2
      kcontrol/privacy/privacy.h
  256. 10
      kcontrol/randr/krandrmodule.cpp
  257. 2
      kcontrol/randr/krandrmodule.h
  258. 6
      kcontrol/randr/krandrtray.cpp
  259. 2
      kcontrol/samba/kcmsambaimports.cpp
  260. 4
      kcontrol/samba/kcmsambaimports.h
  261. 2
      kcontrol/samba/kcmsambalog.cpp
  262. 4
      kcontrol/samba/kcmsambalog.h
  263. 2
      kcontrol/samba/kcmsambastatistics.cpp
  264. 6
      kcontrol/samba/kcmsambastatistics.h
  265. 2
      kcontrol/samba/ksmbstatus.cpp
  266. 4
      kcontrol/samba/ksmbstatus.h
  267. 6
      kcontrol/samba/main.cpp
  268. 4
      kcontrol/screensaver/advanceddialog.cpp
  269. 8
      kcontrol/screensaver/scrnsave.cpp
  270. 2
      kcontrol/screensaver/scrnsave.h
  271. 8
      kcontrol/smartcard/smartcard.cpp
  272. 6
      kcontrol/smartcard/smartcard.h
  273. 6
      kcontrol/smserver/kcmsmserver.cpp
  274. 2
      kcontrol/smserver/kcmsmserver.h
  275. 2
      kcontrol/spellchecking/spellchecking.cpp
  276. 2
      kcontrol/spellchecking/spellchecking.h
  277. 20
      kcontrol/style/kcmstyle.cpp
  278. 8
      kcontrol/style/kcmstyle.h
  279. 2
      kcontrol/style/main.cpp
  280. 18
      kcontrol/taskbar/kcmtaskbar.cpp
  281. 2
      kcontrol/taskbar/kcmtaskbar.h
  282. 2
      kcontrol/tdm/main.cpp
  283. 2
      kcontrol/tdm/main.h
  284. 4
      kcontrol/tdm/tdm-appear.cpp
  285. 4
      kcontrol/tdm/tdm-users.cpp
  286. 2
      kcontrol/usbview/kcmusb.cpp
  287. 2
      kcontrol/usbview/kcmusb.h
  288. 6
      kcontrol/view1394/view1394.cpp
  289. 2
      kcontrol/view1394/view1394.h
  290. 8
      kcontrol/xinerama/kcmxinerama.cpp
  291. 6
      kcontrol/xinerama/kcmxinerama.h
  292. 2
      kdebugdialog/kabstractdebugdialog.cpp
  293. 6
      kdebugdialog/kabstractdebugdialog.h
  294. 2
      kdebugdialog/kdebugdialog.h
  295. 2
      kdepasswd/kcm/chfacedlg.cpp
  296. 10
      kdepasswd/kcm/main.cpp
  297. 2
      kdepasswd/kcm/main.h
  298. 4
      kdesktop/bgmanager.h
  299. 12
      kdesktop/desktop.cc
  300. 6
      kdesktop/init.cc
  301. 2
      kdesktop/kcustommenu.cc
  302. 4
      kdesktop/kdesktopshadowsettings.cpp
  303. 6
      kdesktop/kdesktopshadowsettings.h
  304. 18
      kdesktop/kdiconview.cc
  305. 4
      kdesktop/kdiconview.h
  306. 2
      kdesktop/klaunch.kcfg
  307. 4
      kdesktop/krootwm.cc
  308. 18
      kdesktop/kwebdesktop/kwebdesktop.cpp
  309. 6
      kdesktop/kwebdesktop/kwebdesktop.h
  310. 2
      kdesktop/kwebdesktop/kwebdesktop.kcfg
  311. 2
      kdesktop/kxdglauncher.cpp
  312. 4
      kdialog/kdialog.cpp
  313. 6
      kfind/kfinddlg.cpp
  314. 2
      kfind/kfindpart.cpp
  315. 10
      kfind/kftabdlg.cpp
  316. 6
      kfind/kfwin.cpp
  317. 30
      kfind/kquery.cpp
  318. 14
      kfind/kquery.h
  319. 2
      khelpcenter/docmetainfo.cpp
  320. 10
      khelpcenter/fontdialog.cpp
  321. 2
      khelpcenter/formatter.cpp
  322. 4
      khelpcenter/glossary.h
  323. 2
      khelpcenter/htmlsearch.cpp
  324. 4
      khelpcenter/htmlsearch.h
  325. 10
      khelpcenter/htmlsearch/htmlsearch.cpp
  326. 8
      khelpcenter/htmlsearch/kcmhtmlsearch.cpp
  327. 2
      khelpcenter/htmlsearch/kcmhtmlsearch.h
  328. 4
      khelpcenter/htmlsearchconfig.cpp
  329. 6
      khelpcenter/htmlsearchconfig.h
  330. 2
      khelpcenter/infotree.cpp
  331. 4
      khelpcenter/kcmhelpcenter.cpp
  332. 4
      khelpcenter/kcmhelpcenter.h
  333. 36
      khelpcenter/mainwindow.cpp
  334. 8
      khelpcenter/mainwindow.h
  335. 6
      khelpcenter/navigator.cpp
  336. 2
      khelpcenter/plugintraverser.cpp
  337. 4
      khelpcenter/scrollkeepertreebuilder.cpp
  338. 2
      khelpcenter/searchengine.cpp
  339. 2
      khelpcenter/searchengine.h
  340. 18
      khelpcenter/searchhandler.cpp
  341. 10
      khelpcenter/searchhandler.h
  342. 4
      khelpcenter/searchwidget.cpp
  343. 6
      khelpcenter/searchwidget.h
  344. 2
      khotkeys/kcontrol/init.cpp
  345. 12
      khotkeys/kcontrol/kcmkhotkeys.cpp
  346. 2
      khotkeys/kcontrol/kcmkhotkeys.h
  347. 30
      khotkeys/shared/action_data.cpp
  348. 44
      khotkeys/shared/action_data.h
  349. 26
      khotkeys/shared/actions.cpp
  350. 36
      khotkeys/shared/actions.h
  351. 34
      khotkeys/shared/conditions.cpp
  352. 36
      khotkeys/shared/conditions.h
  353. 2
      khotkeys/shared/khotkeysglobal.h
  354. 16
      khotkeys/shared/settings.cpp
  355. 14
      khotkeys/shared/settings.h
  356. 24
      khotkeys/shared/triggers.cpp
  357. 30
      khotkeys/shared/triggers.h
  358. 4
      khotkeys/shared/voicesignature.cpp
  359. 6
      khotkeys/shared/voicesignature.h
  360. 14
      khotkeys/shared/windows.cpp
  361. 16
      khotkeys/shared/windows.h
  362. 2
      khotkeys/update/update.cpp
  363. 2
      kicker/TODO
  364. 20
      kicker/applets/clock/clock.cpp
  365. 8
      kicker/applets/clock/clock.h
  366. 2
      kicker/applets/clock/zone.cpp
  367. 6
      kicker/applets/clock/zone.h
  368. 12
      kicker/applets/launcher/configdlg.cpp
  369. 4
      kicker/applets/launcher/configdlg.h
  370. 2
      kicker/applets/launcher/quicklauncher.cpp
  371. 6
      kicker/applets/lockout/lockout.cpp
  372. 4
      kicker/applets/media/mediaapplet.cpp
  373. 2
      kicker/applets/menu/menuapplet.cpp
  374. 2
      kicker/applets/minipager/pagerapplet.cpp
  375. 4
      kicker/applets/run/runapplet.cpp
  376. 2
      kicker/applets/swallow/swallow.cpp
  377. 2
      kicker/applets/swallow/swallow.h
  378. 4
      kicker/applets/systemtray/systemtrayapplet.cpp
  379. 4
      kicker/applets/trash/trashbutton.cpp
  380. 4
      kicker/extensions/dockbar/dockbarextension.cpp
  381. 4
      kicker/extensions/kasbar/ChangeLog
  382. 2
      kicker/extensions/kasbar/kasbarapp.cpp
  383. 4
      kicker/extensions/kasbar/kasprefsdlg.cpp
  384. 2
      kicker/extensions/kasbar/kasprefsdlg.h
  385. 12
      kicker/extensions/kasbar/kastasker.cpp
  386. 18
      kicker/extensions/kasbar/kastasker.h
  387. 2
      kicker/kicker/buttons/bookmarksbutton.h
  388. 4
      kicker/kicker/buttons/browserbutton.cpp
  389. 4
      kicker/kicker/buttons/browserbutton.h
  390. 4
      kicker/kicker/buttons/extensionbutton.cpp
  391. 4
      kicker/kicker/buttons/extensionbutton.h
  392. 2
      kicker/kicker/buttons/kbutton.h
  393. 2
      kicker/kicker/buttons/knewbutton.h
  394. 6
      kicker/kicker/buttons/nonkdeappbutton.cpp
  395. 4
      kicker/kicker/buttons/nonkdeappbutton.h
  396. 4
      kicker/kicker/buttons/servicebutton.cpp
  397. 4
      kicker/kicker/buttons/servicebutton.h
  398. 4
      kicker/kicker/buttons/servicemenubutton.cpp
  399. 4
      kicker/kicker/buttons/servicemenubutton.h
  400. 4
      kicker/kicker/buttons/urlbutton.cpp
  401. 4
      kicker/kicker/buttons/urlbutton.h
  402. 6
      kicker/kicker/core/container_applet.cpp
  403. 8
      kicker/kicker/core/container_applet.h
  404. 6
      kicker/kicker/core/container_base.cpp
  405. 12
      kicker/kicker/core/container_base.h
  406. 24
      kicker/kicker/core/container_button.cpp
  407. 26
      kicker/kicker/core/container_button.h
  408. 20
      kicker/kicker/core/container_extension.cpp
  409. 2
      kicker/kicker/core/container_extension.h
  410. 8
      kicker/kicker/core/containerarea.cpp
  411. 6
      kicker/kicker/core/containerarea.h
  412. 2
      kicker/kicker/core/extensionSettings.kcfg
  413. 18
      kicker/kicker/core/extensionmanager.cpp
  414. 4
      kicker/kicker/core/kicker.cpp
  415. 2
      kicker/kicker/core/main.cpp
  416. 8
      kicker/kicker/core/pluginmanager.cpp
  417. 2
      kicker/kicker/core/showdesktop.cpp
  418. 6
      kicker/kicker/ui/browser_mnu.cpp
  419. 2
      kicker/kicker/ui/k_mnu.cpp
  420. 10
      kicker/kicker/ui/k_new_mnu.cpp
  421. 4
      kicker/kicker/ui/service_mnu.cpp
  422. 4
      kicker/libkicker/global.cpp
  423. 2
      kicker/libkicker/panelbutton.cpp
  424. 6
      kicker/libkicker/panelbutton.h
  425. 2
      kicker/menuext/konq-profiles/konqy_menu.cpp
  426. 2
      kicker/menuext/konsole/konsole_mnu.cpp
  427. 12
      kicker/menuext/tom/tom.cc
  428. 2
      kicker/menuext/tom/tom.h
  429. 4
      kicker/taskbar/taskbarcontainer.cpp
  430. 2
      kicker/taskmanager/taskmanager.cpp
  431. 2
      kioslave/DESIGN
  432. 2
      kioslave/about/kio_about.cpp
  433. 2
      kioslave/about/kio_about.h
  434. 8
      kioslave/cgi/cgi.cpp
  435. 2
      kioslave/cgi/cgi.h
  436. 6
      kioslave/cgi/kcmcgi/kcmcgi.cpp
  437. 6
      kioslave/cgi/kcmcgi/kcmcgi.h
  438. 10
      kioslave/filter/filter.cc
  439. 2
      kioslave/filter/filter.h
  440. 2
      kioslave/finger/kio_finger.cpp
  441. 2
      kioslave/finger/kio_finger.h
  442. 14
      kioslave/fish/fish.cpp
  443. 34
      kioslave/fish/fish.h
  444. 50
      kioslave/floppy/kio_floppy.cpp
  445. 4
      kioslave/floppy/kio_floppy.h
  446. 72
      kioslave/home/homeimpl.cpp
  447. 14
      kioslave/home/homeimpl.h
  448. 24
      kioslave/home/kio_home.cpp
  449. 2
      kioslave/home/kio_home.h
  450. 6
      kioslave/info/info.cc
  451. 2
      kioslave/info/info.h
  452. 2
      kioslave/ldap/kio_ldap.cpp
  453. 6
      kioslave/ldap/kio_ldap.h
  454. 38
      kioslave/mac/kio_mac.cpp
  455. 8
      kioslave/mac/kio_mac.h
  456. 8
      kioslave/man/kio_man.cpp
  457. 2
      kioslave/man/kio_man.h
  458. 10
      kioslave/man/kmanpart.cpp
  459. 6
      kioslave/man/kmanpart.h
  460. 2
      kioslave/media/kcmodule/main.cpp
  461. 6
      kioslave/media/kcmodule/main.h
  462. 12
      kioslave/media/kcmodule/managermodule.cpp
  463. 2
      kioslave/media/kcmodule/managermodule.h
  464. 2
      kioslave/media/kcmodule/notifiermodule.cpp
  465. 2
      kioslave/media/kcmodule/notifiermodule.h
  466. 4
      kioslave/media/kfile-plugin/kfilemediaplugin.cpp
  467. 6
      kioslave/media/kfile-plugin/kfilemediaplugin.h
  468. 26
      kioslave/media/kio_media.cpp
  469. 2
      kioslave/media/kio_media.h
  470. 4
      kioslave/media/libmediacommon/medium.cpp
  471. 2
      kioslave/media/libmediacommon/notifiersettings.cpp
  472. 118
      kioslave/media/mediaimpl.cpp
  473. 20
      kioslave/media/mediaimpl.h
  474. 8
      kioslave/media/mediamanager/fstabbackend.cpp
  475. 20
      kioslave/media/mediamanager/halbackend.cpp
  476. 8
      kioslave/media/mediamanager/halbackend.h
  477. 12
      kioslave/media/mediamanager/tdehardwarebackend.cpp
  478. 6
      kioslave/media/mediamanager/tdehardwarebackend.h
  479. 12
      kioslave/media/medianotifier/medianotifier.cpp
  480. 4
      kioslave/media/medianotifier/medianotifier.h
  481. 2
      kioslave/media/medianotifier/notificationdialog.cpp
  482. 84
      kioslave/nfs/kio_nfs.cpp
  483. 10
      kioslave/nfs/kio_nfs.h
  484. 6
      kioslave/nntp/nntp.cpp
  485. 4
      kioslave/nntp/nntp.h
  486. 12
      kioslave/pop3/pop3.cc
  487. 10
      kioslave/pop3/pop3.h
  488. 28
      kioslave/remote/kio_remote.cpp
  489. 2
      kioslave/remote/kio_remote.h
  490. 54
      kioslave/remote/remoteimpl.cpp
  491. 10
      kioslave/remote/remoteimpl.h
  492. 54
      kioslave/settings/kio_settings.cc
  493. 28
      kioslave/sftp/kio_sftp.cpp
  494. 10
      kioslave/sftp/kio_sftp.h
  495. 2
      kioslave/sftp/sftpfileattr.cpp
  496. 2
      kioslave/sftp/sftpfileattr.h
  497. 4
      kioslave/smb/kio_smb.h
  498. 4
      kioslave/smb/kio_smb_auth.cpp
  499. 36
      kioslave/smb/kio_smb_browse.cpp
  500. 2
      kioslave/smb/kio_smb_config.cpp
  501. Some files were not shown because too many files have changed in this diff Show More

10
doc/ksplashml/index.docbook

@ -814,7 +814,7 @@ class Cfg2k: public ThemeEngineConfig
{
Q_OBJECT
public:
Cfg2k( KConfig * );
Cfg2k( TDEConfig * );
};
class ObjKsTheme;
@ -828,7 +828,7 @@ public:
{
return( QString("KSplash2k") );
}
inline const KDialogBase *config( KConfig *kc )
inline const KDialogBase *config( TDEConfig *kc )
{
return new Cfg2k( kc );
}
@ -924,7 +924,7 @@ void Theme2k::readSettings()
if( !mTheme )
return;
KConfig *cfg = mTheme->themeConfig();
TDEConfig *cfg = mTheme->themeConfig();
if( !cfg )
return;
@ -1099,7 +1099,7 @@ appropriate plugin.</para>
K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory&lt;Theme2k&gt; );
Cfg2k::Cfg2k( KConfig * )
Cfg2k::Cfg2k( TDEConfig * )
{}
Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args
@ -1164,7 +1164,7 @@ void Theme2k::readSettings()
if( !mTheme )
return;
KConfig *cfg = mTheme-&gt;themeConfig();
TDEConfig *cfg = mTheme-&gt;themeConfig();
if( !cfg )
return;

2
drkonqi/debugger.cpp

@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
bool KrashDebugger::performChecks( TQString* msg )
{
bool ret = true;
KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
TDEConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
kdedcfg.setGroup( "General" );
if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
{

6
drkonqi/krashconf.cpp

@ -88,7 +88,7 @@ void KrashConfig :: readConfig()
KStartupInfo::sendFinish( id );
}
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("drkonqi");
// maybe we should check if it's relative?
@ -98,7 +98,7 @@ void KrashConfig :: readConfig()
TQString debuggername = config->readEntry("Debugger",
TQString::fromLatin1("gdb"));
KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
TDEConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
true, false, "appdata");
debuggers.setGroup("General");
@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
TDEConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
true, false, "appdata");
preset.setGroup("ErrorDescription");

2
kate/app/kateapp.cpp

@ -352,7 +352,7 @@ bool KateApp::openInput (const TQString &text)
return true;
}
KateMainWindow *KateApp::newMainWindow (KConfig *sconfig, const TQString &sgroup)
KateMainWindow *KateApp::newMainWindow (TDEConfig *sconfig, const TQString &sgroup)
{
KateMainWindow *mainWindow = new KateMainWindow (sconfig, sgroup);
m_mainWindows.push_back (mainWindow);

2
kate/app/kateapp.h

@ -140,7 +140,7 @@ class KDE_EXPORT KateApp : public TDEApplication
* @param sgroup session group for this window
* @return new constructed main window
*/
KateMainWindow *newMainWindow (KConfig *sconfig = 0, const TQString &sgroup = "");
KateMainWindow *newMainWindow (TDEConfig *sconfig = 0, const TQString &sgroup = "");
/**
* removes the mainwindow given, DOES NOT DELETE IT

4
kate/app/kateconfigdialog.cpp

@ -68,7 +68,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
parent,
"configdialog" )
{
KConfig *config = KateApp::self()->config();
TDEConfig *config = KateApp::self()->config();
KWin::setIcons( winId(), KateApp::self()->icon(), KateApp::self()->miniIcon() );
@ -372,7 +372,7 @@ void KateConfigDialog::slotOk()
void KateConfigDialog::slotApply()
{
KConfig *config = KateApp::self()->config();
TDEConfig *config = KateApp::self()->config();
// if data changed apply the kate app stuff
if( dataChanged )

8
kate/app/katedocmanager.cpp

@ -60,7 +60,7 @@ KateDocManager::KateDocManager (TQObject *parent)
m_dcop = new KateDocManagerDCOPIface (this);
m_metaInfos = new KConfig("metainfos", false, false, "appdata");
m_metaInfos = new TDEConfig("metainfos", false, false, "appdata");
createDoc ();
}
@ -315,7 +315,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
"Do you want to delete it anyway?").arg(m_tempFiles[ documentNumber ].first.prettyURL()),
i18n("Delete File?") ) == KMessageBox::Yes*/ )
{
KIO::del( m_tempFiles[ documentNumber ].first, false, false );
TDEIO::del( m_tempFiles[ documentNumber ].first, false, false );
kdDebug(13001)<<"Deleted temporary file "<<m_tempFiles[ documentNumber ].first<<endl;
m_tempFiles.remove( documentNumber );
}
@ -444,7 +444,7 @@ void KateDocManager::saveAll()
((Kate::View*)it.current()->views().first())->save();
}
void KateDocManager::saveDocumentList (KConfig* config)
void KateDocManager::saveDocumentList (TDEConfig* config)
{
TQString prevGrp=config->group();
config->setGroup ("Open Documents");
@ -466,7 +466,7 @@ void KateDocManager::saveDocumentList (KConfig* config)
config->setGroup(prevGrp);
}
void KateDocManager::restoreDocumentList (KConfig* config)
void KateDocManager::restoreDocumentList (TDEConfig* config)
{
TQString prevGrp=config->group();
config->setGroup ("Open Documents");

8
kate/app/katedocmanager.h

@ -36,7 +36,7 @@
namespace KParts { class Factory; }
class KConfig;
class TDEConfig;
class DCOPObject;
class KateDocumentInfo
@ -104,8 +104,8 @@ class KateDocManager : public TQObject
TQPtrList<Kate::Document> modifiedDocumentList();
bool queryCloseDocuments(KateMainWindow *w);
void saveDocumentList (class KConfig *config);
void restoreDocumentList (class KConfig *config);
void saveDocumentList (class TDEConfig *config);
void restoreDocumentList (class TDEConfig *config);
DCOPObject *dcopObject () { return m_dcop; };
@ -143,7 +143,7 @@ class KateDocManager : public TQObject
TQPtrDict<KateDocumentInfo> m_docInfos;
TQMap<uint,TPair> m_tempFiles;
TQGuardedPtr<Kate::Document> m_currentDoc;
KConfig *m_metaInfos;
TDEConfig *m_metaInfos;
bool m_saveMetaInfos;
int m_daysMetaInfos;

8
kate/app/kateexternaltools.cpp

@ -151,7 +151,7 @@ void KateExternalToolsCommand::reload () {
m_list.clear();
m_map.clear();
KConfig config("externaltools", false, false, "appdata");
TDEConfig config("externaltools", false, false, "appdata");
config.setGroup("Global");
TQStringList tools = config.readListEntry("tools");
@ -312,7 +312,7 @@ void KateExternalToolsMenuAction::reload()
popupMenu()->clear();
// load all the tools, and create a action for each of them
KConfig *config = new KConfig( "externaltools", false, false, "appdata" );
TDEConfig *config = new TDEConfig( "externaltools", false, false, "appdata" );
config->setGroup( "Global" );
TQStringList tools = config->readListEntry( "tools" );
@ -601,7 +601,7 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent,
TQWhatsThis::add( lbTools, i18n(
"This list shows all the configured tools, represented by their menu text.") );
config = new KConfig("externaltools", false, false, "appdata");
config = new TDEConfig("externaltools", false, false, "appdata");
reload();
slotSelectionChanged();
}
@ -616,7 +616,7 @@ void KateExternalToolsConfigWidget::reload()
//m_tools.clear();
lbTools->clear();
// load the files from a KConfig
// load the files from a TDEConfig
config->setGroup( "Global" );
TQStringList tools = config->readListEntry("tools");

2
kate/app/kateexternaltools.h

@ -171,7 +171,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage
class KListBox *lbTools;
class TQPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn;
class KConfig *config;
class TDEConfig *config;
bool m_changed;
};

6
kate/app/katefilelist.cpp

@ -480,7 +480,7 @@ void KateFileList::updateSort ()
updateFileListLocations();
}
void KateFileList::readConfig( KConfig *config, const TQString &group )
void KateFileList::readConfig( TDEConfig *config, const TQString &group )
{
TQString oldgroup = config->group();
config->setGroup( group );
@ -495,7 +495,7 @@ void KateFileList::readConfig( KConfig *config, const TQString &group )
config->setGroup( oldgroup );
}
void KateFileList::writeConfig( KConfig *config, const TQString &group )
void KateFileList::writeConfig( TDEConfig *config, const TQString &group )
{
TQString oldgroup = config->group();
config->setGroup( group );
@ -715,7 +715,7 @@ void KFLConfigPage::apply()
void KFLConfigPage::reload()
{
// read in from config file
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "Filelist" );
cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) );
kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) );

4
kate/app/katefilelist.h

@ -102,8 +102,8 @@ class KateFileList : public KListView
TQColor viewShade() const { return m_viewShade; }
bool shadingEnabled() { return m_enableBgShading; }
void readConfig( class KConfig *config, const TQString &group );
void writeConfig( class KConfig *config, const TQString &group );
void readConfig( class TDEConfig *config, const TQString &group );
void writeConfig( class TDEConfig *config, const TQString &group );
/**
* reimplemented to remove the item from the history stacks

10
kate/app/katefileselector.cpp

@ -216,7 +216,7 @@ KateFileSelector::~KateFileSelector()
//BEGIN Public Methods
void KateFileSelector::readConfig(KConfig *config, const TQString & name)
void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
{
dir->setViewConfig( config, name + ":view" );
dir->readConfig(config, name + ":dir");
@ -258,7 +258,7 @@ void KateFileSelector::initialDirChangeHack()
setDir( waitingDir );
}
void KateFileSelector::setupToolbar( KConfig *config )
void KateFileSelector::setupToolbar( TDEConfig *config )
{
toolbar->clear();
TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
@ -279,7 +279,7 @@ void KateFileSelector::setupToolbar( KConfig *config )
}
}
void KateFileSelector::writeConfig(KConfig *config, const TQString & name)
void KateFileSelector::writeConfig(TDEConfig *config, const TQString & name)
{
dir->writeConfig(config,name + ":dir");
@ -630,7 +630,7 @@ void KFSConfigPage::apply()
m_changed = false;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "fileselector" );
// toolbar
TQStringList l;
@ -672,7 +672,7 @@ void KFSConfigPage::reload()
}
void KFSConfigPage::init()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "fileselector" );
// toolbar
TQStringList l = config->readListEntry( "toolbar actions", ',' );

6
kate/app/katefileselector.h

@ -83,9 +83,9 @@ class KateFileSelector : public TQVBox
TQWidget * parent = 0, const char * name = 0 );
~KateFileSelector();
void readConfig( KConfig *, const TQString & );
void writeConfig( KConfig *, const TQString & );
void setupToolbar( KConfig * );
void readConfig( TDEConfig *, const TQString & );
void writeConfig( TDEConfig *, const TQString & );
void setupToolbar( TDEConfig * );
void setView( KFile::FileView );
KDirOperator *dirOperator(){ return dir; }
KActionCollection *actionCollection() { return mActionCollection; };

4
kate/app/kategrepdialog.h

@ -31,7 +31,7 @@ class TQListBox;
class KPushButton;
class TQLabel;
class TDEProcess;
class KConfig;
class TDEConfig;
class KURLRequester;
class TQEvent;
@ -85,7 +85,7 @@ private:
TDEProcess *childproc;
TQString buf;
TQString errbuf;
KConfig* config;
TDEConfig* config;
TQStringList lastSearchItems;
TQStringList lastSearchPaths;
TQStringList lastSearchFiles;

2
kate/app/katemain.h

@ -38,7 +38,7 @@ class TQWidgetStack;
class KAction;
class KActionMenu;
class KConfig;
class TDEConfig;
class KDirOperator;
class KEditToolbar;
class KFileViewItem;

14
kate/app/katemainwindow.cpp

@ -86,7 +86,7 @@
uint KateMainWindow::uniqueID = 1;
KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup)
: KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1())
{
// first the very important id
@ -402,7 +402,7 @@ void KateMainWindow::slotFileQuit()
void KateMainWindow::readOptions ()
{
KConfig *config = KateApp::self()->config ();
TDEConfig *config = KateApp::self()->config ();
config->setGroup("General");
syncKonsole = config->readBoolEntry("Sync Konsole", true);
@ -420,7 +420,7 @@ void KateMainWindow::readOptions ()
void KateMainWindow::saveOptions ()
{
KConfig *config = KateApp::self()->config ();
TDEConfig *config = KateApp::self()->config ();
config->setGroup("General");
@ -553,7 +553,7 @@ void KateMainWindow::editKeys()
}
}
externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new KConfig("externaltools", false, false, "appdata") );
externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new TDEConfig("externaltools", false, false, "appdata") );
}
void KateMainWindow::openURL (const TQString &name)
@ -823,7 +823,7 @@ void KateMainWindow::updateCaption (Kate::Document *doc)
m_viewManager->activeView()->getDoc()->isModified());
}
void KateMainWindow::saveProperties(KConfig *config)
void KateMainWindow::saveProperties(TDEConfig *config)
{
TQString grp=config->group();
@ -833,7 +833,7 @@ void KateMainWindow::saveProperties(KConfig *config)
config->setGroup(grp);
}
void KateMainWindow::readProperties(KConfig *config)
void KateMainWindow::readProperties(TDEConfig *config)
{
TQString grp=config->group();
@ -844,7 +844,7 @@ void KateMainWindow::readProperties(KConfig *config)
config->setGroup(grp);
}
void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig )
void KateMainWindow::saveGlobalProperties( TDEConfig* sessionConfig )
{
KateDocManager::self()->saveDocumentList (sessionConfig);

8
kate/app/katemainwindow.h

@ -58,7 +58,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
* @param sconfig session config for this window, 0 if none
* @param sgroup session config group to use
*/
KateMainWindow (KConfig *sconfig, const TQString &sgroup);
KateMainWindow (TDEConfig *sconfig, const TQString &sgroup);
/**
* Destruct the nice window
@ -102,9 +102,9 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
KateTabWidget *tabWidget ();
public:
void readProperties(KConfig *config);
void saveProperties(KConfig *config);
void saveGlobalProperties( KConfig* sessionConfig );
void readProperties(TDEConfig *config);
void saveProperties(TDEConfig *config);
void saveGlobalProperties( TDEConfig* sessionConfig );
public:
bool queryClose_internal();

10
kate/app/katemdi.cpp

@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv)
// try to read the action shortcut
KShortcut sc;
KConfig *cfg = kapp->config();
TDEConfig *cfg = kapp->config();
TQString _grp = cfg->group();
cfg->setGroup("Shortcuts");
sc = KShortcut( cfg->readEntry( aname, "" ) );
@ -542,7 +542,7 @@ class TmpToolViewSorter
unsigned int pos;
};
void Sidebar::restoreSession (KConfig *config)
void Sidebar::restoreSession (TDEConfig *config)
{
// get the last correct placed toolview
unsigned int firstWrong = 0;
@ -637,7 +637,7 @@ void Sidebar::restoreSession (KConfig *config)
m_ownSplit->hide();
}
void Sidebar::saveSession (KConfig *config)
void Sidebar::saveSession (TDEConfig *config)
{
// store the own splitter sizes
TQValueList<int> s = m_ownSplit->sizes();
@ -847,7 +847,7 @@ bool MainWindow::hideToolView (ToolView *widget)
return widget->sidebar()->hideWidget (widget);
}
void MainWindow::startRestore (KConfig *config, const TQString &group)
void MainWindow::startRestore (TDEConfig *config, const TQString &group)
{
// first save this stuff
m_restoreConfig = config;
@ -929,7 +929,7 @@ void MainWindow::finishRestore ()
m_restoreGroup = "";
}
void MainWindow::saveSession (KConfig *config, const TQString &group)
void MainWindow::saveSession (TDEConfig *config, const TQString &group)
{
if (!config)
return;

10
kate/app/katemdi.h

@ -207,13 +207,13 @@ class Sidebar : public KMultiTabBar
* restore the current session config from given object, use current group
* @param config config object to use
*/
void restoreSession (KConfig *config);
void restoreSession (TDEConfig *config);
/**
* save the current session config to given object, use current group
* @param config config object to use
*/
void saveSession (KConfig *config);
void saveSession (TDEConfig *config);
public slots:
// reimplemented, to block a show() call if we have no children or if
@ -370,7 +370,7 @@ class MainWindow : public KParts::MainWindow
* @param config config object to use
* @param group config group to use
*/
void startRestore (KConfig *config, const TQString &group);
void startRestore (TDEConfig *config, const TQString &group);
/**
* finish the restore
@ -382,7 +382,7 @@ class MainWindow : public KParts::MainWindow
* @param config config object to use
* @param group config group to use
*/
void saveSession (KConfig *config, const TQString &group);
void saveSession (TDEConfig *config, const TQString &group);
/**
* internal data ;)
@ -428,7 +428,7 @@ class MainWindow : public KParts::MainWindow
* config object for session restore, only valid between
* start and finish restore calls
*/
KConfig *m_restoreConfig;
TDEConfig *m_restoreConfig;
/**
* restore group

18
kate/app/katesession.cpp

@ -169,7 +169,7 @@ bool KateSession::rename (const TQString &name)
m_sessionName = name;
KConfig config (sessionFile (), false, false);
TDEConfig config (sessionFile (), false, false);
config.setGroup ("General");
config.writeEntry ("Name", m_sessionName);
config.sync ();
@ -177,7 +177,7 @@ bool KateSession::rename (const TQString &name)
return true;
}
KConfig *KateSession::configRead ()
TDEConfig *KateSession::configRead ()
{
if (m_sessionFileRel.isEmpty())
return 0;
@ -188,7 +188,7 @@ KConfig *KateSession::configRead ()
return m_readConfig = new KSimpleConfig (sessionFile (), true);
}
KConfig *KateSession::configWrite ()
TDEConfig *KateSession::configWrite ()
{
if (m_sessionFileRel.isEmpty())
return 0;
@ -288,7 +288,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa
// open the new session
Kate::Document::setOpenErrorDialogsActivated (false);
KConfig *sc = activeSession()->configRead();
TDEConfig *sc = activeSession()->configRead();
if (sc)
KateApp::self()->documentManager()->restoreDocumentList (sc);
@ -301,7 +301,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa
// window config
if (sc)
{
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
if (c->readBoolEntry("Restore Window Configuration", true))
@ -371,7 +371,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
if (tryAsk)
{
// app config
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
TQString sesExit (c->readEntry ("Session Exit", "save"));
@ -407,7 +407,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
}
}
KConfig *sc = activeSession()->configWrite();
TDEConfig *sc = activeSession()->configWrite();
if (!sc)
return false;
@ -428,7 +428,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
if (rememberAsLast)
{
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
c->writeEntry ("Last Session", activeSession()->sessionFileRelative());
c->sync ();
@ -442,7 +442,7 @@ bool KateSessionManager::chooseSession ()
bool success = true;
// app config
KConfig *c = KateApp::self()->config();
TDEConfig *c = KateApp::self()->config();
c->setGroup("General");
// get last used session, default to default session

4
kate/app/katesession.h

@ -109,7 +109,7 @@ class KateSession : public KShared
* return 0 if we have no file to read config from atm
* @return config to read from
*/
KConfig *configRead ();
TDEConfig *configRead ();
/**
* config to write
@ -117,7 +117,7 @@ class KateSession : public KShared
* return 0 if we have no file to write config to atm
* @return config to write from
*/
KConfig *configWrite ();
TDEConfig *configWrite ();
/**
* count of documents in this session

4
kate/app/kateviewmanager.cpp

@ -463,7 +463,7 @@ void KateViewManager::setShowFullPath( bool enable )
* session config functions
*/
// FIXME 3.0 - make those config goups more streamlined: "objN:objN..."
void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
void KateViewManager::saveViewConfiguration(TDEConfig *config,const TQString& grp)
{
// Use the same group name for view configuration as usual for sessions.
// (When called by session manager grp is a 1-based index for the main window)
@ -481,7 +481,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
}
}
void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString& grp)
void KateViewManager::restoreViewConfiguration (TDEConfig *config, const TQString& grp)
{
// Use the same group name for view configuration as usual for sessions.
// (When called by session manager grp is a 1-based index for the main window)

6
kate/app/kateviewmanager.h

@ -31,7 +31,7 @@
class KateMainWindow;
class KateViewSpaceContainer;
class KConfig;
class TDEConfig;
class KAction;
class TQToolButton;
@ -60,10 +60,10 @@ class KateViewManager : public TQObject
public:
/* This will save the splitter configuration */
void saveViewConfiguration(KConfig *config,const TQString& group);
void saveViewConfiguration(TDEConfig *config,const TQString& group);
/* restore it */
void restoreViewConfiguration (KConfig *config,const TQString& group);
void restoreViewConfiguration (TDEConfig *config,const TQString& group);
uint openURL (const KURL &url, const TQString& encoding, bool activate = true, bool isTempFile=false);

4
kate/app/kateviewspace.cpp

@ -233,7 +233,7 @@ void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr,
mStatusBar->setStatus( r, c, ovr, block, mod, msg );
}
void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const TQString& viewConfGrp)
void KateViewSpace::saveConfig ( TDEConfig* config, int myIndex ,const TQString& viewConfGrp)
{
// kdDebug()<<"KateViewSpace::saveConfig("<<myIndex<<", "<<viewConfGrp<<") - currentView: "<<currentView()<<")"<<endl;
TQString group = TQString(viewConfGrp+"-ViewSpace %1").arg( myIndex );
@ -272,7 +272,7 @@ void KateViewSpace::modifiedOnDisc(Kate::Document *, bool, unsigned char)
mStatusBar->updateMod( currentView()->getDoc()->isModified() );
}
void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group )
void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group )
{
config->setGroup (group);
TQString fn = config->readEntry( "Active View" );

6
kate/app/kateviewspace.h

@ -33,7 +33,7 @@
class KVSSBSep;
class KConfig;
class TDEConfig;
class KSqueezedTextLabel;
class KateViewSpaceContainer;
@ -88,8 +88,8 @@ class KateViewSpace : public TQVBox
Kate::View* currentView();
int viewCount() const { return mViewList.count(); }
void saveConfig (KConfig* config, int myIndex,const TQString& viewConfGrp);
void restoreConfig ( class KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group );
void saveConfig (TDEConfig* config, int myIndex,const TQString& viewConfGrp);
void restoreConfig ( class KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group );
protected:

8
kate/app/kateviewspacecontainer.cpp

@ -602,7 +602,7 @@ void KateViewSpaceContainer::setShowFullPath( bool enable )
* session config functions
*/
void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQString& group)
void KateViewSpaceContainer::saveViewConfiguration(TDEConfig *config,const TQString& group)
{
bool weHaveSplittersAlive (viewSpaceCount() > 1);
@ -629,7 +629,7 @@ void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQStrin
delete l;
}
void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQString& group)
void KateViewSpaceContainer::restoreViewConfiguration (TDEConfig *config, const TQString& group)
{
config->setGroup(group);
//config->setGroup ("View Configuration");
@ -665,7 +665,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
}
void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, KConfig* config, const TQString& viewConfGrp )
void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, TDEConfig* config, const TQString& viewConfGrp )
{
TQString grp = TQString(viewConfGrp+"-Splitter %1").arg(idx);
config->setGroup(grp);
@ -712,7 +712,7 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx,
config->writeEntry("Children", childList);
}
void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp)
void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp)
{
config->setGroup( group );

10
kate/app/kateviewspacecontainer.h

@ -29,7 +29,7 @@
#include "katemdi.h"
class KConfig;
class TDEConfig;
class KateMainWindow;
class KateViewSpaceContainer: public TQVBox
@ -48,10 +48,10 @@ class KateViewSpaceContainer: public TQVBox
public:
/* This will save the splitter configuration */
void saveViewConfiguration(KConfig *config,const TQString& group);
void saveViewConfiguration(TDEConfig *config,const TQString& group);
/* restore it */
void restoreViewConfiguration (KConfig *config,const TQString& group);
void restoreViewConfiguration (TDEConfig *config,const TQString& group);
private:
/**
@ -69,12 +69,12 @@ class KateViewSpaceContainer: public TQVBox
* If child splitters are found, it calls it self with those as the argument.
* If a viewspace child is found, it is asked to save its filelist.
*/
void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, KConfig* config=0L, const TQString& viewConfGrp="");
void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, TDEConfig* config=0L, const TQString& viewConfGrp="");
/** Restore a single splitter.
* This is all the work is done for @see saveSplitterConfig()
*/
void restoreSplitter ( KConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp);
void restoreSplitter ( TDEConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp);
void removeViewSpace (KateViewSpace *viewspace);

20
kate/app/kwritemain.cpp

@ -248,7 +248,7 @@ void KWrite::slotOpen( const KURL& url )