r18273 by fschmid - Finally fixed Bug #11493: "No Barcodes generated in QT5 Port"

[scribus-commit]

Author: fschmid
Date: Wed May  1 08:36:49 2013
New Revision: 18273

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18273
Log:
Finally fixed Bug #11493: "No Barcodes generated in QT5 Port"

Modified:
    trunk/Scribus/scribus/loadsaveplugin.cpp
    trunk/Scribus/scribus/scribuscore.cpp

Modified: trunk/Scribus/scribus/loadsaveplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18273&path=/trunk/Scribus/scribus/loadsaveplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.cpp (original)
+++ trunk/Scribus/scribus/loadsaveplugin.cpp Wed May  1 08:36:49 2013
@@ -294,8 +294,18 @@
 			id = FORMATID_FIRSTUSER;
 		else
 		{
-			id = qMax(static_cast<int>(formats.last().formatId), FORMATID_FIRSTUSER-1);
+			QList<FileFormat>::iterator it(formats.begin());
+			QList<FileFormat>::iterator itEnd(formats.end());
+			id = FORMATID_FIRSTUSER - 1;
+			while (it != itEnd)
+			{
+				id = qMax((*it).formatId, id);
+				++it;
+			}
 			id++;
+
+//			id = qMax(static_cast<int>(formats.last().formatId), FORMATID_FIRSTUSER-1);
+//			id++;
 		}
 		fmt.formatId = id;
 		formats.insert(id, fmt);
@@ -313,7 +323,7 @@
 		}
 		formats.insert(it, fmt);
 	}
-	//qDebug("Format: Id: %3u, Prio: %3hu, Name: %s", fmt.formatId, fmt.priority, fmt.trName.toLocal8Bit().data() );
+	qDebug("Format: Id: %3u, Prio: %3hu, Name: %s", fmt.formatId, fmt.priority, fmt.trName.toLocal8Bit().data() );
 	//printFormatList(); // DEBUG
 }
 

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18273&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Wed May  1 08:36:49 2013
@@ -167,8 +167,8 @@
 	undoManager = UndoManager::instance();
 	fileWatcher = new FileWatcher(this);
 	pluginManager = new PluginManager();
-	setSplashStatus( tr("Initializing Plugins") );
-	pluginManager->initPlugs();
+//	setSplashStatus( tr("Initializing Plugins") );
+//	pluginManager->initPlugs();
 /* #4428, remove block later if ok
 	bool haveFonts=false;
 #ifdef Q_OS_MAC
@@ -193,6 +193,8 @@
 	m_HaveGS = testGSAvailability();
 	m_HavePngAlpha = testGSDeviceAvailability("pngalpha");
 	m_HaveTiffSep = testGSDeviceAvailability("tiffsep");
+	setSplashStatus( tr("Initializing Plugins") );
+	pluginManager->initPlugs();
 	
 	ScCore->setSplashStatus( tr("Reading Color Profiles") );
 	m_HaveCMS = false;