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

List:       kde-commits
Subject:    KDE/kdepim/kresources/kolab/shared
From:       Till Adam <adam () kde ! org>
Date:       2005-09-25 12:48:12
Message-ID: 1127652492.071795.32186.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 463815 by tilladam:

schwupp


 M  +10 -10    kmailconnection.cpp  
 M  +6 -5      kmailconnection.h  
 M  +5 -4      resourcekolabbase.cpp  
 M  +4 -4      resourcekolabbase.h  


--- trunk/KDE/kdepim/kresources/kolab/shared/kmailconnection.cpp #463814:463815
@@ -47,7 +47,7 @@
 
 
 KMailConnection::KMailConnection( ResourceKolabBase* resource,
-                                  const QCString& objId )
+                                  const DCOPCString& objId )
   : DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( 0 )
 {
   // Make the connection to KMail ready
@@ -56,8 +56,8 @@
   mDCOPClient->registerAs( objId, true );
 
   kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
-           this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+  connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QByteArray& ) ),
+           this, SLOT( unregisteredFromDCOP( const QByteArray& ) ) );
 }
 
 KMailConnection::~KMailConnection()
@@ -69,12 +69,12 @@
   mDCOPClient = 0;
 }
 
-static const QCString dcopObjectId = "KMailICalIface";
+static const DCOPCString dcopObjectId = "KMailICalIface";
 bool KMailConnection::connectToKMail()
 {
   if ( !mKMailIcalIfaceStub ) {
     QString error;
-    QCString dcopService;
+    DCOPCString dcopService;
     int result = KDCOPServiceStarter::self()->
       findServiceFor( "DCOP/ResourceBackend/IMAP", QString::null,
                       QString::null, &error, &dcopService );
@@ -172,14 +172,14 @@
   mResource->fromKMailAsyncLoadResult( map, type, folder );
 }
 
-bool KMailConnection::connectKMailSignal( const QCString& signal,
-                                          const QCString& method )
+bool KMailConnection::connectKMailSignal( const QByteArray& signal,
+                                          const QByteArray& method )
 {
   return connectDCOPSignal( "kmail", dcopObjectId, signal, method, false )
     && connectDCOPSignal( "kontact", dcopObjectId, signal, method, false );
 }
 
-bool KMailConnection::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
+bool KMailConnection::kmailSubresources( QList<KMailICalIface::SubResource>& lst,
                                          const QString& contentsType )
 {
   if ( !connectToKMail() )
@@ -238,7 +238,7 @@
                                    Q_UINT32& sernum,
                                    const QString& subject,
                                    const QString& plainTextBody,
-                                   const QMap<QCString, QString>& customHeaders,
+                                   const QMap<QByteArray, QString>& customHeaders,
                                    const QStringList& attachmentURLs,
                                    const QStringList& attachmentMimetypes,
                                    const QStringList& attachmentNames,
@@ -269,7 +269,7 @@
   return ok && mKMailIcalIfaceStub->triggerSync( contentsType );
 }
 
-void KMailConnection::unregisteredFromDCOP( const QCString& appId )
+void KMailConnection::unregisteredFromDCOP( const DCOPCString& appId )
 {
   if ( mKMailIcalIfaceStub && mKMailIcalIfaceStub->app() == appId ) {
     // Delete the stub so that the next time we need to talk to kmail,
--- trunk/KDE/kdepim/kresources/kolab/shared/kmailconnection.h #463814:463815
@@ -39,6 +39,7 @@
 
 class KURL;
 class DCOPClient;
+class DCOPCString;
 class KMailICalIface_stub;
 
 namespace Kolab {
@@ -65,7 +66,7 @@
                                  const QString& folder );
 
 public:
-  KMailConnection( ResourceKolabBase* resource, const QCString& objId );
+  KMailConnection( ResourceKolabBase* resource, const DCOPCString& objId );
   virtual ~KMailConnection();
 
   /**
@@ -74,7 +75,7 @@
   bool connectToKMail();
 
   // Call the DCOP methods
-  bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
+  bool kmailSubresources( QList<KMailICalIface::SubResource>& lst,
                           const QString& contentsType );
   bool kmailIncidencesCount( int& count,
                              const QString& mimetype,
@@ -91,7 +92,7 @@
                     Q_UINT32& sernum,
                     const QString& subject,
                     const QString& plainTextBody,
-                    const QMap<QCString, QString>& customHeaders,
+                    const QMap<QByteArray, QString>& customHeaders,
                     const QStringList& attachmentURLs,
                     const QStringList& attachmentMimetypes,
                     const QStringList& attachmentNames,
@@ -102,11 +103,11 @@
   bool kmailTriggerSync( const QString& contentsType );
 
 private slots:
-  virtual void unregisteredFromDCOP( const QCString& );
+  virtual void unregisteredFromDCOP( const DCOPCString& );
 
 private:
   /** Connect a signal from KMail to a local slot. */
-  bool connectKMailSignal( const QCString&, const QCString& );
+  bool connectKMailSignal( const QByteArray&, const QByteArray& );
 
   ResourceKolabBase* mResource;
   DCOPClient* mDCOPClient;
--- trunk/KDE/kdepim/kresources/kolab/shared/resourcekolabbase.cpp #463814:463815
@@ -42,18 +42,19 @@
 #include <kmessagebox.h>
 #include <qtextstream.h>
 #include <kdebug.h>
+#include <dcopobject.h>
 
 using namespace Kolab;
 
 static unsigned int uniquifier = 0;
 
-ResourceKolabBase::ResourceKolabBase( const QCString& objId )
+ResourceKolabBase::ResourceKolabBase( const DCOPCString& objId )
   : mSilent( false )
 {
   KGlobal::locale()->insertCatalogue( "kres_kolab" );
   KGlobal::locale()->insertCatalogue( "libkcal" );
-  QString uniqueObjId = QString( objId ) + QString::number( uniquifier++ );
-  mConnection = new KMailConnection( this, uniqueObjId.utf8() );
+  DCOPCString uniqueObjId = objId + QString::number( uniquifier++ ).latin1();
+  mConnection = new KMailConnection( this, uniqueObjId );
 }
 
 ResourceKolabBase::~ResourceKolabBase()
@@ -62,7 +63,7 @@
 }
 
 
-bool ResourceKolabBase::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
+bool ResourceKolabBase::kmailSubresources( QList<KMailICalIface::SubResource>& lst,
                                            const QString& contentsType ) const
 {
   return mConnection->kmailSubresources( lst, contentsType );
--- trunk/KDE/kdepim/kresources/kolab/shared/resourcekolabbase.h #463814:463815
@@ -41,7 +41,7 @@
 #include "subresource.h"
 #include <kmail/kmailicalIface.h>
 
-class QCString;
+class QString;
 class KURL;
 
 namespace Kolab {
@@ -73,7 +73,7 @@
 */
 class ResourceKolabBase {
 public:
-  ResourceKolabBase( const QCString& objId );
+  ResourceKolabBase( const DCOPCString& objId );
   virtual ~ResourceKolabBase();
 
   // These are the methods called by KMail when the resource changes
@@ -106,7 +106,7 @@
 
   /// List all folders with a certain contentsType. Returns a QMap with
   /// resourcename/writable pairs
-  bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
+  bool kmailSubresources( QList<KMailICalIface::SubResource>& lst,
                           const QString& contentsType ) const;
 
   /// Get the number of messages in this folder.
@@ -137,7 +137,7 @@
 
   KMailICalIface::StorageFormat kmailStorageFormat( const QString& folder ) const;
 
-  typedef QMap<QCString, QString> CustomHeaderMap;
+  typedef QMap<QByteArray, QString> CustomHeaderMap;
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
[prev in list] [next in list] [prev in thread] [next in thread]