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

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins/summary
From:       Allen Winter <winter () kde ! org>
Date:       2009-10-12 20:11:52
Message-ID: 1255378312.138686.25309.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1034477 by winterz:

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


 M  +9 -14     kcmkontactsummary.cpp  
 M  +1 -1      kcmkontactsummary.h  
 M  +18 -27    summaryview_part.cpp  
 M  +5 -11     summaryview_part.h  
 M  +4 -8      summaryview_plugin.cpp  
 M  +1 -3      summaryview_plugin.h  


--- trunk/KDE/kdepim/kontact/plugins/summary/kcmkontactsummary.cpp #1034476:1034477
@@ -25,22 +25,19 @@
 
 #include "kcmkontactsummary.h"
 
-#include <kontactinterface/plugin.h>
+#include <KontactInterface/Plugin>
 
-#include <kaboutdata.h>
-#include <kcomponentdata.h>
-#include <kconfig.h>
-#include <kdebug.h>
-#include <kdialog.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kdemacros.h>
-#include <kplugininfo.h>
-#include <kservicetypetrader.h>
+#include <KAboutData>
+#include <KComponentData>
+#include <KDialog>
+#include <KIcon>
+#include <KLocale>
+#include <KPluginInfo>
+#include <KService>
+#include <KServiceTypeTrader>
 
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QTreeWidgetItem>
 
 extern "C"
 {
@@ -174,7 +171,6 @@
 
 void KCMKontactSummary::save()
 {
-  kDebug();
   QStringList activeSummaries;
 
   QTreeWidgetItemIterator it( mPluginView );
@@ -188,7 +184,6 @@
 
   KConfig config( "kontact_summaryrc" );
   KConfigGroup grp( &config, QString() );
-  kDebug() << "saving activesummaries " << activeSummaries;
   grp.writeEntry( "ActiveSummaries", activeSummaries );
 }
 
--- trunk/KDE/kdepim/kontact/plugins/summary/kcmkontactsummary.h #1034476:1034477
@@ -26,7 +26,7 @@
 #ifndef KCMKONTACTSUMMARY_H
 #define KCMKONTACTSUMMARY_H
 
-#include <kcmodule.h>
+#include <KCModule>
 #include <QTreeWidget>
 
 class KPluginInfo;
--- trunk/KDE/kdepim/kontact/plugins/summary/summaryview_part.cpp #1034476:1034477
@@ -23,46 +23,37 @@
 */
 
 #include "summaryview_part.h"
+#include "dropwidget.h"
 
-#include <kontactinterface/summary.h>
-#include <kontactinterface/plugin.h>
 #include <libkdepim/broadcaststatus.h>
 using KPIM::BroadcastStatus;
 
-#include <kpimidentities/identity.h>
-#include <kpimidentities/identitymanager.h>
+#include <KPIMIdentities/Identity>
+#include <KPIMIdentities/IdentityManager>
 
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kconfig.h>
-#include <kdbusservicestarter.h>
-#include <kdialog.h>
-#include <kcomponentdata.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kservice.h>
-#include <kstandarddirs.h>
-#include <kcmultidialog.h>
-#include <kparts/componentfactory.h>
-#include <kparts/event.h>
+#include <KontactInterface/Core>
+#include <KontactInterface/Plugin>
+#include <KontactInterface/Summary>
 
+#include <KAction>
+#include <KActionCollection>
+#include <KCMultiDialog>
+#include <KComponentData>
+#include <KConfigGroup>
+#include <KDialog>
+#include <KGlobalSettings>
+#include <KIcon>
+#include <KLocale>
+#include <KParts/PartActivateEvent>
+
 #include <QApplication>
+#include <QDate>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QLayout>
 #include <QScrollArea>
-#include <QSpacerItem>
 #include <QTimer>
 #include <QVBoxLayout>
 
-namespace KontactInterface
-{
-  class MainWindow;
-}
-
 SummaryViewPart::SummaryViewPart( KontactInterface::Core *core, const char *,
                                   const KAboutData *aboutData, QObject *parent )
   : KParts::ReadOnlyPart( parent ), mCore( core ), mFrame( 0 ), mConfigAction( 0 )
--- trunk/KDE/kdepim/kontact/plugins/summary/summaryview_part.h #1034476:1034477
@@ -24,27 +24,21 @@
 #ifndef SUMMARYVIEW_PART_H
 #define SUMMARYVIEW_PART_H
 
-#include "dropwidget.h"
+#include <KParts/ReadOnlyPart>
 
-#include <kontactinterface/core.h>
+class DropWidget;
 
-#include <kparts/part.h>
-
-#include <QMap>
-
 namespace KontactInterface {
+  class Core;
   class Summary;
 }
 
-namespace KParts {
-  class PartActivateEvent;
-}
+class KAboutData;
+class KAction;
 
 class QFrame;
 class QLabel;
 class QVBoxLayout;
-class KAction;
-class KAboutData;
 
 class SummaryViewPart : public KParts::ReadOnlyPart
 {
--- trunk/KDE/kdepim/kontact/plugins/summary/summaryview_plugin.cpp #1034476:1034477
@@ -22,22 +22,18 @@
 #include "summaryview_plugin.h"
 #include "summaryview_part.h"
 #ifdef KMAIL_SUPPORTED
-# include "kmailinterface.h"
+#include "kmailinterface.h"
 #endif
 
-#include <kontactinterface/core.h>
-#include <kontactinterface/plugin.h>
+#include <KontactInterface/Core>
 
 #include <KAboutData>
-#include <KAction>
 #include <KActionCollection>
-#include <KGenericFactory>
+#include <KIcon>
+#include <KLocale>
 #include <KSelectAction>
-#include <kparts/componentfactory.h>
 
-#include <QList>
 #include <QMenu>
-#include <QtDBus/QtDBus>
 
 EXPORT_KONTACT_PLUGIN( SummaryView, summary )
 
--- trunk/KDE/kdepim/kontact/plugins/summary/summaryview_plugin.h #1034476:1034477
@@ -22,10 +22,8 @@
 #ifndef SUMMARYVIEW_PLUGIN_H
 #define SUMMARYVIEW_PLUGIN_H
 
-#include <kontactinterface/plugin.h>
+#include <KontactInterface/Plugin>
 
-#include <kparts/part.h>
-
 class SummaryViewPart;
 class KSelectAction;
 
[prev in list] [next in list] [prev in thread] [next in thread]