Removed QML system paths since integrated in new Qt 6

FalsinSoft · Jan 4, 2024 · e1a1649 · e1a1649
1 parent 0feff91
commit e1a1649
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 125 deletions.
diff --git a/QtAndroidTools/QAndroidSystem.cpp b/QtAndroidTools/QAndroidSystem.cpp
@@ -32,7 +32,6 @@ QAndroidSystem::QAndroidSystem(QObject *parent) : QObject(parent),
                                                   QNativeInterface::QAndroidApplication::context())
 {
     m_pInstance = this;
-    loadStandardPaths();
 }
 
 QAndroidSystem* QAndroidSystem::create(QQmlEngine *engine, QJSEngine *scriptEngine)
@@ -74,43 +73,3 @@ int QAndroidSystem::ptToPx(float pt)
     }
     return -1;
 }
-
-const QString& QAndroidSystem::getDataLocation() const
-{
-    return m_standardPaths.dataLocation;
-}
-
-const QString& QAndroidSystem::getConfigLocation() const
-{
-    return m_standardPaths.configLocation;
-}
-
-const QString& QAndroidSystem::getDownloadLocation() const
-{
-    return m_standardPaths.downloadLocation;
-}
-
-const QString& QAndroidSystem::getMusicLocation() const
-{
-    return m_standardPaths.musicLocation;
-}
-
-const QString& QAndroidSystem::getMoviesLocation() const
-{
-    return m_standardPaths.moviesLocation;
-}
-
-const QString& QAndroidSystem::getPicturesLocation() const
-{
-    return m_standardPaths.picturesLocation;
-}
-
-void QAndroidSystem::loadStandardPaths()
-{
-    m_standardPaths.dataLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-    m_standardPaths.configLocation = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
-    m_standardPaths.downloadLocation = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
-    m_standardPaths.musicLocation = QStandardPaths::writableLocation(QStandardPaths::MusicLocation);
-    m_standardPaths.moviesLocation = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
-    m_standardPaths.picturesLocation = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
-}
diff --git a/QtAndroidTools/QAndroidSystem.h b/QtAndroidTools/QAndroidSystem.h
@@ -23,18 +23,11 @@
  */
 #pragma once
 
-#include <QStandardPaths>
 #include <QJniObject>
 #include <QQmlEngine>
 
 class QAndroidSystem : public QObject
 {
-    Q_PROPERTY(QString dataLocation READ getDataLocation CONSTANT)
-    Q_PROPERTY(QString configLocation READ getConfigLocation CONSTANT)
-    Q_PROPERTY(QString downloadLocation READ getDownloadLocation CONSTANT)
-    Q_PROPERTY(QString musicLocation READ getMusicLocation CONSTANT)
-    Q_PROPERTY(QString moviesLocation READ getMoviesLocation CONSTANT)
-    Q_PROPERTY(QString picturesLocation READ getPicturesLocation CONSTANT)
     Q_DISABLE_COPY(QAndroidSystem)
     QML_NAMED_ELEMENT(QtAndroidSystem)
     QML_SINGLETON
@@ -52,25 +45,7 @@ class QAndroidSystem : public QObject
     Q_INVOKABLE int dipToPx(float dip);
     Q_INVOKABLE int ptToPx(float pt);
 
-    const QString& getDataLocation() const;
-    const QString& getConfigLocation() const;
-    const QString& getDownloadLocation() const;
-    const QString& getMusicLocation() const;
-    const QString& getMoviesLocation() const;
-    const QString& getPicturesLocation() const;
-
 private:
     const QJniObject m_javaSystem;
     static QAndroidSystem *m_pInstance;
-
-    struct {
-        QString dataLocation;
-        QString configLocation;
-        QString downloadLocation;
-        QString musicLocation;
-        QString moviesLocation;
-        QString picturesLocation;
-    } m_standardPaths;
-
-    void loadStandardPaths();
 };
diff --git a/QtAndroidToolsDemo/tools/AndroidSystem.qml b/QtAndroidToolsDemo/tools/AndroidSystem.qml
@@ -10,64 +10,5 @@ ScrollablePage {
         anchors.fill: parent
         spacing: 5
 
-        Label {
-            font.bold: true
-            font.pixelSize: 15
-            text: "DataLocation:"
-        }
-        Label {
-            font.pixelSize: 15
-            text: QtAndroidSystem.dataLocation
-        }
-
-        Label {
-            font.bold: true
-            font.pixelSize: 15
-            text: "ConfigLocation:"
-        }
-        Label {
-            font.pixelSize: 15
-            text: QtAndroidSystem.configLocation
-        }
-
-        Label {
-            font.bold: true
-            font.pixelSize: 15
-            text: "DownloadLocation:"
-        }
-        Label {
-            font.pixelSize: 15
-            text: QtAndroidSystem.downloadLocation
-        }
-
-        Label {
-            font.bold: true
-            font.pixelSize: 15
-            text: "MusicLocation:"
-        }
-        Label {
-            font.pixelSize: 15
-            text: QtAndroidSystem.musicLocation
-        }
-
-        Label {
-            font.bold: true
-            font.pixelSize: 15
-            text: "MoviesLocation:"
-        }
-        Label {
-            font.pixelSize: 15
-            text: QtAndroidSystem.moviesLocation
-        }
-
-        Label {
-            font.bold: true
-            font.pixelSize: 15
-            text: "PicturesLocation:"
-        }
-        Label {
-            font.pixelSize: 15
-            text: QtAndroidSystem.picturesLocation
-        }
     }
 }