aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qmmpui/generalfactory.h46
-rw-r--r--src/qmmpui/uifactory.h44
2 files changed, 46 insertions, 44 deletions
diff --git a/src/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h
index f862a9347..41a4eb488 100644
--- a/src/qmmpui/generalfactory.h
+++ b/src/qmmpui/generalfactory.h
@@ -3,64 +3,76 @@
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU Ui Public License as published by *
+ * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU Ui Public License for more details. *
+ * GNU General Public License for more details. *
* *
- * You should have received a copy of the GNU Ui Public License *
+ * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef UiFACTORY_H
-#define UiFACTORY_H
+#ifndef GENERALFACTORY_H
+#define GENERALFACTORY_H
class QObject;
class QTranslator;
class QDialog;
class QString;
class QWidget;
+class Control;
+class General;
-/*! @brief Helper class to store ui plugin properies.
+/*! @brief Helper class to store general plugin properies.
*/
-class UiProperties
+class GeneralProperties
{
public:
/*!
* Constructor
*/
- UiProperties()
+ GeneralProperties()
{
hasAbout = false;
-
+ hasSettings = false;
+ visibilityControl = false;
}
QString name; /*!< File dialog plugin full name */
QString shortName; /*!< File dialog short name for internal usage */
bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */
+ bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */
+ bool visibilityControl; /*!< Should be \b true if plugin can show/hide main window of the player,
+ * otherwise returns \b false */
};
-/*! @brief User interface plugin interface.
+/*! @brief %General plugin interface.
* @author Ilya Kotov <forkotov02@hotmail.ru>
*/
-class UiFactory
+class GeneralFactory
{
public:
/*!
* Object destructor.
*/
- virtual ~UiFactory() {}
+ virtual ~GeneralFactory() {}
+ /*!
+ * Returns general plugin properties.
+ */
+ virtual const GeneralProperties properties() const = 0;
/*!
- * Returns ui plugin properties.
+ * Creates object of the General class.
*/
- virtual const UiProperties properties() const = 0;
+ virtual General *create(QObject *parent) = 0;
/*!
- * Creates Ui object instance.
+ * Creates configuration dialog.
+ * @param parent Parent widget.
+ * @return Configuration dialog pointer.
*/
- virtual QObject *create() = 0;
+ virtual QDialog *createConfigDialog(QWidget *parent) = 0;
/*!
* Shows about dialog.
* @param parent Parent widget.
@@ -73,5 +85,5 @@ public:
virtual QTranslator *createTranslator(QObject *parent) = 0;
};
-Q_DECLARE_INTERFACE(UiFactory, "UiFactory/1.0")
+Q_DECLARE_INTERFACE(GeneralFactory, "GeneralFactory/1.0");
#endif
diff --git a/src/qmmpui/uifactory.h b/src/qmmpui/uifactory.h
index da62a1da4..bccb632aa 100644
--- a/src/qmmpui/uifactory.h
+++ b/src/qmmpui/uifactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2009 by Ilya Kotov *
+ * Copyright (C) 2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -17,38 +17,34 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef GENERALFACTORY_H
-#define GENERALFACTORY_H
+#ifndef UIFACTORY_H
+#define UIFACTORY_H
class QObject;
class QTranslator;
class QDialog;
class QString;
class QWidget;
+class Control;
class General;
-/*! @brief Helper class to store general plugin properies.
+/*! @brief Helper class to store user interface plugin properies.
*/
-class GeneralProperties
+class UiProperties
{
public:
/*!
* Constructor
*/
- GeneralProperties()
+ UiProperties()
{
hasAbout = false;
- hasSettings = false;
- visibilityControl = false;
}
- QString name; /*!< File dialog plugin full name */
- QString shortName; /*!< File dialog short name for internal usage */
- bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */
- bool hasSettings; /*!< Should be \b true if plugin has settings dialog, otherwise returns \b false */
- bool visibilityControl; /*!< Should be \b true if plugin can show/hide main window of the player,
- * otherwise returns \b false */
+ QString name; /*!< File dialog plugin full name */
+ QString shortName; /*!< File dialog short name for internal usage */
+ bool hasAbout; /*!< Should be \b true if plugin has about dialog, otherwise returns \b false */
};
-/*! @brief %General plugin interface.
+/*! @brief User interface plugin interface.
* @author Ilya Kotov <forkotov02@hotmail.ru>
*/
class UiFactory
@@ -57,21 +53,15 @@ public:
/*!
* Object destructor.
*/
- virtual ~GeneralFactory() {}
+ virtual ~UiFactory() {}
/*!
- * Returns general plugin properties.
+ * Returns user interface plugin properties.
*/
- virtual const GeneralProperties properties() const = 0;
+ virtual const UiProperties properties() const = 0;
/*!
- * Creates object of the General class.
+ * Creates user interface instance.
*/
- virtual General *create(QObject *parent) = 0;
- /*!
- * Creates configuration dialog.
- * @param parent Parent widget.
- * @return Configuration dialog pointer.
- */
- virtual QDialog *createConfigDialog(QWidget *parent) = 0;
+ virtual QObject *create() = 0;
/*!
* Shows about dialog.
* @param parent Parent widget.
@@ -84,5 +74,5 @@ public:
virtual QTranslator *createTranslator(QObject *parent) = 0;
};
-Q_DECLARE_INTERFACE(GeneralFactory, "GeneralFactory/1.0");
+Q_DECLARE_INTERFACE(UiFactory, "UiFactory/1.0")
#endif