Browse Source

Rename old tq methods that no longer need a unique name

pull/21/head
Timothy Pearson 11 years ago
parent
commit
0e00c0a86a
  1. 4
      NewsLog.txt
  2. 8
      akregator/src/addfeedwidgetbase.ui
  3. 6
      akregator/src/akregator_part.cpp
  4. 14
      akregator/src/akregator_view.cpp
  5. 24
      akregator/src/article.cpp
  6. 4
      akregator/src/article.h
  7. 146
      akregator/src/articlefilter.cpp
  8. 4
      akregator/src/articlefilter.h
  9. 4
      akregator/src/articlelistview.cpp
  10. 6
      akregator/src/dragobjects.cpp
  11. 2
      akregator/src/dragobjects.h
  12. 34
      akregator/src/feed.cpp
  13. 8
      akregator/src/feed.h
  14. 2
      akregator/src/feedstorage.h
  15. 4
      akregator/src/feedstoragedummyimpl.cpp
  16. 2
      akregator/src/feedstoragedummyimpl.h
  17. 6
      akregator/src/folder.cpp
  18. 6
      akregator/src/frame.cpp
  19. 2
      akregator/src/kcursorsaver.h
  20. 44
      akregator/src/librss/article.cpp
  21. 4
      akregator/src/librss/category.cpp
  22. 304
      akregator/src/librss/document.cpp
  23. 20
      akregator/src/librss/enclosure.cpp
  24. 2
      akregator/src/librss/global.h
  25. 12
      akregator/src/librss/image.cpp
  26. 4
      akregator/src/librss/loader.cpp
  27. 10
      akregator/src/librss/loader.h
  28. 6
      akregator/src/librss/testlibrss.cpp
  29. 4
      akregator/src/librss/testlibrss.h
  30. 8
      akregator/src/librss/textinput.cpp
  31. 10
      akregator/src/librss/tools_p.cpp
  32. 2
      akregator/src/mainwindow.cpp
  33. 4
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  34. 2
      akregator/src/mk4storage/feedstoragemk4impl.h
  35. 2
      akregator/src/mk4storage/mk4confwidgetbase.ui
  36. 6
      akregator/src/pageviewer.cpp
  37. 6
      akregator/src/progressmanager.cpp
  38. 8
      akregator/src/propertieswidgetbase.ui
  39. 10
      akregator/src/searchbar.cpp
  40. 2
      akregator/src/searchbar.h
  41. 4
      akregator/src/settings_advancedbase.ui
  42. 2
      akregator/src/settings_appearance.ui
  43. 2
      akregator/src/settings_archive.ui
  44. 2
      akregator/src/settings_browser.ui
  45. 2
      akregator/src/settings_general.ui
  46. 6
      akregator/src/tabwidget.cpp
  47. 2
      akregator/src/tagaction.cpp
  48. 2
      akregator/src/tagnode.cpp
  49. 6
      akregator/src/tagpropertieswidgetbase.ui
  50. 16
      akregator/src/tagset.cpp
  51. 4
      certmanager/certificateinfowidget.ui
  52. 20
      certmanager/certificatewizard.ui
  53. 2
      certmanager/certificatewizardimpl.cpp
  54. 4
      certmanager/certmanager.cpp
  55. 2
      certmanager/conf/appearanceconfigwidgetbase.ui
  56. 8
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  57. 12
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  58. 12
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  59. 6
      certmanager/lib/backends/qgpgme/gnupgprocessbase.h
  60. 2
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  61. 2
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  62. 4
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  63. 2
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
  64. 4
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
  65. 2
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
  66. 10
      certmanager/lib/cryptplug.cpp
  67. 24
      certmanager/lib/cryptplugwrapper.cpp
  68. 32
      certmanager/lib/cryptplugwrapper.h
  69. 4
      certmanager/lib/tests/gnupgviewer.h
  70. 6
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  71. 4
      certmanager/lib/ui/adddirectoryservicedialog.ui
  72. 2
      certmanager/lib/ui/backendconfigwidget.cpp
  73. 8
      certmanager/lib/ui/cryptoconfigmodule.cpp
  74. 2
      certmanager/lib/ui/directoryserviceswidget.cpp
  75. 10
      certmanager/lib/ui/directoryserviceswidgetbase.ui
  76. 2
      certmanager/lib/ui/dnattributeorderconfigwidget.cpp
  77. 16
      certmanager/lib/ui/kdhorizontalline.cpp
  78. 4
      certmanager/lib/ui/kdhorizontalline.h
  79. 10
      certmanager/lib/ui/keyapprovaldialog.cpp
  80. 8
      certmanager/lib/ui/keylistview.cpp
  81. 4
      certmanager/lib/ui/keyrequester.cpp
  82. 8
      certmanager/lib/ui/keyselectiondialog.cpp
  83. 8
      kabc/frontend/mainWindow.ui
  84. 4
      kaddressbook/addresseditwidget.cpp
  85. 4
      kaddressbook/addresseeeditorwidget.cpp
  86. 2
      kaddressbook/addviewdialog.cpp
  87. 4
      kaddressbook/common/kabprefs.h
  88. 10
      kaddressbook/customfieldswidget.cpp
  89. 4
      kaddressbook/distributionlisteditor.cpp
  90. 6
      kaddressbook/distributionlistentryview.cpp
  91. 4
      kaddressbook/editors/imeditorbase.ui
  92. 10
      kaddressbook/editors/imeditorwidget.cpp
  93. 2
      kaddressbook/emaileditwidget.cpp
  94. 2
      kaddressbook/features/distributionlistngwidget.cpp
  95. 2
      kaddressbook/geowidget.cpp
  96. 8
      kaddressbook/incsearchwidget.cpp
  97. 4
      kaddressbook/jumpbuttonbar.cpp
  98. 8
      kaddressbook/kabcore.cpp
  99. 6
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  100. 2
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  101. 10
      kaddressbook/ldapsearchdialog.cpp
  102. 4
      kaddressbook/phoneeditwidget.cpp
  103. 12
      kaddressbook/printing/kabentrypainter.cpp
  104. 2
      kaddressbook/printing/mikesstyle.cpp
  105. 2
      kaddressbook/printing/printprogress.cpp
  106. 2
      kaddressbook/printing/selectionpage.cpp
  107. 4
      kaddressbook/printing/stylepage.cpp
  108. 8
      kaddressbook/searchmanager.cpp
  109. 2
      kaddressbook/soundwidget.cpp
  110. 10
      kaddressbook/viewconfigurefieldspage.cpp
  111. 2
      kaddressbook/viewconfigurefilterpage.cpp
  112. 6
      kaddressbook/views/cardview.cpp
  113. 2
      kaddressbook/views/cardview.h
  114. 10
      kaddressbook/views/configurecardviewdialog.cpp
  115. 2
      kaddressbook/views/contactlistview.cpp
  116. 2
      kaddressbook/xxport/csvimportdialog.cpp
  117. 18
      kaddressbook/xxport/gnokii_xxport.cpp
  118. 20
      kaddressbook/xxport/opera_xxport.cpp
  119. 6
      kaddressbook/xxport/vcard_xxport.cpp
  120. 4
      kaddressbook/xxportselectdialog.cpp
  121. 46
      kalarm/alarmcalendar.cpp
  122. 8
      kalarm/alarmcalendar.h
  123. 118
      kalarm/alarmevent.cpp
  124. 12
      kalarm/alarmevent.h
  125. 14
      kalarm/alarmlistview.cpp
  126. 2
      kalarm/alarmlistview.h
  127. 14
      kalarm/alarmtext.cpp
  128. 30
      kalarm/alarmtimewidget.cpp
  129. 2
      kalarm/alarmtimewidget.h
  130. 24
      kalarm/birthdaydlg.cpp
  131. 8
      kalarm/calendarcompat.cpp
  132. 64
      kalarm/daemon.cpp
  133. 14
      kalarm/daemon.h
  134. 2
      kalarm/dcophandler.cpp
  135. 112
      kalarm/editdlg.cpp
  136. 12
      kalarm/find.cpp
  137. 6
      kalarm/fontcolour.cpp
  138. 6
      kalarm/fontcolourbutton.cpp
  139. 72
      kalarm/functions.cpp
  140. 22
      kalarm/functions.h
  141. 156
      kalarm/kalarmapp.cpp
  142. 2
      kalarm/kalarmd/adcalendar.cpp
  143. 14
      kalarm/kalarmd/adconfigdata.cpp
  144. 36
      kalarm/kalarmd/alarmdaemon.cpp
  145. 4
      kalarm/kalarmd/alarmdaemon.h
  146. 6
      kalarm/kalarmd/alarmguiiface.h
  147. 54
      kalarm/kamail.cpp
  148. 2
      kalarm/karecurrence.cpp
  149. 4
      kalarm/latecancel.cpp
  150. 2
      kalarm/lib/checkbox.h
  151. 2
      kalarm/lib/dateedit.cpp
  152. 4
      kalarm/lib/lineedit.cpp
  153. 6
      kalarm/lib/messagebox.cpp
  154. 2
      kalarm/lib/radiobutton.h
  155. 16
      kalarm/lib/shellprocess.cpp
  156. 8
      kalarm/lib/shellprocess.h
  157. 16
      kalarm/lib/spinbox2.cpp
  158. 8
      kalarm/lib/spinbox2.h
  159. 4
      kalarm/lib/synchtimer.cpp
  160. 4
      kalarm/lib/timeedit.cpp
  161. 4
      kalarm/lib/timeperiod.cpp
  162. 14
      kalarm/lib/timespinbox.cpp
  163. 4
      kalarm/lib/timespinbox.h
  164. 52
      kalarm/mainwindow.cpp
  165. 2
      kalarm/mainwindow.h
  166. 158
      kalarm/messagewin.cpp
  167. 2
      kalarm/messagewin.h
  168. 152
      kalarm/prefdlg.cpp
  169. 148
      kalarm/preferences.cpp
  170. 90
      kalarm/recurrenceedit.cpp
  171. 4
      kalarm/reminder.cpp
  172. 10
      kalarm/repetition.cpp
  173. 22
      kalarm/sounddlg.cpp
  174. 6
      kalarm/soundpicker.cpp
  175. 4
      kalarm/specialactions.cpp
  176. 6
      kalarm/templatedlg.cpp
  177. 4
      kalarm/timeselector.cpp
  178. 12
      kalarm/traywindow.cpp
  179. 2
      kalarm/traywindow.h
  180. 20
      kalarm/undo.cpp
  181. 2
      kandy/src/cmdpropertiesdialog_base.ui
  182. 4
      kandy/src/mobilegui.cpp
  183. 2
      kandy/src/mobilegui.h
  184. 18
      kandy/src/mobilegui_base.ui
  185. 6
      karm/csvexportdialog_base.ui
  186. 10
      karm/edittaskdialog.cpp
  187. 6
      karm/idletimedetector.cpp
  188. 22
      karm/karm_part.cpp
  189. 40
      karm/karmstorage.cpp
  190. 2
      karm/karmstorage.h
  191. 6
      karm/ktimewidget.cpp
  192. 42
      karm/mainwindow.cpp
  193. 8
      karm/plannerparser.cpp
  194. 56
      karm/preferences.cpp
  195. 2
      karm/print.cpp
  196. 4
      karm/printdialog.cpp
  197. 14
      karm/task.cpp
  198. 4
      karm/task.h
  199. 2
      karm/taskview.h
  200. 2
      karm/test/lockerthread.cpp
  201. 6
      karm/test/locking.cpp
  202. 2
      karm/test/script.cpp
  203. 36
      karm/timekard.cpp
  204. 136
      kdgantt/KDGanttMinimizeSplitter.cpp
  205. 6
      kdgantt/KDGanttMinimizeSplitter.h
  206. 4
      kdgantt/KDGanttSemiSizingControl.cpp
  207. 12
      kdgantt/KDGanttView.cpp
  208. 2
      kdgantt/KDGanttView.h
  209. 4
      kdgantt/KDGanttViewItemDrag.cpp
  210. 2
      kdgantt/KDGanttViewItemDrag.h
  211. 32
      kdgantt/KDGanttViewSubwidgets.cpp
  212. 4
      kdgantt/itemAttributeDialog.ui
  213. 10
      kdgantt/qlayoutengine_p.h
  214. 4
      kfile-plugins/ics/kfile_ics.cpp
  215. 4
      kgantt/kgantt/KGantt.cpp
  216. 4
      kgantt/kgantt/KGantt.h
  217. 26
      kgantt/kgantt/itemedit.ui
  218. 8
      kgantt/kgantt/itemedit2.ui
  219. 18
      kioslaves/imap4/imap4.cc
  220. 2
      kioslaves/imap4/imapcommand.cc
  221. 2
      kioslaves/imap4/imapcommand.h
  222. 18
      kioslaves/imap4/imapparser.cc
  223. 8
      kioslaves/imap4/imapparser.h
  224. 2
      kioslaves/imap4/mimeheader.cc
  225. 4
      kioslaves/opengroupware/opengroupware.cpp
  226. 6
      kioslaves/sieve/sieve.cpp
  227. 2
      kitchensync/libqopensync/group.cpp
  228. 4
      kitchensync/libqopensync/member.cpp
  229. 6
      kitchensync/libqopensync/plugin.cpp
  230. 18
      kitchensync/src/configguisunbird.cpp
  231. 4
      kitchensync/src/groupconfig.cpp
  232. 70
      kitchensync/src/groupitem.cpp
  233. 4
      kitchensync/src/groupitem.h
  234. 2
      kitchensync/src/pluginpicker.cpp
  235. 4
      kitchensync/src/syncprocess.cpp
  236. 4
      kitchensync/src/syncprocess.h
  237. 8
      kmail/Mainpage.dox
  238. 2
      kmail/aboutdata.cpp
  239. 28
      kmail/accountdialog.cpp
  240. 4
      kmail/accountmanager.cpp
  241. 2
      kmail/acljobs.cpp
  242. 2
      kmail/actionscheduler.cpp
  243. 2
      kmail/antispamwizard.cpp
  244. 4
      kmail/archivefolderdialog.cpp
  245. 4
      kmail/backupjob.cpp
  246. 8
      kmail/cachedimapjob.cpp
  247. 2
      kmail/compactionjob.cpp
  248. 2
      kmail/composercryptoconfiguration.ui
  249. 102
      kmail/configuredialog.cpp
  250. 26
      kmail/configuredialog_p.cpp
  251. 2
      kmail/configuredialog_p.h
  252. 2
      kmail/customtemplates_base.ui
  253. 8
      kmail/expirypropertiesdialog.cpp
  254. 8
      kmail/folderdiaacltab.cpp
  255. 2
      kmail/folderdiaacltab.h
  256. 4
      kmail/folderdiaquotatab.cpp
  257. 2
      kmail/folderdiaquotatab.h
  258. 24
      kmail/folderpropertiesdialog.ui
  259. 2
      kmail/folderrequester.cpp
  260. 24
      kmail/folderstorage.cpp
  261. 10
      kmail/folderstorage.h
  262. 6
      kmail/folderviewtooltip.h
  263. 2
      kmail/headeritem.cpp
  264. 36
      kmail/headerlistquicksearch.cpp
  265. 12
      kmail/headerlistquicksearch.h
  266. 10
      kmail/headerstyle.cpp
  267. 4
      kmail/htmlstatusbar.cpp
  268. 4
      kmail/identitydrag.cpp
  269. 2
      kmail/identitydrag.h
  270. 10
      kmail/imapaccountbase.cpp
  271. 6
      kmail/imapaccountbase.h
  272. 8
      kmail/imapjob.cpp
  273. 2
      kmail/importarchivedialog.cpp
  274. 4
      kmail/importjob.cpp
  275. 2
      kmail/index.cpp
  276. 2
      kmail/kcursorsaver.h
  277. 8
      kmail/kmaccount.cpp
  278. 6
      kmail/kmaccount.h
  279. 2
      kmail/kmacctcachedimap.cpp
  280. 6
      kmail/kmacctimap.cpp
  281. 6
      kmail/kmacctlocal.cpp
  282. 6
      kmail/kmacctmaildir.cpp
  283. 10
      kmail/kmail.antispamrc
  284. 2
      kmail/kmail_part.cpp
  285. 70
      kmail/kmailicalifaceimpl.cpp
  286. 4
      kmail/kmatmlistview.cpp
  287. 42
      kmail/kmcommands.cpp
  288. 6
      kmail/kmcommands.h
  289. 58
      kmail/kmcomposewin.cpp
  290. 2
      kmail/kmcomposewin.h
  291. 12
      kmail/kmedit.cpp
  292. 4
      kmail/kmfawidgets.cpp
  293. 48
      kmail/kmfilteraction.cpp
  294. 24
      kmail/kmfilterdlg.cpp
  295. 14
      kmail/kmfolder.cpp
  296. 10
      kmail/kmfolder.h
  297. 34
      kmail/kmfoldercachedimap.cpp
  298. 8
      kmail/kmfoldercachedimap.h
  299. 4
      kmail/kmfolderdia.cpp
  300. 4
      kmail/kmfolderdia.h
  301. 2
      kmail/kmfolderdir.cpp
  302. 64
      kmail/kmfolderimap.cpp
  303. 22
      kmail/kmfolderimap.h
  304. 8
      kmail/kmfolderindex.cpp
  305. 6
      kmail/kmfolderindex.h
  306. 18
      kmail/kmfoldermaildir.cpp
  307. 14
      kmail/kmfoldermaildir.h
  308. 36
      kmail/kmfoldermbox.cpp
  309. 2
      kmail/kmfoldermbox.h
  310. 4
      kmail/kmfolderseldlg.cpp
  311. 2
      kmail/kmfolderseldlg.h
  312. 2
      kmail/kmfoldertree.cpp
  313. 56
      kmail/kmheaders.cpp
  314. 8
      kmail/kmheaders.h
  315. 20
      kmail/kmkernel.cpp
  316. 2
      kmail/kmkernel.h
  317. 44
      kmail/kmmainwidget.cpp
  318. 8
      kmail/kmmainwidget.h
  319. 70
      kmail/kmmessage.cpp
  320. 30
      kmail/kmmessage.h
  321. 4
      kmail/kmmimeparttree.cpp
  322. 210
      kmail/kmmsgbase.cpp
  323. 24
      kmail/kmmsgbase.h
  324. 34
      kmail/kmmsginfo.cpp
  325. 10
      kmail/kmmsginfo.h
  326. 20
      kmail/kmmsgpartdlg.cpp
  327. 2
      kmail/kmpopfiltercnfrmdlg.cpp
  328. 26
      kmail/kmreaderwin.cpp
  329. 34
      kmail/kmsearchpattern.cpp
  330. 18
      kmail/kmsearchpattern.h
  331. 6
      kmail/kmsearchpatternedit.cpp
  332. 2
      kmail/kmsearchpatternedit.h
  333. 12
      kmail/kmsender.cpp
  334. 2
      kmail/kmstartup.cpp
  335. 12
      kmail/kmsystemtray.cpp
  336. 2
      kmail/kmtransport.cpp
  337. 6
      kmail/listjob.cpp
  338. 2
      kmail/mailinglistpropertiesdialog.cpp
  339. 2
      kmail/main.cpp
  340. 4
      kmail/managesievescriptsdialog.cpp
  341. 12
      kmail/messageactions.cpp
  342. 2
      kmail/messageactions.h
  343. 4
      kmail/messagecomposer.cpp
  344. 2
      kmail/newfolderdialog.cpp
  345. 8
      kmail/objecttreeparser.cpp
  346. 4
      kmail/objecttreeparser_p.cpp
  347. 2
      kmail/partNode.cpp
  348. 8
      kmail/popaccount.cpp
  349. 12
      kmail/recipientseditor.cpp
  350. 4
      kmail/recipientseditor.h
  351. 2
      kmail/recipientseditortest.cpp
  352. 2
      kmail/recipientspicker.cpp
  353. 2
      kmail/redirectdialog.cpp
  354. 2
      kmail/regexplineedit.cpp
  355. 4
      kmail/rulewidgethandlermanager.cpp
  356. 8
      kmail/searchwindow.cpp
  357. 2
      kmail/searchwindow.h
  358. 2
      kmail/signatureconfigurator.cpp
  359. 6
      kmail/smimeconfiguration.ui
  360. 4
      kmail/snippetdlgbase.ui
  361. 6
      kmail/snippetsettingsbase.ui
  362. 10
      kmail/snippetwidget.cpp
  363. 2
      kmail/stringutil.cpp
  364. 14
      kmail/templateparser.cpp
  365. 4
      kmail/templatesconfiguration.cpp
  366. 6
      kmail/templatesconfiguration_base.ui
  367. 2
      kmail/templatesinsertcommand.cpp
  368. 6
      kmail/tests/signedmail.mbox
  369. 2
      kmail/twindowpositioner.cpp
  370. 14
      kmail/vacation.cpp
  371. 6
      kmail/warningconfiguration.ui
  372. 4
      kmail/xfaceconfigurator.cpp
  373. 2
      kmailcvt/filter_kmail_maildir.cxx
  374. 4
      kmailcvt/filter_oe.cxx
  375. 2
      kmailcvt/filter_opera.cxx
  376. 2
      kmailcvt/filters.cxx
  377. 6
      kmailcvt/kimportpagedlg.ui
  378. 4
      kmailcvt/kselfilterpagedlg.ui
  379. 4
      kmobile/devices/gnokii/gnokii_mobile.cpp
  380. 6
      kmobile/devices/gnokii/gnokiiconfigui.ui
  381. 2
      kmobile/kmobile_selectiondialog.ui
  382. 2
      kmobile/kmobileclient.cpp
  383. 12
      kmobile/kmobiledevice.h
  384. 8
      knode/articlewidget.cpp
  385. 6
      knode/headerview.cpp
  386. 4
      knode/knaccountmanager.cpp
  387. 10
      knode/knarticlefactory.cpp
  388. 2
      knode/knarticlefilter.cpp
  389. 26
      knode/kncomposer.cpp
  390. 14
      knode/knconfig.cpp
  391. 2
      knode/knconfig.h
  392. 10
      knode/knconfigwidgets.cpp
  393. 2
      knode/knconvert.cpp
  394. 4
      knode/kndisplayedheader.cpp
  395. 4
      knode/knfilterdialog.cpp
  396. 2
      knode/kngroup.cpp
  397. 8
      knode/kngroup.h
  398. 4
      knode/kngroupdialog.cpp
  399. 8
      knode/kngroupmanager.cpp
  400. 4
      knode/kngroupmanager.h
  401. 2
      knode/kngrouppropdlg.cpp
  402. 4
      knode/knjobdata.cpp
  403. 2
      knode/knjobdata.h
  404. 30
      knode/knmainwidget.cpp
  405. 4
      knode/knmainwidget.h
  406. 38
      knode/knnetaccess.cpp
  407. 2
      knode/knnetaccess.h
  408. 2
      knode/knnntpaccount.cpp
  409. 4
      knode/knnntpclient.cpp
  410. 2
      knode/knode.cpp
  411. 2
      knode/knrangefilter.cpp
  412. 4
      knode/knsearchdialog.cpp
  413. 6
      knode/knwidgets.cpp
  414. 2
      knode/knwidgets.h
  415. 2
      knode/smtpaccountwidget_base.ui
  416. 16
      knotes/knote.cpp
  417. 12
      knotes/knotebutton.cpp
  418. 2
      knotes/knotebutton.h
  419. 4
      knotes/knoteconfigdlg.cpp
  420. 8
      knotes/knoteedit.cpp
  421. 10
      knotes/knoteprinter.cpp
  422. 6
      knotes/knoteprinter.h
  423. 2
      knotes/knotesalarm.cpp
  424. 6
      knotes/knotesapp.cpp
  425. 2
      knotes/knotesnetrecv.cpp
  426. 2
      knotes/resourcelocal.cpp
  427. 2
      kode/kodemain.cpp
  428. 2
      kode/kwsdl/kung/dateinputfield.cpp
  429. 2
      kode/kwsdl/kung/pageinputfield.cpp
  430. 4
      konsolekalendar/konsolekalendarepoch.cpp
  431. 4
      konsolekalendar/main.cpp
  432. 2
      kontact/Thoughts
  433. 8
      kontact/interfaces/core.cpp
  434. 14
      kontact/interfaces/summary.cpp
  435. 2
      kontact/plugins/kmail/kmail_plugin.cpp
  436. 6
      kontact/plugins/kmail/summarywidget.cpp
  437. 4
      kontact/plugins/knotes/knotes_part.cpp
  438. 10
      kontact/plugins/knotes/summarywidget.cpp
  439. 4
      kontact/plugins/korganizer/korganizerplugin.cpp
  440. 30
      kontact/plugins/korganizer/summarywidget.cpp
  441. 2
      kontact/plugins/korganizer/todoplugin.cpp
  442. 28
      kontact/plugins/korganizer/todosummarywidget.cpp
  443. 10
      kontact/plugins/kpilot/summarywidget.cpp
  444. 2
      kontact/plugins/kpilot/summarywidget.h
  445. 282
      kontact/plugins/newsticker/newsfeeds.h
  446. 8
      kontact/plugins/newsticker/summarywidget.cpp
  447. 48
      kontact/plugins/specialdates/sdsummarywidget.cpp
  448. 2
      kontact/plugins/summary/kcmkontactsummary.cpp
  449. 6
      kontact/plugins/summary/summaryview_part.cpp
  450. 10
      kontact/plugins/weather/summarywidget.cpp
  451. 2
      kontact/src/aboutdialog.cpp
  452. 18
      kontact/src/iconsidepane.cpp
  453. 8
      kontact/src/iconsidepane.h
  454. 2
      kontact/src/kcmkontact.cpp
  455. 2
      kontact/src/main.cpp
  456. 20
      kontact/src/mainwindow.cpp
  457. 2
      kontact/src/profilemanager.cpp
  458. 16
      korganizer/actionmanager.cpp
  459. 22
      korganizer/calendarview.cpp
  460. 8
      korganizer/datechecker.cpp
  461. 12
      korganizer/datenavigator.cpp
  462. 18
      korganizer/datenavigatorcontainer.cpp
  463. 4
      korganizer/datenavigatorcontainer.h
  464. 2
      korganizer/eventarchiver.cpp
  465. 6
      korganizer/filteredit_base.ui
  466. 14
      korganizer/freebusymanager.cpp
  467. 2
      korganizer/incidencechanger.cpp
  468. 2
      korganizer/interfaces/korganizer/baseview.h
  469. 2
      korganizer/interfaces/korganizer/mainwindow.h
  470. 2
      korganizer/interfaces/korganizer/part.h
  471. 8
      korganizer/journalentry.cpp
  472. 4
      korganizer/kdatenavigator.cpp
  473. 6
      korganizer/koagenda.cpp
  474. 2
      korganizer/koagendaitem.cpp
  475. 26
      korganizer/koagendaview.cpp
  476. 4
      korganizer/koagendaview.h
  477. 6
      korganizer/koapp.cpp
  478. 2
      korganizer/koattendeeeditor.cpp
  479. 2
      korganizer/kocore.cpp
  480. 8
      korganizer/kodaymatrix.cpp
  481. 8
      korganizer/koeditoralarms_base.ui
  482. 4
      korganizer/koeditorattachments.cpp
  483. 2
      korganizer/koeditordetails.cpp
  484. 16
      korganizer/koeditorfreebusy.cpp
  485. 4
      korganizer/koeditorgeneralevent.cpp
  486. 2
      korganizer/koeditorgeneraljournal.cpp
  487. 16
      korganizer/koeditorgeneraltodo.cpp
  488. 2
      korganizer/koeditorgeneraltodo.h
  489. 2
      korganizer/koeditorrecurrence.cpp
  490. 2
      korganizer/koeventeditor.cpp
  491. 10
      korganizer/kogroupware.cpp
  492. 8
      korganizer/kogroupwareprefspage.ui
  493. 2
      korganizer/kojournaleditor.cpp
  494. 4
      korganizer/kojournalview.cpp
  495. 2
      korganizer/kojournalview.h
  496. 12
      korganizer/kolistview.cpp
  497. 4
      korganizer/kolistview.h
  498. 24
      korganizer/komailclient.cpp
  499. 18
      korganizer/komonthview.cpp
  500. 2
      korganizer/komonthview.h
  501. Some files were not shown because too many files have changed in this diff Show More

4
NewsLog.txt

@ -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.

8
akregator/src/addfeedwidgetbase.ui

@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@ -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>

6
akregator/src/akregator_part.cpp

@ -428,7 +428,7 @@ 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);
@ -444,7 +444,7 @@ 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") );
@ -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;

14
akregator/src/akregator_view.cpp

@ -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());
}
@ -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);
}
}
@ -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 void readConfig(KConfig* config);
@ -259,7 +259,7 @@ class Criterion
public:
enum Subject {
Title, Description, Author, Link, tqStatus, KeepFlag
Title, Description, Author, Link, Status, KeepFlag
};
static TQString subjectToString(Subject subj);

4
akregator/src/articlelistview.cpp

@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message)
const uint x = (viewport()->width() - w - 30) / 2 ;
const uint y = (viewport()->height() - h - 30) / 2 ;
p.setBrush( tqcolorGroup().background() );
p.setBrush( colorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
}
void ArticleListView::viewportPaintEvent(TQPaintEvent *e)

6
akregator/src/dragobjects.cpp

@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e)
bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles)
{
articles.clear();
TQByteArray array = e->tqencodedData("akregator/articles");
TQByteArray array = e->encodedData("akregator/articles");
TQDataStream stream(array, IO_ReadOnly);
@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const
return 0;
}
TQByteArray ArticleDrag::tqencodedData(const char* mime) const
TQByteArray ArticleDrag::encodedData(const char* mime) const
{
TQCString mimetype(mime);
if (mimetype == "akregator/articles")
@ -86,7 +86,7 @@ TQByteArray ArticleDrag::tqencodedData(const char* mime) const
}
else
{
return KURLDrag::tqencodedData(mime);
return KURLDrag::encodedData(mime);
}
}

2
akregator/src/dragobjects.h

@ -57,7 +57,7 @@ public:
protected:
virtual TQByteArray tqencodedData(const char* mime) const;
virtual TQByteArray encodedData(const char* mime) const;
virtual const char* format(int i) const;
private:

34
akregator/src/feed.cpp

@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
TQValueList<Article>::Iterator en = tarticles.end();
for (it = tarticles.begin(); it != en; ++it)
(*it).setqStatus(Article::Read);
(*it).seStatus(Article::Read);
setNotificationMode(true, true);
}
}
@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
queue->addFeed(this);
else
{
uint now = TQDateTime::tqcurrentDateTime().toTime_t();
uint now = TQDateTime::currentDateTime().toTime_t();
// workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes
// this fixes annoying behaviour of akregator, especially when the host is reachable
@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
d->addedArticlesNotify.append(mya);
if (!mya.isDeleted() && !markImmediatelyAsRead())
mya.setqStatus(Article::New);
mya.seStatus(Article::New);
else
mya.setqStatus(Article::Read);
mya.seStatus(Article::Read);
changed = true;
}
@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
{
mya.setKeep(old.keep());
int oldstatus = old.status();
old.setqStatus(Article::Read);
old.seStatus(Article::Read);
d->articles.remove(old.guid());
appendArticle(mya);
mya.setqStatus(oldstatus);
mya.seStatus(oldstatus);
d->updatedArticlesNotify.append(mya);
changed = true;
@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const
bool Feed::isExpired(const Article& a) const
{
TQDateTime now = TQDateTime::tqcurrentDateTime();
TQDateTime now = TQDateTime::currentDateTime();
int expiryAge = -1;
// check whether the feed uses the global default and the default is limitArticleAge
if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge)
@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
{
if ((*it).status() == Article::New)
{
(*it).setqStatus(Article::Unread);
(*it).seStatus(Article::Unread);
}
}
@ -579,7 +579,7 @@ void Feed::tryFetch()
{
d->fetchError = false;
d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
//connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
}
@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
nodeModified();
}
void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
{
// Note that loader instances delete themselves
d->loader = 0;
@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
else
{
d->fetchError = true;
d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
emit fetchError(this);
}
return;
@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
appendArticles(doc);
d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t());
d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t());
emit fetched(this);
}
@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
articlesModified();
}
void Feed::setArticleChanged(Article& a, int oldtqStatus)
void Feed::setArticleChanged(Article& a, int oldStatus)
{
if (oldtqStatus != -1)
if (oldStatus != -1)
{
int newtqStatus = a.status();
if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
int newStatus = a.status();
if (oldStatus == Article::Read && newStatus != Article::Read)
setUnread(unread()+1);
else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
else if (oldStatus != Article::Read && newStatus == Article::Read)
setUnread(unread()-1);
}
d->updatedArticlesNotify.append(a);

8
akregator/src/feed.h

@ -43,7 +43,7 @@ namespace KPIM {
// needed for slot fetchCompleted()
using RSS::Document;
using RSS::Loader;
using RSS::tqStatus;
using RSS::Status;
namespace Akregator
{
@ -254,7 +254,7 @@ namespace Akregator
private slots:
void fetchCompleted(Loader *loader, Document doc, tqStatus status);
void fetchCompleted(Loader *loader, Document doc, Status status);
void slotImageFetched(const TQPixmap& image);
private:
@ -265,10 +265,10 @@ namespace Akregator
void setArticleDeleted(Article& a);
/** notifies that article @c mya was changed
@param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
@param oldStatus if the status was changed, it contains the old status, -1 otherwise
To be called by @ref Article
*/
void setArticleChanged(Article& a, int oldtqStatus=-1);
void setArticleChanged(Article& a, int oldStatus=-1);
void enforceLimitArticleNumber();

2
akregator/src/feedstorage.h

@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject
virtual uint pubDate(const TQString& guid) = 0;
virtual void setPubDate(const TQString& guid, uint pubdate) = 0;
virtual int status(const TQString& guid) = 0;