Commit 5bd05e6c authored by Martin Straka's avatar Martin Straka

Minor code refactoring

parent 25fc8328
...@@ -193,7 +193,7 @@ Item { ...@@ -193,7 +193,7 @@ Item {
} }
Component.onCompleted: { Component.onCompleted: {
iOS = files.isIos() iOS = iOSHelper.isIos()
actionButton.enabled = false actionButton.enabled = false
initPDZ.visible = false initPDZ.visible = false
initPDZ.checked = false initPDZ.checked = false
......
...@@ -202,3 +202,12 @@ void IosHelper::storeFilesToDeviceStorage(const QStringList &srcFilePaths) ...@@ -202,3 +202,12 @@ void IosHelper::storeFilesToDeviceStorage(const QStringList &srcFilePaths)
Q_UNUSED(srcFilePaths); Q_UNUSED(srcFilePaths);
#endif /* Q_OS_IOS */ #endif /* Q_OS_IOS */
} }
bool IosHelper::isIos(void)
{
#ifdef Q_OS_IOS
return true;
#else
return false;
#endif
}
...@@ -87,6 +87,14 @@ public: ...@@ -87,6 +87,14 @@ public:
*/ */
void importFilesToAppInbox(QList<QUrl> selectedFileUrls); void importFilesToAppInbox(QList<QUrl> selectedFileUrls);
/*!
* @brief iOS check for QML.
*
* @return True if iOS.
*/
Q_INVOKABLE
bool isIos(void);
signals: signals:
/*! /*!
......
...@@ -816,15 +816,6 @@ void Files::deleteTmpFileFromStorage(const QString &filePath) ...@@ -816,15 +816,6 @@ void Files::deleteTmpFileFromStorage(const QString &filePath)
#endif #endif
} }
bool Files::isIos(void)
{
#ifdef Q_OS_IOS
return true;
#else
return false;
#endif
}
bool Files::parseXmlData(enum MsgInfo::ZfoType *type, QString *idStr, bool Files::parseXmlData(enum MsgInfo::ZfoType *type, QString *idStr,
QString *annotation, QString *msgDescrHtml, FileListModel *attachModel, QString *annotation, QString *msgDescrHtml, FileListModel *attachModel,
QString *emailBody, QByteArray xmlData) QString *emailBody, QByteArray xmlData)
......
...@@ -284,14 +284,6 @@ public: ...@@ -284,14 +284,6 @@ public:
Q_INVOKABLE Q_INVOKABLE
void deleteTmpFileFromStorage(const QString &filePath); void deleteTmpFileFromStorage(const QString &filePath);
/*!
* @brief iOS check for QML.
*
* @return True if iOS.
*/
Q_INVOKABLE
bool isIos(void);
signals: signals:
/*! /*!
* @brief Set new statusbar text and active busy indicator to QML. * @brief Set new statusbar text and active busy indicator to QML.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment