From 9408303fad1efd3b889f7677dd255b9437276cfc Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 13 Sep 2011 16:38:23 +0000 Subject: fixed general plugin api git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2351 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/covermanager/covermanager.cpp | 2 +- src/plugins/General/covermanager/covermanager.h | 4 ++-- .../General/covermanager/covermanagerfactory.cpp | 4 ++-- .../General/covermanager/covermanagerfactory.h | 6 +++--- src/plugins/General/fileops/fileops.cpp | 3 +-- src/plugins/General/fileops/fileops.h | 4 ++-- src/plugins/General/fileops/fileopsfactory.cpp | 4 ++-- src/plugins/General/fileops/fileopsfactory.h | 6 +++--- .../fileops/translations/fileops_plugin_cs.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_de.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_es.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_it.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_ja.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_lt.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_nl.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_pl.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_ru.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_tr.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_uk_UA.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_zh_CN.ts | 14 +++++++------- .../fileops/translations/fileops_plugin_zh_TW.ts | 14 +++++++------- src/plugins/General/hal/halfactory.cpp | 4 ++-- src/plugins/General/hal/halfactory.h | 6 +++--- src/plugins/General/hal/halplugin.cpp | 6 ++---- src/plugins/General/hal/halplugin.h | 6 +++--- .../General/hal/translations/hal_plugin_cs.ts | 4 ++-- .../General/hal/translations/hal_plugin_de.ts | 4 ++-- .../General/hal/translations/hal_plugin_es.ts | 4 ++-- .../General/hal/translations/hal_plugin_it.ts | 4 ++-- .../General/hal/translations/hal_plugin_ja.ts | 4 ++-- .../General/hal/translations/hal_plugin_lt.ts | 4 ++-- .../General/hal/translations/hal_plugin_nl.ts | 4 ++-- .../General/hal/translations/hal_plugin_pl.ts | 4 ++-- .../General/hal/translations/hal_plugin_ru.ts | 4 ++-- .../General/hal/translations/hal_plugin_tr.ts | 4 ++-- .../General/hal/translations/hal_plugin_uk_UA.ts | 4 ++-- .../General/hal/translations/hal_plugin_zh_CN.ts | 4 ++-- .../General/hal/translations/hal_plugin_zh_TW.ts | 4 ++-- src/plugins/General/hotkey/hotkeyfactory.cpp | 4 ++-- src/plugins/General/hotkey/hotkeyfactory.h | 6 +++--- src/plugins/General/hotkey/hotkeymanager.cpp | 4 ++-- src/plugins/General/hotkey/hotkeymanager.h | 4 ++-- src/plugins/General/kdenotify/kdenotify.cpp | 4 ++-- src/plugins/General/kdenotify/kdenotify.h | 4 ++-- src/plugins/General/kdenotify/kdenotifyfactory.cpp | 2 +- src/plugins/General/kdenotify/kdenotifyfactory.h | 4 ++-- src/plugins/General/lyrics/lyrics.cpp | 6 ++---- src/plugins/General/lyrics/lyrics.h | 6 +++--- src/plugins/General/lyrics/lyricsfactory.cpp | 2 +- src/plugins/General/lyrics/lyricsfactory.h | 10 +++++----- .../General/lyrics/translations/lyrics_plugin_cs.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_de.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_es.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_it.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_ja.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_lt.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_nl.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_pl.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_ru.ts | 4 ++-- .../General/lyrics/translations/lyrics_plugin_tr.ts | 4 ++-- .../lyrics/translations/lyrics_plugin_uk_UA.ts | 4 ++-- .../lyrics/translations/lyrics_plugin_zh_CN.ts | 4 ++-- .../lyrics/translations/lyrics_plugin_zh_TW.ts | 4 ++-- src/plugins/General/mpris/mpris.cpp | 2 +- src/plugins/General/mpris/mpris.h | 6 +++--- src/plugins/General/mpris/mprisfactory.cpp | 4 ++-- src/plugins/General/mpris/mprisfactory.h | 6 +++--- src/plugins/General/notifier/notifier.cpp | 3 +-- src/plugins/General/notifier/notifier.h | 6 +++--- src/plugins/General/notifier/notifierfactory.cpp | 4 ++-- src/plugins/General/notifier/notifierfactory.h | 6 +++--- src/plugins/General/scrobbler/scrobblerfactory.cpp | 4 ++-- src/plugins/General/scrobbler/scrobblerfactory.h | 6 +++--- src/plugins/General/scrobbler/scrobblerhandler.cpp | 4 ++-- src/plugins/General/scrobbler/scrobblerhandler.h | 2 +- src/plugins/General/statusicon/statusicon.cpp | 3 +-- src/plugins/General/statusicon/statusicon.h | 4 ++-- .../General/statusicon/statusiconfactory.cpp | 4 ++-- src/plugins/General/statusicon/statusiconfactory.h | 6 +++--- .../statusicon/translations/statusicon_plugin_cs.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_de.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_es.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_it.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_ja.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_lt.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_nl.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_pl.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_ru.ts | 14 +++++++------- .../statusicon/translations/statusicon_plugin_tr.ts | 14 +++++++------- .../translations/statusicon_plugin_uk_UA.ts | 14 +++++++------- .../translations/statusicon_plugin_zh_CN.ts | 14 +++++++------- .../translations/statusicon_plugin_zh_TW.ts | 14 +++++++------- .../General/udisks/translations/udisks_plugin_cs.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_de.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_es.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_it.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_ja.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_lt.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_nl.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_pl.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_ru.ts | 4 ++-- .../General/udisks/translations/udisks_plugin_tr.ts | 4 ++-- .../udisks/translations/udisks_plugin_uk_UA.ts | 4 ++-- .../udisks/translations/udisks_plugin_zh_CN.ts | 4 ++-- .../udisks/translations/udisks_plugin_zh_TW.ts | 4 ++-- src/plugins/General/udisks/udisksfactory.cpp | 2 +- src/plugins/General/udisks/udisksfactory.h | 4 ++-- src/plugins/General/udisks/udisksplugin.cpp | 3 +-- src/plugins/General/udisks/udisksplugin.h | 4 ++-- src/qmmpui/general.cpp | 20 +++++--------------- src/qmmpui/general.h | 21 ++++----------------- src/qmmpui/generalfactory.h | 6 +++--- 112 files changed, 365 insertions(+), 396 deletions(-) diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp index 528c6c18d..60ef2ef6a 100644 --- a/src/plugins/General/covermanager/covermanager.cpp +++ b/src/plugins/General/covermanager/covermanager.cpp @@ -30,7 +30,7 @@ #include "coverwidget.h" #include "covermanager.h" -CoverManager::CoverManager(QObject *parent) : General(parent) +CoverManager::CoverManager(QObject *parent) : QObject(parent) { m_action = new QAction(tr("Show Cover"), this); m_action->setShortcut(tr("Ctrl+M")); diff --git a/src/plugins/General/covermanager/covermanager.h b/src/plugins/General/covermanager/covermanager.h index a235faa54..7bf5b9075 100644 --- a/src/plugins/General/covermanager/covermanager.h +++ b/src/plugins/General/covermanager/covermanager.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2010 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,7 +29,7 @@ class QAction; /** @author Ilya Kotov */ -class CoverManager : public General +class CoverManager : public QObject { Q_OBJECT public: diff --git a/src/plugins/General/covermanager/covermanagerfactory.cpp b/src/plugins/General/covermanager/covermanagerfactory.cpp index 126b76bbe..3f3a6271f 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.cpp +++ b/src/plugins/General/covermanager/covermanagerfactory.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 * @@ -34,7 +34,7 @@ const GeneralProperties CoverManagerFactory::properties() const return properties; } -General *CoverManagerFactory::create(QObject *parent) +QObject *CoverManagerFactory::create(QObject *parent) { return new CoverManager(parent); } diff --git a/src/plugins/General/covermanager/covermanagerfactory.h b/src/plugins/General/covermanager/covermanagerfactory.h index 5c825a574..143a38705 100644 --- a/src/plugins/General/covermanager/covermanagerfactory.h +++ b/src/plugins/General/covermanager/covermanagerfactory.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 CoverManagerFactory : 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/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp index e661b646c..83896e6b5 100644 --- a/src/plugins/General/fileops/fileops.cpp +++ b/src/plugins/General/fileops/fileops.cpp @@ -37,8 +37,7 @@ #define COPY_BLOCK_SIZE 102400 -FileOps::FileOps(QObject *parent) - : General(parent) +FileOps::FileOps(QObject *parent) : QObject(parent) { //separators QAction *separator1 = new QAction(this); diff --git a/src/plugins/General/fileops/fileops.h b/src/plugins/General/fileops/fileops.h index 1ba862308..ad261df9e 100644 --- a/src/plugins/General/fileops/fileops.h +++ b/src/plugins/General/fileops/fileops.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2010 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,7 +31,7 @@ class PlayListItem; @author Ilya Kotov */ -class FileOps : public General +class FileOps : public QObject { Q_OBJECT public: diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp index 606eec457..028b18e42 100644 --- a/src/plugins/General/fileops/fileopsfactory.cpp +++ b/src/plugins/General/fileops/fileopsfactory.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 FileOpsFactory::properties() const return properties; } -General *FileOpsFactory::create(QObject *parent) +QObject *FileOpsFactory::create(QObject *parent) { return new FileOps(parent); } diff --git a/src/plugins/General/fileops/fileopsfactory.h b/src/plugins/General/fileops/fileopsfactory.h index 6b0665be3..ebf9177c8 100644 --- a/src/plugins/General/fileops/fileopsfactory.h +++ b/src/plugins/General/fileops/fileopsfactory.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 * @@ -33,10 +33,10 @@ class FileOpsFactory : 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/fileops/translations/fileops_plugin_cs.ts b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts index 682d991b3..ebb988c19 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_cs.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_cs.ts @@ -4,37 +4,37 @@ FileOps - + Error Chyba - + Destination directory doesn't exist Cílový adresář neexistuje - + Copying Kopíruje se - + Stop Přerušit - + Copying file %1/%2 Kopíruje se soubor %1/%2 - + Remove files Odstranit soubory - + Are you sure you want to remove %n file(s) from disk? Jste si jisti, že chcete z disku odstranit %n soubor? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_de.ts b/src/plugins/General/fileops/translations/fileops_plugin_de.ts index 4dc416e12..41d13b8a0 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_de.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_de.ts @@ -4,37 +4,37 @@ FileOps - + Error Fehler - + Destination directory doesn't exist Das Zielverzeichnis existiert nicht - + Copying Kopiere - + Stop Stopp - + Copying file %1/%2 Datei %1/%2 wird kopiert - + Remove files Dateien entfernen - + Are you sure you want to remove %n file(s) from disk? Möchten Sie wirklich %n Datei von der Festplatte entfernen? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_es.ts b/src/plugins/General/fileops/translations/fileops_plugin_es.ts index 35b63c7e7..8d10c699a 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_es.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_es.ts @@ -4,37 +4,37 @@ FileOps - + Error Error - + Destination directory doesn't exist El directorio de destino no existe - + Copying Copiando - + Stop Detener - + Copying file %1/%2 Copiando archivo %1/%2 - + Remove files Eliminar archivos - + Are you sure you want to remove %n file(s) from disk? ¿Seguro que quiere eliminar %n archivo(s) del disco? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_it.ts b/src/plugins/General/fileops/translations/fileops_plugin_it.ts index ba7758fe1..22fd5b00f 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_it.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_it.ts @@ -4,37 +4,37 @@ FileOps - + Error Errore - + Destination directory doesn't exist Cartella di destinazione - + Copying Copia - + Stop Ferma - + Copying file %1/%2 Copia del file - + Remove files Rimuovi file - + Are you sure you want to remove %n file(s) from disk? Vuoi davvero rimuovere %n file(s) dal disco? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_ja.ts b/src/plugins/General/fileops/translations/fileops_plugin_ja.ts index 62f8dffa1..d9022c88c 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_ja.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_ja.ts @@ -4,37 +4,37 @@ FileOps - + Error 事故 - + Destination directory doesn't exist 移動先ディレクトリが存在しません - + Copying コピーしています - + Stop 中止 - + Copying file %1/%2 %1/%2 ファイルをコピーしています - + Remove files ファイルを削除 - + Are you sure you want to remove %n file(s) from disk? %n 個のファイルをディスク上から削除しようとしています。 よろしいですか？ diff --git a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts index 4af39f554..028cf85e2 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_lt.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_lt.ts @@ -4,37 +4,37 @@ FileOps - + Error Klaida - + Destination directory doesn't exist Aplankas neegzistuoja - + Copying Kopijuoju - + Stop Stop - + Copying file %1/%2 Kopijuoju bylą %1/%2 - + Remove files Ištrinti bylas - + Are you sure you want to remove %n file(s) from disk? Ar tu tikras, jog nori ištrinti %n bylą(as) iš disko? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_nl.ts b/src/plugins/General/fileops/translations/fileops_plugin_nl.ts index 5a3172463..8b6054f56 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_nl.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_nl.ts @@ -4,37 +4,37 @@ FileOps - + Error Fout - + Destination directory doesn't exist Doelmap bestaat niet - + Copying Bezig met kopiëren - + Stop Stop - + Copying file %1/%2 Kopiëer bestand: %1/%2 - + Remove files Verwijder bestanden - + Are you sure you want to remove %n file(s) from disk? Weet u zeker dat u deze %n bestanden wilt verwijderen? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_pl.ts b/src/plugins/General/fileops/translations/fileops_plugin_pl.ts index a770574eb..f56a6f4cd 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_pl.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_pl.ts @@ -4,37 +4,37 @@ FileOps - + Error Błąd - + Destination directory doesn't exist Katalog docelowy nie istnieje - + Copying Kopiowanie - + Stop - + Copying file %1/%2 Kopiowanie pliku %1/%2 - + Remove files Usuń pliki - + Are you sure you want to remove %n file(s) from disk? Czy napewno chcesz usunąć %n plik(ów) z dysku? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts index 82a900e6b..f85e0aec5 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_ru.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_ru.ts @@ -4,37 +4,37 @@ FileOps - + Error Ошибка - + Destination directory doesn't exist Директория назначения не существует - + Copying Копирование - + Stop Остановить - + Copying file %1/%2 Копирование файла %1/%2 - + Remove files Удалить файлы - + Are you sure you want to remove %n file(s) from disk? Вы уверены, что хотите удалить %n файл с диска? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts index 933914679..14c07ed31 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts @@ -4,37 +4,37 @@ FileOps - + Error Hata - + Destination directory doesn't exist Hedef dizin mevcut değil - + Copying Kopyalıyor - + Stop Dur - + Copying file %1/%2 %1/%2 dosyası kopyalanıyor - + Remove files Dosyaları kaldır - + Are you sure you want to remove %n file(s) from disk? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts index 94543deef..079085b50 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_uk_UA.ts @@ -4,37 +4,37 @@ FileOps - + Error Помилка - + Destination directory doesn't exist Тека призначення не існує - + Copying Копіювання - + Stop Зупинити - + Copying file %1/%2 Копіювання файла %1/%2 - + Remove files Видалити файли - + Are you sure you want to remove %n file(s) from disk? Ви дійсно бажаєте видалити %n файл з диску? diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts index 5ab4e8782..283e790e7 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_CN.ts @@ -4,37 +4,37 @@ FileOps - + Error 错误 - + Destination directory doesn't exist 目标目录不存在 - + Copying 正在复制 - + Stop 停止 - + Copying file %1/%2 正在复制文件 %1/%2 - + Remove files 删除文件 - + Are you sure you want to remove %n file(s) from disk? 你确认要从磁盘中删除 %n 文件？ diff --git a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts index 459ae292f..aa94cf61d 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_zh_TW.ts @@ -4,37 +4,37 @@ FileOps - + Error 錯誤 - + Destination directory doesn't exist 目標目錄早已存在 - + Copying 正在復制 - + Stop 停止 - + Copying file %1/%2 復制檔案 %1/%2 - + Remove files 刪除檔案 - + Are you sure you want to remove %n file(s) from disk? 你確認要從磁盤中刪除%n文件？ 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 + @author Ilya Kotov */ -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 @@ HalPlugin - + Add CD "%1" Přidat CD „%1“ - + Add Volume "%1" Přidat svazek „%1“ 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 @@ HalPlugin - + Add CD "%1" CD „%1“ hinzufügen - + Add Volume "%1" Gerät „%1“ hinzufügen 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 @@ HalPlugin - + Add CD "%1" Añadir CD "%1" - + Add Volume "%1" Añadir volumen "%1" 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 @@ HalPlugin - + Add CD "%1" Aggiungi CD "%1" - + Add Volume "%1" Aggiungi libreria "%1" 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 @@ HalPlugin - + Add CD "%1" Cd "%1" を追加 - + Add Volume "%1" 量目 "%1" を追加 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 @@ HalPlugin - + Add CD "%1" Pridėti CD "%1" - + Add Volume "%1" Pridėti tomą "%1" 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 @@ HalPlugin - + Add CD "%1" Voeg CD "%1" toe - + Add Volume "%1" Voeg Station "%1" toe 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 @@ HalPlugin - + Add CD "%1" Dodaj CD "%1" - + Add Volume "%1" Dodaj urządzenie "%1" 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 @@ HalPlugin - + Add CD "%1" Добавить CD "%1" - + Add Volume "%1" Добавить том "%1" 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 @@ HalPlugin - + Add CD "%1" CD "%1" Ekle - + Add Volume "%1" "%1" Aygıtını Ekle 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 @@ HalPlugin - + Add CD "%1" Додати CD "%1" - + Add Volume "%1" Додати том "%1" 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 @@ HalPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" 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 @@ HalPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index 423437892..34922d739 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.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 HotkeyFactory::properties() const return properties; } -General *HotkeyFactory::create(QObject *parent) +QObject *HotkeyFactory::create(QObject *parent) { return new HotkeyManager(parent); } diff --git a/src/plugins/General/hotkey/hotkeyfactory.h b/src/plugins/General/hotkey/hotkeyfactory.h index f1ca46d1f..e00aa7f30 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.h +++ b/src/plugins/General/hotkey/hotkeyfactory.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 HotkeyFactory : 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/hotkey/hotkeymanager.cpp b/src/plugins/General/hotkey/hotkeymanager.cpp index 6a6b3b685..212601a7b 100644 --- a/src/plugins/General/hotkey/hotkeymanager.cpp +++ b/src/plugins/General/hotkey/hotkeymanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * Copyright (C) 2003-2007 by Justin Karneges and Michail Pishchagin * @@ -69,7 +69,7 @@ quint32 Hotkey::defaultKey(int act) return keyMap[act]; } -HotkeyManager::HotkeyManager(QObject *parent) : General(parent) +HotkeyManager::HotkeyManager(QObject *parent) : QObject(parent) { QCoreApplication::instance()->installEventFilter(this); WId rootWindow = QX11Info::appRootWindow(); diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h index dddb10a9e..793bb74d9 100644 --- a/src/plugins/General/hotkey/hotkeymanager.h +++ b/src/plugins/General/hotkey/hotkeymanager.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 * @@ -63,7 +63,7 @@ public: static quint32 defaultKey(int act); }; -class HotkeyManager : public General +class HotkeyManager : public QObject { Q_OBJECT public: diff --git a/src/plugins/General/kdenotify/kdenotify.cpp b/src/plugins/General/kdenotify/kdenotify.cpp index d1d196362..9f5e648e5 100644 --- a/src/plugins/General/kdenotify/kdenotify.cpp +++ b/src/plugins/General/kdenotify/kdenotify.cpp @@ -36,7 +36,7 @@ #include "kdenotify.h" -KdeNotify::KdeNotify(QObject *parent) : General(parent),m_useFreedesktopSpec(false) +KdeNotify::KdeNotify(QObject *parent) : QObject(parent),m_useFreedesktopSpec(false) { m_notifier = new QDBusInterface("org.kde.VisualNotifications", "/VisualNotifications", "org.kde.VisualNotifications", @@ -44,7 +44,7 @@ KdeNotify::KdeNotify(QObject *parent) : General(parent),m_useFreedesktopSpec(fal if(m_notifier->lastError().type() != QDBusError::NoError) { delete(m_notifier); - m_notifier = new QDBusInterface("org.freedesktop.Notifications", + m_notifier = new QDBusInterface("org.freedesktop.Notifications", "/org/freedesktop/Notifications","org.freedesktop.Notifications", QDBusConnection::sessionBus(), this); if(m_notifier->lastError().type() != QDBusError::NoError) diff --git a/src/plugins/General/kdenotify/kdenotify.h b/src/plugins/General/kdenotify/kdenotify.h index d6c4d7300..06b559938 100644 --- a/src/plugins/General/kdenotify/kdenotify.h +++ b/src/plugins/General/kdenotify/kdenotify.h @@ -32,9 +32,9 @@ class QDBusInterface; -class KdeNotify : public General +class KdeNotify : public QObject { - Q_OBJECT; + Q_OBJECT public: KdeNotify(QObject *parent = 0); ~KdeNotify(); diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.cpp b/src/plugins/General/kdenotify/kdenotifyfactory.cpp index 59fca89b7..abd2ca214 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.cpp +++ b/src/plugins/General/kdenotify/kdenotifyfactory.cpp @@ -35,7 +35,7 @@ const GeneralProperties KdeNotifyFactory::properties() const return properties; } -General *KdeNotifyFactory::create(QObject *parent) +QObject *KdeNotifyFactory::create(QObject *parent) { return new KdeNotify(parent); } diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.h b/src/plugins/General/kdenotify/kdenotifyfactory.h index b9d5634eb..f4c9ea238 100644 --- a/src/plugins/General/kdenotify/kdenotifyfactory.h +++ b/src/plugins/General/kdenotify/kdenotifyfactory.h @@ -30,11 +30,11 @@ class KdeNotifyFactory : public QObject, public GeneralFactory { - Q_OBJECT; + Q_OBJECT 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/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 #include - #include #include #include @@ -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 + @author Ilya Kotov */ -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 @@ -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 @@ Lyrics - + View Lyrics Zobrazit text - + Ctrl+L Ctrl+L 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 @@ Lyrics - + View Lyrics Liedtext anzeigen - + Ctrl+L Strg+L 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 @@ Lyrics - + View Lyrics Ver letras - + Ctrl+L Ctrl+L 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 @@ Lyrics - + View Lyrics Vedi testi lirica - + Ctrl+L Ctrl+L 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 @@ Lyrics - + View Lyrics 歌詞を表示 - + Ctrl+L Ctrl+L 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 @@ Lyrics - + View Lyrics Rodyti tekstą - + Ctrl+L 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 @@ Lyrics - + View Lyrics Laat Tekst zien - + Ctrl+L Ctrl+L 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 @@ Lyrics - + View Lyrics Pokaż tekst piosenki - + Ctrl+L 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 @@ Lyrics - + View Lyrics Показать текст - + Ctrl+L 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 @@ Lyrics - + View Lyrics Şarkı Sözlerini Göster - + Ctrl+L Ctrl+L 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 @@ Lyrics - + View Lyrics Огляд текстів - + Ctrl+L 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 @@ Lyrics - + View Lyrics 显示歌词 - + Ctrl+L Ctrl+L 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 @@ Lyrics - + View Lyrics 察看歌詞 - + Ctrl+L Ctrl+L diff --git a/src/plugins/General/mpris/mpris.cpp b/src/plugins/General/mpris/mpris.cpp index 61caaae64..c45bb44c5 100644 --- a/src/plugins/General/mpris/mpris.cpp +++ b/src/plugins/General/mpris/mpris.cpp @@ -26,7 +26,7 @@ #include "mpris2/player2object.h" #include "mpris.h" -MPRIS::MPRIS(QObject *parent) : General(parent) +MPRIS::MPRIS(QObject *parent) : QObject(parent) { QDBusConnection connection = QDBusConnection::sessionBus(); //MPRISv1.0 diff --git a/src/plugins/General/mpris/mpris.h b/src/plugins/General/mpris/mpris.h index 370809da7..1cab01efe 100644 --- a/src/plugins/General/mpris/mpris.h +++ b/src/plugins/General/mpris/mpris.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -26,10 +26,10 @@ class DBUSAdaptor; /** - @author Ilya Kotov + @author Ilya Kotov */ -class MPRIS : public General +class MPRIS : public QObject { Q_OBJECT public: diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp index 079f3b674..a13f62d23 100644 --- a/src/plugins/General/mpris/mprisfactory.cpp +++ b/src/plugins/General/mpris/mprisfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,7 +34,7 @@ const GeneralProperties MPRISFactory::properties() const return properties; } -General *MPRISFactory::create(QObject *parent) +QObject *MPRISFactory::create(QObject *parent) { return new MPRIS(parent); } diff --git a/src/plugins/General/mpris/mprisfactory.h b/src/plugins/General/mpris/mprisfactory.h index 27708dd6e..38d1b66ed 100644 --- a/src/plugins/General/mpris/mprisfactory.h +++ b/src/plugins/General/mpris/mprisfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,10 +32,10 @@ class MPRISFactory : 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/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp index 9b1cf5de6..be414c9a6 100644 --- a/src/plugins/General/notifier/notifier.cpp +++ b/src/plugins/General/notifier/notifier.cpp @@ -27,8 +27,7 @@ #include "popupwidget.h" #include "notifier.h" -Notifier::Notifier(QObject *parent) - : General(parent) +Notifier::Notifier(QObject *parent) : QObject(parent) { m_popupWidget = 0; m_l = -1; diff --git a/src/plugins/General/notifier/notifier.h b/src/plugins/General/notifier/notifier.h index d9cbb7faf..2f3d433ed 100644 --- a/src/plugins/General/notifier/notifier.h +++ b/src/plugins/General/notifier/notifier.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -29,10 +29,10 @@ class PopupWidget; class SoundCore; /** - @author Ilya Kotov + @author Ilya Kotov */ -class Notifier : public General +class Notifier : public QObject { Q_OBJECT public: diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp index e3ba30fea..63fff569f 100644 --- a/src/plugins/General/notifier/notifierfactory.cpp +++ b/src/plugins/General/notifier/notifierfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-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 NotifierFactory::properties() const return properties; } -General *NotifierFactory::create(QObject *parent) +QObject *NotifierFactory::create(QObject *parent) { return new Notifier(parent); } diff --git a/src/plugins/General/notifier/notifierfactory.h b/src/plugins/General/notifier/notifierfactory.h index 68c22bbde..80f798c0a 100644 --- a/src/plugins/General/notifier/notifierfactory.h +++ b/src/plugins/General/notifier/notifierfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,10 +33,10 @@ class NotifierFactory : 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/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp index 6ed89e551..acbec4e8d 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.cpp +++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2009 by Ilya Kotov * + * Copyright (C) 2008-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 ScrobblerFactory::properties() const return properties; } -General *ScrobblerFactory::create(QObject *parent) +QObject *ScrobblerFactory::create(QObject *parent) { return new ScrobblerHandler(parent); } diff --git a/src/plugins/General/scrobbler/scrobblerfactory.h b/src/plugins/General/scrobbler/scrobblerfactory.h index a0bd0a626..cd37ee696 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.h +++ b/src/plugins/General/scrobbler/scrobblerfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,10 +32,10 @@ class ScrobblerFactory : 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/scrobbler/scrobblerhandler.cpp b/src/plugins/General/scrobbler/scrobblerhandler.cpp index 6248578e3..be280b19f 100644 --- a/src/plugins/General/scrobbler/scrobblerhandler.cpp +++ b/src/plugins/General/scrobbler/scrobblerhandler.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 * @@ -26,7 +26,7 @@ #include "scrobbler2.h" #include "scrobblerhandler.h" -ScrobblerHandler::ScrobblerHandler(QObject *parent) : General(parent) +ScrobblerHandler::ScrobblerHandler(QObject *parent) : QObject(parent) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Scrobbler"); diff --git a/src/plugins/General/scrobbler/scrobblerhandler.h b/src/plugins/General/scrobbler/scrobblerhandler.h index 9a6bd3828..501ee349c 100644 --- a/src/plugins/General/scrobbler/scrobblerhandler.h +++ b/src/plugins/General/scrobbler/scrobblerhandler.h @@ -28,7 +28,7 @@ @author Ilya Kotov */ -class ScrobblerHandler : public General +class ScrobblerHandler : public QObject { Q_OBJECT diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index 6191ee725..8a64cb733 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -35,8 +35,7 @@ #include "qmmptrayicon.h" #include "statusicon.h" -StatusIcon::StatusIcon(QObject *parent) - : General(parent) +StatusIcon::StatusIcon(QObject *parent) : QObject(parent) { m_tray = new QmmpTrayIcon(this); connect(m_tray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(trayActivated(QSystemTrayIcon::ActivationReason))); diff --git a/src/plugins/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h index c7ff2e7ca..bda950d87 100644 --- a/src/plugins/General/statusicon/statusicon.h +++ b/src/plugins/General/statusicon/statusicon.h @@ -31,10 +31,10 @@ class QEvent; /** - @author Ilya Kotov + @author Ilya Kotov */ -class StatusIcon : public General +class StatusIcon : public QObject { Q_OBJECT public: diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp index 0ecb9ec5c..c4c51f16a 100644 --- a/src/plugins/General/statusicon/statusiconfactory.cpp +++ b/src/plugins/General/statusicon/statusiconfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2009 by Ilya Kotov * + * Copyright (C) 2008-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 StatusIconFactory::properties() const return properties; } -General *StatusIconFactory::create(QObject *parent) +QObject *StatusIconFactory::create(QObject *parent) { return new StatusIcon(parent); } diff --git a/src/plugins/General/statusicon/statusiconfactory.h b/src/plugins/General/statusicon/statusiconfactory.h index c2dc76bc5..402d2c604 100644 --- a/src/plugins/General/statusicon/statusiconfactory.h +++ b/src/plugins/General/statusicon/statusiconfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,10 +33,10 @@ class StatusIconFactory : 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/statusicon/translations/statusicon_plugin_cs.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts index 61cbd7190..6a69780fd 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Přehrát - + Pause Pauza - + Stop Stop - + Next Další - + Previous Předchozí - + Exit Ukončit - + Now Playing Nyní hraje diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts index 1f374e0e1..6b7b0665f 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Wiedergabe - + Pause Pause - + Stop Stopp - + Next Nächster - + Previous Vorheriger - + Exit Beenden - + Now Playing Aktueller Titel diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts index 3a3534c4c..1b2d56b40 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_es.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Reproducir - + Pause Pausar - + Stop Detener - + Next Siguiente - + Previous Anterior - + Exit Salir - + Now Playing Ahora reproduciendo: diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts index 15fe932f0..8c092faee 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_it.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Esegui - + Pause Pausa - + Stop Ferma - + Next Successivo - + Previous Precedente - + Exit Esci - + Now Playing Brano in esecuzione: diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts index 5d2acf74a..bfc6641b1 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ja.ts @@ -73,37 +73,37 @@ StatusIcon - + Play 再生 - + Pause 一時停止 - + Stop 終止 - + Next 次の曲 - + Previous 前の曲 - + Exit 終了 - + Now Playing 今の曲 diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts index f4002ebac..75d0a8b9e 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_lt.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Groti - + Pause Pauzė - + Stop Stop - + Next Sekantis takelis - + Previous Ankstesnis takelis - + Exit Uždaryti - + Now Playing Dabar groju diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts index 9be7e80d4..92b173775 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_nl.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Afspelen - + Pause Pauze - + Stop Stop - + Next Volgende - + Previous Vorige - + Exit Afsluiten - + Now Playing Aan het Afspelen diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_pl.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_pl.ts index f3732e93d..34d534d7e 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_pl.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_pl.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Odtwarzaj - + Pause Pauza - + Stop Zatrzymaj - + Next Następny - + Previous Poprzedni - + Exit Wyjdź - + Now Playing Teraz odtwarza diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts index 05a026d84..ec13b3ed7 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Воспроизвести - + Pause Пауза - + Stop Стоп - + Next Следующий фрагмент - + Previous Предыдущий фрагмент - + Exit Выход - + Now Playing Сейчас играет diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts index fa428a3a3..3fba5a507 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_tr.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Oynat - + Pause Duraklat - + Stop Durdur - + Next Sonraki - + Previous Önceki - + Exit Çık - + Now Playing Şimdi Oynatılıyor diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts index 3c162fff9..a207c4fb7 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts @@ -73,37 +73,37 @@ StatusIcon - + Play Грати - + Pause Пауза - + Stop Стоп - + Next Вперед - + Previous Назад - + Exit Вихід - + Now Playing Зараз грає diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts index aed74b9d8..7090b82f4 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts @@ -73,37 +73,37 @@ StatusIcon - + Play 播放 - + Pause 暂停 - + Stop 停止 - + Next 下一曲 - + Previous 上一曲 - + Exit 退出 - + Now Playing 正在播放 diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts index a892901c1..e96109603 100644 --- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts +++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts @@ -73,37 +73,37 @@ StatusIcon - + Play 播放 - + Pause 暫停 - + Stop 停止 - + Next 下一曲 - + Previous 上一曲 - + Exit 結束 - + Now Playing 正在播放 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 @@ UDisksPlugin - + Add CD "%1" Přidat CD „%1“ - + Add Volume "%1" Přidat svazek „%1“ 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 @@ UDisksPlugin - + Add CD "%1" CD „%1“ hinzufügen - + Add Volume "%1" Gerät „%1“ hinzufügen 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 @@ UDisksPlugin - + Add CD "%1" Añadir CD "%1" - + Add Volume "%1" Añadir volumen "%1" 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 @@ UDisksPlugin - + Add CD "%1" Aggiungi CD "%1" - + Add Volume "%1" Aggiungi libreria "%1" 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 @@ UDisksPlugin - + Add CD "%1" CD "%1" を追加 - + Add Volume "%1" 量目 "%1" を追加 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 @@ UDisksPlugin - + Add CD "%1" Pridėti CD "%1" - + Add Volume "%1" Pridėti tomą "%1" 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 @@ UDisksPlugin - + Add CD "%1" Voeg CD "%1" toe - + Add Volume "%1" Voeg Station "%1" toe 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 @@ UDisksPlugin - + Add CD "%1" Dodaj CD "%1" - + Add Volume "%1" Dodaj urządzenie "%1" 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 @@ UDisksPlugin - + Add CD "%1" Добавить CD "%1" - + Add Volume "%1" Добавить том "%1" 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 @@ UDisksPlugin - + Add CD "%1" CD "%1" Ekle - + Add Volume "%1" "%1" Aygıtını Ekle 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 @@ UDisksPlugin - + Add CD "%1" Додати CD "%1" - + Add Volume "%1" Додати том "%1" 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 @@ UDisksPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" 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 @@ UDisksPlugin - + Add CD "%1" 添加 CD "%1" - + Add Volume "%1" 添加卷 "%1" 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 + @author Ilya Kotov */ -class UDisksPlugin : public General +class UDisksPlugin : public QObject { Q_OBJECT public: diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp index 8b2b36f22..2ae7b7199 100644 --- a/src/qmmpui/general.cpp +++ b/src/qmmpui/general.cpp @@ -27,7 +27,7 @@ QList *General::m_factories = 0; QStringList General::m_files; -QMap *General::m_generals = 0; +QMap *General::m_generals = 0; QObject *General::m_parent = 0; void General::checkFactories() @@ -61,28 +61,18 @@ void General::checkFactories() } } -General::General(QObject *parent) - : QObject(parent) -{ - Q_UNUSED(parent); -} - - -General::~General() -{} - void General::create(QObject *parent) { if(m_generals) return; - m_generals = new QMap (); + m_generals = new QMap (); m_parent = parent; checkFactories(); foreach(GeneralFactory* factory, *General::factories()) { if (General::isEnabled(factory)) { - General *general = factory->create(parent); + QObject *general = factory->create(parent); m_generals->insert(factory, general); } } @@ -126,7 +116,7 @@ void General::setEnabled(GeneralFactory* factory, bool enable) return; if (enable) { - General *general = factory->create(m_parent); + QObject *general = factory->create(m_parent); m_generals->insert(factory, general); } else @@ -145,7 +135,7 @@ void General::showSettings(GeneralFactory* factory, QWidget* parentWidget) if (m_generals && dialog->exec() == QDialog::Accepted && m_generals->keys().contains(factory)) { delete m_generals->value(factory); - General *general = factory->create(m_parent); + QObject *general = factory->create(m_parent); m_generals->insert(factory, general); } dialog->deleteLater(); diff --git a/src/qmmpui/general.h b/src/qmmpui/general.h index 6afd75517..502867957 100644 --- a/src/qmmpui/general.h +++ b/src/qmmpui/general.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -25,22 +25,12 @@ #include #include "generalfactory.h" -/*! @brief The General class provides the basic functionality for the general plugin objects +/*! @brief The General class provides simple access to general plugins * @author Ilya Kotov */ -class General : public QObject +class General { - Q_OBJECT public: - /*! - * Object constructor, - * @param parent Parent object - */ - General(QObject *parent = 0); - /*! - * Destructor - */ - ~General(); /*! * Prepares general plugins for usage. * @param parent Parent object. @@ -72,14 +62,11 @@ public: */ static bool isEnabled(GeneralFactory* factory); - private: - QMap m_strValues; - QMap m_numValues; static QList *m_factories; static QStringList m_files; static void checkFactories(); - static QMap *m_generals; + static QMap *m_generals; static QObject *m_parent; }; diff --git a/src/qmmpui/generalfactory.h b/src/qmmpui/generalfactory.h index 41a4eb488..7670f6bae 100644 --- a/src/qmmpui/generalfactory.h +++ b/src/qmmpui/generalfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2009 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -66,7 +66,7 @@ public: /*! * Creates object of the General class. */ - virtual General *create(QObject *parent) = 0; + virtual QObject *create(QObject *parent) = 0; /*! * Creates configuration dialog. * @param parent Parent widget. @@ -85,5 +85,5 @@ public: virtual QTranslator *createTranslator(QObject *parent) = 0; }; -Q_DECLARE_INTERFACE(GeneralFactory, "GeneralFactory/1.0"); +Q_DECLARE_INTERFACE(GeneralFactory, "GeneralFactory/1.0") #endif -- cgit v1.2.3-13-gbd6f