Browse Source

Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 10 years ago
parent
commit
67e29a054c
2894 changed files with 23574 additions and 22486 deletions
  1. +11
    -11
      NewsLog.txt
  2. +1
    -1
      README.Kolab
  3. +2
    -2
      akregator/COPYING
  4. +10
    -10
      akregator/HACKING
  5. +2
    -2
      akregator/src/aboutdata.cpp
  6. +2
    -2
      akregator/src/aboutdata.h
  7. +3
    -3
      akregator/src/actionmanager.cpp
  8. +4
    -4
      akregator/src/actionmanager.h
  9. +20
    -20
      akregator/src/actionmanagerimpl.cpp
  10. +4
    -3
      akregator/src/actionmanagerimpl.h
  11. +8
    -8
      akregator/src/addfeeddialog.cpp
  12. +6
    -4
      akregator/src/addfeeddialog.h
  13. +7
    -7
      akregator/src/addfeedwidgetbase.ui
  14. +2
    -2
      akregator/src/akregator_options.h
  15. +13
    -13
      akregator/src/akregator_part.cpp
  16. +5
    -3
      akregator/src/akregator_part.h
  17. +2
    -2
      akregator/src/akregator_partiface.h
  18. +2
    -2
      akregator/src/akregator_run.cpp
  19. +3
    -2
      akregator/src/akregator_run.h
  20. +48
    -48
      akregator/src/akregator_view.cpp
  21. +13
    -12
      akregator/src/akregator_view.h
  22. +17
    -17
      akregator/src/article.cpp
  23. +4
    -4
      akregator/src/article.h
  24. +9
    -9
      akregator/src/articlefilter.cpp
  25. +4
    -4
      akregator/src/articlefilter.h
  26. +14
    -14
      akregator/src/articlelistview.cpp
  27. +4
    -3
      akregator/src/articlelistview.h
  28. +6
    -6
      akregator/src/articleviewer.cpp
  29. +4
    -3
      akregator/src/articleviewer.h
  30. +1
    -1
      akregator/src/articleviewer.rc
  31. +3
    -3
      akregator/src/configdialog.cpp
  32. +4
    -3
      akregator/src/configdialog.h
  33. +2
    -2
      akregator/src/dragobjects.cpp
  34. +2
    -2
      akregator/src/dragobjects.h
  35. +19
    -19
      akregator/src/feed.cpp
  36. +9
    -8
      akregator/src/feed.h
  37. +7
    -7
      akregator/src/feediconmanager.cpp
  38. +3
    -2
      akregator/src/feediconmanager.h
  39. +6
    -6
      akregator/src/feeditem.cpp
  40. +6
    -6
      akregator/src/feeditem.h
  41. +17
    -17
      akregator/src/feedlist.cpp
  42. +7
    -6
      akregator/src/feedlist.h
  43. +60
    -60
      akregator/src/feedlistview.cpp
  44. +11
    -9
      akregator/src/feedlistview.h
  45. +9
    -9
      akregator/src/feedstorage.h
  46. +8
    -8
      akregator/src/feedstoragedummyimpl.cpp
  47. +6
    -6
      akregator/src/feedstoragedummyimpl.h
  48. +3
    -3
      akregator/src/fetchqueue.cpp
  49. +7
    -6
      akregator/src/fetchqueue.h
  50. +40
    -40
      akregator/src/folder.cpp
  51. +17
    -16
      akregator/src/folder.h
  52. +6
    -6
      akregator/src/folderitem.cpp
  53. +6
    -6
      akregator/src/folderitem.h
  54. +9
    -9
      akregator/src/frame.cpp
  55. +5
    -4
      akregator/src/frame.h
  56. +2
    -2
      akregator/src/kcursorsaver.h
  57. +2
    -2
      akregator/src/kernel.cpp
  58. +2
    -2
      akregator/src/kernel.h
  59. +2
    -2
      akregator/src/librss/article.cpp
  60. +6
    -6
      akregator/src/librss/article.h
  61. +4
    -4
      akregator/src/librss/category.cpp
  62. +2
    -2
      akregator/src/librss/category.h
  63. +12
    -12
      akregator/src/librss/document.cpp
  64. +4
    -4
      akregator/src/librss/document.h
  65. +2
    -2
      akregator/src/librss/enclosure.cpp
  66. +2
    -2
      akregator/src/librss/enclosure.h
  67. +2
    -2
      akregator/src/librss/feeddetector.cpp
  68. +2
    -2
      akregator/src/librss/feeddetector.h
  69. +1
    -1
      akregator/src/librss/global.h
  70. +4
    -3
      akregator/src/librss/image.h
  71. +3
    -3
      akregator/src/librss/loader.cpp
  72. +11
    -7
      akregator/src/librss/loader.h
  73. +3
    -3
      akregator/src/librss/testlibrss.cpp
  74. +4
    -3
      akregator/src/librss/testlibrss.h
  75. +3
    -3
      akregator/src/librss/textinput.h
  76. +12
    -12
      akregator/src/librss/tools_p.cpp
  77. +3
    -3
      akregator/src/librss/tools_p.h
  78. +3
    -3
      akregator/src/listtabwidget.cpp
  79. +6
    -5
      akregator/src/listtabwidget.h
  80. +2
    -2
      akregator/src/main.cpp
  81. +4
    -4
      akregator/src/mainwindow.cpp
  82. +4
    -2
      akregator/src/mainwindow.h
  83. +6
    -6
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  84. +6
    -6
      akregator/src/mk4storage/feedstoragemk4impl.h
  85. +13
    -13
      akregator/src/mk4storage/metakit/CHANGES
  86. +1
    -1
      akregator/src/mk4storage/metakit/README
  87. +1
    -1
      akregator/src/mk4storage/metakit/include/mk4str.h
  88. +3
    -3
      akregator/src/mk4storage/metakit/include/mk4str.inl
  89. +64
    -64
      akregator/src/mk4storage/metakit/src/custom.cpp
  90. +2
    -2
      akregator/src/mk4storage/metakit/src/field.cpp
  91. +1
    -1
      akregator/src/mk4storage/metakit/src/field.h
  92. +1
    -1
      akregator/src/mk4storage/metakit/src/format.cpp
  93. +12
    -12
      akregator/src/mk4storage/metakit/src/handler.cpp
  94. +2
    -2
      akregator/src/mk4storage/metakit/src/handler.h
  95. +1
    -1
      akregator/src/mk4storage/metakit/src/handler.inl
  96. +2
    -2
      akregator/src/mk4storage/metakit/src/persist.cpp
  97. +4
    -4
      akregator/src/mk4storage/metakit/src/remap.cpp
  98. +2
    -2
      akregator/src/mk4storage/metakit/src/store.cpp
  99. +1
    -1
      akregator/src/mk4storage/metakit/src/view.cpp
  100. +1
    -1
      akregator/src/mk4storage/metakit/tests/ok/f07a.txt
  101. +1
    -1
      akregator/src/mk4storage/metakit/tests/regress.h
  102. +1
    -1
      akregator/src/mk4storage/metakit/tests/tformat.cpp
  103. +2
    -2
      akregator/src/mk4storage/mk4confwidget.cpp
  104. +3
    -2
      akregator/src/mk4storage/mk4confwidget.h
  105. +9
    -9
      akregator/src/mk4storage/mk4confwidgetbase.ui
  106. +2
    -2
      akregator/src/mk4storage/mk4plugin.cpp
  107. +2
    -2
      akregator/src/mk4storage/mk4plugin.h
  108. +2
    -2
      akregator/src/mk4storage/storagefactorymk4impl.cpp
  109. +2
    -2
      akregator/src/mk4storage/storagefactorymk4impl.h
  110. +3
    -3
      akregator/src/mk4storage/storagemk4impl.cpp
  111. +5
    -4
      akregator/src/mk4storage/storagemk4impl.h
  112. +8
    -8
      akregator/src/nodelist.cpp
  113. +6
    -5
      akregator/src/nodelist.h
  114. +2
    -2
      akregator/src/notificationmanager.cpp
  115. +4
    -3
      akregator/src/notificationmanager.h
  116. +7
    -7
      akregator/src/pageviewer.cpp
  117. +4
    -3
      akregator/src/pageviewer.h
  118. +1
    -1
      akregator/src/pageviewer.rc
  119. +3
    -3
      akregator/src/plugin.cpp
  120. +2
    -2
      akregator/src/plugin.h
  121. +1
    -1
      akregator/src/pluginmanager.cpp
  122. +4
    -4
      akregator/src/pluginmanager.h
  123. +6
    -6
      akregator/src/progressmanager.cpp
  124. +6
    -4
      akregator/src/progressmanager.h
  125. +6
    -6
      akregator/src/propertiesdialog.cpp
  126. +6
    -4
      akregator/src/propertiesdialog.h
  127. +24
    -24
      akregator/src/propertieswidgetbase.ui
  128. +8
    -8
      akregator/src/searchbar.cpp
  129. +6
    -5
      akregator/src/searchbar.h
  130. +1
    -1
      akregator/src/settings_advanced.cpp
  131. +3
    -2
      akregator/src/settings_advanced.h
  132. +8
    -8
      akregator/src/settings_advancedbase.ui
  133. +12
    -12
      akregator/src/settings_appearance.ui
  134. +8
    -8
      akregator/src/settings_archive.ui
  135. +11
    -11
      akregator/src/settings_browser.ui
  136. +12
    -12
      akregator/src/settings_general.ui
  137. +8
    -8
      akregator/src/simplenodeselector.cpp
  138. +7
    -5
      akregator/src/simplenodeselector.h
  139. +2
    -2
      akregator/src/speechclient.cpp
  140. +3
    -2
      akregator/src/speechclient.h
  141. +2
    -2
      akregator/src/storage.cpp
  142. +4
    -4
      akregator/src/storage.h
  143. +2
    -2
      akregator/src/storagedummyimpl.cpp
  144. +4
    -3
      akregator/src/storagedummyimpl.h
  145. +2
    -2
      akregator/src/storagefactory.h
  146. +2
    -2
      akregator/src/storagefactorydummyimpl.cpp
  147. +2
    -2
      akregator/src/storagefactorydummyimpl.h
  148. +4
    -4
      akregator/src/storagefactoryregistry.cpp
  149. +3
    -3
      akregator/src/storagefactoryregistry.h
  150. +13
    -13
      akregator/src/tabwidget.cpp
  151. +4
    -3
      akregator/src/tabwidget.h
  152. +2
    -2
      akregator/src/tag.cpp
  153. +5
    -5
      akregator/src/tag.h
  154. +5
    -5
      akregator/src/tagaction.cpp
  155. +4
    -3
      akregator/src/tagaction.h
  156. +3
    -3
      akregator/src/tagfolder.cpp
  157. +4
    -4
      akregator/src/tagfolder.h
  158. +6
    -6
      akregator/src/tagfolderitem.cpp
  159. +6
    -6
      akregator/src/tagfolderitem.h
  160. +6
    -6
      akregator/src/tagnode.cpp
  161. +5
    -4
      akregator/src/tagnode.h
  162. +6
    -6
      akregator/src/tagnodeitem.cpp
  163. +6
    -6
      akregator/src/tagnodeitem.h
  164. +16
    -16
      akregator/src/tagnodelist.cpp
  165. +5
    -4
      akregator/src/tagnodelist.h
  166. +3
    -3
      akregator/src/tagpropertiesdialog.cpp
  167. +4
    -3
      akregator/src/tagpropertiesdialog.h
  168. +6
    -6
      akregator/src/tagpropertieswidgetbase.ui
  169. +4
    -4
      akregator/src/tagset.cpp
  170. +7
    -6
      akregator/src/tagset.h
  171. +9
    -9
      akregator/src/trayicon.cpp
  172. +4
    -3
      akregator/src/trayicon.h
  173. +16
    -16
      akregator/src/treenode.cpp
  174. +12
    -11
      akregator/src/treenode.h
  175. +13
    -13
      akregator/src/treenodeitem.cpp
  176. +7
    -7
      akregator/src/treenodeitem.h
  177. +2
    -2
      akregator/src/treenodevisitor.cpp
  178. +2
    -2
      akregator/src/treenodevisitor.h
  179. +2
    -2
      akregator/src/utils.cpp
  180. +3
    -3
      akregator/src/utils.h
  181. +10
    -10
      akregator/src/viewer.cpp
  182. +5
    -4
      akregator/src/viewer.h
  183. +3
    -3
      certmanager/aboutdata.cpp
  184. +3
    -3
      certmanager/aboutdata.h
  185. +12
    -12
      certmanager/certificateinfowidget.ui
  186. +11
    -11
      certmanager/certificateinfowidgetimpl.cpp
  187. +5
    -4
      certmanager/certificateinfowidgetimpl.h
  188. +29
    -29
      certmanager/certificatewizard.ui
  189. +13
    -13
      certmanager/certificatewizardimpl.cpp
  190. +6
    -5
      certmanager/certificatewizardimpl.h
  191. +2
    -2
      certmanager/certlistview.cpp
  192. +2
    -1
      certmanager/certlistview.h
  193. +35
    -35
      certmanager/certmanager.cpp
  194. +7
    -6
      certmanager/certmanager.h
  195. +7
    -7
      certmanager/conf/appearanceconfigpage.cpp
  196. +5
    -4
      certmanager/conf/appearanceconfigpage.h
  197. +8
    -8
      certmanager/conf/appearanceconfigwidget.cpp
  198. +5
    -4
      certmanager/conf/appearanceconfigwidget.h
  199. +12
    -12
      certmanager/conf/appearanceconfigwidgetbase.ui
  200. +5
    -5
      certmanager/conf/configuredialog.cpp
  201. +5
    -4
      certmanager/conf/configuredialog.h
  202. +12
    -12
      certmanager/conf/dirservconfigpage.cpp
  203. +7
    -6
      certmanager/conf/dirservconfigpage.h
  204. +7
    -7
      certmanager/conf/dnorderconfigpage.cpp
  205. +5
    -4
      certmanager/conf/dnorderconfigpage.h
  206. +7
    -7
      certmanager/crlview.cpp
  207. +5
    -4
      certmanager/crlview.h
  208. +9
    -9
      certmanager/customactions.cpp
  209. +9
    -6
      certmanager/customactions.h
  210. +7
    -7
      certmanager/hierarchyanalyser.cpp
  211. +5
    -4
      certmanager/hierarchyanalyser.h
  212. +1
    -1
      certmanager/kleopatraui.rc
  213. +3
    -3
      certmanager/kwatchgnupg/aboutdata.cpp
  214. +3
    -3
      certmanager/kwatchgnupg/aboutdata.h
  215. +7
    -7
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  216. +5
    -4
      certmanager/kwatchgnupg/kwatchgnupgconfig.h
  217. +11
    -11
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  218. +5
    -4
      certmanager/kwatchgnupg/kwatchgnupgmainwin.h
  219. +3
    -3
      certmanager/kwatchgnupg/main.cpp
  220. +3
    -3
      certmanager/kwatchgnupg/tray.cpp
  221. +4
    -3
      certmanager/kwatchgnupg/tray.h
  222. +4
    -4
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  223. +3
    -3
      certmanager/lib/backends/chiasmus/chiasmusbackend.h
  224. +7
    -7
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  225. +9
    -8
      certmanager/lib/backends/chiasmus/chiasmusjob.h
  226. +3
    -3
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  227. +3
    -3
      certmanager/lib/backends/chiasmus/chiasmuslibrary.h
  228. +3
    -3
      certmanager/lib/backends/chiasmus/config_data.c
  229. +7
    -7
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  230. +5
    -4
      certmanager/lib/backends/chiasmus/obtainkeysjob.h
  231. +5
    -5
      certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
  232. +5
    -4
      certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
  233. +3
    -3
      certmanager/lib/backends/kpgp/gpg1backend.h
  234. +3
    -3
      certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
  235. +3
    -3
      certmanager/lib/backends/kpgp/kpgpbackendbase.h
  236. +3
    -3
      certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp
  237. +4
    -3
      certmanager/lib/backends/kpgp/kpgpkeylistjob.h
  238. +3
    -3
      certmanager/lib/backends/kpgp/kpgpwrapper.cpp
  239. +3
    -3
      certmanager/lib/backends/kpgp/kpgpwrapper.h
  240. +3
    -3
      certmanager/lib/backends/kpgp/pgp2backend.h
  241. +3
    -3
      certmanager/lib/backends/kpgp/pgp5backend.h
  242. +3
    -3
      certmanager/lib/backends/kpgp/pgp6backend.h
  243. +15
    -15
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  244. +8
    -7
      certmanager/lib/backends/qgpgme/gnupgprocessbase.h
  245. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  246. +6
    -6
      certmanager/lib/backends/qgpgme/qgpgmebackend.h
  247. +11
    -11
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  248. +9
    -7
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
  249. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp
  250. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
  251. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp
  252. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
  253. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp
  254. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
  255. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp
  256. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
  257. +5
    -5
      certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
  258. +9
    -8
      certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
  259. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp
  260. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
  261. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp
  262. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
  263. +6
    -6
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  264. +17
    -17
      certmanager/lib/backends/qgpgme/qgpgmejob.h
  265. +4
    -4
      certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp
  266. +10
    -9
      certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
  267. +5
    -5
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  268. +9
    -8
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
  269. +9
    -9
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  270. +6
    -6
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h
  271. +11
    -11
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  272. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
  273. +11
    -11
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
  274. +9
    -8
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
  275. +5
    -5
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
  276. +9
    -8
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
  277. +5
    -5
      certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
  278. +9
    -8
      certmanager/lib/backends/qgpgme/qgpgmesignjob.h
  279. +4
    -4
      certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp
  280. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
  281. +3
    -3
      certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp
  282. +8
    -7
      certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
  283. +6
    -6
      certmanager/lib/cryptplug.cpp
  284. +2
    -2
      certmanager/lib/cryptplug.h
  285. +3
    -3
      certmanager/lib/cryptplugfactory.cpp
  286. +4
    -3
      certmanager/lib/cryptplugfactory.h
  287. +20
    -20
      certmanager/lib/cryptplugwrapper.cpp
  288. +22
    -22
      certmanager/lib/cryptplugwrapper.h
  289. +1
    -1
      certmanager/lib/cryptplugwrapperlist.cpp
  290. +3
    -3
      certmanager/lib/kleo/cryptobackend.cpp
  291. +4
    -4
      certmanager/lib/kleo/cryptobackend.h
  292. +10
    -10
      certmanager/lib/kleo/cryptobackendfactory.cpp
  293. +5
    -4
      certmanager/lib/kleo/cryptobackendfactory.h
  294. +3
    -3
      certmanager/lib/kleo/cryptoconfig.h
  295. +5
    -4
      certmanager/lib/kleo/decryptjob.h
  296. +5
    -4
      certmanager/lib/kleo/decryptverifyjob.h
  297. +5
    -4
      certmanager/lib/kleo/deletejob.h
  298. +13
    -13
      certmanager/lib/kleo/dn.cpp
  299. +5
    -5
      certmanager/lib/kleo/dn.h
  300. +5
    -4
      certmanager/lib/kleo/downloadjob.h
  301. +5
    -4
      certmanager/lib/kleo/encryptjob.h
  302. +4
    -4
      certmanager/lib/kleo/enum.cpp
  303. +3
    -3
      certmanager/lib/kleo/enum.h
  304. +6
    -5
      certmanager/lib/kleo/exportjob.h
  305. +4
    -4
      certmanager/lib/kleo/hierarchicalkeylistjob.cpp
  306. +4
    -3
      certmanager/lib/kleo/hierarchicalkeylistjob.h
  307. +6
    -5
      certmanager/lib/kleo/importjob.h
  308. +6
    -6
      certmanager/lib/kleo/job.cpp
  309. +6
    -5
      certmanager/lib/kleo/job.h
  310. +3
    -3
      certmanager/lib/kleo/kconfigbasedkeyfilter.cpp
  311. +3
    -3
      certmanager/lib/kleo/kconfigbasedkeyfilter.h
  312. +3
    -3
      certmanager/lib/kleo/keyfilter.h
  313. +5
    -5
      certmanager/lib/kleo/keyfiltermanager.cpp
  314. +5
    -4
      certmanager/lib/kleo/keyfiltermanager.h
  315. +5
    -4
      certmanager/lib/kleo/keygenerationjob.h
  316. +6
    -5
      certmanager/lib/kleo/keylistjob.h
  317. +3
    -3
      certmanager/lib/kleo/multideletejob.cpp
  318. +4
    -3
      certmanager/lib/kleo/multideletejob.h
  319. +3
    -3
      certmanager/lib/kleo/oidmap.h
  320. +6
    -5
      certmanager/lib/kleo/refreshkeysjob.h
  321. +5
    -4
      certmanager/lib/kleo/signencryptjob.h
  322. +5
    -4
      certmanager/lib/kleo/signjob.h
  323. +6
    -5
      certmanager/lib/kleo/specialjob.h
  324. +7
    -6
      certmanager/lib/kleo/verifydetachedjob.h
  325. +7
    -6
      certmanager/lib/kleo/verifyopaquejob.h
  326. +7
    -6
      certmanager/lib/tests/gnupgviewer.h
  327. +2
    -2
      certmanager/lib/tests/test.data
  328. +4
    -4
      certmanager/lib/tests/test_cryptoconfig.cpp
  329. +9
    -9
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  330. +3
    -3
      certmanager/lib/tests/test_jobs.cpp
  331. +5
    -5
      certmanager/lib/tests/test_keygen.cpp
  332. +5
    -4
      certmanager/lib/tests/test_keygen.h
  333. +7
    -7
      certmanager/lib/tests/test_keylister.cpp
  334. +5
    -4
      certmanager/lib/tests/test_keylister.h
  335. +3
    -3
      certmanager/lib/tests/test_keyselectiondialog.cpp
  336. +3
    -3
      certmanager/lib/tests/test_verify.cpp
  337. +13
    -13
      certmanager/lib/ui/adddirectoryservicedialog.ui
  338. +7
    -7
      certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
  339. +5
    -4
      certmanager/lib/ui/adddirectoryservicedialogimpl.h
  340. +12
    -12
      certmanager/lib/ui/backendconfigwidget.cpp
  341. +5
    -4
      certmanager/lib/ui/backendconfigwidget.h
  342. +5
    -5
      certmanager/lib/ui/cryptoconfigdialog.cpp
  343. +5
    -4
      certmanager/lib/ui/cryptoconfigdialog.h
  344. +10
    -10
      certmanager/lib/ui/cryptoconfigmodule.cpp
  345. +5
    -4
      certmanager/lib/ui/cryptoconfigmodule.h
  346. +22
    -12
      certmanager/lib/ui/cryptoconfigmodule_p.h
  347. +8
    -8
      certmanager/lib/ui/directoryserviceswidget.cpp
  348. +5
    -4
      certmanager/lib/ui/directoryserviceswidget.h
  349. +12
    -12
      certmanager/lib/ui/directoryserviceswidgetbase.ui
  350. +7
    -7
      certmanager/lib/ui/dnattributeorderconfigwidget.cpp
  351. +6
    -5
      certmanager/lib/ui/dnattributeorderconfigwidget.h
  352. +14
    -16
      certmanager/lib/ui/kdhorizontalline.cpp
  353. +9
    -8
      certmanager/lib/ui/kdhorizontalline.h
  354. +5
    -5
      certmanager/lib/ui/keyapprovaldialog.cpp
  355. +5
    -4
      certmanager/lib/ui/keyapprovaldialog.h
  356. +66
    -66
      certmanager/lib/ui/keylistview.cpp
  357. +24
    -23
      certmanager/lib/ui/keylistview.h
  358. +19
    -19
      certmanager/lib/ui/keyrequester.cpp
  359. +15
    -12
      certmanager/lib/ui/keyrequester.h
  360. +16
    -16
      certmanager/lib/ui/keyselectiondialog.cpp
  361. +7
    -6
      certmanager/lib/ui/keyselectiondialog.h
  362. +45
    -44
      certmanager/lib/ui/messagebox.cpp
  363. +23
    -23
      certmanager/lib/ui/messagebox.h
  364. +5
    -5
      certmanager/lib/ui/passphrasedialog.cpp
  365. +6
    -5
      certmanager/lib/ui/passphrasedialog.h
  366. +5
    -5
      certmanager/lib/ui/progressbar.cpp
  367. +5
    -4
      certmanager/lib/ui/progressbar.h
  368. +4
    -4
      certmanager/lib/ui/progressdialog.cpp
  369. +4
    -3
      certmanager/lib/ui/progressdialog.h
  370. +3
    -3
      certmanager/main.cpp
  371. +1
    -0
      certmanager/storedtransferjob.h
  372. +3
    -3
      doc/api/Doxyfile.pim
  373. +2
    -2
      doc/api/doxygen.css
  374. +2
    -2
      indexlib/GPL_V2
  375. +3
    -3
      indexlib/bitio.h
  376. +3
    -3
      indexlib/bitstream.cpp
  377. +3
    -3
      indexlib/bitstream.h
  378. +1
    -1
      indexlib/boost-compat/config/auto_link.hpp
  379. +1
    -1
      indexlib/boost-compat/config/platform/macos.hpp
  380. +3
    -3
      indexlib/boost-compat/config/requires_threads.hpp
  381. +1
    -1
      indexlib/boost-compat/config/select_stdlib_config.hpp
  382. +1
    -1
      indexlib/boost-compat/config/suffix.hpp
  383. +4
    -4
      indexlib/boost-compat/config/user.hpp
  384. +1
    -1
      indexlib/boost-compat/shared_ptr.hpp
  385. +4
    -4
      indexlib/compat.h
  386. +3
    -3
      indexlib/compressed.cpp
  387. +3
    -3
      indexlib/compressed.h
  388. +3
    -3
      indexlib/create.cpp
  389. +3
    -3
      indexlib/create.h
  390. +3
    -3
      indexlib/exception.cpp
  391. +3
    -3
      indexlib/exception.h
  392. +3
    -3
      indexlib/ifile.cpp
  393. +3
    -3
      indexlib/ifile.h
  394. +3
    -3
      indexlib/index.h
  395. +3
    -3
      indexlib/index_slow.h
  396. +3
    -3
      indexlib/leafdata.cpp
  397. +3
    -3
      indexlib/leafdata.h
  398. +3
    -3
      indexlib/leafdatavector.cpp
  399. +3
    -3
      indexlib/leafdatavector.h
  400. +3
    -3
      indexlib/lockfile.cpp
  401. +3
    -3
      indexlib/lockfile.h
  402. +3
    -3
      indexlib/logfile.cpp
  403. +3
    -3
      indexlib/logfile.h
  404. +3
    -3
      indexlib/main.cpp
  405. +6
    -6
      indexlib/manager.h
  406. +3
    -3
      indexlib/match.cpp
  407. +3
    -3
      indexlib/match.h
  408. +8
    -8
      indexlib/mempool.h
  409. +1
    -1
      indexlib/mempool.tcc
  410. +3
    -3
      indexlib/memreference.h
  411. +3
    -3
      indexlib/memvector.h
  412. +3
    -3
      indexlib/mmap_manager.cpp
  413. +3
    -3
      indexlib/mmap_manager.h
  414. +3
    -3
      indexlib/path.h
  415. +3
    -3
      indexlib/pointer.h
  416. +3
    -3
      indexlib/quotes.cpp
  417. +6
    -6
      indexlib/quotes.h
  418. +3
    -3
      indexlib/result.h
  419. +3
    -3
      indexlib/slow.cpp
  420. +3
    -3
      indexlib/slow.h
  421. +3
    -3
      indexlib/stringarray.cpp
  422. +3
    -3
      indexlib/stringarray.h
  423. +3
    -3
      indexlib/stringset.cpp
  424. +4
    -4
      indexlib/stringset.h
  425. +36
    -36
      indexlib/tests/ifile-test.cpp
  426. +19
    -19
      indexlib/tests/leafdatavector-test.cpp
  427. +25
    -25
      indexlib/tests/match-test.cpp
  428. +1
    -1
      indexlib/tests/mempool-test.cpp
  429. +54
    -54
      indexlib/tests/memvector-test.cpp
  430. +21
    -21
      indexlib/tests/stringarray-test.cpp
  431. +31
    -31
      indexlib/tests/stringset-test.cpp
  432. +3
    -3
      indexlib/tests/testdriver.cpp
  433. +6
    -6
      indexlib/tests/tokenizer-test.cpp
  434. +3
    -3
      indexlib/thing.h
  435. +103
    -103
      kabc/frontend/mainWindow.ui
  436. +18
    -18
      kabc/frontend/mainWindow.ui.h
  437. +5
    -5
      kabc/kabc2mutt/kabc2mutt.cpp
  438. +3
    -2
      kabc/kabc2mutt/kabc2mutt.h
  439. +1
    -1
      kaddressbook/TODO
  440. +20
    -20
      kaddressbook/addresseditwidget.cpp
  441. +8
    -6
      kaddressbook/addresseditwidget.h
  442. +2
    -2
      kaddressbook/addresseeconfig.cpp
  443. +2
    -2
      kaddressbook/addresseeconfig.h
  444. +2
    -2
      kaddressbook/addresseeeditorbase.cpp
  445. +6
    -5
      kaddressbook/addresseeeditorbase.h
  446. +5
    -5
      kaddressbook/addresseeeditordialog.cpp
  447. +4
    -3
      kaddressbook/addresseeeditordialog.h
  448. +4
    -4
      kaddressbook/addresseeeditorextension.cpp
  449. +4
    -3
      kaddressbook/addresseeeditorextension.h
  450. +8
    -8
      kaddressbook/addresseeeditorwidget.cpp
  451. +4
    -3
      kaddressbook/addresseeeditorwidget.h
  452. +2
    -2
      kaddressbook/addresseeutil.cpp
  453. +2
    -2
      kaddressbook/addresseeutil.h
  454. +9
    -9
      kaddressbook/addviewdialog.cpp
  455. +4
    -3
      kaddressbook/addviewdialog.h
  456. +4
    -4
      kaddressbook/advancedcustomfields.cpp
  457. +4
    -3
      kaddressbook/advancedcustomfields.h
  458. +3
    -3
      kaddressbook/common/filter.cpp
  459. +2
    -2
      kaddressbook/common/filter.h
  460. +2
    -2
      kaddressbook/common/kabprefs.cpp
  461. +2
    -2
      kaddressbook/common/kabprefs.h
  462. +3
    -3
      kaddressbook/common/locationmap.cpp
  463. +4
    -3
      kaddressbook/common/locationmap.h
  464. +4
    -4
      kaddressbook/contacteditorwidgetmanager.cpp
  465. +7
    -5
      kaddressbook/contacteditorwidgetmanager.h
  466. +47
    -47
      kaddressbook/customfieldswidget.cpp
  467. +11
    -8
      kaddressbook/customfieldswidget.h
  468. +8
    -8
      kaddressbook/distributionlisteditor.cpp
  469. +4
    -3
      kaddressbook/distributionlisteditor.h
  470. +7
    -5
      kaddressbook/distributionlisteditor_p.h
  471. +6
    -6
      kaddressbook/distributionlistentryview.cpp
  472. +3
    -2
      kaddressbook/distributionlistentryview.h
  473. +3
    -3
      kaddressbook/distributionlistpicker.cpp
  474. +4
    -3
      kaddressbook/distributionlistpicker.h
  475. +4
    -4
      kaddressbook/editors/cryptowidget.cpp
  476. +6
    -5
      kaddressbook/editors/cryptowidget.h
  477. +9
    -9
      kaddressbook/editors/imaddressbase.ui
  478. +6
    -6
      kaddressbook/editors/imaddresswidget.cpp
  479. +5
    -4
      kaddressbook/editors/imaddresswidget.h
  480. +2
    -2
      kaddressbook/editors/imeditorbase.ui
  481. +12
    -12
      kaddressbook/editors/imeditorwidget.cpp
  482. +5
    -4
      kaddressbook/editors/imeditorwidget.h
  483. +11
    -11
      kaddressbook/emaileditwidget.cpp
  484. +7
    -5
      kaddressbook/emaileditwidget.h
  485. +4
    -4
      kaddressbook/extensionmanager.cpp
  486. +5
    -4
      kaddressbook/extensionmanager.h
  487. +6
    -6
      kaddressbook/features/distributionlistngwidget.cpp
  488. +6
    -4
      kaddressbook/features/distributionlistngwidget.h
  489. +24
    -24
      kaddressbook/features/distributionlistwidget.cpp
  490. +8
    -6
      kaddressbook/features/distributionlistwidget.h
  491. +15
    -15
      kaddressbook/features/resourceselection.cpp
  492. +4
    -3
      kaddressbook/features/resourceselection.h
  493. +7
    -7
      kaddressbook/filtereditdialog.cpp
  494. +6
    -4
      kaddressbook/filtereditdialog.h
  495. +4
    -4
      kaddressbook/filterselectionwidget.cpp
  496. +5
    -4
      kaddressbook/filterselectionwidget.h
  497. +4
    -4
      kaddressbook/freebusywidget.cpp
  498. +6
    -5
      kaddressbook/freebusywidget.h
  499. +11
    -11
      kaddressbook/geowidget.cpp
  500. +11
    -8
      kaddressbook/geowidget.h

+ 11
- 11
NewsLog.txt View File

@ -66,7 +66,7 @@ Problems addressed
------------------
* kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
* kolab/issue4455: calendar activate/deactivate handling broken
* kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
dialog 'store/throw away' (rt#6094)
@ -269,7 +269,7 @@ Problems addressed
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
* kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
* kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
@ -551,7 +551,7 @@ Problems addressed
* kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
* kolab/issue3930: time on the Marcus Bains line doesn't change
* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
* kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
* kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@ -565,7 +565,7 @@ Problems addressed
* kolab/issue3065: Crash in KOAgendaItem::paintEvent
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
* kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
* kolab/issue3813: reccuring events show wrong dates (rt#5855)
@ -593,7 +593,7 @@ Friday, October 2th 2009
Problems addressed
------------------
* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog contains ???? at the bottom
* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog tqcontains ???? at the bottom
* kolab/issue3823: mimetreeviewer doesn't show structure of forward-as-attachment message #n where #n > 1
* kolab/issue3889: Kontact crahes if opening/changing calendar view (rt#5868)
* kolab/issue3867: Save S/MIME encrypted mails unencrypted after reading them
@ -1108,7 +1108,7 @@ Friday, November 21st 2008
Problems addressed
------------------
* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
* kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.
@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
Problems addressed
------------------
* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
*Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
* Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
@ -1474,7 +1474,7 @@ Friday, February 29th 2008
Problems addressed
-------------------
* Prevent crash after changing the layout and replying then. (778728)
* Prevent crash after changing the tqlayout and replying then. (778728)
* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
* "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
* kolab/issue1700 kleopatra crashes after ldap search. (780211)
@ -1696,10 +1696,10 @@ Problems addressed
* kolab/issue2142 ( part 1 ) Make sure the file selector is shown on top of the filter dialog. (732794)
* crash when there is no smime backend, and the protocol can't be determined.(733049 )
* kolab/issue2151 Fix creation of new folders when restarting KMail before the next sync. ( 733149 )
* kolab/issue2142 ( part 2 ) Provide a proper parent for the "ask to overwrite" dialog.(733495)
* kolab/issue2142 ( part 2 ) Provide a proper tqparent for the "ask to overwrite" dialog.(733495)
* kolab/issue 2176 Move transaction code into the filtermanager, from the caller and make sure filter counts are written to and read from the right section. ( 733511 )
* kolab/issue2175 Show an error message if the to-be-imported filters file can't be read. (733519 )
* kolab/issue2181 Fix crash when opening a message without a parent, cleanup initialization order.(734247)
* kolab/issue2181 Fix crash when opening a message without a tqparent, cleanup initialization order.(734247)
New functionality
-------------------
@ -2063,7 +2063,7 @@ Bugfixes
Korganizer
-----------
- proko35 W1-9 icon alignment was improved.
- proko35 W1-9 icon tqalignment was improved.
Additional Fixes
================


+ 1
- 1
README.Kolab View File

@ -39,7 +39,7 @@ KAddressBook:
The scheme for the base DN is to take the parts of the fully
qualified hostname of the kolab server and put ",dc=" between
the parts and "dc=" in front of it. Or in Qt code:
baseDN = "dc=" + hostname.replace( '.', ",dc=" );
baseDN = "dc=" + hostname.tqreplace( '.', ",dc=" );
Finally check the checkbox to activate the LDAP server. Now
you can search the Kolab LDAP server and get all users on the
system.


+ 2
- 2
akregator/COPYING View File

@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
0. This License applies to any program or other work which tqcontains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
code means all the source code for all modules it tqcontains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include


+ 10
- 10
akregator/HACKING View File

@ -66,7 +66,7 @@ Spaces
================================================================================
Spaces should be used between the conditional / loop type and the
conditional statement. They should not be used after parenthesis. However
conditional statement. They should not be used after tqparenthesis. However
the should be to mark of mathematical or comparative operators.
if ( foo == bar )
@ -87,17 +87,17 @@ class should be roughly as follows:
public typedefs:
public ctors:
public methods:
public slots:
signals:
public Q_SLOTS:
Q_SIGNALS:
protected methods:
protected slots:
protected Q_SLOTS:
protected fields:
private methods:
private slots:
private Q_SLOTS:
private fields:
private ctors: // if you define ctors/dtor as private, put them at end
If there are no private slots there is no need for two private sections, however
If there are no private Q_SLOTS there is no need for two private sections, however
private functions and private variables should be clearly separated.
The implementations files -- .cpp files -- should follow (when possible) the
@ -163,10 +163,10 @@ class Test : public QObject
static Test *instance() { return m_instance; }
public slots:
public Q_SLOTS:
void receive(QSomething &);
signals:
Q_SIGNALS:
void send(QSomething &);
protected:
@ -174,7 +174,7 @@ class Test : public QObject
static void someProtectedStaticFunc();
protected slots:
protected Q_SLOTS:
void protectedSlot();
protected:
@ -185,7 +185,7 @@ class Test : public QObject
static int staticPrivateMethod();
private slots:
private Q_SLOTS:
void privateSlotIndeed(int youWonder);
private:


+ 2
- 2
akregator/src/aboutdata.cpp View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include <tqstring.h>


+ 2
- 2
akregator/src/aboutdata.h View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef ABOUTDATA_H


+ 3
- 3
akregator/src/actionmanager.cpp View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include "actionmanager.h"
@ -43,7 +43,7 @@ void ActionManager::setInstance(ActionManager* manager)
}
ActionManager::ActionManager(TQObject* parent, const char* name) : TQObject(parent, name), d(new ActionManagerPrivate)
ActionManager::ActionManager(TQObject* tqparent, const char* name) : TQObject(tqparent, name), d(new ActionManagerPrivate)
{}
ActionManager::~ActionManager()


+ 4
- 4
akregator/src/actionmanager.h View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATOR_ACTIONMANAGER_H
@ -36,14 +36,14 @@ namespace Akregator {
/** interface for accessing actions, popup menus etc. from widgets.
(Extracted from the implementation to avoid dependencies between widgets and Akregator::Part).
*/
class ActionManager : public QObject
class ActionManager : public TQObject
{
public:
static ActionManager* getInstance();
static void setInstance(ActionManager* manager);
ActionManager(TQObject* parent=0, const char* name=0);
ActionManager(TQObject* tqparent=0, const char* name=0);
virtual ~ActionManager();
virtual KAction* action(const char* name, const char* classname=0) = 0;


+ 20
- 20
akregator/src/actionmanagerimpl.cpp View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include <tqwidget.h>
@ -89,7 +89,7 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor
{
KAction* remove = m_manager->action("feed_remove");
if (remove)
remove->setEnabled(node->parent()); // root nodes must not be deleted
remove->setEnabled(node->tqparent()); // root nodes must not be deleted
KAction* hp = m_manager->action("feed_homepage");
if (hp)
hp->setEnabled(false);
@ -222,7 +222,7 @@ void ActionManagerImpl::slotNodeSelected(TreeNode* node)
d->nodeSelectVisitor->visit(node);
}
ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* parent, const char* name) : ActionManager(parent, name), d(new ActionManagerImplPrivate)
ActionManagerImpl::ActionManagerImpl(Part* part, TQObject* tqparent, const char* name) : ActionManager(tqparent, name), d(new ActionManagerImplPrivate)
{
d->nodeSelectVisitor = new NodeSelectVisitor(this);
d->part = part;
@ -314,13 +314,13 @@ void ActionManagerImpl::initView(View* view)
new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
// Settings menu
KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString::null, 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
sqf->setChecked( Settings::showQuickFilter() );
new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
new KAction( i18n("Open in Background Tab"), TQString::null, "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
@ -364,10 +364,10 @@ void ActionManagerImpl::initView(View* view)
connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));
new KAction( i18n("Move Node Up"), TQString::null, "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
new KAction( i18n("Move Node Down"), TQString::null, "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
new KAction( i18n("Move Node Left"), TQString::null, "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
new KAction( i18n("Move Node Right"), TQString::null, "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
new KAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
}
void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
else
d->articleList = articleList;
new KAction( i18n("&Previous Article"), TQString::null, "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
new KAction( i18n("&Next Article"), TQString::null, "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
}
void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@ -401,12 +401,12 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
new KAction( i18n("Go to Top of Tree"), TQString::null, "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
new KAction( i18n("Go to Bottom of Tree"), TQString::null, "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
new KAction( i18n("Go Left in Tree"), TQString::null, "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
new KAction( i18n("Go Right in Tree"), TQString::null, "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
new KAction( i18n("Go Up in Tree"), TQString::null, "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
new KAction( i18n("Go Down in Tree"), TQString::null, "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
}
void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@ -419,7 +419,7 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
new KAction( i18n("Copy Link Address"), TQString::null, TQString::null, d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
}


+ 4
- 3
akregator/src/actionmanagerimpl.h View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATOR_ACTIONMANAGERIMPL_H
@ -50,9 +50,10 @@ class TabWidget;
class ActionManagerImpl : public ActionManager
{
Q_OBJECT
TQ_OBJECT
public:
ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
ActionManagerImpl(Part* part, TQObject* tqparent=0, const char* name=0);
virtual ~ActionManagerImpl();
virtual KAction* action(const char* name, const char* classname=0);


+ 8
- 8
akregator/src/addfeeddialog.cpp View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include "feed.h"
@ -39,18 +39,18 @@
namespace Akregator {
AddFeedWidget::AddFeedWidget(TQWidget *parent, const char *name)
: AddFeedWidgetBase(parent, name)
AddFeedWidget::AddFeedWidget(TQWidget *tqparent, const char *name)
: AddFeedWidgetBase(tqparent, name)
{
pixmapLabel1->setPixmap(kapp->iconLoader()->loadIcon( "package_network",KIcon::Desktop,KIcon::SizeHuge, KIcon::DefaultState, 0, true));
statusLabel->setText(TQString::null);
statusLabel->setText(TQString());
}
AddFeedWidget::~AddFeedWidget()
{}
AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name)
: KDialogBase(KDialogBase::Swallow, Qt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
AddFeedDialog::AddFeedDialog(TQWidget *tqparent, const char *name)
: KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, tqparent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel)
{
widget = new AddFeedWidget(this);
connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&)));
@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( )
if (feedURL.startsWith("feed:"))
feedURL = feedURL.right( feedURL.length() - 5 );
if (feedURL.find(":/") == -1)
if (feedURL.tqfind(":/") == -1)
feedURL.prepend("http://");
f->setXmlUrl(feedURL);


+ 6
- 4
akregator/src/addfeeddialog.h View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATORADDFEEDDIALOG_H
@ -41,16 +41,18 @@ namespace Akregator
class AddFeedWidget : public AddFeedWidgetBase
{
Q_OBJECT
TQ_OBJECT
public:
AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
AddFeedWidget(TQWidget *tqparent = 0, const char *name = 0);
~AddFeedWidget();
};
class AddFeedDialog : public KDialogBase
{
Q_OBJECT
TQ_OBJECT
public:
AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
AddFeedDialog(TQWidget *tqparent = 0, const char *name = 0);
~AddFeedDialog();
void setURL(const TQString& t);


+ 7
- 7
akregator/src/addfeedwidgetbase.ui View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>Akregator::AddFeedWidgetBase</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>AddFeedWidget</cstring>
</property>
@ -22,7 +22,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
</property>
@ -30,7 +30,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>pixmapLabel1</cstring>
</property>
@ -63,7 +63,7 @@
</size>
</property>
</spacer>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
</property>
@ -82,7 +82,7 @@
</size>
</property>
</widget>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@ -95,7 +95,7 @@
<string>Add New Source</string>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@ -115,7 +115,7 @@
<cstring>statusLabel</cstring>
</property>
<property name="text">
<string>Status</string>
<string>tqStatus</string>
</property>
</widget>
<spacer>


+ 2
- 2
akregator/src/akregator_options.h View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATOR_OPTIONS_H


+ 13
- 13
akregator/src/akregator_part.cpp View File

@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include <dcopclient.h>
#include <kaboutdata.h>
@ -117,9 +117,9 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
};
Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
TQObject *parent, const char *name, const TQStringList& )
TQObject *tqparent, const char *name, const TQStringList& )
: DCOPObject("AkregatorIface")
, MyBasePart(parent, name)
, MyBasePart(tqparent, name)
, m_standardListLoaded(false)
, m_shuttingDown(false)
, m_mergedPart(0)
@ -416,7 +416,7 @@ bool Part::openFile()
{
if (file.open(IO_ReadOnly))
{
// Read OPML feeds list and build QDom tree.
// Read OPML feeds list and build TQDom tree.
TQTextStream stream(&file);
stream.setEncoding(TQTextStream::UnicodeUTF8); // FIXME not all opmls are in utf8
str = stream.read();
@ -452,7 +452,7 @@ bool Part::openFile()
m_view->loadFeeds(createDefaultFeedList());
}
emit setStatusBarText(TQString::null);
emit setStatusBarText(TQString());
if( Settings::markAllFeedsReadOnStartup() )
@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
{
if (m_mergedPart) {
factory()->removeClient(m_mergedPart);
if (childClients()->tqcontainsRef(m_mergedPart))
if (childClients()->containsRef(m_mergedPart))
removeChildClient(m_mergedPart);
}
if (part)
@ -634,7 +634,7 @@ void Part::importFile(const KURL& url)
TQFile file(filename);
if (file.open(IO_ReadOnly))
{
// Read OPML feeds list and build QDom tree.
// Read OPML feeds list and build TQDom tree.
TQDomDocument doc;
if (doc.setContent(file.readAll()))
m_view->importFeeds(doc);
@ -692,7 +692,7 @@ void Part::exportFile(const KURL& url)
void Part::fileImport()
{
KURL url = KFileDialog::getOpenURL( TQString::null,
KURL url = KFileDialog::getOpenURL( TQString(),
"*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
+"\n*|" + i18n("All Files") );
@ -702,7 +702,7 @@ void Part::fileImport()
void Part::fileExport()
{
KURL url= KFileDialog::getSaveURL( TQString::null,
KURL url= KFileDialog::getSaveURL( TQString(),
"*.opml *.xml|" + i18n("OPML Outlines (*.opml, *.xml)")
+"\n*|" + i18n("All Files") );
@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.arg( programName, programName, backendName );
// TQString::arg( st ) only tqreplaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
// TQString::arg( st ) only replaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) replacess all occurrences
// of %1 with s1 and all occurrences of %2 with s2. So don't
// even think about changing the above to .arg( programName ).
else
@ -1014,7 +1014,7 @@ bool Part::tryToLock(const TQString& backendName)
KCursorSaver idle( KBusyPtr::idle() );
if ( KMessageBox::No ==
KMessageBox::warningYesNo( 0, msg, TQString::null,
KMessageBox::warningYesNo( 0, msg, TQString(),
i18n("Force Access"),
i18n("Disable Archive")) )
{


+ 5
- 3
akregator/src/akregator_part.h View File

@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef _AKREGATORPART_H_
@ -60,6 +60,7 @@ namespace Akregator
class BrowserExtension : public KParts::BrowserExtension
{
Q_OBJECT
TQ_OBJECT
public:
BrowserExtension(Part *p, const char *name );
@ -76,12 +77,13 @@ namespace Akregator
class Part : public MyBasePart, virtual public AkregatorPartIface
{
Q_OBJECT
TQ_OBJECT
public:
typedef MyBasePart inherited;
/** Default constructor.*/
Part(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList&);
TQObject *tqparent, const char *name, const TQStringList&);
/** Destructor. */
virtual ~Part();


+ 2
- 2
akregator/src/akregator_partiface.h View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATORPARTIFACE_H


+ 2
- 2
akregator/src/akregator_run.cpp View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include <kdebug.h>


+ 3
- 2
akregator/src/akregator_run.h View File

@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#ifndef AKREGATOR_RUN_H
@ -35,6 +35,7 @@ class Viewer;
class BrowserRun : public KParts::BrowserRun
{
Q_OBJECT
TQ_OBJECT
public:
/** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum */
enum OpeningMode


+ 48
- 48
akregator/src/akregator_view.cpp View File

@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include "actionmanagerimpl.h"
@ -210,8 +210,8 @@ View::~View()
kdDebug() << "View::~View(): leaving" << endl;
}
View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
: TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
: TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
{
m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
if (!Settings::resetQuickFilterOnNodeChange())
{
m_searchBar->slotSeStatus(Settings::statusFilter());
m_searchBar->slotSetqStatus(Settings::statusFilter());
m_searchBar->slotSetText(Settings::textFilter());
}
@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc)
return true;
}
bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
{
FeedList* feedList = new FeedList();
bool parsed = feedList->readFromXML(doc);
@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
}
m_feedListView->setUpdatesEnabled(false);
m_tagNodeListView->setUpdatesEnabled(false);
if (!parent)
if (!tqparent)
{
TagSet* tagSet = Kernel::self()->tagSet();
@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
// create a tag for every tag ID in the archive that is not part of the tagset
// this is a fallback in case the tagset was corrupted,
// so the tagging information from archive does not get lost.
if (!tagSet->tqcontainsID(*it))
if (!tagSet->containsID(*it))
{
Tag tag(*it, *it);
tagSet->insert(tag);
@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
}
}
else
m_feedList->append(feedList, parent);
m_feedList->append(feedList, tqparent);
m_feedListView->setUpdatesEnabled(true);
m_feedListView->triggerUpdate();
@ -705,7 +705,7 @@ void View::slotFrameChanged(Frame *f)
emit signalStarted(0);
break;
case Frame::Canceled:
emit signalCanceled(TQString::null);
emit signalCanceled(TQString());
break;
case Frame::Idle:
case Frame::Completed:
@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
if (!current)
return;
TreeNode* prev = current->prevSibling();
Folder* parent = current->parent();
Folder* tqparent = current->tqparent();
if (!prev || !parent)
if (!prev || !tqparent)
return;
parent->removeChild(prev);
parent->insertChild(prev, current);
tqparent->removeChild(prev);
tqparent->insertChild(prev, current);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown()
if (!current)
return;
TreeNode* next = current->nextSibling();
Folder* parent = current->parent();
Folder* tqparent = current->tqparent();
if (!next || !parent)
if (!next || !tqparent)
return;
parent->removeChild(current);
parent->insertChild(current, next);
tqparent->removeChild(current);
tqparent->insertChild(current, next);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
void View::slotMoveCurrentNodeLeft()
{
TreeNode* current = m_listTabWidget->activeView()->selectedNode();
if (!current || !current->parent() || !current->parent()->parent())
if (!current || !current->tqparent() || !current->tqparent()->tqparent())
return;
Folder* parent = current->parent();
Folder* grandparent = current->parent()->parent();
Folder* tqparent = current->tqparent();
Folder* grandtqparent = current->tqparent()->tqparent();
parent->removeChild(current);
grandparent->insertChild(current, parent);
tqparent->removeChild(current);
grandtqparent->insertChild(current, tqparent);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
void View::slotMoveCurrentNodeRight()
{
TreeNode* current = m_listTabWidget->activeView()->selectedNode();
if (!current || !current->parent())
if (!current || !current->tqparent())
return;
TreeNode* prev = current->prevSibling();
if ( prev && prev->isGroup() )
{
Folder* fg = static_cast<Folder*>(prev);
current->parent()->removeChild(current);
current->tqparent()->removeChild(current);
fg->appendChild(current);
m_listTabWidget->activeView()->ensureNodeVisible(current);
}
@ -880,16 +880,16 @@ void View::slotFeedAdd()
if ( m_feedListView->selectedNode()->isGroup())
group = static_cast<Folder*>(m_feedListView->selectedNode());
else
group= m_feedListView->selectedNode()->parent();
group= m_feedListView->selectedNode()->tqparent();
}
TreeNode* lastChild = group->children().last();
TreeNode* lastChild = group->tqchildren().last();
addFeed(TQString::null, lastChild, group, false);
addFeed(TQString(), lastChild, group, false);
}
void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec)
{
AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool au
return;
}
if (!parent)
parent = m_feedList->rootNode();
if (!tqparent)
tqparent = m_feedList->rootNode();
parent->insertChild(feed, after);
tqparent->insertChild(feed, after);
m_feedListView->ensureNodeVisible(feed);