r19417 by jghali - fix build error with gcc + Qt 5.1.x

[scribus-commit]

Author: jghali
Date: Mon Aug 11 06:31:49 2014
New Revision: 19417

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19417
Log:
fix build error with gcc + Qt 5.1.x

Modified:
    trunk/Scribus/scribus/undotransaction.cpp
    trunk/Scribus/scribus/undotransaction.h

Modified: trunk/Scribus/scribus/undotransaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19417&path=/trunk/Scribus/scribus/undotransaction.cpp
==============================================================================
--- trunk/Scribus/scribus/undotransaction.cpp (original)
+++ trunk/Scribus/scribus/undotransaction.cpp Mon Aug 11 06:31:49 2014
@@ -28,12 +28,12 @@
 
 #include <QDebug>
 #include <QPixmap>
+#include <QString>
 
 #include "scconfig.h"
 #include "undomanager.h"
 #include "undoobject.h"
 #include "undostate.h"
-#include "undotransaction.h"
 #include "util_icon.h"
 
 UndoTransaction::UndoTransaction() : Transaction(0)
@@ -44,7 +44,7 @@
 
 UndoTransaction::~UndoTransaction() 
 {
-	if (m_data && (m_data->ref == 1))
+	if (m_data && (m_data->ref.load() == 1))
 		UndoTransaction::cancel(); // no virtual calls in destructor
 }
 

Modified: trunk/Scribus/scribus/undotransaction.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19417&path=/trunk/Scribus/scribus/undotransaction.h
==============================================================================
--- trunk/Scribus/scribus/undotransaction.h (original)
+++ trunk/Scribus/scribus/undotransaction.h Mon Aug 11 06:31:49 2014
@@ -27,10 +27,11 @@
 #ifndef UNDOTRANSACTION_H
 #define UNDOTRANSACTION_H
 
+#include <QString>
+
 #include "scribusapi.h"
 #include "transaction.h"
 
-class QString;
 class QPixmap;
 
 class TransactionData;