office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-25 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

port TTS to QDBusServiceWatcher

Browse source 
svn path=/trunk/KDE/kdegraphics/okular/; revision=1163584
This commit is contained in:
Pino Toscano 2010-08-14 13:18:55 +00:00
parent e0cbb82cc4
commit efcd020e2a
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ui/tts.cpp
View file

@ -9,6 +9,7 @@
#include "tts.h"
#include <qdbusservicewatcher.h>
#include <qset.h>
#include <klocale.h>
@ -23,6 +24,7 @@ class OkularTTS::Private
public:
Private( OkularTTS *qq )
: q( qq ), kspeech( 0 )
, watcher( "org.kde.kttsd", QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForUnregistration )
{
}
@ -32,6 +34,7 @@ public:
OkularTTS *q;
org::kde::KSpeech* kspeech;
QSet< int > jobs;
QDBusServiceWatcher watcher;
};
void OkularTTS::Private::setupIface()
@ -64,17 +67,11 @@ void OkularTTS::Private::setupIface()
kspeech->setApplicationName( "Okular" );
connect( kspeech, SIGNAL( jobStateChanged( const QString &, int, int ) ),
q, SLOT( slotJobStateChanged( const QString &, int, int ) ) );
connect( QDBusConnection::sessionBus().interface(), SIGNAL( serviceUnregistered( const QString & ) ),
q, SLOT( slotServiceUnregistered( const QString & ) ) );
connect( QDBusConnection::sessionBus().interface(), SIGNAL( serviceOwnerChanged( const QString &, const QString &, const QString & ) ),
q, SLOT( slotServiceOwnerChanged( const QString &, const QString &, const QString & ) ) );
}
}
void OkularTTS::Private::teardownIface()
{
disconnect( QDBusConnection::sessionBus().interface(), 0, q, 0 );
delete kspeech;
kspeech = 0;
}
@ -83,10 +80,14 @@ void OkularTTS::Private::teardownIface()
OkularTTS::OkularTTS( QObject *parent )
: QObject( parent ), d( new Private( this ) )
{
connect( &d->watcher, SIGNAL( serviceUnregistered( const QString & ) ),
this, SLOT( slotServiceUnregistered( const QString & ) ) );
}
OkularTTS::~OkularTTS()
{
disconnect( &d->watcher, 0, this, 0 );
delete d;
}
@ -123,14 +124,6 @@ void OkularTTS::slotServiceUnregistered( const QString &service )
}
}
void OkularTTS::slotServiceOwnerChanged( const QString &service, const QString &, const QString &newOwner )
{
if ( service == QLatin1String( "org.kde.kttsd" ) && newOwner.isEmpty() )
{
d->teardownIface();
}
}
void OkularTTS::slotJobStateChanged( const QString &appId, int jobNum, int state )
{
// discard non ours job

1
ui/tts.h
View file

@ -28,7 +28,6 @@ class OkularTTS : public QObject
private slots:
void slotServiceUnregistered( const QString& );
void slotServiceOwnerChanged( const QString&, const QString&, const QString& );
void slotJobStateChanged( const QString &appId, int jobNum, int state );
private: