Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Utilities
Ark
Commits
fd9a3edd
Commit
fd9a3edd
authored
Sep 27, 2020
by
Alexander Lohnau
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile with QT_NO_KEYWORDS
parent
99057f5e
Changes
19
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
214 additions
and
213 deletions
+214
-213
CMakeLists.txt
CMakeLists.txt
+1
-0
app/batchextract.cpp
app/batchextract.cpp
+2
-2
autotests/kerfuffle/jsonarchiveinterface.cpp
autotests/kerfuffle/jsonarchiveinterface.cpp
+2
-2
kerfuffle/cliinterface.cpp
kerfuffle/cliinterface.cpp
+39
-39
kerfuffle/jobs.cpp
kerfuffle/jobs.cpp
+14
-14
kerfuffle/plugin.cpp
kerfuffle/plugin.cpp
+1
-1
kerfuffle/settingsdialog.cpp
kerfuffle/settingsdialog.cpp
+1
-1
part/archivemodel.cpp
part/archivemodel.cpp
+5
-5
part/archiveview.cpp
part/archiveview.cpp
+1
-1
part/part.cpp
part/part.cpp
+5
-5
plugins/cli7zplugin/cliplugin.cpp
plugins/cli7zplugin/cliplugin.cpp
+11
-11
plugins/cliplugin-example/cliplugin.cpp
plugins/cliplugin-example/cliplugin.cpp
+1
-1
plugins/clirarplugin/cliplugin.cpp
plugins/clirarplugin/cliplugin.cpp
+13
-13
plugins/cliunarchiverplugin/cliplugin.cpp
plugins/cliunarchiverplugin/cliplugin.cpp
+16
-16
plugins/clizipplugin/cliplugin.cpp
plugins/clizipplugin/cliplugin.cpp
+8
-8
plugins/libarchive/libarchiveplugin.cpp
plugins/libarchive/libarchiveplugin.cpp
+18
-18
plugins/libarchive/readwritelibarchiveplugin.cpp
plugins/libarchive/readwritelibarchiveplugin.cpp
+15
-15
plugins/libsinglefileplugin/singlefileplugin.cpp
plugins/libsinglefileplugin/singlefileplugin.cpp
+5
-5
plugins/libzipplugin/libzipplugin.cpp
plugins/libzipplugin/libzipplugin.cpp
+56
-56
No files found.
CMakeLists.txt
View file @
fd9a3edd
...
...
@@ -81,6 +81,7 @@ set(SUPPORTED_ARK_MIMETYPES "")
add_definitions
(
-DTRANSLATION_DOMAIN=
"ark"
)
add_definitions
(
-DQT_NO_FOREACH
)
add_definitions
(
-DQT_NO_KEYWORDS
)
add_subdirectory
(
plugins
)
add_subdirectory
(
kerfuffle
)
...
...
app/batchextract.cpp
View file @
fd9a3edd
...
...
@@ -119,7 +119,7 @@ void BatchExtract::slotStartJob()
KIO
::
getJobTracker
()
->
registerJob
(
this
);
emit
description
(
this
,
Q_EMIT
description
(
this
,
i18n
(
"Extracting Files"
),
qMakePair
(
i18n
(
"Source archive"
),
m_fileNames
.
value
(
subjobs
().
at
(
0
)).
first
),
qMakePair
(
i18n
(
"Destination"
),
m_fileNames
.
value
(
subjobs
().
at
(
0
)).
second
)
...
...
@@ -183,7 +183,7 @@ void BatchExtract::slotResult(KJob *job)
emitResult
();
}
else
{
qCDebug
(
ARK
)
<<
"Starting the next job"
;
emit
description
(
this
,
Q_EMIT
description
(
this
,
i18n
(
"Extracting Files"
),
qMakePair
(
i18n
(
"Source archive"
),
m_fileNames
.
value
(
subjobs
().
at
(
0
)).
first
),
qMakePair
(
i18n
(
"Destination"
),
m_fileNames
.
value
(
subjobs
().
at
(
0
)).
second
)
...
...
autotests/kerfuffle/jsonarchiveinterface.cpp
View file @
fd9a3edd
...
...
@@ -41,7 +41,7 @@ bool JSONArchiveInterface::list()
{
JSONParser
::
JSONArchive
::
const_iterator
it
=
m_archive
.
constBegin
();
for
(;
it
!=
m_archive
.
constEnd
();
++
it
)
{
emit
entry
(
*
it
);
Q_EMIT
entry
(
*
it
);
}
return
true
;
...
...
@@ -117,7 +117,7 @@ bool JSONArchiveInterface::deleteFiles(const QVector<Kerfuffle::Archive::Entry*>
const
QString
&
fileName
=
file
->
fullPath
();
if
(
m_archive
.
contains
(
fileName
))
{
m_archive
.
remove
(
fileName
);
emit
entryRemoved
(
fileName
);
Q_EMIT
entryRemoved
(
fileName
);
}
}
...
...
kerfuffle/cliinterface.cpp
View file @
fd9a3edd
...
...
@@ -126,7 +126,7 @@ bool CliInterface::extractFiles(const QVector<Archive::Entry*> &files, const QSt
qCDebug
(
ARK
)
<<
"Using temporary extraction dir:"
<<
m_extractTempDir
->
path
();
if
(
!
m_extractTempDir
->
isValid
())
{
qCDebug
(
ARK
)
<<
"Creation of temporary directory failed."
;
emit
finished
(
false
);
Q_EMIT
finished
(
false
);
return
false
;
}
destDir
=
QUrl
(
m_extractTempDir
->
path
());
...
...
@@ -176,7 +176,7 @@ bool CliInterface::addFiles(const QVector<Archive::Entry*> &files, const Archive
qCDebug
(
ARK
)
<<
"Symlink's created:"
<<
filePath
<<
newFilePath
;
}
else
{
qCDebug
(
ARK
)
<<
"Can't create symlink"
<<
filePath
<<
newFilePath
;
emit
finished
(
false
);
Q_EMIT
finished
(
false
);
return
false
;
}
}
...
...
@@ -269,8 +269,8 @@ bool CliInterface::runProcess(const QString& programName, const QStringList& arg
QString
programPath
=
QStandardPaths
::
findExecutable
(
programName
);
if
(
programPath
.
isEmpty
())
{
emit
error
(
xi18nc
(
"@info"
,
"Failed to locate program <filename>%1</filename> on disk."
,
programName
));
emit
finished
(
false
);
Q_EMIT
error
(
xi18nc
(
"@info"
,
"Failed to locate program <filename>%1</filename> on disk."
,
programName
));
Q_EMIT
finished
(
false
);
return
false
;
}
...
...
@@ -327,10 +327,10 @@ void CliInterface::processFinished(int exitCode, QProcess::ExitStatus exitStatus
if
(
m_operationMode
==
Delete
||
m_operationMode
==
Move
)
{
const
QStringList
removedFullPaths
=
entryFullPaths
(
m_removedFiles
);
for
(
const
QString
&
fullPath
:
removedFullPaths
)
{
emit
entryRemoved
(
fullPath
);
Q_EMIT
entryRemoved
(
fullPath
);
}
for
(
Archive
::
Entry
*
e
:
qAsConst
(
m_newMovedFiles
))
{
emit
entry
(
e
);
Q_EMIT
entry
(
e
);
}
m_newMovedFiles
.
clear
();
}
...
...
@@ -341,15 +341,15 @@ void CliInterface::processFinished(int exitCode, QProcess::ExitStatus exitStatus
Kerfuffle
::
LoadCorruptQuery
query
(
filename
());
query
.
execute
();
if
(
!
query
.
responseYes
())
{
emit
cancelled
();
emit
finished
(
false
);
Q_EMIT
cancelled
();
Q_EMIT
finished
(
false
);
}
else
{
emit
progress
(
1.0
);
emit
finished
(
true
);
Q_EMIT
progress
(
1.0
);
Q_EMIT
finished
(
true
);
}
}
else
{
emit
progress
(
1.0
);
emit
finished
(
true
);
Q_EMIT
progress
(
1.0
);
Q_EMIT
finished
(
true
);
}
}
...
...
@@ -379,25 +379,25 @@ void CliInterface::extractProcessFinished(int exitCode, QProcess::ExitStatus exi
if
(
m_exitCode
==
1
)
{
if
(
password
().
isEmpty
())
{
qCWarning
(
ARK
)
<<
"Extraction aborted, destination folder might not have enough space."
;
emit
error
(
i18n
(
"Extraction failed. Make sure that enough space is available."
));
Q_EMIT
error
(
i18n
(
"Extraction failed. Make sure that enough space is available."
));
}
else
{
qCWarning
(
ARK
)
<<
"Extraction aborted, either the password is wrong or the destination folder doesn't have enough space."
;
emit
error
(
i18n
(
"Extraction failed. Make sure you provided the correct password and that enough space is available."
));
Q_EMIT
error
(
i18n
(
"Extraction failed. Make sure you provided the correct password and that enough space is available."
));
setPassword
(
QString
());
}
cleanUpExtracting
();
emit
finished
(
false
);
Q_EMIT
finished
(
false
);
return
;
}
if
(
!
m_extractionOptions
.
isDragAndDropEnabled
())
{
if
(
!
moveToDestination
(
QDir
::
current
(),
QDir
(
m_extractDestDir
),
m_extractionOptions
.
preservePaths
()))
{
emit
error
(
i18ncp
(
"@info"
,
Q_EMIT
error
(
i18ncp
(
"@info"
,
"Could not move the extracted file to the destination directory."
,
"Could not move the extracted files to the destination directory."
,
m_extractedFiles
.
size
()));
cleanUpExtracting
();
emit
finished
(
false
);
Q_EMIT
finished
(
false
);
return
;
}
...
...
@@ -418,8 +418,8 @@ void CliInterface::extractProcessFinished(int exitCode, QProcess::ExitStatus exi
// #395939: make sure we *always* restore the old working dir.
restoreWorkingDirExtraction
();
emit
progress
(
1.0
);
emit
finished
(
true
);
Q_EMIT
progress
(
1.0
);
Q_EMIT
finished
(
true
);
}
void
CliInterface
::
continueCopying
(
bool
result
)
...
...
@@ -495,8 +495,8 @@ bool CliInterface::moveDroppedFilesToDest(const QVector<Archive::Entry*> &files,
continue
;
}
else
if
(
query
.
responseCancelled
())
{
emit
cancelled
();
emit
finished
(
false
);
Q_EMIT
cancelled
();
Q_EMIT
finished
(
false
);
return
false
;
}
...
...
@@ -517,11 +517,11 @@ bool CliInterface::moveDroppedFilesToDest(const QVector<Archive::Entry*> &files,
// Move files to the final destination.
if
(
!
QFile
(
absSourceEntry
.
absoluteFilePath
()).
rename
(
absDestEntry
.
absoluteFilePath
()))
{
qCWarning
(
ARK
)
<<
"Failed to move file"
<<
absSourceEntry
.
filePath
()
<<
"to final destination."
;
emit
error
(
i18ncp
(
"@info"
,
Q_EMIT
error
(
i18ncp
(
"@info"
,
"Could not move the extracted file to the destination directory."
,
"Could not move the extracted files to the destination directory."
,
m_extractedFiles
.
size
()));
emit
finished
(
false
);
Q_EMIT
finished
(
false
);
return
false
;
}
}
...
...
@@ -559,8 +559,8 @@ void CliInterface::restoreWorkingDirExtraction()
void
CliInterface
::
finishCopying
(
bool
result
)
{
disconnect
(
this
,
&
CliInterface
::
finished
,
this
,
&
CliInterface
::
continueCopying
);
emit
progress
(
1.0
);
emit
finished
(
result
);
Q_EMIT
progress
(
1.0
);
Q_EMIT
finished
(
result
);
cleanUp
();
}
...
...
@@ -724,9 +724,9 @@ bool CliInterface::passwordQuery()
query
.
execute
();
if
(
query
.
responseCancelled
())
{
emit
cancelled
();
Q_EMIT
cancelled
();
// There is no process running, so finished() must be emitted manually.
emit
finished
(
false
);
Q_EMIT
finished
(
false
);
return
false
;
}
...
...
@@ -845,7 +845,7 @@ bool CliInterface::handleLine(const QString& line)
int
pos
=
line
.
indexOf
(
QLatin1Char
(
'%'
));
if
(
pos
>
1
)
{
int
percentage
=
line
.
midRef
(
pos
-
2
,
2
).
toInt
();
emit
progress
(
float
(
percentage
)
/
100
);
Q_EMIT
progress
(
float
(
percentage
)
/
100
);
return
true
;
}
}
...
...
@@ -859,7 +859,7 @@ bool CliInterface::handleLine(const QString& line)
query
.
execute
();
if
(
query
.
responseCancelled
())
{
emit
cancelled
();
Q_EMIT
cancelled
();
return
false
;
}
...
...
@@ -873,14 +873,14 @@ bool CliInterface::handleLine(const QString& line)
if
(
isDiskFullMsg
(
line
))
{
qCWarning
(
ARK
)
<<
"Found disk full message:"
<<
line
;
emit
error
(
i18nc
(
"@info"
,
"Extraction failed because the disk is full."
));
Q_EMIT
error
(
i18nc
(
"@info"
,
"Extraction failed because the disk is full."
));
return
false
;
}
if
(
isWrongPasswordMsg
(
line
))
{
qCWarning
(
ARK
)
<<
"Wrong password!"
;
setPassword
(
QString
());
emit
error
(
i18nc
(
"@info"
,
"Extraction failed: Incorrect password"
));
Q_EMIT
error
(
i18nc
(
"@info"
,
"Extraction failed: Incorrect password"
));
return
false
;
}
...
...
@@ -899,7 +899,7 @@ bool CliInterface::handleLine(const QString& line)
query
.
execute
();
if
(
query
.
responseCancelled
())
{
emit
cancelled
();
Q_EMIT
cancelled
();
return
false
;
}
...
...
@@ -914,7 +914,7 @@ bool CliInterface::handleLine(const QString& line)
if
(
isWrongPasswordMsg
(
line
))
{
qCWarning
(
ARK
)
<<
"Wrong password!"
;
setPassword
(
QString
());
emit
error
(
i18n
(
"Incorrect password."
));
Q_EMIT
error
(
i18n
(
"Incorrect password."
));
return
false
;
}
...
...
@@ -937,13 +937,13 @@ bool CliInterface::handleLine(const QString& line)
if
(
isPasswordPrompt
(
line
))
{
qCDebug
(
ARK
)
<<
"Found a password prompt"
;
emit
error
(
i18n
(
"Ark does not currently support testing this archive."
));
Q_EMIT
error
(
i18n
(
"Ark does not currently support testing this archive."
));
return
false
;
}
if
(
m_cliProps
->
isTestPassedMsg
(
line
))
{
qCDebug
(
ARK
)
<<
"Test successful"
;
emit
testSuccess
();
Q_EMIT
testSuccess
();
return
true
;
}
}
...
...
@@ -993,7 +993,7 @@ bool CliInterface::handleFileExistsMessage(const QString& line)
}
else
if
(
query
.
responseAutoSkip
())
{
responseToProcess
=
choices
.
at
(
3
);
}
else
if
(
query
.
responseCancelled
())
{
emit
cancelled
();
Q_EMIT
cancelled
();
if
(
choices
.
count
()
<
5
)
{
// If the program has no way to cancel the extraction, we resort to killing it
return
doKill
();
}
...
...
@@ -1058,7 +1058,7 @@ bool CliInterface::addComment(const QString &comment)
m_commentTempFile
.
reset
(
new
QTemporaryFile
());
if
(
!
m_commentTempFile
->
open
())
{
qCWarning
(
ARK
)
<<
"Failed to create temporary file for comment"
;
emit
finished
(
false
);
Q_EMIT
finished
(
false
);
return
false
;
}
...
...
@@ -1101,10 +1101,10 @@ void CliInterface::onEntry(Archive::Entry *archiveEntry)
if
(
archiveEntry
->
compressedSizeIsSet
)
{
m_listedSize
+=
archiveEntry
->
property
(
"compressedSize"
).
toULongLong
();
if
(
m_listedSize
<=
m_archiveSizeOnDisk
)
{
emit
progress
(
float
(
m_listedSize
)
/
float
(
m_archiveSizeOnDisk
));
Q_EMIT
progress
(
float
(
m_listedSize
)
/
float
(
m_archiveSizeOnDisk
));
}
else
{
// In case summed compressed size exceeds archive size on disk.
emit
progress
(
1
);
Q_EMIT
progress
(
1
);
}
}
}
...
...
kerfuffle/jobs.cpp
View file @
fd9a3edd
...
...
@@ -188,7 +188,7 @@ void Job::onEntry(Archive::Entry *entry)
return
;
}
emit
newEntry
(
entry
);
Q_EMIT
newEntry
(
entry
);
}
void
Job
::
onProgress
(
double
value
)
...
...
@@ -198,12 +198,12 @@ void Job::onProgress(double value)
void
Job
::
onInfo
(
const
QString
&
info
)
{
emit
infoMessage
(
this
,
info
);
Q_EMIT
infoMessage
(
this
,
info
);
}
void
Job
::
onEntryRemoved
(
const
QString
&
path
)
{
emit
entryRemoved
(
path
);
Q_EMIT
entryRemoved
(
path
);
}
void
Job
::
onFinished
(
bool
result
)
...
...
@@ -225,7 +225,7 @@ void Job::onUserQuery(Query *query)
qCWarning
(
ARK
)
<<
"Plugins run from the main thread should call directly query->execute()"
;
}
emit
userQuery
(
query
);
Q_EMIT
userQuery
(
query
);
}
bool
Job
::
doKill
()
...
...
@@ -266,7 +266,7 @@ LoadJob::LoadJob(ReadOnlyArchiveInterface *interface)
void
LoadJob
::
doWork
()
{
emit
description
(
this
,
i18n
(
"Loading archive"
),
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
Q_EMIT
description
(
this
,
i18n
(
"Loading archive"
),
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
connectToArchiveInterfaceSignals
();
bool
ret
=
archiveInterface
()
->
list
();
...
...
@@ -489,7 +489,7 @@ void CreateJob::doWork()
connect
(
m_addJob
,
&
KJob
::
result
,
this
,
&
CreateJob
::
emitResult
);
// Forward description signal from AddJob, we need to change the first argument ('this' needs to be a CreateJob).
connect
(
m_addJob
,
&
KJob
::
description
,
this
,
[
=
](
KJob
*
,
const
QString
&
title
,
const
QPair
<
QString
,
QString
>
&
field1
,
const
QPair
<
QString
,
QString
>
&
)
{
emit
description
(
this
,
title
,
field1
);
Q_EMIT
description
(
this
,
title
,
field1
);
});
m_addJob
->
start
();
...
...
@@ -520,7 +520,7 @@ void ExtractJob::doWork()
}
else
{
desc
=
i18np
(
"Extracting one file"
,
"Extracting %1 files"
,
m_entries
.
count
());
}
emit
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()),
qMakePair
(
i18nc
(
"extraction folder"
,
"Destination"
),
m_destinationDir
));
Q_EMIT
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()),
qMakePair
(
i18nc
(
"extraction folder"
,
"Destination"
),
m_destinationDir
));
QFileInfo
destDirInfo
(
m_destinationDir
);
if
(
destDirInfo
.
isDir
()
&&
(
!
destDirInfo
.
isWritable
()
||
!
destDirInfo
.
isExecutable
()))
{
...
...
@@ -592,7 +592,7 @@ QTemporaryDir *TempExtractJob::tempDir() const
void
TempExtractJob
::
doWork
()
{
// pass 1 to i18np on purpose so this translation may properly be reused.
emit
description
(
this
,
i18np
(
"Extracting one file"
,
"Extracting %1 files"
,
1
));
Q_EMIT
description
(
this
,
i18np
(
"Extracting one file"
,
"Extracting %1 files"
,
1
));
connectToArchiveInterfaceSignals
();
...
...
@@ -666,7 +666,7 @@ void AddJob::doWork()
qCDebug
(
ARK
)
<<
"Going to add"
<<
totalCount
<<
"entries, counted in"
<<
timer
.
elapsed
()
<<
"ms"
;
const
QString
desc
=
i18np
(
"Compressing a file"
,
"Compressing %1 files"
,
totalCount
);
emit
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
Q_EMIT
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
ReadWriteArchiveInterface
*
m_writeInterface
=
qobject_cast
<
ReadWriteArchiveInterface
*>
(
archiveInterface
());
...
...
@@ -719,7 +719,7 @@ void MoveJob::doWork()
qCDebug
(
ARK
)
<<
"Going to move"
<<
m_entries
.
count
()
<<
"file(s)"
;
QString
desc
=
i18np
(
"Moving a file"
,
"Moving %1 files"
,
m_entries
.
count
());
emit
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
Q_EMIT
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
ReadWriteArchiveInterface
*
m_writeInterface
=
qobject_cast
<
ReadWriteArchiveInterface
*>
(
archiveInterface
());
...
...
@@ -757,7 +757,7 @@ void CopyJob::doWork()
qCDebug
(
ARK
)
<<
"Going to copy"
<<
m_entries
.
count
()
<<
"file(s)"
;
QString
desc
=
i18np
(
"Copying a file"
,
"Copying %1 files"
,
m_entries
.
count
());
emit
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
Q_EMIT
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
ReadWriteArchiveInterface
*
m_writeInterface
=
qobject_cast
<
ReadWriteArchiveInterface
*>
(
archiveInterface
());
...
...
@@ -789,7 +789,7 @@ DeleteJob::DeleteJob(const QVector<Archive::Entry*> &entries, ReadWriteArchiveIn
void
DeleteJob
::
doWork
()
{
QString
desc
=
i18np
(
"Deleting a file from the archive"
,
"Deleting %1 files"
,
m_entries
.
count
());
emit
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
Q_EMIT
description
(
this
,
desc
,
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
ReadWriteArchiveInterface
*
m_writeInterface
=
qobject_cast
<
ReadWriteArchiveInterface
*>
(
archiveInterface
());
...
...
@@ -812,7 +812,7 @@ CommentJob::CommentJob(const QString& comment, ReadWriteArchiveInterface *interf
void
CommentJob
::
doWork
()
{
emit
description
(
this
,
i18n
(
"Adding comment"
));
Q_EMIT
description
(
this
,
i18n
(
"Adding comment"
));
ReadWriteArchiveInterface
*
m_writeInterface
=
qobject_cast
<
ReadWriteArchiveInterface
*>
(
archiveInterface
());
...
...
@@ -837,7 +837,7 @@ void TestJob::doWork()
{
qCDebug
(
ARK
)
<<
"Job started"
;
emit
description
(
this
,
i18n
(
"Testing archive"
),
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
Q_EMIT
description
(
this
,
i18n
(
"Testing archive"
),
qMakePair
(
i18n
(
"Archive"
),
archiveInterface
()
->
filename
()));
connectToArchiveInterfaceSignals
();
connect
(
archiveInterface
(),
&
ReadOnlyArchiveInterface
::
testSuccess
,
this
,
&
TestJob
::
onTestSuccess
);
...
...
kerfuffle/plugin.cpp
View file @
fd9a3edd
...
...
@@ -55,7 +55,7 @@ bool Plugin::isEnabled() const
void
Plugin
::
setEnabled
(
bool
enabled
)
{
m_enabled
=
enabled
;
emit
enabledChanged
();
Q_EMIT
enabledChanged
();
}
bool
Plugin
::
isReadWrite
()
const
...
...
kerfuffle/settingsdialog.cpp
View file @
fd9a3edd
...
...
@@ -36,7 +36,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &name, KCoreConfig
void
SettingsDialog
::
updateWidgetsDefault
()
{
emit
defaultsButtonClicked
();
Q_EMIT
defaultsButtonClicked
();
}
}
...
...
part/archivemodel.cpp
View file @
fd9a3edd
...
...
@@ -308,7 +308,7 @@ bool ArchiveModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
if
(
archive
()
->
isReadOnly
()
||
(
archive
()
->
encryptionType
()
!=
Archive
::
Unencrypted
&&
archive
()
->
password
().
isEmpty
()))
{
emit
messageWidget
(
KMessageWidget
::
Error
,
i18n
(
"Adding files is not supported for this archive."
));
Q_EMIT
messageWidget
(
KMessageWidget
::
Error
,
i18n
(
"Adding files is not supported for this archive."
));
return
false
;
}
...
...
@@ -316,7 +316,7 @@ bool ArchiveModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
const
auto
urls
=
data
->
urls
();
for
(
const
QUrl
&
url
:
urls
)
{
if
(
!
url
.
isLocalFile
())
{
emit
messageWidget
(
KMessageWidget
::
Error
,
i18n
(
"You can only add local files to an archive."
));
Q_EMIT
messageWidget
(
KMessageWidget
::
Error
,
i18n
(
"You can only add local files to an archive."
));
return
false
;
}
paths
<<
url
.
toLocalFile
();
...
...
@@ -331,7 +331,7 @@ bool ArchiveModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
}
}
emit
droppedFiles
(
paths
,
entry
);
Q_EMIT
droppedFiles
(
paths
,
entry
);
return
true
;
}
...
...
@@ -573,7 +573,7 @@ void ArchiveModel::slotLoadingFinished(KJob *job)
endResetModel
();
}
emit
loadingFinished
(
job
);
Q_EMIT
loadingFinished
(
job
);
}
void
ArchiveModel
::
insertEntry
(
Archive
::
Entry
*
entry
,
InsertBehaviour
behaviour
)
...
...
@@ -623,7 +623,7 @@ KJob *ArchiveModel::loadArchive(const QString &path, const QString &mimeType, QO
connect
(
loadJob
,
&
Job
::
newEntry
,
this
,
&
ArchiveModel
::
slotListEntry
);
connect
(
loadJob
,
&
Job
::
userQuery
,
this
,
&
ArchiveModel
::
slotUserQuery
);
emit
loadingStarted
();
Q_EMIT
loadingStarted
();
return
loadJob
;
}
...
...
part/archiveview.cpp
View file @
fd9a3edd
...
...
@@ -139,7 +139,7 @@ void ArchiveView::keyPressEvent(QKeyEvent *event)
case
Qt
::
Key_Return
:
case
Qt
::
Key_Enter
:
{
QLineEdit
*
editor
=
static_cast
<
QLineEdit
*>
(
indexWidget
(
m_editorIndex
));
emit
entryChanged
(
editor
->
text
());
Q_EMIT
entryChanged
(
editor
->
text
());
closeEntryEditor
();
break
;
}
...
...
part/part.cpp
View file @
fd9a3edd
...
...
@@ -266,7 +266,7 @@ void Part::registerJob(KJob* job)
KIO
::
getJobTracker
()
->
registerJob
(
job
);
m_jobTracker
->
registerJob
(
job
);
emit
busy
();
Q_EMIT
busy
();
connect
(
job
,
&
KJob
::
result
,
this
,
&
Part
::
ready
);
}
...
...
@@ -924,12 +924,12 @@ void Part::slotLoadingStarted()
void
Part
::
slotLoadingFinished
(
KJob
*
job
)
{
if
(
!
job
->
error
())
{
emit
completed
();
Q_EMIT
completed
();
return
;
}
// Loading failed or was canceled by the user (e.g. password dialog rejected).
emit
canceled
(
job
->
errorString
());
Q_EMIT
canceled
(
job
->
errorString
());
resetArchive
();
if
(
job
->
error
()
!=
KJob
::
KilledJobError
)
{
...
...
@@ -972,7 +972,7 @@ void Part::setFileNameFromArchive()
m_infoPanel
->
setPrettyFileName
(
prettyName
);
m_infoPanel
->
updateWithDefaults
();
emit
setWindowCaption
(
prettyName
);
Q_EMIT
setWindowCaption
(
prettyName
);
}
void
Part
::
slotOpenEntry
(
int
mode
)
...
...
@@ -1281,7 +1281,7 @@ void Part::slotExtractionDone(KJob* job)
}
if
(
ArkSettings
::
closeAfterExtraction
())
{
emit
quit
();
Q_EMIT
quit
();
}
}
}
...
...
plugins/cli7zplugin/cliplugin.cpp
View file @
fd9a3edd
...
...
@@ -123,7 +123,7 @@ bool CliPlugin::readListLine(const QString& line)
static
const
QLatin1String
entryInfoDelimiter
(
"----------"
);
if
(
line
.
startsWith
(
QLatin1String
(
"Open ERROR: Can not open the file as [7z] archive"
)))
{
emit
error
(
i18n
(
"Listing the archive failed."
));
Q_EMIT
error
(
i18n
(
"Listing the archive failed."
));
return
false
;
}
...
...
@@ -285,7 +285,7 @@ bool CliPlugin::readListLine(const QString& line)
line
.
startsWith
(
QLatin1String
(
"Version = "
)))
{
m_isFirstInformationEntry
=
true
;
if
(
!
m_currentArchiveEntry
->
fullPath
().
isEmpty
())
{
emit
entry
(
m_currentArchiveEntry
);
Q_EMIT
entry
(
m_currentArchiveEntry
);
}
else
{
delete
m_currentArchiveEntry
;
...
...
@@ -301,13 +301,13 @@ bool CliPlugin::readListLine(const QString& line)
bool
CliPlugin
::
readExtractLine
(
const
QString
&
line
)
{
if
(
line
.
startsWith
(
QLatin1String
(
"ERROR: E_FAIL"
)))
{
emit
error
(
i18n
(
"Extraction failed due to an unknown error."
));
Q_EMIT
error
(
i18n
(
"Extraction failed due to an unknown error."
));
return
false
;
}
if
(
line
.
startsWith
(
QLatin1String
(
"ERROR: CRC Failed"
))
||
line
.
startsWith
(
QLatin1String
(
"ERROR: Headers Error"
)))
{
emit
error
(
i18n
(
"Extraction failed due to one or more corrupt files. Any extracted files may be damaged."
));
Q_EMIT
error
(
i18n
(
"Extraction failed due to one or more corrupt files. Any extracted files may be damaged."
));
return
false
;
}
...
...
@@ -318,7 +318,7 @@ bool CliPlugin::readDeleteLine(const QString &line)
{
if
(
line
.
startsWith
(
QLatin1String
(
"Error: "
))
&&
line
.
endsWith
(
QLatin1String
(
" is not supported archive"
)))
{
emit
error
(
i18n
(
"Delete operation failed. Try upgrading p7zip or disabling the p7zip plugin in the configuration dialog."
));
Q_EMIT
error
(
i18n
(
"Delete operation failed. Try upgrading p7zip or disabling the p7zip plugin in the configuration dialog."
));
return
false
;
}
...
...
@@ -334,9 +334,9 @@ void CliPlugin::handleMethods(const QStringList &methods)
QRegularExpression
rxAESMethods
(
QStringLiteral
(
"^(AES-128|AES-192|AES-256)$"
));
if
(
rxAESMethods
.
match
(
method
).
hasMatch
())
{
// Remove dash for AES methods.
emit
encryptionMethodFound
(
QString
(
method
).
remove
(
QLatin1Char
(
'-'
)));
Q_EMIT
encryptionMethodFound
(
QString
(
method
).
remove
(
QLatin1Char
(
'-'
)));
}
else
{
emit
encryptionMethodFound
(
method
);
Q_EMIT
encryptionMethodFound
(
method
);
}
continue
;
}
...
...
@@ -344,13 +344,13 @@ void CliPlugin::handleMethods(const QStringList &methods)
// LZMA methods are output with some trailing numbers by 7z representing dictionary/block sizes.
// We are not interested in these, so remove them.
if
(
method
.
startsWith
(
QLatin1String
(
"LZMA2"
)))
{
emit
compressionMethodFound
(
method
.
left
(
5
));
Q_EMIT
compressionMethodFound
(
method
.
left
(
5
));
}
else
if
(
method
.
startsWith
(
QLatin1String
(
"LZMA"
)))
{
emit
compressionMethodFound
(
method
.
left
(
4
));
Q_EMIT
compressionMethodFound
(
method
.
left
(
4
));
}
else
if
(
method
==
QLatin1String
(
"xz"
))
{
emit
compressionMethodFound
(
method
.
toUpper
());
Q_EMIT
compressionMethodFound
(
method
.
toUpper
());
}
else
{
emit
compressionMethodFound
(
method
);
Q_EMIT
compressionMethodFound
(
method
);
}
}
}
...
...
plugins/cliplugin-example/cliplugin.cpp
View file @
fd9a3edd
...
...
@@ -144,7 +144,7 @@ bool CliPlugin::readListLine(const QString &line)
e
->
setProperty
(
"ssPasswordProtected"
,
m_isPasswordProtected
);
qCDebug
(
ARK
)
<<
"Added entry: "
<<
e
;
emit
entry
(
e
);
Q_EMIT
entry
(
e
);
m_isFirstLine
=
true
;
return
true
;
}
...
...
plugins/clirarplugin/cliplugin.cpp
View file @
fd9a3edd
...
...
@@ -168,7 +168,7 @@ bool CliPlugin::readListLine(const QString &line)
bool
CliPlugin
::
handleUnrar5Line
(
const
QString
&
line
)
{
if
(
line
.
startsWith
(
QLatin1String
(
"Cannot find volume "
)))
{
emit
error
(
i18n
(
"Failed to find all archive volumes."
));
Q_EMIT
error
(
i18n
(
"Failed to find all archive volumes."
));
return
false
;
}
...
...
@@ -213,9 +213,9 @@ bool CliPlugin::handleUnrar5Line(const QString &line)
qCDebug
(
ARK
)
<<
"Solid archive detected"
;
}