From e346222c6e42a0ad4c73e86700e4bbdf54a28927 Mon Sep 17 00:00:00 2001 From: "dmytro.bogovych" Date: Fri, 21 Dec 2018 22:07:56 +0200 Subject: [PATCH] - more changes for 0.9.1 --- client/.qmake.stash | 5 + client/chooka.pro | 4 +- client/moc_aboutdlg.cpp | 18 +- client/moc_attachmentsdialog.cpp | 18 +- client/moc_attachmentslist.cpp | 32 ++- client/moc_finddialog.cpp | 46 ++-- client/moc_findsupport.cpp | 36 +-- client/moc_fvavailableupdate.cpp | 18 +- client/moc_fvignoredversions.cpp | 18 +- client/moc_fvplatform.cpp | 18 +- client/moc_fvupdateconfirmdialog.cpp | 18 +- client/moc_fvupdater.cpp | 18 +- client/moc_fvupdatewindow.cpp | 18 +- client/moc_helper.cpp | 20 +- client/moc_hidtracker.cpp | 22 +- client/moc_logger.cpp | 18 +- client/moc_mainwindow.cpp | 302 ++++++++++++------------- client/moc_newpassworddlg.cpp | 18 +- client/moc_passworddlg.cpp | 18 +- client/moc_preferencesdlg.cpp | 18 +- client/moc_sleeptracker_osx.cpp | 22 +- client/moc_startworkdialog.cpp | 22 +- client/moc_stopworkdialog.cpp | 22 +- client/moc_task.cpp | 18 +- client/moc_tasktreemodel.cpp | 34 +-- client/moc_timeintervaldlg.cpp | 18 +- client/moc_timereportwizard.cpp | 74 ++++--- client/moc_timetreedlg.cpp | 18 +- client/qrc_mainwindow.cpp | 2 +- client/ui_aboutdlg.h | 21 +- client/ui_attachmentsdialog.h | 19 +- client/ui_attachmentslist.h | 34 ++- client/ui_finddialog.h | 24 +- client/ui_fvupdateconfirmdialog.h | 29 ++- client/ui_fvupdatewindow.h | 43 ++-- client/ui_mainwindow.h | 320 +++++++++++++-------------- client/ui_newpassworddlg.h | 31 ++- client/ui_passworddlg.h | 21 +- client/ui_preferencesdlg.h | 78 ++++--- client/ui_startworkdialog.h | 21 +- client/ui_stopworkdialog.h | 21 +- client/ui_timeintervaldlg.h | 27 +-- client/ui_timetreedlg.h | 35 ++- redist/LittAppCast.xml | 10 + redist/build_osx_qt5.sh | 2 +- redist/changes.html | 3 + site/LittAppCast.xml | 8 + site/index.html | 4 +- site/index.html.bak | 2 +- site/releasenotes.html | 10 + 50 files changed, 907 insertions(+), 769 deletions(-) diff --git a/client/.qmake.stash b/client/.qmake.stash index cf4e7db..b3cdc69 100644 --- a/client/.qmake.stash +++ b/client/.qmake.stash @@ -61,3 +61,8 @@ QMAKE_CXX.COMPILER_MACROS = \ QMAKE_GCC_MAJOR_VERSION \ QMAKE_GCC_MINOR_VERSION \ QMAKE_GCC_PATCH_VERSION +QMAKE_MAC_SDK.macosx.Path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk +QMAKE_MAC_SDK.macosx.PlatformPath = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform +QMAKE_MAC_SDK.macosx.SDKVersion = 10.14 +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_C = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang +QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_C_SHLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang diff --git a/client/chooka.pro b/client/chooka.pro index d2e03bc..d143590 100644 --- a/client/chooka.pro +++ b/client/chooka.pro @@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport CONFIG += c++11 TARGET = Litt TEMPLATE = app -VERSION = 0.9.0 +VERSION = 0.9.1 VERSTR = '\\"$${VERSION}\\"' DEFINES += VER=\"$${VERSTR}\" @@ -20,7 +20,7 @@ win32 { } macx { - QMAKE_MAC_SDK = macosx10.12 + QMAKE_MAC_SDK = macosx10.14 DEFINES += TARGET_OSX # DEFINES += USE_LOGGER LIBS += ../lib/osx/libssl.a ../lib/osx/libcrypto.a diff --git a/client/moc_aboutdlg.cpp b/client/moc_aboutdlg.cpp index c4bdfe7..4e737fb 100644 --- a/client/moc_aboutdlg.cpp +++ b/client/moc_aboutdlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'aboutdlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'aboutdlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -43,7 +43,7 @@ QT_MOC_LITERAL(2, 21, 0) // "" static const uint qt_meta_data_AboutDlg[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -75,10 +75,14 @@ void AboutDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo Q_UNUSED(_a); } -const QMetaObject AboutDlg::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_AboutDlg.data, - qt_meta_data_AboutDlg, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject AboutDlg::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_AboutDlg.data, + qt_meta_data_AboutDlg, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *AboutDlg::metaObject() const diff --git a/client/moc_attachmentsdialog.cpp b/client/moc_attachmentsdialog.cpp index d71eda2..18743fa 100644 --- a/client/moc_attachmentsdialog.cpp +++ b/client/moc_attachmentsdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'attachmentsdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'attachmentsdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 17) // "AttachmentsDialog" static const uint qt_meta_data_AttachmentsDialog[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void AttachmentsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in Q_UNUSED(_a); } -const QMetaObject AttachmentsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_AttachmentsDialog.data, - qt_meta_data_AttachmentsDialog, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject AttachmentsDialog::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_AttachmentsDialog.data, + qt_meta_data_AttachmentsDialog, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *AttachmentsDialog::metaObject() const diff --git a/client/moc_attachmentslist.cpp b/client/moc_attachmentslist.cpp index d0ab5f7..82fd321 100644 --- a/client/moc_attachmentslist.cpp +++ b/client/moc_attachmentslist.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'attachmentslist.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'attachmentslist.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 20) // "AttachmentsListModel" static const uint qt_meta_data_AttachmentsListModel[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void AttachmentsListModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, Q_UNUSED(_a); } -const QMetaObject AttachmentsListModel::staticMetaObject = { - { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_AttachmentsListModel.data, - qt_meta_data_AttachmentsListModel, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject AttachmentsListModel::staticMetaObject = { { + &QAbstractListModel::staticMetaObject, + qt_meta_stringdata_AttachmentsListModel.data, + qt_meta_data_AttachmentsListModel, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *AttachmentsListModel::metaObject() const @@ -116,7 +120,7 @@ QT_MOC_LITERAL(7, 71, 10) // "renameFile" static const uint qt_meta_data_AttachmentsList[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 5, 14, // methods @@ -159,10 +163,14 @@ void AttachmentsList::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int } } -const QMetaObject AttachmentsList::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_AttachmentsList.data, - qt_meta_data_AttachmentsList, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject AttachmentsList::staticMetaObject = { { + &QWidget::staticMetaObject, + qt_meta_stringdata_AttachmentsList.data, + qt_meta_data_AttachmentsList, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *AttachmentsList::metaObject() const diff --git a/client/moc_finddialog.cpp b/client/moc_finddialog.cpp index cb5e481..afe3ed3 100644 --- a/client/moc_finddialog.cpp +++ b/client/moc_finddialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'finddialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'finddialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_FindInTasksDialog_t { - QByteArrayData data[9]; - char stringdata0[99]; + QByteArrayData data[10]; + char stringdata0[111]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -35,23 +35,25 @@ QT_MOC_LITERAL(0, 0, 17), // "FindInTasksDialog" QT_MOC_LITERAL(1, 18, 11), // "startSearch" QT_MOC_LITERAL(2, 30, 0), // "" QT_MOC_LITERAL(3, 31, 14), // "resultSelected" -QT_MOC_LITERAL(4, 46, 5), // "index" -QT_MOC_LITERAL(5, 52, 14), // "searchComplete" -QT_MOC_LITERAL(6, 67, 11), // "onNewResult" -QT_MOC_LITERAL(7, 79, 14), // "FindResultItem" -QT_MOC_LITERAL(8, 94, 4) // "item" +QT_MOC_LITERAL(4, 46, 11), // "QModelIndex" +QT_MOC_LITERAL(5, 58, 5), // "index" +QT_MOC_LITERAL(6, 64, 14), // "searchComplete" +QT_MOC_LITERAL(7, 79, 11), // "onNewResult" +QT_MOC_LITERAL(8, 91, 14), // "FindResultItem" +QT_MOC_LITERAL(9, 106, 4) // "item" }, "FindInTasksDialog\0startSearch\0\0" - "resultSelected\0index\0searchComplete\0" - "onNewResult\0FindResultItem\0item" + "resultSelected\0QModelIndex\0index\0" + "searchComplete\0onNewResult\0FindResultItem\0" + "item" }; #undef QT_MOC_LITERAL static const uint qt_meta_data_FindInTasksDialog[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 4, 14, // methods @@ -64,14 +66,14 @@ static const uint qt_meta_data_FindInTasksDialog[] = { // slots: name, argc, parameters, tag, flags 1, 0, 34, 2, 0x0a /* Public */, 3, 1, 35, 2, 0x0a /* Public */, - 5, 0, 38, 2, 0x0a /* Public */, - 6, 1, 39, 2, 0x0a /* Public */, + 6, 0, 38, 2, 0x0a /* Public */, + 7, 1, 39, 2, 0x0a /* Public */, // slots: parameters QMetaType::Void, - QMetaType::Void, QMetaType::QModelIndex, 4, + QMetaType::Void, 0x80000000 | 4, 5, QMetaType::Void, - QMetaType::Void, 0x80000000 | 7, 8, + QMetaType::Void, 0x80000000 | 8, 9, 0 // eod }; @@ -102,10 +104,14 @@ void FindInTasksDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in } } -const QMetaObject FindInTasksDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_FindInTasksDialog.data, - qt_meta_data_FindInTasksDialog, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FindInTasksDialog::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_FindInTasksDialog.data, + qt_meta_data_FindInTasksDialog, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FindInTasksDialog::metaObject() const diff --git a/client/moc_findsupport.cpp b/client/moc_findsupport.cpp index be8c332..1f17663 100644 --- a/client/moc_findsupport.cpp +++ b/client/moc_findsupport.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'findsupport.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'findsupport.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -46,7 +46,7 @@ QT_MOC_LITERAL(4, 41, 4) // "item" static const uint qt_meta_data_FindResultsModel[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -88,10 +88,14 @@ void FindResultsModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int } } -const QMetaObject FindResultsModel::staticMetaObject = { - { &QAbstractTableModel::staticMetaObject, qt_meta_stringdata_FindResultsModel.data, - qt_meta_data_FindResultsModel, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FindResultsModel::staticMetaObject = { { + &QAbstractTableModel::staticMetaObject, + qt_meta_stringdata_FindResultsModel.data, + qt_meta_data_FindResultsModel, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FindResultsModel::metaObject() const @@ -150,7 +154,7 @@ QT_MOC_LITERAL(5, 51, 14) // "searchComplete" static const uint qt_meta_data_TaskSearch[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 2, 14, // methods @@ -195,14 +199,14 @@ void TaskSearch::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (TaskSearch::*_t)(const FindResultItem & ); + using _t = void (TaskSearch::*)(const FindResultItem & ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&TaskSearch::newResultAvailable)) { *result = 0; return; } } { - typedef void (TaskSearch::*_t)(); + using _t = void (TaskSearch::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&TaskSearch::searchComplete)) { *result = 1; return; @@ -211,10 +215,14 @@ void TaskSearch::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } } -const QMetaObject TaskSearch::staticMetaObject = { - { &QThread::staticMetaObject, qt_meta_stringdata_TaskSearch.data, - qt_meta_data_TaskSearch, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject TaskSearch::staticMetaObject = { { + &QThread::staticMetaObject, + qt_meta_stringdata_TaskSearch.data, + qt_meta_data_TaskSearch, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *TaskSearch::metaObject() const diff --git a/client/moc_fvavailableupdate.cpp b/client/moc_fvavailableupdate.cpp index 2ba2c7f..7a55eb5 100644 --- a/client/moc_fvavailableupdate.cpp +++ b/client/moc_fvavailableupdate.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvavailableupdate.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvavailableupdate.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 17) // "FvAvailableUpdate" static const uint qt_meta_data_FvAvailableUpdate[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void FvAvailableUpdate::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in Q_UNUSED(_a); } -const QMetaObject FvAvailableUpdate::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_FvAvailableUpdate.data, - qt_meta_data_FvAvailableUpdate, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FvAvailableUpdate::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_FvAvailableUpdate.data, + qt_meta_data_FvAvailableUpdate, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FvAvailableUpdate::metaObject() const diff --git a/client/moc_fvignoredversions.cpp b/client/moc_fvignoredversions.cpp index e5a1451..8478a78 100644 --- a/client/moc_fvignoredversions.cpp +++ b/client/moc_fvignoredversions.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvignoredversions.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvignoredversions.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 17) // "FVIgnoredVersions" static const uint qt_meta_data_FVIgnoredVersions[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void FVIgnoredVersions::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in Q_UNUSED(_a); } -const QMetaObject FVIgnoredVersions::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_FVIgnoredVersions.data, - qt_meta_data_FVIgnoredVersions, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FVIgnoredVersions::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_FVIgnoredVersions.data, + qt_meta_data_FVIgnoredVersions, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FVIgnoredVersions::metaObject() const diff --git a/client/moc_fvplatform.cpp b/client/moc_fvplatform.cpp index bbec841..6ba653b 100644 --- a/client/moc_fvplatform.cpp +++ b/client/moc_fvplatform.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvplatform.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvplatform.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 10) // "FvPlatform" static const uint qt_meta_data_FvPlatform[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void FvPlatform::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, Q_UNUSED(_a); } -const QMetaObject FvPlatform::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_FvPlatform.data, - qt_meta_data_FvPlatform, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FvPlatform::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_FvPlatform.data, + qt_meta_data_FvPlatform, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FvPlatform::metaObject() const diff --git a/client/moc_fvupdateconfirmdialog.cpp b/client/moc_fvupdateconfirmdialog.cpp index b8076ee..e198d9f 100644 --- a/client/moc_fvupdateconfirmdialog.cpp +++ b/client/moc_fvupdateconfirmdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvupdateconfirmdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvupdateconfirmdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 21) // "FvUpdateConfirmDialog" static const uint qt_meta_data_FvUpdateConfirmDialog[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void FvUpdateConfirmDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c Q_UNUSED(_a); } -const QMetaObject FvUpdateConfirmDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_FvUpdateConfirmDialog.data, - qt_meta_data_FvUpdateConfirmDialog, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FvUpdateConfirmDialog::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_FvUpdateConfirmDialog.data, + qt_meta_data_FvUpdateConfirmDialog, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FvUpdateConfirmDialog::metaObject() const diff --git a/client/moc_fvupdater.cpp b/client/moc_fvupdater.cpp index e8f907f..3cb4736 100644 --- a/client/moc_fvupdater.cpp +++ b/client/moc_fvupdater.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvupdater.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvupdater.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -63,7 +63,7 @@ QT_MOC_LITERAL(15, 267, 24) // "httpFeedDownloadFinished" static const uint qt_meta_data_FvUpdater[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 12, 14, // methods @@ -131,10 +131,14 @@ void FvUpdater::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v } } -const QMetaObject FvUpdater::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_FvUpdater.data, - qt_meta_data_FvUpdater, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FvUpdater::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_FvUpdater.data, + qt_meta_data_FvUpdater, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FvUpdater::metaObject() const diff --git a/client/moc_fvupdatewindow.cpp b/client/moc_fvupdatewindow.cpp index 27044bf..7bdf905 100644 --- a/client/moc_fvupdatewindow.cpp +++ b/client/moc_fvupdatewindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvupdatewindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvupdatewindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -46,7 +46,7 @@ QT_MOC_LITERAL(4, 48, 5) // "reply" static const uint qt_meta_data_FvUpdateWindow[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -77,10 +77,14 @@ void FvUpdateWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ } } -const QMetaObject FvUpdateWindow::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_FvUpdateWindow.data, - qt_meta_data_FvUpdateWindow, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject FvUpdateWindow::staticMetaObject = { { + &QWidget::staticMetaObject, + qt_meta_stringdata_FvUpdateWindow.data, + qt_meta_data_FvUpdateWindow, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *FvUpdateWindow::metaObject() const diff --git a/client/moc_helper.cpp b/client/moc_helper.cpp index 3d16391..71ea110 100644 --- a/client/moc_helper.cpp +++ b/client/moc_helper.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'helper.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'helper.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -45,7 +45,7 @@ QT_MOC_LITERAL(3, 36, 3) // "obj" static const uint qt_meta_data_EscapeKeyEventFilter[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -76,7 +76,7 @@ void EscapeKeyEventFilter::qt_static_metacall(QObject *_o, QMetaObject::Call _c, } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (EscapeKeyEventFilter::*_t)(QObject * ); + using _t = void (EscapeKeyEventFilter::*)(QObject * ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&EscapeKeyEventFilter::escapePressed)) { *result = 0; return; @@ -85,10 +85,14 @@ void EscapeKeyEventFilter::qt_static_metacall(QObject *_o, QMetaObject::Call _c, } } -const QMetaObject EscapeKeyEventFilter::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_EscapeKeyEventFilter.data, - qt_meta_data_EscapeKeyEventFilter, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject EscapeKeyEventFilter::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_EscapeKeyEventFilter.data, + qt_meta_data_EscapeKeyEventFilter, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *EscapeKeyEventFilter::metaObject() const diff --git a/client/moc_hidtracker.cpp b/client/moc_hidtracker.cpp index 2bbe9dd..4e63d7e 100644 --- a/client/moc_hidtracker.cpp +++ b/client/moc_hidtracker.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'hidtracker.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'hidtracker.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -46,7 +46,7 @@ QT_MOC_LITERAL(4, 50, 10) // "checkState" static const uint qt_meta_data_HIDActivityTracker[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 3, 14, // methods @@ -87,14 +87,14 @@ void HIDActivityTracker::qt_static_metacall(QObject *_o, QMetaObject::Call _c, i } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (HIDActivityTracker::*_t)(); + using _t = void (HIDActivityTracker::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&HIDActivityTracker::idleDetected)) { *result = 0; return; } } { - typedef void (HIDActivityTracker::*_t)(); + using _t = void (HIDActivityTracker::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&HIDActivityTracker::activityDetected)) { *result = 1; return; @@ -104,10 +104,14 @@ void HIDActivityTracker::qt_static_metacall(QObject *_o, QMetaObject::Call _c, i Q_UNUSED(_a); } -const QMetaObject HIDActivityTracker::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_HIDActivityTracker.data, - qt_meta_data_HIDActivityTracker, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject HIDActivityTracker::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_HIDActivityTracker.data, + qt_meta_data_HIDActivityTracker, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *HIDActivityTracker::metaObject() const diff --git a/client/moc_logger.cpp b/client/moc_logger.cpp index a426d5f..6ad2dd9 100644 --- a/client/moc_logger.cpp +++ b/client/moc_logger.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'logger.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'logger.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 6) // "Logger" static const uint qt_meta_data_Logger[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void Logger::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void Q_UNUSED(_a); } -const QMetaObject Logger::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_Logger.data, - qt_meta_data_Logger, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject Logger::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_Logger.data, + qt_meta_data_Logger, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *Logger::metaObject() const diff --git a/client/moc_mainwindow.cpp b/client/moc_mainwindow.cpp index 2ac37d8..f4b71d6 100644 --- a/client/moc_mainwindow.cpp +++ b/client/moc_mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mainwindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mainwindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_MainWindow_t { - QByteArrayData data[82]; - char stringdata0[1077]; + QByteArrayData data[83]; + char stringdata0[1089]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -51,68 +51,69 @@ QT_MOC_LITERAL(16, 143, 10), // "deleteTask" QT_MOC_LITERAL(17, 154, 22), // "taskTreeContextualMenu" QT_MOC_LITERAL(18, 177, 5), // "point" QT_MOC_LITERAL(19, 183, 16), // "taskIndexChanged" -QT_MOC_LITERAL(20, 200, 12), // "idleDetected" -QT_MOC_LITERAL(21, 213, 16), // "activityDetected" -QT_MOC_LITERAL(22, 230, 19), // "startOrStopTracking" -QT_MOC_LITERAL(23, 250, 13), // "startTracking" -QT_MOC_LITERAL(24, 264, 19), // "startTrackingRecent" -QT_MOC_LITERAL(25, 284, 12), // "stopTracking" -QT_MOC_LITERAL(26, 297, 18), // "TrackingStopReason" -QT_MOC_LITERAL(27, 316, 6), // "reason" -QT_MOC_LITERAL(28, 323, 10), // "currentUtc" -QT_MOC_LITERAL(29, 334, 10), // "updateData" -QT_MOC_LITERAL(30, 345, 9), // "add10Mins" -QT_MOC_LITERAL(31, 355, 20), // "editSelectionChanged" -QT_MOC_LITERAL(32, 376, 19), // "editPositionChanged" -QT_MOC_LITERAL(33, 396, 17), // "editFormatChanged" -QT_MOC_LITERAL(34, 414, 15), // "QTextCharFormat" -QT_MOC_LITERAL(35, 430, 3), // "fmt" -QT_MOC_LITERAL(36, 434, 8), // "editUndo" -QT_MOC_LITERAL(37, 443, 8), // "editRedo" -QT_MOC_LITERAL(38, 452, 7), // "editCut" -QT_MOC_LITERAL(39, 460, 8), // "editCopy" -QT_MOC_LITERAL(40, 469, 9), // "editPaste" -QT_MOC_LITERAL(41, 479, 10), // "editDelete" -QT_MOC_LITERAL(42, 490, 13), // "editSelectAll" -QT_MOC_LITERAL(43, 504, 13), // "iconActivated" -QT_MOC_LITERAL(44, 518, 33), // "QSystemTrayIcon::ActivationRe..." -QT_MOC_LITERAL(45, 552, 17), // "timeFormatChanged" -QT_MOC_LITERAL(46, 570, 12), // "showTimeline" -QT_MOC_LITERAL(47, 583, 14), // "showTimeReport" -QT_MOC_LITERAL(48, 598, 25), // "newPasswordDialogFinished" -QT_MOC_LITERAL(49, 624, 6), // "status" -QT_MOC_LITERAL(50, 631, 22), // "passwordDialogFinished" -QT_MOC_LITERAL(51, 654, 21), // "criticalAlertFinished" -QT_MOC_LITERAL(52, 676, 17), // "openAlertFinished" -QT_MOC_LITERAL(53, 694, 20), // "warningAlertFinished" -QT_MOC_LITERAL(54, 715, 24), // "toolbarVisibilityChanged" -QT_MOC_LITERAL(55, 740, 7), // "visible" -QT_MOC_LITERAL(56, 748, 15), // "showHideToolbar" -QT_MOC_LITERAL(57, 764, 15), // "showAttachments" -QT_MOC_LITERAL(58, 780, 15), // "checkForUpdates" -QT_MOC_LITERAL(59, 796, 11), // "systemSleep" -QT_MOC_LITERAL(60, 808, 12), // "systemResume" -QT_MOC_LITERAL(61, 821, 23), // "changeTimeTrackableFlag" -QT_MOC_LITERAL(62, 845, 9), // "trackable" -QT_MOC_LITERAL(63, 855, 4), // "find" -QT_MOC_LITERAL(64, 860, 11), // "findInTasks" -QT_MOC_LITERAL(65, 872, 13), // "findRequested" -QT_MOC_LITERAL(66, 886, 12), // "findRejected" -QT_MOC_LITERAL(67, 899, 3), // "obj" -QT_MOC_LITERAL(68, 903, 15), // "taskTextChanged" -QT_MOC_LITERAL(69, 919, 9), // "taskMoved" -QT_MOC_LITERAL(70, 929, 5), // "PTask" -QT_MOC_LITERAL(71, 935, 4), // "task" -QT_MOC_LITERAL(72, 940, 13), // "focusTaskTree" -QT_MOC_LITERAL(73, 954, 13), // "focusTaskText" -QT_MOC_LITERAL(74, 968, 14), // "showMainWindow" -QT_MOC_LITERAL(75, 983, 14), // "continueOnIdle" -QT_MOC_LITERAL(76, 998, 11), // "breakOnIdle" -QT_MOC_LITERAL(77, 1010, 8), // "stopTime" -QT_MOC_LITERAL(78, 1019, 15), // "startOnActivity" -QT_MOC_LITERAL(79, 1035, 14), // "stopOnActivity" -QT_MOC_LITERAL(80, 1050, 19), // "trayWindowDestroyed" -QT_MOC_LITERAL(81, 1070, 6) // "object" +QT_MOC_LITERAL(20, 200, 11), // "QModelIndex" +QT_MOC_LITERAL(21, 212, 12), // "idleDetected" +QT_MOC_LITERAL(22, 225, 16), // "activityDetected" +QT_MOC_LITERAL(23, 242, 19), // "startOrStopTracking" +QT_MOC_LITERAL(24, 262, 13), // "startTracking" +QT_MOC_LITERAL(25, 276, 19), // "startTrackingRecent" +QT_MOC_LITERAL(26, 296, 12), // "stopTracking" +QT_MOC_LITERAL(27, 309, 18), // "TrackingStopReason" +QT_MOC_LITERAL(28, 328, 6), // "reason" +QT_MOC_LITERAL(29, 335, 10), // "currentUtc" +QT_MOC_LITERAL(30, 346, 10), // "updateData" +QT_MOC_LITERAL(31, 357, 9), // "add10Mins" +QT_MOC_LITERAL(32, 367, 20), // "editSelectionChanged" +QT_MOC_LITERAL(33, 388, 19), // "editPositionChanged" +QT_MOC_LITERAL(34, 408, 17), // "editFormatChanged" +QT_MOC_LITERAL(35, 426, 15), // "QTextCharFormat" +QT_MOC_LITERAL(36, 442, 3), // "fmt" +QT_MOC_LITERAL(37, 446, 8), // "editUndo" +QT_MOC_LITERAL(38, 455, 8), // "editRedo" +QT_MOC_LITERAL(39, 464, 7), // "editCut" +QT_MOC_LITERAL(40, 472, 8), // "editCopy" +QT_MOC_LITERAL(41, 481, 9), // "editPaste" +QT_MOC_LITERAL(42, 491, 10), // "editDelete" +QT_MOC_LITERAL(43, 502, 13), // "editSelectAll" +QT_MOC_LITERAL(44, 516, 13), // "iconActivated" +QT_MOC_LITERAL(45, 530, 33), // "QSystemTrayIcon::ActivationRe..." +QT_MOC_LITERAL(46, 564, 17), // "timeFormatChanged" +QT_MOC_LITERAL(47, 582, 12), // "showTimeline" +QT_MOC_LITERAL(48, 595, 14), // "showTimeReport" +QT_MOC_LITERAL(49, 610, 25), // "newPasswordDialogFinished" +QT_MOC_LITERAL(50, 636, 6), // "status" +QT_MOC_LITERAL(51, 643, 22), // "passwordDialogFinished" +QT_MOC_LITERAL(52, 666, 21), // "criticalAlertFinished" +QT_MOC_LITERAL(53, 688, 17), // "openAlertFinished" +QT_MOC_LITERAL(54, 706, 20), // "warningAlertFinished" +QT_MOC_LITERAL(55, 727, 24), // "toolbarVisibilityChanged" +QT_MOC_LITERAL(56, 752, 7), // "visible" +QT_MOC_LITERAL(57, 760, 15), // "showHideToolbar" +QT_MOC_LITERAL(58, 776, 15), // "showAttachments" +QT_MOC_LITERAL(59, 792, 15), // "checkForUpdates" +QT_MOC_LITERAL(60, 808, 11), // "systemSleep" +QT_MOC_LITERAL(61, 820, 12), // "systemResume" +QT_MOC_LITERAL(62, 833, 23), // "changeTimeTrackableFlag" +QT_MOC_LITERAL(63, 857, 9), // "trackable" +QT_MOC_LITERAL(64, 867, 4), // "find" +QT_MOC_LITERAL(65, 872, 11), // "findInTasks" +QT_MOC_LITERAL(66, 884, 13), // "findRequested" +QT_MOC_LITERAL(67, 898, 12), // "findRejected" +QT_MOC_LITERAL(68, 911, 3), // "obj" +QT_MOC_LITERAL(69, 915, 15), // "taskTextChanged" +QT_MOC_LITERAL(70, 931, 9), // "taskMoved" +QT_MOC_LITERAL(71, 941, 5), // "PTask" +QT_MOC_LITERAL(72, 947, 4), // "task" +QT_MOC_LITERAL(73, 952, 13), // "focusTaskTree" +QT_MOC_LITERAL(74, 966, 13), // "focusTaskText" +QT_MOC_LITERAL(75, 980, 14), // "showMainWindow" +QT_MOC_LITERAL(76, 995, 14), // "continueOnIdle" +QT_MOC_LITERAL(77, 1010, 11), // "breakOnIdle" +QT_MOC_LITERAL(78, 1022, 8), // "stopTime" +QT_MOC_LITERAL(79, 1031, 15), // "startOnActivity" +QT_MOC_LITERAL(80, 1047, 14), // "stopOnActivity" +QT_MOC_LITERAL(81, 1062, 19), // "trayWindowDestroyed" +QT_MOC_LITERAL(82, 1082, 6) // "object" }, "MainWindow\0onTimeFormatChanged\0\0" @@ -120,16 +121,17 @@ QT_MOC_LITERAL(81, 1070, 6) // "object" "print\0quit\0newRootTask\0newTask\0" "newSibling\0moveUp\0moveDown\0renameTask\0" "deleteTask\0taskTreeContextualMenu\0" - "point\0taskIndexChanged\0idleDetected\0" - "activityDetected\0startOrStopTracking\0" - "startTracking\0startTrackingRecent\0" - "stopTracking\0TrackingStopReason\0reason\0" - "currentUtc\0updateData\0add10Mins\0" - "editSelectionChanged\0editPositionChanged\0" - "editFormatChanged\0QTextCharFormat\0fmt\0" - "editUndo\0editRedo\0editCut\0editCopy\0" - "editPaste\0editDelete\0editSelectAll\0" - "iconActivated\0QSystemTrayIcon::ActivationReason\0" + "point\0taskIndexChanged\0QModelIndex\0" + "idleDetected\0activityDetected\0" + "startOrStopTracking\0startTracking\0" + "startTrackingRecent\0stopTracking\0" + "TrackingStopReason\0reason\0currentUtc\0" + "updateData\0add10Mins\0editSelectionChanged\0" + "editPositionChanged\0editFormatChanged\0" + "QTextCharFormat\0fmt\0editUndo\0editRedo\0" + "editCut\0editCopy\0editPaste\0editDelete\0" + "editSelectAll\0iconActivated\0" + "QSystemTrayIcon::ActivationReason\0" "timeFormatChanged\0showTimeline\0" "showTimeReport\0newPasswordDialogFinished\0" "status\0passwordDialogFinished\0" @@ -151,7 +153,7 @@ QT_MOC_LITERAL(81, 1070, 6) // "object" static const uint qt_meta_data_MainWindow[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 66, 14, // methods @@ -181,55 +183,55 @@ static const uint qt_meta_data_MainWindow[] = { 16, 0, 358, 2, 0x0a /* Public */, 17, 1, 359, 2, 0x0a /* Public */, 19, 2, 362, 2, 0x0a /* Public */, - 20, 0, 367, 2, 0x0a /* Public */, - 21, 0, 368, 2, 0x0a /* Public */, - 22, 0, 369, 2, 0x0a /* Public */, - 23, 0, 370, 2, 0x0a /* Public */, - 24, 0, 371, 2, 0x0a /* Public */, - 25, 2, 372, 2, 0x0a /* Public */, - 25, 1, 377, 2, 0x2a /* Public | MethodCloned */, - 29, 0, 380, 2, 0x0a /* Public */, - 30, 0, 381, 2, 0x0a /* Public */, - 31, 0, 382, 2, 0x0a /* Public */, - 32, 0, 383, 2, 0x0a /* Public */, - 33, 1, 384, 2, 0x0a /* Public */, - 36, 0, 387, 2, 0x0a /* Public */, - 37, 0, 388, 2, 0x0a /* Public */, - 38, 0, 389, 2, 0x0a /* Public */, - 39, 0, 390, 2, 0x0a /* Public */, - 40, 0, 391, 2, 0x0a /* Public */, - 41, 0, 392, 2, 0x0a /* Public */, - 42, 0, 393, 2, 0x0a /* Public */, - 43, 1, 394, 2, 0x0a /* Public */, - 45, 0, 397, 2, 0x0a /* Public */, - 46, 0, 398, 2, 0x0a /* Public */, - 47, 0, 399, 2, 0x0a /* Public */, - 48, 1, 400, 2, 0x0a /* Public */, - 50, 1, 403, 2, 0x0a /* Public */, - 51, 1, 406, 2, 0x0a /* Public */, - 52, 1, 409, 2, 0x0a /* Public */, - 53, 1, 412, 2, 0x0a /* Public */, - 54, 1, 415, 2, 0x0a /* Public */, - 56, 0, 418, 2, 0x0a /* Public */, - 57, 0, 419, 2, 0x0a /* Public */, - 58, 0, 420, 2, 0x0a /* Public */, - 59, 0, 421, 2, 0x0a /* Public */, - 60, 0, 422, 2, 0x0a /* Public */, - 61, 1, 423, 2, 0x0a /* Public */, - 63, 0, 426, 2, 0x0a /* Public */, - 64, 0, 427, 2, 0x0a /* Public */, - 65, 0, 428, 2, 0x0a /* Public */, - 66, 1, 429, 2, 0x0a /* Public */, - 68, 0, 432, 2, 0x0a /* Public */, - 69, 1, 433, 2, 0x0a /* Public */, - 72, 0, 436, 2, 0x0a /* Public */, - 73, 0, 437, 2, 0x0a /* Public */, - 74, 0, 438, 2, 0x0a /* Public */, - 75, 0, 439, 2, 0x0a /* Public */, - 76, 1, 440, 2, 0x0a /* Public */, - 78, 0, 443, 2, 0x0a /* Public */, - 79, 0, 444, 2, 0x0a /* Public */, - 80, 1, 445, 2, 0x0a /* Public */, + 21, 0, 367, 2, 0x0a /* Public */, + 22, 0, 368, 2, 0x0a /* Public */, + 23, 0, 369, 2, 0x0a /* Public */, + 24, 0, 370, 2, 0x0a /* Public */, + 25, 0, 371, 2, 0x0a /* Public */, + 26, 2, 372, 2, 0x0a /* Public */, + 26, 1, 377, 2, 0x2a /* Public | MethodCloned */, + 30, 0, 380, 2, 0x0a /* Public */, + 31, 0, 381, 2, 0x0a /* Public */, + 32, 0, 382, 2, 0x0a /* Public */, + 33, 0, 383, 2, 0x0a /* Public */, + 34, 1, 384, 2, 0x0a /* Public */, + 37, 0, 387, 2, 0x0a /* Public */, + 38, 0, 388, 2, 0x0a /* Public */, + 39, 0, 389, 2, 0x0a /* Public */, + 40, 0, 390, 2, 0x0a /* Public */, + 41, 0, 391, 2, 0x0a /* Public */, + 42, 0, 392, 2, 0x0a /* Public */, + 43, 0, 393, 2, 0x0a /* Public */, + 44, 1, 394, 2, 0x0a /* Public */, + 46, 0, 397, 2, 0x0a /* Public */, + 47, 0, 398, 2, 0x0a /* Public */, + 48, 0, 399, 2, 0x0a /* Public */, + 49, 1, 400, 2, 0x0a /* Public */, + 51, 1, 403, 2, 0x0a /* Public */, + 52, 1, 406, 2, 0x0a /* Public */, + 53, 1, 409, 2, 0x0a /* Public */, + 54, 1, 412, 2, 0x0a /* Public */, + 55, 1, 415, 2, 0x0a /* Public */, + 57, 0, 418, 2, 0x0a /* Public */, + 58, 0, 419, 2, 0x0a /* Public */, + 59, 0, 420, 2, 0x0a /* Public */, + 60, 0, 421, 2, 0x0a /* Public */, + 61, 0, 422, 2, 0x0a /* Public */, + 62, 1, 423, 2, 0x0a /* Public */, + 64, 0, 426, 2, 0x0a /* Public */, + 65, 0, 427, 2, 0x0a /* Public */, + 66, 0, 428, 2, 0x0a /* Public */, + 67, 1, 429, 2, 0x0a /* Public */, + 69, 0, 432, 2, 0x0a /* Public */, + 70, 1, 433, 2, 0x0a /* Public */, + 73, 0, 436, 2, 0x0a /* Public */, + 74, 0, 437, 2, 0x0a /* Public */, + 75, 0, 438, 2, 0x0a /* Public */, + 76, 0, 439, 2, 0x0a /* Public */, + 77, 1, 440, 2, 0x0a /* Public */, + 79, 0, 443, 2, 0x0a /* Public */, + 80, 0, 444, 2, 0x0a /* Public */, + 81, 1, 445, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, @@ -250,19 +252,19 @@ static const uint qt_meta_data_MainWindow[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::QPoint, 18, - QMetaType::Void, QMetaType::QModelIndex, QMetaType::QModelIndex, 2, 2, + QMetaType::Void, 0x80000000 | 20, 0x80000000 | 20, 2, 2, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, 0x80000000 | 26, QMetaType::QDateTime, 27, 28, - QMetaType::Void, 0x80000000 | 26, 27, + QMetaType::Void, 0x80000000 | 27, QMetaType::QDateTime, 28, 29, + QMetaType::Void, 0x80000000 | 27, 28, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, 0x80000000 | 34, 35, + QMetaType::Void, 0x80000000 | 35, 36, QMetaType::Void, QMetaType::Void, QMetaType::Void, @@ -270,36 +272,36 @@ static const uint qt_meta_data_MainWindow[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, 0x80000000 | 44, 27, + QMetaType::Void, 0x80000000 | 45, 28, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Int, 49, - QMetaType::Void, QMetaType::Int, 49, - QMetaType::Void, QMetaType::Int, 49, - QMetaType::Void, QMetaType::Int, 49, - QMetaType::Void, QMetaType::Int, 49, - QMetaType::Void, QMetaType::Bool, 55, + QMetaType::Void, QMetaType::Int, 50, + QMetaType::Void, QMetaType::Int, 50, + QMetaType::Void, QMetaType::Int, 50, + QMetaType::Void, QMetaType::Int, 50, + QMetaType::Void, QMetaType::Int, 50, + QMetaType::Void, QMetaType::Bool, 56, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Bool, 62, + QMetaType::Void, QMetaType::Bool, 63, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QObjectStar, 67, + QMetaType::Void, QMetaType::QObjectStar, 68, QMetaType::Void, - QMetaType::Void, 0x80000000 | 70, 71, + QMetaType::Void, 0x80000000 | 71, 72, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QDateTime, 77, + QMetaType::Void, QMetaType::QDateTime, 78, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QObjectStar, 81, + QMetaType::Void, QMetaType::QObjectStar, 82, 0 // eod }; @@ -381,14 +383,14 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (MainWindow::*_t)(); + using _t = void (MainWindow::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onTimeFormatChanged)) { *result = 0; return; } } { - typedef void (MainWindow::*_t)(); + using _t = void (MainWindow::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onTimeChanged)) { *result = 1; return; @@ -397,10 +399,14 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } } -const QMetaObject MainWindow::staticMetaObject = { - { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow.data, - qt_meta_data_MainWindow, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject MainWindow::staticMetaObject = { { + &QMainWindow::staticMetaObject, + qt_meta_stringdata_MainWindow.data, + qt_meta_data_MainWindow, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *MainWindow::metaObject() const diff --git a/client/moc_newpassworddlg.cpp b/client/moc_newpassworddlg.cpp index 4199d28..d954ce5 100644 --- a/client/moc_newpassworddlg.cpp +++ b/client/moc_newpassworddlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'newpassworddlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'newpassworddlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -43,7 +43,7 @@ QT_MOC_LITERAL(2, 25, 0) // "" static const uint qt_meta_data_NewPasswordDlg[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -75,10 +75,14 @@ void NewPasswordDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ Q_UNUSED(_a); } -const QMetaObject NewPasswordDlg::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_NewPasswordDlg.data, - qt_meta_data_NewPasswordDlg, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject NewPasswordDlg::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_NewPasswordDlg.data, + qt_meta_data_NewPasswordDlg, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *NewPasswordDlg::metaObject() const diff --git a/client/moc_passworddlg.cpp b/client/moc_passworddlg.cpp index 1287a28..f627fc9 100644 --- a/client/moc_passworddlg.cpp +++ b/client/moc_passworddlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'passworddlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'passworddlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 11) // "PasswordDlg" static const uint qt_meta_data_PasswordDlg[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void PasswordDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, Q_UNUSED(_a); } -const QMetaObject PasswordDlg::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_PasswordDlg.data, - qt_meta_data_PasswordDlg, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject PasswordDlg::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_PasswordDlg.data, + qt_meta_data_PasswordDlg, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *PasswordDlg::metaObject() const diff --git a/client/moc_preferencesdlg.cpp b/client/moc_preferencesdlg.cpp index 7d1b4f0..e66b203 100644 --- a/client/moc_preferencesdlg.cpp +++ b/client/moc_preferencesdlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'preferencesdlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'preferencesdlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -52,7 +52,7 @@ QT_MOC_LITERAL(8, 111, 27) // "allowStartAfterIdleControls" static const uint qt_meta_data_PreferencesDlg[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 6, 14, // methods @@ -98,10 +98,14 @@ void PreferencesDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ } } -const QMetaObject PreferencesDlg::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_PreferencesDlg.data, - qt_meta_data_PreferencesDlg, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject PreferencesDlg::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_PreferencesDlg.data, + qt_meta_data_PreferencesDlg, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *PreferencesDlg::metaObject() const diff --git a/client/moc_sleeptracker_osx.cpp b/client/moc_sleeptracker_osx.cpp index 837f16a..0e07483 100644 --- a/client/moc_sleeptracker_osx.cpp +++ b/client/moc_sleeptracker_osx.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'sleeptracker_osx.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'sleeptracker_osx.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -44,7 +44,7 @@ QT_MOC_LITERAL(3, 28, 14) // "onSystemResume" static const uint qt_meta_data_SleepTracker[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 2, 14, // methods @@ -78,14 +78,14 @@ void SleepTracker::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (SleepTracker::*_t)(); + using _t = void (SleepTracker::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SleepTracker::onSystemSleep)) { *result = 0; return; } } { - typedef void (SleepTracker::*_t)(); + using _t = void (SleepTracker::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SleepTracker::onSystemResume)) { *result = 1; return; @@ -95,10 +95,14 @@ void SleepTracker::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id Q_UNUSED(_a); } -const QMetaObject SleepTracker::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_SleepTracker.data, - qt_meta_data_SleepTracker, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject SleepTracker::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_SleepTracker.data, + qt_meta_data_SleepTracker, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *SleepTracker::metaObject() const diff --git a/client/moc_startworkdialog.cpp b/client/moc_startworkdialog.cpp index 7e9a807..561b7e9 100644 --- a/client/moc_startworkdialog.cpp +++ b/client/moc_startworkdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'startworkdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'startworkdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -49,7 +49,7 @@ QT_MOC_LITERAL(6, 89, 22) // "onFinishTimerTriggered" static const uint qt_meta_data_StartWorkDialog[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 5, 14, // methods @@ -96,14 +96,14 @@ void StartWorkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (StartWorkDialog::*_t)(); + using _t = void (StartWorkDialog::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&StartWorkDialog::continueTracking)) { *result = 0; return; } } { - typedef void (StartWorkDialog::*_t)(); + using _t = void (StartWorkDialog::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&StartWorkDialog::breakTracking)) { *result = 1; return; @@ -113,10 +113,14 @@ void StartWorkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int Q_UNUSED(_a); } -const QMetaObject StartWorkDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_StartWorkDialog.data, - qt_meta_data_StartWorkDialog, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject StartWorkDialog::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_StartWorkDialog.data, + qt_meta_data_StartWorkDialog, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *StartWorkDialog::metaObject() const diff --git a/client/moc_stopworkdialog.cpp b/client/moc_stopworkdialog.cpp index ff314a8..6995422 100644 --- a/client/moc_stopworkdialog.cpp +++ b/client/moc_stopworkdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'stopworkdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'stopworkdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -50,7 +50,7 @@ QT_MOC_LITERAL(7, 97, 22) // "onFinishTimerTriggered" static const uint qt_meta_data_StopWorkDialog[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 5, 14, // methods @@ -97,14 +97,14 @@ void StopWorkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (StopWorkDialog::*_t)(); + using _t = void (StopWorkDialog::*)(); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&StopWorkDialog::continueTracking)) { *result = 0; return; } } { - typedef void (StopWorkDialog::*_t)(const QDateTime & ); + using _t = void (StopWorkDialog::*)(const QDateTime & ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&StopWorkDialog::breakTracking)) { *result = 1; return; @@ -113,10 +113,14 @@ void StopWorkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ } } -const QMetaObject StopWorkDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_StopWorkDialog.data, - qt_meta_data_StopWorkDialog, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject StopWorkDialog::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_StopWorkDialog.data, + qt_meta_data_StopWorkDialog, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *StopWorkDialog::metaObject() const diff --git a/client/moc_task.cpp b/client/moc_task.cpp index 13eccaa..3956a5d 100644 --- a/client/moc_task.cpp +++ b/client/moc_task.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'task.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'task.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -41,7 +41,7 @@ QT_MOC_LITERAL(0, 0, 4) // "Task" static const uint qt_meta_data_Task[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -62,10 +62,14 @@ void Task::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void * Q_UNUSED(_a); } -const QMetaObject Task::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_Task.data, - qt_meta_data_Task, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject Task::staticMetaObject = { { + &QObject::staticMetaObject, + qt_meta_stringdata_Task.data, + qt_meta_data_Task, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *Task::metaObject() const diff --git a/client/moc_tasktreemodel.cpp b/client/moc_tasktreemodel.cpp index 950d231..f2d4737 100644 --- a/client/moc_tasktreemodel.cpp +++ b/client/moc_tasktreemodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'tasktreemodel.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'tasktreemodel.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -45,7 +45,7 @@ QT_MOC_LITERAL(4, 33, 1) // "t" static const uint qt_meta_data_TaskTreeModel[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -76,7 +76,7 @@ void TaskTreeModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - typedef void (TaskTreeModel::*_t)(PTask ); + using _t = void (TaskTreeModel::*)(PTask ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&TaskTreeModel::onTaskMoved)) { *result = 0; return; @@ -85,10 +85,14 @@ void TaskTreeModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i } } -const QMetaObject TaskTreeModel::staticMetaObject = { - { &QAbstractItemModel::staticMetaObject, qt_meta_stringdata_TaskTreeModel.data, - qt_meta_data_TaskTreeModel, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject TaskTreeModel::staticMetaObject = { { + &QAbstractItemModel::staticMetaObject, + qt_meta_stringdata_TaskTreeModel.data, + qt_meta_data_TaskTreeModel, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *TaskTreeModel::metaObject() const @@ -148,7 +152,7 @@ QT_MOC_LITERAL(0, 0, 16) // "TaskItemDelegate" static const uint qt_meta_data_TaskItemDelegate[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -169,10 +173,14 @@ void TaskItemDelegate::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int Q_UNUSED(_a); } -const QMetaObject TaskItemDelegate::staticMetaObject = { - { &QItemDelegate::staticMetaObject, qt_meta_stringdata_TaskItemDelegate.data, - qt_meta_data_TaskItemDelegate, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject TaskItemDelegate::staticMetaObject = { { + &QItemDelegate::staticMetaObject, + qt_meta_stringdata_TaskItemDelegate.data, + qt_meta_data_TaskItemDelegate, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *TaskItemDelegate::metaObject() const diff --git a/client/moc_timeintervaldlg.cpp b/client/moc_timeintervaldlg.cpp index 964033a..c1a2fbf 100644 --- a/client/moc_timeintervaldlg.cpp +++ b/client/moc_timeintervaldlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'timeintervaldlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'timeintervaldlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -44,7 +44,7 @@ QT_MOC_LITERAL(3, 29, 7) // "changed" static const uint qt_meta_data_TimeIntervalDlg[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -75,10 +75,14 @@ void TimeIntervalDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int } } -const QMetaObject TimeIntervalDlg::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_TimeIntervalDlg.data, - qt_meta_data_TimeIntervalDlg, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject TimeIntervalDlg::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_TimeIntervalDlg.data, + qt_meta_data_TimeIntervalDlg, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *TimeIntervalDlg::metaObject() const diff --git a/client/moc_timereportwizard.cpp b/client/moc_timereportwizard.cpp index 60e9fa8..2eb9740 100644 --- a/client/moc_timereportwizard.cpp +++ b/client/moc_timereportwizard.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'timereportwizard.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'timereportwizard.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -43,7 +43,7 @@ QT_MOC_LITERAL(2, 22, 0) // "" static const uint qt_meta_data_TaskTreePage[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -75,10 +75,14 @@ void TaskTreePage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id Q_UNUSED(_a); } -const QMetaObject TaskTreePage::staticMetaObject = { - { &QWizardPage::staticMetaObject, qt_meta_stringdata_TaskTreePage.data, - qt_meta_data_TaskTreePage, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject TaskTreePage::staticMetaObject = { { + &QWizardPage::staticMetaObject, + qt_meta_stringdata_TaskTreePage.data, + qt_meta_data_TaskTreePage, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *TaskTreePage::metaObject() const @@ -134,7 +138,7 @@ QT_MOC_LITERAL(3, 32, 5) // "value" static const uint qt_meta_data_CumulativeOptionPage[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 1, 14, // methods @@ -165,10 +169,14 @@ void CumulativeOptionPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, } } -const QMetaObject CumulativeOptionPage::staticMetaObject = { - { &QWizardPage::staticMetaObject, qt_meta_stringdata_CumulativeOptionPage.data, - qt_meta_data_CumulativeOptionPage, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject CumulativeOptionPage::staticMetaObject = { { + &QWizardPage::staticMetaObject, + qt_meta_stringdata_CumulativeOptionPage.data, + qt_meta_data_CumulativeOptionPage, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *CumulativeOptionPage::metaObject() const @@ -221,7 +229,7 @@ QT_MOC_LITERAL(0, 0, 16) // "DateIntervalPage" static const uint qt_meta_data_DateIntervalPage[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -242,10 +250,14 @@ void DateIntervalPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int Q_UNUSED(_a); } -const QMetaObject DateIntervalPage::staticMetaObject = { - { &QWizardPage::staticMetaObject, qt_meta_stringdata_DateIntervalPage.data, - qt_meta_data_DateIntervalPage, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject DateIntervalPage::staticMetaObject = { { + &QWizardPage::staticMetaObject, + qt_meta_stringdata_DateIntervalPage.data, + qt_meta_data_DateIntervalPage, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *DateIntervalPage::metaObject() const @@ -287,7 +299,7 @@ QT_MOC_LITERAL(0, 0, 14) // "ReportViewPage" static const uint qt_meta_data_ReportViewPage[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 0, 0, // methods @@ -308,10 +320,14 @@ void ReportViewPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ Q_UNUSED(_a); } -const QMetaObject ReportViewPage::staticMetaObject = { - { &QWizardPage::staticMetaObject, qt_meta_stringdata_ReportViewPage.data, - qt_meta_data_ReportViewPage, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject ReportViewPage::staticMetaObject = { { + &QWizardPage::staticMetaObject, + qt_meta_stringdata_ReportViewPage.data, + qt_meta_data_ReportViewPage, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *ReportViewPage::metaObject() const @@ -358,7 +374,7 @@ QT_MOC_LITERAL(4, 51, 6) // "pageId" static const uint qt_meta_data_TimeReportWizard[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 2, 14, // methods @@ -392,10 +408,14 @@ void TimeReportWizard::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int } } -const QMetaObject TimeReportWizard::staticMetaObject = { - { &QWizard::staticMetaObject, qt_meta_stringdata_TimeReportWizard.data, - qt_meta_data_TimeReportWizard, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject TimeReportWizard::staticMetaObject = { { + &QWizard::staticMetaObject, + qt_meta_stringdata_TimeReportWizard.data, + qt_meta_data_TimeReportWizard, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *TimeReportWizard::metaObject() const diff --git a/client/moc_timetreedlg.cpp b/client/moc_timetreedlg.cpp index 5580c66..0bef677 100644 --- a/client/moc_timetreedlg.cpp +++ b/client/moc_timetreedlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'timetreedlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.9.5) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'timetreedlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.9.5. It" +#error "This file was generated using the moc from 5.12.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -47,7 +47,7 @@ QT_MOC_LITERAL(5, 55, 21) // "onNewIntervalAccepted" static const uint qt_meta_data_TimeTreeDlg[] = { // content: - 7, // revision + 8, // revision 0, // classname 0, 0, // classinfo 4, 14, // methods @@ -88,10 +88,14 @@ void TimeTreeDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, Q_UNUSED(_a); } -const QMetaObject TimeTreeDlg::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_TimeTreeDlg.data, - qt_meta_data_TimeTreeDlg, qt_static_metacall, nullptr, nullptr} -}; +QT_INIT_METAOBJECT const QMetaObject TimeTreeDlg::staticMetaObject = { { + &QDialog::staticMetaObject, + qt_meta_stringdata_TimeTreeDlg.data, + qt_meta_data_TimeTreeDlg, + qt_static_metacall, + nullptr, + nullptr +} }; const QMetaObject *TimeTreeDlg::metaObject() const diff --git a/client/qrc_mainwindow.cpp b/client/qrc_mainwindow.cpp index d3aa350..fa07a63 100644 --- a/client/qrc_mainwindow.cpp +++ b/client/qrc_mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Resource object code ** -** Created by: The Resource Compiler for Qt version 5.9.5 +** Created by: The Resource Compiler for Qt version 5.12.0 ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ diff --git a/client/ui_aboutdlg.h b/client/ui_aboutdlg.h index c545412..f40f917 100644 --- a/client/ui_aboutdlg.h +++ b/client/ui_aboutdlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'aboutdlg.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,12 +10,9 @@ #define UI_ABOUTDLG_H #include -#include #include -#include #include #include -#include #include #include @@ -32,25 +29,25 @@ public: void setupUi(QDialog *AboutDlg) { if (AboutDlg->objectName().isEmpty()) - AboutDlg->setObjectName(QStringLiteral("AboutDlg")); + AboutDlg->setObjectName(QString::fromUtf8("AboutDlg")); AboutDlg->resize(323, 170); verticalLayout = new QVBoxLayout(AboutDlg); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); mTextLabel = new QLabel(AboutDlg); - mTextLabel->setObjectName(QStringLiteral("mTextLabel")); + mTextLabel->setObjectName(QString::fromUtf8("mTextLabel")); mTextLabel->setAlignment(Qt::AlignCenter); verticalLayout->addWidget(mTextLabel); mLicenseLabel = new QLabel(AboutDlg); - mLicenseLabel->setObjectName(QStringLiteral("mLicenseLabel")); + mLicenseLabel->setObjectName(QString::fromUtf8("mLicenseLabel")); mLicenseLabel->setMaximumSize(QSize(16777215, 40)); mLicenseLabel->setAlignment(Qt::AlignCenter); verticalLayout->addWidget(mLicenseLabel); mButtonBox = new QDialogButtonBox(AboutDlg); - mButtonBox->setObjectName(QStringLiteral("mButtonBox")); + mButtonBox->setObjectName(QString::fromUtf8("mButtonBox")); mButtonBox->setOrientation(Qt::Horizontal); mButtonBox->setStandardButtons(QDialogButtonBox::Ok); mButtonBox->setCenterButtons(true); @@ -67,11 +64,11 @@ public: void retranslateUi(QDialog *AboutDlg) { - AboutDlg->setWindowTitle(QApplication::translate("AboutDlg", "Dialog", Q_NULLPTR)); + AboutDlg->setWindowTitle(QApplication::translate("AboutDlg", "Dialog", nullptr)); mTextLabel->setText(QApplication::translate("AboutDlg", "werwre\n" "werwer\n" -"", Q_NULLPTR)); - mLicenseLabel->setText(QApplication::translate("AboutDlg", "TextLabel", Q_NULLPTR)); +"", nullptr)); + mLicenseLabel->setText(QApplication::translate("AboutDlg", "TextLabel", nullptr)); } // retranslateUi }; diff --git a/client/ui_attachmentsdialog.h b/client/ui_attachmentsdialog.h index 8a1f81b..581e66c 100644 --- a/client/ui_attachmentsdialog.h +++ b/client/ui_attachmentsdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'attachmentsdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,12 +10,9 @@ #define UI_ATTACHMENTSDIALOG_H #include -#include #include -#include #include #include -#include #include #include #include "attachmentslist.h" @@ -33,18 +30,18 @@ public: void setupUi(QDialog *AttachmentsDialog) { if (AttachmentsDialog->objectName().isEmpty()) - AttachmentsDialog->setObjectName(QStringLiteral("AttachmentsDialog")); + AttachmentsDialog->setObjectName(QString::fromUtf8("AttachmentsDialog")); AttachmentsDialog->resize(600, 300); AttachmentsDialog->setSizeGripEnabled(true); verticalLayout = new QVBoxLayout(AttachmentsDialog); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); widget = new AttachmentsList(AttachmentsDialog); - widget->setObjectName(QStringLiteral("widget")); + widget->setObjectName(QString::fromUtf8("widget")); verticalLayout->addWidget(widget); label = new QLabel(AttachmentsDialog); - label->setObjectName(QStringLiteral("label")); + label->setObjectName(QString::fromUtf8("label")); label->setMaximumSize(QSize(16777215, 30)); label->setAlignment(Qt::AlignCenter); label->setWordWrap(true); @@ -52,7 +49,7 @@ public: verticalLayout->addWidget(label); buttonBox = new QDialogButtonBox(AttachmentsDialog); - buttonBox->setObjectName(QStringLiteral("buttonBox")); + buttonBox->setObjectName(QString::fromUtf8("buttonBox")); buttonBox->setOrientation(Qt::Horizontal); buttonBox->setStandardButtons(QDialogButtonBox::Ok); buttonBox->setCenterButtons(true); @@ -69,8 +66,8 @@ public: void retranslateUi(QDialog *AttachmentsDialog) { - AttachmentsDialog->setWindowTitle(QApplication::translate("AttachmentsDialog", "Dialog", Q_NULLPTR)); - label->setText(QApplication::translate("AttachmentsDialog", "There is list of attachments in document. Use context menu or drag-and-drop to manage it.", Q_NULLPTR)); + AttachmentsDialog->setWindowTitle(QApplication::translate("AttachmentsDialog", "Dialog", nullptr)); + label->setText(QApplication::translate("AttachmentsDialog", "There is list of attachments in document. Use context menu or drag-and-drop to manage it.", nullptr)); } // retranslateUi }; diff --git a/client/ui_attachmentslist.h b/client/ui_attachmentslist.h index 9d94884..fa98c07 100644 --- a/client/ui_attachmentslist.h +++ b/client/ui_attachmentslist.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'attachmentslist.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -12,9 +12,7 @@ #include #include #include -#include #include -#include #include #include @@ -33,21 +31,21 @@ public: void setupUi(QWidget *AttachmentsList) { if (AttachmentsList->objectName().isEmpty()) - AttachmentsList->setObjectName(QStringLiteral("AttachmentsList")); + AttachmentsList->setObjectName(QString::fromUtf8("AttachmentsList")); AttachmentsList->resize(425, 300); mRenameAction = new QAction(AttachmentsList); - mRenameAction->setObjectName(QStringLiteral("mRenameAction")); + mRenameAction->setObjectName(QString::fromUtf8("mRenameAction")); mDeleteAction = new QAction(AttachmentsList); - mDeleteAction->setObjectName(QStringLiteral("mDeleteAction")); + mDeleteAction->setObjectName(QString::fromUtf8("mDeleteAction")); mExportAction = new QAction(AttachmentsList); - mExportAction->setObjectName(QStringLiteral("mExportAction")); + mExportAction->setObjectName(QString::fromUtf8("mExportAction")); mImportAction = new QAction(AttachmentsList); - mImportAction->setObjectName(QStringLiteral("mImportAction")); + mImportAction->setObjectName(QString::fromUtf8("mImportAction")); horizontalLayout = new QHBoxLayout(AttachmentsList); - horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); + horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); horizontalLayout->setContentsMargins(4, 4, 4, 4); mListView = new QListView(AttachmentsList); - mListView->setObjectName(QStringLiteral("mListView")); + mListView->setObjectName(QString::fromUtf8("mListView")); mListView->setContextMenuPolicy(Qt::CustomContextMenu); mListView->setViewMode(QListView::IconMode); @@ -66,19 +64,19 @@ public: void retranslateUi(QWidget *AttachmentsList) { - AttachmentsList->setWindowTitle(QApplication::translate("AttachmentsList", "Form", Q_NULLPTR)); - mRenameAction->setText(QApplication::translate("AttachmentsList", "Rename", Q_NULLPTR)); + AttachmentsList->setWindowTitle(QApplication::translate("AttachmentsList", "Form", nullptr)); + mRenameAction->setText(QApplication::translate("AttachmentsList", "Rename", nullptr)); #ifndef QT_NO_TOOLTIP - mRenameAction->setToolTip(QApplication::translate("AttachmentsList", "Rename", Q_NULLPTR)); + mRenameAction->setToolTip(QApplication::translate("AttachmentsList", "Rename", nullptr)); #endif // QT_NO_TOOLTIP - mDeleteAction->setText(QApplication::translate("AttachmentsList", "Delete", Q_NULLPTR)); - mExportAction->setText(QApplication::translate("AttachmentsList", "Export...", Q_NULLPTR)); + mDeleteAction->setText(QApplication::translate("AttachmentsList", "Delete", nullptr)); + mExportAction->setText(QApplication::translate("AttachmentsList", "Export...", nullptr)); #ifndef QT_NO_TOOLTIP - mExportAction->setToolTip(QApplication::translate("AttachmentsList", "Export", Q_NULLPTR)); + mExportAction->setToolTip(QApplication::translate("AttachmentsList", "Export", nullptr)); #endif // QT_NO_TOOLTIP - mImportAction->setText(QApplication::translate("AttachmentsList", "Import new...", Q_NULLPTR)); + mImportAction->setText(QApplication::translate("AttachmentsList", "Import new...", nullptr)); #ifndef QT_NO_TOOLTIP - mImportAction->setToolTip(QApplication::translate("AttachmentsList", "Import", Q_NULLPTR)); + mImportAction->setToolTip(QApplication::translate("AttachmentsList", "Import", nullptr)); #endif // QT_NO_TOOLTIP } // retranslateUi diff --git a/client/ui_finddialog.h b/client/ui_finddialog.h index 3155bcf..aa865f5 100644 --- a/client/ui_finddialog.h +++ b/client/ui_finddialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'finddialog.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,9 +10,7 @@ #define UI_FINDDIALOG_H #include -#include #include -#include #include #include #include @@ -37,24 +35,24 @@ public: void setupUi(QDialog *FindDialog) { if (FindDialog->objectName().isEmpty()) - FindDialog->setObjectName(QStringLiteral("FindDialog")); + FindDialog->setObjectName(QString::fromUtf8("FindDialog")); FindDialog->resize(611, 392); verticalLayout = new QVBoxLayout(FindDialog); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); horizontalLayout = new QHBoxLayout(); - horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); + horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); label = new QLabel(FindDialog); - label->setObjectName(QStringLiteral("label")); + label->setObjectName(QString::fromUtf8("label")); horizontalLayout->addWidget(label); mQueryText = new QLineEdit(FindDialog); - mQueryText->setObjectName(QStringLiteral("mQueryText")); + mQueryText->setObjectName(QString::fromUtf8("mQueryText")); horizontalLayout->addWidget(mQueryText); mSearchButton = new QPushButton(FindDialog); - mSearchButton->setObjectName(QStringLiteral("mSearchButton")); + mSearchButton->setObjectName(QString::fromUtf8("mSearchButton")); mSearchButton->setAutoDefault(false); horizontalLayout->addWidget(mSearchButton); @@ -63,7 +61,7 @@ public: verticalLayout->addLayout(horizontalLayout); mResultList = new QTableView(FindDialog); - mResultList->setObjectName(QStringLiteral("mResultList")); + mResultList->setObjectName(QString::fromUtf8("mResultList")); mResultList->setSelectionBehavior(QAbstractItemView::SelectRows); mResultList->setShowGrid(false); mResultList->horizontalHeader()->setDefaultSectionSize(293); @@ -82,9 +80,9 @@ public: void retranslateUi(QDialog *FindDialog) { - FindDialog->setWindowTitle(QApplication::translate("FindDialog", "Dialog", Q_NULLPTR)); - label->setText(QApplication::translate("FindDialog", "Text to search:", Q_NULLPTR)); - mSearchButton->setText(QApplication::translate("FindDialog", "Search", Q_NULLPTR)); + FindDialog->setWindowTitle(QApplication::translate("FindDialog", "Dialog", nullptr)); + label->setText(QApplication::translate("FindDialog", "Text to search:", nullptr)); + mSearchButton->setText(QApplication::translate("FindDialog", "Search", nullptr)); } // retranslateUi }; diff --git a/client/ui_fvupdateconfirmdialog.h b/client/ui_fvupdateconfirmdialog.h index 4fe7724..4c67777 100644 --- a/client/ui_fvupdateconfirmdialog.h +++ b/client/ui_fvupdateconfirmdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'fvupdateconfirmdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,12 +10,9 @@ #define UI_FVUPDATECONFIRMDIALOG_H #include -#include #include -#include #include #include -#include #include #include @@ -34,34 +31,34 @@ public: void setupUi(QDialog *FvUpdateConfirmDialog) { if (FvUpdateConfirmDialog->objectName().isEmpty()) - FvUpdateConfirmDialog->setObjectName(QStringLiteral("FvUpdateConfirmDialog")); + FvUpdateConfirmDialog->setObjectName(QString::fromUtf8("FvUpdateConfirmDialog")); FvUpdateConfirmDialog->resize(480, 160); verticalLayout = new QVBoxLayout(FvUpdateConfirmDialog); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); updateFileIsLocatedLabel = new QLabel(FvUpdateConfirmDialog); - updateFileIsLocatedLabel->setObjectName(QStringLiteral("updateFileIsLocatedLabel")); + updateFileIsLocatedLabel->setObjectName(QString::fromUtf8("updateFileIsLocatedLabel")); verticalLayout->addWidget(updateFileIsLocatedLabel); updateFileLinkLabel = new QLabel(FvUpdateConfirmDialog); - updateFileLinkLabel->setObjectName(QStringLiteral("updateFileLinkLabel")); + updateFileLinkLabel->setObjectName(QString::fromUtf8("updateFileLinkLabel")); updateFileLinkLabel->setOpenExternalLinks(true); updateFileLinkLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); verticalLayout->addWidget(updateFileLinkLabel); downloadThisUpdateLabel = new QLabel(FvUpdateConfirmDialog); - downloadThisUpdateLabel->setObjectName(QStringLiteral("downloadThisUpdateLabel")); + downloadThisUpdateLabel->setObjectName(QString::fromUtf8("downloadThisUpdateLabel")); verticalLayout->addWidget(downloadThisUpdateLabel); whenYouClickOkLabel = new QLabel(FvUpdateConfirmDialog); - whenYouClickOkLabel->setObjectName(QStringLiteral("whenYouClickOkLabel")); + whenYouClickOkLabel->setObjectName(QString::fromUtf8("whenYouClickOkLabel")); verticalLayout->addWidget(whenYouClickOkLabel); confirmButtonBox = new QDialogButtonBox(FvUpdateConfirmDialog); - confirmButtonBox->setObjectName(QStringLiteral("confirmButtonBox")); + confirmButtonBox->setObjectName(QString::fromUtf8("confirmButtonBox")); confirmButtonBox->setOrientation(Qt::Horizontal); confirmButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); @@ -75,11 +72,11 @@ public: void retranslateUi(QDialog *FvUpdateConfirmDialog) { - FvUpdateConfirmDialog->setWindowTitle(QApplication::translate("FvUpdateConfirmDialog", "Software Update", Q_NULLPTR)); - updateFileIsLocatedLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "The update file is located at:", Q_NULLPTR)); - updateFileLinkLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "%1", Q_NULLPTR)); - downloadThisUpdateLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "Download this update, close \"%1\", install it, and then reopen \"%1\".", Q_NULLPTR)); - whenYouClickOkLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "When you click \"OK\", this link will be opened in your browser.", Q_NULLPTR)); + FvUpdateConfirmDialog->setWindowTitle(QApplication::translate("FvUpdateConfirmDialog", "Software Update", nullptr)); + updateFileIsLocatedLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "The update file is located at:", nullptr)); + updateFileLinkLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "%1", nullptr)); + downloadThisUpdateLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "Download this update, close \"%1\", install it, and then reopen \"%1\".", nullptr)); + whenYouClickOkLabel->setText(QApplication::translate("FvUpdateConfirmDialog", "When you click \"OK\", this link will be opened in your browser.", nullptr)); } // retranslateUi }; diff --git a/client/ui_fvupdatewindow.h b/client/ui_fvupdatewindow.h index 4e1a3ed..86ee5b2 100644 --- a/client/ui_fvupdatewindow.h +++ b/client/ui_fvupdatewindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'fvupdatewindow.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,12 +10,9 @@ #define UI_FVUPDATEWINDOW_H #include -#include #include -#include #include #include -#include #include #include #include @@ -44,14 +41,14 @@ public: void setupUi(QWidget *FvUpdateWindow) { if (FvUpdateWindow->objectName().isEmpty()) - FvUpdateWindow->setObjectName(QStringLiteral("FvUpdateWindow")); + FvUpdateWindow->setObjectName(QString::fromUtf8("FvUpdateWindow")); FvUpdateWindow->resize(640, 480); horizontalLayout_6 = new QHBoxLayout(FvUpdateWindow); - horizontalLayout_6->setObjectName(QStringLiteral("horizontalLayout_6")); + horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6")); verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); newVersionIsAvailableLabel = new QLabel(FvUpdateWindow); - newVersionIsAvailableLabel->setObjectName(QStringLiteral("newVersionIsAvailableLabel")); + newVersionIsAvailableLabel->setObjectName(QString::fromUtf8("newVersionIsAvailableLabel")); QFont font; font.setBold(true); font.setWeight(75); @@ -60,17 +57,17 @@ public: verticalLayout->addWidget(newVersionIsAvailableLabel); wouldYouLikeToDownloadLabel = new QLabel(FvUpdateWindow); - wouldYouLikeToDownloadLabel->setObjectName(QStringLiteral("wouldYouLikeToDownloadLabel")); + wouldYouLikeToDownloadLabel->setObjectName(QString::fromUtf8("wouldYouLikeToDownloadLabel")); verticalLayout->addWidget(wouldYouLikeToDownloadLabel); groupBox = new QGroupBox(FvUpdateWindow); - groupBox->setObjectName(QStringLiteral("groupBox")); + groupBox->setObjectName(QString::fromUtf8("groupBox")); groupBox->setFont(font); horizontalLayout_7 = new QHBoxLayout(groupBox); - horizontalLayout_7->setObjectName(QStringLiteral("horizontalLayout_7")); + horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7")); releaseNotes = new QTextBrowser(groupBox); - releaseNotes->setObjectName(QStringLiteral("releaseNotes")); + releaseNotes->setObjectName(QString::fromUtf8("releaseNotes")); horizontalLayout_7->addWidget(releaseNotes); @@ -78,9 +75,9 @@ public: verticalLayout->addWidget(groupBox); horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QStringLiteral("horizontalLayout_3")); + horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); skipThisVersionButton = new QPushButton(FvUpdateWindow); - skipThisVersionButton->setObjectName(QStringLiteral("skipThisVersionButton")); + skipThisVersionButton->setObjectName(QString::fromUtf8("skipThisVersionButton")); horizontalLayout_3->addWidget(skipThisVersionButton); @@ -89,12 +86,12 @@ public: horizontalLayout_3->addItem(horizontalSpacer); remindMeLaterButton = new QPushButton(FvUpdateWindow); - remindMeLaterButton->setObjectName(QStringLiteral("remindMeLaterButton")); + remindMeLaterButton->setObjectName(QString::fromUtf8("remindMeLaterButton")); horizontalLayout_3->addWidget(remindMeLaterButton); installUpdateButton = new QPushButton(FvUpdateWindow); - installUpdateButton->setObjectName(QStringLiteral("installUpdateButton")); + installUpdateButton->setObjectName(QString::fromUtf8("installUpdateButton")); installUpdateButton->setAutoDefault(true); horizontalLayout_3->addWidget(installUpdateButton); @@ -116,13 +113,13 @@ public: void retranslateUi(QWidget *FvUpdateWindow) { - FvUpdateWindow->setWindowTitle(QApplication::translate("FvUpdateWindow", "Software Update", Q_NULLPTR)); - newVersionIsAvailableLabel->setText(QApplication::translate("FvUpdateWindow", "A new version of %1 is available!", Q_NULLPTR)); - wouldYouLikeToDownloadLabel->setText(QApplication::translate("FvUpdateWindow", "%1 %2 is now available - you have %3. Would you like to download it now?", Q_NULLPTR)); - groupBox->setTitle(QApplication::translate("FvUpdateWindow", "Release Notes:", Q_NULLPTR)); - skipThisVersionButton->setText(QApplication::translate("FvUpdateWindow", "Skip This Version", Q_NULLPTR)); - remindMeLaterButton->setText(QApplication::translate("FvUpdateWindow", "Remind Me Later", Q_NULLPTR)); - installUpdateButton->setText(QApplication::translate("FvUpdateWindow", "Install Update", Q_NULLPTR)); + FvUpdateWindow->setWindowTitle(QApplication::translate("FvUpdateWindow", "Software Update", nullptr)); + newVersionIsAvailableLabel->setText(QApplication::translate("FvUpdateWindow", "A new version of %1 is available!", nullptr)); + wouldYouLikeToDownloadLabel->setText(QApplication::translate("FvUpdateWindow", "%1 %2 is now available - you have %3. Would you like to download it now?", nullptr)); + groupBox->setTitle(QApplication::translate("FvUpdateWindow", "Release Notes:", nullptr)); + skipThisVersionButton->setText(QApplication::translate("FvUpdateWindow", "Skip This Version", nullptr)); + remindMeLaterButton->setText(QApplication::translate("FvUpdateWindow", "Remind Me Later", nullptr)); + installUpdateButton->setText(QApplication::translate("FvUpdateWindow", "Install Update", nullptr)); } // retranslateUi }; diff --git a/client/ui_mainwindow.h b/client/ui_mainwindow.h index 2ae8861..913588e 100644 --- a/client/ui_mainwindow.h +++ b/client/ui_mainwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'mainwindow.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,9 +10,9 @@ #define UI_MAINWINDOW_H #include +#include #include #include -#include #include #include #include @@ -102,163 +102,163 @@ public: void setupUi(QMainWindow *MainWindow) { if (MainWindow->objectName().isEmpty()) - MainWindow->setObjectName(QStringLiteral("MainWindow")); + MainWindow->setObjectName(QString::fromUtf8("MainWindow")); MainWindow->resize(647, 508); QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(MainWindow->sizePolicy().hasHeightForWidth()); MainWindow->setSizePolicy(sizePolicy); - MainWindow->setWindowTitle(QStringLiteral("Litt")); + MainWindow->setWindowTitle(QString::fromUtf8("Litt")); mSyncAction = new QAction(MainWindow); - mSyncAction->setObjectName(QStringLiteral("mSyncAction")); + mSyncAction->setObjectName(QString::fromUtf8("mSyncAction")); mSyncAction->setEnabled(false); QIcon icon; - icon.addFile(QStringLiteral(":/icons/icons/network-receive.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QString::fromUtf8(":/icons/icons/network-receive.png"), QSize(), QIcon::Normal, QIcon::Off); mSyncAction->setIcon(icon); mSyncAction->setVisible(false); mPrintAction = new QAction(MainWindow); - mPrintAction->setObjectName(QStringLiteral("mPrintAction")); + mPrintAction->setObjectName(QString::fromUtf8("mPrintAction")); QIcon icon1; - icon1.addFile(QStringLiteral(":/icons/icons/document-print.png"), QSize(), QIcon::Normal, QIcon::Off); + icon1.addFile(QString::fromUtf8(":/icons/icons/document-print.png"), QSize(), QIcon::Normal, QIcon::Off); mPrintAction->setIcon(icon1); mExitAction = new QAction(MainWindow); - mExitAction->setObjectName(QStringLiteral("mExitAction")); + mExitAction->setObjectName(QString::fromUtf8("mExitAction")); mPreferencesAction = new QAction(MainWindow); - mPreferencesAction->setObjectName(QStringLiteral("mPreferencesAction")); + mPreferencesAction->setObjectName(QString::fromUtf8("mPreferencesAction")); mSaveAction = new QAction(MainWindow); - mSaveAction->setObjectName(QStringLiteral("mSaveAction")); + mSaveAction->setObjectName(QString::fromUtf8("mSaveAction")); QIcon icon2; - icon2.addFile(QStringLiteral(":/icons/icons/document-save.png"), QSize(), QIcon::Normal, QIcon::Off); + icon2.addFile(QString::fromUtf8(":/icons/icons/document-save.png"), QSize(), QIcon::Normal, QIcon::Off); mSaveAction->setIcon(icon2); mDeleteTaskAction = new QAction(MainWindow); - mDeleteTaskAction->setObjectName(QStringLiteral("mDeleteTaskAction")); + mDeleteTaskAction->setObjectName(QString::fromUtf8("mDeleteTaskAction")); QIcon icon3; - icon3.addFile(QStringLiteral(":/icons/icons/list-remove.png"), QSize(), QIcon::Normal, QIcon::Off); + icon3.addFile(QString::fromUtf8(":/icons/icons/list-remove.png"), QSize(), QIcon::Normal, QIcon::Off); mDeleteTaskAction->setIcon(icon3); mRenameTaskAction = new QAction(MainWindow); - mRenameTaskAction->setObjectName(QStringLiteral("mRenameTaskAction")); + mRenameTaskAction->setObjectName(QString::fromUtf8("mRenameTaskAction")); QIcon icon4; - icon4.addFile(QStringLiteral(":/icons/icons/empty.png"), QSize(), QIcon::Normal, QIcon::Off); + icon4.addFile(QString::fromUtf8(":/icons/icons/empty.png"), QSize(), QIcon::Normal, QIcon::Off); mRenameTaskAction->setIcon(icon4); mNewTaskAction = new QAction(MainWindow); - mNewTaskAction->setObjectName(QStringLiteral("mNewTaskAction")); + mNewTaskAction->setObjectName(QString::fromUtf8("mNewTaskAction")); QIcon icon5; - icon5.addFile(QStringLiteral(":/icons/icons/tree-add-child-small.png"), QSize(), QIcon::Normal, QIcon::Off); + icon5.addFile(QString::fromUtf8(":/icons/icons/tree-add-child-small.png"), QSize(), QIcon::Normal, QIcon::Off); mNewTaskAction->setIcon(icon5); mNewRootTaskAction = new QAction(MainWindow); - mNewRootTaskAction->setObjectName(QStringLiteral("mNewRootTaskAction")); + mNewRootTaskAction->setObjectName(QString::fromUtf8("mNewRootTaskAction")); QIcon icon6; - icon6.addFile(QStringLiteral(":/icons/icons/tree-add-root-small.png"), QSize(), QIcon::Normal, QIcon::Off); + icon6.addFile(QString::fromUtf8(":/icons/icons/tree-add-root-small.png"), QSize(), QIcon::Normal, QIcon::Off); mNewRootTaskAction->setIcon(icon6); mStartOrStopTrackingAction = new QAction(MainWindow); - mStartOrStopTrackingAction->setObjectName(QStringLiteral("mStartOrStopTrackingAction")); + mStartOrStopTrackingAction->setObjectName(QString::fromUtf8("mStartOrStopTrackingAction")); QIcon icon7; - icon7.addFile(QStringLiteral(":/icons/icons/clock-32x32.png"), QSize(), QIcon::Normal, QIcon::Off); + icon7.addFile(QString::fromUtf8(":/icons/icons/clock-32x32.png"), QSize(), QIcon::Normal, QIcon::Off); mStartOrStopTrackingAction->setIcon(icon7); mUndoEditAction = new QAction(MainWindow); - mUndoEditAction->setObjectName(QStringLiteral("mUndoEditAction")); + mUndoEditAction->setObjectName(QString::fromUtf8("mUndoEditAction")); QIcon icon8; - icon8.addFile(QStringLiteral(":/icons/icons/edit-undo.png"), QSize(), QIcon::Normal, QIcon::Off); + icon8.addFile(QString::fromUtf8(":/icons/icons/edit-undo.png"), QSize(), QIcon::Normal, QIcon::Off); mUndoEditAction->setIcon(icon8); mRedoEditAction = new QAction(MainWindow); - mRedoEditAction->setObjectName(QStringLiteral("mRedoEditAction")); + mRedoEditAction->setObjectName(QString::fromUtf8("mRedoEditAction")); QIcon icon9; - icon9.addFile(QStringLiteral(":/icons/icons/edit-redo.png"), QSize(), QIcon::Normal, QIcon::Off); + icon9.addFile(QString::fromUtf8(":/icons/icons/edit-redo.png"), QSize(), QIcon::Normal, QIcon::Off); mRedoEditAction->setIcon(icon9); mCutEditAction = new QAction(MainWindow); - mCutEditAction->setObjectName(QStringLiteral("mCutEditAction")); + mCutEditAction->setObjectName(QString::fromUtf8("mCutEditAction")); QIcon icon10; - icon10.addFile(QStringLiteral(":/icons/icons/edit-cut.png"), QSize(), QIcon::Normal, QIcon::Off); + icon10.addFile(QString::fromUtf8(":/icons/icons/edit-cut.png"), QSize(), QIcon::Normal, QIcon::Off); mCutEditAction->setIcon(icon10); mCopyEditAction = new QAction(MainWindow); - mCopyEditAction->setObjectName(QStringLiteral("mCopyEditAction")); + mCopyEditAction->setObjectName(QString::fromUtf8("mCopyEditAction")); QIcon icon11; - icon11.addFile(QStringLiteral(":/icons/icons/edit-copy.png"), QSize(), QIcon::Normal, QIcon::Off); + icon11.addFile(QString::fromUtf8(":/icons/icons/edit-copy.png"), QSize(), QIcon::Normal, QIcon::Off); mCopyEditAction->setIcon(icon11); mPasteEditAction = new QAction(MainWindow); - mPasteEditAction->setObjectName(QStringLiteral("mPasteEditAction")); + mPasteEditAction->setObjectName(QString::fromUtf8("mPasteEditAction")); QIcon icon12; - icon12.addFile(QStringLiteral(":/icons/icons/edit-paste.png"), QSize(), QIcon::Normal, QIcon::Off); + icon12.addFile(QString::fromUtf8(":/icons/icons/edit-paste.png"), QSize(), QIcon::Normal, QIcon::Off); mPasteEditAction->setIcon(icon12); mDeleteEditAction = new QAction(MainWindow); - mDeleteEditAction->setObjectName(QStringLiteral("mDeleteEditAction")); + mDeleteEditAction->setObjectName(QString::fromUtf8("mDeleteEditAction")); QIcon icon13; - icon13.addFile(QStringLiteral(":/icons/icons/edit-clear.png"), QSize(), QIcon::Normal, QIcon::Off); + icon13.addFile(QString::fromUtf8(":/icons/icons/edit-clear.png"), QSize(), QIcon::Normal, QIcon::Off); mDeleteEditAction->setIcon(icon13); mSelectAllEditAction = new QAction(MainWindow); - mSelectAllEditAction->setObjectName(QStringLiteral("mSelectAllEditAction")); + mSelectAllEditAction->setObjectName(QString::fromUtf8("mSelectAllEditAction")); QIcon icon14; - icon14.addFile(QStringLiteral(":/icons/icons/edit-select-all.png"), QSize(), QIcon::Normal, QIcon::Off); + icon14.addFile(QString::fromUtf8(":/icons/icons/edit-select-all.png"), QSize(), QIcon::Normal, QIcon::Off); mSelectAllEditAction->setIcon(icon14); mAboutAction = new QAction(MainWindow); - mAboutAction->setObjectName(QStringLiteral("mAboutAction")); + mAboutAction->setObjectName(QString::fromUtf8("mAboutAction")); mTimelineAction = new QAction(MainWindow); - mTimelineAction->setObjectName(QStringLiteral("mTimelineAction")); + mTimelineAction->setObjectName(QString::fromUtf8("mTimelineAction")); QIcon icon15; - icon15.addFile(QStringLiteral(":/icons/icons/office-calendar.png"), QSize(), QIcon::Normal, QIcon::Off); + icon15.addFile(QString::fromUtf8(":/icons/icons/office-calendar.png"), QSize(), QIcon::Normal, QIcon::Off); mTimelineAction->setIcon(icon15); mTimeReportAction = new QAction(MainWindow); - mTimeReportAction->setObjectName(QStringLiteral("mTimeReportAction")); + mTimeReportAction->setObjectName(QString::fromUtf8("mTimeReportAction")); QIcon icon16; - icon16.addFile(QStringLiteral(":/icons/icons/appointment-new.png"), QSize(), QIcon::Normal, QIcon::Off); + icon16.addFile(QString::fromUtf8(":/icons/icons/appointment-new.png"), QSize(), QIcon::Normal, QIcon::Off); mTimeReportAction->setIcon(icon16); mShowToolbarAction = new QAction(MainWindow); - mShowToolbarAction->setObjectName(QStringLiteral("mShowToolbarAction")); + mShowToolbarAction->setObjectName(QString::fromUtf8("mShowToolbarAction")); mShowToolbarAction->setCheckable(true); mShowToolbarAction->setChecked(true); mShowToolbarAction->setIcon(icon4); mAttachmentsAction = new QAction(MainWindow); - mAttachmentsAction->setObjectName(QStringLiteral("mAttachmentsAction")); + mAttachmentsAction->setObjectName(QString::fromUtf8("mAttachmentsAction")); mAttachmentsAction->setIcon(icon4); mCheckForUpdatesAction = new QAction(MainWindow); - mCheckForUpdatesAction->setObjectName(QStringLiteral("mCheckForUpdatesAction")); + mCheckForUpdatesAction->setObjectName(QString::fromUtf8("mCheckForUpdatesAction")); mTimeTrackableAction = new QAction(MainWindow); - mTimeTrackableAction->setObjectName(QStringLiteral("mTimeTrackableAction")); + mTimeTrackableAction->setObjectName(QString::fromUtf8("mTimeTrackableAction")); mTimeTrackableAction->setCheckable(true); QIcon icon17; - icon17.addFile(QStringLiteral(":/icons/icons/accessories-calculator.png"), QSize(), QIcon::Normal, QIcon::Off); + icon17.addFile(QString::fromUtf8(":/icons/icons/accessories-calculator.png"), QSize(), QIcon::Normal, QIcon::Off); mTimeTrackableAction->setIcon(icon17); mActionSearchInTasks = new QAction(MainWindow); - mActionSearchInTasks->setObjectName(QStringLiteral("mActionSearchInTasks")); + mActionSearchInTasks->setObjectName(QString::fromUtf8("mActionSearchInTasks")); QIcon icon18; - icon18.addFile(QStringLiteral(":/icons/icons/folder-saved-search.png"), QSize(), QIcon::Normal, QIcon::Off); + icon18.addFile(QString::fromUtf8(":/icons/icons/folder-saved-search.png"), QSize(), QIcon::Normal, QIcon::Off); mActionSearchInTasks->setIcon(icon18); mActionSearch = new QAction(MainWindow); - mActionSearch->setObjectName(QStringLiteral("mActionSearch")); + mActionSearch->setObjectName(QString::fromUtf8("mActionSearch")); QIcon icon19; - icon19.addFile(QStringLiteral(":/icons/icons/edit-find.png"), QSize(), QIcon::Normal, QIcon::Off); + icon19.addFile(QString::fromUtf8(":/icons/icons/edit-find.png"), QSize(), QIcon::Normal, QIcon::Off); mActionSearch->setIcon(icon19); mShowLittAction = new QAction(MainWindow); - mShowLittAction->setObjectName(QStringLiteral("mShowLittAction")); + mShowLittAction->setObjectName(QString::fromUtf8("mShowLittAction")); QIcon icon20; - icon20.addFile(QStringLiteral(":/icons/icons/format-justify-fill.png"), QSize(), QIcon::Normal, QIcon::Off); + icon20.addFile(QString::fromUtf8(":/icons/icons/format-justify-fill.png"), QSize(), QIcon::Normal, QIcon::Off); mShowLittAction->setIcon(icon20); mFocusTaskTreeAction = new QAction(MainWindow); - mFocusTaskTreeAction->setObjectName(QStringLiteral("mFocusTaskTreeAction")); + mFocusTaskTreeAction->setObjectName(QString::fromUtf8("mFocusTaskTreeAction")); mFocusTaskTreeAction->setIcon(icon4); mFocusTaskTextAction = new QAction(MainWindow); - mFocusTaskTextAction->setObjectName(QStringLiteral("mFocusTaskTextAction")); + mFocusTaskTextAction->setObjectName(QString::fromUtf8("mFocusTaskTextAction")); mFocusTaskTextAction->setIcon(icon4); mAddSiblingAction = new QAction(MainWindow); - mAddSiblingAction->setObjectName(QStringLiteral("mAddSiblingAction")); + mAddSiblingAction->setObjectName(QString::fromUtf8("mAddSiblingAction")); QIcon icon21; - icon21.addFile(QStringLiteral(":/icons/icons/tree-add-sibling-small.png"), QSize(), QIcon::Normal, QIcon::Off); + icon21.addFile(QString::fromUtf8(":/icons/icons/tree-add-sibling-small.png"), QSize(), QIcon::Normal, QIcon::Off); mAddSiblingAction->setIcon(icon21); mDecreaseLevelAction = new QAction(MainWindow); - mDecreaseLevelAction->setObjectName(QStringLiteral("mDecreaseLevelAction")); + mDecreaseLevelAction->setObjectName(QString::fromUtf8("mDecreaseLevelAction")); mDecreaseLevelAction->setIcon(icon4); mIncreaseLevelAction = new QAction(MainWindow); - mIncreaseLevelAction->setObjectName(QStringLiteral("mIncreaseLevelAction")); + mIncreaseLevelAction->setObjectName(QString::fromUtf8("mIncreaseLevelAction")); mIncreaseLevelAction->setIcon(icon4); mMoveUpAction = new QAction(MainWindow); - mMoveUpAction->setObjectName(QStringLiteral("mMoveUpAction")); + mMoveUpAction->setObjectName(QString::fromUtf8("mMoveUpAction")); mMoveUpAction->setIcon(icon4); mMoveDownAction = new QAction(MainWindow); - mMoveDownAction->setObjectName(QStringLiteral("mMoveDownAction")); + mMoveDownAction->setObjectName(QString::fromUtf8("mMoveDownAction")); mMoveDownAction->setIcon(icon4); centralWidget = new QWidget(MainWindow); - centralWidget->setObjectName(QStringLiteral("centralWidget")); + centralWidget->setObjectName(QString::fromUtf8("centralWidget")); QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Maximum); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); @@ -267,48 +267,48 @@ public: horizontalLayout = new QHBoxLayout(centralWidget); horizontalLayout->setSpacing(6); horizontalLayout->setContentsMargins(11, 11, 11, 11); - horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); + horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); horizontalLayout->setSizeConstraint(QLayout::SetMaximumSize); horizontalLayout->setContentsMargins(2, 2, 2, 2); mSplitter = new QSplitter(centralWidget); - mSplitter->setObjectName(QStringLiteral("mSplitter")); + mSplitter->setObjectName(QString::fromUtf8("mSplitter")); sizePolicy.setHeightForWidth(mSplitter->sizePolicy().hasHeightForWidth()); mSplitter->setSizePolicy(sizePolicy); mSplitter->setMinimumSize(QSize(600, 200)); mSplitter->setOrientation(Qt::Horizontal); mTaskTree = new TaskTreeView(mSplitter); - mTaskTree->setObjectName(QStringLiteral("mTaskTree")); + mTaskTree->setObjectName(QString::fromUtf8("mTaskTree")); mTaskTree->setContextMenuPolicy(Qt::CustomContextMenu); mTaskTree->setDragEnabled(true); mTaskTree->setDragDropMode(QAbstractItemView::InternalMove); mTaskTree->setDefaultDropAction(Qt::MoveAction); mSplitter->addWidget(mTaskTree); frame = new QFrame(mSplitter); - frame->setObjectName(QStringLiteral("frame")); + frame->setObjectName(QString::fromUtf8("frame")); frame->setFrameShape(QFrame::NoFrame); frame->setFrameShadow(QFrame::Raised); gridLayout = new QGridLayout(frame); gridLayout->setSpacing(6); gridLayout->setContentsMargins(11, 11, 11, 11); - gridLayout->setObjectName(QStringLiteral("gridLayout")); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); gridLayout->setContentsMargins(0, 0, 0, 0); mTimeSplitter = new QSplitter(frame); - mTimeSplitter->setObjectName(QStringLiteral("mTimeSplitter")); + mTimeSplitter->setObjectName(QString::fromUtf8("mTimeSplitter")); mTimeSplitter->setMinimumSize(QSize(0, 0)); mTimeSplitter->setLineWidth(0); mTimeSplitter->setOrientation(Qt::Vertical); mEditFrame = new QFrame(mTimeSplitter); - mEditFrame->setObjectName(QStringLiteral("mEditFrame")); + mEditFrame->setObjectName(QString::fromUtf8("mEditFrame")); mEditFrame->setFrameShape(QFrame::StyledPanel); mEditFrame->setFrameShadow(QFrame::Plain); mEditFrame->setLineWidth(0); verticalLayout = new QVBoxLayout(mEditFrame); verticalLayout->setSpacing(0); verticalLayout->setContentsMargins(11, 11, 11, 11); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); verticalLayout->setContentsMargins(0, 0, 0, 0); mNoteEdit = new QPlainTextEdit(mEditFrame); - mNoteEdit->setObjectName(QStringLiteral("mNoteEdit")); + mNoteEdit->setObjectName(QString::fromUtf8("mNoteEdit")); sizePolicy.setHeightForWidth(mNoteEdit->sizePolicy().hasHeightForWidth()); mNoteEdit->setSizePolicy(sizePolicy); mNoteEdit->setFrameShape(QFrame::NoFrame); @@ -317,24 +317,24 @@ public: verticalLayout->addWidget(mNoteEdit); mFindFrame = new QFrame(mEditFrame); - mFindFrame->setObjectName(QStringLiteral("mFindFrame")); + mFindFrame->setObjectName(QString::fromUtf8("mFindFrame")); mFindFrame->setAutoFillBackground(false); - mFindFrame->setStyleSheet(QStringLiteral("background-color:white;")); + mFindFrame->setStyleSheet(QString::fromUtf8("background-color:white;")); mFindFrame->setFrameShape(QFrame::NoFrame); mFindFrame->setFrameShadow(QFrame::Raised); mFindFrame->setLineWidth(0); mFindFrameLayout = new QHBoxLayout(mFindFrame); mFindFrameLayout->setSpacing(5); mFindFrameLayout->setContentsMargins(11, 11, 11, 11); - mFindFrameLayout->setObjectName(QStringLiteral("mFindFrameLayout")); + mFindFrameLayout->setObjectName(QString::fromUtf8("mFindFrameLayout")); mFindFrameLayout->setContentsMargins(0, 0, 0, 0); label = new QLabel(mFindFrame); - label->setObjectName(QStringLiteral("label")); + label->setObjectName(QString::fromUtf8("label")); mFindFrameLayout->addWidget(label); mFindEdit = new QLineEdit(mFindFrame); - mFindEdit->setObjectName(QStringLiteral("mFindEdit")); + mFindEdit->setObjectName(QString::fromUtf8("mFindEdit")); mFindFrameLayout->addWidget(mFindEdit); @@ -343,30 +343,30 @@ public: mTimeSplitter->addWidget(mEditFrame); mTimeFrame = new QFrame(mTimeSplitter); - mTimeFrame->setObjectName(QStringLiteral("mTimeFrame")); + mTimeFrame->setObjectName(QString::fromUtf8("mTimeFrame")); mTimeFrame->setMaximumSize(QSize(16777215, 70)); mTimeFrame->setFrameShape(QFrame::StyledPanel); formLayout = new QFormLayout(mTimeFrame); formLayout->setSpacing(6); formLayout->setContentsMargins(11, 11, 11, 11); - formLayout->setObjectName(QStringLiteral("formLayout")); + formLayout->setObjectName(QString::fromUtf8("formLayout")); mTodayTextLabel = new QLabel(mTimeFrame); - mTodayTextLabel->setObjectName(QStringLiteral("mTodayTextLabel")); + mTodayTextLabel->setObjectName(QString::fromUtf8("mTodayTextLabel")); formLayout->setWidget(0, QFormLayout::LabelRole, mTodayTextLabel); mTodaySpentTimeLabel = new QLabel(mTimeFrame); - mTodaySpentTimeLabel->setObjectName(QStringLiteral("mTodaySpentTimeLabel")); + mTodaySpentTimeLabel->setObjectName(QString::fromUtf8("mTodaySpentTimeLabel")); formLayout->setWidget(0, QFormLayout::FieldRole, mTodaySpentTimeLabel); mThisMonthTextLabel = new QLabel(mTimeFrame); - mThisMonthTextLabel->setObjectName(QStringLiteral("mThisMonthTextLabel")); + mThisMonthTextLabel->setObjectName(QString::fromUtf8("mThisMonthTextLabel")); formLayout->setWidget(1, QFormLayout::LabelRole, mThisMonthTextLabel); mThisMonthSpentTimeLabel = new QLabel(mTimeFrame); - mThisMonthSpentTimeLabel->setObjectName(QStringLiteral("mThisMonthSpentTimeLabel")); + mThisMonthSpentTimeLabel->setObjectName(QString::fromUtf8("mThisMonthSpentTimeLabel")); formLayout->setWidget(1, QFormLayout::FieldRole, mThisMonthSpentTimeLabel); @@ -380,28 +380,28 @@ public: MainWindow->setCentralWidget(centralWidget); mMainMenu = new QMenuBar(MainWindow); - mMainMenu->setObjectName(QStringLiteral("mMainMenu")); + mMainMenu->setObjectName(QString::fromUtf8("mMainMenu")); mMainMenu->setGeometry(QRect(0, 0, 647, 22)); mFileMenu = new QMenu(mMainMenu); - mFileMenu->setObjectName(QStringLiteral("mFileMenu")); + mFileMenu->setObjectName(QString::fromUtf8("mFileMenu")); mEditMenu = new QMenu(mMainMenu); - mEditMenu->setObjectName(QStringLiteral("mEditMenu")); + mEditMenu->setObjectName(QString::fromUtf8("mEditMenu")); mToolsMenu = new QMenu(mMainMenu); - mToolsMenu->setObjectName(QStringLiteral("mToolsMenu")); + mToolsMenu->setObjectName(QString::fromUtf8("mToolsMenu")); mStartRecentTaskMenu = new QMenu(mToolsMenu); - mStartRecentTaskMenu->setObjectName(QStringLiteral("mStartRecentTaskMenu")); + mStartRecentTaskMenu->setObjectName(QString::fromUtf8("mStartRecentTaskMenu")); mStartRecentTaskMenu->setIcon(icon4); mViewMenu = new QMenu(mMainMenu); - mViewMenu->setObjectName(QStringLiteral("mViewMenu")); + mViewMenu->setObjectName(QString::fromUtf8("mViewMenu")); MainWindow->setMenuBar(mMainMenu); mMainToolbar = new QToolBar(MainWindow); - mMainToolbar->setObjectName(QStringLiteral("mMainToolbar")); + mMainToolbar->setObjectName(QString::fromUtf8("mMainToolbar")); mMainToolbar->setContextMenuPolicy(Qt::NoContextMenu); mMainToolbar->setMovable(false); mMainToolbar->setFloatable(false); MainWindow->addToolBar(Qt::TopToolBarArea, mMainToolbar); mStatusBar = new QStatusBar(MainWindow); - mStatusBar->setObjectName(QStringLiteral("mStatusBar")); + mStatusBar->setObjectName(QString::fromUtf8("mStatusBar")); MainWindow->setStatusBar(mStatusBar); mMainMenu->addAction(mFileMenu->menuAction()); @@ -488,127 +488,127 @@ public: void retranslateUi(QMainWindow *MainWindow) { - mSyncAction->setText(QApplication::translate("MainWindow", "S&ync...", Q_NULLPTR)); - mPrintAction->setText(QApplication::translate("MainWindow", "&Print...", Q_NULLPTR)); - mExitAction->setText(QApplication::translate("MainWindow", "E&xit", Q_NULLPTR)); - mPreferencesAction->setText(QApplication::translate("MainWindow", "Pre&ferences...", Q_NULLPTR)); - mSaveAction->setText(QApplication::translate("MainWindow", "&Save", Q_NULLPTR)); + mSyncAction->setText(QApplication::translate("MainWindow", "S&ync...", nullptr)); + mPrintAction->setText(QApplication::translate("MainWindow", "&Print...", nullptr)); + mExitAction->setText(QApplication::translate("MainWindow", "E&xit", nullptr)); + mPreferencesAction->setText(QApplication::translate("MainWindow", "Pre&ferences...", nullptr)); + mSaveAction->setText(QApplication::translate("MainWindow", "&Save", nullptr)); #ifndef QT_NO_SHORTCUT - mSaveAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+S", Q_NULLPTR)); + mSaveAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+S", nullptr)); #endif // QT_NO_SHORTCUT - mDeleteTaskAction->setText(QApplication::translate("MainWindow", "Delete task", Q_NULLPTR)); + mDeleteTaskAction->setText(QApplication::translate("MainWindow", "Delete task", nullptr)); #ifndef QT_NO_TOOLTIP - mDeleteTaskAction->setToolTip(QApplication::translate("MainWindow", "Delete task", Q_NULLPTR)); + mDeleteTaskAction->setToolTip(QApplication::translate("MainWindow", "Delete task", nullptr)); #endif // QT_NO_TOOLTIP - mRenameTaskAction->setText(QApplication::translate("MainWindow", "Rename task", Q_NULLPTR)); - mNewTaskAction->setText(QApplication::translate("MainWindow", "New child task", Q_NULLPTR)); - mNewTaskAction->setIconText(QApplication::translate("MainWindow", "New child task", Q_NULLPTR)); + mRenameTaskAction->setText(QApplication::translate("MainWindow", "Rename task", nullptr)); + mNewTaskAction->setText(QApplication::translate("MainWindow", "New child task", nullptr)); + mNewTaskAction->setIconText(QApplication::translate("MainWindow", "New child task", nullptr)); #ifndef QT_NO_TOOLTIP - mNewTaskAction->setToolTip(QApplication::translate("MainWindow", "New child task", Q_NULLPTR)); + mNewTaskAction->setToolTip(QApplication::translate("MainWindow", "New child task", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_SHORTCUT - mNewTaskAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+N", Q_NULLPTR)); + mNewTaskAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+N", nullptr)); #endif // QT_NO_SHORTCUT - mNewRootTaskAction->setText(QApplication::translate("MainWindow", "New root task", Q_NULLPTR)); + mNewRootTaskAction->setText(QApplication::translate("MainWindow", "New root task", nullptr)); #ifndef QT_NO_SHORTCUT - mNewRootTaskAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+N", Q_NULLPTR)); + mNewRootTaskAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+N", nullptr)); #endif // QT_NO_SHORTCUT - mStartOrStopTrackingAction->setText(QApplication::translate("MainWindow", "Start tracking", Q_NULLPTR)); + mStartOrStopTrackingAction->setText(QApplication::translate("MainWindow", "Start tracking", nullptr)); #ifndef QT_NO_SHORTCUT - mStartOrStopTrackingAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+T", Q_NULLPTR)); + mStartOrStopTrackingAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+T", nullptr)); #endif // QT_NO_SHORTCUT - mUndoEditAction->setText(QApplication::translate("MainWindow", "Undo", Q_NULLPTR)); + mUndoEditAction->setText(QApplication::translate("MainWindow", "Undo", nullptr)); #ifndef QT_NO_SHORTCUT - mUndoEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Z", Q_NULLPTR)); + mUndoEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Z", nullptr)); #endif // QT_NO_SHORTCUT - mRedoEditAction->setText(QApplication::translate("MainWindow", "Redo", Q_NULLPTR)); + mRedoEditAction->setText(QApplication::translate("MainWindow", "Redo", nullptr)); #ifndef QT_NO_SHORTCUT - mRedoEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+Z", Q_NULLPTR)); + mRedoEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+Z", nullptr)); #endif // QT_NO_SHORTCUT - mCutEditAction->setText(QApplication::translate("MainWindow", "Cut", Q_NULLPTR)); + mCutEditAction->setText(QApplication::translate("MainWindow", "Cut", nullptr)); #ifndef QT_NO_SHORTCUT - mCutEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+X", Q_NULLPTR)); + mCutEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+X", nullptr)); #endif // QT_NO_SHORTCUT - mCopyEditAction->setText(QApplication::translate("MainWindow", "Copy", Q_NULLPTR)); + mCopyEditAction->setText(QApplication::translate("MainWindow", "Copy", nullptr)); #ifndef QT_NO_SHORTCUT - mCopyEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+C", Q_NULLPTR)); + mCopyEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+C", nullptr)); #endif // QT_NO_SHORTCUT - mPasteEditAction->setText(QApplication::translate("MainWindow", "Paste", Q_NULLPTR)); + mPasteEditAction->setText(QApplication::translate("MainWindow", "Paste", nullptr)); #ifndef QT_NO_SHORTCUT - mPasteEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+V", Q_NULLPTR)); + mPasteEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+V", nullptr)); #endif // QT_NO_SHORTCUT - mDeleteEditAction->setText(QApplication::translate("MainWindow", "Delete", Q_NULLPTR)); - mSelectAllEditAction->setText(QApplication::translate("MainWindow", "Select all note", Q_NULLPTR)); + mDeleteEditAction->setText(QApplication::translate("MainWindow", "Delete", nullptr)); + mSelectAllEditAction->setText(QApplication::translate("MainWindow", "Select all note", nullptr)); #ifndef QT_NO_SHORTCUT - mSelectAllEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+A", Q_NULLPTR)); + mSelectAllEditAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+A", nullptr)); #endif // QT_NO_SHORTCUT - mAboutAction->setText(QApplication::translate("MainWindow", "About...", Q_NULLPTR)); - mTimelineAction->setText(QApplication::translate("MainWindow", "Timeline...", Q_NULLPTR)); - mTimeReportAction->setText(QApplication::translate("MainWindow", "Time report...", Q_NULLPTR)); - mShowToolbarAction->setText(QApplication::translate("MainWindow", "Show toolbar", Q_NULLPTR)); - mAttachmentsAction->setText(QApplication::translate("MainWindow", "Attachments", Q_NULLPTR)); + mAboutAction->setText(QApplication::translate("MainWindow", "About...", nullptr)); + mTimelineAction->setText(QApplication::translate("MainWindow", "Timeline...", nullptr)); + mTimeReportAction->setText(QApplication::translate("MainWindow", "Time report...", nullptr)); + mShowToolbarAction->setText(QApplication::translate("MainWindow", "Show toolbar", nullptr)); + mAttachmentsAction->setText(QApplication::translate("MainWindow", "Attachments", nullptr)); #ifndef QT_NO_TOOLTIP - mAttachmentsAction->setToolTip(QApplication::translate("MainWindow", "View&edit attachments", Q_NULLPTR)); + mAttachmentsAction->setToolTip(QApplication::translate("MainWindow", "View&edit attachments", nullptr)); #endif // QT_NO_TOOLTIP - mCheckForUpdatesAction->setText(QApplication::translate("MainWindow", "Check for updates...", Q_NULLPTR)); - mTimeTrackableAction->setText(QApplication::translate("MainWindow", "Time trackable", Q_NULLPTR)); - mActionSearchInTasks->setText(QApplication::translate("MainWindow", "Find in tasks...", Q_NULLPTR)); + mCheckForUpdatesAction->setText(QApplication::translate("MainWindow", "Check for updates...", nullptr)); + mTimeTrackableAction->setText(QApplication::translate("MainWindow", "Time trackable", nullptr)); + mActionSearchInTasks->setText(QApplication::translate("MainWindow", "Find in tasks...", nullptr)); #ifndef QT_NO_SHORTCUT - mActionSearchInTasks->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+F", Q_NULLPTR)); + mActionSearchInTasks->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+F", nullptr)); #endif // QT_NO_SHORTCUT - mActionSearch->setText(QApplication::translate("MainWindow", "Find...", Q_NULLPTR)); + mActionSearch->setText(QApplication::translate("MainWindow", "Find...", nullptr)); #ifndef QT_NO_SHORTCUT - mActionSearch->setShortcut(QApplication::translate("MainWindow", "Ctrl+F", Q_NULLPTR)); + mActionSearch->setShortcut(QApplication::translate("MainWindow", "Ctrl+F", nullptr)); #endif // QT_NO_SHORTCUT - mShowLittAction->setText(QApplication::translate("MainWindow", "Show Litt window", Q_NULLPTR)); + mShowLittAction->setText(QApplication::translate("MainWindow", "Show Litt window", nullptr)); #ifndef QT_NO_TOOLTIP - mShowLittAction->setToolTip(QApplication::translate("MainWindow", "Bring Litt window to foreground", Q_NULLPTR)); + mShowLittAction->setToolTip(QApplication::translate("MainWindow", "Bring Litt window to foreground", nullptr)); #endif // QT_NO_TOOLTIP - mFocusTaskTreeAction->setText(QApplication::translate("MainWindow", "Switch to task tree", Q_NULLPTR)); + mFocusTaskTreeAction->setText(QApplication::translate("MainWindow", "Switch to task tree", nullptr)); #ifndef QT_NO_SHORTCUT - mFocusTaskTreeAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+1", Q_NULLPTR)); + mFocusTaskTreeAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+1", nullptr)); #endif // QT_NO_SHORTCUT - mFocusTaskTextAction->setText(QApplication::translate("MainWindow", "Switch to task text", Q_NULLPTR)); + mFocusTaskTextAction->setText(QApplication::translate("MainWindow", "Switch to task text", nullptr)); #ifndef QT_NO_SHORTCUT - mFocusTaskTextAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+2", Q_NULLPTR)); + mFocusTaskTextAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+2", nullptr)); #endif // QT_NO_SHORTCUT - mAddSiblingAction->setText(QApplication::translate("MainWindow", "Add sibling", Q_NULLPTR)); + mAddSiblingAction->setText(QApplication::translate("MainWindow", "Add sibling", nullptr)); #ifndef QT_NO_TOOLTIP - mAddSiblingAction->setToolTip(QApplication::translate("MainWindow", "Add sibling document", Q_NULLPTR)); + mAddSiblingAction->setToolTip(QApplication::translate("MainWindow", "Add sibling document", nullptr)); #endif // QT_NO_TOOLTIP - mDecreaseLevelAction->setText(QApplication::translate("MainWindow", "Decrease level", Q_NULLPTR)); + mDecreaseLevelAction->setText(QApplication::translate("MainWindow", "Decrease level", nullptr)); #ifndef QT_NO_TOOLTIP - mDecreaseLevelAction->setToolTip(QApplication::translate("MainWindow", "Decrease document level", Q_NULLPTR)); + mDecreaseLevelAction->setToolTip(QApplication::translate("MainWindow", "Decrease document level", nullptr)); #endif // QT_NO_TOOLTIP - mIncreaseLevelAction->setText(QApplication::translate("MainWindow", "Increase level", Q_NULLPTR)); + mIncreaseLevelAction->setText(QApplication::translate("MainWindow", "Increase level", nullptr)); #ifndef QT_NO_TOOLTIP - mIncreaseLevelAction->setToolTip(QApplication::translate("MainWindow", "Increase document level", Q_NULLPTR)); + mIncreaseLevelAction->setToolTip(QApplication::translate("MainWindow", "Increase document level", nullptr)); #endif // QT_NO_TOOLTIP - mMoveUpAction->setText(QApplication::translate("MainWindow", "Move up", Q_NULLPTR)); + mMoveUpAction->setText(QApplication::translate("MainWindow", "Move up", nullptr)); #ifndef QT_NO_TOOLTIP - mMoveUpAction->setToolTip(QApplication::translate("MainWindow", "Move document up", Q_NULLPTR)); + mMoveUpAction->setToolTip(QApplication::translate("MainWindow", "Move document up", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_SHORTCUT - mMoveUpAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+Up", Q_NULLPTR)); + mMoveUpAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+Up", nullptr)); #endif // QT_NO_SHORTCUT - mMoveDownAction->setText(QApplication::translate("MainWindow", "Move down", Q_NULLPTR)); + mMoveDownAction->setText(QApplication::translate("MainWindow", "Move down", nullptr)); #ifndef QT_NO_TOOLTIP - mMoveDownAction->setToolTip(QApplication::translate("MainWindow", "Move document down", Q_NULLPTR)); + mMoveDownAction->setToolTip(QApplication::translate("MainWindow", "Move document down", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_SHORTCUT - mMoveDownAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+Down", Q_NULLPTR)); + mMoveDownAction->setShortcut(QApplication::translate("MainWindow", "Ctrl+Shift+Down", nullptr)); #endif // QT_NO_SHORTCUT - label->setText(QApplication::translate("MainWindow", "Find:", Q_NULLPTR)); - mTodayTextLabel->setText(QApplication::translate("MainWindow", "Today:", Q_NULLPTR)); - mTodaySpentTimeLabel->setText(QApplication::translate("MainWindow", "0 hours 0 minutes", Q_NULLPTR)); - mThisMonthTextLabel->setText(QApplication::translate("MainWindow", "This month:", Q_NULLPTR)); - mThisMonthSpentTimeLabel->setText(QApplication::translate("MainWindow", "0 hours 0 minutes", Q_NULLPTR)); - mFileMenu->setTitle(QApplication::translate("MainWindow", "&File", Q_NULLPTR)); - mEditMenu->setTitle(QApplication::translate("MainWindow", "Edit", Q_NULLPTR)); - mToolsMenu->setTitle(QApplication::translate("MainWindow", "&Tools", Q_NULLPTR)); - mStartRecentTaskMenu->setTitle(QApplication::translate("MainWindow", "Track recent task", Q_NULLPTR)); - mViewMenu->setTitle(QApplication::translate("MainWindow", "View", Q_NULLPTR)); - mMainToolbar->setWindowTitle(QApplication::translate("MainWindow", "Toolbar", Q_NULLPTR)); + label->setText(QApplication::translate("MainWindow", "Find:", nullptr)); + mTodayTextLabel->setText(QApplication::translate("MainWindow", "Today:", nullptr)); + mTodaySpentTimeLabel->setText(QApplication::translate("MainWindow", "0 hours 0 minutes", nullptr)); + mThisMonthTextLabel->setText(QApplication::translate("MainWindow", "This month:", nullptr)); + mThisMonthSpentTimeLabel->setText(QApplication::translate("MainWindow", "0 hours 0 minutes", nullptr)); + mFileMenu->setTitle(QApplication::translate("MainWindow", "&File", nullptr)); + mEditMenu->setTitle(QApplication::translate("MainWindow", "Edit", nullptr)); + mToolsMenu->setTitle(QApplication::translate("MainWindow", "&Tools", nullptr)); + mStartRecentTaskMenu->setTitle(QApplication::translate("MainWindow", "Track recent task", nullptr)); + mViewMenu->setTitle(QApplication::translate("MainWindow", "View", nullptr)); + mMainToolbar->setWindowTitle(QApplication::translate("MainWindow", "Toolbar", nullptr)); Q_UNUSED(MainWindow); } // retranslateUi diff --git a/client/ui_newpassworddlg.h b/client/ui_newpassworddlg.h index 08f1e27..c40c1ce 100644 --- a/client/ui_newpassworddlg.h +++ b/client/ui_newpassworddlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'newpassworddlg.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,13 +10,10 @@ #define UI_NEWPASSWORDDLG_H #include -#include #include -#include #include #include #include -#include #include #include #include @@ -38,32 +35,32 @@ public: void setupUi(QDialog *NewPasswordDlg) { if (NewPasswordDlg->objectName().isEmpty()) - NewPasswordDlg->setObjectName(QStringLiteral("NewPasswordDlg")); + NewPasswordDlg->setObjectName(QString::fromUtf8("NewPasswordDlg")); NewPasswordDlg->resize(416, 200); NewPasswordDlg->setMinimumSize(QSize(400, 188)); verticalLayout = new QVBoxLayout(NewPasswordDlg); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); formLayout = new QFormLayout(); - formLayout->setObjectName(QStringLiteral("formLayout")); + formLayout->setObjectName(QString::fromUtf8("formLayout")); mNewPasswordLabel1 = new QLabel(NewPasswordDlg); - mNewPasswordLabel1->setObjectName(QStringLiteral("mNewPasswordLabel1")); + mNewPasswordLabel1->setObjectName(QString::fromUtf8("mNewPasswordLabel1")); formLayout->setWidget(0, QFormLayout::LabelRole, mNewPasswordLabel1); mNewPasswordEdit1 = new QLineEdit(NewPasswordDlg); - mNewPasswordEdit1->setObjectName(QStringLiteral("mNewPasswordEdit1")); + mNewPasswordEdit1->setObjectName(QString::fromUtf8("mNewPasswordEdit1")); mNewPasswordEdit1->setInputMethodHints(Qt::ImhHiddenText|Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhSensitiveData); mNewPasswordEdit1->setEchoMode(QLineEdit::Password); formLayout->setWidget(0, QFormLayout::FieldRole, mNewPasswordEdit1); mNewPasswordLabel2 = new QLabel(NewPasswordDlg); - mNewPasswordLabel2->setObjectName(QStringLiteral("mNewPasswordLabel2")); + mNewPasswordLabel2->setObjectName(QString::fromUtf8("mNewPasswordLabel2")); formLayout->setWidget(1, QFormLayout::LabelRole, mNewPasswordLabel2); mNewPasswordEdit2 = new QLineEdit(NewPasswordDlg); - mNewPasswordEdit2->setObjectName(QStringLiteral("mNewPasswordEdit2")); + mNewPasswordEdit2->setObjectName(QString::fromUtf8("mNewPasswordEdit2")); mNewPasswordEdit2->setEchoMode(QLineEdit::Password); formLayout->setWidget(1, QFormLayout::FieldRole, mNewPasswordEdit2); @@ -72,13 +69,13 @@ public: verticalLayout->addLayout(formLayout); mPasswordHintLabel = new QLabel(NewPasswordDlg); - mPasswordHintLabel->setObjectName(QStringLiteral("mPasswordHintLabel")); + mPasswordHintLabel->setObjectName(QString::fromUtf8("mPasswordHintLabel")); mPasswordHintLabel->setWordWrap(true); verticalLayout->addWidget(mPasswordHintLabel); mDialogButtonBox = new QDialogButtonBox(NewPasswordDlg); - mDialogButtonBox->setObjectName(QStringLiteral("mDialogButtonBox")); + mDialogButtonBox->setObjectName(QString::fromUtf8("mDialogButtonBox")); mDialogButtonBox->setOrientation(Qt::Horizontal); mDialogButtonBox->setStandardButtons(QDialogButtonBox::Ok); mDialogButtonBox->setCenterButtons(true); @@ -94,10 +91,10 @@ public: void retranslateUi(QDialog *NewPasswordDlg) { - NewPasswordDlg->setWindowTitle(QApplication::translate("NewPasswordDlg", "Password for new database", Q_NULLPTR)); - mNewPasswordLabel1->setText(QApplication::translate("NewPasswordDlg", "Password:", Q_NULLPTR)); - mNewPasswordLabel2->setText(QApplication::translate("NewPasswordDlg", "Repeat password:", Q_NULLPTR)); - mPasswordHintLabel->setText(QApplication::translate("NewPasswordDlg", "

Please enter new password twice to complete database creation.

Please be aware - there is no way to recover lost password.

", Q_NULLPTR)); + NewPasswordDlg->setWindowTitle(QApplication::translate("NewPasswordDlg", "Password for new database", nullptr)); + mNewPasswordLabel1->setText(QApplication::translate("NewPasswordDlg", "Password:", nullptr)); + mNewPasswordLabel2->setText(QApplication::translate("NewPasswordDlg", "Repeat password:", nullptr)); + mPasswordHintLabel->setText(QApplication::translate("NewPasswordDlg", "

Please enter new password twice to complete database creation.

Please be aware - there is no way to recover lost password.

", nullptr)); } // retranslateUi }; diff --git a/client/ui_passworddlg.h b/client/ui_passworddlg.h index c3cb87f..17340fa 100644 --- a/client/ui_passworddlg.h +++ b/client/ui_passworddlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'passworddlg.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,13 +10,10 @@ #define UI_PASSWORDDLG_H #include -#include #include -#include #include #include #include -#include #include #include #include @@ -35,22 +32,22 @@ public: void setupUi(QDialog *PasswordDlg) { if (PasswordDlg->objectName().isEmpty()) - PasswordDlg->setObjectName(QStringLiteral("PasswordDlg")); + PasswordDlg->setObjectName(QString::fromUtf8("PasswordDlg")); PasswordDlg->resize(285, 113); PasswordDlg->setMinimumSize(QSize(285, 113)); verticalLayout = new QVBoxLayout(PasswordDlg); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); verticalLayout->setContentsMargins(-1, 24, -1, 12); mPasswordFormLayout = new QFormLayout(); - mPasswordFormLayout->setObjectName(QStringLiteral("mPasswordFormLayout")); + mPasswordFormLayout->setObjectName(QString::fromUtf8("mPasswordFormLayout")); mPasswordFormLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint); mPasswordLabel = new QLabel(PasswordDlg); - mPasswordLabel->setObjectName(QStringLiteral("mPasswordLabel")); + mPasswordLabel->setObjectName(QString::fromUtf8("mPasswordLabel")); mPasswordFormLayout->setWidget(0, QFormLayout::LabelRole, mPasswordLabel); mPasswordEdit = new QLineEdit(PasswordDlg); - mPasswordEdit->setObjectName(QStringLiteral("mPasswordEdit")); + mPasswordEdit->setObjectName(QString::fromUtf8("mPasswordEdit")); mPasswordEdit->setInputMethodHints(Qt::ImhHiddenText|Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhSensitiveData); mPasswordEdit->setEchoMode(QLineEdit::Password); @@ -60,7 +57,7 @@ public: verticalLayout->addLayout(mPasswordFormLayout); mButtonBox = new QDialogButtonBox(PasswordDlg); - mButtonBox->setObjectName(QStringLiteral("mButtonBox")); + mButtonBox->setObjectName(QString::fromUtf8("mButtonBox")); mButtonBox->setMaximumSize(QSize(16777215, 50)); mButtonBox->setOrientation(Qt::Horizontal); mButtonBox->setStandardButtons(QDialogButtonBox::Ok); @@ -77,8 +74,8 @@ public: void retranslateUi(QDialog *PasswordDlg) { - PasswordDlg->setWindowTitle(QApplication::translate("PasswordDlg", "Password required", Q_NULLPTR)); - mPasswordLabel->setText(QApplication::translate("PasswordDlg", "Password:", Q_NULLPTR)); + PasswordDlg->setWindowTitle(QApplication::translate("PasswordDlg", "Password required", nullptr)); + mPasswordLabel->setText(QApplication::translate("PasswordDlg", "Password:", nullptr)); } // retranslateUi }; diff --git a/client/ui_preferencesdlg.h b/client/ui_preferencesdlg.h index e8b49c3..2ba1197 100644 --- a/client/ui_preferencesdlg.h +++ b/client/ui_preferencesdlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'preferencesdlg.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,14 +10,12 @@ #define UI_PREFERENCESDLG_H #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -58,7 +56,7 @@ public: void setupUi(QDialog *PreferencesDlg) { if (PreferencesDlg->objectName().isEmpty()) - PreferencesDlg->setObjectName(QStringLiteral("PreferencesDlg")); + PreferencesDlg->setObjectName(QString::fromUtf8("PreferencesDlg")); PreferencesDlg->resize(444, 353); QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); sizePolicy.setHorizontalStretch(0); @@ -66,39 +64,39 @@ public: sizePolicy.setHeightForWidth(PreferencesDlg->sizePolicy().hasHeightForWidth()); PreferencesDlg->setSizePolicy(sizePolicy); verticalLayout_3 = new QVBoxLayout(PreferencesDlg); - verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3")); + verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); mShowSecondsCheckbox = new QCheckBox(PreferencesDlg); - mShowSecondsCheckbox->setObjectName(QStringLiteral("mShowSecondsCheckbox")); + mShowSecondsCheckbox->setObjectName(QString::fromUtf8("mShowSecondsCheckbox")); verticalLayout_3->addWidget(mShowSecondsCheckbox); mAutosavePasswordCheckbox = new QCheckBox(PreferencesDlg); - mAutosavePasswordCheckbox->setObjectName(QStringLiteral("mAutosavePasswordCheckbox")); + mAutosavePasswordCheckbox->setObjectName(QString::fromUtf8("mAutosavePasswordCheckbox")); verticalLayout_3->addWidget(mAutosavePasswordCheckbox); mShowTrayIconCheckbox = new QCheckBox(PreferencesDlg); - mShowTrayIconCheckbox->setObjectName(QStringLiteral("mShowTrayIconCheckbox")); + mShowTrayIconCheckbox->setObjectName(QString::fromUtf8("mShowTrayIconCheckbox")); verticalLayout_3->addWidget(mShowTrayIconCheckbox); mDarkThemeCheckbox = new QCheckBox(PreferencesDlg); - mDarkThemeCheckbox->setObjectName(QStringLiteral("mDarkThemeCheckbox")); + mDarkThemeCheckbox->setObjectName(QString::fromUtf8("mDarkThemeCheckbox")); verticalLayout_3->addWidget(mDarkThemeCheckbox); mCustomDatabaseFileCheckbox = new QCheckBox(PreferencesDlg); - mCustomDatabaseFileCheckbox->setObjectName(QStringLiteral("mCustomDatabaseFileCheckbox")); + mCustomDatabaseFileCheckbox->setObjectName(QString::fromUtf8("mCustomDatabaseFileCheckbox")); verticalLayout_3->addWidget(mCustomDatabaseFileCheckbox); mSelectDatabaseButton = new QPushButton(PreferencesDlg); - mSelectDatabaseButton->setObjectName(QStringLiteral("mSelectDatabaseButton")); + mSelectDatabaseButton->setObjectName(QString::fromUtf8("mSelectDatabaseButton")); verticalLayout_3->addWidget(mSelectDatabaseButton); mDatabaseLocation = new QLabel(PreferencesDlg); - mDatabaseLocation->setObjectName(QStringLiteral("mDatabaseLocation")); + mDatabaseLocation->setObjectName(QString::fromUtf8("mDatabaseLocation")); QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); @@ -109,12 +107,12 @@ public: stopTrackingRuleLayout = new QVBoxLayout(); stopTrackingRuleLayout->setSpacing(0); - stopTrackingRuleLayout->setObjectName(QStringLiteral("stopTrackingRuleLayout")); + stopTrackingRuleLayout->setObjectName(QString::fromUtf8("stopTrackingRuleLayout")); horizontalLayout = new QHBoxLayout(); horizontalLayout->setSpacing(0); - horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); + horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); mSmartStopTracking = new QCheckBox(PreferencesDlg); - mSmartStopTracking->setObjectName(QStringLiteral("mSmartStopTracking")); + mSmartStopTracking->setObjectName(QString::fromUtf8("mSmartStopTracking")); QSizePolicy sizePolicy2(QSizePolicy::Fixed, QSizePolicy::Fixed); sizePolicy2.setHorizontalStretch(20); sizePolicy2.setVerticalStretch(0); @@ -125,13 +123,13 @@ public: horizontalLayout->addWidget(mSmartStopTracking); mSmartStopIntervalInMinutes = new QLineEdit(PreferencesDlg); - mSmartStopIntervalInMinutes->setObjectName(QStringLiteral("mSmartStopIntervalInMinutes")); + mSmartStopIntervalInMinutes->setObjectName(QString::fromUtf8("mSmartStopIntervalInMinutes")); mSmartStopIntervalInMinutes->setMaximumSize(QSize(50, 16777215)); horizontalLayout->addWidget(mSmartStopIntervalInMinutes); label = new QLabel(PreferencesDlg); - label->setObjectName(QStringLiteral("label")); + label->setObjectName(QString::fromUtf8("label")); label->setMargin(3); horizontalLayout->addWidget(label); @@ -140,25 +138,25 @@ public: stopTrackingRuleLayout->addLayout(horizontalLayout); horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QStringLiteral("horizontalLayout_3")); + horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); horizontalSpacer_2 = new QSpacerItem(20, 20, QSizePolicy::Fixed, QSizePolicy::Minimum); horizontalLayout_3->addItem(horizontalSpacer_2); verticalLayout_2 = new QVBoxLayout(); verticalLayout_2->setSpacing(10); - verticalLayout_2->setObjectName(QStringLiteral("verticalLayout_2")); + verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); mAskQuestionOnStopRadiobutton = new QRadioButton(PreferencesDlg); buttonGroup = new QButtonGroup(PreferencesDlg); - buttonGroup->setObjectName(QStringLiteral("buttonGroup")); + buttonGroup->setObjectName(QString::fromUtf8("buttonGroup")); buttonGroup->addButton(mAskQuestionOnStopRadiobutton); - mAskQuestionOnStopRadiobutton->setObjectName(QStringLiteral("mAskQuestionOnStopRadiobutton")); + mAskQuestionOnStopRadiobutton->setObjectName(QString::fromUtf8("mAskQuestionOnStopRadiobutton")); verticalLayout_2->addWidget(mAskQuestionOnStopRadiobutton); mAutomaticallyOnStopRadiobutton = new QRadioButton(PreferencesDlg); buttonGroup->addButton(mAutomaticallyOnStopRadiobutton); - mAutomaticallyOnStopRadiobutton->setObjectName(QStringLiteral("mAutomaticallyOnStopRadiobutton")); + mAutomaticallyOnStopRadiobutton->setObjectName(QString::fromUtf8("mAutomaticallyOnStopRadiobutton")); verticalLayout_2->addWidget(mAutomaticallyOnStopRadiobutton); @@ -173,16 +171,16 @@ public: startTrackingRuleLayout = new QVBoxLayout(); startTrackingRuleLayout->setSpacing(0); - startTrackingRuleLayout->setObjectName(QStringLiteral("startTrackingRuleLayout")); + startTrackingRuleLayout->setObjectName(QString::fromUtf8("startTrackingRuleLayout")); horizontalLayout_4 = new QHBoxLayout(); - horizontalLayout_4->setObjectName(QStringLiteral("horizontalLayout_4")); + horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); mSmartStartTracking = new QCheckBox(PreferencesDlg); - mSmartStartTracking->setObjectName(QStringLiteral("mSmartStartTracking")); + mSmartStartTracking->setObjectName(QString::fromUtf8("mSmartStartTracking")); horizontalLayout_4->addWidget(mSmartStartTracking); label_2 = new QLabel(PreferencesDlg); - label_2->setObjectName(QStringLiteral("label_2")); + label_2->setObjectName(QString::fromUtf8("label_2")); horizontalLayout_4->addWidget(label_2); @@ -193,7 +191,7 @@ public: verticalLayout_3->addLayout(startTrackingRuleLayout); buttonBox = new QDialogButtonBox(PreferencesDlg); - buttonBox->setObjectName(QStringLiteral("buttonBox")); + buttonBox->setObjectName(QString::fromUtf8("buttonBox")); buttonBox->setOrientation(Qt::Horizontal); buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); buttonBox->setCenterButtons(true); @@ -211,20 +209,20 @@ public: void retranslateUi(QDialog *PreferencesDlg) { - PreferencesDlg->setWindowTitle(QApplication::translate("PreferencesDlg", "Dialog", Q_NULLPTR)); - mShowSecondsCheckbox->setText(QApplication::translate("PreferencesDlg", "Show seconds", Q_NULLPTR)); - mAutosavePasswordCheckbox->setText(QApplication::translate("PreferencesDlg", "Autosave password (requires app restart)", Q_NULLPTR)); - mShowTrayIconCheckbox->setText(QApplication::translate("PreferencesDlg", "Show tray icon", Q_NULLPTR)); - mDarkThemeCheckbox->setText(QApplication::translate("PreferencesDlg", "Use dark theme", Q_NULLPTR)); - mCustomDatabaseFileCheckbox->setText(QApplication::translate("PreferencesDlg", "Use database at custom location (requires app restart)", Q_NULLPTR)); - mSelectDatabaseButton->setText(QApplication::translate("PreferencesDlg", "Select file...", Q_NULLPTR)); - mDatabaseLocation->setText(QApplication::translate("PreferencesDlg", "Location of used database", Q_NULLPTR)); - mSmartStopTracking->setText(QApplication::translate("PreferencesDlg", "Stop tracking if idle detected for", Q_NULLPTR)); - label->setText(QApplication::translate("PreferencesDlg", "minutes", Q_NULLPTR)); - mAskQuestionOnStopRadiobutton->setText(QApplication::translate("PreferencesDlg", "Ask question", Q_NULLPTR)); - mAutomaticallyOnStopRadiobutton->setText(QApplication::translate("PreferencesDlg", "Automatically", Q_NULLPTR)); + PreferencesDlg->setWindowTitle(QApplication::translate("PreferencesDlg", "Dialog", nullptr)); + mShowSecondsCheckbox->setText(QApplication::translate("PreferencesDlg", "Show seconds", nullptr)); + mAutosavePasswordCheckbox->setText(QApplication::translate("PreferencesDlg", "Autosave password (requires app restart)", nullptr)); + mShowTrayIconCheckbox->setText(QApplication::translate("PreferencesDlg", "Show tray icon", nullptr)); + mDarkThemeCheckbox->setText(QApplication::translate("PreferencesDlg", "Use dark theme", nullptr)); + mCustomDatabaseFileCheckbox->setText(QApplication::translate("PreferencesDlg", "Use database at custom location (requires app restart)", nullptr)); + mSelectDatabaseButton->setText(QApplication::translate("PreferencesDlg", "Select file...", nullptr)); + mDatabaseLocation->setText(QApplication::translate("PreferencesDlg", "Location of used database", nullptr)); + mSmartStopTracking->setText(QApplication::translate("PreferencesDlg", "Stop tracking if idle detected for", nullptr)); + label->setText(QApplication::translate("PreferencesDlg", "minutes", nullptr)); + mAskQuestionOnStopRadiobutton->setText(QApplication::translate("PreferencesDlg", "Ask question", nullptr)); + mAutomaticallyOnStopRadiobutton->setText(QApplication::translate("PreferencesDlg", "Automatically", nullptr)); mSmartStartTracking->setText(QApplication::translate("PreferencesDlg", "Start tracking after stop on idle when user activity detected. \n" -"This option requires enabled automatic stop tracking on idle.", Q_NULLPTR)); +"This option requires enabled automatic stop tracking on idle.", nullptr)); label_2->setText(QString()); } // retranslateUi diff --git a/client/ui_startworkdialog.h b/client/ui_startworkdialog.h index 45bada0..8129b87 100644 --- a/client/ui_startworkdialog.h +++ b/client/ui_startworkdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'startworkdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,11 +10,8 @@ #define UI_STARTWORKDIALOG_H #include -#include #include -#include #include -#include #include #include @@ -30,11 +27,11 @@ public: void setupUi(QDialog *StartWorkDialog) { if (StartWorkDialog->objectName().isEmpty()) - StartWorkDialog->setObjectName(QStringLiteral("StartWorkDialog")); + StartWorkDialog->setObjectName(QString::fromUtf8("StartWorkDialog")); StartWorkDialog->resize(394, 61); StartWorkDialog->setSizeGripEnabled(false); mInfoLabel = new QLabel(StartWorkDialog); - mInfoLabel->setObjectName(QStringLiteral("mInfoLabel")); + mInfoLabel->setObjectName(QString::fromUtf8("mInfoLabel")); mInfoLabel->setGeometry(QRect(2, 2, 276, 51)); QFont font; font.setPointSize(12); @@ -43,7 +40,7 @@ public: mInfoLabel->setWordWrap(true); mInfoLabel->setMargin(4); mYesButton = new QToolButton(StartWorkDialog); - mYesButton->setObjectName(QStringLiteral("mYesButton")); + mYesButton->setObjectName(QString::fromUtf8("mYesButton")); mYesButton->setGeometry(QRect(280, 4, 111, 25)); QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); sizePolicy.setHorizontalStretch(0); @@ -55,7 +52,7 @@ public: mYesButton->setToolButtonStyle(Qt::ToolButtonTextOnly); mYesButton->setAutoRaise(true); mNoButton = new QToolButton(StartWorkDialog); - mNoButton->setObjectName(QStringLiteral("mNoButton")); + mNoButton->setObjectName(QString::fromUtf8("mNoButton")); mNoButton->setGeometry(QRect(280, 34, 111, 25)); sizePolicy.setHeightForWidth(mNoButton->sizePolicy().hasHeightForWidth()); mNoButton->setSizePolicy(sizePolicy); @@ -71,11 +68,11 @@ public: void retranslateUi(QDialog *StartWorkDialog) { - StartWorkDialog->setWindowTitle(QApplication::translate("StartWorkDialog", "Dialog", Q_NULLPTR)); + StartWorkDialog->setWindowTitle(QApplication::translate("StartWorkDialog", "Dialog", nullptr)); mInfoLabel->setText(QApplication::translate("StartWorkDialog", "Litt discovered user activity after idle interval. \n" -"Should Litt start tracking on %TASK%?", Q_NULLPTR)); - mYesButton->setText(QApplication::translate("StartWorkDialog", "Yes", Q_NULLPTR)); - mNoButton->setText(QApplication::translate("StartWorkDialog", "No", Q_NULLPTR)); +"Should Litt start tracking on %TASK%?", nullptr)); + mYesButton->setText(QApplication::translate("StartWorkDialog", "Yes", nullptr)); + mNoButton->setText(QApplication::translate("StartWorkDialog", "No", nullptr)); } // retranslateUi }; diff --git a/client/ui_stopworkdialog.h b/client/ui_stopworkdialog.h index 1be3164..bce987e 100644 --- a/client/ui_stopworkdialog.h +++ b/client/ui_stopworkdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'stopworkdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,11 +10,8 @@ #define UI_STOPWORKDIALOG_H #include -#include #include -#include #include -#include #include #include @@ -30,10 +27,10 @@ public: void setupUi(QDialog *StopWorkDialog) { if (StopWorkDialog->objectName().isEmpty()) - StopWorkDialog->setObjectName(QStringLiteral("StopWorkDialog")); + StopWorkDialog->setObjectName(QString::fromUtf8("StopWorkDialog")); StopWorkDialog->resize(386, 59); mInfoLabel = new QLabel(StopWorkDialog); - mInfoLabel->setObjectName(QStringLiteral("mInfoLabel")); + mInfoLabel->setObjectName(QString::fromUtf8("mInfoLabel")); mInfoLabel->setGeometry(QRect(7, 3, 241, 41)); QFont font; font.setPointSize(12); @@ -41,11 +38,11 @@ public: mInfoLabel->setScaledContents(false); mInfoLabel->setWordWrap(true); mYesButton = new QToolButton(StopWorkDialog); - mYesButton->setObjectName(QStringLiteral("mYesButton")); + mYesButton->setObjectName(QString::fromUtf8("mYesButton")); mYesButton->setGeometry(QRect(270, 3, 111, 25)); mYesButton->setFont(font); mNoButton = new QToolButton(StopWorkDialog); - mNoButton->setObjectName(QStringLiteral("mNoButton")); + mNoButton->setObjectName(QString::fromUtf8("mNoButton")); mNoButton->setGeometry(QRect(270, 32, 111, 25)); mNoButton->setFont(font); @@ -58,11 +55,11 @@ public: void retranslateUi(QDialog *StopWorkDialog) { - StopWorkDialog->setWindowTitle(QApplication::translate("StopWorkDialog", "Dialog", Q_NULLPTR)); + StopWorkDialog->setWindowTitle(QApplication::translate("StopWorkDialog", "Dialog", nullptr)); mInfoLabel->setText(QApplication::translate("StopWorkDialog", "Litt discovered idle interval at %TIME%.\n" -"Should app to continue work tracking?", Q_NULLPTR)); - mYesButton->setText(QApplication::translate("StopWorkDialog", "Yes", Q_NULLPTR)); - mNoButton->setText(QApplication::translate("StopWorkDialog", "No", Q_NULLPTR)); +"Should app to continue work tracking?", nullptr)); + mYesButton->setText(QApplication::translate("StopWorkDialog", "Yes", nullptr)); + mNoButton->setText(QApplication::translate("StopWorkDialog", "No", nullptr)); } // retranslateUi }; diff --git a/client/ui_timeintervaldlg.h b/client/ui_timeintervaldlg.h index 3160f42..11459ee 100644 --- a/client/ui_timeintervaldlg.h +++ b/client/ui_timeintervaldlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'timeintervaldlg.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,14 +10,11 @@ #define UI_TIMEINTERVALDLG_H #include -#include #include -#include #include #include #include #include -#include #include #include @@ -37,32 +34,32 @@ public: void setupUi(QDialog *TimeIntervalDlg) { if (TimeIntervalDlg->objectName().isEmpty()) - TimeIntervalDlg->setObjectName(QStringLiteral("TimeIntervalDlg")); + TimeIntervalDlg->setObjectName(QString::fromUtf8("TimeIntervalDlg")); TimeIntervalDlg->resize(400, 134); TimeIntervalDlg->setModal(false); verticalLayout = new QVBoxLayout(TimeIntervalDlg); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); formLayout = new QFormLayout(); - formLayout->setObjectName(QStringLiteral("formLayout")); + formLayout->setObjectName(QString::fromUtf8("formLayout")); mStartTimeLabel = new QLabel(TimeIntervalDlg); - mStartTimeLabel->setObjectName(QStringLiteral("mStartTimeLabel")); + mStartTimeLabel->setObjectName(QString::fromUtf8("mStartTimeLabel")); formLayout->setWidget(0, QFormLayout::LabelRole, mStartTimeLabel); mStartTimeEdit = new QDateTimeEdit(TimeIntervalDlg); - mStartTimeEdit->setObjectName(QStringLiteral("mStartTimeEdit")); + mStartTimeEdit->setObjectName(QString::fromUtf8("mStartTimeEdit")); mStartTimeEdit->setTime(QTime(1, 0, 0)); mStartTimeEdit->setCalendarPopup(true); formLayout->setWidget(0, QFormLayout::FieldRole, mStartTimeEdit); mFinishTimeLabel = new QLabel(TimeIntervalDlg); - mFinishTimeLabel->setObjectName(QStringLiteral("mFinishTimeLabel")); + mFinishTimeLabel->setObjectName(QString::fromUtf8("mFinishTimeLabel")); formLayout->setWidget(1, QFormLayout::LabelRole, mFinishTimeLabel); mFinishTimeEdit = new QDateTimeEdit(TimeIntervalDlg); - mFinishTimeEdit->setObjectName(QStringLiteral("mFinishTimeEdit")); + mFinishTimeEdit->setObjectName(QString::fromUtf8("mFinishTimeEdit")); mFinishTimeEdit->setCalendarPopup(true); formLayout->setWidget(1, QFormLayout::FieldRole, mFinishTimeEdit); @@ -71,7 +68,7 @@ public: verticalLayout->addLayout(formLayout); buttonBox = new QDialogButtonBox(TimeIntervalDlg); - buttonBox->setObjectName(QStringLiteral("buttonBox")); + buttonBox->setObjectName(QString::fromUtf8("buttonBox")); buttonBox->setOrientation(Qt::Horizontal); buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); buttonBox->setCenterButtons(true); @@ -88,9 +85,9 @@ public: void retranslateUi(QDialog *TimeIntervalDlg) { - TimeIntervalDlg->setWindowTitle(QApplication::translate("TimeIntervalDlg", "Time interval", Q_NULLPTR)); - mStartTimeLabel->setText(QApplication::translate("TimeIntervalDlg", "Start time:", Q_NULLPTR)); - mFinishTimeLabel->setText(QApplication::translate("TimeIntervalDlg", "Finish time:", Q_NULLPTR)); + TimeIntervalDlg->setWindowTitle(QApplication::translate("TimeIntervalDlg", "Time interval", nullptr)); + mStartTimeLabel->setText(QApplication::translate("TimeIntervalDlg", "Start time:", nullptr)); + mFinishTimeLabel->setText(QApplication::translate("TimeIntervalDlg", "Finish time:", nullptr)); } // retranslateUi }; diff --git a/client/ui_timetreedlg.h b/client/ui_timetreedlg.h index 454b212..a4576cd 100644 --- a/client/ui_timetreedlg.h +++ b/client/ui_timetreedlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'timetreedlg.ui' ** -** Created by: Qt User Interface Compiler version 5.9.5 +** Created by: Qt User Interface Compiler version 5.12.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -39,31 +38,31 @@ public: void setupUi(QDialog *TimeTreeDlg) { if (TimeTreeDlg->objectName().isEmpty()) - TimeTreeDlg->setObjectName(QStringLiteral("TimeTreeDlg")); + TimeTreeDlg->setObjectName(QString::fromUtf8("TimeTreeDlg")); TimeTreeDlg->resize(400, 300); TimeTreeDlg->setModal(true); mAddIntervalAction = new QAction(TimeTreeDlg); - mAddIntervalAction->setObjectName(QStringLiteral("mAddIntervalAction")); + mAddIntervalAction->setObjectName(QString::fromUtf8("mAddIntervalAction")); mRemoveIntervalAction = new QAction(TimeTreeDlg); - mRemoveIntervalAction->setObjectName(QStringLiteral("mRemoveIntervalAction")); + mRemoveIntervalAction->setObjectName(QString::fromUtf8("mRemoveIntervalAction")); mChangeIntervalAction = new QAction(TimeTreeDlg); - mChangeIntervalAction->setObjectName(QStringLiteral("mChangeIntervalAction")); + mChangeIntervalAction->setObjectName(QString::fromUtf8("mChangeIntervalAction")); gridLayout = new QGridLayout(TimeTreeDlg); - gridLayout->setObjectName(QStringLiteral("gridLayout")); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); mTimeTree = new QTreeView(TimeTreeDlg); - mTimeTree->setObjectName(QStringLiteral("mTimeTree")); + mTimeTree->setObjectName(QString::fromUtf8("mTimeTree")); gridLayout->addWidget(mTimeTree, 0, 0, 1, 1); verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); mAddIntervalButton = new QPushButton(TimeTreeDlg); - mAddIntervalButton->setObjectName(QStringLiteral("mAddIntervalButton")); + mAddIntervalButton->setObjectName(QString::fromUtf8("mAddIntervalButton")); verticalLayout->addWidget(mAddIntervalButton); mRemoveIntervalButton = new QPushButton(TimeTreeDlg); - mRemoveIntervalButton->setObjectName(QStringLiteral("mRemoveIntervalButton")); + mRemoveIntervalButton->setObjectName(QString::fromUtf8("mRemoveIntervalButton")); verticalLayout->addWidget(mRemoveIntervalButton); @@ -71,7 +70,7 @@ public: gridLayout->addLayout(verticalLayout, 0, 1, 1, 1); mButtonBox = new QDialogButtonBox(TimeTreeDlg); - mButtonBox->setObjectName(QStringLiteral("mButtonBox")); + mButtonBox->setObjectName(QString::fromUtf8("mButtonBox")); mButtonBox->setOrientation(Qt::Horizontal); mButtonBox->setStandardButtons(QDialogButtonBox::Ok); mButtonBox->setCenterButtons(true); @@ -88,12 +87,12 @@ public: void retranslateUi(QDialog *TimeTreeDlg) { - TimeTreeDlg->setWindowTitle(QApplication::translate("TimeTreeDlg", "Timeline", Q_NULLPTR)); - mAddIntervalAction->setText(QApplication::translate("TimeTreeDlg", "Add...", Q_NULLPTR)); - mRemoveIntervalAction->setText(QApplication::translate("TimeTreeDlg", "Remove", Q_NULLPTR)); - mChangeIntervalAction->setText(QApplication::translate("TimeTreeDlg", "Change...", Q_NULLPTR)); - mAddIntervalButton->setText(QApplication::translate("TimeTreeDlg", "Add...", Q_NULLPTR)); - mRemoveIntervalButton->setText(QApplication::translate("TimeTreeDlg", "Remove", Q_NULLPTR)); + TimeTreeDlg->setWindowTitle(QApplication::translate("TimeTreeDlg", "Timeline", nullptr)); + mAddIntervalAction->setText(QApplication::translate("TimeTreeDlg", "Add...", nullptr)); + mRemoveIntervalAction->setText(QApplication::translate("TimeTreeDlg", "Remove", nullptr)); + mChangeIntervalAction->setText(QApplication::translate("TimeTreeDlg", "Change...", nullptr)); + mAddIntervalButton->setText(QApplication::translate("TimeTreeDlg", "Add...", nullptr)); + mRemoveIntervalButton->setText(QApplication::translate("TimeTreeDlg", "Remove", nullptr)); } // retranslateUi }; diff --git a/redist/LittAppCast.xml b/redist/LittAppCast.xml index 7b93396..17c27d3 100644 --- a/redist/LittAppCast.xml +++ b/redist/LittAppCast.xml @@ -6,6 +6,16 @@ Most recent changes with links to updates. en + + + Version 0.9.1 + Thu, 09 Dec 2018 20:17:15 +0000 + http://satorilight.com/releasenotes.html + http://satorilight.com/releasenotes.html + http://satorilight.com/releasenotes.html + + + Version 0.8.13 Thu, 28 Jun 2015 20:17:15 +0000 diff --git a/redist/build_osx_qt5.sh b/redist/build_osx_qt5.sh index 9ffbf4b..42735fa 100755 --- a/redist/build_osx_qt5.sh +++ b/redist/build_osx_qt5.sh @@ -26,7 +26,7 @@ if [ "$MAKEBUILD" = "YES" ]; then rm -rf Makefile echo Running qmake - QT_BINARY_DIR=/Users/anand/Qt/5.9.5/clang_64/bin + QT_BINARY_DIR=/Users/anand/Qt5.12.0/5.12.0/clang_64/bin $QT_BINARY_DIR/qmake chooka.pro echo Building diff --git a/redist/changes.html b/redist/changes.html index 277976f..d8b454a 100644 --- a/redist/changes.html +++ b/redist/changes.html @@ -1,3 +1,6 @@ +

Changes in version 0.9.1

+

- rebuild with Qt 5.12 - native support Mojave dark mode

+

Changes in version 0.8.16

- one more fixed bug in time interval removing.

diff --git a/site/LittAppCast.xml b/site/LittAppCast.xml index 5a7bf7a..7ed765d 100644 --- a/site/LittAppCast.xml +++ b/site/LittAppCast.xml @@ -6,6 +6,14 @@ Most recent changes with links to updates. en + + Version 0.9.1 + Sun, 09 Dec 2018 14:34:39 +0000 + http://satorilight.com/releasenotes.html + http://satorilight.com/releasenotes.html + http://satorilight.com/releasenotes.html + + Version 0.8.16 Sat, 08 Apr 2017 18:43:45 +0000 diff --git a/site/index.html b/site/index.html index 4b65ae4..fb9d853 100644 --- a/site/index.html +++ b/site/index.html @@ -60,7 +60,7 @@

Availability

-

DMG package for OS X 10.6+

+

DMG package for OS X 10.6+

Changelog |

@@ -83,7 +83,7 @@
-
(C) com.satorilight 2012 - 2017
+
(C) com.satorilight 2012 - 2018
diff --git a/site/index.html.bak b/site/index.html.bak index 1c60125..0022428 100644 --- a/site/index.html.bak +++ b/site/index.html.bak @@ -60,7 +60,7 @@

Availability

-

DMG package for OS X 10.6+

+

DMG package for OS X 10.6+

Changelog |

diff --git a/site/releasenotes.html b/site/releasenotes.html index d77c49d..e1febc2 100644 --- a/site/releasenotes.html +++ b/site/releasenotes.html @@ -17,6 +17,16 @@ + +

Changes in version 0.9.1

+

- rebuild with Qt 5.12 - native support Mojave dark mode

+ +

Changes in version 0.8.16

+

- one more fixed bug in time interval removing.

+ + + +

Changes in version 0.8.16

- one more fixed bug in time interval removing.