aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/mpris
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/General/mpris')
-rw-r--r--src/plugins/General/mpris/mpris.cpp2
-rw-r--r--src/plugins/General/mpris/mpris.h6
-rw-r--r--src/plugins/General/mpris/mprisfactory.cpp4
-rw-r--r--src/plugins/General/mpris/mprisfactory.h6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/General/mpris/mpris.cpp b/src/plugins/General/mpris/mpris.cpp
index 61caaae64..c45bb44c5 100644
--- a/src/plugins/General/mpris/mpris.cpp
+++ b/src/plugins/General/mpris/mpris.cpp
@@ -26,7 +26,7 @@
#include "mpris2/player2object.h"
#include "mpris.h"
-MPRIS::MPRIS(QObject *parent) : General(parent)
+MPRIS::MPRIS(QObject *parent) : QObject(parent)
{
QDBusConnection connection = QDBusConnection::sessionBus();
//MPRISv1.0
diff --git a/src/plugins/General/mpris/mpris.h b/src/plugins/General/mpris/mpris.h
index 370809da7..1cab01efe 100644
--- a/src/plugins/General/mpris/mpris.h
+++ b/src/plugins/General/mpris/mpris.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Ilya Kotov *
+ * Copyright (C) 2008-2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -26,10 +26,10 @@
class DBUSAdaptor;
/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
+ @author Ilya Kotov <forkotov02@hotmail.ru>
*/
-class MPRIS : public General
+class MPRIS : public QObject
{
Q_OBJECT
public:
diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp
index 079f3b674..a13f62d23 100644
--- a/src/plugins/General/mpris/mprisfactory.cpp
+++ b/src/plugins/General/mpris/mprisfactory.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Ilya Kotov *
+ * Copyright (C) 2008-2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -34,7 +34,7 @@ const GeneralProperties MPRISFactory::properties() const
return properties;
}
-General *MPRISFactory::create(QObject *parent)
+QObject *MPRISFactory::create(QObject *parent)
{
return new MPRIS(parent);
}
diff --git a/src/plugins/General/mpris/mprisfactory.h b/src/plugins/General/mpris/mprisfactory.h
index 27708dd6e..38d1b66ed 100644
--- a/src/plugins/General/mpris/mprisfactory.h
+++ b/src/plugins/General/mpris/mprisfactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008 by Ilya Kotov *
+ * Copyright (C) 2008-2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -32,10 +32,10 @@
class MPRISFactory : public QObject, public GeneralFactory
{
Q_OBJECT
-Q_INTERFACES(GeneralFactory);
+Q_INTERFACES(GeneralFactory)
public:
const GeneralProperties properties() const;
- General *create(QObject *parent);
+ QObject *create(QObject *parent);
QDialog *createConfigDialog(QWidget *parent);
void showAbout(QWidget *parent);
QTranslator *createTranslator(QObject *parent);