r20698 by craig -

[scribus-commit]

Author: craig
Date: Tue Jan 19 20:24:01 2016
New Revision: 20698

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20698
Log:
Minor code cleaning

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20698&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp	Tue Jan 19 20:24:01 2016
@@ -460,7 +460,6 @@
 	currItem->PLineJoin = Qt::PenJoinStyle(Buffer->PLineJoin);
 	currItem->setPrintEnabled(Buffer->isPrintable);
 	currItem->isBookmark = Buffer->isBookmark;
-//	currItem->Groups = Buffer->Groups;
 	currItem->setIsAnnotation(Buffer->m_isAnnotation);
 	currItem->setAnnotation(Buffer->m_annotation);
 	if (!Buffer->AnName.isEmpty())

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20698&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Tue Jan 19 20:24:01 2016
@@ -8336,15 +8336,15 @@
 {
 	if (!HaveDoc)
 		return;
-	LoremManager m(doc, this);
+	LoremManager loremMgr(doc, this);
 	if (m_prefsManager->appPrefs.miscPrefs.useStandardLI)
 	{
-		m.insertLoremIpsum("la.xml", m_prefsManager->appPrefs.miscPrefs.paragraphsLI);
-		return;
-	}
-
-	if (m.exec())
-		m.insertLoremIpsum(m.getName(), m.paragraphCount(), m.randomize());
+		loremMgr.insertLoremIpsum("la.xml", m_prefsManager->appPrefs.miscPrefs.paragraphsLI);
+		return;
+	}
+
+	if (loremMgr.exec())
+		loremMgr.insertLoremIpsum(loremMgr.getName(), loremMgr.paragraphCount(), loremMgr.randomize());
 }
 
 void ScribusMainWindow::languageChange()
@@ -8406,11 +8406,10 @@
 {
 	if (!HaveDoc)
 		return;
-	if(doc->masterPageMode())
-	{
-		editMasterPagesEnd();
-		qApp->processEvents();
-	}
+	if(!doc->masterPageMode())
+		return;
+	editMasterPagesEnd();
+	qApp->processEvents();
 }
 
 void ScribusMainWindow::updateActiveWindowCaption(const QString &newCaption)
@@ -9143,9 +9142,7 @@
 		view->DrawNew();
 	}
 	if (trans)
-	{
 		trans.commit();
-	}
 }
 
 void ScribusMainWindow::slotEditMark()