[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kresources/kolab/shared
From: Laurent Montel <montel () kde ! org>
Date: 2007-06-25 15:06:14
Message-ID: 1182783974.935950.6532.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 680159 by mlaurent:
Dabud is right. Not necessary to create an adaptor for it
(it was just necessary into kde3)
M +1 -8 kmailconnectionadaptor.cpp
M +8 -9 kmailconnectionadaptor.h
M +1 -4 resourcekolabbase.cpp
--- trunk/KDE/kdepim/kresources/kolab/shared/kmailconnectionadaptor.cpp \
#680158:680159 @@ -100,22 +100,15 @@
}
}
-KMailConnectionAdaptor::KMailConnectionAdaptor( ResourceKolabBase* \
resource, const QString &uniq ) \
+KMailConnectionAdaptor::KMailConnectionAdaptor( ResourceKolabBase* \
resource ) : mResource( resource )
, mKmailGroupwareInterface( 0 )
{
// Make the connection to KMail ready
-#if 0
- // Do we need to kill the interface when kmail exits, to restart kmail \
next time?
- connect( QDBusConnection::sessionBus().interface(), \
SIGNAL(serviceOwnerChanged(QString,QString,QString)),
- SLOT(dbusServiceOwnerChanged(QString,QString,QString)) );
-#endif
QObject::connect(QDBusConnection::sessionBus().interface(),
SIGNAL(serviceOwnerChanged(QString,QString,QString)),
this, \
SLOT(dbusServiceOwnerChanged(QString,QString,QString)));
- // TODO connect to the dbus signals from kmail here
- QDBusConnection::sessionBus().registerObject( \
uniq,this,QDBusConnection::ExportScriptableSlots|QDBusConnection::ExportScriptableSignals \
); }
--- trunk/KDE/kdepim/kresources/kolab/shared/kmailconnectionadaptor.h \
#680158:680159 @@ -52,23 +52,22 @@
*/
class KOLABSHARED_EXPORT KMailConnectionAdaptor : public QObject {
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.kde.kmail.GroupWare")
// These are the methods called by KMail when the resource changes
public Q_SLOTS:
- Q_SCRIPTABLE bool fromKMailAddIncidence( const QString& type, const \
QString& resource,
- quint32 sernum, int format, const QString& \
xml );
- Q_SCRIPTABLE void fromKMailDelIncidence( const QString& type, const \
QString& resource, + bool fromKMailAddIncidence( const QString& type, \
const QString& resource, + quint32 sernum, int \
format, const QString& xml ); + void fromKMailDelIncidence( const QString& \
type, const QString& resource, const QString& xml );
- Q_SCRIPTABLE void fromKMailRefresh( const QString& type, const QString& \
resource );
- Q_SCRIPTABLE void fromKMailAddSubresource( const QString& type, const \
QString& resource, + void fromKMailRefresh( const QString& type, const \
QString& resource ); + void fromKMailAddSubresource( const QString& type, \
const QString& resource, const QString& label, bool writable,
bool alarmRelevant );
- Q_SCRIPTABLE void fromKMailDelSubresource( const QString& type, const \
QString& resource );
- Q_SCRIPTABLE void fromKMailAsyncLoadResult( const QMap<quint32, \
QString>& map, const QString& type, + void fromKMailDelSubresource( const \
QString& type, const QString& resource ); + void fromKMailAsyncLoadResult( \
const QMap<quint32, QString>& map, const QString& type, const QString& \
folder );
public:
- KMailConnectionAdaptor( ResourceKolabBase* resource, const QString&uniq \
); + KMailConnectionAdaptor( ResourceKolabBase* resource );
virtual ~KMailConnectionAdaptor();
/**
--- trunk/KDE/kdepim/kresources/kolab/shared/resourcekolabbase.cpp \
#680158:680159 @@ -47,15 +47,12 @@
using namespace Kolab;
-static unsigned int uniquifier = 0;
-
ResourceKolabBase::ResourceKolabBase( const QByteArray& objId )
: mSilent( false )
{
KGlobal::locale()->insertCatalog( "kres_kolab" );
KGlobal::locale()->insertCatalog( "libkcal" );
- QString uniqueObjId = "/Kolabresource_" +objId + QString::number( \
uniquifier++ ).toLatin1();
- mConnection = new KMailConnectionAdaptor( this, uniqueObjId ); //Rename \
it to adaptor. + mConnection = new KMailConnectionAdaptor( this ); \
//Rename it to adaptor. }
ResourceKolabBase::~ResourceKolabBase()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic