hatam
/
QtMvvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix ci missing includes and const ref

pull/2/head
Skycoder42 8 years ago
parent
8e5eb5d048
commit
50950f4880
3 changed files with 38 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/mvvmcore/message.cpp
  2. 36
      src/mvvmcore/message.h
  3. 4
      src/mvvmcore/message_p.h

32
src/mvvmcore/message.cpp
View File

@ -267,7 +267,7 @@ MessageResult *QtMvvm::information(const QString &title, const QString &text, co
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::information(const QString &title, const QString &text, QObject *scope, std::function<void ()> onResult, const QString &okText) void QtMvvm::information(const QString &title, const QString &text, QObject *scope, const std::function<void ()> &onResult, const QString &okText)
{ {
auto result = information(title, text, okText); auto result = information(title, text, okText);
if(result) { if(result) {
@ -277,7 +277,7 @@ void QtMvvm::information(const QString &title, const QString &text, QObject *sco
} }
} }
void QtMvvm::information(const QString &title, const QString &text, std::function<void ()> onResult, const QString &okText) void QtMvvm::information(const QString &title, const QString &text, const std::function<void ()> &onResult, const QString &okText)
{ {
information(title, text, CoreApp::instance(), onResult, okText); information(title, text, CoreApp::instance(), onResult, okText);
} }
@ -294,7 +294,7 @@ MessageResult *QtMvvm::question(const QString &title, const QString &text, const
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::question(const QString &title, const QString &text, QObject *scope, std::function<void (bool)> onResult, const QString &yesText, const QString &noText) void QtMvvm::question(const QString &title, const QString &text, QObject *scope, const std::function<void (bool)> &onResult, const QString &yesText, const QString &noText)
{ {
auto result = question(title, text, yesText, noText); auto result = question(title, text, yesText, noText);
if(result) { if(result) {
@ -305,7 +305,7 @@ void QtMvvm::question(const QString &title, const QString &text, QObject *scope,
} }
} }
void QtMvvm::question(const QString &title, const QString &text, std::function<void (bool)> onResult, const QString &yesText, const QString &noText) void QtMvvm::question(const QString &title, const QString &text, const std::function<void (bool)> &onResult, const QString &yesText, const QString &noText)
{ {
question(title, text, CoreApp::instance(), onResult, yesText, noText); question(title, text, CoreApp::instance(), onResult, yesText, noText);
} }
@ -320,7 +320,7 @@ MessageResult *QtMvvm::warning(const QString &title, const QString &text, const
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::warning(const QString &title, const QString &text, QObject *scope, std::function<void ()> onResult, const QString &okText) void QtMvvm::warning(const QString &title, const QString &text, QObject *scope, const std::function<void ()> &onResult, const QString &okText)
{ {
auto result = warning(title, text, okText); auto result = warning(title, text, okText);
if(result) { if(result) {
@ -330,7 +330,7 @@ void QtMvvm::warning(const QString &title, const QString &text, QObject *scope,
} }
} }
void QtMvvm::warning(const QString &title, const QString &text, std::function<void ()> onResult, const QString &okText) void QtMvvm::warning(const QString &title, const QString &text, const std::function<void ()> &onResult, const QString &okText)
{ {
warning(title, text, CoreApp::instance(), onResult, okText); warning(title, text, CoreApp::instance(), onResult, okText);
} }
@ -345,7 +345,7 @@ MessageResult *QtMvvm::critical(const QString &title, const QString &text, const
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::critical(const QString &title, const QString &text, QObject *scope, std::function<void ()> onResult, const QString &okText) void QtMvvm::critical(const QString &title, const QString &text, QObject *scope, const std::function<void ()> &onResult, const QString &okText)
{ {
auto result = critical(title, text, okText); auto result = critical(title, text, okText);
if(result) { if(result) {
@ -355,7 +355,7 @@ void QtMvvm::critical(const QString &title, const QString &text, QObject *scope,
} }
} }
void QtMvvm::critical(const QString &title, const QString &text, std::function<void ()> onResult, const QString &okText) void QtMvvm::critical(const QString &title, const QString &text, const std::function<void ()> &onResult, const QString &okText)
{ {
critical(title, text, CoreApp::instance(), onResult, okText); critical(title, text, CoreApp::instance(), onResult, okText);
} }
@ -444,7 +444,7 @@ MessageResult *QtMvvm::getInput(const QString &title, const QString &text, const
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::getInput(const QString &title, const QString &text, const char *inputType, QObject *scope, std::function<void (QVariant)> onResult, const QVariant &defaultValue, const QVariantMap &viewProperties, const QString &okText, const QString &cancelText) void QtMvvm::getInput(const QString &title, const QString &text, const char *inputType, QObject *scope, const std::function<void (QVariant)> &onResult, const QVariant &defaultValue, const QVariantMap &viewProperties, const QString &okText, const QString &cancelText)
{ {
auto result = getInput(title, text, inputType, defaultValue, viewProperties, okText, cancelText); auto result = getInput(title, text, inputType, defaultValue, viewProperties, okText, cancelText);
if(result) { if(result) {
@ -455,7 +455,7 @@ void QtMvvm::getInput(const QString &title, const QString &text, const char *inp
} }
} }
void QtMvvm::getInput(const QString &title, const QString &text, const char *inputType, std::function<void (QVariant)> onResult, const QVariant &defaultValue, const QVariantMap &viewProperties, const QString &okText, const QString &cancelText) void QtMvvm::getInput(const QString &title, const QString &text, const char *inputType, const std::function<void (QVariant)> &onResult, const QVariant &defaultValue, const QVariantMap &viewProperties, const QString &okText, const QString &cancelText)
{ {
getInput(title, text, inputType, CoreApp::instance(), onResult, defaultValue, viewProperties, okText, cancelText); getInput(title, text, inputType, CoreApp::instance(), onResult, defaultValue, viewProperties, okText, cancelText);
} }
@ -468,7 +468,7 @@ MessageResult *QtMvvm::getExistingDirectory(const QString &title, const QUrl &di
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::getExistingDirectory(QObject *scope, std::function<void (QUrl)> onResult, const QString &title, const QUrl &dir) void QtMvvm::getExistingDirectory(QObject *scope, const std::function<void (QUrl)> &onResult, const QString &title, const QUrl &dir)
{ {
auto result = getExistingDirectory(title, dir); auto result = getExistingDirectory(title, dir);
if(result) { if(result) {
@ -479,7 +479,7 @@ void QtMvvm::getExistingDirectory(QObject *scope, std::function<void (QUrl)> onR
} }
} }
void QtMvvm::getExistingDirectory(std::function<void (QUrl)> onResult, const QString &title, const QUrl &dir) void QtMvvm::getExistingDirectory(const std::function<void (QUrl)> &onResult, const QString &title, const QUrl &dir)
{ {
getExistingDirectory(CoreApp::instance(), onResult, title, dir); getExistingDirectory(CoreApp::instance(), onResult, title, dir);
} }
@ -493,7 +493,7 @@ MessageResult *QtMvvm::getOpenFile(const QString &title, const QStringList &supp
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::getOpenFile(QObject *scope, std::function<void (QUrl)> onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir) void QtMvvm::getOpenFile(QObject *scope, const std::function<void (QUrl)> &onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir)
{ {
auto result = getOpenFile(title, supportedMimeTypes, dir); auto result = getOpenFile(title, supportedMimeTypes, dir);
if(result) { if(result) {
@ -504,7 +504,7 @@ void QtMvvm::getOpenFile(QObject *scope, std::function<void (QUrl)> onResult, co
} }
} }
void QtMvvm::getOpenFile(std::function<void (QUrl)> onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir) void QtMvvm::getOpenFile(const std::function<void (QUrl)> &onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir)
{ {
getOpenFile(CoreApp::instance(), onResult, title, supportedMimeTypes, dir); getOpenFile(CoreApp::instance(), onResult, title, supportedMimeTypes, dir);
} }
@ -543,7 +543,7 @@ MessageResult *QtMvvm::getSaveFile(const QString &title, const QStringList &supp
return CoreApp::showDialog(config); return CoreApp::showDialog(config);
} }
void QtMvvm::getSaveFile(QObject *scope, std::function<void (QUrl)> onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir) void QtMvvm::getSaveFile(QObject *scope, const std::function<void (QUrl)> &onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir)
{ {
auto result = getSaveFile(title, supportedMimeTypes, dir); auto result = getSaveFile(title, supportedMimeTypes, dir);
if(result) { if(result) {
@ -554,7 +554,7 @@ void QtMvvm::getSaveFile(QObject *scope, std::function<void (QUrl)> onResult, co
} }
} }
void QtMvvm::getSaveFile(std::function<void (QUrl)> onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir) void QtMvvm::getSaveFile(const std::function<void (QUrl)> &onResult, const QString &title, const QStringList &supportedMimeTypes, const QUrl &dir)
{ {
getSaveFile(CoreApp::instance(), onResult, title, supportedMimeTypes, dir); getSaveFile(CoreApp::instance(), onResult, title, supportedMimeTypes, dir);
} }

36
src/mvvmcore/message.h
View File

@ -151,11 +151,11 @@ Q_MVVMCORE_EXPORT MessageResult *information(const QString &title,
Q_MVVMCORE_EXPORT void information(const QString &title, Q_MVVMCORE_EXPORT void information(const QString &title,
const QString &text, const QString &text,
QObject *scope, QObject *scope,
std::function<void()> onResult, const std::function<void()> &onResult,
const QString &okText = {}); const QString &okText = {});
Q_MVVMCORE_EXPORT void information(const QString &title, Q_MVVMCORE_EXPORT void information(const QString &title,
const QString &text, const QString &text,
std::function<void()> onResult, const std::function<void()> &onResult,
const QString &okText = {}); const QString &okText = {});
Q_MVVMCORE_EXPORT MessageResult *question(const QString &title, Q_MVVMCORE_EXPORT MessageResult *question(const QString &title,
@ -165,12 +165,12 @@ Q_MVVMCORE_EXPORT MessageResult *question(const QString &title,
Q_MVVMCORE_EXPORT void question(const QString &title, Q_MVVMCORE_EXPORT void question(const QString &title,
const QString &text, const QString &text,
QObject *scope, QObject *scope,
std::function<void(bool)> onResult, const std::function<void(bool)> &onResult,
const QString &yesText = {}, const QString &yesText = {},
const QString &noText = {}); const QString &noText = {});
Q_MVVMCORE_EXPORT void question(const QString &title, Q_MVVMCORE_EXPORT void question(const QString &title,
const QString &text, const QString &text,
std::function<void(bool)> onResult, const std::function<void(bool)> &onResult,
const QString &yesText = {}, const QString &yesText = {},
const QString &noText = {}); const QString &noText = {});
@ -180,11 +180,11 @@ Q_MVVMCORE_EXPORT MessageResult *warning(const QString &title,
Q_MVVMCORE_EXPORT void warning(const QString &title, Q_MVVMCORE_EXPORT void warning(const QString &title,
const QString &text, const QString &text,
QObject *scope, QObject *scope,
std::function<void()> onResult, const std::function<void()> &onResult,
const QString &okText = {}); const QString &okText = {});
Q_MVVMCORE_EXPORT void warning(const QString &title, Q_MVVMCORE_EXPORT void warning(const QString &title,
const QString &text, const QString &text,
std::function<void()> onResult, const std::function<void()> &onResult,
const QString &okText = {}); const QString &okText = {});
Q_MVVMCORE_EXPORT MessageResult *critical(const QString &title, Q_MVVMCORE_EXPORT MessageResult *critical(const QString &title,
@ -193,11 +193,11 @@ Q_MVVMCORE_EXPORT MessageResult *critical(const QString &title,
Q_MVVMCORE_EXPORT void critical(const QString &title, Q_MVVMCORE_EXPORT void critical(const QString &title,
const QString &text, const QString &text,
QObject *scope, QObject *scope,
std::function<void()> onResult, const std::function<void()> &onResult,
const QString &okText = {}); const QString &okText = {});
Q_MVVMCORE_EXPORT void critical(const QString &title, Q_MVVMCORE_EXPORT void critical(const QString &title,
const QString &text, const QString &text,
std::function<void()> onResult, const std::function<void()> &onResult,
const QString &okText = {}); const QString &okText = {});
Q_MVVMCORE_EXPORT MessageResult *about(const QString &description, Q_MVVMCORE_EXPORT MessageResult *about(const QString &description,
@ -220,7 +220,7 @@ Q_MVVMCORE_EXPORT void getInput(const QString &title,
const QString &text, const QString &text,
const char *inputType, const char *inputType,
QObject *scope, QObject *scope,
std::function<void(QVariant)> onResult, const std::function<void(QVariant)> &onResult,
const QVariant &defaultValue = {}, const QVariant &defaultValue = {},
const QVariantMap &viewProperties = {}, const QVariantMap &viewProperties = {},
const QString &okText = {}, const QString &okText = {},
@ -228,7 +228,7 @@ Q_MVVMCORE_EXPORT void getInput(const QString &title,
Q_MVVMCORE_EXPORT void getInput(const QString &title, Q_MVVMCORE_EXPORT void getInput(const QString &title,
const QString &text, const QString &text,
const char *inputType, const char *inputType,
std::function<void(QVariant)> onResult, const std::function<void(QVariant)> &onResult,
const QVariant &defaultValue = {}, const QVariant &defaultValue = {},
const QVariantMap &viewProperties = {}, const QVariantMap &viewProperties = {},
const QString &okText = {}, const QString &okText = {},
@ -247,7 +247,7 @@ template <typename TEdit>
inline void getInput(const QString &title, inline void getInput(const QString &title,
const QString &text, const QString &text,
QObject *scope, QObject *scope,
std::function<void(TEdit)> onResult, const std::function<void(TEdit)> &onResult,
const QVariant &defaultValue = {}, const QVariant &defaultValue = {},
const QVariantMap &viewProperties = {}, const QVariantMap &viewProperties = {},
const QString &okText = {}, const QString &okText = {},
@ -259,7 +259,7 @@ inline void getInput(const QString &title,
template <typename TEdit> template <typename TEdit>
inline void getInput(const QString &title, inline void getInput(const QString &title,
const QString &text, const QString &text,
std::function<void(TEdit)> onResult, const std::function<void(TEdit)> &onResult,
const QVariant &defaultValue = {}, const QVariant &defaultValue = {},
const QVariantMap &viewProperties = {}, const QVariantMap &viewProperties = {},
const QString &okText = {}, const QString &okText = {},
@ -272,10 +272,10 @@ inline void getInput(const QString &title,
Q_MVVMCORE_EXPORT MessageResult *getExistingDirectory(const QString &title = {}, Q_MVVMCORE_EXPORT MessageResult *getExistingDirectory(const QString &title = {},
const QUrl &dir = {}); const QUrl &dir = {});
Q_MVVMCORE_EXPORT void getExistingDirectory(QObject *scope, Q_MVVMCORE_EXPORT void getExistingDirectory(QObject *scope,
std::function<void(QUrl)> onResult, const std::function<void(QUrl)> &onResult,
const QString &title = {}, const QString &title = {},
const QUrl &dir = {}); const QUrl &dir = {});
Q_MVVMCORE_EXPORT void getExistingDirectory(std::function<void(QUrl)> onResult, Q_MVVMCORE_EXPORT void getExistingDirectory(const std::function<void(QUrl)> &onResult,
const QString &title = {}, const QString &title = {},
const QUrl &dir = {}); const QUrl &dir = {});
@ -283,11 +283,11 @@ Q_MVVMCORE_EXPORT MessageResult *getOpenFile(const QString &title = {},
const QStringList &supportedMimeTypes = {}, const QStringList &supportedMimeTypes = {},
const QUrl &dir = {}); const QUrl &dir = {});
Q_MVVMCORE_EXPORT void getOpenFile(QObject *scope, Q_MVVMCORE_EXPORT void getOpenFile(QObject *scope,
std::function<void(QUrl)> onResult, const std::function<void(QUrl)> &onResult,
const QString &title = {}, const QString &title = {},
const QStringList &supportedMimeTypes = {}, const QStringList &supportedMimeTypes = {},
const QUrl &dir = {}); const QUrl &dir = {});
Q_MVVMCORE_EXPORT void getOpenFile(std::function<void(QUrl)> onResult, Q_MVVMCORE_EXPORT void getOpenFile(const std::function<void(QUrl)> &onResult,
const QString &title = {}, const QString &title = {},
const QStringList &supportedMimeTypes = {}, const QStringList &supportedMimeTypes = {},
const QUrl &dir = {}); const QUrl &dir = {});
@ -309,11 +309,11 @@ Q_MVVMCORE_EXPORT MessageResult *getSaveFile(const QString &title = {},
const QStringList &supportedMimeTypes = {}, const QStringList &supportedMimeTypes = {},
const QUrl &dir = {}); const QUrl &dir = {});
Q_MVVMCORE_EXPORT void getSaveFile(QObject *scope, Q_MVVMCORE_EXPORT void getSaveFile(QObject *scope,
std::function<void(QUrl)> onResult, const std::function<void(QUrl)> &onResult,
const QString &title = {}, const QString &title = {},
const QStringList &supportedMimeTypes = {}, const QStringList &supportedMimeTypes = {},
const QUrl &dir = {}); const QUrl &dir = {});
Q_MVVMCORE_EXPORT void getSaveFile(std::function<void(QUrl)> onResult, Q_MVVMCORE_EXPORT void getSaveFile(const std::function<void(QUrl)> &onResult,
const QString &title = {}, const QString &title = {},
const QStringList &supportedMimeTypes = {}, const QStringList &supportedMimeTypes = {},
const QUrl &dir = {}); const QUrl &dir = {});

4
src/mvvmcore/message_p.h
View File

@ -1,6 +1,10 @@
#ifndef QTMVVM_MESSAGE_P_H #ifndef QTMVVM_MESSAGE_P_H
#define QTMVVM_MESSAGE_P_H #define QTMVVM_MESSAGE_P_H
#include <QtCore/QHash>
#include <QtCore/QPointer>
#include <QtCore/QMetaMethod>
#include "qtmvvmcore_global.h" #include "qtmvvmcore_global.h"
#include "message.h" #include "message.h"

Write Preview
Loading…
Cancel
Save