Author: jghali
Date: Mon Nov 4 23:40:48 2019
New Revision: 23331
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23331
Log:
Remove unused Dirty member from PageItem
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
trunk/Scribus/scribus/scpageoutput.cpp
trunk/Scribus/scribus/text/screenpainter.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23331&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Mon Nov 4 23:40:48 2019
@@ -849,7 +849,6 @@
BottomLine = false;
isTableItem = false;
isSingleSel = false;
- Dirty = false;
invalid = true;
ChangedMasterItem = false;
isEmbedded = false;
@@ -2273,7 +2272,6 @@
embedded->m_yPos -= embedded->gHeight *
(style.baselineOffset() / 1000.0);
}
p->scale(style.scaleH() / 1000.0, style.scaleV() / 1000.0);
- embedded->Dirty = Dirty;
embedded->invalid = true;
double pws = embedded->m_lineWidth;
embedded->DrawObj_Pre(p);
Modified: trunk/Scribus/scribus/pageitem.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23331&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Mon Nov 4 23:40:48 2019
@@ -1359,7 +1359,6 @@
StoryText itemText; ///< Text of element
TextLayout textLayout;
bool isBookmark; ///< Flag for PDF Bookmark
- bool Dirty; ///< Flag for redraw in EditMode
bool invalid; ///< Flag indicates that layout has changed (eg. for
textlayout)
bool HasSel; ///< Flag for text selection
bool FrameOnly; ///< avoid artefacts while moving
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23331&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Mon Nov 4
23:40:48 2019
@@ -394,7 +394,6 @@
currItem->itemText.clear();
currItem->itemText.insertChars(0, Daten);
currItem->invalidateLayout();
- currItem->Dirty = false;
Py_RETURN_NONE;
}
@@ -428,12 +427,8 @@
if (pos == -1)
pos = item->itemText.length();
item->itemText.insertChars(pos, textData, true);
- item->Dirty = true;
- if (ScCore->primaryMainWindow()->doc->DoDrawing)
- {
- // FIXME adapt to Qt-4 painting style
- item->Dirty = false;
- }
+ item->invalidateLayout();
+
Py_RETURN_NONE;
}
Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23331&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp Mon Nov 4 23:40:48 2019
@@ -139,8 +139,6 @@
currItem->BoundingX = OldBX - Mp->xOffset() +
page->xOffset();
currItem->BoundingY = OldBY - Mp->yOffset() +
page->yOffset();
}
- /*if (evSpon)
- currItem->Dirty = true;*/
QRectF oldR(currItem->getBoundingRect().adjusted(0.0, 0.0, 1.0,
1.0));
if (clip.intersects(oldR.toRect()))
{
@@ -1078,7 +1076,6 @@
m_painter->save();
double pws = embedded->m_lineWidth;
- embedded->Dirty = m_item->Dirty;
embedded->invalid = true;
m_scpage->drawItem_Pre(embedded, m_painter);
Modified: trunk/Scribus/scribus/text/screenpainter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23331&path=/trunk/Scribus/scribus/text/screenpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/text/screenpainter.cpp (original)
+++ trunk/Scribus/scribus/text/screenpainter.cpp Mon Nov 4 23:40:48 2019
@@ -300,7 +300,6 @@
double pws = embedded->m_lineWidth;
- embedded->Dirty = m_item->Dirty;
embedded->invalid = true;
embedded->DrawObj_Pre(m_painter);
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23331&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Mon Nov 4 23:40:48 2019
@@ -2985,7 +2985,6 @@
}
nb2->itemText.clear();
nb2->CPos = 0;
- nb2->Dirty = false;
nb2 = nb2->nextInChain();
}
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
