Author: jghali
Date: Thu Sep 13 11:22:29 2018
New Revision: 22686
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22686
Log:
rename ScriXmlDoc methods
Modified:
trunk/Scribus/scribus/canvasmode_normal.cpp
trunk/Scribus/scribus/plugins/import/ai/importai.cpp
trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp
trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
trunk/Scribus/scribus/scpreview.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusXml.cpp
trunk/Scribus/scribus/scribusXml.h
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/ui/colorsandfills.cpp
trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Thu Sep 13 11:22:29 2018
@@ -478,7 +478,7 @@
m_doc->DragElements.clear();
for (int dre=0;
dre<m_doc->m_Selection->count(); ++dre)
m_doc->DragElements.append(m_doc->m_Selection->itemAt(dre));
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_doc, m_doc->m_Selection);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_doc, m_doc->m_Selection);
QDrag* dr = new QDrag(m_view);
dr->setMimeData(md);
const QPixmap& pm =
IconManager::instance()->loadPixmap("dragpix.png");
Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Thu Sep 13
11:22:29 2018
@@ -544,7 +544,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if ((importedColors.count() != 0) && (!((flags
& LoadSavePlugin::lfKeepGradients) || (flags & LoadSavePlugin::lfKeepColors) ||
(flags & LoadSavePlugin::lfKeepPatterns))))
Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp Thu Sep 13
11:22:29 2018
@@ -257,7 +257,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp Thu Sep 13
11:22:29 2018
@@ -303,7 +303,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp Thu Sep 13
11:22:29 2018
@@ -256,7 +256,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp Thu Sep 13
11:22:29 2018
@@ -271,7 +271,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedColors.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp Thu Sep 13
11:22:29 2018
@@ -740,7 +740,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedColors.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfh.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfh.cpp Thu Sep 13
11:22:29 2018
@@ -257,7 +257,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp Thu Sep 13
11:22:29 2018
@@ -404,7 +404,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Thu Sep 13
11:22:29 2018
@@ -264,7 +264,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if ((importedColors.count() != 0) && (!((flags
& LoadSavePlugin::lfKeepGradients) || (flags & LoadSavePlugin::lfKeepColors) ||
(flags & LoadSavePlugin::lfKeepPatterns))))
Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&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 Thu Sep 13
11:22:29 2018
@@ -570,7 +570,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md = ScriXmlDoc::WriteToMimeData(m_Doc,
tmpSel);
+ ScElemMimeData* md = ScriXmlDoc::writeToMimeData(m_Doc,
tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp Thu Sep 13
11:22:29 2018
@@ -282,7 +282,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
@@ -733,7 +733,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if ((importedColors.count() != 0) && (!((flags
& LoadSavePlugin::lfKeepGradients) || (flags & LoadSavePlugin::lfKeepColors) ||
(flags & LoadSavePlugin::lfKeepPatterns))))
Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp Thu Sep 13
11:22:29 2018
@@ -276,7 +276,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedColors.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Thu Sep 13
11:22:29 2018
@@ -323,7 +323,7 @@
tmpSele->addItem(Elements.at(dre),
true);
}
tmpSele->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSele);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSele);
m_Doc->itemSelection_DeleteItem(tmpSele);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpm.cpp Thu Sep 13
11:22:29 2018
@@ -257,7 +257,7 @@
tmpSel->addItem(Elements.at(i), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpub.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpub.cpp Thu Sep 13
11:22:29 2018
@@ -260,7 +260,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp Thu Sep 13
11:22:29 2018
@@ -263,7 +263,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp Thu Sep 13
11:22:29 2018
@@ -261,7 +261,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp Thu Sep 13
11:22:29 2018
@@ -256,7 +256,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp Thu Sep 13
11:22:29 2018
@@ -509,7 +509,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md = ScriXmlDoc::WriteToMimeData(m_Doc,
tmpSel);
+ ScElemMimeData* md = ScriXmlDoc::writeToMimeData(m_Doc,
tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if ((importedColors.count() != 0) && (!((flags &
LoadSavePlugin::lfKeepGradients) || (flags & LoadSavePlugin::lfKeepColors) ||
(flags & LoadSavePlugin::lfKeepPatterns))))
Modified: trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp Thu Sep 13
11:22:29 2018
@@ -540,7 +540,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedColors.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp Thu Sep 13
11:22:29 2018
@@ -325,7 +325,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp Thu Sep 13
11:22:29 2018
@@ -260,7 +260,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Thu Sep 13
11:22:29 2018
@@ -669,7 +669,7 @@
m_tmpSel->addItem(Elements.at(dre), true);
}
m_tmpSel->setGroupRect();
- ScElemMimeData* md = ScriXmlDoc::WriteToMimeData(m_Doc,
m_tmpSel);
+ ScElemMimeData* md = ScriXmlDoc::writeToMimeData(m_Doc,
m_tmpSel);
/*#ifndef QT_MAC*/
// see #2526
m_Doc->itemSelection_DeleteItem(m_tmpSel);
Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp Thu Sep 13
11:22:29 2018
@@ -624,7 +624,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp Thu Sep 13
11:22:29 2018
@@ -365,7 +365,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedColors.count() != 0)
Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp Thu Sep 13
11:22:29 2018
@@ -394,7 +394,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
m_Doc->m_Selection->delaySignalsOff();
Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp Thu Sep 13
11:22:29 2018
@@ -320,7 +320,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if ((importedColors.count() != 0) && (!((flags
& LoadSavePlugin::lfKeepGradients) || (flags & LoadSavePlugin::lfKeepColors) ||
(flags & LoadSavePlugin::lfKeepPatterns))))
Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp Thu Sep 13
11:22:29 2018
@@ -263,7 +263,7 @@
tmpSel->addItem(Elements.at(dre), true);
}
tmpSel->setGroupRect();
- ScElemMimeData* md =
ScriXmlDoc::WriteToMimeData(m_Doc, tmpSel);
+ ScElemMimeData* md =
ScriXmlDoc::writeToMimeData(m_Doc, tmpSel);
m_Doc->itemSelection_DeleteItem(tmpSel);
m_Doc->view()->updatesOn(true);
if (importedPatterns.count() != 0)
Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp Thu Sep 13
11:22:29 2018
@@ -231,7 +231,7 @@
ite->ClipEdited = true;
ite->FrameType = 3;
m_Doc->m_Selection->addItem(ite, true);
- ScElemMimeData* md = ScriXmlDoc::WriteToMimeData(m_Doc,
m_Doc->m_Selection);
+ ScElemMimeData* md = ScriXmlDoc::writeToMimeData(m_Doc,
m_Doc->m_Selection);
QDrag* dr = new QDrag(this);
dr->setMimeData(md);
dr->setPixmap(currentItem()->icon().pixmap(QSize(48, 48)));
Modified: trunk/Scribus/scribus/scpreview.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/scpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/scpreview.cpp (original)
+++ trunk/Scribus/scribus/scpreview.cpp Thu Sep 13 11:22:29 2018
@@ -25,7 +25,7 @@
PrefsManager *prefsManager = PrefsManager::instance();
double gx, gy, gw, gh;
ScriXmlDoc ss;
- if(ss.ReadElemHeader(data, false, &gx, &gy, &gw, &gh))
+ if (ss.readElemHeader(data, false, &gx, &gy, &gw, &gh))
{
QDomDocument docu("scridoc");
docu.setContent(data);
@@ -48,7 +48,7 @@
m_Doc->setGUI(false, ScCore->primaryMainWindow(), nullptr);
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
- if(ss.ReadElem(data,
prefsManager->appPrefs.fontPrefs.AvailFonts, m_Doc, 0, 0, false, true,
prefsManager->appPrefs.fontPrefs.GFontSub))
+ if (ss.readElem(data,
prefsManager->appPrefs.fontPrefs.AvailFonts, m_Doc, 0, 0, false, true,
prefsManager->appPrefs.fontPrefs.GFontSub))
{
QList<PageItem*> Elements = *m_Doc->Items;
Selection *tmpSel = new Selection(m_Doc, false);
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Sep 13 11:22:29 2018
@@ -4608,7 +4608,7 @@
if ((currItem->isSingleSel) && (currItem->isGroup()))
return;
ScriXmlDoc ss;
- QString BufferS = ss.WriteElem(doc, doc->m_Selection);
+ QString BufferS = ss.writeElem(doc, doc->m_Selection);
if ((m_prefsManager->appPrefs.scrapbookPrefs.doCopyToScrapbook)
&& (!internalCopy))
{
scrapbookPalette->ObjFromCopyAction(BufferS,
currItem->itemName());
@@ -4683,7 +4683,7 @@
*(doc->m_Selection) = tempSelection;
ScriXmlDoc ss;
- QString BufferS = ss.WriteElem(doc, doc->m_Selection);
+ QString BufferS = ss.writeElem(doc, doc->m_Selection);
if (!internalCopy)
{
if
((m_prefsManager->appPrefs.scrapbookPrefs.doCopyToScrapbook) && (!internalCopy))
@@ -7469,7 +7469,7 @@
view->requestMode(submodeEndNodeEdit);
ScriXmlDoc ss;
- if(ss.ReadElem(xml, m_prefsManager->appPrefs.fontPrefs.AvailFonts,
docc, x, y, art, loca, m_prefsManager->appPrefs.fontPrefs.GFontSub))
+ if(ss.readElem(xml, m_prefsManager->appPrefs.fontPrefs.AvailFonts,
docc, x, y, art, loca, m_prefsManager->appPrefs.fontPrefs.GFontSub))
{
vie->DrawNew();
if (doc == docc)
@@ -8178,7 +8178,7 @@
if (doc->m_Selection->isEmpty())
return;
ScriXmlDoc ss;
- QString objectString = ss.WriteElem(doc, doc->m_Selection);
+ QString objectString = ss.writeElem(doc, doc->m_Selection);
QDomDocument docu("scridoc");
docu.setContent(objectString);
QDomElement elem = docu.documentElement();
@@ -8777,7 +8777,7 @@
data = QString::fromUtf8(cf.data());
double gx, gy, gw, gh;
ScriXmlDoc ss;
- if (ss.ReadElemHeader(data, false, &gx,
&gy, &gw, &gh))
+ if (ss.readElemHeader(data, false, &gx,
&gy, &gw, &gh))
{
doFileNew(gw, gh, 0, 0, 0, 0,
0, 0, false, false, 0, false, 0, 1, "Custom", true);
HaveNewDoc();
@@ -8815,7 +8815,7 @@
{
double gx, gy, gw, gh;
ScriXmlDoc ss;
- if (ss.ReadElemHeader(text, false, &gx, &gy,
&gw, &gh))
+ if (ss.readElemHeader(text, false, &gx, &gy,
&gw, &gh))
{
doFileNew(gw, gh, 0, 0, 0, 0, 0, 0,
false, false, 0, false, 0, 1, "Custom", true);
HaveNewDoc();
Modified: trunk/Scribus/scribus/scribusXml.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/scribusXml.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusXml.cpp (original)
+++ trunk/Scribus/scribus/scribusXml.cpp Thu Sep 13 11:22:29 2018
@@ -66,7 +66,7 @@
{
}
-bool ScriXmlDoc::ReadElemHeader(const QString& file, bool isFile, double *x,
double *y, double *w, double *h)
+bool ScriXmlDoc::readElemHeader(const QString& file, bool isFile, double *x,
double *y, double *w, double *h)
{
QString ff = "";
if (isFile)
@@ -110,14 +110,14 @@
return (succeed && !sReader.hasError());
}
-bool ScriXmlDoc::ReadElem(const QString& fileNameOrData, SCFonts &avail,
ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool loc,
QMap<QString,QString> &FontSub)
+bool ScriXmlDoc::readElem(const QString& fileNameOrData, SCFonts &avail,
ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool loc,
QMap<QString,QString> &FontSub)
{
// Do not suppose the existence of layer with id = 0
- // return ReadElemToLayer(fileName, avail, doc, Xp, Yp, Fi, loc,
FontSub, view, 0);
- return ReadElemToLayer(fileNameOrData, avail, doc, xPos, yPos,
isDataFromFile, loc, FontSub, doc->activeLayer());
-}
-
-bool ScriXmlDoc::ReadElemToLayer(const QString& fileNameOrData, SCFonts
&avail, ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool
loc, QMap<QString,QString> &FontSub, int toLayer)
+ // return readElemToLayer(fileName, avail, doc, Xp, Yp, Fi, loc,
FontSub, view, 0);
+ return readElemToLayer(fileNameOrData, avail, doc, xPos, yPos,
isDataFromFile, loc, FontSub, doc->activeLayer());
+}
+
+bool ScriXmlDoc::readElemToLayer(const QString& fileNameOrData, SCFonts
&avail, ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool
loc, QMap<QString,QString> &FontSub, int toLayer)
{
QString elementData;
QString fileDir = ScPaths::applicationDataDir();
@@ -152,7 +152,7 @@
return false;
}
-QString ScriXmlDoc::WriteElem(ScribusDoc *doc, Selection* selection)
+QString ScriXmlDoc::writeElem(ScribusDoc *doc, Selection* selection)
{
if (selection->count()==0)
return "";
@@ -223,10 +223,10 @@
return documentStr;
}
-ScElemMimeData* ScriXmlDoc::WriteToMimeData(ScribusDoc *doc, Selection
*selection)
+ScElemMimeData* ScriXmlDoc::writeToMimeData(ScribusDoc *doc, Selection
*selection)
{
ScElemMimeData* md = new ScElemMimeData();
- md->setScribusElem(WriteElem(doc, selection));
+ md->setScribusElem(writeElem(doc, selection));
return md;
}
Modified: trunk/Scribus/scribus/scribusXml.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/scribusXml.h
==============================================================================
--- trunk/Scribus/scribus/scribusXml.h (original)
+++ trunk/Scribus/scribus/scribusXml.h Thu Sep 13 11:22:29 2018
@@ -47,12 +47,12 @@
\param file filename of file to test
\retval bool true = Scribus format file, false : not Scribus
*/
- bool ReadElemHeader(const QString& file, bool isFile, double *x, double
*y, double *w, double *h);
- bool ReadElem(const QString& fileNameOrData, SCFonts &avail, ScribusDoc
*doc, double xPos, double yPos, bool isDataFromFile, bool loc,
QMap<QString,QString> &FontSub);
- bool ReadElemToLayer(const QString& fileNameOrData, SCFonts &avail,
ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool loc,
QMap<QString,QString> &FontSub, int toLayer);
+ bool readElemHeader(const QString& file, bool isFile, double *x, double
*y, double *w, double *h);
+ bool readElem(const QString& fileNameOrData, SCFonts &avail, ScribusDoc
*doc, double xPos, double yPos, bool isDataFromFile, bool loc,
QMap<QString,QString> &FontSub);
+ bool readElemToLayer(const QString& fileNameOrData, SCFonts &avail,
ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool loc,
QMap<QString,QString> &FontSub, int toLayer);
- static QString WriteElem(ScribusDoc *doc, Selection *selection);
- static ScElemMimeData* WriteToMimeData(ScribusDoc *doc, Selection
*selection);
+ static QString writeElem(ScribusDoc *doc, Selection *selection);
+ static ScElemMimeData* writeToMimeData(ScribusDoc *doc, Selection
*selection);
private:
static QList<PageItem*> getItemsFromSelection(ScribusDoc *doc,
Selection* selection);
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Thu Sep 13 11:22:29 2018
@@ -2931,8 +2931,8 @@
if (sourceSelection.count() != 0)
{
ScriXmlDoc ss;
- QString dataS = ss.WriteElem(this, &sourceSelection);
- ss.ReadElemToLayer(dataS, m_appPrefsData.fontPrefs.AvailFonts,
this, Pages->at(0)->xOffset(), Pages->at(0)->yOffset(), false, true,
m_appPrefsData.fontPrefs.GFontSub, whereToInsert);
+ QString dataS = ss.writeElem(this, &sourceSelection);
+ ss.readElemToLayer(dataS, m_appPrefsData.fontPrefs.AvailFonts,
this, Pages->at(0)->xOffset(), Pages->at(0)->yOffset(), false, true,
m_appPrefsData.fontPrefs.GFontSub, whereToInsert);
}
sourceSelection.clear();
changed();
@@ -5262,10 +5262,10 @@
{
ScriXmlDoc ss;
setMasterPageMode(true);
- setCurrentPage(pageMaster); //
Needed for WriteElem to write proper page relative coordinates
- QString dataS =
ss.WriteElem(this, &tempSelection);
+ setCurrentPage(pageMaster); //
Needed for writeElem to write proper page relative coordinates
+ QString dataS =
ss.writeElem(this, &tempSelection);
setCurrentPage(targetPage);
- ss.ReadElemToLayer(dataS,
m_appPrefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(),
targetPage->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub, it->ID);
+ ss.readElemToLayer(dataS,
m_appPrefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(),
targetPage->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub, it->ID);
setMasterPageMode(false);
setCurrentPage(oldCurrentPage);
}
@@ -5291,11 +5291,11 @@
if (tempSelection.count() != 0)
{
ScriXmlDoc ss;
- setCurrentPage(sourcePage); // Needed for
WriteElem to write proper page relative coordinates
- QString dataS = ss.WriteElem(this,
&tempSelection);
+ setCurrentPage(sourcePage); // Needed for
writeElem to write proper page relative coordinates
+ QString dataS = ss.writeElem(this,
&tempSelection);
setMasterPageMode(true);
setCurrentPage(targetPage);
- ss.ReadElemToLayer(dataS,
m_appPrefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(),
targetPage->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub, it->ID);
+ ss.readElemToLayer(dataS,
m_appPrefsData.fontPrefs.AvailFonts, this, targetPage->xOffset(),
targetPage->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub, it->ID);
setMasterPageMode(false);
setCurrentPage(oldCurrentPage);
}
@@ -7139,7 +7139,7 @@
if (tempSelection.count() != 0)
{
ScriXmlDoc ss;
- QString dataS = ss.WriteElem(this,
&tempSelection);
+ QString dataS = ss.writeElem(this,
&tempSelection);
itemBuffer.append(dataS);
}
else
@@ -7224,7 +7224,7 @@
{
ScriXmlDoc ss;
QString fragment =
itemBuffer[lcount];
- ss.ReadElemToLayer(fragment,
m_appPrefsData.fontPrefs.AvailFonts, this, destination->xOffset(),
destination->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub, it->ID);
+ ss.readElemToLayer(fragment,
m_appPrefsData.fontPrefs.AvailFonts, this, destination->xOffset(),
destination->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub, it->ID);
}
lcount++;
}
@@ -10768,12 +10768,12 @@
int rotBack = rotationMode();
setRotationMode ( 0 );
ScriXmlDoc xmlDoc;
- QString copyBuffer = xmlDoc.WriteElem(this, m_Selection);
+ QString copyBuffer = xmlDoc.writeElem(this, m_Selection);
view()->Deselect(true);
for (int b = 0; b < nrOfCopies; b++)
{
uint ac = Items->count();
- xmlDoc.ReadElem(copyBuffer,
m_appPrefsData.fontPrefs.AvailFonts, this, currentPage()->xOffset(),
currentPage()->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub);
+ xmlDoc.readElem(copyBuffer,
m_appPrefsData.fontPrefs.AvailFonts, this, currentPage()->xOffset(),
currentPage()->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub);
for (int as = ac; as < Items->count(); ++as)
{
PageItem* bItem = Items->at(as);
@@ -13535,13 +13535,13 @@
dV2 += selection.height();
}
ScriXmlDoc ss;
- QString BufferS = ss.WriteElem(this, &selection);
+ QString BufferS = ss.writeElem(this, &selection);
//FIXME: stop using m_View
m_View->Deselect(true);
for (int i=0; i<mdData.copyCount; ++i)
{
uint ac = Items->count();
- ss.ReadElem(BufferS,
m_appPrefsData.fontPrefs.AvailFonts, this, currentPage()->xOffset(),
currentPage()->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub);
+ ss.readElem(BufferS,
m_appPrefsData.fontPrefs.AvailFonts, this, currentPage()->xOffset(),
currentPage()->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub);
m_Selection->delaySignalsOn();
for (int as = ac; as < Items->count(); ++as)
{
@@ -13593,7 +13593,7 @@
double dX = mdData.gridGapH / m_docUnitRatio +
selection.width();
double dY = mdData.gridGapV / m_docUnitRatio +
selection.height();
ScriXmlDoc ss;
- QString BufferS = ss.WriteElem(this, &selection);
+ QString BufferS = ss.writeElem(this, &selection);
for (int i = 0; i < mdData.gridRows; ++i) //skip 0, the item is
the one we are copying
{
for (int j = 0; j < mdData.gridCols; ++j) //skip 0, the
item is the one we are copying
@@ -13602,7 +13602,7 @@
if (i==0 && j==0)
continue;
uint ac = Items->count();
- ss.ReadElem(BufferS,
m_appPrefsData.fontPrefs.AvailFonts, this, currentPage()->xOffset(),
currentPage()->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub);
+ ss.readElem(BufferS,
m_appPrefsData.fontPrefs.AvailFonts, this, currentPage()->xOffset(),
currentPage()->yOffset(), false, true, m_appPrefsData.fontPrefs.GFontSub);
for (int as = ac; as < Items->count(); ++as)
{
PageItem* bItem = Items->at(as);
Modified: trunk/Scribus/scribus/scribusview.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Thu Sep 13 11:22:29 2018
@@ -657,7 +657,7 @@
double gx, gy, gw, gh;
ScriXmlDoc ss;
- if (ss.ReadElemHeader(text, fromFile, &gx, &gy, &gw, &gh))
+ if (ss.readElemHeader(text, fromFile, &gx, &gy, &gw, &gh))
{
FPoint dragPosDoc =
m_canvas->globalToCanvas(widget()->mapToGlobal(e->pos()));
dragX = dragPosDoc.x(); //e->pos().x() / m_canvas->scale();
Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp (original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp Thu Sep 13 11:22:29 2018
@@ -1325,7 +1325,7 @@
if (fi.suffix().toLower() == "sce")
{
ScriXmlDoc ss;
- ss.ReadElem(data,
PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts, m_doc,
m_doc->currentPage()->xOffset(), m_doc->currentPage()->yOffset(), true, true,
PrefsManager::instance()->appPrefs.fontPrefs.GFontSub);
+ ss.readElem(data,
PrefsManager::instance()->appPrefs.fontPrefs.AvailFonts, m_doc,
m_doc->currentPage()->xOffset(), m_doc->currentPage()->yOffset(), true, true,
PrefsManager::instance()->appPrefs.fontPrefs.GFontSub);
}
else
{
Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22686&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Thu Sep 13
11:22:29 2018
@@ -300,8 +300,8 @@
if (m_doc->m_Selection->count() != 0)
{
ScriXmlDoc ss;
- QString buffer = ss.WriteElem(m_doc,
m_doc->m_Selection);
- ss.ReadElemToLayer(buffer,
prefsManager->appPrefs.fontPrefs.AvailFonts, m_doc, destination->xOffset(),
destination->yOffset(), false, true, prefsManager->appPrefs.fontPrefs.GFontSub,
it->ID);
+ QString buffer = ss.writeElem(m_doc,
m_doc->m_Selection);
+ ss.readElemToLayer(buffer,
prefsManager->appPrefs.fontPrefs.AvailFonts, m_doc, destination->xOffset(),
destination->yOffset(), false, true, prefsManager->appPrefs.fontPrefs.GFontSub,
it->ID);
m_doc->m_Selection->clear();
}
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
