r17533 by fschmid - Some small compile fixes.

[scribus-commit]

Author: fschmid
Date: Sat Jun  2 10:18:01 2012
New Revision: 17533

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17533
Log:
Some small compile fixes.

Modified:
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/scribusview.h
    trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17533&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sat Jun  2 10:18:01 2012
@@ -163,8 +163,8 @@
 	m_groupTransactions(0),
 	m_groupTransaction(NULL),
 	_isGlobalMode(true),
-	m_vhRulerHW(17),
-	linkAfterDraw(false)
+	linkAfterDraw(false),
+	m_vhRulerHW(17)
 {
 	setObjectName("s");
 	QPalette p=palette();

Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17533&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h (original)
+++ trunk/Scribus/scribus/scribusview.h Sat Jun  2 10:18:01 2012
@@ -297,7 +297,6 @@
 
 //for linking frame after draw new frame
 private:
-	bool linkAfterDraw;
 	PageItem * firstFrame;
 
 private: // Private attributes
@@ -318,6 +317,7 @@
 	int m_oldCanvasWidth;
 	UndoTransaction*  m_groupTransaction;
 	bool _isGlobalMode;
+	bool linkAfterDraw;
 
 	double oldItemX;
 	double oldItemY;

Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17533&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Sat Jun  2 10:18:01 2012
@@ -64,8 +64,8 @@
 
 void PagePalette_MasterPages::setView(ScribusView* view, QString masterPageName)
 {
-	ScribusView* oldView = currentView;
-	QString oldPage = currentPage;
+//	ScribusView* oldView = currentView;
+//	QString oldPage = currentPage;
 
 	disconnectSignals();
 	currentView = view;