aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/hal
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/General/hal')
-rw-r--r--src/plugins/General/hal/halfactory.cpp4
-rw-r--r--src/plugins/General/hal/halfactory.h6
-rw-r--r--src/plugins/General/hal/halplugin.cpp6
-rw-r--r--src/plugins/General/hal/halplugin.h6
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_cs.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_de.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_es.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_it.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_ja.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_lt.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_nl.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_pl.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_ru.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_tr.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_uk_UA.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_zh_CN.ts4
-rw-r--r--src/plugins/General/hal/translations/hal_plugin_zh_TW.ts4
17 files changed, 36 insertions, 38 deletions
diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp
index 8e7014e50..6820ed5f3 100644
--- a/src/plugins/General/hal/halfactory.cpp
+++ b/src/plugins/General/hal/halfactory.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -35,7 +35,7 @@ const GeneralProperties HalFactory::properties() const
return properties;
}
-General *HalFactory::create(QObject *parent)
+QObject *HalFactory::create(QObject *parent)
{
return new HalPlugin(parent);
}
diff --git a/src/plugins/General/hal/halfactory.h b/src/plugins/General/hal/halfactory.h
index 632cf9f5e..744cd1683 100644
--- a/src/plugins/General/hal/halfactory.h
+++ b/src/plugins/General/hal/halfactory.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -32,10 +32,10 @@
class HalFactory : 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/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index c500ae2b4..876de9761 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -31,8 +31,7 @@
#include "halmanager.h"
#include "halplugin.h"
-HalPlugin::HalPlugin(QObject *parent)
- : General(parent)
+HalPlugin::HalPlugin(QObject *parent) : QObject(parent)
{
m_manager = new HalManager(this);
m_actions = new QActionGroup(this);
@@ -58,7 +57,6 @@ HalPlugin::HalPlugin(QObject *parent)
settings.endGroup();
}
-
HalPlugin::~HalPlugin()
{
}
diff --git a/src/plugins/General/hal/halplugin.h b/src/plugins/General/hal/halplugin.h
index cd90046a2..bb236f746 100644
--- a/src/plugins/General/hal/halplugin.h
+++ b/src/plugins/General/hal/halplugin.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2011 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -29,10 +29,10 @@ class QActionGroup;
class QAction;
/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
+ @author Ilya Kotov <forkotov02@hotmail.ru>
*/
-class HalPlugin : public General
+class HalPlugin : public QObject
{
Q_OBJECT
public:
diff --git a/src/plugins/General/hal/translations/hal_plugin_cs.ts b/src/plugins/General/hal/translations/hal_plugin_cs.ts
index 94a835847..2e69aa95a 100644
--- a/src/plugins/General/hal/translations/hal_plugin_cs.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_cs.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Přidat CD „%1“</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Přidat svazek „%1“</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_de.ts b/src/plugins/General/hal/translations/hal_plugin_de.ts
index 46c29f36a..bbff7e1c0 100644
--- a/src/plugins/General/hal/translations/hal_plugin_de.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_de.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>CD „%1“ hinzufügen</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Gerät „%1“ hinzufügen</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_es.ts b/src/plugins/General/hal/translations/hal_plugin_es.ts
index a3361dd8b..f8e1e26dd 100644
--- a/src/plugins/General/hal/translations/hal_plugin_es.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_es.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Añadir CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Añadir volumen &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_it.ts b/src/plugins/General/hal/translations/hal_plugin_it.ts
index 9b619b59a..64688a491 100644
--- a/src/plugins/General/hal/translations/hal_plugin_it.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_it.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Aggiungi CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Aggiungi libreria &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_ja.ts b/src/plugins/General/hal/translations/hal_plugin_ja.ts
index 9878516ab..49a48af4a 100644
--- a/src/plugins/General/hal/translations/hal_plugin_ja.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_ja.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Cd &quot;%1&quot; を追加</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>量目 &quot;%1&quot; を追加</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_lt.ts b/src/plugins/General/hal/translations/hal_plugin_lt.ts
index 8538581bb..c2e489462 100644
--- a/src/plugins/General/hal/translations/hal_plugin_lt.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_lt.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Pridėti CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Pridėti tomą &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_nl.ts b/src/plugins/General/hal/translations/hal_plugin_nl.ts
index 287e1c04c..85d35303d 100644
--- a/src/plugins/General/hal/translations/hal_plugin_nl.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_nl.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Voeg CD &quot;%1&quot; toe</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Voeg Station &quot;%1&quot; toe</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_pl.ts b/src/plugins/General/hal/translations/hal_plugin_pl.ts
index df733a2cd..301e9efc2 100644
--- a/src/plugins/General/hal/translations/hal_plugin_pl.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_pl.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Dodaj CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Dodaj urządzenie &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_ru.ts b/src/plugins/General/hal/translations/hal_plugin_ru.ts
index b516aadbd..766b24988 100644
--- a/src/plugins/General/hal/translations/hal_plugin_ru.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_ru.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Добавить CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Добавить том &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_tr.ts b/src/plugins/General/hal/translations/hal_plugin_tr.ts
index b1cc55e2a..cb39fb2df 100644
--- a/src/plugins/General/hal/translations/hal_plugin_tr.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_tr.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>CD &quot;%1&quot; Ekle</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>&quot;%1&quot; Aygıtını Ekle</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts
index bf9db94a4..8553f3d2e 100644
--- a/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_uk_UA.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>Додати CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>Додати том &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts
index 659ad10b4..25ef32d0d 100644
--- a/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_zh_CN.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>添加 CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>添加卷 &quot;%1&quot;</translation>
</message>
diff --git a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts
index dfd701863..0d373c36d 100644
--- a/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts
+++ b/src/plugins/General/hal/translations/hal_plugin_zh_TW.ts
@@ -37,12 +37,12 @@
<context>
<name>HalPlugin</name>
<message>
- <location filename="../halplugin.cpp" line="162"/>
+ <location filename="../halplugin.cpp" line="160"/>
<source>Add CD &quot;%1&quot;</source>
<translation>添加 CD &quot;%1&quot;</translation>
</message>
<message>
- <location filename="../halplugin.cpp" line="168"/>
+ <location filename="../halplugin.cpp" line="166"/>
<source>Add Volume &quot;%1&quot;</source>
<translation>添加卷 &quot;%1&quot;</translation>
</message>