- Users table model renamed to UsersTableModel- causes linker conflict

with class TableModel in accomodation plugin.
- Edit record dialog is now screen centered.
- Plugin tabs in application main window are now closable.
This commit is contained in:
2015-11-24 15:09:50 +01:00
parent a6d795ec87
commit 989c8fdac3
8 changed files with 24 additions and 6 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
#include "tablemodel.h"
TableModel::TableModel(QObject *parent) :AutoTableModel<User>(parent)
UsersTableModel::UsersTableModel(QObject *parent) :AutoTableModel<User>(parent)
{
}
+2 -2
View File
@@ -5,11 +5,11 @@
#include "../data/core-data.h"
#include "core-odb.hxx"
class TableModel : public AutoTableModel<User>
class UsersTableModel : public AutoTableModel<User>
{
Q_OBJECT
public:
explicit TableModel(QObject *parent = NULL);
explicit UsersTableModel(QObject *parent = NULL);
};
#endif // TABLEMODEL_H
+1 -1
View File
@@ -3,7 +3,7 @@
UsersUi::UsersUi(QWidget *parent) :GridForm<User>(parent)
{
setTableModel(new TableModel);
setTableModel(new UsersTableModel);
}
UsersUi::~UsersUi()