Commit 59740551 authored by Raphael Kubo da Costa's avatar Raphael Kubo da Costa
Browse files

SVN_SILENT: Coding style fixes, add some braces

svn path=/trunk/KDE/kdeutils/ark/; revision=1001696
parent d06ae4c1
...@@ -60,8 +60,6 @@ BatchExtract::~BatchExtract() ...@@ -60,8 +60,6 @@ BatchExtract::~BatchExtract()
void BatchExtract::addExtraction(Kerfuffle::Archive* archive, QString destinationFolder) void BatchExtract::addExtraction(Kerfuffle::Archive* archive, QString destinationFolder)
{ {
kDebug();
QString autoDestination = destinationFolder; QString autoDestination = destinationFolder;
if (autoSubfolder()) { if (autoSubfolder()) {
...@@ -225,8 +223,9 @@ bool BatchExtract::preservePaths() ...@@ -225,8 +223,9 @@ bool BatchExtract::preservePaths()
void BatchExtract::setDestinationFolder(QString folder) void BatchExtract::setDestinationFolder(QString folder)
{ {
if (!folder.isEmpty()) if (!folder.isEmpty()) {
m_destinationFolder = folder; m_destinationFolder = folder;
}
} }
void BatchExtract::setPreservePaths(bool value) void BatchExtract::setPreservePaths(bool value)
...@@ -241,17 +240,16 @@ void BatchExtract::setSubfolder(QString subfolder) ...@@ -241,17 +240,16 @@ void BatchExtract::setSubfolder(QString subfolder)
bool BatchExtract::showExtractDialog() bool BatchExtract::showExtractDialog()
{ {
kDebug();
QPointer<Kerfuffle::ExtractionDialog> dialog = new Kerfuffle::ExtractionDialog(NULL); QPointer<Kerfuffle::ExtractionDialog> dialog = new Kerfuffle::ExtractionDialog(NULL);
if (m_inputs.size() > 1) { if (m_inputs.size() > 1) {
dialog->batchModeOption(); dialog->batchModeOption();
} }
if (m_destinationFolder.isEmpty()) if (m_destinationFolder.isEmpty()) {
dialog->setCurrentUrl(QDir::currentPath()); dialog->setCurrentUrl(QDir::currentPath());
else } else {
dialog->setCurrentUrl(m_destinationFolder); dialog->setCurrentUrl(m_destinationFolder);
}
dialog->setAutoSubfolder(autoSubfolder()); dialog->setAutoSubfolder(autoSubfolder());
dialog->setPreservePaths(m_preservePaths); dialog->setPreservePaths(m_preservePaths);
...@@ -266,7 +264,9 @@ bool BatchExtract::showExtractDialog() ...@@ -266,7 +264,9 @@ bool BatchExtract::showExtractDialog()
} }
bool ret = dialog->exec(); bool ret = dialog->exec();
if (!ret) return false; if (!ret) {
return false;
}
setDestinationFolder(dialog->destinationDirectory().path()); setDestinationFolder(dialog->destinationDirectory().path());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment