eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Several fixes for compilation with gcc (doesn't link)

Browse source
This commit is contained in:
eelke 2017-08-22 12:45:45 +02:00
parent a2f39692a2
commit dd9906dbd8
20 changed files with 379 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/BackupFormatModel.cpp
View file

@ -58,13 +58,13 @@ BackupFormatModel::BackupFormatModel(QObject *parent)
//}
int BackupFormatModel::rowCount(const QModelIndex &parent) const
int BackupFormatModel::rowCount(const QModelIndex &) const
{
int size = g_BackupFormats.size();
return size;
}
int BackupFormatModel::columnCount(const QModelIndex &parent) const
int BackupFormatModel::columnCount(const QModelIndex &) const
{
return 3;
@ -80,13 +80,13 @@ QVariant BackupFormatModel::data(const QModelIndex &index, int role) const
if (role == Qt::DisplayRole) {
const auto &item = g_BackupFormats.at(row);
switch (col) {
case Column::Short:
case ColumnShort:
result = item.shortFlag;
break;
case Column::Long:
case ColumnLong:
result = item.longFlag;
break;
case Column::Description:
case ColumnDescription:
result = item.description;
break;
}

2
core/BackupFormatModel.h
View file

@ -8,7 +8,7 @@ class BackupFormatModel : public QAbstractListModel
Q_OBJECT
public:
enum class Column { Short=1, Long=0, Description=2 };
enum Column { ColumnShort=1, ColumnLong=0, ColumnDescription=2 };
explicit BackupFormatModel(QObject *parent);

12
core/Expected.h
View file

@ -1,7 +1,9 @@
#ifndef EXPECTED_H
#define EXPECTED_H
#include <exception>
#include <stdexcept>
#include <typeinfo>
#include <utility>
template <typename T>
class Expected {
@ -168,13 +170,13 @@ public:
Expected(const Expected& rhs)
: m_valid(rhs.m_valid)
, m_error(rhs.m_error)
: m_error(rhs.m_error)
, m_valid(rhs.m_valid)
{}
Expected(Expected<void> &&rhs)
: m_valid(rhs.m_valid)
, m_error(std::move(rhs.m_error))
: m_error(std::move(rhs.m_error))
, m_valid(rhs.m_valid)
{}
~Expected()

4
core/core.pro
View file

@ -8,11 +8,11 @@ QT -= gui
TARGET = core
TEMPLATE = lib
CONFIG += staticlib c++11
CONFIG += staticlib c++14
INCLUDEPATH += C:\prog\include C:\VSproj\boost_1_63_0
DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX
LIBS += /LIBPATH:C:\VSproj\boost_1_63_0\stage\lib /LIBPATH:c:\prog\lib\ libpq.lib fmt.lib User32.lib ws2_32.lib
#LIBS += /LIBPATH:C:\VSproj\boost_1_63_0\stage\lib /LIBPATH:c:\prog\lib\ libpq.lib fmt.lib User32.lib ws2_32.lib
# The following define makes your compiler emit warnings if you use