Remove usage of deprecated g_type_init

sailfishos · May 2, 2018 · 2924997 · 2924997
1 parent 4944c21
commit 2924997
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/src/contentinfo.cpp b/src/contentinfo.cpp
@@ -103,8 +103,6 @@ ContentInfo::typeIcon () const
 ContentInfo
 ContentInfo::forMime (const QString &mimeType)
 {
-  g_type_init ();
-
   gchar *contentType = g_content_type_from_mime_type (mimeType.toUtf8());
 
   Private *priv = new Private;
@@ -161,8 +159,6 @@ ContentInfo::forTracker (const QString &tracker_uri)
 ContentInfo
 ContentInfo::forData (const QByteArray &bytes)
 {
-   g_type_init ();
-
    gchar *content_type = g_content_type_guess (NULL, (const guchar *)bytes.constData(), bytes.size(), NULL);
    if (content_type)
      {

diff --git a/src/exec.cpp b/src/exec.cpp
@@ -35,7 +35,6 @@ ExecPrivate::ExecPrivate(QSharedPointer<MDesktopEntry> desktopEntry,
                          const QStringList& params)
     : DefaultPrivate(desktopEntry, params), appInfo(0)
 {
-    g_type_init();
     GError *execError = 0;
     GKeyFile *keyFile;
     GKeyFileFlags flags = G_KEY_FILE_NONE;

diff --git a/src/mime.cpp b/src/mime.cpp
@@ -155,7 +155,6 @@ static QString generalizeMimeType(const QString &mime)
 /// be retrieved.
 QString Internal::mimeForFile(const QUrl& uri)
 {
-    g_type_init();
     // assume "file" scheme if the uri had nothing
     QUrl fileUri(uri);
     if (fileUri.scheme().isEmpty())