mirror of
https://github.com/nomic-ai/gpt4all
synced 2024-11-08 07:10:32 +00:00
chat: don't use incomplete types with signals/slots/Q_INVOKABLE (#2408)
Signed-off-by: Jared Van Bortel <jared@nomic.ai>
This commit is contained in:
parent
69f766cbbb
commit
41c9013fa4
@ -4,7 +4,6 @@
|
|||||||
#include "mysettings.h"
|
#include "mysettings.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "database.h"
|
|
||||||
|
|
||||||
#include <QDataStream>
|
#include <QDataStream>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "chatllm.h"
|
#include "chatllm.h"
|
||||||
#include "chatmodel.h"
|
#include "chatmodel.h"
|
||||||
|
#include "database.h" // IWYU pragma: keep
|
||||||
#include "localdocsmodel.h" // IWYU pragma: keep
|
#include "localdocsmodel.h" // IWYU pragma: keep
|
||||||
#include "modellist.h"
|
#include "modellist.h"
|
||||||
|
|
||||||
@ -13,7 +14,6 @@
|
|||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
class QDataStream;
|
class QDataStream;
|
||||||
struct ResultInfo;
|
|
||||||
|
|
||||||
class Chat : public QObject
|
class Chat : public QObject
|
||||||
{
|
{
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "../gpt4all-backend/llmodel.h"
|
#include "../gpt4all-backend/llmodel.h"
|
||||||
|
|
||||||
|
#include <QByteArray>
|
||||||
#include <QNetworkReply>
|
#include <QNetworkReply>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
@ -16,7 +17,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
class QByteArray;
|
|
||||||
class QNetworkAccessManager;
|
class QNetworkAccessManager;
|
||||||
|
|
||||||
class ChatAPI;
|
class ChatAPI;
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
#include "chat.h"
|
#include "chat.h"
|
||||||
#include "chatapi.h"
|
#include "chatapi.h"
|
||||||
#include "database.h"
|
|
||||||
#include "localdocs.h"
|
#include "localdocs.h"
|
||||||
#include "mysettings.h"
|
#include "mysettings.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
@ -14,7 +13,6 @@
|
|||||||
#include <QIODevice>
|
#include <QIODevice>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QList>
|
|
||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
#include <QMutexLocker>
|
#include <QMutexLocker>
|
||||||
#include <QSet>
|
#include <QSet>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#ifndef CHATLLM_H
|
#ifndef CHATLLM_H
|
||||||
#define CHATLLM_H
|
#define CHATLLM_H
|
||||||
|
|
||||||
|
#include "database.h" // IWYU pragma: keep
|
||||||
#include "modellist.h"
|
#include "modellist.h"
|
||||||
|
|
||||||
#include "../gpt4all-backend/llmodel.h"
|
#include "../gpt4all-backend/llmodel.h"
|
||||||
@ -8,6 +9,7 @@
|
|||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QElapsedTimer>
|
#include <QElapsedTimer>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
#include <QList>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
@ -21,8 +23,6 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
class QDataStream;
|
class QDataStream;
|
||||||
struct ResultInfo;
|
|
||||||
template <typename T> class QList;
|
|
||||||
|
|
||||||
enum LLModelType {
|
enum LLModelType {
|
||||||
GPTJ_,
|
GPTJ_,
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#include "database.h"
|
#include "database.h"
|
||||||
|
|
||||||
#include "embeddings.h"
|
#include "embeddings.h"
|
||||||
#include "embllm.h"
|
|
||||||
#include "modellist.h"
|
#include "modellist.h"
|
||||||
#include "mysettings.h"
|
#include "mysettings.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef DATABASE_H
|
#ifndef DATABASE_H
|
||||||
#define DATABASE_H
|
#define DATABASE_H
|
||||||
|
|
||||||
|
#include "embllm.h" // IWYU pragma: keep
|
||||||
|
|
||||||
#include <QElapsedTimer>
|
#include <QElapsedTimer>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QLatin1String>
|
#include <QLatin1String>
|
||||||
@ -22,7 +24,6 @@ class QFileSystemWatcher;
|
|||||||
class QSqlError;
|
class QSqlError;
|
||||||
class QTextStream;
|
class QTextStream;
|
||||||
class QTimer;
|
class QTimer;
|
||||||
struct EmbeddingResult;
|
|
||||||
|
|
||||||
struct DocumentInfo
|
struct DocumentInfo
|
||||||
{
|
{
|
||||||
|
@ -14,12 +14,10 @@
|
|||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QJsonValue>
|
#include <QJsonValue>
|
||||||
#include <QList>
|
|
||||||
#include <QNetworkRequest>
|
#include <QNetworkRequest>
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QSslConfiguration>
|
#include <QSslConfiguration>
|
||||||
#include <QSslError>
|
|
||||||
#include <QSslSocket>
|
#include <QSslSocket>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
|
@ -5,18 +5,17 @@
|
|||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
|
#include <QList>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <QNetworkAccessManager>
|
#include <QNetworkAccessManager>
|
||||||
#include <QNetworkReply>
|
#include <QNetworkReply>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
#include <QSslError>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
class QByteArray;
|
class QByteArray;
|
||||||
class QFile;
|
|
||||||
class QSslError;
|
|
||||||
template <typename T> class QList;
|
|
||||||
|
|
||||||
struct ReleaseInfo {
|
struct ReleaseInfo {
|
||||||
Q_GADGET
|
Q_GADGET
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
#define EMBLLM_H
|
#define EMBLLM_H
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QNetworkAccessManager>
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include <QRegularExpression>
|
#include <QRegularExpression>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QSslConfiguration>
|
#include <QSslConfiguration>
|
||||||
#include <QSslError>
|
|
||||||
#include <QSslSocket>
|
#include <QSslSocket>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
@ -12,14 +12,13 @@
|
|||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QPair>
|
#include <QPair>
|
||||||
#include <QSortFilterProxyModel>
|
#include <QSortFilterProxyModel>
|
||||||
|
#include <QSslError>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
#include <QVariant>
|
||||||
|
#include <QVector>
|
||||||
#include <Qt>
|
#include <Qt>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <QtQml>
|
#include <QtQml>
|
||||||
#include <QVariant>
|
|
||||||
#include <QVector>
|
|
||||||
|
|
||||||
class QSslError;
|
|
||||||
|
|
||||||
struct ModelInfo {
|
struct ModelInfo {
|
||||||
Q_GADGET
|
Q_GADGET
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
#include "mysettings.h"
|
#include "mysettings.h"
|
||||||
|
|
||||||
#include "modellist.h"
|
|
||||||
|
|
||||||
#include "../gpt4all-backend/llmodel.h"
|
#include "../gpt4all-backend/llmodel.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef MYSETTINGS_H
|
#ifndef MYSETTINGS_H
|
||||||
#define MYSETTINGS_H
|
#define MYSETTINGS_H
|
||||||
|
|
||||||
#include "modellist.h"
|
#include "modellist.h" // IWYU pragma: keep
|
||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
@ -10,8 +10,6 @@
|
|||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
struct ModelInfo;
|
|
||||||
|
|
||||||
class MySettings : public QObject
|
class MySettings : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
#include "../gpt4all-backend/llmodel.h"
|
#include "../gpt4all-backend/llmodel.h"
|
||||||
|
|
||||||
#include <QByteArray>
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
@ -20,14 +19,11 @@
|
|||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
#include <QList>
|
|
||||||
#include <QNetworkReply>
|
|
||||||
#include <QNetworkRequest>
|
#include <QNetworkRequest>
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
#include <QSslConfiguration>
|
#include <QSslConfiguration>
|
||||||
#include <QSslError>
|
|
||||||
#include <QSslSocket>
|
#include <QSslSocket>
|
||||||
#include <QSysInfo>
|
#include <QSysInfo>
|
||||||
#include <Qt>
|
#include <Qt>
|
||||||
|
@ -1,19 +1,18 @@
|
|||||||
#ifndef NETWORK_H
|
#ifndef NETWORK_H
|
||||||
#define NETWORK_H
|
#define NETWORK_H
|
||||||
|
|
||||||
|
#include <QByteArray>
|
||||||
#include <QJsonValue>
|
#include <QJsonValue>
|
||||||
|
#include <QList>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <QNetworkAccessManager>
|
#include <QNetworkAccessManager>
|
||||||
|
#include <QNetworkReply>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
#include <QSslError>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
|
|
||||||
class QByteArray;
|
|
||||||
class QNetworkReply;
|
|
||||||
class QSslError;
|
|
||||||
template <typename T> class QList;
|
|
||||||
|
|
||||||
struct KeyValue {
|
struct KeyValue {
|
||||||
QString key;
|
QString key;
|
||||||
QJsonValue value;
|
QJsonValue value;
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QHostAddress>
|
#include <QHostAddress>
|
||||||
#include <QHttpServer>
|
#include <QHttpServer>
|
||||||
#include <QHttpServerRequest>
|
|
||||||
#include <QHttpServerResponder>
|
#include <QHttpServerResponder>
|
||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#include "chatllm.h"
|
#include "chatllm.h"
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
|
|
||||||
|
#include <QHttpServerRequest>
|
||||||
#include <QHttpServerResponse>
|
#include <QHttpServerResponse>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
@ -11,7 +12,6 @@
|
|||||||
|
|
||||||
class Chat;
|
class Chat;
|
||||||
class QHttpServer;
|
class QHttpServer;
|
||||||
class QHttpServerRequest;
|
|
||||||
|
|
||||||
class Server : public ChatLLM
|
class Server : public ChatLLM
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user