[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/korganizer
From: John Layt <john () layt ! net>
Date: 2010-09-17 9:19:59
Message-ID: 20100917091959.23743AC888 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1176287 by jlayt:
Improve peformance when adding holidays by using more efficient KHolidays
method.
Partial forwardport of r1176162.
M +7 -10 actionmanager.cpp
--- trunk/KDE/kdepim/korganizer/actionmanager.cpp #1176286:1176287
@@ -75,6 +75,8 @@
#include <Akonadi/AgentManager>
#include <Akonadi/AgentInstanceCreateJob>
+#include <KHolidays/Holidays>
+
#include <kmimetypetrader.h>
#include <kio/job.h>
#include <KAction>
@@ -1215,18 +1217,13 @@
KOrg::HtmlExportJob *exportJob = new KOrg::HtmlExportJob( mCalendarView->calendar(), settings, view() );
- QDate cdate = settings->dateStart().date();
- QDate qd2 = settings->dateEnd().date();
- while ( cdate <= qd2 ) {
- QStringList holidays = KOGlobals::self()->holiday( cdate );
- if ( !holidays.isEmpty() ) {
- QStringList::ConstIterator it = holidays.constBegin();
- for ( ; it != holidays.constEnd(); ++it ) {
- exportJob->addHoliday( cdate, *it );
+ if( KOGlobals::self()->holidays() ) {
+ KHolidays::Holiday::List holidays = KOGlobals::self()->holidays()->holidays(
+ settings->dateStart().date(), settings->dateEnd().date() );
+ foreach( KHolidays::Holiday holiday, holidays ) {
+ exportJob->addHoliday( holiday.date(), holiday.text() );
}
}
- cdate = cdate.addDays( 1 );
- }
exportJob->start();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic