aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/null
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/null')
-rw-r--r--src/plugins/Output/null/outputnull.h2
-rw-r--r--src/plugins/Output/null/outputnullfactory.cpp4
-rw-r--r--src/plugins/Output/null/outputnullfactory.h9
3 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/Output/null/outputnull.h b/src/plugins/Output/null/outputnull.h
index 7dc6260fe..6497df1ea 100644
--- a/src/plugins/Output/null/outputnull.h
+++ b/src/plugins/Output/null/outputnull.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Ilya Kotov *
+ * Copyright (C) 2010-2012 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp
index 2ef0fb560..36a03aa78 100644
--- a/src/plugins/Output/null/outputnullfactory.cpp
+++ b/src/plugins/Output/null/outputnullfactory.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Ilya Kotov *
+ * Copyright (C) 2010-2012 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -39,7 +39,7 @@ Output* OutputNullFactory::create(QObject* parent)
return new OutputNull(parent);
}
-VolumeControl *OutputNullFactory::createVolumeControl(QObject *)
+Volume *OutputNullFactory::createVolume()
{
return 0;
}
diff --git a/src/plugins/Output/null/outputnullfactory.h b/src/plugins/Output/null/outputnullfactory.h
index 566d299dd..3917c77ad 100644
--- a/src/plugins/Output/null/outputnullfactory.h
+++ b/src/plugins/Output/null/outputnullfactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010 by Ilya Kotov *
+ * Copyright (C) 2010-2012 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -30,16 +30,15 @@
#include <qmmp/outputfactory.h>
-class OutputNullFactory : public QObject,
- OutputFactory
+class OutputNullFactory : public QObject, OutputFactory
{
Q_OBJECT
-Q_INTERFACES(OutputFactory);
+Q_INTERFACES(OutputFactory)
public:
const OutputProperties properties() const;
Output* create(QObject* parent);
- VolumeControl *createVolumeControl(QObject *parent);
+ Volume *createVolume();
void showSettings(QWidget* parent);
void showAbout(QWidget *parent);
QTranslator *createTranslator(QObject *parent);