Author: jghali
Date: Tue Apr 3 22:56:11 2018
New Revision: 22463
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22463
Log:
#15236: Scribus stopped building after update to icu 61.1
Modified:
trunk/Scribus/scribus/text/scrptrun.cpp
trunk/Scribus/scribus/text/scrptrun.h
trunk/Scribus/scribus/text/storytext.cpp
trunk/Scribus/scribus/text/storytext.h
trunk/Scribus/scribus/text/textshaper.cpp
trunk/Scribus/scribus/text/textshaper.h
Modified: trunk/Scribus/scribus/text/scrptrun.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22463&path=/trunk/Scribus/scribus/text/scrptrun.cpp
==============================================================================
--- trunk/Scribus/scribus/text/scrptrun.cpp (original)
+++ trunk/Scribus/scribus/text/scrptrun.cpp Tue Apr 3 22:56:11 2018
@@ -37,8 +37,8 @@
* This file is largely copied from the ICU project,
* under folder source/extra/scrptrun/scrptrun.cpp
*/
-#include "unicode/utypes.h"
-#include "unicode/uscript.h"
+#include <unicode/utypes.h>
+#include <unicode/uscript.h>
#include "scrptrun.h"
#include <algorithm>
Modified: trunk/Scribus/scribus/text/scrptrun.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22463&path=/trunk/Scribus/scribus/text/scrptrun.h
==============================================================================
--- trunk/Scribus/scribus/text/scrptrun.h (original)
+++ trunk/Scribus/scribus/text/scrptrun.h Tue Apr 3 22:56:11 2018
@@ -37,10 +37,12 @@
#ifndef SCRPTRUN_H
#define SCRPTRUN_H
-#include "unicode/utypes.h"
-#include "unicode/uobject.h"
-#include "unicode/uscript.h"
+#include <unicode/utypes.h>
+#include <unicode/uobject.h>
+#include <unicode/uscript.h>
#include <vector>
+
+using namespace icu;
struct ScriptRecord
{
Modified: trunk/Scribus/scribus/text/storytext.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22463&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp (original)
+++ trunk/Scribus/scribus/text/storytext.cpp Tue Apr 3 22:56:11 2018
@@ -57,11 +57,6 @@
m_shapedTextCache = new ShapedTextCache();
-// m_firstFrameItem = 0;
-// m_lastFrameItem = -1;
-// m_magicX = 0.0;
-// m_lastMagicPos = -1;
-
d->len = 0;
invalidateAll();
}
@@ -73,10 +68,6 @@
m_selFirst = 0;
m_selLast = -1;
m_shapedTextCache = NULL;
-// m_firstFrameItem = 0;
-// m_lastFrameItem = -1;
-// m_magicX = 0.0;
-// m_lastMagicPos = -1;
}
StoryText::StoryText(const StoryText & other) : QObject(), SaxIO(),
m_doc(other.m_doc)
@@ -93,10 +84,6 @@
m_selFirst = 0;
m_selLast = -1;
m_shapedTextCache = NULL;
-// m_firstFrameItem = 0;
-// m_lastFrameItem = -1;
-// m_magicX = 0.0;
-// m_lastMagicPos = -1;
invalidateLayout();
}
@@ -171,9 +158,6 @@
m_selFirst = 0;
m_selLast = -1;
-
-// m_firstFrameItem = 0;
-// m_lastFrameItem = -1;
invalidateLayout();
return *this;
@@ -306,9 +290,6 @@
{
m_selFirst = 0;
m_selLast = -1;
-
-// m_firstFrameItem = 0;
-// m_lastFrameItem = -1;
d->defaultStyle.erase();
d->trailingStyle.erase();
Modified: trunk/Scribus/scribus/text/storytext.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22463&path=/trunk/Scribus/scribus/text/storytext.h
==============================================================================
--- trunk/Scribus/scribus/text/storytext.h (original)
+++ trunk/Scribus/scribus/text/storytext.h Tue Apr 3 22:56:11 2018
@@ -25,15 +25,15 @@
#ifndef STORYTEXT_H_
#define STORYTEXT_H_
+#include <cassert>
#include <QObject>
#include <QString>
#include <QList>
-#include <cassert>
-#include "unicode/brkiter.h"
+
+#include <unicode/brkiter.h>
+
#include "itextsource.h"
-
#include "marks.h"
-//#include "text/paragraphlayout.h"
#include "text/frect.h"
#include "text/specialchars.h"
#include "sctextstruct.h"
@@ -42,17 +42,15 @@
#include "styles/paragraphstyle.h"
#include "desaxe/saxio.h"
-
class CharStyle;
class ParagraphStyle;
class PageItem;
-//class ScTextEngine;
-//class ScScriptItem;
class ScribusDoc;
class ScText_Shared;
class ResourceCollection;
class ShapedTextCache;
+using namespace icu;
/**
* This class holds the text of a Scribus textframe and pointers to its
@@ -281,16 +279,6 @@
ScText * item(uint index);
const ScText * item(uint index) const;
void fixSurrogateSelection();
-
-//public:
-// ScText * item_p(uint index) { return item(index); }
-
-// int screenToPosition(FPoint coord) const;
-// FRect boundingBox(int pos, uint len = 1) const;
-
-// uint lines() const { return (uint) m_lines.count(); }
-
-// LineSpec line(uint i) const { return m_lines[i]; }
private:
ScribusDoc * m_doc;
@@ -300,11 +288,6 @@
static BreakIterator* m_wordIterator;
static BreakIterator* m_sentenceIterator;
static BreakIterator* m_lineIterator;
-// int m_firstFrameItem, m_lastFrameItem;
-// QList<LineSpec> m_lines;
-// bool m_validLayout;
-// qreal m_magicX;
-// int m_lastMagicPos;
QString textWithSoftHyphens (int pos, uint len) const;
void insertCharsWithSoftHyphens(int pos, QString txt, bool
applyNeighbourStyle = false);
Modified: trunk/Scribus/scribus/text/textshaper.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22463&path=/trunk/Scribus/scribus/text/textshaper.cpp
==============================================================================
--- trunk/Scribus/scribus/text/textshaper.cpp (original)
+++ trunk/Scribus/scribus/text/textshaper.cpp Tue Apr 3 22:56:11 2018
@@ -14,6 +14,7 @@
#include "styles/paragraphstyle.h"
#include "util.h"
+using namespace icu;
TextShaper::TextShaper(ITextContext* context, ITextSource &story, int
firstChar, bool singlePar)
: m_context(context),
Modified: trunk/Scribus/scribus/text/textshaper.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22463&path=/trunk/Scribus/scribus/text/textshaper.h
==============================================================================
--- trunk/Scribus/scribus/text/textshaper.h (original)
+++ trunk/Scribus/scribus/text/textshaper.h Tue Apr 3 22:56:11 2018
@@ -7,16 +7,16 @@
#include <QStringList>
#include <unicode/uscript.h>
+
#include "itextsource.h"
#include "itextcontext.h"
#include "shapedtext.h"
-
class GlyphCluster;
class StoryText;
class PageItem;
-
+using namespace icu;
class TextShaper
{
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
