Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 10:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-09 03:27:21 +00:00
parent 427f66443e
commit 801410d5d1
16 changed files with 100 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcontrol/dateandtime/helper.cpp
View file

@ -39,6 +39,7 @@
#include <kconfiggroup.h>
#include <kstandarddirs.h>
#include <kprocess.h>
#include <kauthhelpersupport.h>
#include <QFile>
#include <QDir>

2
kcontrol/dateandtime/helper.h
View file

@ -21,7 +21,7 @@
#ifndef CLOCK_HELPER_H
#define CLOCK_HELPER_H
#include <kauth.h>
#include <kauthactionreply.h>
using namespace KAuth;

1
kdm/kcm/helper.cpp
View file

@ -34,6 +34,7 @@
#include <KConfig>
#include <KConfigGroup>
#include <KStandardDirs>
#include <kauthhelpersupport.h>
bool secureCopy(const QString &from, const QString &to)
{

2
kdm/kcm/helper.h
View file

@ -21,7 +21,7 @@
#ifndef KDM_HELPER_H
#define KDM_HELPER_H
#include <kauth.h>
#include <kauthactionreply.h>
using namespace KAuth;

1
kdm/kcm/kdm-theme.cpp
View file

@ -37,6 +37,7 @@
#include <KIO/Job>
#include <KIO/DeleteJob>
#include <KIO/NetAccess>
#include <KAuth/Action>
#include <QDir>
#include <QGridLayout>

1
kdm/kcm/kdm-users.cpp
View file

@ -33,6 +33,7 @@
#include <KStandardDirs>
#include <KStandardGuiItem>
#include <KIO/NetAccess>
#include <KAuth/Action>
#include <QButtonGroup>
#include <QCheckBox>

1
kdm/kcm/main.cpp
View file

@ -42,6 +42,7 @@
#include <kconfig.h>
#include <kpluginfactory.h>
#include <kpluginloader.h>
#include <kauthaction.h>
#include <QEvent>
#include <QFile>

176
knotify/notifybysound.cpp
View file

@ -27,7 +27,6 @@
#include "notifybysound.h"
// QT headers
#include <QHash>
#include <QtCore/QTimer>
#include <QtCore/QQueue>
#include <QtCore/qcoreevent.h>
@ -47,43 +46,38 @@
class NotifyBySound::Private
{
public:
enum { NoSound, UseMediaPlayer } playerMode;
QHash<int, KAudioPlayer*> playerObjects;
QSignalMapper *signalmapper;
KAudioPlayer *currentPlayer;
QQueue<int> closeQueue;
public:
bool noSound;
QMap<int, KAudioPlayer*> playerObjects;
QSignalMapper *signalmapper;
KAudioPlayer *currentPlayer;
QQueue<int> closeQueue;
};
NotifyBySound::NotifyBySound(QObject *parent) : KNotifyPlugin(parent),d(new Private)
{
d->signalmapper = new QSignalMapper(this);
connect(d->signalmapper, SIGNAL(mapped(int)), this, SLOT(slotSoundFinished(int)));
d->signalmapper = new QSignalMapper(this);
connect(d->signalmapper, SIGNAL(mapped(int)), this, SLOT(slotSoundFinished(int)));
d->currentPlayer = new KAudioPlayer(this);
startTimer(1000);
loadConfig();
d->currentPlayer = new KAudioPlayer(this);
startTimer(1000);
loadConfig();
}
NotifyBySound::~NotifyBySound()
{
delete d;
delete d;
}
void NotifyBySound::loadConfig()
{
// load player settings
KSharedConfig::Ptr kc = KGlobal::config();
KConfigGroup cg(kc, "Sounds");
// load player settings
KSharedConfig::Ptr kc = KGlobal::config();
KConfigGroup cg(kc, "Sounds");
d->playerMode = Private::UseMediaPlayer;
if(cg.readEntry( "No sound" , false ))
{
d->playerMode = Private::NoSound;
}
d->noSound = cg.readEntry( "No sound" , false );
}
@ -91,103 +85,95 @@ void NotifyBySound::loadConfig()
void NotifyBySound::notify( int eventId, KNotifyConfig * config )
{
if(d->playerMode == Private::NoSound)
{
finish( eventId );
return;
}
if (d->noSound) {
finish( eventId );
return;
}
if(d->playerObjects.contains(eventId))
{
//a sound is already playing for this notification, we don't support playing two sounds.
finish( eventId );
return;
}
if (d->playerObjects.contains(eventId)) {
//a sound is already playing for this notification, we don't support playing two sounds.
finish( eventId );
return;
}
KUrl soundFileURL = config->readEntry( "Sound" , true );
QString soundFile = soundFileURL.toLocalFile();
KUrl soundFileURL = config->readEntry( "Sound" , true );
QString soundFile = soundFileURL.toLocalFile();
if (soundFile.isEmpty())
{
finish( eventId );
return;
}
if (soundFile.isEmpty()) {
finish( eventId );
return;
}
// get file name
if ( KUrl::isRelativeUrl(soundFile) )
{
QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
search = KGlobal::mainComponent().dirs()->findResource("data", search);
if ( search.isEmpty() )
soundFile = KStandardDirs::locate( "sound", soundFile );
else
soundFile = search;
}
if ( soundFile.isEmpty() )
{
finish( eventId );
return;
}
if (KUrl::isRelativeUrl(soundFile)) {
QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
search = KGlobal::mainComponent().dirs()->findResource("data", search);
if ( search.isEmpty() ) {
soundFile = KStandardDirs::locate( "sound", soundFile );
} else {
soundFile = search;
}
}
if ( soundFile.isEmpty() ) {
finish( eventId );
return;
}
kDebug() << " going to play " << soundFile;
if(d->playerMode == Private::UseMediaPlayer)
{
KAudioPlayer *player = d->currentPlayer;
if (d->currentPlayer && d->currentPlayer->isPlaying()) {
kDebug() << "creating new player";
player = new KAudioPlayer(this);
}
connect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
d->signalmapper->setMapping(player, eventId);
player->load(soundFile);
d->playerObjects.insert(eventId, player);
}
kDebug() << " going to play " << soundFile;
if (!d->noSound) {
KAudioPlayer *player = d->currentPlayer;
if (d->currentPlayer && d->currentPlayer->isPlaying()) {
kDebug() << "creating new player";
player = new KAudioPlayer(this);
}
connect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
d->signalmapper->setMapping(player, eventId);
player->load(soundFile);
d->playerObjects.insert(eventId, player);
}
}
void NotifyBySound::timerEvent(QTimerEvent *e)
{
QMutableHashIterator<int,KAudioPlayer*> iter(d->playerObjects);
while(iter.hasNext()) {
iter.next();
KAudioPlayer *player = iter.value();
if (player != d->currentPlayer && !player->isPlaying()) {
kDebug() << "destroying idle player";
d->playerObjects.remove(iter.key());
delete player;
}
QMutableMapIterator<int,KAudioPlayer*> iter(d->playerObjects);
while (iter.hasNext()) {
iter.next();
KAudioPlayer *player = iter.value();
if (player != d->currentPlayer && !player->isPlaying()) {
kDebug() << "destroying idle player";
d->playerObjects.remove(d->playerObjects.key(player));
player->deleteLater();
}
KNotifyPlugin::timerEvent(e);
}
KNotifyPlugin::timerEvent(e);
}
void NotifyBySound::slotSoundFinished(int id)
{
kDebug() << id;
if(d->playerObjects.contains(id))
{
KAudioPlayer *player=d->playerObjects.value(id);
disconnect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
}
finish(id);
kDebug() << id;
if (d->playerObjects.contains(id)) {
KAudioPlayer *player=d->playerObjects.value(id);
disconnect(player, SIGNAL(finished()), d->signalmapper, SLOT(map()));
}
finish(id);
}
void NotifyBySound::close(int id)
{
// close in 1 min - ugly workaround for sounds getting cut off because the close call in kdelibs
// is hardcoded to 6 seconds
d->closeQueue.enqueue(id);
QTimer::singleShot(60000, this, SLOT(closeNow()));
// close in 1 min - ugly workaround for sounds getting cut off because the close call in kdelibs
// is hardcoded to 6 seconds
d->closeQueue.enqueue(id);
QTimer::singleShot(60000, this, SLOT(closeNow()));
}
void NotifyBySound::closeNow()
{
const int id = d->closeQueue.dequeue();
if(d->playerObjects.contains(id))
{
KAudioPlayer *player = d->playerObjects.value(id);
player->stop();
}
const int id = d->closeQueue.dequeue();
if (d->playerObjects.contains(id)) {
KAudioPlayer *player = d->playerObjects.value(id);
player->stop();
}
}
#include "moc_notifybysound.cpp"

1
kwalletmanager/src/konfigurator/savehelper.cpp
View file

@ -20,6 +20,7 @@
#include "savehelper.h"
#include <kdebug.h>
#include <kauthhelpersupport.h>
#include <unistd.h>
ActionReply SaveHelper::save(QVariantMap args)

2
kwalletmanager/src/konfigurator/savehelper.h
View file

@ -20,7 +20,7 @@
#ifndef _SAVEHELPER_H_
#define _SAVEHELPER_H_
#include <kauth.h>
#include <kauthactionreply.h>
using namespace KAuth;

2
kwin/killer/killer.cpp
View file

@ -27,7 +27,7 @@ DEALINGS IN THE SOFTWARE.
#include <kmessagebox.h>
#include <KIcon>
#include <KLocalizedString>
#include <kauth.h>
#include <kauthaction.h>
#include <kdebug.h>
#include <unistd.h>
#include <X11/Xlib.h>

2
libs/ksysguard/processcore/helper.cpp
View file

@ -23,6 +23,8 @@
#include "helper.h"
#include "processes_local_p.h"
#include <kauthhelpersupport.h>
KSysGuardProcessListHelper::KSysGuardProcessListHelper()
{
qRegisterMetaType<QList<long long> >();

2
libs/ksysguard/processcore/helper.h
View file

@ -20,7 +20,7 @@
*/
#include <kauth.h>
#include <kauthactionreply.h>
#include <QObject>
using namespace KAuth;

4
libs/ksysguard/processui/ksysguardprocesslist.cpp
View file

@ -47,7 +47,9 @@
#include <signal.h> //For SIGTERM
#include <kauth.h>
#include <kauthaction.h>
#include <kauthactionreply.h>
#include <kauthhelpersupport.h>
#include <kaction.h>
#include <klocale.h>
#include <kmessagebox.h>

2
powerdevil/daemon/backends/upower/backlighthelper.cpp
View file

@ -19,6 +19,8 @@
#include "backlighthelper.h"
#include <kauthhelpersupport.h>
#include <QtCore/QDir>
#include <QtCore/QDebug>

2
powerdevil/daemon/backends/upower/backlighthelper.h
View file

@ -21,7 +21,7 @@
#define BACKLIGHTHELPER_H
#include <QObject>
#include <kauth.h>
#include <kauthactionreply.h>
using namespace KAuth;