Removed commented out code

Author: Lauris Kaplinski

client/CDocSupport.h

@@ -132,7 +132,6 @@ struct IOEntry
 {
 	std::string name, mime;
 	int64_t size;
-	//std::shared_ptr<std::istream> stream;
 	std::unique_ptr<QIODevice> data;
 };
 

client/CryptoDoc.cpp

@@ -94,8 +94,6 @@ class CryptoDoc::Private final: public QThread
 	std::string writer_last_error;
 
 	QString			fileName;
-	//bool			encrypted = false;
-	//bool isEncrypted() const { return encrypted; }
 	bool isEncrypted() const { return reader != nullptr; }
 	CDocumentModel	*documents = new CDocumentModel(this);
 	QStringList		tempFiles;
@@ -543,16 +541,12 @@ bool CryptoDoc::move(const QString &to)
 
 bool CryptoDoc::open( const QString &file )
 {
+	d->writer_last_error.clear();
 	clear(file);
 	d->reader = d->createCDocReader(file.toStdString());
-	if (!d->reader) return false;
-	d->writer_last_error.clear();
-	// fixme: This seems wrong
-	//if(!d->isEncrypted()) {
-	//	WarningDialog::show(tr("Failed to open document"),
-	//						QString::fromStdString(d->cdoc->lastError));
-	//	return false;
-	//}
+	if (!d->reader) {
+		return false;
+	}
 	Application::addRecent( file );
 	return true;
 }

client/MainWindow.cpp

@@ -335,7 +335,6 @@ bool MainWindow::encrypt(bool askForKey)
 		if(!p.exec()) return false;
 		QString label = p.label();
 		QByteArray secret = p.secret();
-		bool result;
 		if (p.type == PasswordDialog::Type::PASSWORD) {
 			WaitDialogHolder waitDialog(this, tr("Encrypting"));
 			return cryptoDoc->encrypt(cryptoDoc->fileName(), label, secret, 65536);
@@ -518,11 +517,6 @@ void MainWindow::convertToCDoc() {
 
 	auto cardData = qApp->signer()->tokenauth();
 	if (!cardData.cert().isNull()) {
-		// QByteArray qder = cardData.cert().toDer();
-		// st7d::vector<uint8_t> sder = std::vector<uint8_t>(qder.cbegin(),
-		// qder.cend());
-		// cryptoContainer->addEncryptionKey(libcdoc::Recipient::makeCertificate(CryptoDoc::labelFromCertificate(sder),
-		// sder));
 		cryptoContainer->addEncryptionKey(cardData.cert());
 	}
 

client/dialogs/KeyDialog.cpp

@@ -86,7 +86,6 @@ KeyDialog::KeyDialog(const CDKey &k, QWidget *parent) : QDialog(parent) {
 		d->view->addTopLevelItem(i);
 	};
 
-	bool adjust_size = false;
 	if (k.lock.isCDoc1()) {
 		std::vector<uint8_t> cert =
 			k.lock.getBytes(libcdoc::Lock::Params::CERT);