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

build fixes

Browse source 
# Conflicts:
#	pglablib/sqlast/SelectList.h
This commit is contained in:
eelke 2022-05-24 18:56:39 +02:00
parent 2ad5fa5e4e
commit a7d4a5f13d
7 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/ScopeGuard.h
View file

@ -1,6 +1,8 @@
#ifndef SCOPEGUARD_H #ifndef SCOPEGUARD_H
#define SCOPEGUARD_H #define SCOPEGUARD_H
#include <utility>
/** \brief Template class for executing code at scope exit. /** \brief Template class for executing code at scope exit.
* *
* By default the object will be an active mode and execute the function * By default the object will be an active mode and execute the function

2
pglab/CodeGenerator.ui
View file

@ -72,7 +72,7 @@
<customwidget> <customwidget>
<class>CodeEditor</class> <class>CodeEditor</class>
<extends>QPlainTextEdit</extends> <extends>QPlainTextEdit</extends>
<header>CodeEditor.h</header> <header>codeeditor/CodeEditor.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

2
pglab/widgets/SingleRecordWidget.ui
View file

@ -23,7 +23,7 @@
<customwidget> <customwidget>
<class>PgLabTableView</class> <class>PgLabTableView</class>
<extends>QTableView</extends> <extends>QTableView</extends>
<header>PgLabTableView.h</header> <header>util/PgLabTableView.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>

8
pglablib/ASyncDBConnection.cpp
View file

@ -269,7 +269,7 @@ void ASyncDBConnectionThread::doStateCallback(ASyncDBConnection::State state)
// if (m_stateCallback.m_func) { // if (m_stateCallback.m_func) {
// m_stateCallback.m_func(state); // m_stateCallback.m_func(state);
// } // }
emit asyncConnObject->onStateChanged(state); Q_EMIT asyncConnObject->onStateChanged(state);
} }
void ASyncDBConnectionThread::waitForAndSendCommand() void ASyncDBConnectionThread::waitForAndSendCommand()
@ -439,7 +439,7 @@ void ASyncDBConnectionThread::processNotice(const PGresult *result)
// m_noticeCallback.m_func(details); // m_noticeCallback.m_func(details);
// } // }
Pgsql::ErrorDetails details = Pgsql::ErrorDetails::createErrorDetailsFromPGresult(result); Pgsql::ErrorDetails details = Pgsql::ErrorDetails::createErrorDetailsFromPGresult(result);
emit asyncConnObject->onNotice(details); Q_EMIT asyncConnObject->onNotice(details);
} }
@ -480,7 +480,7 @@ void ASyncDBConnection::doStateCallback(State state)
m_connection.setNoticeReceiver( m_connection.setNoticeReceiver(
[this](const PGresult *result) { processNotice(result); }); [this](const PGresult *result) { processNotice(result); });
} }
emit onStateChanged(state); Q_EMIT onStateChanged(state);
} }
@ -526,5 +526,5 @@ bool ASyncDBConnection::cancel()
void ASyncDBConnection::processNotice(const PGresult *result) void ASyncDBConnection::processNotice(const PGresult *result)
{ {
Pgsql::ErrorDetails details = Pgsql::ErrorDetails::createErrorDetailsFromPGresult(result); Pgsql::ErrorDetails details = Pgsql::ErrorDetails::createErrorDetailsFromPGresult(result);
emit onNotice(details); Q_EMIT onNotice(details);
} }

2
pglablib/ASyncDBConnection.h
View file

@ -65,7 +65,7 @@ public:
bool cancel(); bool cancel();
signals: Q_SIGNALS:
void onStateChanged(ASyncDBConnection::State state); void onStateChanged(ASyncDBConnection::State state);
void onNotice(Pgsql::ErrorDetails notice); void onNotice(Pgsql::ErrorDetails notice);
// void onQueryResult(std::shared_ptr<Pgsql::Result> result); // void onQueryResult(std::shared_ptr<Pgsql::Result> result);

2
pglablib/ParamListModel.cpp
View file

@ -87,7 +87,7 @@ bool ParamListModel::setData(const QModelIndex &index, const QVariant &value, in
break; break;
} }
emit dataChanged(index, index, QVector<int>() << role); Q_EMIT dataChanged(index, index, QVector<int>() << role);
return true; return true;
} }
} }

2
pglablib/catalog/PgDatabaseCatalog.h
View file

@ -88,7 +88,7 @@ public:
}; };
using RefreshFlags = int; using RefreshFlags = int;
signals: Q_SIGNALS:
void refreshed(const PgDatabaseCatalog *catalog, RefreshFlags flags); void refreshed(const PgDatabaseCatalog *catalog, RefreshFlags flags);
private: private:
QString m_serverVersionString; QString m_serverVersionString;