diff --git a/akabeienums.h b/akabeienums.h index b66b8a8c7c46e71c84171e9540a9b76f2a2a8f23..4d7666a9d686d1947f21283a7c6f58567956d3e0 100644 --- a/akabeienums.h +++ b/akabeienums.h @@ -92,6 +92,6 @@ enum OperationName { PrintFiles }; typedef enum OperationName OperationName; -}; +} -#endif \ No newline at end of file +#endif diff --git a/queueoperation.cpp b/queueoperation.cpp index 5c07e7a4624ed0b78b81ea64545f41b5e9925eac..1575f0f02304ff0c2f37a9d116f65754d23c0874 100644 --- a/queueoperation.cpp +++ b/queueoperation.cpp @@ -179,7 +179,7 @@ void QueueOperation::transactionCreated(AkabeiClient::Transaction* t) } if (t->isValid()) { - out << QObject::tr("Validating transaction...") << "\r"; + out << QObject::tr("Validating transaction...") << "\n"; AkabeiClient::Backend::instance()->transactionHandler()->validate(); } else { err << Akabei::errorPrefix << QObject::tr("Invalid transaction, quitting...") << endl; @@ -270,7 +270,7 @@ void QueueOperation::validationFinished(bool valid) installSize -= i->installedSize(); } if (!m_transaction->toBeRemoved().isEmpty()) { - out << QObject::tr("The following packages are going to be removed: "); + out << '\n' << QObject::tr("The following packages are going to be removed:") << '\n'; foreach (Akabei::Package * pkg, m_transaction->toBeRemoved()) { if (pkg != *(m_transaction->toBeRemoved().begin())) out << QObject::tr(", "); @@ -279,7 +279,7 @@ void QueueOperation::validationFinished(bool valid) out << endl; } if (!m_transaction->toBeInstalled().isEmpty()) { - out << QObject::tr("The following packages are going to be installed: "); + out << '\n' << QObject::tr("The following packages are going to be installed:") << '\n'; foreach (Akabei::Package * pkg, m_transaction->toBeInstalled()) { if (pkg != *(m_transaction->toBeInstalled().begin())) out << QObject::tr(", "); @@ -288,7 +288,7 @@ void QueueOperation::validationFinished(bool valid) out << endl; } if (!m_transaction->toBeUpgraded().isEmpty()) { - out << QObject::tr("The following packages are going to be upgraded: "); + out << '\n' << QObject::tr("The following packages are going to be upgraded:") << '\n'; foreach (Akabei::Package* old, m_transaction->toBeUpgraded().keys()) { if (old != *(m_transaction->toBeUpgraded().keys().begin())) out << QObject::tr(", "); @@ -298,7 +298,7 @@ void QueueOperation::validationFinished(bool valid) out << endl; } if (!m_transaction->toBeReinstalled().isEmpty()) { - out << QObject::tr("The following packages are going to be reinstalled: "); + out << '\n' << QObject::tr("The following packages are going to be reinstalled:") << '\n'; foreach (Akabei::Package * pkg, m_transaction->toBeReinstalled()) { if (pkg != *(m_transaction->toBeReinstalled().begin())) out << QObject::tr(", "); @@ -307,7 +307,7 @@ void QueueOperation::validationFinished(bool valid) out << endl; } if (!m_transaction->toBeReplaced().isEmpty()) { - out << QObject::tr("The following packages are going to be replaced: "); + out << '\n' << QObject::tr("The following packages are going to be replaced:") << '\n'; foreach (Akabei::Package* pkg, m_transaction->toBeReplaced().keys()) { QList older = m_transaction->toBeReplaced().value(pkg); out << pkg->name() << " -> (";