hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 04:24:09 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge branch 'branch-qt-5.15' into dev

Browse source
This commit is contained in:
xiaoyifang 2022-01-19 22:44:05 +08:00
parent 54047ec2d7 f047c5fc9c
commit 5b16f1f5b9
4 changed files with 1 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
articleview.cc
View file

@ -41,7 +41,6 @@
#endif #endif
#include "globalbroadcaster.h" #include "globalbroadcaster.h"
#include "articleviewagent.hh"
using std::map; using std::map;
using std::list; using std::list;
@ -1078,7 +1077,7 @@ void ArticleView::attachToJavaScript() {
ui.definition->page()->setWebChannel(channel, QWebEngineScript::MainWorld); ui.definition->page()->setWebChannel(channel, QWebEngineScript::MainWorld);
// register QObjects to be exposed to JavaScript // register QObjects to be exposed to JavaScript
channel->registerObject(QStringLiteral("articleview"), new ArticleViewAgent(this)); channel->registerObject(QStringLiteral("articleview"), this);
} }
void ArticleView::linkClicked( QUrl const & url_ ) void ArticleView::linkClicked( QUrl const & url_ )

20
articleviewagent.cc
View file

@ -1,20 +0,0 @@
#include "articleviewagent.hh"
ArticleViewAgent::ArticleViewAgent(QObject *parent)
: QObject{parent}
{
}
ArticleViewAgent::ArticleViewAgent(ArticleView *articleView)
: articleView(articleView)
{
}
void ArticleViewAgent::onJsActiveArticleChanged(QString const & id){
articleView->onJsActiveArticleChanged(id);
}
void ArticleViewAgent::linkClickedInHtml(QUrl const & url){
articleView->linkClickedInHtml(url);
}

23
articleviewagent.hh
View file

@ -1,23 +0,0 @@
#ifndef ARTICLEVIEWAGENT_HH
#define ARTICLEVIEWAGENT_HH
#include <QObject>
#include "articleview.hh"
class ArticleViewAgent : public QObject
{
Q_OBJECT
ArticleView* articleView;
public:
explicit ArticleViewAgent(QObject *parent = nullptr);
ArticleViewAgent(ArticleView* articleView);
signals:
public slots:
Q_INVOKABLE void onJsActiveArticleChanged(QString const & id);
Q_INVOKABLE void linkClickedInHtml( QUrl const & );
};
#endif // ARTICLEVIEWAGENT_HH

2
goldendict.pro
View file

@ -239,7 +239,6 @@ DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
# Input # Input
HEADERS += folding.hh \ HEADERS += folding.hh \
articleviewagent.hh \
globalbroadcaster.h \ globalbroadcaster.h \
inc_case_folding.hh \ inc_case_folding.hh \
inc_diacritic_folding.hh \ inc_diacritic_folding.hh \
@ -381,7 +380,6 @@ FORMS += groups.ui \
fulltextsearch.ui fulltextsearch.ui
SOURCES += folding.cc \ SOURCES += folding.cc \
articleviewagent.cc \
globalbroadcaster.cpp \ globalbroadcaster.cpp \
main.cc \ main.cc \
dictionary.cc \ dictionary.cc \