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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/libakonadi
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2008-02-11 22:22:33
Message-ID: 1202768553.134003.27636.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 773866 by staniek:

1. On windows WId equals void*:
- cast WId to qlonglong 
- add windows-only configure( qlonglong windowId ) overload in order to make DBUS interfaces work

2. Fix usage of KDE_DEPRECATED



 M  +10 -4     agentbase.h  
 M  +1 -1      agentmanager.cpp  


--- trunk/KDE/kdepim/akonadi/libakonadi/agentbase.h #773865:773866
@@ -26,11 +26,9 @@
 #include "libakonadi_export.h"
 #include <libakonadi/collection.h>
 
-#include <kapplication.h>
+#include <KApplication>
 
-#include <QtCore/QObject>
 #include <QtCore/QSettings>
-#include <QtCore/QString>
 #include <QtDBus/QDBusContext>
 
 class AgentAdaptor;
@@ -94,7 +92,15 @@
      */
     virtual void configure( WId windowId );
 
+#ifdef Q_OS_WIN
     /**
+     * Overload of @ref configure needed because WId cannot be automatically casted 
+     * to qlonglong on Windows.
+     */
+    void configure( qlonglong windowId ) { configure( (WId)windowId ); }
+#endif
+
+    /**
      * Returns the instance identifier of this agent.
      */
     QString identifier() const;
@@ -158,7 +164,7 @@
      *
      * Don't delete this object!
      */
-    QSettings* settings() KDE_DEPRECATED;
+    KDE_DEPRECATED QSettings* settings();
 
     /**
      * Returns a session for communicating with the storage backend. It should
--- trunk/KDE/kdepim/akonadi/libakonadi/agentmanager.cpp #773865:773866
@@ -187,7 +187,7 @@
 
 void AgentManager::agentInstanceConfigure( const QString &identifier, WId windowId )
 {
-  d->mManager->agentInstanceConfigure( identifier, windowId );
+  d->mManager->agentInstanceConfigure( identifier, (qlonglong)windowId );
 }
 
 void AgentManager::agentInstanceSynchronize( const QString &identifier )
[prev in list] [next in list] [prev in thread] [next in thread]