Git commit 04db4e8bc237e1026f4529e3d0d691e4baa91a06 by Allen Winter.
Committed on 01/05/2012 at 01:12.
Pushed by winterz into branch 'master'.

don't use <QtModule> with Qt includes
coding style fixes

M  +3    -4    resources/google/calendar/calendareditor.cpp
M  +3    -5    resources/google/calendar/calendareditor.h
M  +40   -39   resources/google/calendar/calendarresource.cpp
M  +4    -6    resources/google/calendar/defaultreminderattribute.cpp
M  +7    -3    resources/google/calendar/settings.cpp
M  +1    -2    resources/google/calendar/tasklisteditor.h
M  +68   -58   resources/google/contacts/contactsresource.cpp
M  +9    -4    resources/google/contacts/settings.cpp

http://commits.kde.org/kdepim-runtime/04db4e8bc237e1026f4529e3d0d691e4baa91=
a06

diff --git a/resources/google/calendar/calendareditor.cpp b/resources/googl=
e/calendar/calendareditor.cpp
index b7f06dd..f0a3e71 100644
--- a/resources/google/calendar/calendareditor.cpp
+++ b/resources/google/calendar/calendareditor.cpp
@@ -15,16 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 =

-
 #include "calendareditor.h"
 #include "ui_calendar_editor.h"
 =

-#include <libkgoogle/services/calendar.h>
-
-#include <QtCore/QFile>
 #include <KStandardDirs>
 #include <KSystemTimeZone>
 =

+#include <QFile>
+
+#include <libkgoogle/services/calendar.h>
 using namespace KGoogle::Objects;
 =

 CalendarEditor::CalendarEditor( Calendar *calendar ) :
diff --git a/resources/google/calendar/calendareditor.h b/resources/google/=
calendar/calendareditor.h
index 3133db1..41bbc08 100644
--- a/resources/google/calendar/calendareditor.h
+++ b/resources/google/calendar/calendareditor.h
@@ -15,24 +15,22 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 =

-
 #ifndef GOOGLE_CALENDAR_CALENDAREDITOR_H
 #define GOOGLE_CALENDAR_CALENDAREDITOR_H
 =

-#include <QtGui/QDialog>
+#include <QDialog>
 =

 #include <libkgoogle/objects/calendar.h>
 =

 namespace Ui {
-class CalendarEditor;
+  class CalendarEditor;
 }
 =

 using namespace KGoogle::Objects;
 =

 class CalendarEditor: public QDialog
 {
-    Q_OBJECT
-
+  Q_OBJECT
   public:
     explicit CalendarEditor( Calendar *calendar =3D 0 );
 =

diff --git a/resources/google/calendar/calendarresource.cpp b/resources/goo=
gle/calendar/calendarresource.cpp
index dd9c415..1f2ace6 100644
--- a/resources/google/calendar/calendarresource.cpp
+++ b/resources/google/calendar/calendarresource.cpp
@@ -20,6 +20,22 @@
 #include "settings.h"
 #include "settingsdialog.h"
 =

+#include <Akonadi/Attribute>
+#include <Akonadi/AttributeFactory>
+#include <Akonadi/CachePolicy>
+#include <Akonadi/ChangeRecorder>
+#include <Akonadi/CollectionFetchScope>
+#include <Akonadi/EntityDisplayAttribute>
+#include <Akonadi/ItemFetchJob>
+#include <Akonadi/ItemFetchScope>
+#include <KCalCore/Calendar>
+
+#include <KLocalizedString>
+#include <KDialog>
+
+#include <QStringList>
+#include <QMetaType>
+
 #include <libkgoogle/common.h>
 #include <libkgoogle/account.h>
 #include <libkgoogle/accessmanager.h>
@@ -34,21 +50,6 @@
 #include <libkgoogle/services/calendar.h>
 #include <libkgoogle/services/tasks.h>
 =

-#include <QtCore/QStringList>
-#include <QtCore/QMetaType>
-
-#include <KLocalizedString>
-#include <KDialog>
-#include <Akonadi/Attribute>
-#include <Akonadi/AttributeFactory>
-#include <Akonadi/CachePolicy>
-#include <Akonadi/ChangeRecorder>
-#include <Akonadi/CollectionFetchScope>
-#include <Akonadi/EntityDisplayAttribute>
-#include <Akonadi/ItemFetchJob>
-#include <Akonadi/ItemFetchScope>
-#include <KCalCore/Calendar>
-
 using namespace KCalCore;
 using namespace Akonadi;
 using namespace KGoogle;
@@ -506,30 +507,30 @@ void CalendarResource::itemMoved( const Item &item,
 void CalendarResource::replyReceived( KGoogle::Reply *reply )
 {
   switch ( reply->requestType() ) {
-    case Request::FetchAll:
-      /* Handled by FetchListJob */
-      break;
-
-    case Request::Fetch:
-      itemReceived( reply );
-      break;
-
-    case Request::Create:
-      itemCreated( reply );
-      break;
-
-    case Request::Update:
-    case Request::Patch:
-      itemUpdated( reply );
-      break;
-
-    case Request::Remove:
-      itemRemoved( reply );
-      break;
-
-    case Request::Move:
-      itemMoved( reply );
-      break;
+  case Request::FetchAll:
+    /* Handled by FetchListJob */
+    break;
+
+  case Request::Fetch:
+    itemReceived( reply );
+    break;
+
+  case Request::Create:
+    itemCreated( reply );
+    break;
+
+  case Request::Update:
+  case Request::Patch:
+    itemUpdated( reply );
+    break;
+
+  case Request::Remove:
+    itemRemoved( reply );
+    break;
+
+  case Request::Move:
+    itemMoved( reply );
+    break;
   }
 }
 =

diff --git a/resources/google/calendar/defaultreminderattribute.cpp b/resou=
rces/google/calendar/defaultreminderattribute.cpp
index c6ad155..f9eda43 100644
--- a/resources/google/calendar/defaultreminderattribute.cpp
+++ b/resources/google/calendar/defaultreminderattribute.cpp
@@ -17,20 +17,19 @@
 =

 #include "defaultreminderattribute.h"
 =

+#include <QVariant>
+
 #include <libkgoogle/objects/calendar.h>
 =

 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 =

-#include <QtCore/QVariant>
-
 using namespace KCalCore;
 using namespace KGoogle::Objects;
 =

-DefaultReminderAttribute::DefaultReminderAttribute( const Reminder::List &=
reminders ):
-  m_reminders( reminders )
+DefaultReminderAttribute::DefaultReminderAttribute( const Reminder::List &=
reminders )
+  : m_reminders( reminders )
 {
-
 }
 =

 Akonadi::Attribute *DefaultReminderAttribute::clone() const
@@ -101,7 +100,6 @@ Alarm::List DefaultReminderAttribute::alarms( Incidence=
 *incidence ) const
   return alarms;
 }
 =

-
 QByteArray DefaultReminderAttribute::type() const
 {
   return "defaultReminders";
diff --git a/resources/google/calendar/settings.cpp b/resources/google/cale=
ndar/settings.cpp
index 8a35f90..18d827e 100644
--- a/resources/google/calendar/settings.cpp
+++ b/resources/google/calendar/settings.cpp
@@ -22,13 +22,17 @@
 #include <KGlobal>
 #include <KWallet/Wallet>
 =

-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
 =

 class SettingsHelper
 {
   public:
-    SettingsHelper(): q( 0 ) {};
-    ~SettingsHelper() {
+    SettingsHelper() : q( 0 )
+    {
+    }
+
+    ~SettingsHelper()
+    {
       delete q;
       q =3D 0;
     }
diff --git a/resources/google/calendar/tasklisteditor.h b/resources/google/=
calendar/tasklisteditor.h
index ec6b98e..c44987e 100644
--- a/resources/google/calendar/tasklisteditor.h
+++ b/resources/google/calendar/tasklisteditor.h
@@ -15,11 +15,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 =

-
 #ifndef GOOGLE_CALENDAR_TASKLISTEDITOR_H
 #define GOOGLE_CALENDAR_TASKLISTEDITOR_H
 =

-#include <QtGui/QDialog>
+#include <QDialog>
 =

 #include <libkgoogle/objects/tasklist.h>
 =

diff --git a/resources/google/contacts/contactsresource.cpp b/resources/goo=
gle/contacts/contactsresource.cpp
index a23869a..dc1956d 100644
--- a/resources/google/contacts/contactsresource.cpp
+++ b/resources/google/contacts/contactsresource.cpp
@@ -19,22 +19,6 @@
 #include "settingsdialog.h"
 #include "settings.h"
 =

-#include <libkgoogle/accessmanager.h>
-#include <libkgoogle/auth.h>
-#include <libkgoogle/fetchlistjob.h>
-#include <libkgoogle/request.h>
-#include <libkgoogle/reply.h>
-#include <libkgoogle/objects/contact.h>
-#include <libkgoogle/services/contacts.h>
-
-#include <QtCore/QStringList>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#include <QtCore/QBuffer>
-
-#include <KLocalizedString>
-#include <KDebug>
-#include <KIO/AccessManager>
 #include <Akonadi/Attribute>
 #include <Akonadi/AttributeFactory>
 #include <Akonadi/CachePolicy>
@@ -48,6 +32,23 @@
 #include <KABC/Addressee>
 #include <KABC/Picture>
 =

+#include <KLocalizedString>
+#include <KDebug>
+#include <KIO/AccessManager>
+
+#include <QBuffer>
+#include <QStringList>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+#include <libkgoogle/accessmanager.h>
+#include <libkgoogle/auth.h>
+#include <libkgoogle/fetchlistjob.h>
+#include <libkgoogle/request.h>
+#include <libkgoogle/reply.h>
+#include <libkgoogle/objects/contact.h>
+#include <libkgoogle/services/contacts.h>
+
 using namespace Akonadi;
 using namespace KGoogle;
 =

@@ -156,8 +157,9 @@ void ContactsResource::reloadConfig()
 =

 Account::Ptr ContactsResource::getAccount()
 {
-  if ( !m_account.isNull() )
+  if ( !m_account.isNull() ) {
     return m_account;
+  }
 =

   Auth *auth =3D Auth::instance();
   try {
@@ -170,7 +172,6 @@ Account::Ptr ContactsResource::getAccount()
   return m_account;
 }
 =

-
 void ContactsResource::retrieveItems( const Akonadi::Collection &collectio=
n )
 {
   /* Root collection has no items */
@@ -188,12 +189,13 @@ void ContactsResource::retrieveItems( const Akonadi::=
Collection &collection )
   fetchJob->start();
 }
 =

-bool ContactsResource::retrieveItem( const Akonadi::Item &item, const QSet=
< QByteArray >& parts )
+bool ContactsResource::retrieveItem( const Akonadi::Item &item, const QSet=
< QByteArray > &parts )
 {
   Q_UNUSED( parts );
 =

-  if ( item.mimeType() !=3D KABC::Addressee::mimeType() )
+  if ( item.mimeType() !=3D KABC::Addressee::mimeType() ) {
     return false;
+  }
 =

   Account::Ptr account =3D getAccount();
   if ( account.isNull() ) {
@@ -236,14 +238,15 @@ void ContactsResource::retrieveCollections()
 =

   Collection myContacts;
   myContacts.setName( i18n( "My Contacts" ) );
-  myContacts.setRemoteId( "http://www.google.com/m8/feeds/groups/" + Setti=
ngs::self()->account() + "/base/6" );
+  myContacts.setRemoteId( "http://www.google.com/m8/feeds/groups/" +
+                          Settings::self()->account() +
+                          "/base/6" );
   myContacts.setParentCollection( rootCollection );
   myContacts.setContentMimeTypes( QStringList() << KABC::Addressee::mimeTy=
pe() );
   myContacts.addAttribute( attr );
   myContacts.setRights( rights );
   m_collections[MyContacts] =3D myContacts;
 =

-
   attr =3D new Akonadi::EntityDisplayAttribute();
   attr->setDisplayName( i18n( "Other Contacts" ) );
 =

@@ -297,8 +300,9 @@ void ContactsResource::initialItemsFetchJobFinished( KJ=
ob *job )
 =

 void ContactsResource::itemAdded( const Akonadi::Item &item, const Akonadi=
::Collection &collection )
 {
-  if ( !item.hasPayload< KABC::Addressee >() )
+  if ( !item.hasPayload< KABC::Addressee >() ) {
     return;
+  }
 =

   Account::Ptr account =3D getAccount();
   if ( account.isNull() ) {
@@ -340,7 +344,8 @@ void ContactsResource::itemAdded( const Akonadi::Item &=
item, const Akonadi::Coll
   Q_UNUSED( collection );
 }
 =

-void ContactsResource::itemChanged( const Akonadi::Item &item, const QSet<=
 QByteArray >& partIdentifiers )
+void ContactsResource::itemChanged( const Akonadi::Item &item,
+                                    const QSet< QByteArray >& partIdentifi=
ers )
 {
   if ( !item.hasPayload< KABC::Addressee >() ) {
     cancelTask( i18n( "Invalid Payload" ) );
@@ -371,8 +376,10 @@ void ContactsResource::itemChanged( const Akonadi::Ite=
m &item, const QSet< QByte
   data.append( "</atom:entry>" );
 =

   KGoogle::Request *request;
-  request =3D new KGoogle::Request( Services::Contacts::updateContactUrl( =
account->accountName(), item.remoteId() ),
-                                  Request::Update, "Contacts", account );
+  request =3D
+    new KGoogle::Request(
+      Services::Contacts::updateContactUrl( account->accountName(), item.r=
emoteId() ),
+      Request::Update, "Contacts", account );
   request->setRequestData( data, "application/atom+xml" );
   request->setProperty( "Item", QVariant::fromValue( item ) );
 =

@@ -381,7 +388,8 @@ void ContactsResource::itemChanged( const Akonadi::Item=
 &item, const QSet< QByte
   Q_UNUSED( partIdentifiers );
 }
 =

-void ContactsResource::itemMoved( const Item &item, const Collection &coll=
ectionSource, const Collection &collectionDestination )
+void ContactsResource::itemMoved( const Item &item, const Collection &coll=
ectionSource,
+                                  const Collection &collectionDestination )
 {
   if ( !item.hasPayload< KABC::Addressee >() ) {
     cancelTask( i18n( "Invalid payload" ) );
@@ -394,16 +402,18 @@ void ContactsResource::itemMoved( const Item &item, c=
onst Collection &collection
     return;
   }
 =

-  kDebug() << "Moving contact" << item.remoteId() << "from" << collectionS=
ource.remoteId() << "to" << collectionDestination.remoteId();
+  kDebug() << "Moving contact" << item.remoteId()
+           << "from" << collectionSource.remoteId()
+           << "to" << collectionDestination.remoteId();
 =

   KABC::Addressee addressee =3D item.payload< KABC::Addressee >();
   Objects::Contact contact( addressee );
 =

-  if ( collectionSource.remoteId() =3D=3D m_collections[MyContacts].remote=
Id()
-      && collectionDestination.remoteId() =3D=3D m_collections[OtherContac=
ts].remoteId() ) {
+  if ( collectionSource.remoteId() =3D=3D m_collections[MyContacts].remote=
Id() &&
+       collectionDestination.remoteId() =3D=3D m_collections[OtherContacts=
].remoteId() ) {
     contact.removeGroup( collectionSource.remoteId() );
-  } else if ( collectionSource.remoteId() =3D=3D m_collections[OtherContac=
ts].remoteId()
-             && collectionDestination.remoteId() =3D=3D m_collections[MyCo=
ntacts].remoteId() ) {
+  } else if ( collectionSource.remoteId() =3D=3D m_collections[OtherContac=
ts].remoteId() &&
+              collectionDestination.remoteId() =3D=3D m_collections[MyCont=
acts].remoteId() ) {
     contact.addGroup( collectionDestination.remoteId() );
   } else {
     cancelTask( i18n( "Invalid source or destination collection" ) );
@@ -421,15 +431,16 @@ void ContactsResource::itemMoved( const Item &item, c=
onst Collection &collection
   data.append( "</atom:entry>" );
 =

   KGoogle::Request *request;
-  request =3D new KGoogle::Request( Services::Contacts::updateContactUrl( =
account->accountName(), item.remoteId() ),
-                                  Request::Update, "Contacts", account );
+  request =3D
+    new KGoogle::Request(
+      Services::Contacts::updateContactUrl( account->accountName(), item.r=
emoteId() ),
+      Request::Update, "Contacts", account );
   request->setRequestData( data, "application/atom+xml" );
   request->setProperty( "Item", QVariant::fromValue( item ) );
 =

   m_gam->sendRequest( request );
 }
 =

-
 void ContactsResource::itemRemoved( const Akonadi::Item &item )
 {
   Account::Ptr account =3D getAccount();
@@ -439,37 +450,38 @@ void ContactsResource::itemRemoved( const Akonadi::It=
em &item )
   }
 =

   KGoogle::Request *request;
-  request =3D new KGoogle::Request( Services::Contacts::removeContactUrl( =
account->accountName(), item.remoteId() ),
-                                  Request::Remove, "Contacts", account );
+  request =3D
+    new KGoogle::Request(
+      Services::Contacts::removeContactUrl( account->accountName(), item.r=
emoteId() ),
+      Request::Remove, "Contacts", account );
   request->setProperty( "Item", QVariant::fromValue( item ) );
 =

   m_gam->sendRequest( request );
 }
 =

-
 void ContactsResource::replyReceived( KGoogle::Reply *reply )
 {
   switch ( reply->requestType() ) {
-    case Request::Fetch:
-      contactReceived( reply );
-      break;
+  case Request::Fetch:
+    contactReceived( reply );
+    break;
 =

-    case Request::Create:
-      contactCreated( reply );
-      break;
+  case Request::Create:
+    contactCreated( reply );
+    break;
 =

-    case Request::Update:
-      contactUpdated( reply );
-      break;
+  case Request::Update:
+    contactUpdated( reply );
+    break;
 =

-    case Request::Remove:
-      contactRemoved( reply );
-      break;
+  case Request::Remove:
+    contactRemoved( reply );
+    break;
 =

-    case Request::FetchAll:
-    case Request::Move:
-    case Request::Patch:
-      break;
+  case Request::FetchAll:
+  case Request::Move:
+  case Request::Patch:
+    break;
   }
 =

   delete reply;
@@ -635,9 +647,9 @@ void ContactsResource::photoRequestFinished( QNetworkRe=
ply *reply )
   if ( reply->operation() =3D=3D QNetworkAccessManager::GetOperation ) {
     QImage image;
 =

-    if ( !image.loadFromData( reply->readAll(), "JPG" ) )
+    if ( !image.loadFromData( reply->readAll(), "JPG" ) ) {
       return;
-
+    }
 =

     Item item =3D reply->request().attribute( QNetworkRequest::User, QVari=
ant() ).value< Item >();
 =

@@ -669,7 +681,6 @@ void ContactsResource::fetchPhoto( Akonadi::Item &item )
   m_photoNam->get( request );
 }
 =

-
 void ContactsResource::updatePhoto( Item &item )
 {
   Account::Ptr account =3D getAccount();
@@ -708,5 +719,4 @@ void ContactsResource::emitPercent( KJob *job, ulong pr=
ogress )
   Q_UNUSED( job )
 }
 =

-
 AKONADI_RESOURCE_MAIN( ContactsResource )
diff --git a/resources/google/contacts/settings.cpp b/resources/google/cont=
acts/settings.cpp
index 9c71cc7..18d827e 100644
--- a/resources/google/contacts/settings.cpp
+++ b/resources/google/contacts/settings.cpp
@@ -22,12 +22,17 @@
 #include <KGlobal>
 #include <KWallet/Wallet>
 =

-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
 =

-class SettingsHelper {
+class SettingsHelper
+{
   public:
-    SettingsHelper(): q( 0 ) {};
-    ~SettingsHelper() {
+    SettingsHelper() : q( 0 )
+    {
+    }
+
+    ~SettingsHelper()
+    {
       delete q;
       q =3D 0;
     }