Merged revisions 993251,993269-993270,993305,993311,993326,993338,993446,993450,993461-993464,993472,993474,993477,993480,993495,993501,993515,993518,993520,993522,993531,993542,993545,993550,993557,993561,993573,993582,993591,993599,993629,993641,993738,993741-993742,993746,993846,993878,993906,993963-993964,993970,994012,994017,994063,994093,994129,994223,994262,994339,994382,994441,994459,994532 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim ........ r993251 | trueg | 2009-07-08 12:46:00 +0200 (Wed, 08 Jul 2009) | 3 lines Nepomuk rcgen cleanup first step (or rather fourth or something considering tokoe's amazing work before): - disabling templates. we do not use them anyway and they will be deprecated soon. ........ r993269 | skelly | 2009-07-08 13:14:13 +0200 (Wed, 08 Jul 2009) | 1 line Make sure tests includes are available. ........ r993270 | skelly | 2009-07-08 13:14:17 +0200 (Wed, 08 Jul 2009) | 2 lines Break the main window into a tabbed interface for multiple proxy model tests. ........ r993305 | lueck | 2009-07-08 14:52:34 +0200 (Wed, 08 Jul 2009) | 1 line typo fix ........ r993311 | winterz | 2009-07-08 15:08:11 +0200 (Wed, 08 Jul 2009) | 9 lines Refinement of import/export of kaddressbook from/to GMX. Patch entirely from Urs Joss. Thanks! Joss, please close the review board request for this as closed. Remember: we need to also put this into kcontactmanager. http://reviewboard.kde.org/r/941 CCMAIL: tschenturs@gmx.ch ........ r993326 | djarvie | 2009-07-08 15:42:42 +0200 (Wed, 08 Jul 2009) | 1 line Move methods out of base class ........ r993338 | vkrause | 2009-07-08 16:00:53 +0200 (Wed, 08 Jul 2009) | 4 lines Birthday resources can have different settings, so it does not make sense to only allow one instance. Should help with the migration problem David is seeing. ........ r993446 | skelly | 2009-07-08 19:47:31 +0200 (Wed, 08 Jul 2009) | 6 lines Add another configuration use for the selection proxy model. This is getting cumbersome, so I will soon change the API and refactor the internals. There are also some remaining nagging bugs. ........ r993450 | skelly | 2009-07-08 19:50:58 +0200 (Wed, 08 Jul 2009) | 1 line Enable akonadi_next to be built standalone. ........ r993461 | skelly | 2009-07-08 20:12:46 +0200 (Wed, 08 Jul 2009) | 1 line Start some support for AmazingCompletion(tm) ........ r993462 | skelly | 2009-07-08 20:12:50 +0200 (Wed, 08 Jul 2009) | 4 lines Create a sane implementation od AbstractProxyModelMatch. This should be in QAbstractProxyModel. I'll patch it there later and send a merge request upstream. ........ r993463 | skelly | 2009-07-08 20:12:53 +0200 (Wed, 08 Jul 2009) | 2 lines Implement match for the ContactsModel. Will allow matching Amazingly eventually. ........ r993464 | skelly | 2009-07-08 20:12:57 +0200 (Wed, 08 Jul 2009) | 1 line Reimplement match. ........ r993472 | skelly | 2009-07-08 20:25:04 +0200 (Wed, 08 Jul 2009) | 1 line Better match implementation. ........ r993474 | tmcguire | 2009-07-08 20:33:31 +0200 (Wed, 08 Jul 2009) | 4 lines Prevent an infinite recursion when entering a new folder with at least one message. Curiously, this is very similar to kolab/issue3727 ........ r993477 | skelly | 2009-07-08 20:39:54 +0200 (Wed, 08 Jul 2009) | 1 line Really fix matching this time. ........ r993480 | mleupold | 2009-07-08 20:51:54 +0200 (Wed, 08 Jul 2009) | 1 line Fix/hide various krazy issues including most qclasses, QLatin1String and kdebug. ........ r993495 | bbroeksema | 2009-07-08 21:39:29 +0200 (Wed, 08 Jul 2009) | 2 lines Krazy fixes: Use const references instead of const values in Q_FOREACH. ........ r993501 | mlaurent | 2009-07-08 21:44:23 +0200 (Wed, 08 Jul 2009) | 2 lines compile++ ........ r993515 | tstaerk | 2009-07-08 22:18:36 +0200 (Wed, 08 Jul 2009) | 1 line karm->ktimetracker && dcop->dbus ........ r993518 | tstaerk | 2009-07-08 22:30:55 +0200 (Wed, 08 Jul 2009) | 1 line karm->ktimetracker && dcop->dbus ........ r993520 | cgiboudeaux | 2009-07-08 22:41:32 +0200 (Wed, 08 Jul 2009) | 1 line SVN_SILENT Cleanup ........ r993522 | cgiboudeaux | 2009-07-08 22:42:49 +0200 (Wed, 08 Jul 2009) | 1 line Cleanup ........ r993531 | tstaerk | 2009-07-08 22:53:34 +0200 (Wed, 08 Jul 2009) | 1 line What you never wanted to know about ktimetracker, but were forced to learn anyway-- ........ r993542 | bbroeksema | 2009-07-08 23:06:33 +0200 (Wed, 08 Jul 2009) | 2 lines Krazy fixes: null string assign -> clear() ........ r993545 | bbroeksema | 2009-07-08 23:19:38 +0200 (Wed, 08 Jul 2009) | 2 lines SVN_SILENT: fix two small spelling errors in comments. ........ r993550 | cgiboudeaux | 2009-07-08 23:29:37 +0200 (Wed, 08 Jul 2009) | 1 line Partially revert of r967753. Only kresources and plugins must be built after the optional applications. ........ r993557 | bbroeksema | 2009-07-08 23:36:51 +0200 (Wed, 08 Jul 2009) | 2 lines Fix krazy issues: QLatin1String ........ r993561 | cgiboudeaux | 2009-07-08 23:39:10 +0200 (Wed, 08 Jul 2009) | 1 line SVN_SILENT Cleanup ........ r993573 | bbroeksema | 2009-07-09 00:02:53 +0200 (Thu, 09 Jul 2009) | 2 lines Krazy fixes: proper include directives. ........ r993582 | bbroeksema | 2009-07-09 00:25:27 +0200 (Thu, 09 Jul 2009) | 2 lines Krazy fixes: proper include directives. ........ r993591 | bbroeksema | 2009-07-09 01:02:21 +0200 (Thu, 09 Jul 2009) | 2 lines Krazy fixes: proper include directives. ........ r993599 | winterz | 2009-07-09 02:32:58 +0200 (Thu, 09 Jul 2009) | 3 lines compile++ add cstdlib header for exit() ........ r993629 | bbroeksema | 2009-07-09 09:04:53 +0200 (Thu, 09 Jul 2009) | 2 lines Revert part of r993495 because Protocol is an enum. Let krazy ignore these lines. ........ r993641 | bbroeksema | 2009-07-09 10:42:09 +0200 (Thu, 09 Jul 2009) | 4 lines Reduce reloads of resources based on the SingleFileResource by using hashes of the file. This commit prevents reloads of resources based on singlefileresource when the resource is writing changes to the file itself. ........ r993738 | pokrzywka | 2009-07-09 14:26:52 +0200 (Thu, 09 Jul 2009) | 1 line nicer fix for the --templates bug in nepomuk_rcgen: only add the option if there are templates specified. Not sure if that will ever be needed again though, but it doesn't hurt for now. ........ r993741 | djarvie | 2009-07-09 14:35:19 +0200 (Thu, 09 Jul 2009) | 1 line Fix compile warning ........ r993742 | winterz | 2009-07-09 14:46:42 +0200 (Thu, 09 Jul 2009) | 6 lines Go crazy with node validity checks to try and fix all the crash reports that I can't reproduce. Might fix CCBUG: 198961 MERGE: e4,4.3 ........ r993746 | pokrzywka | 2009-07-09 14:51:40 +0200 (Thu, 09 Jul 2009) | 3 lines fixed the build problems with the nepomuk agents on windows. The generated files now handle static linking. CCMAIL:till@kdab.net ........ r993846 | winterz | 2009-07-09 17:11:23 +0200 (Thu, 09 Jul 2009) | 7 lines Urs' cleanups Add Urs to copyright. I'll copy this into kcontactmanager. MERGE: e4 ........ r993878 | scripty | 2009-07-09 17:42:19 +0200 (Thu, 09 Jul 2009) | 1 line SVN_SILENT made messages (.desktop file) ........ r993906 | jtamate | 2009-07-09 18:58:08 +0200 (Thu, 09 Jul 2009) | 3 lines BUG: 192897 Added "at the bottom of the Security tab in this dialog" to the message. ........ r993963 | bbroeksema | 2009-07-09 22:20:13 +0200 (Thu, 09 Jul 2009) | 2 lines Fix krazy issues: Proper include directives. ........ r993964 | bbroeksema | 2009-07-09 22:24:44 +0200 (Thu, 09 Jul 2009) | 2 lines Krazy fix: single-char QString operations ........ r993970 | bbroeksema | 2009-07-09 22:29:56 +0200 (Thu, 09 Jul 2009) | 2 lines Krazy fix: C++ ctors that should be declared 'explicit' ........ r994012 | bbroeksema | 2009-07-10 00:01:00 +0200 (Fri, 10 Jul 2009) | 2 lines Krazy fixes: validity of i18n calls. ........ r994017 | bbroeksema | 2009-07-10 00:07:32 +0200 (Fri, 10 Jul 2009) | 3 lines Krazy fix: [foreach[ This is not a call to keys of a map or set, but to a std::vector. Ignore this one. ........ r994063 | winterz | 2009-07-10 04:16:56 +0200 (Fri, 10 Jul 2009) | 4 lines fix spacing between the pixmap and the urllabel BUG: 199598 MERGE: e4,4.3 ........ r994093 | mlaurent | 2009-07-10 09:10:16 +0200 (Fri, 10 Jul 2009) | 2 lines Apply patch ........ r994129 | trueg | 2009-07-10 11:15:40 +0200 (Fri, 10 Jul 2009) | 4 lines Moved NepomukAddOntologyClasses to kdelibs. No need for a local copy anymore. Also by default rcgen will not export classes anymore. Thus, there is no need for the define anymore. ........ r994223 | vkrause | 2009-07-10 13:59:23 +0200 (Fri, 10 Jul 2009) | 3 lines No need to try to migrate the not yet/no longer supported file formats of the KABC file resource in every run. ........ r994262 | djarvie | 2009-07-10 15:36:32 +0200 (Fri, 10 Jul 2009) | 4 lines Refactor to remove dependencies in KAEvent, KARecurrence and AlarmText on KAlarm preferences, in preparation for Akonadi migration. All KAEvent data independent of preferences is not in KAEventData. ........ r994339 | ervin | 2009-07-10 16:35:40 +0200 (Fri, 10 Jul 2009) | 2 lines Let's allow people to type in the KDateEdit. Okay? :-) ........ r994382 | djarvie | 2009-07-10 16:51:41 +0200 (Fri, 10 Jul 2009) | 1 line Fix alarms not being triggered if reminders occur AFTER the main alarm ........ r994441 | scripty | 2009-07-10 17:19:10 +0200 (Fri, 10 Jul 2009) | 1 line SVN_SILENT made messages (.desktop file) ........ r994459 | cgiboudeaux | 2009-07-10 17:37:43 +0200 (Fri, 10 Jul 2009) | 1 line SVN_SILENT Remove the extra comma ........ r994532 | vkrause | 2009-07-10 19:36:12 +0200 (Fri, 10 Jul 2009) | 4 lines Use the recently introduced server-side collection content mimetype filtering. This fixes Kolab collections not showing up in eg. KContactManager. ........ svn path=/branches/work/akonadi-ports/kdepim/; revision=994567wilder-work
Volker Krause
17 years ago
parent
0d055456de
commit
51dcfa27bf
12 changed files with 64 additions and 12 deletions
Loading…
Reference in new issue