Git commit 0b59626bca3c20ad81119458669fdede11fba79e by Urs Fleisch. Committed on 14/02/2020 at 07:09. Pushed by ufleisch into branch 'master'.
Replace references to SourceForge by KDE M +1 -1 CMakeLists.txt M +1 -1 deb/control M +1 -1 deb/kid3-core.install M +2 -2 deb/kid3-qt.install M +2 -2 deb/kid3.install M +10 -10 doc/en/index.docbook M +2 -2 kid3.spec M +2 -2 src/app/kde/CMakeLists.txt M +3 -3 src/app/kde/mainkde.cpp M +5 -5 src/app/kid3.appdata.xml M +3 -3 src/app/qt/CMakeLists.txt M +1 -1 src/app/qt/kid3mainwindow.cpp M +1 -1 src/core/CMakeLists.txt M +1 -1 src/core/import/iserverimporterfactory.h M +1 -1 src/core/import/iservertrackimporterfactory.h M +1 -1 src/core/model/iusercommandprocessor.h M +1 -1 src/core/model/kid3application.cpp R +1 -1 src/core/model/org.kde.Kid3.xml [from: src/core/model/net.sourceforge.Kid3.xml - 099% similarity] M +5 -5 src/core/model/scriptinterface.h M +1 -1 src/core/tags/itaggedfilefactory.h M +1 -1 src/gui/forms/mprisinterface.cpp M +1 -1 src/plugins/acoustidimport/acoustidimportplugin.h M +1 -1 src/plugins/amazonimport/amazonimportplugin.h M +1 -1 src/plugins/discogsimport/discogsimportplugin.h M +1 -1 src/plugins/freedbimport/freedbimportplugin.h M +1 -1 src/plugins/id3libmetadata/id3libmetadataplugin.h M +1 -1 src/plugins/mp4v2metadata/mp4v2metadataplugin.h M +1 -1 src/plugins/musicbrainzimport/musicbrainzimportplugin.h M +1 -1 src/plugins/oggflacmetadata/oggflacmetadataplugin.h M +1 -1 src/plugins/qmlcommand/qmlcommandplugin.h M +1 -1 src/plugins/taglibmetadata/taglibmetadataplugin.h M +2 -2 src/qml/app/AboutDialog.qml M +1 -1 translations/extract-merge.sh https://invent.kde.org/kde/kid3/commit/0b59626bca3c20ad81119458669fdede11fba79e diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b369773..3e49d8db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -485,7 +485,7 @@ endif() set(CPACK_PACKAGE_CONTACT "[email protected]") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Audio tag editor") set(CPACK_STRIP_FILES ON) -set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://kid3.sourceforge.net/";) +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://kid3.kde.org/";) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) include(CPack) diff --git a/deb/control b/deb/control index d9221572..36200cf8 100644 --- a/deb/control +++ b/deb/control @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9), libreadline-dev, xsltproc Standards-Version: 4.2.1 -Homepage: http://kid3.sourceforge.net/ +Homepage: https://kid3.kde.org/ Package: kid3-core Architecture: any diff --git a/deb/kid3-core.install b/deb/kid3-core.install index e4262314..35716001 100644 --- a/deb/kid3-core.install +++ b/deb/kid3-core.install @@ -1,4 +1,4 @@ /usr/lib/kid3/* -/usr/share/dbus-1/interfaces/net.sourceforge.Kid3.xml +/usr/share/dbus-1/interfaces/org.kde.Kid3.xml /usr/share/kid3/translations/* /usr/share/kid3/qml/script/* diff --git a/deb/kid3-qt.install b/deb/kid3-qt.install index e14356da..3c75ebcd 100644 --- a/deb/kid3-qt.install +++ b/deb/kid3-qt.install @@ -1,5 +1,5 @@ /usr/bin/kid3-qt -/usr/share/applications/net.sourceforge.kid3-qt.desktop -/usr/share/metainfo/net.sourceforge.kid3-qt.appdata.xml +/usr/share/applications/org.kde.kid3-qt.desktop +/usr/share/metainfo/org.kde.kid3-qt.appdata.xml /usr/share/doc/kid3-qt/* /usr/share/icons/hicolor/*/apps/kid3-qt.* diff --git a/deb/kid3.install b/deb/kid3.install index 844659e4..ea8da2e3 100644 --- a/deb/kid3.install +++ b/deb/kid3.install @@ -1,6 +1,6 @@ /usr/bin/kid3 -/usr/share/metainfo/net.sourceforge.kid3.appdata.xml +/usr/share/metainfo/org.kde.kid3.appdata.xml /usr/share/icons/hicolor/*/apps/kid3.* -/usr/share/applications/net.sourceforge.kid3.desktop +/usr/share/applications/org.kde.kid3.desktop /usr/share/doc/HTML/*/kid3/* /usr/share/kxmlgui5/kid3/kid3ui.rc diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 658d261e..08c0f751 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -3299,7 +3299,7 @@ Program written by Urs Fleisch <email>[email protected]</email> <para> &kid3; can be found at -<ulink url="https://kid3.sourceforge.io";>https://kid3.sourceforge.io</ulink>. +<ulink url="https://kid3.kde.org";>https://kid3.kde.org</ulink>. </para> </sect1> @@ -3330,8 +3330,8 @@ and <ulink url="http://libav.org/";>libav</ulink> are used. </para> <para> &kid3; is available for most &Linux; distributions, &Windows; and &macOS;. -Links can be found on <ulink url="https://kid3.sourceforge.io";> -https://kid3.sourceforge.io</ulink>. +Links can be found on <ulink url="https://kid3.kde.org";> +https://kid3.kde.org</ulink>. </para> </sect1> @@ -3427,8 +3427,8 @@ with the following code: <varlistentry><term>Shell</term> <listitem> <programlisting> -dbus-send --dest=net.sourceforge.kid3 --print-reply=literal \ -/Kid3 net.sourceforge.Kid3.setFrame int32:2 string:'Artist' \ +dbus-send --dest=org.kde.kid3 --print-reply=literal \ +/Kid3 org.kde.Kid3.setFrame int32:2 string:'Artist' \ string:'One Hit Wonder' </programlisting> <para> @@ -3436,7 +3436,7 @@ or easier with &Qt;'s <command>qdbus</command> (<command>qdbusviewer</command> can be used to explore the interface in a &GUI;): </para> <programlisting> -qdbus net.sourceforge.kid3 /Kid3 setFrame 2 Artist \ +qdbus org.kde.kid3 /Kid3 setFrame 2 Artist \ 'One Hit Wonder' </programlisting> </listitem> @@ -3446,7 +3446,7 @@ qdbus net.sourceforge.kid3 /Kid3 setFrame 2 Artist \ <programlisting> import dbus kid3 = dbus.SessionBus().get_object( - 'net.sourceforge.kid3', '/Kid3') + 'org.kde.kid3', '/Kid3') kid3.setFrame(2, 'Artist', 'One Hit Wonder') </programlisting> </listitem> @@ -3456,8 +3456,8 @@ kid3.setFrame(2, 'Artist', 'One Hit Wonder') <programlisting> use Net::DBus; $kid3 = Net::DBus->session->get_service( - "net.sourceforge.kid3")->get_object( - "/Kid3", "net.sourceforge.Kid3"); + "org.kde.kid3")->get_object( + "/Kid3", "org.kde.Kid3"); $kid3->setFrame(2, "Artist", "One Hit Wonder"); </programlisting> </listitem> @@ -3470,7 +3470,7 @@ $kid3->setFrame(2, "Artist", "One Hit Wonder"); <para> The &DBus; API is specified -in <filename>net.sourceforge.Kid3.xml</filename>. The &kid3; interface has the +in <filename>org.kde.Kid3.xml</filename>. The &kid3; interface has the following methods: </para> diff --git a/kid3.spec b/kid3.spec index b77b1d9a..1b566401 100644 --- a/kid3.spec +++ b/kid3.spec @@ -8,8 +8,8 @@ Group: Applications/Multimedia Summary: Efficient ID3 tag editor Version: 3.8.2 Release: 1%{?dist} -URL: http://kid3.sourceforge.net/ -Source0: http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz +URL: https://kid3.kde.org/ +Source0: https://invent.kde.org/kde/kid3/-/archive/%{version}/kid3-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs4-devel # OpenSUSE: BuildRequires: libkde4-devel diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt index b58ef396..aa7312a6 100644 --- a/src/app/kde/CMakeLists.txt +++ b/src/app/kde/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWi install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR}) install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} - RENAME net.sourceforge.kid3.desktop) + RENAME org.kde.kid3.desktop) install(FILES ../kid3.appdata.xml DESTINATION "${WITH_DATAROOTDIR}/metainfo" - RENAME net.sourceforge.kid3.appdata.xml) + RENAME org.kde.kid3.appdata.xml) install(FILES kid3ui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kid3) diff --git a/src/app/kde/mainkde.cpp b/src/app/kde/mainkde.cpp index c7d61923..e5f018b0 100644 --- a/src/app/kde/mainkde.cpp +++ b/src/app/kde/mainkde.cpp @@ -100,9 +100,9 @@ int main(int argc, char* argv[]) QStringLiteral("Audio Tag Editor"), KAboutLicense::GPL, QStringLiteral("(c) 2003-" RELEASE_YEAR " Urs Fleisch"), QString(), - QStringLiteral("http://kid3.sourceforge.net";), - QStringLiteral("[email protected]")); - aboutData.setOrganizationDomain(QByteArray("sourceforge.net")); + QStringLiteral("https://kid3.kde.org";), + QStringLiteral("https://invent.kde.org/kde/kid3/issues";)); + aboutData.setOrganizationDomain(QByteArray("kde.org")); aboutData.addAuthor(QStringLiteral("Urs Fleisch"), QString(), QStringLiteral("[email protected]")); aboutData.setProductName(QByteArray("kid3")); diff --git a/src/app/kid3.appdata.xml b/src/app/kid3.appdata.xml index 3713a032..83fb1e7e 100644 --- a/src/app/kid3.appdata.xml +++ b/src/app/kid3.appdata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2014 Urs Fleisch <ufleisch_at_users.sourceforge.net> --> <component type="desktop"> - <id>net.sourceforge.kid3.desktop</id> + <id>org.kde.kid3.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0+</project_license> <name>Kid3</name> @@ -89,7 +89,7 @@ </description> <screenshots> <screenshot type="default" width="1200" height="675"> - <image>http://kid3.sourceforge.net/screen169.png</image> + <image>https://kid3.kde.org/assets/img/screen169.png</image> <caption>Kid3 main window</caption> <caption xml:lang="ca">Finestra principal del Kid3</caption> <caption xml:lang="ca-valencia">Finestra principal del Kid3</caption> @@ -105,9 +105,9 @@ <caption xml:lang="zh-TW">Kid3 主視窗</caption> </screenshot> </screenshots> - <url type="homepage">http://kid3.sourceforge.net/</url> - <url type="bugtracker">http://sourceforge.net/p/kid3/bugs/</url> - <url type="help">http://sourceforge.net/p/kid3/discussion/</url> + <url type="homepage">https://kid3.kde.org/</url> + <url type="bugtracker">https://invent.kde.org/kde/kid3/issues</url> + <url type="help">https://invent.kde.org/kde/kid3/issues</url> <developer_name>Urs Fleisch</developer_name> <developer_name xml:lang="ca">Urs Fleisch</developer_name> <developer_name xml:lang="ca-valencia">Urs Fleisch</developer_name> diff --git a/src/app/qt/CMakeLists.txt b/src/app/qt/CMakeLists.txt index cdc1ccee..01428fc6 100644 --- a/src/app/qt/CMakeLists.txt +++ b/src/app/qt/CMakeLists.txt @@ -29,7 +29,7 @@ if(APPLE) set(MACOSX_BUNDLE_BUNDLE_EXECUTABLE "kid3") set(MACOSX_BUNDLE_ICON_FILE kid3.icns) set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${CPACK_PACKAGE_VERSION}) - set(MACOSX_BUNDLE_GUI_IDENTIFIER "net.sourceforge.kid3") + set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.kid3") set(MACOSX_BUNDLE_COPYRIGHT "Copyright (c) 2003-${RELEASE_YEAR} Urs Fleisch") set_source_files_properties(kid3.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) @@ -60,7 +60,7 @@ if(UNIX AND NOT APPLE) add_custom_target("desktop-file" ALL DEPENDS kid3-qt.desktop) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kid3-qt.desktop DESTINATION "${WITH_DATAROOTDIR}/applications" - RENAME net.sourceforge.kid3-qt.desktop) + RENAME org.kde.kid3-qt.desktop) add_custom_command(OUTPUT kid3-qt.appdata.xml COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/fixappdata.py ${CMAKE_CURRENT_SOURCE_DIR}/../kid3.appdata.xml >kid3-qt.appdata.xml @@ -69,7 +69,7 @@ if(UNIX AND NOT APPLE) add_custom_target("appdata-file" ALL DEPENDS kid3-qt.appdata.xml) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kid3-qt.appdata.xml DESTINATION "${WITH_DATAROOTDIR}/metainfo" - RENAME net.sourceforge.kid3-qt.appdata.xml) + RENAME org.kde.kid3-qt.appdata.xml) if(GZIP_PROGRAM) add_custom_command(OUTPUT kid3-qt.svg COMMAND ${GZIP_PROGRAM} -cdn ${CMAKE_CURRENT_SOURCE_DIR}/../sc-apps-kid3.svgz >kid3-qt.svg diff --git a/src/app/qt/kid3mainwindow.cpp b/src/app/qt/kid3mainwindow.cpp index 73d18f59..eb5693f7 100644 --- a/src/app/qt/kid3mainwindow.cpp +++ b/src/app/qt/kid3mainwindow.cpp @@ -870,7 +870,7 @@ void Kid3MainWindow::slotHelpAbout() QLatin1String("<br/><br/>(c) 2003-" RELEASE_YEAR " <a href=\"mailto:[email protected]\";>Urs Fleisch</a>" "<br/><br/>" - "<a href=\"http://kid3.sourceforge.net/\";>http://kid3.sourceforge.net</a>" + "<a href=\"https://kid3.kde.org/\";>https://kid3.kde.org</a>" "<br/>") + tr("License") + QLatin1String(": <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\";>" "GNU General Public License</a><br/> ")); diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index eaa44bfc..ed2244bf 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -206,6 +206,6 @@ if(BUILD_SHARED_LIBS) endif() if(BUILD_KDE_APP) - install(FILES model/net.sourceforge.Kid3.xml + install(FILES model/org.kde.Kid3.xml DESTINATION ${WITH_DBUSDIR}) endif() diff --git a/src/core/import/iserverimporterfactory.h b/src/core/import/iserverimporterfactory.h index 74485ac4..72ab514a 100644 --- a/src/core/import/iserverimporterfactory.h +++ b/src/core/import/iserverimporterfactory.h @@ -65,4 +65,4 @@ public: }; Q_DECLARE_INTERFACE(IServerImporterFactory, - "net.sourceforge.kid3.IServerImporterFactory") + "org.kde.kid3.IServerImporterFactory") diff --git a/src/core/import/iservertrackimporterfactory.h b/src/core/import/iservertrackimporterfactory.h index 0b07b531..8b608a2c 100644 --- a/src/core/import/iservertrackimporterfactory.h +++ b/src/core/import/iservertrackimporterfactory.h @@ -65,4 +65,4 @@ public: }; Q_DECLARE_INTERFACE(IServerTrackImporterFactory, - "net.sourceforge.kid3.IServerTrackImporterFactory") + "org.kde.kid3.IServerTrackImporterFactory") diff --git a/src/core/model/iusercommandprocessor.h b/src/core/model/iusercommandprocessor.h index bdcd10ef..908132db 100644 --- a/src/core/model/iusercommandprocessor.h +++ b/src/core/model/iusercommandprocessor.h @@ -87,4 +87,4 @@ public: }; Q_DECLARE_INTERFACE(IUserCommandProcessor, - "net.sourceforge.kid3.IUserCommandProcessor") + "org.kde.kid3.IUserCommandProcessor") diff --git a/src/core/model/kid3application.cpp b/src/core/model/kid3application.cpp index 8c625dc6..3648c405 100644 --- a/src/core/model/kid3application.cpp +++ b/src/core/model/kid3application.cpp @@ -328,7 +328,7 @@ void Kid3Application::onApplicationStateChanged(Qt::ApplicationState state) void Kid3Application::activateDbusInterface() { if (QDBusConnection::sessionBus().isConnected()) { - QString serviceName(QLatin1String("net.sourceforge.kid3")); + QString serviceName(QLatin1String("org.kde.kid3")); QDBusConnection::sessionBus().registerService(serviceName); // For the case of multiple Kid3 instances running, register also a service // with the PID appended. On KDE such a service is already registered but diff --git a/src/core/model/net.sourceforge.Kid3.xml b/src/core/model/org.kde.Kid3.xml similarity index 99% rename from src/core/model/net.sourceforge.Kid3.xml rename to src/core/model/org.kde.Kid3.xml index a35e41c2..d5a13403 100644 --- a/src/core/model/net.sourceforge.Kid3.xml +++ b/src/core/model/org.kde.Kid3.xml @@ -1,6 +1,6 @@ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> <node> - <interface name="net.sourceforge.Kid3"> + <interface name="org.kde.Kid3"> <method name="openDirectory"> <arg type="b" direction="out"/> <arg name="path" type="s" direction="in"/> diff --git a/src/core/model/scriptinterface.h b/src/core/model/scriptinterface.h index cf1f106c..be0c47e7 100644 --- a/src/core/model/scriptinterface.h +++ b/src/core/model/scriptinterface.h @@ -34,15 +34,15 @@ class Kid3Application; /** - * Adaptor class for interface net.sourceforge.Kid3 - * Create net.sourceforge.Kid3.xml with: + * Adaptor class for interface org.kde.Kid3 + * Create org.kde.Kid3.xml with: * echo "#define HAVE_QTDBUS" >config.h - * qdbuscpp2xml scriptinterface.h >net.sourceforge.Kid3.xml + * qdbuscpp2xml scriptinterface.h >org.kde.Kid3.xml * rm config.h */ class ScriptInterface : public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "net.sourceforge.Kid3") + Q_CLASSINFO("D-Bus Interface", "org.kde.Kid3") public: /** * Constructor. @@ -178,7 +178,7 @@ public slots: * be enclosed in parentheses and the files must exist: * * @code - * qdbus net.sourceforge.kid3 /Kid3 setPlaylistItems "/path/to/playlist.m3u" + * qdbus org.kde.kid3 /Kid3 setPlaylistItems "/path/to/playlist.m3u" * \( "/path/to/file1" "/path/to/file2" \) * @endcode * diff --git a/src/core/tags/itaggedfilefactory.h b/src/core/tags/itaggedfilefactory.h index 29d9aa1d..49704fd8 100644 --- a/src/core/tags/itaggedfilefactory.h +++ b/src/core/tags/itaggedfilefactory.h @@ -109,4 +109,4 @@ public: }; Q_DECLARE_INTERFACE(ITaggedFileFactory, - "net.sourceforge.kid3.ITaggedFileFactory") + "org.kde.kid3.ITaggedFileFactory") diff --git a/src/gui/forms/mprisinterface.cpp b/src/gui/forms/mprisinterface.cpp index 60d09151..083e5130 100644 --- a/src/gui/forms/mprisinterface.cpp +++ b/src/gui/forms/mprisinterface.cpp @@ -415,7 +415,7 @@ QDBusObjectPath MprisPlayerInterface::getCurrentTrackId() const { if (index < 0) { return QDBusObjectPath(); } - return QDBusObjectPath(QLatin1String("/net/sourceforge/kid3/playlist/") + return QDBusObjectPath(QLatin1String("/org/kde/kid3/playlist/") + QString::number(index)); } diff --git a/src/plugins/acoustidimport/acoustidimportplugin.h b/src/plugins/acoustidimport/acoustidimportplugin.h index 843c0cc6..930b5270 100644 --- a/src/plugins/acoustidimport/acoustidimportplugin.h +++ b/src/plugins/acoustidimport/acoustidimportplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT AcoustidImportPlugin : public QObject, public IServerTrackImporterFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.IServerTrackImporterFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.IServerTrackImporterFactory") Q_INTERFACES(IServerTrackImporterFactory) public: /*! diff --git a/src/plugins/amazonimport/amazonimportplugin.h b/src/plugins/amazonimport/amazonimportplugin.h index 2e6e04c1..ece50939 100644 --- a/src/plugins/amazonimport/amazonimportplugin.h +++ b/src/plugins/amazonimport/amazonimportplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT AmazonImportPlugin : public QObject, public IServerImporterFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.IServerImporterFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.IServerImporterFactory") Q_INTERFACES(IServerImporterFactory) public: /*! diff --git a/src/plugins/discogsimport/discogsimportplugin.h b/src/plugins/discogsimport/discogsimportplugin.h index 8f9f0b73..8ef3795a 100644 --- a/src/plugins/discogsimport/discogsimportplugin.h +++ b/src/plugins/discogsimport/discogsimportplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT DiscogsImportPlugin : public QObject, public IServerImporterFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.IServerImporterFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.IServerImporterFactory") Q_INTERFACES(IServerImporterFactory) public: /*! diff --git a/src/plugins/freedbimport/freedbimportplugin.h b/src/plugins/freedbimport/freedbimportplugin.h index 39b26976..58faaefb 100644 --- a/src/plugins/freedbimport/freedbimportplugin.h +++ b/src/plugins/freedbimport/freedbimportplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT FreedbImportPlugin : public QObject, public IServerImporterFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.IServerImporterFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.IServerImporterFactory") Q_INTERFACES(IServerImporterFactory) public: /*! diff --git a/src/plugins/id3libmetadata/id3libmetadataplugin.h b/src/plugins/id3libmetadata/id3libmetadataplugin.h index 9c280665..b64d0e28 100644 --- a/src/plugins/id3libmetadata/id3libmetadataplugin.h +++ b/src/plugins/id3libmetadata/id3libmetadataplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT Id3libMetadataPlugin : public QObject, public ITaggedFileFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.ITaggedFileFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.ITaggedFileFactory") Q_INTERFACES(ITaggedFileFactory) public: /*! diff --git a/src/plugins/mp4v2metadata/mp4v2metadataplugin.h b/src/plugins/mp4v2metadata/mp4v2metadataplugin.h index 458ef16e..3ee69f5b 100644 --- a/src/plugins/mp4v2metadata/mp4v2metadataplugin.h +++ b/src/plugins/mp4v2metadata/mp4v2metadataplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT Mp4v2MetadataPlugin : public QObject, public ITaggedFileFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.ITaggedFileFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.ITaggedFileFactory") Q_INTERFACES(ITaggedFileFactory) public: /*! diff --git a/src/plugins/musicbrainzimport/musicbrainzimportplugin.h b/src/plugins/musicbrainzimport/musicbrainzimportplugin.h index 970ce18b..2421094e 100644 --- a/src/plugins/musicbrainzimport/musicbrainzimportplugin.h +++ b/src/plugins/musicbrainzimport/musicbrainzimportplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT MusicBrainzImportPlugin : public QObject, public IServerImporterFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.IServerImporterFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.IServerImporterFactory") Q_INTERFACES(IServerImporterFactory) public: /*! diff --git a/src/plugins/oggflacmetadata/oggflacmetadataplugin.h b/src/plugins/oggflacmetadata/oggflacmetadataplugin.h index 0c62f18a..04bcf4f3 100644 --- a/src/plugins/oggflacmetadata/oggflacmetadataplugin.h +++ b/src/plugins/oggflacmetadata/oggflacmetadataplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT OggFlacMetadataPlugin : public QObject, public ITaggedFileFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.ITaggedFileFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.ITaggedFileFactory") Q_INTERFACES(ITaggedFileFactory) public: /*! diff --git a/src/plugins/qmlcommand/qmlcommandplugin.h b/src/plugins/qmlcommand/qmlcommandplugin.h index 5ee14146..62857ac2 100644 --- a/src/plugins/qmlcommand/qmlcommandplugin.h +++ b/src/plugins/qmlcommand/qmlcommandplugin.h @@ -40,7 +40,7 @@ class QQmlError; class KID3_PLUGIN_EXPORT QmlCommandPlugin : public QObject, public IUserCommandProcessor { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.IUserCommandProcessor") + Q_PLUGIN_METADATA(IID "org.kde.kid3.IUserCommandProcessor") Q_INTERFACES(IUserCommandProcessor) public: /** diff --git a/src/plugins/taglibmetadata/taglibmetadataplugin.h b/src/plugins/taglibmetadata/taglibmetadataplugin.h index 273c456c..023490e5 100644 --- a/src/plugins/taglibmetadata/taglibmetadataplugin.h +++ b/src/plugins/taglibmetadata/taglibmetadataplugin.h @@ -35,7 +35,7 @@ class KID3_PLUGIN_EXPORT TaglibMetadataPlugin : public QObject, public ITaggedFileFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "net.sourceforge.kid3.ITaggedFileFactory") + Q_PLUGIN_METADATA(IID "org.kde.kid3.ITaggedFileFactory") Q_INTERFACES(ITaggedFileFactory) public: /*! diff --git a/src/qml/app/AboutDialog.qml b/src/qml/app/AboutDialog.qml index 27624cea..c7ff286e 100644 --- a/src/qml/app/AboutDialog.qml +++ b/src/qml/app/AboutDialog.qml @@ -40,8 +40,8 @@ Dialog { "<br/><br/>(c) 2003-" + script.getKid3ReleaseYear() + " <a href=\"mailto:[email protected]\";>Urs Fleisch</a>" + "<br/><br/>" + - "<a href=\"http://kid3.sourceforge.net/\";>" + - "http://kid3.sourceforge.net</a><br/>" + qsTr("License") + + "<a href=\"https://kid3.kde.org/\";>" + + "https://kid3.kde.org</a><br/>" + qsTr("License") + ": <a href=\"http://www.gnu.org/licenses/licenses.html#GPL\";>" + "GNU General Public License</a><br/><br/>" + qsTr( "This program uses <a href=\"http://www.qt.io/\";>Qt</a> version %1." diff --git a/translations/extract-merge.sh b/translations/extract-merge.sh index 069550d1..44f40725 100755 --- a/translations/extract-merge.sh +++ b/translations/extract-merge.sh @@ -6,7 +6,7 @@ BASEDIR="../src" # root of translatable sources PROJECT="kid3" # project name PROJECTVERSION="3.8.2" # project version -BUGADDR="http://sourceforge.net/p/kid3/bugs/"; # MSGID-Bugs +BUGADDR="https://invent.kde.org/kde/kid3/issues"; # MSGID-Bugs WDIR=`pwd` # working dir # Use extract-merge.sh if found in the path, its from
