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

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-12-08 21:33:40 +08:00
parent 45d740a59b 5757fff5a6
commit 16d76f2cc7
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -1,5 +1,9 @@
name: SonarCloud name: SonarCloud
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on: on:
workflow_dispatch:
push: push:
branches: branches:
- dev - dev
@ -48,8 +52,8 @@ jobs:
uses: SonarSource/sonarcloud-github-c-cpp@v1 uses: SonarSource/sonarcloud-github-c-cpp@v1
- name: Run build-wrapper - name: Run build-wrapper
run: | run: |
cmake . qmake CONFIG+=release CONFIG+=no_extra_tiff_handler CONFIG+=zim_support CONFIG+=chinese_conversion_support
build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build . build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make -j8
- name: Run sonar-scanner - name: Run sonar-scanner
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

1
dictzip.c
View file

@ -575,7 +575,6 @@ void dict_data_close( dictData *header )
xfree (header -> cache [i].inBuffer); xfree (header -> cache [i].inBuffer);
} }
memset( header, 0, sizeof( struct dictData ) );
xfree( header ); xfree( header );
} }

2
externalviewer.cc
View file

@ -35,7 +35,7 @@ void ExternalViewer::start()
{ {
connect( &viewer, SIGNAL( finished( int, QProcess::ExitStatus ) ), connect( &viewer, SIGNAL( finished( int, QProcess::ExitStatus ) ),
this, SLOT( deleteLater() ) ); this, SLOT( deleteLater() ) );
connect( &viewer, SIGNAL( error( QProcess::ProcessError ) ), connect( &viewer, SIGNAL( errorOccurred( QProcess::ProcessError ) ),
this, SLOT( deleteLater() ) ); this, SLOT( deleteLater() ) );
QStringList args = parseCommandLine( viewerCmdLine ); QStringList args = parseCommandLine( viewerCmdLine );

2
icons/readme.txt
View file

@ -65,4 +65,6 @@ reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions
advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
book.svg https://github.com/johnfactotum/foliate

2
programs.cc
View file

@ -141,7 +141,7 @@ RunInstance::RunInstance(): process( this )
connect( this, SIGNAL(processFinished()), this, connect( this, SIGNAL(processFinished()), this,
SLOT(handleProcessFinished()), Qt::QueuedConnection ); SLOT(handleProcessFinished()), Qt::QueuedConnection );
connect( &process, SIGNAL(finished(int)), this, SIGNAL(processFinished())); connect( &process, SIGNAL(finished(int)), this, SIGNAL(processFinished()));
connect( &process, SIGNAL(error(QProcess::ProcessError)), this, connect( &process, SIGNAL(errorOccurred(QProcess::ProcessError)), this,
SIGNAL(processFinished()) ); SIGNAL(processFinished()) );
} }