From: APTX <marek321@gmail.com>
Date: Fri, 16 Dec 2011 01:43:10 +0000 (+0100)
Subject: Use QTextStream instead of ostream.
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=0e06e8d9b1a01d46403633ab1b58a3b58c043cd8;p=AniAddCLI.git

Use QTextStream instead of ostream.
---

diff --git a/aniaddcli.cpp b/aniaddcli.cpp
index 06c4ab5..41bc598 100644
--- a/aniaddcli.cpp
+++ b/aniaddcli.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 
 AniAddCli::AniAddCli(QObject *parent) :
-	QObject(parent), printHash(false)
+	QObject(parent), printHash(false), cout(stdout, QIODevice::WriteOnly)
 {
 	AniDBUdpClient::Client::instance()->setIdlePolicy(AniDBUdpClient::ImmediateLogoutIdlePolicy);;
 	connect(AniDBUdpClient::Client::instance(), SIGNAL(connectionError()), this, SLOT(handleError()));
@@ -40,7 +40,7 @@ void AniAddCli::process(const QStringList &files, bool rename, bool add, bool se
 			file = AniDBUdpClient::File::fromEd2k(fileName);
 			if (file == 0)
 			{
-				std::cout << "[FAIL] " << fileName.toUtf8().data() << " is not a valid ed2k uri" << std::endl;
+				cout << "[FAIL] " << fileName.toUtf8().data() << " is not a valid ed2k uri" << endl;
 				continue;
 			}
 		}
@@ -49,7 +49,7 @@ void AniAddCli::process(const QStringList &files, bool rename, bool add, bool se
 			QFileInfo fileInfo(fileName);
 			if (!fileInfo.exists())
 			{
-				std::cout << "[FAIL] File " << fileInfo.absoluteFilePath().toUtf8().data() << " does not exist" << std::endl;
+				cout << "[FAIL] File " << fileInfo.absoluteFilePath() << " does not exist" << endl;
 				continue;
 			}
 			file = new AniDBUdpClient::File(fileInfo);
@@ -75,11 +75,11 @@ void AniAddCli::process(const QStringList &files, bool rename, bool add, bool se
 
 	if (m_files.isEmpty())
 	{
-		std::cout << "No files to process" << std::endl;
+		cout << "No files to process" << endl;
 		emit finished(1);
 		return;
 	}
-	std::cout << "Processing " << m_files.count() << " files" << std::endl;
+	cout << "Processing " << m_files.count() << " files" << endl;
 }
 
 void AniAddCli::handleStatusUpdate(AniDBUdpClient::File::Action action, AniDBUdpClient::File::ActionState state, int progress)
@@ -103,67 +103,66 @@ void AniAddCli::handleStatusUpdate(AniDBUdpClient::File::Action action, AniDBUdp
 	switch (state)
 	{
 		case AniDBUdpClient::File::Success:
-			std::cout << "[WIN!] ";
+			cout << "[WIN!] ";
 		break;
 		case AniDBUdpClient::File::Failure:
-			std::cout << "[FAIL] ";
+			cout << "[FAIL] ";
 		break;
 		case AniDBUdpClient::File::InProgress:
 		default:
-			std::cout << "[INFO] ";
+			cout << "[INFO] ";
 		break;
 	}
 
 	switch (action)
 	{
 		case AniDBUdpClient::File::Hashing:
-			std::cout << "Hashing   ";
+			cout << "Hashing   ";
 		break;
 		case AniDBUdpClient::File::Renaming:
-			std::cout << "Renaming  ";
+			cout << "Renaming  ";
 		break;
 		case AniDBUdpClient::File::Adding:
-			std::cout << "Adding    ";
+			cout << "Adding    ";
 		break;
 		case AniDBUdpClient::File::SettingState:
-			std::cout << "Set State ";
+			cout << "Set State ";
 		break;
 		default:
-			std::cout << "Unknown Operation ";
+			cout << "Unknown Operation ";
 		break;
 	}
-	std::cout << "of file " << file->file().fileName().toUtf8().data();
+	cout << "of file " << file->file().fileName();
 
 	switch (state)
 	{
 		case AniDBUdpClient::File::Success:
 		case AniDBUdpClient::File::Finished:
-			std::cout << " finished successfully!";
+			cout << " finished successfully!";
 		break;
 		case AniDBUdpClient::File::Failure:
-			std::cout << " failed";
+			cout << " failed";
 		break;
 		case AniDBUdpClient::File::InProgress:
 		default:
-				std::cout << " started";
+			cout << " started";
 		break;
 	}
-	std::cout << std::endl;
+	cout << endl;
 
 	if (printHash && action == AniDBUdpClient::File::Hashing && state == AniDBUdpClient::File::Success)
-		std::cout << "[HASH] " << file->file().fileName().toUtf8().constData() << " - " << file->ed2k().constData() << std::endl;
+		cout << "[HASH] " << file->file().fileName() << " - " << file->ed2k() << endl;
 }
 
 void AniAddCli::handleError()
 {
-	std::cout << "[FAIL] Connection error: " << AniDBUdpClient::Client::instance()->errorString().toUtf8().data()
-			<< std::endl;
+	cout << "[FAIL] Connection error: " << AniDBUdpClient::Client::instance()->errorString() << endl;
 	emit finished(1);
 }
 
 void AniAddCli::exit(int code)
 {
 	if (!code)
-		std::cout << "[INFO] Done" << std::endl;
+		cout << "[INFO] Done" << endl;
 	qApp->exit(code);
 }
diff --git a/aniaddcli.h b/aniaddcli.h
index 784760a..f338bca 100644
--- a/aniaddcli.h
+++ b/aniaddcli.h
@@ -2,6 +2,7 @@
 #define RENAMETOOL_H
 
 #include <QObject>
+#include <QTextStream>
 #include <AniDBUdpClient/Client>
 #include <AniDBUdpClient/File>
 #include <AniDBUdpClient/MyListState>
@@ -36,6 +37,8 @@ private:
 	AniDBUdpClient::MyListState m_state;
 
 	bool printHash;
+
+	QTextStream cout;
 };
 
 #endif // RENAMETOOL_H