[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2009-07-31 0:11:52
Message-ID: 1248999112.125791.18798.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1004818 by ahartmetz:

Build fix, imitating krake here...
KPIM::KPimPrefs::timeSpec() -> KSystemTimeZones::local() like suggested by rev 1004696
This also rearranges some includes alphabetically.
CCMAIL: mcguire@kde.org


 M  +5 -4      knotes/knotes_plugin.cpp  
 M  +4 -3      planner/planner.cpp  


--- trunk/KDE/kdepim/kontact/plugins/knotes/knotes_plugin.cpp #1004817:1004818
@@ -35,13 +35,14 @@
 
 #include <kaboutdata.h>
 #include <kaction.h>
+#include <kactioncollection.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kactioncollection.h>
+#include <kicon.h>
 #include <kiconloader.h>
+#include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <kicon.h>
-#include <kmessagebox.h>
+#include <KSystemTimeZones>
 
 #include <QtDBus/QtDBus>
 #include <QtGui/QDropEvent>
@@ -135,7 +136,7 @@
   }
 
   if ( KCal::ICalDrag::canDecode( event->mimeData() ) ) {
-    KCal::CalendarLocal cal( KPIM::KPimPrefs::timeSpec() );
+    KCal::CalendarLocal cal( KSystemTimeZones::local() );
     if ( KCal::ICalDrag::fromMimeData( event->mimeData(), &cal ) ) {
       KCal::Journal::List journals = cal.journals();
       if ( !journals.isEmpty() ) {
--- trunk/KDE/kdepim/kontact/plugins/planner/planner.cpp #1004817:1004818
@@ -50,6 +50,7 @@
 #include <klocale.h>
 #include <kmenu.h>
 #include <kstandarddirs.h>
+#include <KSystemTimeZones>
 #include <kurllabel.h>
 #include <kparts/part.h>
 
@@ -377,7 +378,7 @@
                this, SLOT(todoPopupMenu(const QString&)) );
 
       QString tipText( KCal::IncidenceFormatter::toolTipStr(
-                         todo, true, KPIM::KPimPrefs::timeSpec() ) );
+                         todo, true, KSystemTimeZones::local() ) );
       if ( !tipText.isEmpty() ) {
         urlLabel2->setToolTip( tipText );
       }
@@ -512,7 +513,7 @@
 
       // Print the date span for multiday, allDay events, for the
       // first day of the event only.
-      KDateTime::Spec spec = KPIM::KPimPrefs::timeSpec();
+      KDateTime::Spec spec = KSystemTimeZones::local();
       if ( ev->isMultiDay() && ev->allDay() && dayof == 1 && span > 1 ) {
         KDateTime ksD( sD.addDays( span - 1 ), spec );
         datestr = ev->dtStartDateStr( false, spec ) +
@@ -608,7 +609,7 @@
                this, SLOT(eventPopupMenu(const QString&)) );
 
       QString tipText( KCal::IncidenceFormatter::toolTipStr(
-                         ev, true, KPIM::KPimPrefs::timeSpec() ) );
+                         ev, true, KSystemTimeZones::local() ) );
       if ( !tipText.isEmpty() ) {
         urlLabel->setToolTip( tipText );
       }
[prev in list] [next in list] [prev in thread] [next in thread]