From 43e0468a233a49b1010f34c5ce888204fa4e9416 Mon Sep 17 00:00:00 2001 From: Robert Förster Date: Fri, 21 Nov 2014 14:34:32 +0000 Subject: - massive trailing whitespace cleanup (yes, one of these "you can hate me for that" commits) - apply patch by d00p: show the correct protocol version instead of just "SSLv3/TLSv1", thanks! - fix compilation on qt 5.4 on windows git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6398 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/KvsObject_pixmap.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/objects/KvsObject_pixmap.cpp') diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index fcb57a78d..55bf48f40 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -144,7 +144,7 @@ KVSO_CLASS_FUNCTION(pixmap,fill) if (!var1->asInteger(iCol1)) { var1->asString(szColor); - if (c->paramCount()<2) + if (c->paramCount()<2) iOpacity=255; else { if (!var2->asInteger(iOpacity)) @@ -362,11 +362,11 @@ KVSO_CLASS_FUNCTION(pixmap,rotate) { if (KviQString::equalCI(szAxis,"XAxis")) axis=Qt::XAxis; - else if (KviQString::equalCI(szAxis,"YAxis")) + else if (KviQString::equalCI(szAxis,"YAxis")) axis=Qt::YAxis; - else if (KviQString::equalCI(szAxis,"ZAxis")) + else if (KviQString::equalCI(szAxis,"ZAxis")) axis=Qt::ZAxis; - else + else c->warning(__tr2qs_ctx("Unknown axis '%Q' switching to default ZAxis","objects"),&szAxis); } -- cgit v1.3.1-10-gc9f91