[scribus-dev] Scribus CTL

[Khaled Hosny]

On Wed, Feb 24, 2016 at 05:54:46PM +0100, Craig Bradney wrote:
> 
> > On 24 Feb 2016, at 17:53, Khaled Hosny <khaledhosny at eglug.org> wrote:
> > 
> > On Tue, Feb 23, 2016 at 10:30:20PM +0100, Craig Bradney wrote:
> >> 
> >>> I just rebased on top of r21027, and we will try to rebase regularly to
> >>> keep things in sync. I have been also trying to reduce the unneeded
> >>> diffs as much as possible (reverting early experimentation etc.) to make
> >>> the final patch a bit easier to digest.
> >>> 
> >> 
> >> r20128 and r20129 are easy for you to bring over. scpaths.h/cpp and
> >> ui/helpbrowser.cpp.
> > 
> > We are on r21029 now. Rebasing with git is super easy as long as we
> > didn’t touch the same code (and even that can be manageable to a certain
> > degree).
> > 
> >> I was trying to do a rename of ScPainter to ScImagePainter to match
> >> you but you still have both classes at the moment. Not sure which to
> >> use.
> > 
> > After the latest changes most of the renaming became unnecessary, so I
> > reverted most of the ScPainter changes so the differences are reduced
> > quite a bit and more localised now.
> > 
> 
> I just removed the extra ; in scpage.h so that is now the same too.
> 
> I’m now seeing 34 files with changes and 2 orphans (the 2 new boxes files in the text directory)

We are again up to date now. I’m attaching a small patch that fixes a
bunch of warnings, so that it is easy to spot new warnings in our code.

Regards,
Khaled
-------------- next part --------------
diff --git a/scribus/canvasmode_framelinks.cpp b/scribus/canvasmode_framelinks.cpp
index 0d39d5a..e424e90 100644
--- a/scribus/canvasmode_framelinks.cpp
+++ b/scribus/canvasmode_framelinks.cpp
@@ -119,8 +119,6 @@ void CanvasMode_FrameLinks::mouseDoubleClickEvent(QMouseEvent *m)
 
 void CanvasMode_FrameLinks::mouseMoveEvent(QMouseEvent *m)
 {
-	const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
-	
 	m->accept();
 
 	if (commonMouseMove(m))
diff --git a/scribus/pdflib_core.cpp b/scribus/pdflib_core.cpp
index 81e7ce4..684933f 100644
--- a/scribus/pdflib_core.cpp
+++ b/scribus/pdflib_core.cpp
@@ -1709,27 +1709,27 @@ PdfFont PDFLibCore::PDF_EncodeSimpleFont(const QByteArray& fontName, ScFace& fac
 }
 
 
-static void dumpFont(QString name, QByteArray data)
-{
-	QFile file(name);
-	if (file.open(QIODevice::WriteOnly))
-	{
-		QDataStream out(&file);
-		out.writeRawData(data.data(), data.length());
-		file.close();
-	}
-}
+//static void dumpFont(QString name, QByteArray data)
+//{
+//	QFile file(name);
+//	if (file.open(QIODevice::WriteOnly))
+//	{
+//		QDataStream out(&file);
+//		out.writeRawData(data.data(), data.length());
+//		file.close();
+//	}
+//}
 
-static void dumpCFF(QString name, cff::CFF font)
-{
-	QFile file(name);
-	if (file.open(QIODevice::WriteOnly))
-	{
-		QDataStream out(&file);
-		font.dump(out);
-		file.close();
-	}
-}
+//static void dumpCFF(QString name, cff::CFF font)
+//{
+//	QFile file(name);
+//	if (file.open(QIODevice::WriteOnly))
+//	{
+//		QDataStream out(&file);
+//		font.dump(out);
+//		file.close();
+//	}
+//}
 
 
 PdfFont PDFLibCore::PDF_WriteTtfSubsetFont(const QByteArray& fontName, ScFace& face, const QMap<uint,FPointArray>& RealGlyphs)
diff --git a/scribus/plugins/scriptplugin/cmddoc.cpp b/scribus/plugins/scriptplugin/cmddoc.cpp
index f1a70b6..562ce6d 100644
--- a/scribus/plugins/scriptplugin/cmddoc.cpp
+++ b/scribus/plugins/scriptplugin/cmddoc.cpp
@@ -426,5 +426,5 @@ PV */
 void cmddocdocwarnings()
 {
 	QStringList s;
-	s << scribus_newdocument__doc__ << scribus_newdoc__doc__ <<  scribus_closedoc__doc__ << scribus_havedoc__doc__ << scribus_opendoc__doc__ << scribus_savedoc__doc__ << scribus_getdocname__doc__ << scribus_savedocas__doc__ << scribus_setinfo__doc__ <<scribus_setmargins__doc__ <<scribus_setunit__doc__ <<scribus_getunit__doc__ <<scribus_loadstylesfromfile__doc__ <<scribus_setdoctype__doc__ <<scribus_closemasterpage__doc__ <<scribus_masterpagenames__doc__ <<scribus_editmasterpage__doc__ <<scribus_createmasterpage__doc__ <<scribus_deletemasterpage__doc__ << scribus_setbaseline__doc__;
+	s << scribus_newdocument__doc__ << scribus_newdoc__doc__ <<  scribus_closedoc__doc__ << scribus_havedoc__doc__ << scribus_opendoc__doc__ << scribus_savedoc__doc__ << scribus_getdocname__doc__ << scribus_savedocas__doc__ << scribus_setinfo__doc__ <<scribus_setmargins__doc__ <<scribus_setunit__doc__ <<scribus_getunit__doc__ <<scribus_loadstylesfromfile__doc__ <<scribus_setdoctype__doc__ <<scribus_closemasterpage__doc__ <<scribus_masterpagenames__doc__ <<scribus_editmasterpage__doc__ <<scribus_createmasterpage__doc__ <<scribus_deletemasterpage__doc__ << scribus_setbaseline__doc__ << scribus_applymasterpage__doc__;
 }
diff --git a/scribus/ui/prefs_documentsections.cpp b/scribus/ui/prefs_documentsections.cpp
index 80a50dc..a94ee56 100644
--- a/scribus/ui/prefs_documentsections.cpp
+++ b/scribus/ui/prefs_documentsections.cpp
@@ -17,7 +17,7 @@ for which a new license (GPL+exception) is in place.
 
 Prefs_DocumentSections::Prefs_DocumentSections(QWidget* parent, ScribusDoc* doc)
 	: Prefs_Pane(parent),
-	m_doc(doc), m_maxPageIndex(0)
+	m_maxPageIndex(0), m_doc(doc)
 {
 	setupUi(this);
 	languageChange();