aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/lyrics
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/General/lyrics')
-rw-r--r--src/plugins/General/lyrics/lyrics.cpp6
-rw-r--r--src/plugins/General/lyrics/lyrics.h6
-rw-r--r--src/plugins/General/lyrics/lyricsfactory.cpp2
-rw-r--r--src/plugins/General/lyrics/lyricsfactory.h10
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_de.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_es.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_it.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts4
-rw-r--r--src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts4
17 files changed, 37 insertions, 39 deletions
diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp
index e3fe003c3..f38787ded 100644
--- a/src/plugins/General/lyrics/lyrics.cpp
+++ b/src/plugins/General/lyrics/lyrics.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 *
@@ -20,7 +20,6 @@
#include <QAction>
#include <QApplication>
-
#include <qmmp/soundcore.h>
#include <qmmpui/uihelper.h>
#include <qmmpui/playlistmanager.h>
@@ -29,8 +28,7 @@
#include "lyricswindow.h"
#include "lyrics.h"
-Lyrics::Lyrics(QObject *parent)
- : General(parent)
+Lyrics::Lyrics(QObject *parent) : QObject(parent)
{
m_action = new QAction(tr("View Lyrics"), this);
m_action->setShortcut(tr("Ctrl+L"));
diff --git a/src/plugins/General/lyrics/lyrics.h b/src/plugins/General/lyrics/lyrics.h
index 1fdd6ebfe..95f637d4e 100644
--- a/src/plugins/General/lyrics/lyrics.h
+++ b/src/plugins/General/lyrics/lyrics.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 *
@@ -30,10 +30,10 @@ class QAction;
class SoundCore;
/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
+ @author Ilya Kotov <forkotov02@hotmail.ru>
*/
-class Lyrics : public General
+class Lyrics : public QObject
{
Q_OBJECT
public:
diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp
index 2a4f16143..1cdd01584 100644
--- a/src/plugins/General/lyrics/lyricsfactory.cpp
+++ b/src/plugins/General/lyrics/lyricsfactory.cpp
@@ -34,7 +34,7 @@ const GeneralProperties LyricsFactory::properties() const
return properties;
}
-General *LyricsFactory::create(QObject *parent)
+QObject *LyricsFactory::create(QObject *parent)
{
return new Lyrics(parent);
}
diff --git a/src/plugins/General/lyrics/lyricsfactory.h b/src/plugins/General/lyrics/lyricsfactory.h
index 67bdccac6..9b90135ab 100644
--- a/src/plugins/General/lyrics/lyricsfactory.h
+++ b/src/plugins/General/lyrics/lyricsfactory.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 *
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef NOTIFIERFACTORY_H
-#define NOTIFIERFACTORY_H
+#ifndef CONVERTERFACTORY_H
+#define CONVERTERFACTORY_H
/**
@author Ilya Kotov <forkotov02@hotmail.ru>
@@ -33,10 +33,10 @@
class LyricsFactory : 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/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
index e4377067b..bcbe2c244 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Zobrazit text</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
index 0d683358d..7d65effc2 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Liedtext anzeigen</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Strg+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts
index 77a62fe90..fdf18a28c 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_es.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Ver letras</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
index 3a09e69c8..90452067d 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Vedi testi lirica</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts
index 5b41ef477..37a679a9a 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ja.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>歌詞を表示</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
index be97df4ec..fb1e8c9b1 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Rodyti tekstą</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts
index 1fcf9c608..8aeae8fda 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_nl.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Laat Tekst zien</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
index a618baf93..c4b945934 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Pokaż tekst piosenki</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
index 0261df293..78cb6c5a5 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Показать текст</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation type="unfinished"></translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
index 11f77b6dd..00c4111f3 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Şarkı Sözlerini Göster</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
index 4b6f2ac32..db458d142 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>Огляд текстів</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
index c4dae511f..6f0042d5c 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>显示歌词</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
index ee44bed11..6a5bc76c7 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
@@ -4,12 +4,12 @@
<context>
<name>Lyrics</name>
<message>
- <location filename="../lyrics.cpp" line="35"/>
+ <location filename="../lyrics.cpp" line="33"/>
<source>View Lyrics</source>
<translation>察看歌詞</translation>
</message>
<message>
- <location filename="../lyrics.cpp" line="36"/>
+ <location filename="../lyrics.cpp" line="34"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>