Browse Source

Rename a number of old tq methods that are no longer tq specific

pull/21/head
Timothy Pearson 10 years ago
parent
commit
3ca10fd9a2
  1. 16
      NewsLog.txt
  2. 4
      akregator/src/addfeeddialog.cpp
  3. 12
      akregator/src/addfeedwidgetbase.ui
  4. 36
      akregator/src/akregator_part.cpp
  5. 34
      akregator/src/akregator_view.cpp
  6. 24
      akregator/src/article.cpp
  7. 4
      akregator/src/article.h
  8. 146
      akregator/src/articlefilter.cpp
  9. 4
      akregator/src/articlefilter.h
  10. 4
      akregator/src/articlelistview.cpp
  11. 126
      akregator/src/articleviewer.cpp
  12. 6
      akregator/src/dragobjects.cpp
  13. 2
      akregator/src/dragobjects.h
  14. 34
      akregator/src/feed.cpp
  15. 8
      akregator/src/feed.h
  16. 12
      akregator/src/feedlist.cpp
  17. 16
      akregator/src/feedlistview.cpp
  18. 2
      akregator/src/feedlistview.h
  19. 2
      akregator/src/feedstorage.h
  20. 4
      akregator/src/feedstoragedummyimpl.cpp
  21. 2
      akregator/src/feedstoragedummyimpl.h
  22. 72
      akregator/src/folder.cpp
  23. 18
      akregator/src/folder.h
  24. 8
      akregator/src/frame.cpp
  25. 6
      akregator/src/kcursorsaver.h
  26. 44
      akregator/src/librss/article.cpp
  27. 4
      akregator/src/librss/category.cpp
  28. 304
      akregator/src/librss/document.cpp
  29. 20
      akregator/src/librss/enclosure.cpp
  30. 2
      akregator/src/librss/global.h
  31. 12
      akregator/src/librss/image.cpp
  32. 4
      akregator/src/librss/loader.cpp
  33. 10
      akregator/src/librss/loader.h
  34. 6
      akregator/src/librss/testlibrss.cpp
  35. 4
      akregator/src/librss/testlibrss.h
  36. 8
      akregator/src/librss/textinput.cpp
  37. 12
      akregator/src/librss/tools_p.cpp
  38. 14
      akregator/src/listtabwidget.cpp
  39. 2
      akregator/src/mainwindow.cpp
  40. 4
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  41. 2
      akregator/src/mk4storage/feedstoragemk4impl.h
  42. 20
      akregator/src/mk4storage/metakit/CHANGES
  43. 2
      akregator/src/mk4storage/metakit/README
  44. 2
      akregator/src/mk4storage/metakit/src/column.h
  45. 2
      akregator/src/mk4storage/metakit/tests/regress.cpp
  46. 8
      akregator/src/mk4storage/mk4confwidgetbase.ui
  47. 4
      akregator/src/nodelist.cpp
  48. 6
      akregator/src/notificationmanager.cpp
  49. 8
      akregator/src/pageviewer.cpp
  50. 16
      akregator/src/pluginmanager.cpp
  51. 8
      akregator/src/progressmanager.cpp
  52. 2
      akregator/src/propertiesdialog.cpp
  53. 14
      akregator/src/propertieswidgetbase.ui
  54. 10
      akregator/src/searchbar.cpp
  55. 2
      akregator/src/searchbar.h
  56. 4
      akregator/src/settings_advancedbase.ui
  57. 2
      akregator/src/settings_appearance.ui
  58. 4
      akregator/src/settings_archive.ui
  59. 4
      akregator/src/settings_browser.ui
  60. 2
      akregator/src/settings_general.ui
  61. 10
      akregator/src/simplenodeselector.cpp
  62. 12
      akregator/src/tabwidget.cpp
  63. 2
      akregator/src/tag.h
  64. 2
      akregator/src/tagaction.cpp
  65. 2
      akregator/src/tagnode.cpp
  66. 10
      akregator/src/tagpropertieswidgetbase.ui
  67. 16
      akregator/src/tagset.cpp
  68. 2
      akregator/src/trayicon.cpp
  69. 12
      akregator/src/treenode.cpp
  70. 2
      akregator/src/treenodeitem.cpp
  71. 6
      akregator/src/viewer.cpp
  72. 4
      certmanager/certificateinfowidget.ui
  73. 18
      certmanager/certificateinfowidgetimpl.cpp
  74. 28
      certmanager/certificatewizard.ui
  75. 18
      certmanager/certificatewizardimpl.cpp
  76. 62
      certmanager/certmanager.cpp
  77. 2
      certmanager/certmanager.h
  78. 2
      certmanager/conf/appearanceconfigpage.cpp
  79. 24
      certmanager/conf/appearanceconfigwidget.cpp
  80. 4
      certmanager/conf/appearanceconfigwidgetbase.ui
  81. 12
      certmanager/conf/configuredialog.cpp
  82. 6
      certmanager/conf/dirservconfigpage.cpp
  83. 2
      certmanager/conf/dnorderconfigpage.cpp
  84. 4
      certmanager/crlview.cpp
  85. 2
      certmanager/hierarchyanalyser.cpp
  86. 6
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  87. 16
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  88. 20
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  89. 4
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  90. 4
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  91. 2
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  92. 14
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  93. 6
      certmanager/lib/backends/qgpgme/gnupgprocessbase.h
  94. 10
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  95. 12
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  96. 10
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  97. 2
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  98. 6
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  99. 4
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  100. 2
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
  101. 4
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
  102. 2
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
  103. 10
      certmanager/lib/cryptplug.cpp
  104. 26
      certmanager/lib/cryptplugwrapper.cpp
  105. 32
      certmanager/lib/cryptplugwrapper.h
  106. 2
      certmanager/lib/kleo/cryptobackendfactory.cpp
  107. 2
      certmanager/lib/kleo/dn.cpp
  108. 2
      certmanager/lib/kleo/hierarchicalkeylistjob.cpp
  109. 2
      certmanager/lib/kleo/multideletejob.cpp
  110. 6
      certmanager/lib/tests/gnupgviewer.h
  111. 6
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  112. 4
      certmanager/lib/tests/test_keygen.cpp
  113. 2
      certmanager/lib/tests/test_keylister.cpp
  114. 4
      certmanager/lib/ui/adddirectoryservicedialog.ui
  115. 6
      certmanager/lib/ui/backendconfigwidget.cpp
  116. 14
      certmanager/lib/ui/cryptoconfigmodule.cpp
  117. 18
      certmanager/lib/ui/cryptoconfigmodule_p.h
  118. 2
      certmanager/lib/ui/directoryserviceswidget.cpp
  119. 16
      certmanager/lib/ui/directoryserviceswidgetbase.ui
  120. 4
      certmanager/lib/ui/dnattributeorderconfigwidget.cpp
  121. 22
      certmanager/lib/ui/kdhorizontalline.cpp
  122. 6
      certmanager/lib/ui/kdhorizontalline.h
  123. 12
      certmanager/lib/ui/keyapprovaldialog.cpp
  124. 38
      certmanager/lib/ui/keylistview.cpp
  125. 8
      certmanager/lib/ui/keylistview.h
  126. 8
      certmanager/lib/ui/keyrequester.cpp
  127. 18
      certmanager/lib/ui/keyselectiondialog.cpp
  128. 14
      certmanager/lib/ui/messagebox.cpp
  129. 2
      certmanager/lib/ui/passphrasedialog.cpp
  130. 2
      certmanager/lib/ui/progressdialog.cpp
  131. 2
      certmanager/storedtransferjob.cpp
  132. 2
      doc/api/doxygen.css
  133. 6
      indexlib/boost-compat/config/abi/borland_prefix.hpp
  134. 4
      indexlib/boost-compat/config/user.hpp
  135. 8
      kabc/frontend/mainWindow.ui
  136. 2
      kaddressbook/TODO
  137. 34
      kaddressbook/addresseditwidget.cpp
  138. 8
      kaddressbook/addresseeeditordialog.cpp
  139. 6
      kaddressbook/addresseeeditorextension.cpp
  140. 144
      kaddressbook/addresseeeditorwidget.cpp
  141. 20
      kaddressbook/addviewdialog.cpp
  142. 8
      kaddressbook/advancedcustomfields.cpp
  143. 8
      kaddressbook/common/filter.cpp
  144. 4
      kaddressbook/common/kabprefs.h
  145. 2
      kaddressbook/common/locationmap.cpp
  146. 4
      kaddressbook/contacteditorwidgetmanager.cpp
  147. 2
      kaddressbook/contacteditorwidgetmanager.h
  148. 40
      kaddressbook/customfieldswidget.cpp
  149. 16
      kaddressbook/distributionlisteditor.cpp
  150. 14
      kaddressbook/distributionlistentryview.cpp
  151. 12
      kaddressbook/distributionlistpicker.cpp
  152. 2
      kaddressbook/editors/cryptowidget.cpp
  153. 4
      kaddressbook/editors/imeditorbase.ui
  154. 18
      kaddressbook/editors/imeditorwidget.cpp
  155. 2
      kaddressbook/editors/imeditorwidget.h
  156. 6
      kaddressbook/emaileditwidget.cpp
  157. 8
      kaddressbook/extensionmanager.cpp
  158. 12
      kaddressbook/features/distributionlistngwidget.cpp
  159. 4
      kaddressbook/features/distributionlistwidget.cpp
  160. 6
      kaddressbook/features/resourceselection.cpp
  161. 4
      kaddressbook/filtereditdialog.cpp
  162. 8
      kaddressbook/freebusywidget.cpp
  163. 8
      kaddressbook/geowidget.cpp
  164. 12
      kaddressbook/imagewidget.cpp
  165. 2
      kaddressbook/imeditwidget.cpp
  166. 22
      kaddressbook/incsearchwidget.cpp
  167. 2
      kaddressbook/interfaces/xxport.h
  168. 18
      kaddressbook/jumpbuttonbar.cpp
  169. 38
      kaddressbook/kabcore.cpp
  170. 2
      kaddressbook/kabtools.cpp
  171. 2
      kaddressbook/kaddressbook_part.cpp
  172. 8
      kaddressbook/kaddressbookview.cpp
  173. 6
      kaddressbook/kcmconfigs/addhostdialog.cpp
  174. 22
      kaddressbook/kcmconfigs/addresseewidget.cpp
  175. 6
      kaddressbook/kcmconfigs/extensionconfigdialog.cpp
  176. 24
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  177. 6
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  178. 6
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  179. 12
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  180. 18
      kaddressbook/keywidget.cpp
  181. 24
      kaddressbook/ldapsearchdialog.cpp
  182. 36
      kaddressbook/nameeditdialog.cpp
  183. 30
      kaddressbook/phoneeditwidget.cpp
  184. 6
      kaddressbook/printing/detailledstyle.cpp
  185. 26
      kaddressbook/printing/ds_appearance.ui
  186. 14
      kaddressbook/printing/kabentrypainter.cpp
  187. 6
      kaddressbook/printing/mikesstyle.cpp
  188. 2
      kaddressbook/printing/printingwizard.cpp
  189. 6
      kaddressbook/printing/printprogress.cpp
  190. 10
      kaddressbook/printing/selectionpage.cpp
  191. 10
      kaddressbook/printing/stylepage.cpp
  192. 8
      kaddressbook/searchmanager.cpp
  193. 6
      kaddressbook/secrecywidget.cpp
  194. 2
      kaddressbook/simpleaddresseeeditor.cpp
  195. 4
      kaddressbook/soundwidget.cpp
  196. 2
      kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
  197. 4
      kaddressbook/typecombo.h
  198. 6
      kaddressbook/undocmds.cpp
  199. 12
      kaddressbook/viewconfigurefieldspage.cpp
  200. 4
      kaddressbook/viewconfigurefilterpage.cpp
  201. 2
      kaddressbook/viewconfigurewidget.cpp
  202. 12
      kaddressbook/viewmanager.cpp
  203. 16
      kaddressbook/views/cardview.cpp
  204. 10
      kaddressbook/views/cardview.h
  205. 18
      kaddressbook/views/configurecardviewdialog.cpp
  206. 12
      kaddressbook/views/configuretableviewdialog.cpp
  207. 14
      kaddressbook/views/contactlistview.cpp
  208. 8
      kaddressbook/views/kaddressbookcardview.cpp
  209. 6
      kaddressbook/views/kaddressbookiconview.cpp
  210. 6
      kaddressbook/views/kaddressbooktableview.cpp
  211. 8
      kaddressbook/xxport/csv_xxport.cpp
  212. 42
      kaddressbook/xxport/csvimportdialog.cpp
  213. 160
      kaddressbook/xxport/gnokii_xxport.cpp
  214. 2
      kaddressbook/xxport/kde2_xxport.cpp
  215. 10
      kaddressbook/xxport/ldif_xxport.cpp
  216. 22
      kaddressbook/xxport/opera_xxport.cpp
  217. 4
      kaddressbook/xxport/pab_pablib.cpp
  218. 2
      kaddressbook/xxport/pab_xxport.cpp
  219. 36
      kaddressbook/xxport/vcard_xxport.cpp
  220. 8
      kaddressbook/xxportmanager.cpp
  221. 14
      kaddressbook/xxportselectdialog.cpp
  222. 4
      kalarm/Changelog
  223. 68
      kalarm/alarmcalendar.cpp
  224. 8
      kalarm/alarmcalendar.h
  225. 146
      kalarm/alarmevent.cpp
  226. 12
      kalarm/alarmevent.h
  227. 24
      kalarm/alarmlistview.cpp
  228. 2
      kalarm/alarmlistview.h
  229. 14
      kalarm/alarmtext.cpp
  230. 52
      kalarm/alarmtimewidget.cpp
  231. 2
      kalarm/alarmtimewidget.h
  232. 44
      kalarm/birthdaydlg.cpp
  233. 10
      kalarm/calendarcompat.cpp
  234. 66
      kalarm/daemon.cpp
  235. 14
      kalarm/daemon.h
  236. 2
      kalarm/dcophandler.cpp
  237. 10
      kalarm/deferdlg.cpp
  238. 220
      kalarm/editdlg.cpp
  239. 18
      kalarm/find.cpp
  240. 26
      kalarm/fontcolour.cpp
  241. 20
      kalarm/fontcolourbutton.cpp
  242. 78
      kalarm/functions.cpp
  243. 22
      kalarm/functions.h
  244. 160
      kalarm/kalarmapp.cpp
  245. 2
      kalarm/kalarmd/adcalendar.cpp
  246. 14
      kalarm/kalarmd/adconfigdata.cpp
  247. 36
      kalarm/kalarmd/alarmdaemon.cpp
  248. 4
      kalarm/kalarmd/alarmdaemon.h
  249. 6
      kalarm/kalarmd/alarmguiiface.h
  250. 70
      kalarm/kamail.cpp
  251. 2
      kalarm/karecurrence.cpp
  252. 22
      kalarm/latecancel.cpp
  253. 2
      kalarm/latecancel.h
  254. 2
      kalarm/lib/buttongroup.cpp
  255. 2
      kalarm/lib/checkbox.h
  256. 4
      kalarm/lib/dateedit.cpp
  257. 4
      kalarm/lib/lineedit.cpp
  258. 6
      kalarm/lib/messagebox.cpp
  259. 2
      kalarm/lib/radiobutton.h
  260. 20
      kalarm/lib/shellprocess.cpp
  261. 8
      kalarm/lib/shellprocess.h
  262. 22
      kalarm/lib/spinbox2.cpp
  263. 20
      kalarm/lib/spinbox2.h
  264. 4
      kalarm/lib/synchtimer.cpp
  265. 4
      kalarm/lib/timeedit.cpp
  266. 4
      kalarm/lib/timeperiod.cpp
  267. 14
      kalarm/lib/timespinbox.cpp
  268. 4
      kalarm/lib/timespinbox.h
  269. 60
      kalarm/mainwindow.cpp
  270. 2
      kalarm/mainwindow.h
  271. 208
      kalarm/messagewin.cpp
  272. 2
      kalarm/messagewin.h
  273. 262
      kalarm/prefdlg.cpp
  274. 148
      kalarm/preferences.cpp
  275. 190
      kalarm/recurrenceedit.cpp
  276. 2
      kalarm/recurrenceeditprivate.h
  277. 14
      kalarm/reminder.cpp
  278. 30
      kalarm/repetition.cpp
  279. 42
      kalarm/sounddlg.cpp
  280. 16
      kalarm/soundpicker.cpp
  281. 12
      kalarm/specialactions.cpp
  282. 22
      kalarm/templatedlg.cpp
  283. 2
      kalarm/templatepickdlg.cpp
  284. 12
      kalarm/timeselector.cpp
  285. 28
      kalarm/traywindow.cpp
  286. 2
      kalarm/traywindow.h
  287. 22
      kalarm/undo.cpp
  288. 4
      kandy/RELEASENOTES
  289. 2
      kandy/configure.in.in
  290. 2
      kandy/src/atcommand.cpp
  291. 2
      kandy/src/cmdpropertiesdialog_base.ui
  292. 2
      kandy/src/commandset.cpp
  293. 10
      kandy/src/kandy.cpp
  294. 2
      kandy/src/kandy.kcfg
  295. 6
      kandy/src/kandyprefsdialog.cpp
  296. 8
      kandy/src/kandyview.cpp
  297. 8
      kandy/src/mobilegui.cpp
  298. 2
      kandy/src/mobilegui.h
  299. 20
      kandy/src/mobilegui_base.ui
  300. 2
      kandy/src/mobilemain.cpp
  301. 20
      kandy/src/modem.cpp
  302. 6
      karm/csvexportdialog_base.ui
  303. 4
      karm/doc/design
  304. 12
      karm/edittaskdialog.cpp
  305. 8
      karm/idletimedetector.cpp
  306. 26
      karm/karm_part.cpp
  307. 78
      karm/karmstorage.cpp
  308. 6
      karm/karmstorage.h
  309. 20
      karm/ktimewidget.cpp
  310. 48
      karm/mainwindow.cpp
  311. 8
      karm/plannerparser.cpp
  312. 98
      karm/preferences.cpp
  313. 12
      karm/print.cpp
  314. 28
      karm/printdialog.cpp
  315. 20
      karm/task.cpp
  316. 8
      karm/task.h
  317. 30
      karm/taskview.cpp
  318. 8
      karm/taskview.h
  319. 2
      karm/test/README
  320. 4
      karm/test/lifetest.php
  321. 2
      karm/test/lockerthread.cpp
  322. 6
      karm/test/locking.cpp
  323. 2
      karm/test/runscripts.cpp
  324. 2
      karm/test/script.cpp
  325. 70
      karm/timekard.cpp
  326. 6
      karm/tray.cpp
  327. 164
      kdgantt/KDGanttMinimizeSplitter.cpp
  328. 6
      kdgantt/KDGanttMinimizeSplitter.h
  329. 32
      kdgantt/KDGanttSemiSizingControl.cpp
  330. 4
      kdgantt/KDGanttSemiSizingControl.h
  331. 206
      kdgantt/KDGanttView.cpp
  332. 12
      kdgantt/KDGanttView.h
  333. 168
      kdgantt/KDGanttViewItem.cpp
  334. 6
      kdgantt/KDGanttViewItem.h
  335. 6
      kdgantt/KDGanttViewItemDrag.cpp
  336. 2
      kdgantt/KDGanttViewItemDrag.h
  337. 62
      kdgantt/KDGanttViewSubwidgets.cpp
  338. 8
      kdgantt/KDGanttViewSubwidgets.h
  339. 2
      kdgantt/KDGanttViewTaskItem.cpp
  340. 2
      kdgantt/KDGanttXMLTools.cpp
  341. 2
      kdgantt/Makefile.am
  342. 6
      kdgantt/itemAttributeDialog.ui
  343. 22
      kdgantt/itemAttributeDialog.ui.h
  344. 14
      kdgantt/qlayoutengine_p.h
  345. 4
      kfile-plugins/ics/kfile_ics.cpp
  346. 4
      kgantt/kgantt/KGantt.cpp
  347. 4
      kgantt/kgantt/KGantt.h
  348. 2
      kgantt/kgantt/KGanttItem.h
  349. 2
      kgantt/kgantt/KGanttRelation.h
  350. 28
      kgantt/kgantt/itemedit.ui
  351. 10
      kgantt/kgantt/itemedit2.ui
  352. 94
      kioslaves/imap4/imap4.cc
  353. 2
      kioslaves/imap4/imapcommand.cc
  354. 2
      kioslaves/imap4/imapcommand.h
  355. 4
      kioslaves/imap4/imaplist.cc
  356. 18
      kioslaves/imap4/imapparser.cc
  357. 8
      kioslaves/imap4/imapparser.h
  358. 4
      kioslaves/imap4/mailheader.h
  359. 2
      kioslaves/imap4/mimeheader.cc
  360. 8
      kioslaves/imap4/rfcdecoder.cc
  361. 4
      kioslaves/mbox/readmbox.cc
  362. 4
      kioslaves/mbox/stat.cc
  363. 4
      kioslaves/opengroupware/opengroupware.cpp
  364. 22
      kioslaves/sieve/sieve.cpp
  365. 6
      kitchensync/libqopensync/group.cpp
  366. 6
      kitchensync/libqopensync/member.cpp
  367. 4
      kitchensync/libqopensync/member.h
  368. 6
      kitchensync/libqopensync/plugin.cpp
  369. 12
      kitchensync/opensyncdbus/dbusclient.cpp
  370. 62
      kitchensync/src/aboutpage.cpp
  371. 4
      kitchensync/src/configgui.cpp
  372. 2
      kitchensync/src/configguiblank.cpp
  373. 24
      kitchensync/src/configguievo2.cpp
  374. 2
      kitchensync/src/configguifile.cpp
  375. 2
      kitchensync/src/configguigcalendar.cpp
  376. 20
      kitchensync/src/configguignokii.cpp
  377. 32
      kitchensync/src/configguigpe.cpp
  378. 2
      kitchensync/src/configguiirmc.cpp
  379. 28
      kitchensync/src/configguijescs.cpp
  380. 48
      kitchensync/src/configguildap.cpp
  381. 14
      kitchensync/src/configguimoto.cpp
  382. 32
      kitchensync/src/configguiopie.cpp
  383. 2
      kitchensync/src/configguipalm.cpp
  384. 32
      kitchensync/src/configguisunbird.cpp
  385. 24
      kitchensync/src/configguisynce.cpp
  386. 2
      kitchensync/src/configguisyncmlhttp.cpp
  387. 6
      kitchensync/src/configguisyncmlobex.cpp
  388. 46
      kitchensync/src/connectionwidgets.cpp
  389. 6
      kitchensync/src/genericdiffalgo.cpp
  390. 10
      kitchensync/src/groupconfig.cpp
  391. 20
      kitchensync/src/groupconfigcommon.cpp
  392. 2
      kitchensync/src/groupconfigdialog.cpp
  393. 118
      kitchensync/src/groupitem.cpp
  394. 4
      kitchensync/src/groupitem.h
  395. 2
      kitchensync/src/groupview.cpp
  396. 22
      kitchensync/src/htmldiffalgodisplay.cpp
  397. 4
      kitchensync/src/mainwidget.cpp
  398. 6
      kitchensync/src/memberconfig.cpp
  399. 20
      kitchensync/src/multiconflictdialog.cpp
  400. 2
      kitchensync/src/part.cpp
  401. 16
      kitchensync/src/pluginpicker.cpp
  402. 16
      kitchensync/src/singleconflictdialog.cpp
  403. 4
      kitchensync/src/syncprocess.cpp
  404. 4
      kitchensync/src/syncprocess.h
  405. 2
      kitchensync/src/syncprocessmanager.cpp
  406. 8
      kmail/ChangeLog
  407. 34
      kmail/Mainpage.dox
  408. 4
      kmail/aboutdata.cpp
  409. 46
      kmail/accountdialog.cpp
  410. 10
      kmail/accountmanager.cpp
  411. 48
      kmail/accountwizard.cpp
  412. 2
      kmail/acljobs.cpp
  413. 24
      kmail/actionscheduler.cpp
  414. 2
      kmail/antispamconfig.cpp
  415. 42
      kmail/antispamwizard.cpp
  416. 2
      kmail/antispamwizard.h
  417. 6
      kmail/archivefolderdialog.cpp
  418. 2
      kmail/attachmentcollector.cpp
  419. 28
      kmail/backupjob.cpp
  420. 2
      kmail/bodyvisitor.h
  421. 28
      kmail/cachedimapjob.cpp
  422. 8
      kmail/callback.cpp
  423. 14
      kmail/chiasmuskeyselector.cpp
  424. 12
      kmail/compactionjob.cpp
  425. 2
      kmail/composercryptoconfiguration.ui
  426. 230
      kmail/configuredialog.cpp
  427. 32
      kmail/configuredialog_p.cpp
  428. 2
      kmail/configuredialog_p.h
  429. 6
      kmail/copyfolderjob.cpp
  430. 2
      kmail/csshelper.cpp
  431. 4
      kmail/customtemplates.cpp
  432. 18
      kmail/customtemplates_base.ui
  433. 4
      kmail/distributionlistdialog.cpp
  434. 2
      kmail/encodingdetector.cpp
  435. 2
      kmail/encodingdetector.h
  436. 18
      kmail/expirejob.cpp
  437. 10
      kmail/expirypropertiesdialog.cpp
  438. 14
      kmail/favoritefolderview.cpp
  439. 2
      kmail/filehtmlwriter.h
  440. 2
      kmail/filterimporterexporter.cpp
  441. 2
      kmail/filterlog.h
  442. 4
      kmail/filterlogdlg.cpp
  443. 18
      kmail/folderdiaacltab.cpp
  444. 2
      kmail/folderdiaacltab.h
  445. 12
      kmail/folderdiaquotatab.cpp
  446. 2
      kmail/folderdiaquotatab.h
  447. 16
      kmail/folderdiaquotatab_p.cpp
  448. 24
      kmail/folderpropertiesdialog.ui
  449. 6
      kmail/folderrequester.cpp
  450. 2
      kmail/foldershortcutdialog.cpp
  451. 26
      kmail/folderstorage.cpp
  452. 22
      kmail/folderstorage.h
  453. 16
      kmail/foldertreebase.cpp
  454. 2
      kmail/folderutil.cpp
  455. 16
      kmail/folderviewtooltip.h
  456. 6
      kmail/headeritem.cpp
  457. 12
      kmail/headeritem.h
  458. 36
      kmail/headerlistquicksearch.cpp
  459. 12
      kmail/headerlistquicksearch.h
  460. 112
      kmail/headerstyle.cpp
  461. 4
      kmail/htmlstatusbar.cpp
  462. 34
      kmail/identitydialog.cpp
  463. 4
      kmail/identitydrag.cpp
  464. 2
      kmail/identitydrag.h
  465. 2
      kmail/identitylistview.cpp
  466. 38
      kmail/imapaccountbase.cpp
  467. 6
      kmail/imapaccountbase.h
  468. 16
      kmail/imapjob.cpp
  469. 4
      kmail/importarchivedialog.cpp
  470. 22
      kmail/importjob.cpp
  471. 2
      kmail/index.cpp
  472. 6
      kmail/kcursorsaver.h
  473. 22
      kmail/keyresolver.cpp
  474. 2
      kmail/khtmlparthtmlwriter.cpp
  475. 2
      kmail/klistboxdialog.cpp
  476. 22
      kmail/kmaccount.cpp
  477. 8
      kmail/kmaccount.h
  478. 4
      kmail/kmacctcachedimap.cpp
  479. 28
      kmail/kmacctimap.cpp
  480. 24
      kmail/kmacctlocal.cpp
  481. 20
      kmail/kmacctmaildir.cpp
  482. 2
      kmail/kmacctseldlg.cpp
  483. 10
      kmail/kmail.antispamrc
  484. 6
      kmail/kmail.kcfg
  485. 4
      kmail/kmail_part.cpp
  486. 86
      kmail/kmailicalifaceimpl.cpp
  487. 4
      kmail/kmatmlistview.cpp
  488. 88
      kmail/kmcommands.cpp
  489. 6
      kmail/kmcommands.h
  490. 104
      kmail/kmcomposewin.cpp
  491. 6
      kmail/kmcomposewin.h
  492. 18
      kmail/kmedit.cpp
  493. 2
      kmail/kmedit.h
  494. 6
      kmail/kmfawidgets.cpp
  495. 10
      kmail/kmfilter.cpp
  496. 78
      kmail/kmfilteraction.cpp
  497. 46
      kmail/kmfilterdlg.cpp
  498. 20
      kmail/kmfolder.cpp
  499. 16
      kmail/kmfolder.h
  500. 66
      kmail/kmfoldercachedimap.cpp

16
NewsLog.txt

@ -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 tqlayout problem if description of attachment is to long (#5872)
* kolab/issue3908 (partly): Mail view and print layout 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 tqlayout and small problems (rt#6032)
* kolab/issue4142: Composer: view all fields layout 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 tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908(partial): Mail view and print layout 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 tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908 (partial): Mail view and print layout 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)
@ -1108,7 +1108,7 @@ Friday, November 21st 2008
Problems addressed
------------------
* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2627 Status 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 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2627 Status 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 tqlayout and replying then. (778728)
* Prevent crash after changing the layout 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)
@ -2063,7 +2063,7 @@ Bugfixes
Korganizer
-----------
- proko35 W1-9 icon tqalignment was improved.
- proko35 W1-9 icon alignment was improved.
Additional Fixes
================

4
akregator/src/addfeeddialog.cpp

@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( )
feedURL.prepend("http://");
f->setXmlUrl(feedURL);
widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) );
widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );
connect( feed, TQT_SIGNAL(fetched(Feed* )),
this, TQT_SLOT(fetchCompleted(Feed *)) );
@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/)
void AddFeedDialog::fetchError(Feed *)
{
KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL));
KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL));
KDialogBase::slotCancel();
}

12
akregator/src/addfeedwidgetbase.ui

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -65,7 +65,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@ -75,7 +75,7 @@
<property name="name">
<cstring>urlEdit</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@ -115,7 +115,7 @@
<cstring>statusLabel</cstring>
</property>
<property name="text">
<string>tqStatus</string>
<string>Status</string>
</property>
</widget>
<spacer>
@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>

36
akregator/src/akregator_part.cpp

@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
TQStringList storageParams;
storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
if (factory != 0)
{
@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
{
m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
}
Filters::ArticleFilterList list;
@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
initFonts();
RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
}
void Part::loadPlugins()
@ -428,11 +428,11 @@ bool Part::openFile()
if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
copyFile(backup);
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") );
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
}
if (!doc.setContent(listBackup))
@ -444,10 +444,10 @@ bool Part::openFile()
{
if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
copyFile(backup);
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("OPML Parsing Error") );
KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
}
m_view->loadFeeds(createDefaultFeedList());
}
@ -486,7 +486,7 @@ void Part::slotSaveFeedList()
if (file.open(IO_WriteOnly) == false)
{
//FIXME: allow to save the feedlist into different location -tpr 20041118
KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
return;
}
@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow()
{
// this is a dirty fix to get the main window used for the tray icon
TQWidgetList *l = kapp->tqtopLevelWidgets();
TQWidgetList *l = kapp->topLevelWidgets();
TQWidgetListIt it( *l );
TQWidget *wid;
@ -639,10 +639,10 @@ void Part::importFile(const KURL& url)
if (doc.setContent(TQByteArray(file.readAll())))
m_view->importFeeds(doc);
else
KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") );
KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") );
}
else
KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error"));
KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
if (isRemote)
KIO::NetAccess::removeTempFile(filename);
@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url)
if ( file.exists() &&
KMessageBox::questionYesNo(m_view,
i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()),
i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()),
i18n("Export"),
i18n("Overwrite"),
KStdGuiItem::cancel()) == KMessageBox::No )
@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url)
if ( !file.open(IO_WriteOnly) )
{
KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") );
KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") );
return;
}
@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName)
"can cause the loss of archived articles and crashes at startup.</b> "
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.tqarg( programName, programName, backendName );
.arg( programName, programName, backendName );
// 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 .tqarg( programName ).
// even think about changing the above to .arg( programName ).
else
msg = i18n("<qt>%1 seems to be running on another display on this "
"machine. <b>Running %1 and %2 at the same "
@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName)
"the loss of archived articles and crashes at startup.</b> "
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.tqarg( oldProgramName, programName, backendName );
.arg( oldProgramName, programName, backendName );
}
else
{
@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that it is "
"not already running on %2.</qt>")
.tqarg( programName, oldHostName, backendName );
.arg( programName, oldHostName, backendName );
else
msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the "
"same time is not supported by the %4 backend and can cause "
@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that %1 is "
"not running on %3.</qt>")
.tqarg( oldProgramName, programName, oldHostName, backendName );
.arg( oldProgramName, programName, oldHostName, backendName );
}
KCursorSaver idle( KBusyPtr::idle() );

34
akregator/src/akregator_view.cpp

@ -90,18 +90,18 @@
#include <tqfile.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqmultilineedit.h>
#include <tqpopupmenu.h>
#include <tqptrlist.h>
#include <tqstylesheet.h>
#include <tqtextstream.h>
#include <stylesheet.h>
#include <textstream.h>
#include <tqtimer.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
#include <tqvaluevector.h>
#include <tqwhatsthis.h>
#include <tqclipboard.h>
#include <clipboard.h>
namespace Akregator {
@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
virtual bool visitTagNode(TagNode* node)
{
TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title());
TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
{
Tag tag = node->tag();
@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
else
msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title());
msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue)
{
@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
else
msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
{
@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
if (!Settings::resetQuickFilterOnNodeChange())
{
m_searchBar->slotSetqStatus(Settings::statusFilter());
m_searchBar->slotSeStatus(Settings::statusFilter());
m_searchBar->slotSetText(Settings::textFilter());
}
@ -884,7 +884,7 @@ void View::slotFeedAdd()
}
TreeNode* lastChild = group->tqchildren().last();
TreeNode* lastChild = group->children().last();
addFeed(TQString(), lastChild, group, false);
}
@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
if (delay > 0)
m_markReadTimer->start( delay*1000, true );
else
a.setqStatus(Article::Read);
a.seStatus(Article::Read);
}
}
@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setText(link, TQClipboard::Clipboard);
cb->setText(link, TQClipboard::Selection);
}
@ -1312,7 +1312,7 @@ void View::slotArticleDelete()
case 0:
return;
case 1:
msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title()));
msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
break;
default:
msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setqStatus(Article::Read);
(*it).seStatus(Article::Read);
}
void View::slotTextToSpeechRequest()
@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setqStatus(Article::Unread);
(*it).seStatus(Article::Unread);
}
void View::slotSetSelectedArticleNew()
@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setqStatus(Article::New);
(*it).seStatus(Article::New);
}
void View::slotSetCurrentArticleReadDelayed()
@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
if (article.isNull())
return;
article.setqStatus(Article::Read);
article.seStatus(Article::Read);
}
void View::slotMouseOverInfo(const KFileItem *kifi)
@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
m_searchBar->slotSetText(config->readEntry("searchLine"));
int statusfilter = config->readNumEntry("searchCombo", -1);
if (statusfilter != -1)
m_searchBar->slotSetqStatus(statusfilter);
m_searchBar->slotSeStatus(statusfilter);
}
int selectedID = config->readNumEntry("selectedNodeID", -1);

24
akregator/src/article.cpp

@ -55,7 +55,7 @@ struct Article::Private : public Shared
0001 0000 Keep
*/
enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
TQString guid;
Backend::FeedStorage* archive;
@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
if (article.meta("deleted") == "true")
{ // if article is in deleted state, we just add the status and omit the rest
d->status = Private::Read | Private::Deleted;
d->archive->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
}
else
{ // article is not deleted, let's add it to the archive
@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
d->archive->setCommentsLink(d->guid, article.commentsLink().url());
d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
d->archive->setAuthor(d->guid, article.author());
@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
int statusInt = status.toInt();
if (statusInt == New)
statusInt = Unread;
setqStatus(statusInt);
seStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
setqStatus(Read);
seStatus(Read);
d->status = Private::Deleted | Private::Read;
d->archive->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);
if (d->feed)
@ -299,13 +299,13 @@ int Article::status() const
return Unread;
}
void Article::setqStatus(int stat)
void Article::seStatus(int stat)
{
// use status() rather than statusBits() here to filter out status flags that we are not
// interested in
int oldtqStatus = status();
int oldStatus = status();
if (oldtqStatus != stat)
if (oldStatus != stat)
{
switch (stat)
{
@ -319,9 +319,9 @@ void Article::setqStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
d->archive->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this, oldtqStatus);
d->feed->setArticleChanged(*this, oldStatus);
}
}
@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
void Article::setKeep(bool keep)
{
d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
d->archive->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}

4
akregator/src/article.h

@ -57,7 +57,7 @@ namespace Akregator
class Article
{
public:
enum tqStatus { Unread=0, Read, New };
enum Status { Unread=0, Read, New };
typedef TQValueList<Article> List;
Article();
@ -80,7 +80,7 @@ namespace Akregator
bool isNull() const;
int status() const;
void setqStatus(int s);
void seStatus(int s);
void offsetPubDate(int secs);

146
akregator/src/articlefilter.cpp

@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj)
switch (subj)
{
case Title:
return TQString::tqfromLatin1("Title");
return TQString::fromLatin1("Title");
case Link:
return TQString::tqfromLatin1("Link");
return TQString::fromLatin1("Link");
case Author:
return TQString::tqfromLatin1("Author");
return TQString::fromLatin1("Author");
case Description:
return TQString::tqfromLatin1("Description");
case tqStatus:
return TQString::tqfromLatin1("Status");
return TQString::fromLatin1("Description");
case Status:
return TQString::fromLatin1("Status");
case KeepFlag:
return TQString::tqfromLatin1("KeepFlag");
return TQString::fromLatin1("KeepFlag");
default: // should never happen (TM)
return TQString::tqfromLatin1("Description");
return TQString::fromLatin1("Description");
}
}
Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
{
if (subjStr == TQString::tqfromLatin1("Title"))
if (subjStr == TQString::fromLatin1("Title"))
return Title;
else if (subjStr == TQString::tqfromLatin1("Link"))
else if (subjStr == TQString::fromLatin1("Link"))
return Link;
else if (subjStr == TQString::tqfromLatin1("Description"))
else if (subjStr == TQString::fromLatin1("Description"))
return Description;
else if (subjStr == TQString::tqfromLatin1("Author"))
else if (subjStr == TQString::fromLatin1("Author"))
return Author;
else if (subjStr == TQString::tqfromLatin1("Status"))
return tqStatus;
else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
else if (subjStr == TQString::fromLatin1("Status"))
return Status;
else if (subjStr == TQString::fromLatin1("KeepFlag"))
return KeepFlag;
// hopefully never reached
@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred)
switch (pred)
{
case Contains:
return TQString::tqfromLatin1("Contains");
return TQString::fromLatin1("Contains");
case Equals:
return TQString::tqfromLatin1("Equals");
return TQString::fromLatin1("Equals");
case Matches:
return TQString::tqfromLatin1("Matches");
return TQString::fromLatin1("Matches");
case Negation:
return TQString::tqfromLatin1("Negation");
return TQString::fromLatin1("Negation");
default:// hopefully never reached
return TQString::tqfromLatin1("Contains");
return TQString::fromLatin1("Contains");
}
}
Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
{
if (predStr == TQString::tqfromLatin1("Contains"))
if (predStr == TQString::fromLatin1("Contains"))
return Contains;
else if (predStr == TQString::tqfromLatin1("Equals"))
else if (predStr == TQString::fromLatin1("Equals"))
return Equals;
else if (predStr == TQString::tqfromLatin1("Matches"))
else if (predStr == TQString::fromLatin1("Matches"))
return Matches;
else if (predStr == TQString::tqfromLatin1("Negation"))
else if (predStr == TQString::fromLatin1("Negation"))
return Negation;
// hopefully never reached
@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
void Criterion::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject));
config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate));
config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate));
config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName()));
config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName()));
config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object);
config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
}
void Criterion::readConfig(KConfig* config)
{
m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject")));
m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate")));
TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii());
m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii());
if (type != TQVariant::Invalid)
{
m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type);
m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type);
}
}
@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
// ### Maybe use prettyURL here?
concreteSubject = TQVariant(article.link().url());
break;
case tqStatus:
case Status:
concreteSubject = TQVariant(article.status());
break;
case KeepFlag:
@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const
void ArticleMatcher::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count());
config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count());
int index = 0;
for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it)
{
config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index));
config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index));
(*it).writeConfig(config);
++index;
}
@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const
void ArticleMatcher::readConfig(KConfig* config)
{
m_criteria.clear();
m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation")));
m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
int count = config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
int count = config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
for (int i = 0; i < count; ++i)
{
Criterion c;
config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i));
config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i));
c.readConfig(config);
m_criteria.append(c);
}
@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const
ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr)
{
if (assocStr == TQString::tqfromLatin1("LogicalAnd"))
if (assocStr == TQString::fromLatin1("LogicalAnd"))
return LogicalAnd;
else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
else if (assocStr == TQString::fromLatin1("LogicalOr"))
return LogicalOr;
else
return None;
@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
switch (association)
{
case LogicalAnd:
return TQString::tqfromLatin1("LogicalAnd");
return TQString::fromLatin1("LogicalAnd");
case LogicalOr:
return TQString::tqfromLatin1("LogicalOr");
return TQString::fromLatin1("LogicalOr");
default:
return TQString::tqfromLatin1("None");
return TQString::fromLatin1("None");
}
}
@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
void TagMatcher::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher"));
config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID);
config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
}
void TagMatcher::readConfig(KConfig* config)
{
d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams"));
d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
}
bool TagMatcher::operator==(const AbstractMatcher& other) const
@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
void SeStatusAction::exec(Article& article)
{
if (!article.isNull())
article.setqStatus(m_status);
article.seStatus(m_status);
}
int SeStatusAction::status() const
@ -457,20 +457,20 @@ int SeStatusAction::status() const
return m_status;
}
void SeStatusAction::setqStatus(int status)
void SeStatusAction::seStatus(int status)
{
m_status = status;
}
void SeStatusAction::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction"));
config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status);
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
}
void SeStatusAction::readConfig(KConfig* config)
{
m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read);
m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
}
bool SeStatusAction::operator==(const AbstractAction& other)
@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
void ArticleFilterList::writeConfig(KConfig* config) const
{
config->setGroup(TQString::tqfromLatin1("Filters"));
config->writeEntry(TQString::tqfromLatin1("count"), count());
config->setGroup(TQString::fromLatin1("Filters"));
config->writeEntry(TQString::fromLatin1("count"), count());
int index = 0;
for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
{
config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index));
config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index));
(*it).writeConfig(config);
++index;
}
@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const
void ArticleFilterList::readConfig(KConfig* config)
{
clear();
config->setGroup(TQString::tqfromLatin1("Filters"));
int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
config->setGroup(TQString::fromLatin1("Filters"));
int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
for (int i = 0; i < count; ++i)
{
config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i));
config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i));
ArticleFilter filter;
filter.readConfig(config);
append(filter);
@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config)
void AssignTagAction::readConfig(KConfig* config)
{
m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams"));
m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
}
void AssignTagAction::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID);
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
}
bool AssignTagAction::operator==(const AbstractAction& other)
@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/)
void DeleteAction::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
}
bool DeleteAction::operator==(const AbstractAction& other)
@ -661,27 +661,27 @@ void ArticleFilter::readConfig(KConfig* config)
delete d->action;
d->action = 0;
d->name = config->readEntry(TQString::tqfromLatin1("name"));
d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0);
d->name = config->readEntry(TQString::fromLatin1("name"));
d->id = config->readNumEntry(TQString::fromLatin1("id"), 0);
TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType"));
TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType"));
if (matcherType == TQString::tqfromLatin1("TagMatcher"))
if (matcherType == TQString::fromLatin1("TagMatcher"))
d->matcher = new TagMatcher();
else if (matcherType == TQString::tqfromLatin1("ArticleMatcher"))
else if (matcherType == TQString::fromLatin1("ArticleMatcher"))
d->matcher = new ArticleMatcher();
if (d->matcher)
d->matcher->readConfig(config);
TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType"));
TQString actionType = config->readEntry(TQString::fromLatin1("actionType"));
if (actionType == TQString::tqfromLatin1("AssignTagAction"))
if (actionType == TQString::fromLatin1("AssignTagAction"))
d->action = new AssignTagAction();
else if (actionType == TQString::tqfromLatin1("DeleteAction"))
else if (actionType == TQString::fromLatin1("DeleteAction"))
d->action = new DeleteAction();
else if (actionType == TQString::tqfromLatin1("SeStatusAction"))
else if (actionType == TQString::fromLatin1("SeStatusAction"))
d->action = new SeStatusAction();
if (d->action)
@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config)
void ArticleFilter::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("name"), d->name);
config->writeEntry(TQString::tqfromLatin1("id"), d->id);
config->writeEntry(TQString::fromLatin1("name"), d->name);
config->writeEntry(TQString::fromLatin1("id"), d->id);
d->matcher->writeConfig(config);
d->action->writeConfig(config);
}

4
akregator/src/articlefilter.h

@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
virtual void exec(Article& article);
int status() const;
void setqStatus(int status);
void seStatus(int status);
virtual void writeConfig(KConfig* config) const;
virtual