r17936 by craig - Fix a few compile warnings

[scribus-commit]

Author: craig
Date: Wed Dec  5 20:42:33 2012
New Revision: 17936

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17936
Log:
Fix a few compile warnings

Modified:
    trunk/Scribus/scribus/ui/propertiespalette.cpp
    trunk/Scribus/scribus/ui/scmenu.cpp
    trunk/Scribus/scribus/ui/sctreewidget.cpp
    trunk/Scribus/scribus/ui/sctreewidget.h

Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17936&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Wed Dec  5 20:42:33 2012
@@ -125,7 +125,7 @@
 	connect(groupPal, SIGNAL(shapeChanged(int)) , this, SLOT(handleNewShape(int)));
 	connect(groupPal, SIGNAL(shapeEditStarted()), this, SLOT(handleShapeEdit()));
 
-	connect(TabStack, SIGNAL(currentChanged(int)), this, SLOT(SelTab(int)));
+	connect(TabStack, SIGNAL(currentChanged2(int)), this, SLOT(SelTab(int)));
 
 	connect(Cpal, SIGNAL(NewSpecial(double, double, double, double, double, double, double, double, double, double)), this, SLOT(NewSpGradient(double, double, double, double, double, double, double, double, double, double )));
 	connect(Cpal, SIGNAL(editGradient(int)), this, SLOT(toggleGradientEdit(int)));
@@ -366,7 +366,7 @@
 	if (!m_doc)
 		setDoc(i->doc());
 
-	disconnect(TabStack, SIGNAL(currentChanged(int)) , this, SLOT(SelTab(int)));
+	disconnect(TabStack, SIGNAL(currentChanged2(int)) , this, SLOT(SelTab(int)));
 	disconnect(linePal , SIGNAL(lineModeChanged(int)), this, SLOT(NewLineMode(int)));
 
 	m_haveItem = false;
@@ -440,7 +440,7 @@
 		TabStack->setItemEnabled(idTransparencyItem, false);
 		TabStack->setItemEnabled(idTableItem, false);
 	}
-	connect(TabStack, SIGNAL(currentChanged(int)), this, SLOT(SelTab(int)));
+	connect(TabStack, SIGNAL(currentChanged2(int)), this, SLOT(SelTab(int)));
 }
 
 void  PropertiesPalette::handleSelectionChanged()
@@ -448,7 +448,7 @@
 	if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;
 	int currentTab = TabStack->currentIndex();
-	disconnect(TabStack, SIGNAL(currentChanged(int)), this, SLOT(SelTab(int)));
+	disconnect(TabStack, SIGNAL(currentChanged2(int)), this, SLOT(SelTab(int)));
 
 	PageItem* currItem = currentItemFromSelection();
 	if (m_doc->m_Selection->count() > 1)
@@ -571,7 +571,7 @@
 		TabStack->setCurrentIndex(currentTab);
 	updateGeometry();
 	repaint();
-	connect(TabStack, SIGNAL(currentChanged(int)), this, SLOT(SelTab(int)));
+	connect(TabStack, SIGNAL(currentChanged2(int)), this, SLOT(SelTab(int)));
 
 	if (currItem)
 	{

Modified: trunk/Scribus/scribus/ui/scmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17936&path=/trunk/Scribus/scribus/ui/scmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/scmenu.cpp Wed Dec  5 20:42:33 2012
@@ -142,7 +142,7 @@
 #ifdef Q_WS_MAC
 		bool menuListHasNoIcons = true;
 		// look for ScrAction or ScrPopupMenu from the end of the list
-		QList< QPointer<QObject> >::Iterator it = menuItemList.end();
+//		QList< QPointer<QObject> >::Iterator it = menuItemList.end();
 		int s=menuItemList.size()-1; 
 		for (int i=s; i>=0; --i) {
 			QObject* menuItem = menuItemList[i];

Modified: trunk/Scribus/scribus/ui/sctreewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17936&path=/trunk/Scribus/scribus/ui/sctreewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/sctreewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/sctreewidget.cpp Wed Dec  5 20:42:33 2012
@@ -279,6 +279,6 @@
 			setColumnWidth(0, wide);
 		else
 			resizeColumnToContents(0);
-		emit currentChanged(indexOfTopLevelItem(item));
-	}
-}
+		emit currentChanged2(indexOfTopLevelItem(item));
+	}
+}

Modified: trunk/Scribus/scribus/ui/sctreewidget.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17936&path=/trunk/Scribus/scribus/ui/sctreewidget.h
==============================================================================
--- trunk/Scribus/scribus/ui/sctreewidget.h (original)
+++ trunk/Scribus/scribus/ui/sctreewidget.h Wed Dec  5 20:42:33 2012
@@ -65,7 +65,7 @@
 	void handleMousePress(QTreeWidgetItem *item);
 
 signals:
-	void currentChanged(int);
+	void currentChanged2(int);
 
 private:
 	bool m_toolbox_mode;