r20968 by jghali -

[scribus-commit]

Author: jghali
Date: Wed Feb 10 21:14:49 2016
New Revision: 20968

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20968
Log:
indentation fixes

Modified:
    trunk/Scribus/scribus/ui/about.cpp
    trunk/Scribus/scribus/ui/splash.cpp

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20968&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Wed Feb 10 21:14:49 2016
@@ -128,13 +128,11 @@
 	if (BUILD_NAME == "BleedingEdge")
 		built = tr("%3-%2-%1 %4 %5").arg(BUILD_DAY).arg(BUILD_MONTH).arg(BUILD_YEAR).arg(BUILD_TIME).arg(BUILD_TZ);
 
-#ifdef HAVE_SVNVERSION
-	#ifdef SVNVERSION
-		QString revText;
-		revText=QString(tr("SVN Revision: %1")).arg(SVNVERSION);
-		built+=" - ";
-		built+=revText;
-	#endif
+#if defined(HAVE_SVNVERSION) && defined(SVNVERSION)
+	QString revText;
+	revText=QString(tr("SVN Revision: %1")).arg(SVNVERSION);
+	built+=" - ";
+	built+=revText;
 #endif
 	QString bu;
 	bu += "C";

Modified: trunk/Scribus/scribus/ui/splash.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20968&path=/trunk/Scribus/scribus/ui/splash.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/splash.cpp	(original)
+++ trunk/Scribus/scribus/ui/splash.cpp	Wed Feb 10 21:14:49 2016
@@ -77,24 +77,22 @@
 
 	if (v.contains("svn"))
 	{
-#ifdef HAVE_SVNVERSION
-	#ifdef SVNVERSION
+#if defined(HAVE_SVNVERSION) && defined(SVNVERSION)
 		QString revText;
 		revText=QString("SVN Revision: %1").arg(SVNVERSION);
 		QRect r2 = rect().adjusted(0, 0, -15, -50);
 		painter->setFont(f);
 		painter->drawText(r2, Qt::AlignRight | Qt::AlignBottom, revText );
-	#endif
 #endif
 		QFont wf(font());
 #if defined _WIN32
-	wf.setPointSize(10);
+		wf.setPointSize(10);
 #elif defined(__INNOTEK_LIBC__)
-	wf.setPointSize(9);
+		wf.setPointSize(9);
 #elif defined(Q_OS_MAC)
-	wf.setPointSize(12);
+		wf.setPointSize(12);
 #else
-	wf.setPointSize(9);
+		wf.setPointSize(9);
 #endif
 		painter->setFont(wf);
 		painter->setPen(QPen(Qt::red));