Merge branch 'v1.0.0'

YATE.pro

@@ -7,7 +7,7 @@ CONFIG += c++11 DISCORD_ENABLED
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-VERSION = 1.0.5
+VERSION = 1.0.5.1
 SOURCES += \
     analysisviewitem.cpp \
     analysisviewmodel.cpp \
@@ -22,7 +22,7 @@ SOURCES += \
     livefeedbackoverlay.cpp \
     logevent.cpp \
     main.cpp \
-    miniz.c \
+    miniz.cpp \
     settingsdialog.cpp \
     updater.cpp \
     yatewindow.cpp \

main.cpp

@@ -19,11 +19,15 @@ void logMessageHandler(QtMsgType type, const QMessageLogContext &context, const
 QTextStream& qStdErr()
 {
     static QTextStream ts(stderr);
+    ts.setAutoDetectUnicode(true);
+    ts.setEncoding(QStringConverter::Utf16);
     return ts;
 }
 QTextStream& qStdOut()
 {
     static QTextStream ts(stdout);
+    ts.setAutoDetectUnicode(true);
+    ts.setEncoding(QStringConverter::Utf16);
     return ts;
 }
 #endif
@@ -34,6 +38,8 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
+
+
 #ifdef QT_DEBUG
     qInstallMessageHandler(logMessageHandler);
     qDebug() << "YATE Launched";
@@ -43,6 +49,7 @@ int main(int argc, char *argv[])
     }
     qDebug() << "Version: " << QApplication::applicationVersion();
     qDebug() << "Arguments: " << args.join(", ");
+
 #endif
 
     if (argc >= 5) {
@@ -84,7 +91,6 @@ int main(int argc, char *argv[])
 #ifdef QT_DEBUG
 void logMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
-    QByteArray localMsg = msg.toLocal8Bit();
     const char *file = context.file ? context.file : "";
     const char *function = context.function ? context.function : "";
     QString logType = "System";
@@ -108,11 +114,11 @@ void logMessageHandler(QtMsgType type, const QMessageLogContext &context, const
         logType = "Fatal";
         break;
     }
-    QString txt = QString("[%1] %2: %3 (%4:%5, %6)").arg(QDateTime::currentDateTime().toString()).arg(logType).arg(localMsg.constData()).arg(file).arg(context.line).arg(function);
+    QString txt = QString("[%1] %2: %3 (%4:%5, %6)").arg(QDateTime::currentDateTime().toString()).arg(logType).arg(msg).arg(file).arg(context.line).arg(function);
     if (isStdOut) {
-        qStdOut() << txt.toLocal8Bit().data() << Qt::endl;
+        qStdOut() << txt << Qt::endl;
     } else {
-        qStdErr() << txt.toLocal8Bit().data() << Qt::endl;
+        qStdErr() << txt << Qt::endl;
     }
     QFile outFile("yate.log");
     outFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text);

miniz.c → miniz.cpp

@@ -24,7 +24,8 @@
  * THE SOFTWARE.
  *
  **************************************************************************/
-
+#include <QDebug>
+#include <QFile>
 
 
 typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];
@@ -2999,9 +3000,17 @@ extern "C" {
 #if defined(_MSC_VER) || defined(__MINGW64__)
 static FILE *mz_fopen(const char *pFilename, const char *pMode)
 {
-    FILE *pFile = NULL;
-    fopen_s(&pFile, pFilename, pMode);
-    return pFile;
+    QFile qf(pFilename);
+    qf.open(QIODevice::ReadWrite);
+    int fd = qf.handle();
+    FILE* f = fdopen(dup(fd), pMode);
+
+    if (!f) {
+        qCritical() << errno << strerror(errno);
+    }
+
+    return f;
+
 }
 static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
 {

yatewindow.cpp

@@ -16,6 +16,8 @@
 #include <QClipboard>
 #include <QInputDialog>
 
+
+
 #include "globals.h"
 #include "settingsdialog.h"
 #include "analysiswindow.h"
@@ -110,7 +112,6 @@ YATEWindow::YATEWindow(QWidget *parent)
 
     qDebug() << "Main window initialized.";
 
-
 }
 
 void Yate::YATEWindow::initDiscord()

zipmanager.cpp

@@ -19,9 +19,9 @@ bool ZipManager::unzip(QString sourceArchive, QString destDir)
     mz_zip_archive zipArchive;
     memset(&zipArchive, 0, sizeof(zipArchive));
     mz_bool status;
-    auto sourceArchiveBA = sourceArchive.toUtf8 ();
-    const char *sourceArchiveFileName =  sourceArchiveBA.data();
-    status = mz_zip_reader_init_file(&zipArchive, sourceArchiveFileName, 0);
+    auto sourceArchiveStd = sourceArchive.toStdString();
+
+    status = mz_zip_reader_init_file(&zipArchive, sourceArchiveStd.c_str(), 0);
     if (!status)
     {
         qCritical() << "mz_zip_reader_init_file() failed!";
@@ -38,14 +38,12 @@ bool ZipManager::unzip(QString sourceArchive, QString destDir)
            return false;
        }
 
-//       qDebug() << file_stat.m_filename << file_stat.m_comment << file_stat.m_uncomp_size << file_stat.m_comp_size << mz_zip_reader_is_file_a_directory(&zipArchive, i);
        if (mz_zip_reader_is_file_a_directory(&zipArchive, i)) {
            continue;
        }
        QString strippedFileName = QFileInfo(file_stat.m_filename).fileName();
-       auto extractionFileNameBA = QString(destDir + QDir::separator() + strippedFileName).toUtf8();
-       const char * extractionFileName = extractionFileNameBA.data();
-       status = mz_zip_reader_extract_file_to_file(&zipArchive, file_stat.m_filename, extractionFileName, 0);
+       auto extractionFileNameStd = QString(destDir + QDir::separator() + strippedFileName).toStdString();
+       status = mz_zip_reader_extract_file_to_file(&zipArchive, file_stat.m_filename, extractionFileNameStd.c_str(), 0);
        if (!status)
        {
            qCritical() << "mz_zip_reader_extract_file_to_file() failed!";