Use qCritical where it makes sense.

git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1400 05730e5d-ab1b-0410-a4ac-84af385074fa

6 files changed, 12 insertions, 9 deletions

diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp
index da45f7416..df470cdc9 100644
--- a/src/murmur/DBus.cpp
+++ b/src/murmur/DBus.cpp
@@ -1113,7 +1113,7 @@ void MetaDBus::rotateLogs(const QDBusMessage &msg) {
 }
 
 void MetaDBus::quit() {
-	qWarning("Quit requested from D-Bus");
+	qCritical("Quit requested from D-Bus");
 	QCoreApplication::instance()->quit();
 }
 
diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp
index 0559c9db5..75bd63471 100644
--- a/src/murmur/Meta.cpp
+++ b/src/murmur/Meta.cpp
@@ -188,7 +188,7 @@ void MetaParams::read(QString fname) {
 			crt = pem.readAll();
 			pem.close();
 		} else {
-			qWarning("Failed to read %s", qPrintable(qsSSLCert));
+			qCritical("Failed to read %s", qPrintable(qsSSLCert));
 		}
 	}
 	if (! qsSSLKey.isEmpty()) {
@@ -197,14 +197,14 @@ void MetaParams::read(QString fname) {
 			key = pem.readAll();
 			pem.close();
 		} else {
-			qWarning("Failed to read %s", qPrintable(qsSSLKey));
+			qCritical("Failed to read %s", qPrintable(qsSSLKey));
 		}
 	}
 
 	if (! crt.isEmpty()) {
 		qscCert = QSslCertificate(crt);
 		if (qscCert.isNull()) {
-			qWarning("Failed to parse certificate.");
+			qCritical("Failed to parse certificate.");
 		}
 	}
 
@@ -221,7 +221,7 @@ void MetaParams::read(QString fname) {
 		if (! key.isEmpty()) {
 			qskKey = QSslKey(key, alg, QSsl::Pem, QSsl::PrivateKey, qbaPassPhrase);
 			if (qskKey.isNull()) {
-				qWarning("Failed to parse key file.");
+				qCritical("Failed to parse key file.");
 			}
 		}
 
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index caa5cd474..93251ce26 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -97,7 +97,7 @@ MurmurIce::MurmurIce() {
 			qWarning("MurmurIce: Endpoint \"%s\" running", qPrintable(fromStdUtf8String(ep->toString())));
 		}
 	} catch (Ice::Exception &e) {
-		qWarning("MurmurIce: Initialization failed: %s", qPrintable(fromStdUtf8String(e.ice_name())));
+		qCritical("MurmurIce: Initialization failed: %s", qPrintable(fromStdUtf8String(e.ice_name())));
 	}
 }
 
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index 8f987c2bb..bfc66a0f9 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -320,7 +320,7 @@ void Server::run() {
 		if (ret == 0) {
 			continue;
 		} else if (ret == -1) {
-			qWarning("poll() failed: %s", strerror(errno));
+			qCritical("poll() failed: %s", strerror(errno));
 			break;
 		}
 #endif
diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp
index 0521f4405..b4857e384 100644
--- a/src/murmur/UnixMurmur.cpp
+++ b/src/murmur/UnixMurmur.cpp
@@ -121,7 +121,7 @@ void UnixMurmur::handleSigTerm() {
 	char tmp;
 	::read(iTermFd[1], &tmp, sizeof(tmp));
 
-	qWarning("Caught SIGTERM, exiting");
+	qCritical("Caught SIGTERM, exiting");
 
 	QCoreApplication::instance()->quit();
 
diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp
index 50105b1fe..32720a927 100644
--- a/src/murmur/main.cpp
+++ b/src/murmur/main.cpp
@@ -75,6 +75,9 @@ static void murmurMessageOutput(QtMsgType type, const char *msg) {
 		case QtWarningMsg:
 			c='W';
 			break;
+		case QtCriticalMsg:
+			c='C';
+			break;
 		case QtFatalMsg:
 			c='F';
 			break;
@@ -385,7 +388,7 @@ int main(int argc, char **argv) {
 #endif
 
 	meta->bootAll();
-
+	
 	res=a.exec();
 
 	qWarning("Killing running servers");