aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/udisks
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-09-13 16:38:23 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-09-13 16:38:23 +0000
commit9408303fad1efd3b889f7677dd255b9437276cfc (patch)
tree0657a5fd272ab0eb8469626d059e9d1f9f560238 /src/plugins/General/udisks
parentd0e1f9e4e1e44dbe3372a6cdb621bf0ee9baa668 (diff)
downloadqmmp-9408303fad1efd3b889f7677dd255b9437276cfc.tar.gz
qmmp-9408303fad1efd3b889f7677dd255b9437276cfc.tar.bz2
qmmp-9408303fad1efd3b889f7677dd255b9437276cfc.zip
fixed general plugin api
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2351 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/udisks')
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_cs.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_de.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_es.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_it.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_ja.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_lt.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_nl.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_pl.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_ru.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_tr.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts4
-rw-r--r--src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts4
-rw-r--r--src/plugins/General/udisks/udisksfactory.cpp2
-rw-r--r--src/plugins/General/udisks/udisksfactory.h4
-rw-r--r--src/plugins/General/udisks/udisksplugin.cpp3
-rw-r--r--src/plugins/General/udisks/udisksplugin.h4
17 files changed, 32 insertions, 33 deletions
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts
index e6b4e7c5d..3959679f4 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_cs.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_cs.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation type="unfinished">Přidat CD „%1“</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation type="unfinished">Přidat svazek „%1“</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_de.ts b/src/plugins/General/udisks/translations/udisks_plugin_de.ts
index 07a042cff..8575e5b34 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_de.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_de.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>CD „%1“ hinzufügen</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Gerät „%1“ hinzufügen</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_es.ts b/src/plugins/General/udisks/translations/udisks_plugin_es.ts
index 3556975d4..86e67d93a 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_es.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_es.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Añadir CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Añadir volumen &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_it.ts b/src/plugins/General/udisks/translations/udisks_plugin_it.ts
index 849ae8c72..3ebf27916 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_it.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_it.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation type="unfinished">Aggiungi CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation type="unfinished">Aggiungi libreria &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts
index 48a4e3aaa..a1cfb49d7 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_ja.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_ja.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>CD &quot;%1&quot; を追加</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>量目 &quot;%1&quot; を追加</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts
index 01faa0139..1745c099f 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_lt.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_lt.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Pridėti CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Pridėti tomą &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts
index 77c51a9c9..b2b9381ba 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_nl.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_nl.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation type="unfinished">Voeg CD &quot;%1&quot; toe</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation type="unfinished">Voeg Station &quot;%1&quot; toe</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_pl.ts b/src/plugins/General/udisks/translations/udisks_plugin_pl.ts
index e3288e2bb..30c37463d 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_pl.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_pl.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Dodaj CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Dodaj urządzenie &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts
index afbf2c85a..3f2eb49a1 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_ru.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_ru.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Добавить CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Добавить том &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts
index 00947b127..c217a368f 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_tr.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_tr.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation type="unfinished">CD &quot;%1&quot; Ekle</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation type="unfinished">&quot;%1&quot; Aygıtını Ekle</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts
index 2d7c3146b..8cc150225 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_uk_UA.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Додати CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Додати том &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts
index 78736aece..d98211df5 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_zh_CN.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>添加 CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>添加卷 &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts
index 7cfbc5841..640240c07 100644
--- a/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts
+++ b/src/plugins/General/udisks/translations/udisks_plugin_zh_TW.ts
@@ -70,12 +70,12 @@
<context>
<name>UDisksPlugin</name>
<message>
- <location filename="../udisksplugin.cpp" line="155"/>
+ <location filename="../udisksplugin.cpp" line="154"/>
<source>Add CD &quot;%1&quot;</source>
<translation>添加 CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../udisksplugin.cpp" line="161"/>
+ <location filename="../udisksplugin.cpp" line="160"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>添加卷 &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/udisks/udisksfactory.cpp b/src/plugins/General/udisks/udisksfactory.cpp
index 44c9f425e..74754ad9a 100644
--- a/src/plugins/General/udisks/udisksfactory.cpp
+++ b/src/plugins/General/udisks/udisksfactory.cpp
@@ -35,7 +35,7 @@ const GeneralProperties UDisksFactory::properties() const
return properties;
}
-General *UDisksFactory::create(QObject *parent)
+QObject *UDisksFactory::create(QObject *parent)
{
return new UDisksPlugin(parent);
}
diff --git a/src/plugins/General/udisks/udisksfactory.h b/src/plugins/General/udisks/udisksfactory.h
index 73e7195ce..4718e419c 100644
--- a/src/plugins/General/udisks/udisksfactory.h
+++ b/src/plugins/General/udisks/udisksfactory.h
@@ -32,10 +32,10 @@
class UDisksFactory : 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);
diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp
index 57b54eb9d..38135e437 100644
--- a/src/plugins/General/udisks/udisksplugin.cpp
+++ b/src/plugins/General/udisks/udisksplugin.cpp
@@ -31,8 +31,7 @@
#include "udisksmanager.h"
#include "udisksplugin.h"
-UDisksPlugin::UDisksPlugin(QObject *parent)
- : General(parent)
+UDisksPlugin::UDisksPlugin(QObject *parent) : QObject(parent)
{
m_manager = new UDisksManager(this);
m_actions = new QActionGroup(this);
diff --git a/src/plugins/General/udisks/udisksplugin.h b/src/plugins/General/udisks/udisksplugin.h
index b42f012c6..a29532cf4 100644
--- a/src/plugins/General/udisks/udisksplugin.h
+++ b/src/plugins/General/udisks/udisksplugin.h
@@ -29,10 +29,10 @@ class QActionGroup;
class QAction;
/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
+ @author Ilya Kotov <forkotov02@hotmail.ru>
*/
-class UDisksPlugin : public General
+class UDisksPlugin : public QObject
{
Q_OBJECT
public: