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

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins/planner
From:       Allen Winter <winter () kde ! org>
Date:       2009-10-11 15:46:58
Message-ID: 1255276018.396289.9045.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1033926 by winterz:

CamelCase headers
cleanup unused headers and forward class declarations
MERGE: none


 M  +2 -12     kcmplanner.cpp  
 M  +1 -1      kcmplanner.h  
 M  +19 -32    planner.cpp  
 M  +20 -15    planner.h  
 M  +4 -6      plannerplugin.cpp  
 M  +2 -4      plannerplugin.h  


--- trunk/KDE/kdepim/kontact/plugins/planner/kcmplanner.cpp #1033925:1033926
@@ -25,19 +25,9 @@
 
 #include "kcmplanner.h"
 
-#include <kaboutdata.h>
-#include <kcomponentdata.h>
-#include <kconfig.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kdemacros.h>
+#include <KAboutData>
+#include <KComponentData>
 
-#include <QCheckBox>
-#include <QLabel>
-#include <QLayout>
-#include <QRadioButton>
-#include <QSpinBox>
-
 extern "C"
 {
   KDE_EXPORT KCModule *create_planner( QWidget *parent, const char * )
--- trunk/KDE/kdepim/kontact/plugins/planner/kcmplanner.h #1033925:1033926
@@ -25,7 +25,7 @@
 #define KCMPLANNER_H
 
 #include "ui_plannerconfig_base.h"
-#include <kcmodule.h>
+#include <KCModule>
 
 class KCMPlanner : public KCModule, public Ui::PlannerSummaryConfig_Base
 {
--- trunk/KDE/kdepim/kontact/plugins/planner/planner.cpp #1033925:1033926
@@ -26,42 +26,29 @@
 
 #include "planner.h"
 #include "plannerplugin.h"
-#include "korganizerinterface.h"
+#include "korganizer/korganizerinterface.h"
+#include "korganizer/stdcalendar.h"
 
-#include <korganizer/stdcalendar.h>
-#include <kontactinterface/core.h>
-#include <kontactinterface/plugin.h>
-#include <libkdepim/kpimprefs.h>
+#include <KABC/StdAddressBook>
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
-#include <kcal/calendar.h>
-#include <kcal/calhelper.h>
-#include <kcal/event.h>
-#include <kcal/todo.h>
-#include <kcal/incidence.h>
-#include <kcal/resourcecalendar.h>
-#include <kcal/resourcelocal.h>
-#include <kcal/incidenceformatter.h>
+#include <KCal/CalendarResources>
+#include <KCal/CalHelper>
+#include <KCal/IncidenceFormatter>
 
-#include <kdialog.h>
-#include <kdatetime.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmenu.h>
-#include <kstandarddirs.h>
+#include <KHolidays/Holidays>
+
+#include <KontactInterface/Core>
+
+#include <KConfig>
+#include <KConfigGroup>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMenu>
 #include <KSystemTimeZones>
-#include <kurllabel.h>
-#include <kparts/part.h>
+#include <KUrlLabel>
 
-#include <QCursor>
-#include <QGridLayout>
 #include <QEvent>
 #include <QLabel>
-#include <QLayout>
-#include <QPixmap>
-#include <QToolTip>
 #include <QVBoxLayout>
 
 enum SDIncidenceType {
@@ -87,7 +74,7 @@
     QString summary;
     QString desc;
     int span; // #days in the special occassion.
-    KABC::Addressee addressee;
+    Addressee addressee;
 
     bool operator<( const SDEntry &entry ) const
     {
@@ -108,7 +95,7 @@
   mCalendar = KOrg::StdCalendar::self();
   mCalendar->load();
 
-  mAddressBook = KABC::StdAddressBook::self();
+  mAddressBook = StdAddressBook::self();
   mAddressBook->load();
 
   connect( mCalendar, SIGNAL(calendarChanged()), SLOT(updateView()) );
@@ -637,7 +624,7 @@
 {
   mDates.clear();
 
-  Q_FOREACH ( const KABC::Addressee &addressee, mAddressBook->allAddressees() ) {
+  Q_FOREACH ( const Addressee &addressee, mAddressBook->allAddressees() ) {
     QDate birthday = addressee.birthday().date();
     if ( birthday.isValid() && mBirthdayConList &&
           birthday.day() == date.day() && birthday.month() == date.month() ) {
--- trunk/KDE/kdepim/kontact/plugins/planner/planner.h #1033925:1033926
@@ -25,32 +25,37 @@
 #ifndef PLANNERWIDGET_H
 #define PLANNERWIDGET_H
 
-#include <kontactinterface/summary.h>
-#include <kholidays/holidays.h>
+#include <KontactInterface/Summary>
 
-#include <kabc/resource.h>
-#include <kcal/calendarresources.h>
-#include <kcal/todo.h>
+#include <KCal/Event>
+#include <KCal/Todo>
 
 #include <QList>
 
-class QWidget;
-class QEvent;
-class QGridLayout;
-class QLabel;
-class QVBoxLayout;
 class SDEntry;
 
-namespace KontactInterface {
-  class Plugin;
+namespace KABC {
+  class AddressBook;
 }
+using namespace KABC;
+
 namespace KCal {
-  class Event;
   class CalendarResources;
-  class ResourceCalendar;
 }
 using namespace KCal;
 
+namespace KHolidays {
+  class HolidayRegion;
+}
+
+namespace KontactInterface {
+  class Plugin;
+}
+
+class QGridLayout;
+class QLabel;
+class QVBoxLayout;
+
 class Planner : public KontactInterface::Summary
 {
   Q_OBJECT
@@ -128,7 +133,7 @@
     QList<QLabel *> mLabels;
 
     CalendarResources *mCalendar;
-    KABC::AddressBook *mAddressBook;
+    AddressBook *mAddressBook;
 
     Todo::List mTodos;
     QString initStateText( const Todo *todo, const QDate &date );
--- trunk/KDE/kdepim/kontact/plugins/planner/plannerplugin.cpp #1033925:1033926
@@ -2,7 +2,7 @@
   This file is part of Kontact.
 
   Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
-  Copyright (c) 2004-2005 Allen Winter <winter@kde.org>
+  Copyright (c) 2004-2005,2009 Allen Winter <winter@kde.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,12 +26,10 @@
 #include "plannerplugin.h"
 #include "planner.h"
 
-#include <kontactinterface/core.h>
+#include <KontactInterface/Core>
 
-#include <kaboutdata.h>
-#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kparts/componentfactory.h>
+#include <KAboutData>
+#include <KLocale>
 
 EXPORT_KONTACT_PLUGIN( PlannerPlugin, planner )
 
--- trunk/KDE/kdepim/kontact/plugins/planner/plannerplugin.h #1033925:1033926
@@ -2,7 +2,7 @@
   This file is part of Kontact.
 
   Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
-  Copyright (c) 2004 Allen Winter <winter@kde.org>
+  Copyright (c) 2004,2009 Allen Winter <winter@kde.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,10 +26,8 @@
 #ifndef PLANNER_PLUGIN_H
 #define PLANNER_PLUGIN_H
 
-#include <kontactinterface/plugin.h>
+#include <KontactInterface/Plugin>
 
-class Planner;
-
 class PlannerPlugin : public KontactInterface::Plugin
 {
   public:
[prev in list] [next in list] [prev in thread] [next in thread]