diff --git a/core/BackupFormatModel.cpp b/core/BackupFormatModel.cpp index dc265c8..639b337 100644 --- a/core/BackupFormatModel.cpp +++ b/core/BackupFormatModel.cpp @@ -34,6 +34,7 @@ namespace { BackupFormatModel::BackupFormatModel(QObject *parent) : QAbstractListModel(parent) { + } //QVariant BackupFormatModel::headerData(int section, Qt::Orientation orientation, int role) const diff --git a/core/BackupFormatModel.h b/core/BackupFormatModel.h index 471b3c1..8615b32 100644 --- a/core/BackupFormatModel.h +++ b/core/BackupFormatModel.h @@ -3,6 +3,7 @@ #include + class BackupFormatModel : public QAbstractListModel { Q_OBJECT @@ -21,6 +22,7 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; private: + }; #endif // BACKUPFORMATMODEL_H diff --git a/core/core.pro b/core/core.pro index 7b66672..d0851a8 100644 --- a/core/core.pro +++ b/core/core.pro @@ -15,9 +15,6 @@ CONFIG += staticlib error( "Couldn't find the common.pri file!" ) } -INCLUDEPATH += C:\Prog\include\pgsql - - # You can also make your code fail to compile if you use deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. diff --git a/pglab/ColumnPage.cpp b/pglab/ColumnPage.cpp index 892322d..18fef08 100644 --- a/pglab/ColumnPage.cpp +++ b/pglab/ColumnPage.cpp @@ -11,6 +11,7 @@ #include "UserConfiguration.h" #include "catalog/PgClass.h" #include +#include #include #include @@ -25,6 +26,7 @@ ColumnPage::ColumnPage(QWidget *parent) m_columnModel = new ColumnTableModel(this); m_sortFilterProxy = new QSortFilterProxyModel(this); m_sortFilterProxy->setSourceModel(m_columnModel); + m_tableView->setItemDelegateForColumn(ColumnTableModel::TypeCol, new QStyledItemDelegate(this)); m_tableView->setModel(m_sortFilterProxy); m_tableView->setSortingEnabled(true); m_tableView->setSelectionBehavior(QAbstractItemView::SelectRows); diff --git a/pglab/pglab.pro b/pglab/pglab.pro index 5c2e24b..9e43dae 100644 --- a/pglab/pglab.pro +++ b/pglab/pglab.pro @@ -184,8 +184,6 @@ RESOURCES += \ QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 -LIBS += -Lc:/prog/lib/ - win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore @@ -195,7 +193,6 @@ DEPENDPATH += $$PWD/../core win32:CONFIG(debug, debug|release): LIBS += -lbotand else:win32:CONFIG(release, debug|release): LIBS += -lbotan - win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib diff --git a/pglab/widgets/CatalogTablesPage.cpp b/pglab/widgets/CatalogTablesPage.cpp index 391475a..a38992d 100644 --- a/pglab/widgets/CatalogTablesPage.cpp +++ b/pglab/widgets/CatalogTablesPage.cpp @@ -105,6 +105,7 @@ void CatalogTablesPage::setCatalog(std::shared_ptr cat) void CatalogTablesPage::setNamespaceFilter(NamespaceFilter filter) { m_tablesModel->setNamespaceFilter(filter); + m_tableView->resizeColumnsToContents(); } void CatalogTablesPage::tableListTable_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) diff --git a/pglablib/pglablib.pro b/pglablib/pglablib.pro index 5ddce1c..788bbbc 100644 --- a/pglablib/pglablib.pro +++ b/pglablib/pglablib.pro @@ -14,8 +14,6 @@ CONFIG += staticlib error( "Couldn't find the common.pri file!" ) } -INCLUDEPATH += C:\Prog\include\pgsql - # You can also make your code fail to compile if you use deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. diff --git a/pgsql/pgsql.pro b/pgsql/pgsql.pro index e036edd..2f5aa4c 100644 --- a/pgsql/pgsql.pro +++ b/pgsql/pgsql.pro @@ -16,18 +16,7 @@ TEMPLATE = lib error( "Couldn't find the common.pri file!" ) } -#LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib -LIBS += -LC:/PROG/LIB -lws2_32 -llibpq - -debug { -#LIBS += c:/prog/lib/botand_imp.lib -} - -release { -# LIBS += c:\prog\lib\botan.lib -} - -#win32:RC_ICONS += pglab.ico +LIBS += -lws2_32 -llibpq SOURCES += Pgsql_Connection.cpp \ Pgsql_Params.cpp \ @@ -56,12 +45,6 @@ HEADERS += Pgsql_Connection.h \ Pgsql_ErrorDetails.h \ Pgsql_Canceller.h -#FORMS += - -#RESOURCES += \ -# resources.qrc - -#QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore diff --git a/tests/PgsqlTests/PgsqlTests.pro b/tests/PgsqlTests/PgsqlTests.pro index 28bf378..cb1d574 100644 --- a/tests/PgsqlTests/PgsqlTests.pro +++ b/tests/PgsqlTests/PgsqlTests.pro @@ -11,10 +11,6 @@ CONFIG += qt QT += core -INCLUDEPATH += C:\Prog\include\pgsql - - - HEADERS += SOURCES += main.cpp \ diff --git a/tests/pglabtests/pglabtests.pro b/tests/pglabtests/pglabtests.pro index 646d1b0..eeafb33 100644 --- a/tests/pglabtests/pglabtests.pro +++ b/tests/pglabtests/pglabtests.pro @@ -30,13 +30,11 @@ SOURCES += main.cpp \ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../core/release/ -lcore else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../core/debug/ -lcore -INCLUDEPATH += C:\prog\include \ -C:\Prog\include\pgsql \ -C:\VSproj\boost32\include - INCLUDEPATH += $$PWD/../../core DEPENDPATH += $$PWD/../../core -LIBS += c:\prog\lib\botand.lib + +win32:CONFIG(debug, debug|release): LIBS += -lbotand +else:win32:CONFIG(release, debug|release): LIBS += -lbotan win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/release/libcore.a else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/debug/libcore.a