- 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:
@@ -1,6 +1,6 @@
|
||||
#include "tablemodel.h"
|
||||
|
||||
TableModel::TableModel(QObject *parent) :AutoTableModel<User>(parent)
|
||||
UsersTableModel::UsersTableModel(QObject *parent) :AutoTableModel<User>(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
UsersUi::UsersUi(QWidget *parent) :GridForm<User>(parent)
|
||||
{
|
||||
setTableModel(new TableModel);
|
||||
setTableModel(new UsersTableModel);
|
||||
}
|
||||
|
||||
UsersUi::~UsersUi()
|
||||
|
||||
Reference in New Issue
Block a user