r23800 by jghali - More asBlahFrame() to isBlahFrame() conversions

scribus-commit scribus-commit at lists.scribus.net
Tue May 12 23:01:22 UTC 2020


Author: jghali
Date: Tue May 12 23:01:22 2020
New Revision: 23800

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23800
Log:
More asBlahFrame() to isBlahFrame() conversions

Modified:
    trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23800&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp	Tue May 12 23:01:22 2020
@@ -1116,7 +1116,7 @@
 			parseCharStyle(newStyle, n.isElement() ? e : elm);
 			item->itemText.applyCharStyle(pos, chars.length(), newStyle);
 		}
-		if (!item->asPolyLine() && !item->isTextFrame())
+		if (!item->isPolyLine() && !item->isTextFrame())
 			item = m_Doc->convertItemTo(item, PageItem::TextFrame);
 		firstSpan = false;
 	}

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23800&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp	Tue May 12 23:01:22 2020
@@ -635,7 +635,7 @@
 	for (int i = 0; i < curSelection->count(); ++i)
 	{
 		PageItem* it = currentDoc->m_Selection->itemAt(i);
-		if ((!it->asPolygon()) || (!it->asPolyLine()))
+		if ((!it->isPolygon()) || (!it->isPolyLine()))
 			canUniteItems = false;
 	}
 

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23800&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Tue May 12 23:01:22 2020
@@ -6618,18 +6618,18 @@
 			view->requestMode(modeEdit);
 		}
 	}
-	else if (ite->asSymbol())
+	else if (ite->isSymbol())
 	{
 		if (!doc->symbolEditMode())
 			view->requestMode(submodeEditSymbol);
 	}
-	else if (ite->asArc())
+	else if (ite->isArc())
 		view->requestMode(modeEditArc);
-	else if (ite->asRegularPolygon())
+	else if (ite->isRegularPolygon())
 		view->requestMode(modeEditPolygon);
-	else if (ite->asSpiral())
+	else if (ite->isSpiral())
 		view->requestMode(modeEditSpiral);
-	else if (ite->asTable())
+	else if (ite->isTable())
 		view->requestMode(modeEditTable);
 }
 

Modified: trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23800&path=/trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	Tue May 12 23:01:22 2020
@@ -634,7 +634,7 @@
 			enabled = true;
 		if ((m_item->isGroup()) && (!m_item->isSingleSel))
 			enabled = false;
-		if (m_item->isOSGFrame() || m_item->asSymbol())
+		if (m_item->isOSGFrame() || m_item->isSymbol())
 			enabled = false;
 		if (m_doc->m_Selection->count() > 1)
 			enabled = false;




More information about the scribus-commit mailing list