r20606 by craig -
scribus-commit
scribus-commit at lists.scribus.net
Mon Nov 30 22:00:56 UTC 2015
Author: craig
Date: Mon Nov 30 22:00:56 2015
New Revision: 20606
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20606
Log:
#13556: part 2 <aliyousuf>
Modified:
trunk/Scribus/scribus/fpointarray.cpp
trunk/Scribus/scribus/fpointarray.h
trunk/Scribus/scribus/gtaction.cpp
trunk/Scribus/scribus/gtaction.h
trunk/Scribus/scribus/gtfont.cpp
trunk/Scribus/scribus/gtfont.h
trunk/Scribus/scribus/gtgettext.cpp
trunk/Scribus/scribus/gtgettext.h
trunk/Scribus/scribus/gtmeasure.cpp
trunk/Scribus/scribus/gtmeasure.h
trunk/Scribus/scribus/gtwriter.cpp
trunk/Scribus/scribus/gtwriter.h
trunk/Scribus/scribus/guidemanagercore.cpp
trunk/Scribus/scribus/guidemanagercore.h
trunk/Scribus/scribus/guidesmodel.cpp
trunk/Scribus/scribus/guidesmodel.h
trunk/Scribus/scribus/iconmanager.cpp
trunk/Scribus/scribus/iconmanager.h
trunk/Scribus/scribus/latexhelpers.cpp
trunk/Scribus/scribus/latexhelpers.h
Modified: trunk/Scribus/scribus/fpointarray.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/fpointarray.cpp
==============================================================================
--- trunk/Scribus/scribus/fpointarray.cpp (original)
+++ trunk/Scribus/scribus/fpointarray.cpp Mon Nov 30 22:00:56 2015
@@ -51,7 +51,7 @@
FPointArray & FPointArray::operator=( const FPointArray &a )
{
QVector<FPoint>::operator=(a);
- svgState = NULL;
+ m_svgState = NULL;
QVector<FPoint>::squeeze();
return *this;
}
@@ -593,9 +593,9 @@
switch (elm.type)
{
case QPainterPath::MoveToElement:
- if (svgState->WasM)
+ if (m_svgState->WasM)
svgClosePath();
- svgState->WasM = true;
+ m_svgState->WasM = true;
svgMoveTo(elm.x, elm.y);
break;
case QPainterPath::LineToElement:
@@ -614,107 +614,107 @@
FPointArray::~FPointArray()
{
- if (svgState)
- delete svgState;
+ if (m_svgState)
+ delete m_svgState;
}
void FPointArray::svgInit()
{
- if (!svgState)
- svgState = new SVGState;
- svgState->reset(0,0);
- svgState->FirstM = true;
- svgState->WasM = false;
+ if (!m_svgState)
+ m_svgState = new SVGState;
+ m_svgState->reset(0,0);
+ m_svgState->FirstM = true;
+ m_svgState->WasM = false;
}
void FPointArray::svgMoveTo(double x, double y)
{
- if (!svgState)
+ if (!m_svgState)
return;
- svgState->reset(x, y);
- svgState->WasM = true;
+ m_svgState->reset(x, y);
+ m_svgState->WasM = true;
}
void FPointArray::svgLineTo(double x1, double y1)
{
- if (!svgState)
+ if (!m_svgState)
return;
- if (svgState->needsMarker())
+ if (m_svgState->needsMarker())
setMarker();
- svgState->FirstM = false;
- svgState->WasM = false;
+ m_svgState->FirstM = false;
+ m_svgState->WasM = false;
if (size() > 3)
{
FPoint b1 = point(size()-4);
FPoint b2 = point(size()-3);
FPoint b3 = point(size()-2);
FPoint b4 = point(size()-1);
- FPoint n1 = FPoint(svgState->CurrX, svgState->CurrY);
+ FPoint n1 = FPoint(m_svgState->CurrX, m_svgState->CurrY);
FPoint n2 = FPoint(x1, y1);
if ((b1 == n1) && (b2 == n1) && (b3 == n2) && (b4 == n2))
return;
}
- addPoint(FPoint(svgState->CurrX, svgState->CurrY));
- addPoint(FPoint(svgState->CurrX, svgState->CurrY));
+ addPoint(FPoint(m_svgState->CurrX, m_svgState->CurrY));
+ addPoint(FPoint(m_svgState->CurrX, m_svgState->CurrY));
addPoint(FPoint(x1, y1));
addPoint(FPoint(x1, y1));
- svgState->move(x1, y1, 4);
+ m_svgState->move(x1, y1, 4);
}
void FPointArray::svgCurveToCubic(double x1, double y1, double x2, double y2, double x3, double y3)
{
- if (!svgState)
+ if (!m_svgState)
return;
- if (svgState->needsMarker())
+ if (m_svgState->needsMarker())
setMarker();
- svgState->FirstM = false;
- svgState->WasM = false;
- if (svgState->PathLen > 3)
+ m_svgState->FirstM = false;
+ m_svgState->WasM = false;
+ if (m_svgState->PathLen > 3)
{
FPoint b1 = point(size()-4);
FPoint b2 = point(size()-3);
FPoint b3 = point(size()-2);
FPoint b4 = point(size()-1);
- FPoint n1 = FPoint(svgState->CurrX, svgState->CurrY);
+ FPoint n1 = FPoint(m_svgState->CurrX, m_svgState->CurrY);
FPoint n2 = FPoint(x1, y1);
FPoint n3 = FPoint(x3, y3);
FPoint n4 = FPoint(x2, y2);
if ((b1 == n1) && (b2 == n2) && (b3 == n3) && (b4 == n4))
return;
}
- addPoint(FPoint(svgState->CurrX, svgState->CurrY));
+ addPoint(FPoint(m_svgState->CurrX, m_svgState->CurrY));
addPoint(FPoint(x1, y1));
addPoint(FPoint(x3, y3));
addPoint(FPoint(x2, y2));
- svgState->move(x3, y3, 4);
+ m_svgState->move(x3, y3, 4);
}
void FPointArray::svgClosePath()
{
- if (!svgState)
+ if (!m_svgState)
return;
- if (svgState->PathLen > 2)
- {
- if ((svgState->PathLen == 4) || (point(size()-2).x() != svgState->StartX) || (point(size()-2).y() != svgState->StartY))
+ if (m_svgState->PathLen > 2)
+ {
+ if ((m_svgState->PathLen == 4) || (point(size()-2).x() != m_svgState->StartX) || (point(size()-2).y() != m_svgState->StartY))
{
addPoint(point(size()-2));
addPoint(point(size()-3));
- addPoint(FPoint(svgState->StartX, svgState->StartY));
- addPoint(FPoint(svgState->StartX, svgState->StartY));
+ addPoint(FPoint(m_svgState->StartX, m_svgState->StartY));
+ addPoint(FPoint(m_svgState->StartX, m_svgState->StartY));
}
}
}
void FPointArray::svgArcTo(double r1, double r2, double angle, bool largeArcFlag, bool sweepFlag, double x1, double y1)
{
- if (!svgState)
+ if (!m_svgState)
return;
- calculateArc(false, svgState->CurrX, svgState->CurrY, angle, x1, y1, r1, r2, largeArcFlag, sweepFlag);
+ calculateArc(false, m_svgState->CurrX, m_svgState->CurrY, angle, x1, y1, r1, r2, largeArcFlag, sweepFlag);
}
void FPointArray::calculateArc(bool relative, double &curx, double &cury, double angle,
@@ -928,7 +928,7 @@
{
ptr = getCoord( ptr, tox );
ptr = getCoord( ptr, toy );
- svgState->WasM = true;
+ m_svgState->WasM = true;
subpathx = curx = relative ? curx + tox : tox;
subpathy = cury = relative ? cury + toy : toy;
svgMoveTo(curx, cury );
Modified: trunk/Scribus/scribus/fpointarray.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/fpointarray.h
==============================================================================
--- trunk/Scribus/scribus/fpointarray.h (original)
+++ trunk/Scribus/scribus/fpointarray.h Mon Nov 30 22:00:56 2015
@@ -42,9 +42,9 @@
class SCRIBUS_API FPointArray : public QVector<FPoint>
{
public:
- FPointArray() : svgState(NULL) {};
- FPointArray(int size) : QVector<FPoint>(size), svgState(NULL) {};
- FPointArray(const FPointArray &a) : QVector<FPoint>(a), svgState(NULL) {};
+ FPointArray() : m_svgState(NULL) {};
+ FPointArray(int size) : QVector<FPoint>(size), m_svgState(NULL) {};
+ FPointArray(const FPointArray &a) : QVector<FPoint>(a), m_svgState(NULL) {};
int size() const { return QVector<FPoint>::count(); }
bool resize(int newCount);
void reverse();
@@ -91,7 +91,7 @@
QPainterPath toQPainterPath(bool closed);
void fromQPainterPath(QPainterPath &path, bool close = false);
private:
- SVGState * svgState;
+ SVGState * m_svgState;
};
#endif
Modified: trunk/Scribus/scribus/gtaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtaction.cpp
==============================================================================
--- trunk/Scribus/scribus/gtaction.cpp (original)
+++ trunk/Scribus/scribus/gtaction.cpp Mon Nov 30 22:00:56 2015
@@ -73,21 +73,21 @@
gtAction::gtAction(bool append, PageItem* pageitem)
{
- prefsManager=PrefsManager::instance();
- textFrame = pageitem;
- m_ScMW=textFrame->doc()->scMW();
- it = textFrame;
- lastParagraphStyle = -1;
- inPara = false;
- isFirstWrite = true;
- lastCharWasLineChange = false;
- currentFrameStyle = "";
- doAppend = append;
- updateParagraphStyles = false;
- overridePStyleFont = true;
- undoManager = UndoManager::instance();
- noteStory = NULL;
- note = NULL;
+ m_prefsManager=PrefsManager::instance();
+ m_textFrame = pageitem;
+ m_ScMW=m_textFrame->doc()->scMW();
+ m_it = m_textFrame;
+ m_lastParagraphStyle = -1;
+ m_inPara = false;
+ m_isFirstWrite = true;
+ m_lastCharWasLineChange = false;
+ m_currentFrameStyle = "";
+ m_doAppend = append;
+ m_updateParagraphStyles = false;
+ m_overridePStyleFont = true;
+ m_undoManager = UndoManager::instance();
+ m_noteStory = NULL;
+ m_note = NULL;
}
void gtAction::setProgressInfo()
@@ -111,21 +111,21 @@
void gtAction::clearFrame()
{
- textFrame->itemText.clear();
+ m_textFrame->itemText.clear();
}
void gtAction::writeUnstyled(const QString& text, bool isNote)
{
UndoTransaction activeTransaction;
- if (isFirstWrite && it->itemText.length() > 0)
- {
- if (!doAppend)
+ if (m_isFirstWrite && m_it->itemText.length() > 0)
+ {
+ if (!m_doAppend)
{
if (UndoManager::undoEnabled())
- activeTransaction = undoManager->beginTransaction(Um::Selection, Um::IGroup, Um::ImportText, "", Um::IDelete);
- if (it->nextInChain() != 0)
- {
- PageItem *nextItem = it->nextInChain();
+ activeTransaction = m_undoManager->beginTransaction(Um::Selection, Um::IGroup, Um::ImportText, "", Um::IDelete);
+ if (m_it->nextInChain() != 0)
+ {
+ PageItem *nextItem = m_it->nextInChain();
while (nextItem != 0)
{
nextItem->itemText.selectAll();
@@ -133,8 +133,8 @@
nextItem = nextItem->nextInChain();
}
}
- it->itemText.selectAll();
- it->asTextFrame()->deleteSelectedTextFromFrame();
+ m_it->itemText.selectAll();
+ m_it->asTextFrame()->deleteSelectedTextFromFrame();
}
}
@@ -148,39 +148,39 @@
textStr.replace(QString(0x2029),SpecialChars::PARSEP);
if (isNote)
{
- if (note == NULL)
- {
- note = it->m_Doc->newNote(it->m_Doc->m_docNotesStylesList.at(0));
- Q_ASSERT(noteStory == NULL);
- noteStory = new StoryText(it->m_Doc);
+ if (m_note == NULL)
+ {
+ m_note = m_it->m_Doc->newNote(m_it->m_Doc->m_docNotesStylesList.at(0));
+ Q_ASSERT(m_noteStory == NULL);
+ m_noteStory = new StoryText(m_it->m_Doc);
}
if (textStr == SpecialChars::OBJECT)
{
- NotesStyle* nStyle = note->notesStyle();
+ NotesStyle* nStyle = m_note->notesStyle();
QString label = "NoteMark_" + nStyle->name();
if (nStyle->range() == NSRsection)
- label += " in section " + it->m_Doc->getSectionNameForPageIndex(it->OwnPage) + " page " + QString::number(it->OwnPage +1);
+ label += " in section " + m_it->m_Doc->getSectionNameForPageIndex(m_it->OwnPage) + " page " + QString::number(m_it->OwnPage +1);
else if (nStyle->range() == NSRpage)
- label += " on page " + QString::number(it->OwnPage +1);
+ label += " on page " + QString::number(m_it->OwnPage +1);
else if (nStyle->range() == NSRstory)
- label += " in " + it->firstInChain()->itemName();
+ label += " in " + m_it->firstInChain()->itemName();
else if (nStyle->range() == NSRframe)
- label += " in frame" + it->itemName();
- if (it->m_Doc->getMark(label + "_1", MARKNoteMasterType) != NULL)
- getUniqueName(label,it->m_Doc->marksLabelsList(MARKNoteMasterType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
+ label += " in frame" + m_it->itemName();
+ if (m_it->m_Doc->getMark(label + "_1", MARKNoteMasterType) != NULL)
+ getUniqueName(label,m_it->m_Doc->marksLabelsList(MARKNoteMasterType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
else
label = label + "_1";
- Mark* mrk = it->m_Doc->newMark();
+ Mark* mrk = m_it->m_Doc->newMark();
mrk->label = label;
mrk->setType(MARKNoteMasterType);
- mrk->setNotePtr(note);
- note->setMasterMark(mrk);
- if (noteStory->text(noteStory->length() -1) == SpecialChars::PARSEP)
- noteStory->removeChars(noteStory->length() -1, 1);
- note->setSaxedText(saxedText(noteStory));
+ mrk->setNotePtr(m_note);
+ m_note->setMasterMark(mrk);
+ if (m_noteStory->text(m_noteStory->length() -1) == SpecialChars::PARSEP)
+ m_noteStory->removeChars(m_noteStory->length() -1, 1);
+ m_note->setSaxedText(saxedText(m_noteStory));
mrk->setString("");
- mrk->OwnPage = it->OwnPage;
- it->itemText.insertMark(mrk);
+ mrk->OwnPage = m_it->OwnPage;
+ m_it->itemText.insertMark(mrk);
if (UndoManager::undoEnabled())
{
ScItemsState* is = new ScItemsState(UndoManager::InsertNote);
@@ -190,31 +190,31 @@
is->set("type", (int) MARKNoteMasterType);
is->set("strtxt", QString(""));
is->set("nStyle", nStyle->name());
- is->set("at", it->itemText.cursorPosition() -1);
- is->insertItem("inItem", it);
- undoManager->action(it->m_Doc, is);
- }
- note = NULL;
- delete noteStory;
+ is->set("at", m_it->itemText.cursorPosition() -1);
+ is->insertItem("inItem", m_it);
+ m_undoManager->action(m_it->m_Doc, is);
+ }
+ m_note = NULL;
+ delete m_noteStory;
}
else
- noteStory->insertChars(noteStory->length(), textStr);
+ m_noteStory->insertChars(m_noteStory->length(), textStr);
}
else
{
- int pos = it->itemText.length();
+ int pos = m_it->itemText.length();
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::AppendText,"",Um::ICreate);
ss->set("INSERT_FRAMETEXT", "insert_frametext");
ss->set("TEXT_STR",textStr);
ss->set("START", pos);
- undoManager->action(it, ss);
- }
- it->itemText.insertChars(pos, textStr);
- }
- lastCharWasLineChange = text.right(1) == "\n";
- isFirstWrite = false;
+ m_undoManager->action(m_it, ss);
+ }
+ m_it->itemText.insertChars(pos, textStr);
+ }
+ m_lastCharWasLineChange = text.right(1) == "\n";
+ m_isFirstWrite = false;
if (activeTransaction)
{
activeTransaction.commit();
@@ -223,20 +223,20 @@
void gtAction::write(const QString& text, gtStyle *style, bool isNote)
{
- if (isFirstWrite)
- {
- if (!doAppend)
- {
- if (it->nextInChain() != 0)
- {
- PageItem *nextItem = it->nextInChain();
+ if (m_isFirstWrite)
+ {
+ if (!m_doAppend)
+ {
+ if (m_it->nextInChain() != 0)
+ {
+ PageItem *nextItem = m_it->nextInChain();
while (nextItem != 0)
{
nextItem->itemText.clear();
nextItem = nextItem->nextInChain();
}
}
- it->itemText.clear();
+ m_it->itemText.clear();
}
}
int paragraphStyle = -1;
@@ -245,8 +245,8 @@
gtParagraphStyle* pstyle = dynamic_cast<gtParagraphStyle*>(style);
assert(pstyle != NULL);
paragraphStyle = applyParagraphStyle(pstyle);
- if (isFirstWrite)
- inPara = true;
+ if (m_isFirstWrite)
+ m_inPara = true;
}
else if (style->target() == "frame")
{
@@ -255,27 +255,27 @@
applyFrameStyle(fstyle);
}
- if ((inPara) && (!lastCharWasLineChange) && (text.left(1) != "\n") && (lastParagraphStyle != -1))
- paragraphStyle = lastParagraphStyle;
+ if ((m_inPara) && (!m_lastCharWasLineChange) && (text.left(1) != "\n") && (m_lastParagraphStyle != -1))
+ paragraphStyle = m_lastParagraphStyle;
if (paragraphStyle == -1)
paragraphStyle = 0; //::findParagraphStyle(textFrame->doc(), textFrame->doc()->currentStyle);
- const ParagraphStyle& paraStyle = textFrame->doc()->paragraphStyles()[paragraphStyle];
+ const ParagraphStyle& paraStyle = m_textFrame->doc()->paragraphStyles()[paragraphStyle];
gtFont* font = style->getFont();
QString fontName = validateFont(font).scName();
CharStyle lastStyle, newStyle;
int lastStyleStart = 0;
- if ((inPara) && (!overridePStyleFont))
+ if ((m_inPara) && (!m_overridePStyleFont))
{
if (paraStyle.charStyle().font().isNone())
{
gtFont font2(*font);
font2.setName(paraStyle.charStyle().font().scName());
QString fontName2 = validateFont(&font2).scName();
- newStyle.setFont((*textFrame->doc()->AllFonts)[fontName2]);
+ newStyle.setFont((*m_textFrame->doc()->AllFonts)[fontName2]);
}
}
else
@@ -285,19 +285,19 @@
/*newStyle.eraseCharStyle(paraStyle.charStyle());*/
lastStyle = newStyle;
- lastStyleStart = it->itemText.length();
+ lastStyleStart = m_it->itemText.length();
StoryText* story = NULL;
if (isNote)
{
- if (noteStory == NULL)
- {
- note = it->m_Doc->newNote(it->m_Doc->m_docNotesStylesList.at(0));
- noteStory = new StoryText(it->m_Doc);
- }
- story = noteStory;
+ if (m_noteStory == NULL)
+ {
+ m_note = m_it->m_Doc->newNote(m_it->m_Doc->m_docNotesStylesList.at(0));
+ m_noteStory = new StoryText(m_it->m_Doc);
+ }
+ story = m_noteStory;
}
else
- story = &it->itemText;
+ story = &m_it->itemText;
QChar ch0(0), ch5(5), ch10(10), ch13(13);
for (int a = 0; a < text.length(); ++a)
@@ -311,28 +311,28 @@
int pos = story->length();
if (isNote && ch == SpecialChars::OBJECT)
{
- NotesStyle* nStyle = note->notesStyle();
+ NotesStyle* nStyle = m_note->notesStyle();
QString label = "NoteMark_" + nStyle->name();
if (nStyle->range() == NSRsection)
- label += " in section " + it->m_Doc->getSectionNameForPageIndex(it->OwnPage) + " page " + QString::number(it->OwnPage +1);
+ label += " in section " + m_it->m_Doc->getSectionNameForPageIndex(m_it->OwnPage) + " page " + QString::number(m_it->OwnPage +1);
else if (nStyle->range() == NSRpage)
- label += " on page " + QString::number(it->OwnPage +1);
+ label += " on page " + QString::number(m_it->OwnPage +1);
else if (nStyle->range() == NSRstory)
- label += " in " + it->firstInChain()->itemName();
+ label += " in " + m_it->firstInChain()->itemName();
else if (nStyle->range() == NSRframe)
- label += " in frame" + it->itemName();
- if (it->m_Doc->getMark(label + "_1", MARKNoteMasterType) != NULL)
- getUniqueName(label,it->m_Doc->marksLabelsList(MARKNoteMasterType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
+ label += " in frame" + m_it->itemName();
+ if (m_it->m_Doc->getMark(label + "_1", MARKNoteMasterType) != NULL)
+ getUniqueName(label,m_it->m_Doc->marksLabelsList(MARKNoteMasterType), "_"); //FIX ME here user should be warned that inserted mark`s label was changed
else
label = label + "_1";
- Mark* mrk = it->m_Doc->newMark();
+ Mark* mrk = m_it->m_Doc->newMark();
mrk->label = label;
mrk->setType(MARKNoteMasterType);
- mrk->setNotePtr(note);
- note->setMasterMark(mrk);
+ mrk->setNotePtr(m_note);
+ m_note->setMasterMark(mrk);
mrk->setString("");
- mrk->OwnPage = it->OwnPage;
- it->itemText.insertMark(mrk);
+ mrk->OwnPage = m_it->OwnPage;
+ m_it->itemText.insertMark(mrk);
story->applyCharStyle(lastStyleStart, story->length()-lastStyleStart, lastStyle);
if (paraStyle.hasName())
{
@@ -343,17 +343,17 @@
else
story->applyStyle(qMax(0,story->length()-1), paraStyle);
- lastCharWasLineChange = text.right(1) == "\n";
- inPara = style->target() == "paragraph";
- lastParagraphStyle = paragraphStyle;
- if (isFirstWrite)
- isFirstWrite = false;
+ m_lastCharWasLineChange = text.right(1) == "\n";
+ m_inPara = style->target() == "paragraph";
+ m_lastParagraphStyle = paragraphStyle;
+ if (m_isFirstWrite)
+ m_isFirstWrite = false;
if (story->text(pos -1) == SpecialChars::PARSEP)
story->removeChars(pos-1, 1);
- note->setSaxedText(saxedText(story));
- note = NULL;
- delete noteStory;
- noteStory = NULL;
+ m_note->setSaxedText(saxedText(story));
+ m_note = NULL;
+ delete m_noteStory;
+ m_noteStory = NULL;
return;
}
else
@@ -380,11 +380,11 @@
else
story->applyStyle(qMax(0,story->length()-1), paraStyle);
- lastCharWasLineChange = text.right(1) == "\n";
- inPara = style->target() == "paragraph";
- lastParagraphStyle = paragraphStyle;
- if (isFirstWrite)
- isFirstWrite = false;
+ m_lastCharWasLineChange = text.right(1) == "\n";
+ m_inPara = style->target() == "paragraph";
+ m_lastParagraphStyle = paragraphStyle;
+ if (m_isFirstWrite)
+ m_isFirstWrite = false;
}
int gtAction::findParagraphStyle(gtParagraphStyle* pstyle)
@@ -395,9 +395,9 @@
int gtAction::findParagraphStyle(const QString& name)
{
int pstyleIndex = -1;
- for (int i = 0; i < textFrame->doc()->paragraphStyles().count(); ++i)
- {
- if (textFrame->doc()->paragraphStyles()[i].name() == name)
+ for (int i = 0; i < m_textFrame->doc()->paragraphStyles().count(); ++i)
+ {
+ if (m_textFrame->doc()->paragraphStyles()[i].name() == name)
{
pstyleIndex = i;
break;
@@ -412,9 +412,9 @@
if (pstyleIndex == -1)
{
createParagraphStyle(pstyle);
- pstyleIndex = textFrame->doc()->paragraphStyles().count() - 1;
- }
- else if (updateParagraphStyles)
+ pstyleIndex = m_textFrame->doc()->paragraphStyles().count() - 1;
+ }
+ else if (m_updateParagraphStyles)
{
updateParagraphStyle(pstyleIndex, pstyle);
}
@@ -423,13 +423,13 @@
void gtAction::applyFrameStyle(gtFrameStyle* fstyle)
{
- textFrame->setColumns(fstyle->getColumns());
- textFrame->setColumnGap(fstyle->getColumnsGap());
- textFrame->setFillColor(parseColor(fstyle->getBgColor()));
- textFrame->setFillShade(fstyle->getBgShade());
- ParagraphStyle newTabs(textFrame->itemText.defaultStyle());
+ m_textFrame->setColumns(fstyle->getColumns());
+ m_textFrame->setColumnGap(fstyle->getColumnsGap());
+ m_textFrame->setFillColor(parseColor(fstyle->getBgColor()));
+ m_textFrame->setFillShade(fstyle->getBgShade());
+ ParagraphStyle newTabs(m_textFrame->itemText.defaultStyle());
newTabs.setTabValues(QList<ParagraphStyle::TabRecord>(*(fstyle->getTabValues())));
- textFrame->itemText.setDefaultStyle(newTabs);
+ m_textFrame->itemText.setDefaultStyle(newTabs);
// gtParagraphStyle* pstyle = new gtParagraphStyle(*fstyle);
// int pstyleIndex = findParagraphStyle(pstyle);
@@ -469,7 +469,7 @@
void gtAction::getFrameFont(gtFont *font)
{
- const CharStyle& style(textFrame->itemText.defaultStyle().charStyle());
+ const CharStyle& style(m_textFrame->itemText.defaultStyle().charStyle());
if (!style.isInhFont())
font->setName(style.font().scName());
@@ -490,12 +490,12 @@
void gtAction::getFrameStyle(gtFrameStyle *fstyle)
{
- fstyle->setColumns(textFrame->Cols);
- fstyle->setColumnsGap(textFrame->ColGap);
- fstyle->setBgColor(textFrame->fillColor());
- fstyle->setBgShade(qRound(textFrame->fillShade()));
-
- const ParagraphStyle& vg(textFrame->itemText.defaultStyle());
+ fstyle->setColumns(m_textFrame->Cols);
+ fstyle->setColumnsGap(m_textFrame->ColGap);
+ fstyle->setBgColor(m_textFrame->fillColor());
+ fstyle->setBgShade(qRound(m_textFrame->fillShade()));
+
+ const ParagraphStyle& vg(m_textFrame->itemText.defaultStyle());
fstyle->setName(vg.name());
fstyle->setLineSpacing(vg.lineSpacing());
fstyle->setAdjToBaseline(vg.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing);
@@ -527,7 +527,7 @@
void gtAction::createParagraphStyle(gtParagraphStyle* pstyle)
{
- ScribusDoc* currDoc=textFrame->doc();
+ ScribusDoc* currDoc=m_textFrame->doc();
for (int i = 0; i < currDoc->paragraphStyles().count(); ++i)
{
if (currDoc->paragraphStyles()[i].name() == pstyle->getName())
@@ -554,7 +554,7 @@
StyleSet<ParagraphStyle> tmp;
tmp.create(vg);
- textFrame->doc()->redefineStyles(tmp, false);
+ m_textFrame->doc()->redefineStyles(tmp, false);
m_ScMW->propertiesPalette->textPal->updateParagraphStyles();
}
@@ -645,8 +645,8 @@
void gtAction::removeParagraphStyle(int index)
{
QMap<QString, QString> map;
- map[textFrame->doc()->paragraphStyles()[index].name()] = "";
- textFrame->doc()->replaceStyles(map);
+ map[m_textFrame->doc()->paragraphStyles()[index].name()] = "";
+ m_textFrame->doc()->replaceStyles(map);
}
void gtAction::updateParagraphStyle(const QString&, gtParagraphStyle* pstyle)
@@ -679,12 +679,12 @@
StyleSet<ParagraphStyle> tmp;
tmp.create(vg);
- textFrame->doc()->redefineStyles(tmp, false);
- if (vg.name() != textFrame->doc()->paragraphStyles()[pstyleIndex].name())
+ m_textFrame->doc()->redefineStyles(tmp, false);
+ if (vg.name() != m_textFrame->doc()->paragraphStyles()[pstyleIndex].name())
{
QMap<QString, QString> map;
- map[textFrame->doc()->paragraphStyles()[pstyleIndex].name()] = vg.name();
- textFrame->doc()->replaceStyles(map);
+ map[m_textFrame->doc()->paragraphStyles()[pstyleIndex].name()] = vg.name();
+ m_textFrame->doc()->replaceStyles(map);
}
}
@@ -700,8 +700,8 @@
QString useFont = font->getName();
if ((useFont.isNull()) || (useFont.isEmpty()))
- useFont = textFrame->itemText.defaultStyle().charStyle().font().scName();
- else if (prefsManager->appPrefs.fontPrefs.AvailFonts[font->getName()].isNone())
+ useFont = m_textFrame->itemText.defaultStyle().charStyle().font().scName();
+ else if (m_prefsManager->appPrefs.fontPrefs.AvailFonts[font->getName()].isNone())
{
bool found = false;
// Do not empty otherwise user may be asked to replace an empty font
@@ -741,23 +741,23 @@
}
if (!found)
{
- if (!prefsManager->appPrefs.fontPrefs.GFontSub.contains(font->getName()))
+ if (!m_prefsManager->appPrefs.fontPrefs.GFontSub.contains(font->getName()))
{
- MissingFont *dia = new MissingFont(0, useFont, textFrame->doc());
+ MissingFont *dia = new MissingFont(0, useFont, m_textFrame->doc());
dia->exec();
useFont = dia->getReplacementFont();
- prefsManager->appPrefs.fontPrefs.GFontSub[font->getName()] = useFont;
+ m_prefsManager->appPrefs.fontPrefs.GFontSub[font->getName()] = useFont;
delete dia;
}
else
- useFont = prefsManager->appPrefs.fontPrefs.GFontSub[font->getName()];
- }
- }
- }
-
- if(!textFrame->doc()->UsedFonts.contains(useFont))
- textFrame->doc()->AddFont(useFont);
- return prefsManager->appPrefs.fontPrefs.AvailFonts[useFont];
+ useFont = m_prefsManager->appPrefs.fontPrefs.GFontSub[font->getName()];
+ }
+ }
+ }
+
+ if(!m_textFrame->doc()->UsedFonts.contains(useFont))
+ m_textFrame->doc()->AddFont(useFont);
+ return m_prefsManager->appPrefs.fontPrefs.AvailFonts[useFont];
}
QString gtAction::findFontName(gtFont* font)
@@ -766,7 +766,7 @@
for (uint i = 0; i < static_cast<uint>(gtFont::NAMECOUNT); ++i)
{
QString nname = font->getName(i);
- if (! prefsManager->appPrefs.fontPrefs.AvailFonts[nname].isNone())
+ if (! m_prefsManager->appPrefs.fontPrefs.AvailFonts[nname].isNone())
{
ret = nname;
break;
@@ -777,36 +777,36 @@
double gtAction::getLineSpacing(int fontSize)
{
- return ((fontSize / 10.0) * (static_cast<double>(textFrame->doc()->typographicPrefs().autoLineSpacing) / 100));
+ return ((fontSize / 10.0) * (static_cast<double>(m_textFrame->doc()->typographicPrefs().autoLineSpacing) / 100));
}
double gtAction::getFrameWidth()
{
- return textFrame->width();
+ return m_textFrame->width();
}
QString gtAction::getFrameName()
{
- return QString(textFrame->itemName());
+ return QString(m_textFrame->itemName());
}
bool gtAction::getUpdateParagraphStyles()
{
- return updateParagraphStyles;
+ return m_updateParagraphStyles;
}
void gtAction::setUpdateParagraphStyles(bool newUPS)
{
- updateParagraphStyles = newUPS;
+ m_updateParagraphStyles = newUPS;
}
bool gtAction::getOverridePStyleFont()
{
- return overridePStyleFont;
+ return m_overridePStyleFont;
}
void gtAction::setOverridePStyleFont(bool newOPSF)
{
- overridePStyleFont = newOPSF;
+ m_overridePStyleFont = newOPSF;
}
QString gtAction::parseColor(const QString &s)
@@ -816,7 +816,7 @@
return ret; // don't want None to become Black or any color
bool found = false;
ColorList::Iterator it;
- for (it = textFrame->doc()->PageColors.begin(); it != textFrame->doc()->PageColors.end(); ++it)
+ for (it = m_textFrame->doc()->PageColors.begin(); it != m_textFrame->doc()->PageColors.end(); ++it)
{
if (it.key() == s)
{
@@ -860,9 +860,9 @@
c = parseColorN( rgbColor );
}
found = false;
- for (it = textFrame->doc()->PageColors.begin(); it != textFrame->doc()->PageColors.end(); ++it)
- {
- if (c == ScColorEngine::getRGBColor(it.value(), textFrame->doc()))
+ for (it = m_textFrame->doc()->PageColors.begin(); it != m_textFrame->doc()->PageColors.end(); ++it)
+ {
+ if (c == ScColorEngine::getRGBColor(it.value(), m_textFrame->doc()))
{
ret = it.key();
found = true;
@@ -872,7 +872,7 @@
{
ScColor tmp;
tmp.fromQColor(c);
- textFrame->doc()->PageColors.insert("FromGetText"+c.name(), tmp);
+ m_textFrame->doc()->PageColors.insert("FromGetText"+c.name(), tmp);
m_ScMW->propertiesPalette->updateColorList();
ret = "FromGetText"+c.name();
}
@@ -889,10 +889,10 @@
void gtAction::finalize()
{
- if (textFrame->doc()->docHyphenator->AutoCheck)
- textFrame->doc()->docHyphenator->slotHyphenate(textFrame);
- textFrame->doc()->regionsChanged()->update(QRectF());
- textFrame->doc()->changed();
+ if (m_textFrame->doc()->docHyphenator->AutoCheck)
+ m_textFrame->doc()->docHyphenator->slotHyphenate(m_textFrame);
+ m_textFrame->doc()->regionsChanged()->update(QRectF());
+ m_textFrame->doc()->changed();
}
gtAction::~gtAction()
Modified: trunk/Scribus/scribus/gtaction.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtaction.h
==============================================================================
--- trunk/Scribus/scribus/gtaction.h (original)
+++ trunk/Scribus/scribus/gtaction.h Mon Nov 30 22:00:56 2015
@@ -56,22 +56,22 @@
class SCRIBUS_API gtAction
{
private:
- UndoManager* undoManager;
+ UndoManager* m_undoManager;
ScribusMainWindow* m_ScMW;
- PageItem *textFrame;
- PageItem *it;
- int lastParagraphStyle;
- bool inPara;
- bool isFirstWrite;
- bool doAppend;
- bool lastCharWasLineChange;
- bool updateParagraphStyles;
+ PageItem *m_textFrame;
+ PageItem *m_it;
+ int m_lastParagraphStyle;
+ bool m_inPara;
+ bool m_isFirstWrite;
+ bool m_doAppend;
+ bool m_lastCharWasLineChange;
+ bool m_updateParagraphStyles;
/* If paragraph style is used should the font style of the gtpstyle be used
or should writer respect the font set in the real paragraph style
*/
- bool overridePStyleFont;
- QString currentFrameStyle;
- FontFamilyMap families;
+ bool m_overridePStyleFont;
+ QString m_currentFrameStyle;
+ FontFamilyMap m_families;
int findParagraphStyle(const QString& name);
int findParagraphStyle(gtParagraphStyle* pstyle);
@@ -83,9 +83,9 @@
QString parseColor(const QString &s);
QColor parseColorN(const QString &rgbColor);
void finalize();
- PrefsManager *prefsManager;
- StoryText* noteStory;
- TextNote* note;
+ PrefsManager *m_prefsManager;
+ StoryText* m_noteStory;
+ TextNote* m_note;
public:
// gtAction(bool append);
gtAction(bool append, PageItem *pageitem);
Modified: trunk/Scribus/scribus/gtfont.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtfont.cpp
==============================================================================
--- trunk/Scribus/scribus/gtfont.cpp (original)
+++ trunk/Scribus/scribus/gtfont.cpp Mon Nov 30 22:00:56 2015
@@ -69,76 +69,76 @@
gtFont::gtFont()
{
- setflags = 0;
+ m_setflags = 0;
noEffects();
- name = "";
- family = "";
- weight = "";
- slant = "";
- width = "";
- append = "";
- size = 120;
- color = "Black";
- shade = 100;
- strokeColor = "Black";
- strokeShade = 100;
- hscale = 1000;
- kerning = 0;
- useFullName = true;
- weightIndex = 0;
- slantIndex = 1;
- widthIndex = 2;
- smallestIndex = -1;
- biggestIndex = - 1;
- index = -1;
- tmpWeightIndex = -1;
- tmpSlantIndex = -1;
- tmpWidthIndex = -1;
+ m_name = "";
+ m_family = "";
+ m_weight = "";
+ m_slant = "";
+ m_width = "";
+ m_append = "";
+ m_size = 120;
+ m_color = "Black";
+ m_shade = 100;
+ m_strokeColor = "Black";
+ m_strokeShade = 100;
+ m_hscale = 1000;
+ m_kerning = 0;
+ m_useFullName = true;
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ m_widthIndex = 2;
+ m_smallestIndex = -1;
+ m_biggestIndex = - 1;
+ m_index = -1;
+ m_tmpWeightIndex = -1;
+ m_tmpSlantIndex = -1;
+ m_tmpWidthIndex = -1;
}
gtFont::gtFont(const gtFont& f)
{
- name = f.name;
- family = f.family;
- weight = f.weight;
- slant = f.slant;
- width = f.width;
- append = f.append;
- size = f.size;
- color = f.color;
- shade = f.shade;
- strokeColor = f.strokeColor;
- strokeShade = f.strokeShade;
- hscale = f.hscale;
- kerning = f.kerning;
- useFullName = f.useFullName;
- weightIndex = f.weightIndex;
- slantIndex = f.slantIndex;
- widthIndex = f.widthIndex;
- smallestIndex = f.smallestIndex;
- biggestIndex = f.biggestIndex;
- index = f.index;
- tmpWeightIndex = f.tmpWeightIndex;
- tmpSlantIndex = f.tmpSlantIndex;
- tmpWidthIndex = f.tmpWidthIndex;
- fontEffects[NORMAL] = f.fontEffects[NORMAL];
- fontEffects[UNDERLINE] = f.fontEffects[UNDERLINE];
- fontEffects[STRIKETHROUGH] = f.fontEffects[STRIKETHROUGH];
- fontEffects[SMALL_CAPS] = f.fontEffects[SMALL_CAPS];
- fontEffects[SUPERSCRIPT] = f.fontEffects[SUPERSCRIPT];
- fontEffects[SUBSCRIPT] = f.fontEffects[SUBSCRIPT];
- fontEffects[OUTLINE] = f.fontEffects[OUTLINE];
- setflags = f.setflags;
+ m_name = f.m_name;
+ m_family = f.m_family;
+ m_weight = f.m_weight;
+ m_slant = f.m_slant;
+ m_width = f.m_width;
+ m_append = f.m_append;
+ m_size = f.m_size;
+ m_color = f.m_color;
+ m_shade = f.m_shade;
+ m_strokeColor = f.m_strokeColor;
+ m_strokeShade = f.m_strokeShade;
+ m_hscale = f.m_hscale;
+ m_kerning = f.m_kerning;
+ m_useFullName = f.m_useFullName;
+ m_weightIndex = f.m_weightIndex;
+ m_slantIndex = f.m_slantIndex;
+ m_widthIndex = f.m_widthIndex;
+ m_smallestIndex = f.m_smallestIndex;
+ m_biggestIndex = f.m_biggestIndex;
+ m_index = f.m_index;
+ m_tmpWeightIndex = f.m_tmpWeightIndex;
+ m_tmpSlantIndex = f.m_tmpSlantIndex;
+ m_tmpWidthIndex = f.m_tmpWidthIndex;
+ m_fontEffects[NORMAL] = f.m_fontEffects[NORMAL];
+ m_fontEffects[UNDERLINE] = f.m_fontEffects[UNDERLINE];
+ m_fontEffects[STRIKETHROUGH] = f.m_fontEffects[STRIKETHROUGH];
+ m_fontEffects[SMALL_CAPS] = f.m_fontEffects[SMALL_CAPS];
+ m_fontEffects[SUPERSCRIPT] = f.m_fontEffects[SUPERSCRIPT];
+ m_fontEffects[SUBSCRIPT] = f.m_fontEffects[SUBSCRIPT];
+ m_fontEffects[OUTLINE] = f.m_fontEffects[OUTLINE];
+ m_setflags = f.m_setflags;
}
int gtFont::getFlags()
{
- return setflags;
+ return m_setflags;
}
bool gtFont::isToggled(FontEffect fe)
{
- return fontEffects[fe];
+ return m_fontEffects[fe];
}
bool gtFont::toggleEffect(FontEffect fe)
@@ -146,32 +146,32 @@
switch (fe)
{
case NORMAL:
- if (!fontEffects[NORMAL])
+ if (!m_fontEffects[NORMAL])
noEffects();
break;
case SUPERSCRIPT:
- fontEffects[SUPERSCRIPT] = !fontEffects[SUPERSCRIPT];
- if (fontEffects[SUPERSCRIPT])
+ m_fontEffects[SUPERSCRIPT] = !m_fontEffects[SUPERSCRIPT];
+ if (m_fontEffects[SUPERSCRIPT])
{
- fontEffects[SUBSCRIPT] = false;
- fontEffects[NORMAL] = false;
+ m_fontEffects[SUBSCRIPT] = false;
+ m_fontEffects[NORMAL] = false;
}
break;
case SUBSCRIPT:
- fontEffects[SUBSCRIPT] = !fontEffects[SUBSCRIPT];
- if (fontEffects[SUBSCRIPT])
+ m_fontEffects[SUBSCRIPT] = !m_fontEffects[SUBSCRIPT];
+ if (m_fontEffects[SUBSCRIPT])
{
- fontEffects[SUPERSCRIPT] = false;
- fontEffects[NORMAL] = false;
+ m_fontEffects[SUPERSCRIPT] = false;
+ m_fontEffects[NORMAL] = false;
}
break;
default:
- fontEffects[fe] = !fontEffects[fe];
- if (fontEffects[fe])
- fontEffects[NORMAL] = false;
- }
- setflags |= effectWasSet;
- return fontEffects[fe];
+ m_fontEffects[fe] = !m_fontEffects[fe];
+ if (m_fontEffects[fe])
+ m_fontEffects[NORMAL] = false;
+ }
+ m_setflags |= effectWasSet;
+ return m_fontEffects[fe];
}
int gtFont::getEffectsValue()
@@ -196,281 +196,281 @@
void gtFont::setName(QString newName)
{
- name = newName;
+ m_name = newName;
setWeight(NO_WEIGHT);
setSlant(NO_SLANT);
setWidth(NO_WIDTH);
parseName();
- useFullName = true;
- setflags |= familyWasSet;
+ m_useFullName = true;
+ m_setflags |= familyWasSet;
}
void gtFont::setFamily(QString newFamily)
{
- family = newFamily;
- useFullName = false;
- setflags |= familyWasSet;
+ m_family = newFamily;
+ m_useFullName = false;
+ m_setflags |= familyWasSet;
}
QString gtFont::getFamily()
{
- return family;
+ return m_family;
}
void gtFont::setWeight(FontWeight newWeight)
{
- weight = fontWeights[newWeight];
- useFullName = false;
- setflags |= weightWasSet;
+ m_weight = fontWeights[newWeight];
+ m_useFullName = false;
+ m_setflags |= weightWasSet;
if ((newWeight == ROMAN) || (newWeight == REGULAR))
{
setSlant(NO_SLANT);
setWidth(NO_WIDTH);
- setflags &= ~weightWasSet;
- }
- if (weightIndex < 0)
- {
- weightIndex = 0;
- slantIndex = 1;
- widthIndex = 2;
+ m_setflags &= ~weightWasSet;
+ }
+ if (m_weightIndex < 0)
+ {
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ m_widthIndex = 2;
}
}
void gtFont::setWeight(QString newWeight)
{
- weight = newWeight;
- useFullName = false;
- setflags |= weightWasSet;
+ m_weight = newWeight;
+ m_useFullName = false;
+ m_setflags |= weightWasSet;
if ((newWeight == fontWeights[ROMAN]) ||
(newWeight == fontWeights[REGULAR]))
{
setSlant(NO_SLANT);
setWidth(NO_WIDTH);
- setflags &= ~weightWasSet;
- }
- if (weightIndex < 0)
- {
- weightIndex = 0;
- slantIndex = 1;
- widthIndex = 2;
+ m_setflags &= ~weightWasSet;
+ }
+ if (m_weightIndex < 0)
+ {
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ m_widthIndex = 2;
}
}
QString gtFont::getWeight()
{
- return weight;
+ return m_weight;
}
void gtFont::setSlant(FontSlant newSlant)
{
- slant = fontSlants[newSlant];
- useFullName = false;
- setflags &= ~slantWasSet;
+ m_slant = fontSlants[newSlant];
+ m_useFullName = false;
+ m_setflags &= ~slantWasSet;
if (newSlant != NO_SLANT)
{
- if (weight == fontWeights[REGULAR])
+ if (m_weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
- else if (weight == fontWeights[ROMAN])
+ else if (m_weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
- setflags |= slantWasSet;
- }
- if (slantIndex < 0)
- {
- weightIndex = 0;
- slantIndex = 1;
- widthIndex = 2;
+ m_setflags |= slantWasSet;
+ }
+ if (m_slantIndex < 0)
+ {
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ m_widthIndex = 2;
}
}
void gtFont::setSlant(QString newSlant)
{
- slant = newSlant;
- useFullName = false;
- setflags &= ~slantWasSet;
+ m_slant = newSlant;
+ m_useFullName = false;
+ m_setflags &= ~slantWasSet;
if (!newSlant.isEmpty())
{
- if (weight == fontWeights[REGULAR])
+ if (m_weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
- else if (weight == fontWeights[ROMAN])
+ else if (m_weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
- setflags |= slantWasSet;
- }
- if (slantIndex < 0)
- {
- weightIndex = 0;
- slantIndex = 1;
- widthIndex = 2;
+ m_setflags |= slantWasSet;
+ }
+ if (m_slantIndex < 0)
+ {
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ m_widthIndex = 2;
}
}
QString gtFont::getSlant()
{
- return slant;
+ return m_slant;
}
void gtFont::setWidth(FontWidth newWidth)
{
- width = fontWidths[newWidth];
- useFullName = false;
- setflags &= ~widthWasSet;
+ m_width = fontWidths[newWidth];
+ m_useFullName = false;
+ m_setflags &= ~widthWasSet;
if (newWidth != NO_WIDTH)
{
- if (weight == fontWeights[REGULAR])
+ if (m_weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
- else if (weight == fontWeights[ROMAN])
+ else if (m_weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
- setflags |= widthWasSet;
- }
- if (widthIndex < 0)
- {
- weightIndex = 0;
- slantIndex = 1;
- widthIndex = 2;
+ m_setflags |= widthWasSet;
+ }
+ if (m_widthIndex < 0)
+ {
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ m_widthIndex = 2;
}
}
void gtFont::setWidth(QString newWidth)
{
- width = newWidth;
- useFullName = false;
- setflags &= ~widthWasSet;
+ m_width = newWidth;
+ m_useFullName = false;
+ m_setflags &= ~widthWasSet;
if (!newWidth.isEmpty())
{
- if (weight == fontWeights[REGULAR])
+ if (m_weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
- else if (weight == fontWeights[ROMAN])
+ else if (m_weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
- setflags |= widthWasSet;
- }
- if (widthIndex < 0)
- {
- weightIndex = 0;
- slantIndex = 1;
- widthIndex = 2;
+ m_setflags |= widthWasSet;
+ }
+ if (m_widthIndex < 0)
+ {
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ m_widthIndex = 2;
}
}
QString gtFont::getWidth()
{
- return width;
+ return m_width;
}
void gtFont::setSize(int newSize)
{
- size = newSize;
- setflags |= sizeWasSet;
+ m_size = newSize;
+ m_setflags |= sizeWasSet;
}
void gtFont::setSize(double newSize)
{
- size = static_cast<int>(newSize);
- setflags |= sizeWasSet;
+ m_size = static_cast<int>(newSize);
+ m_setflags |= sizeWasSet;
}
void gtFont::setColor(QString newColor)
{
- color = newColor;
- setflags |= fillColorWasSet;
+ m_color = newColor;
+ m_setflags |= fillColorWasSet;
}
void gtFont::setShade(int newShade)
{
- shade = newShade;
- setflags |= fillShadeWasSet;
+ m_shade = newShade;
+ m_setflags |= fillShadeWasSet;
}
void gtFont::setStrokeColor(QString newColor)
{
- strokeColor = newColor;
- setflags |= strokeColorWasSet;
+ m_strokeColor = newColor;
+ m_setflags |= strokeColorWasSet;
}
void gtFont::setStrokeShade(int newShade)
{
- strokeShade = newShade;
- setflags |= strokeShadeWasSet;
+ m_strokeShade = newShade;
+ m_setflags |= strokeShadeWasSet;
}
QString gtFont::getName()
{
- if (useFullName)
- return name;
-
- QString name2 = family + " ";
-
- if (weightIndex == 0)
- name2 += weight + " ";
- else if (slantIndex == 0)
- name2 += slant + " ";
- else if (widthIndex == 0)
- name2 += width + " ";
-
- if (weightIndex == 1)
- name2 += weight + " ";
- else if (slantIndex == 1)
- name2 += slant + " ";
- else if (widthIndex == 1)
- name2 += width + " ";
-
- if (weightIndex == 2)
- name2 += weight + " ";
- else if (slantIndex == 2)
- name2 += slant + " ";
- else if (widthIndex == 2)
- name2 += width + " ";
-
- name2 += append;
+ if (m_useFullName)
+ return m_name;
+
+ QString name2 = m_family + " ";
+
+ if (m_weightIndex == 0)
+ name2 += m_weight + " ";
+ else if (m_slantIndex == 0)
+ name2 += m_slant + " ";
+ else if (m_widthIndex == 0)
+ name2 += m_width + " ";
+
+ if (m_weightIndex == 1)
+ name2 += m_weight + " ";
+ else if (m_slantIndex == 1)
+ name2 += m_slant + " ";
+ else if (m_widthIndex == 1)
+ name2 += m_width + " ";
+
+ if (m_weightIndex == 2)
+ name2 += m_weight + " ";
+ else if (m_slantIndex == 2)
+ name2 += m_slant + " ";
+ else if (m_widthIndex == 2)
+ name2 += m_width + " ";
+
+ name2 += m_append;
name2 = name2.simplified();
return name2;
}
QString gtFont::getName(uint i)
{
- QString fname = family + " ";
+ QString fname = m_family + " ";
switch (i)
{
case 0:
- fname = fname + weight + " " + slant + " " + width + " " + append;
+ fname = fname + m_weight + " " + m_slant + " " + m_width + " " + m_append;
break;
case 1:
- fname = fname + weight + " " + width + " " + slant + " " + append;
+ fname = fname + m_weight + " " + m_width + " " + m_slant + " " + m_append;
break;
case 2:
- fname = fname + slant + " " + weight + " " + width + " " + append;
+ fname = fname + m_slant + " " + m_weight + " " + m_width + " " + m_append;
break;
case 3:
- fname = fname + slant + " " + width + " " + weight + " " + append;
+ fname = fname + m_slant + " " + m_width + " " + m_weight + " " + m_append;
break;
case 4:
- fname = fname + width + " " + weight + " " + slant + " " + append;
+ fname = fname + m_width + " " + m_weight + " " + m_slant + " " + m_append;
break;
case 5:
- fname = fname + width + " " + slant + " " + weight + " " + append;
+ fname = fname + m_width + " " + m_slant + " " + m_weight + " " + m_append;
break;
case 6:
- fname = fname + " " + append + " " + weight + " " + slant + " " + width;
+ fname = fname + " " + m_append + " " + m_weight + " " + m_slant + " " + m_width;
break;
case 7:
- fname = fname + " " + append + " " + weight + " " + width + " " + slant;
+ fname = fname + " " + m_append + " " + m_weight + " " + m_width + " " + m_slant;
break;
case 8:
- fname = fname + " " + append + " " + slant + " " + weight + " " + width;
+ fname = fname + " " + m_append + " " + m_slant + " " + m_weight + " " + m_width;
break;
case 9:
- fname = fname + " " + append + " " + slant + " " + width + " " + weight;
+ fname = fname + " " + m_append + " " + m_slant + " " + m_width + " " + m_weight;
break;
case 10:
- fname = fname + " " + append + " " + width + " " + weight + " " + slant;
+ fname = fname + " " + m_append + " " + m_width + " " + m_weight + " " + m_slant;
break;
case 11:
- fname = fname + " " + append + " " + width + " " + slant + " " + weight;
+ fname = fname + " " + m_append + " " + m_width + " " + m_slant + " " + m_weight;
break;
case 12:
- if ((append.isEmpty()) && (weight.isEmpty()) && (slant.isEmpty()) && (width.isEmpty()))
+ if ((m_append.isEmpty()) && (m_weight.isEmpty()) && (m_slant.isEmpty()) && (m_width.isEmpty()))
fname = fname + " " + fontWeights[REGULAR];
break;
case 13:
- if ((append.isEmpty()) && (weight.isEmpty()) && (slant.isEmpty()) && (width.isEmpty()))
+ if ((m_append.isEmpty()) && (m_weight.isEmpty()) && (m_slant.isEmpty()) && (m_width.isEmpty()))
fname = fname + " " + fontWeights[ROMAN];
break;
}
@@ -480,71 +480,71 @@
int gtFont::getSize()
{
- return size;
+ return m_size;
}
QString gtFont::getColor()
{
- return color;
+ return m_color;
}
int gtFont::getShade()
{
- return shade;
+ return m_shade;
}
QString gtFont::getStrokeColor()
{
- return strokeColor;
+ return m_strokeColor;
}
int gtFont::getStrokeShade()
{
- return strokeShade;
+ return m_strokeShade;
}
void gtFont::noEffects()
{
- fontEffects[NORMAL] = true;
- fontEffects[UNDERLINE] = false;
- fontEffects[STRIKETHROUGH] = false;
- fontEffects[SMALL_CAPS] = false;
- fontEffects[SUPERSCRIPT] = false;
- fontEffects[SUBSCRIPT] = false;
- fontEffects[OUTLINE] = false;
- setflags &= ~effectWasSet;
+ m_fontEffects[NORMAL] = true;
+ m_fontEffects[UNDERLINE] = false;
+ m_fontEffects[STRIKETHROUGH] = false;
+ m_fontEffects[SMALL_CAPS] = false;
+ m_fontEffects[SUPERSCRIPT] = false;
+ m_fontEffects[SUBSCRIPT] = false;
+ m_fontEffects[OUTLINE] = false;
+ m_setflags &= ~effectWasSet;
}
int gtFont::getHscale()
{
- return hscale;
+ return m_hscale;
}
void gtFont::setHscale(int newHscale)
{
- hscale = newHscale;
- setflags |= hscaleWasSet;
+ m_hscale = newHscale;
+ m_setflags |= hscaleWasSet;
}
int gtFont::getKerning()
{
- return kerning;
+ return m_kerning;
}
void gtFont::setKerning(int newKerning)
{
- kerning = newKerning;
- setflags |= kerningWasSet;
+ m_kerning = newKerning;
+ m_setflags |= kerningWasSet;
}
void gtFont::parseName()
{
- smallestIndex = -1;
- biggestIndex = - 1;
- index = -1;
- tmpWeightIndex = -1;
- tmpSlantIndex = -1;
- tmpWidthIndex = -1;
+ m_smallestIndex = -1;
+ m_biggestIndex = - 1;
+ m_index = -1;
+ m_tmpWeightIndex = -1;
+ m_tmpSlantIndex = -1;
+ m_tmpWidthIndex = -1;
parseWeight();
parseSlant();
parseWidth();
@@ -556,19 +556,19 @@
bool found = false;
for (int i = 1; i < FontWeightMAX; ++i)
{
- index = name.indexOf(fontWeights[i]); // f.e. Demi Bold
+ m_index = m_name.indexOf(fontWeights[i]); // f.e. Demi Bold
QString tmpWeight = "";
- if ((index == -1) && (fontWeights[i].indexOf(" ") != -1) && (fontWeights[i].indexOf(" ") != 1))
+ if ((m_index == -1) && (fontWeights[i].indexOf(" ") != -1) && (fontWeights[i].indexOf(" ") != 1))
{
QString fw2 = fontWeights[i];
fw2.replace(" ", "-"); // f.e. Demi-Bold
- index = name.indexOf(fw2);
- if (index == -1)
+ m_index = m_name.indexOf(fw2);
+ if (m_index == -1)
{
fw2 = fontWeights[i];
fw2.replace(" ", ""); // f.e. DemiBold
- index = name.indexOf(fw2);
- if (index == -1)
+ m_index = m_name.indexOf(fw2);
+ if (m_index == -1)
{
fw2 = fontWeights[i];
fw2.replace(" B", " b"); // f.e. Demibold
@@ -576,8 +576,8 @@
fw2.replace(" H", " h");
fw2.replace(" L", " l");
fw2.replace(" ", "");
- index = name.indexOf(fw2);
- if (index != -1)
+ m_index = m_name.indexOf(fw2);
+ if (m_index != -1)
tmpWeight = fw2;
}
else
@@ -590,20 +590,20 @@
}
else
tmpWeight = fontWeights[i];
- if (index != -1)
- {
- weight = tmpWeight;
- if (smallestIndex == -1 || smallestIndex > index)
- smallestIndex = index;
- if ((biggestIndex == -1) || (biggestIndex < index + static_cast<int>(tmpWeight.length()) - 1))
- biggestIndex = index + tmpWeight.length();
+ if (m_index != -1)
+ {
+ m_weight = tmpWeight;
+ if (m_smallestIndex == -1 || m_smallestIndex > m_index)
+ m_smallestIndex = m_index;
+ if ((m_biggestIndex == -1) || (m_biggestIndex < m_index + static_cast<int>(tmpWeight.length()) - 1))
+ m_biggestIndex = m_index + tmpWeight.length();
found = true;
- tmpWeightIndex = index;
+ m_tmpWeightIndex = m_index;
break;
}
}
if (!found)
- weight = fontWeights[NO_WEIGHT];
+ m_weight = fontWeights[NO_WEIGHT];
}
void gtFont::parseSlant()
@@ -611,21 +611,21 @@
bool found = false;
for (int i = 1; i < FontSlantMAX; ++i)
{
- index = name.indexOf(fontSlants[i]);
- if (index != -1)
- {
- slant = fontSlants[i];
- if (smallestIndex == -1 || smallestIndex > index)
- smallestIndex = index;
- if ((biggestIndex == -1) || (biggestIndex < index + static_cast<int>(slant.length()) - 1))
- biggestIndex = index + slant.length();
+ m_index = m_name.indexOf(fontSlants[i]);
+ if (m_index != -1)
+ {
+ m_slant = fontSlants[i];
+ if (m_smallestIndex == -1 || m_smallestIndex > m_index)
+ m_smallestIndex = m_index;
+ if ((m_biggestIndex == -1) || (m_biggestIndex < m_index + static_cast<int>(m_slant.length()) - 1))
+ m_biggestIndex = m_index + m_slant.length();
found = true;
- tmpSlantIndex = index;
+ m_tmpSlantIndex = m_index;
break;
}
}
if (!found)
- slant = fontSlants[NO_SLANT];
+ m_slant = fontSlants[NO_SLANT];
}
void gtFont::parseWidth()
@@ -633,19 +633,19 @@
bool found = false;
for (int i = 1; i < FontWidthMAX; ++i)
{
- index = name.indexOf(fontWidths[i]);
+ m_index = m_name.indexOf(fontWidths[i]);
QString tmpWidth = "";
- if ((index == -1) && (fontWidths[i].indexOf(" ") != -1) && (fontWidths[i].indexOf(" ") != 1))
+ if ((m_index == -1) && (fontWidths[i].indexOf(" ") != -1) && (fontWidths[i].indexOf(" ") != 1))
{
QString fw2 = fontWidths[i];
fw2.replace(" ", "-");
- index = name.indexOf(fw2);
- if (index == -1)
+ m_index = m_name.indexOf(fw2);
+ if (m_index == -1)
{
fw2 = fontWidths[i];
fw2.replace(" ", "");
- index = name.indexOf(fw2);
- if (index == -1)
+ m_index = m_name.indexOf(fw2);
+ if (m_index == -1)
{
fw2 = fontWidths[i];
fw2.replace(" B", " b");
@@ -653,8 +653,8 @@
fw2.replace(" H", " h");
fw2.replace(" L", " l");
fw2.replace(" ", "");
- index = name.indexOf(fw2);
- if (index != -1)
+ m_index = m_name.indexOf(fw2);
+ if (m_index != -1)
tmpWidth = fw2;
}
else
@@ -667,76 +667,76 @@
}
else
tmpWidth = fontWidths[i];
- if (index != -1)
- {
- width = tmpWidth;
- if (smallestIndex == -1 || smallestIndex > index)
- smallestIndex = index;
- if ((biggestIndex == -1) || (biggestIndex < index + static_cast<int>(tmpWidth.length()) - 1))
- biggestIndex = index + tmpWidth.length();
+ if (m_index != -1)
+ {
+ m_width = tmpWidth;
+ if (m_smallestIndex == -1 || m_smallestIndex > m_index)
+ m_smallestIndex = m_index;
+ if ((m_biggestIndex == -1) || (m_biggestIndex < m_index + static_cast<int>(tmpWidth.length()) - 1))
+ m_biggestIndex = m_index + tmpWidth.length();
found = true;
- tmpWidthIndex = index;
+ m_tmpWidthIndex = m_index;
break;
}
}
if (!found)
- width = fontWidths[NO_WIDTH];
+ m_width = fontWidths[NO_WIDTH];
}
void gtFont::parseFamily()
{
- if (tmpWeightIndex < tmpSlantIndex)
- {
- weightIndex = 0;
- slantIndex = 1;
- if (tmpWidthIndex < tmpWeightIndex)
- {
- widthIndex = 0;
- weightIndex = 1;
- slantIndex = 2;
- }
- else if (tmpWidthIndex < tmpSlantIndex)
- {
- widthIndex = 1;
- slantIndex = 2;
+ if (m_tmpWeightIndex < m_tmpSlantIndex)
+ {
+ m_weightIndex = 0;
+ m_slantIndex = 1;
+ if (m_tmpWidthIndex < m_tmpWeightIndex)
+ {
+ m_widthIndex = 0;
+ m_weightIndex = 1;
+ m_slantIndex = 2;
+ }
+ else if (m_tmpWidthIndex < m_tmpSlantIndex)
+ {
+ m_widthIndex = 1;
+ m_slantIndex = 2;
}
else
- widthIndex = 2;
- }
- else if (tmpWeightIndex > tmpSlantIndex)
- {
- slantIndex = 0;
- weightIndex = 1;
- if (tmpWidthIndex < tmpSlantIndex)
- {
- widthIndex = 0;
- slantIndex = 1;
- weightIndex = 2;
- }
- else if (tmpWidthIndex < tmpWeightIndex)
- {
- widthIndex = 1;
- weightIndex = 2;
+ m_widthIndex = 2;
+ }
+ else if (m_tmpWeightIndex > m_tmpSlantIndex)
+ {
+ m_slantIndex = 0;
+ m_weightIndex = 1;
+ if (m_tmpWidthIndex < m_tmpSlantIndex)
+ {
+ m_widthIndex = 0;
+ m_slantIndex = 1;
+ m_weightIndex = 2;
+ }
+ else if (m_tmpWidthIndex < m_tmpWeightIndex)
+ {
+ m_widthIndex = 1;
+ m_weightIndex = 2;
}
else
- widthIndex = 2;
+ m_widthIndex = 2;
}
else
{
- weightIndex = -2;
- widthIndex = -1;
- slantIndex = 0;
- }
-
- if (smallestIndex == -1)
- family = name;
+ m_weightIndex = -2;
+ m_widthIndex = -1;
+ m_slantIndex = 0;
+ }
+
+ if (m_smallestIndex == -1)
+ m_family = m_name;
else
- family = name.left(smallestIndex);
- if (biggestIndex == -1 || biggestIndex >= name.length())
- append = "";
+ m_family = m_name.left(m_smallestIndex);
+ if (m_biggestIndex == -1 || m_biggestIndex >= m_name.length())
+ m_append = "";
else
- append = name.right(name.length() - biggestIndex - 1);
- family = family.trimmed();
+ m_append = m_name.right(m_name.length() - m_biggestIndex - 1);
+ m_family = m_family.trimmed();
}
int gtFont::find(const QString& where, const QString& what)
Modified: trunk/Scribus/scribus/gtfont.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtfont.h
==============================================================================
--- trunk/Scribus/scribus/gtfont.h (original)
+++ trunk/Scribus/scribus/gtfont.h Mon Nov 30 22:00:56 2015
@@ -91,32 +91,32 @@
class SCRIBUS_API gtFont
{
private:
- int setflags;
- QString name;
- QString family;
- QString weight;
- QString slant;
- QString width;
- QString append;
- int size;
- bool fontEffects[FontEffectMAX];
- QString color;
- int shade;
- QString strokeColor;
- int strokeShade;
+ int m_setflags;
+ QString m_name;
+ QString m_family;
+ QString m_weight;
+ QString m_slant;
+ QString m_width;
+ QString m_append;
+ int m_size;
+ bool m_fontEffects[FontEffectMAX];
+ QString m_color;
+ int m_shade;
+ QString m_strokeColor;
+ int m_strokeShade;
/* Width of a character in percentages to it's "real width" */
- int hscale;
- int kerning;
- bool useFullName;
- int weightIndex;
- int slantIndex;
- int widthIndex;
- int smallestIndex;
- int biggestIndex;
- int index;
- int tmpWeightIndex;
- int tmpSlantIndex;
- int tmpWidthIndex;
+ int m_hscale;
+ int m_kerning;
+ bool m_useFullName;
+ int m_weightIndex;
+ int m_slantIndex;
+ int m_widthIndex;
+ int m_smallestIndex;
+ int m_biggestIndex;
+ int m_index;
+ int m_tmpWeightIndex;
+ int m_tmpSlantIndex;
+ int m_tmpWidthIndex;
void initArrays();
void parseName();
void parseWeight();
Modified: trunk/Scribus/scribus/gtgettext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtgettext.cpp
==============================================================================
--- trunk/Scribus/scribus/gtgettext.cpp (original)
+++ trunk/Scribus/scribus/gtgettext.cpp Mon Nov 30 22:00:56 2015
@@ -63,33 +63,33 @@
QString fend = filename.right(filename.length() - filename.lastIndexOf(".") - 1);
QString fendL(fend.toLower());
// Look for that extension in the importer QMap.
- if (importerMap.find(fend) != importerMap.end())
+ if (m_importerMap.find(fend) != m_importerMap.end())
// If the map is found, assign ida to the corresponding struct in the map.
- ida = *importerMap[fend];
+ ida = *m_importerMap[fend];
// Otherwise, test for the lowercase version
else
- if (importerMap.find(fendL) != importerMap.end())
+ if (m_importerMap.find(fendL) != m_importerMap.end())
// If the map is found, assign ida to the corresponding struct in the map.
- ida = *importerMap[fendL];
+ ida = *m_importerMap[fendL];
// Otherwise, try and ask the user.
else
{
// Create a new dialog
- dias = new gtDialogs();
+ m_dias = new gtDialogs();
// Pop up the dialog asking the user to select the type from our list (ilist) of
// importable file types. If one is not selected, set callImporter to false.
- callImporter = dias->runImporterDialog(ilist);
+ callImporter = m_dias->runImporterDialog(m_ilist);
// If we're gonna call an importer, we need to copy it's struct to ida.
if (callImporter)
- ida = importers[dias->getImporter()];
+ ida = m_importers[m_dias->getImporter()];
// Destroy the diag
- delete dias;
+ delete m_dias;
} // else - if (importerMap.find(fend) != importerMap.end())
}
else // If we know which importer to use
{
// Copy the importer's struct to ida.
- ida = importers[importer];
+ ida = m_importers[importer];
} // else - if (importer == -1)
// Create a target text frame for the imported text and assign it to the parameter "target"
@@ -142,7 +142,7 @@
if (ida.soFilePath.left(1) != "/")
ida.soFilePath = "/" + ida.soFilePath;
// Add the plugin data to the end of the importer's vector.
- importers.push_back(ida);
+ m_importers.push_back(ida);
} // if (DLLName(d[dc], &ida.fileFormatName, &ida.fileEndings))
} // for (uint dc = 0; dc < d.count(); ++dc)
} // if ((d.exists()) && (d.count() != 0))
@@ -159,19 +159,19 @@
// the importers vector and add all of the file extensions supported.
QString allSupported = QObject::tr("All Supported Formats") + " (";
// Loop through the importers vector.
- for (uint i = 0; i < importers.size(); ++i)
+ for (uint i = 0; i < m_importers.size(); ++i)
{
// If there are any file extnsions declared by the importer
- if (importers[i].fileEndings.count() != 0)
+ if (m_importers[i].fileEndings.count() != 0)
{
// Add the importer name to the filters list
- filters += importers[i].fileFormatName + " (";
+ filters += m_importers[i].fileFormatName + " (";
// Loop though the extensions supported by the importer
- for (int j = 0; j < importers[i].fileEndings.count(); ++j)
+ for (int j = 0; j < m_importers[i].fileEndings.count(); ++j)
{
// Add the extension to both the filter and allSupported strings
- filters += "*." + importers[i].fileEndings[j] + " ";
- allSupported += "*." + importers[i].fileEndings[j] + " ";
+ filters += "*." + m_importers[i].fileEndings[j] + " ";
+ allSupported += "*." + m_importers[i].fileEndings[j] + " ";
} // for (int j = 0; j < importers[i].fileEndings.count(); ++j)
// Trim the Qstring
filters = filters.trimmed();
@@ -187,29 +187,29 @@
// Add an "all files" entry to the end of the filters QString
filters += QObject::tr("All Files (*)");
// Populate ilist with the file importer names.
- for (uint i = 0; i < importers.size(); ++i)
- ilist.append(importers[i].fileFormatName);
+ for (uint i = 0; i < m_importers.size(); ++i)
+ m_ilist.append(m_importers[i].fileFormatName);
// Create a new dialog.
- dias = new gtDialogs();
+ m_dias = new gtDialogs();
// Create a new ImportSetup struct
ImportSetup impsetup;
// INitialize runDialog to false
impsetup.runDialog=false;
// If we get a true back from the File selection Dialog ( which we send our filters and extensions lists )
- if (dias->runFileDialog(filters, ilist))
+ if (m_dias->runFileDialog(filters, m_ilist))
{
// Set the runDialog to true
impsetup.runDialog=true;
// Copy the other values for the struct from the dialog results
- impsetup.encoding=dias->getEncoding();
- impsetup.filename=dias->getFileName();
- impsetup.importer=dias->getImporter();
- impsetup.textOnly=dias->importTextOnly();
+ impsetup.encoding=m_dias->getEncoding();
+ impsetup.filename=m_dias->getFileName();
+ impsetup.importer=m_dias->getImporter();
+ impsetup.textOnly=m_dias->importTextOnly();
// launchImporter(dias->getImporter(), dias->getFileName(),
// dias->importTextOnly(), dias->getEncoding(), append);
} // if (dias->runFileDialog(filters, ilist))
// Destroy the dialog.
- delete dias;
+ delete m_dias;
// Return the ImportSetup struct.
return impsetup;
} // ImportSetup gtGetText::run()
@@ -330,12 +330,12 @@
void gtGetText::createMap()
{
// Loop through the importers Vector
- for (uint i = 0; i < importers.size(); ++i)
+ for (uint i = 0; i < m_importers.size(); ++i)
{
// Loop through each file extension the importer uses/importers and create an individual
// Qmap entry for it.
- for (int j = 0; j < importers[i].fileEndings.count(); ++j)
- importerMap.insert(importers[i].fileEndings[j], &importers[i]);
+ for (int j = 0; j < m_importers[i].fileEndings.count(); ++j)
+ m_importerMap.insert(m_importers[i].fileEndings[j], &m_importers[i]);
} // for (uint i = 0; i < importers.size(); ++i)
} // void gtGetText::createMap()
Modified: trunk/Scribus/scribus/gtgettext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtgettext.h
==============================================================================
--- trunk/Scribus/scribus/gtgettext.h (original)
+++ trunk/Scribus/scribus/gtgettext.h Mon Nov 30 22:00:56 2015
@@ -66,8 +66,8 @@
class SCRIBUS_API gtGetText
{
private:
- std::vector<ImporterData> importers; // Vector of the loaded importers
- QMap<QString, ImporterData*> importerMap; // QMap of the supported extensions to their relevant importers entry for easy access
+ std::vector<ImporterData> m_importers; // Vector of the loaded importers
+ QMap<QString, ImporterData*> m_importerMap; // QMap of the supported extensions to their relevant importers entry for easy access
void loadImporterPlugins(); // Find the available plugins based on the environment, validate they load, and
// create quick lookup mappings.
void CallDLL(const ImporterData& idata, const QString& filePath,
@@ -77,8 +77,8 @@
// Loads the "DLL", validates the importer is good, populates the passed parameters with
// the plugin information.
void createMap(); // Create the importer Qmap.
- gtDialogs* dias; // File Selection Dialog pointer.
- QStringList ilist; // List of supported importers, used with dialogs
+ gtDialogs* m_dias; // File Selection Dialog pointer.
+ QStringList m_ilist; // List of supported importers, used with dialogs
ScribusDoc* m_Doc; // Which document are we working with.
public:
gtGetText(ScribusDoc* doc); // Constructor
Modified: trunk/Scribus/scribus/gtmeasure.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtmeasure.cpp
==============================================================================
--- trunk/Scribus/scribus/gtmeasure.cpp (original)
+++ trunk/Scribus/scribus/gtmeasure.cpp Mon Nov 30 22:00:56 2015
@@ -29,31 +29,31 @@
#include "gtmeasure.h"
-double gtMeasure::ratio = 1.0;
+double gtMeasure::m_ratio = 1.0;
void gtMeasure::init(scUnit u)
{
- ratio=unitGetRatioFromIndex((int)u);
+ m_ratio=unitGetRatioFromIndex((int)u);
}
double gtMeasure::convert(double value)
{
- return value / ratio;
+ return value / m_ratio;
}
double gtMeasure::convert(int value)
{
- return value / ratio;
+ return value / m_ratio;
}
double gtMeasure::convert2(double value)
{
- return value * ratio;
+ return value * m_ratio;
}
double gtMeasure::convert2(int value)
{
- return value * ratio;
+ return value * m_ratio;
}
double gtMeasure::parse(const QString& value)
Modified: trunk/Scribus/scribus/gtmeasure.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtmeasure.h
==============================================================================
--- trunk/Scribus/scribus/gtmeasure.h (original)
+++ trunk/Scribus/scribus/gtmeasure.h Mon Nov 30 22:00:56 2015
@@ -36,7 +36,7 @@
{
private:
gtMeasure();
- static double ratio;
+ static double m_ratio;
static void init(scUnit u);
static double convert(double value);
static double convert(int value);
Modified: trunk/Scribus/scribus/gtwriter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtwriter.cpp
==============================================================================
--- trunk/Scribus/scribus/gtwriter.cpp (original)
+++ trunk/Scribus/scribus/gtwriter.cpp Mon Nov 30 22:00:56 2015
@@ -46,9 +46,9 @@
gtWriter::gtWriter(bool append, PageItem *pageitem)
{
- action = new gtAction(append, pageitem);
- errorSet = false;
- action->setProgressInfo();
+ m_action = new gtAction(append, pageitem);
+ m_errorSet = false;
+ m_action->setProgressInfo();
setDefaultStyle();
unsetCharacterStyle();
unsetParagraphStyle();
@@ -58,44 +58,44 @@
gtFrameStyle* gtWriter::getDefaultStyle()
{
- return frameStyle;
+ return m_frameStyle;
}
void gtWriter::setFrameStyle(gtFrameStyle *fStyle)
{
- frameStyle = fStyle;
- action->applyFrameStyle(fStyle);
+ m_frameStyle = fStyle;
+ m_action->applyFrameStyle(fStyle);
}
void gtWriter::setParagraphStyle(gtParagraphStyle *pStyle)
{
// @todo Start a new paragraph and add the style to the Paragraph Styles
- paragraphStyle = pStyle;
+ m_paragraphStyle = pStyle;
}
void gtWriter::setCharacterStyle(gtStyle *cStyle)
{
- characterStyle = cStyle;
+ m_characterStyle = cStyle;
}
void gtWriter::unsetFrameStyle()
{
- frameStyle = defaultStyle;
+ m_frameStyle = m_defaultStyle;
}
void gtWriter::unsetParagraphStyle()
{
- paragraphStyle = NULL;
+ m_paragraphStyle = NULL;
}
void gtWriter::unsetCharacterStyle()
{
- characterStyle = NULL;
+ m_characterStyle = NULL;
}
double gtWriter::getPreferredLineSpacing(int fontSize)
{
- return action->getLineSpacing(fontSize);
+ return m_action->getLineSpacing(fontSize);
}
double gtWriter::getPreferredLineSpacing(double fontSize)
@@ -111,17 +111,17 @@
return;
if (inNote && !inNoteBody)
return;
- if (characterStyle != NULL)
- {
- action->write(text, characterStyle, inNote);
- }
- else if (paragraphStyle != NULL)
- {
- action->write(text, paragraphStyle, inNote);
+ if (m_characterStyle != NULL)
+ {
+ m_action->write(text, m_characterStyle, inNote);
+ }
+ else if (m_paragraphStyle != NULL)
+ {
+ m_action->write(text, m_paragraphStyle, inNote);
}
else
{
- action->write(text, frameStyle, inNote);
+ m_action->write(text, m_frameStyle, inNote);
}
}
@@ -133,17 +133,17 @@
return;
if (inNote && !inNoteBody)
return;
- action->writeUnstyled(text, inNote);
+ m_action->writeUnstyled(text, inNote);
}
double gtWriter::getFrameWidth()
{
- return action->getFrameWidth();
+ return m_action->getFrameWidth();
}
QString gtWriter::getFrameName()
{
- return action->getFrameName();
+ return m_action->getFrameName();
}
void gtWriter::append(const QString& text, gtStyle *style)
@@ -156,51 +156,51 @@
return;
}
- currentStyle = style;
- action->write(text, style, inNote);
- currentStyle = NULL;
+ m_currentStyle = style;
+ m_action->write(text, style, inNote);
+ m_currentStyle = NULL;
}
void gtWriter::append(const QString& text, gtStyle *style, bool updatePStyle)
{
- bool ups = action->getUpdateParagraphStyles();
- action->setUpdateParagraphStyles(updatePStyle);
+ bool ups = m_action->getUpdateParagraphStyles();
+ m_action->setUpdateParagraphStyles(updatePStyle);
append(text, style);
- action->setUpdateParagraphStyles(ups);
+ m_action->setUpdateParagraphStyles(ups);
}
void gtWriter::setDefaultStyle()
{
// @todo Get the style of the text frame we are appending to.
- defaultStyle = new gtFrameStyle("Default style");
- action->getFrameStyle(defaultStyle);
- frameStyle = defaultStyle;
+ m_defaultStyle = new gtFrameStyle("Default style");
+ m_action->getFrameStyle(m_defaultStyle);
+ m_frameStyle = m_defaultStyle;
}
bool gtWriter::getUpdateParagraphStyles()
{
- return action->getUpdateParagraphStyles();
+ return m_action->getUpdateParagraphStyles();
}
void gtWriter::setUpdateParagraphStyles(bool newUPS)
{
- action->setUpdateParagraphStyles(newUPS);
+ m_action->setUpdateParagraphStyles(newUPS);
}
bool gtWriter::getOverridePStyleFont()
{
- return action->getOverridePStyleFont();
+ return m_action->getOverridePStyleFont();
}
void gtWriter::setOverridePStyleFont(bool newOPSF)
{
- action->setOverridePStyleFont(newOPSF);
+ m_action->setOverridePStyleFont(newOPSF);
}
gtWriter::~gtWriter()
{
- if (!errorSet)
- action->setProgressInfoDone();
- delete action;
- delete defaultStyle;
-}
+ if (!m_errorSet)
+ m_action->setProgressInfoDone();
+ delete m_action;
+ delete m_defaultStyle;
+}
Modified: trunk/Scribus/scribus/gtwriter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/gtwriter.h
==============================================================================
--- trunk/Scribus/scribus/gtwriter.h (original)
+++ trunk/Scribus/scribus/gtwriter.h Mon Nov 30 22:00:56 2015
@@ -64,9 +64,9 @@
bool inNoteBody;
private:
- gtAction *action;
- gtFrameStyle* defaultStyle;
- gtStyle* currentStyle;
+ gtAction *m_action;
+ gtFrameStyle* m_defaultStyle;
+ gtStyle* m_currentStyle;
/*
Frame style is the default style for text. Styles will be used in order so
@@ -74,10 +74,10 @@
style if no paragraph style is found frame style will be used. Last set
frame style will be left to the default style for the text frame.
*/
- gtFrameStyle* frameStyle;
- gtStyle* paragraphStyle;
- gtStyle* characterStyle;
- bool errorSet;
+ gtFrameStyle* m_frameStyle;
+ gtStyle* m_paragraphStyle;
+ gtStyle* m_characterStyle;
+ bool m_errorSet;
void setDefaultStyle();
};
Modified: trunk/Scribus/scribus/guidemanagercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/guidemanagercore.cpp
==============================================================================
--- trunk/Scribus/scribus/guidemanagercore.cpp (original)
+++ trunk/Scribus/scribus/guidemanagercore.cpp Mon Nov 30 22:00:56 2015
@@ -24,7 +24,7 @@
GuideManagerCore::GuideManagerCore():
gx(0), gy(0), gw(0), gh(0),
- undoManager(UndoManager::instance()),
+ m_undoManager(UndoManager::instance()),
m_page(0),
m_horizontalAutoGap(0.0),
m_verticalAutoGap(0.0),
@@ -33,15 +33,15 @@
m_horizontalAutoRefer(0),
m_verticalAutoRefer(0)
{
- verticalStdG.clear();
- verticalAutoG.clear();
- horizontalStdG.clear();
- horizontalAutoG.clear();
+ m_verticalStdG.clear();
+ m_verticalAutoG.clear();
+ m_horizontalStdG.clear();
+ m_horizontalAutoG.clear();
}
GuideManagerCore::GuideManagerCore(ScPage *parentPage):
gx(0), gy(0), gw(0), gh(0),
- undoManager(UndoManager::instance()),
+ m_undoManager(UndoManager::instance()),
m_page(parentPage),
m_horizontalAutoGap(0.0),
m_verticalAutoGap(0.0),
@@ -50,10 +50,10 @@
m_horizontalAutoRefer(0),
m_verticalAutoRefer(0)
{
- verticalStdG.clear();
- verticalAutoG.clear();
- horizontalStdG.clear();
- horizontalAutoG.clear();
+ m_verticalStdG.clear();
+ m_verticalAutoG.clear();
+ m_horizontalStdG.clear();
+ m_horizontalAutoG.clear();
}
GuideManagerCore::~GuideManagerCore()
@@ -70,14 +70,14 @@
switch (type)
{
case Standard:
- if (!horizontalStdG.contains(value))
- {
- horizontalStdG.append(value);
+ if (!m_horizontalStdG.contains(value))
+ {
+ m_horizontalStdG.append(value);
if (UndoManager::undoEnabled())
{
SimpleState* ss = new SimpleState(Um::AddHGuide, 0, Um::IGuides);
ss->set("ADD_H", value);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
}
break;
@@ -94,14 +94,14 @@
case Standard:
for (it = values.begin(); it != values.end(); ++it)
{
- if (!horizontalStdG.contains((*it)))
- horizontalStdG.append((*it));
- }
- break;
- case Auto:
- horizontalAutoG.clear();
+ if (!m_horizontalStdG.contains((*it)))
+ m_horizontalStdG.append((*it));
+ }
+ break;
+ case Auto:
+ m_horizontalAutoG.clear();
for (it = values.begin(); it != values.end(); ++it)
- horizontalAutoG.append((*it));
+ m_horizontalAutoG.append((*it));
break;
}
}
@@ -111,14 +111,14 @@
switch (type)
{
case Standard:
- if (!verticalStdG.contains(value))
- {
- verticalStdG.append(value);
+ if (!m_verticalStdG.contains(value))
+ {
+ m_verticalStdG.append(value);
if (UndoManager::undoEnabled())
{
SimpleState* ss = new SimpleState(Um::AddVGuide, 0, Um::IGuides);
ss->set("ADD_V", value);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
}
break;
@@ -135,14 +135,14 @@
case Standard:
for (it = values.begin(); it != values.end(); ++it)
{
- if (!verticalStdG.contains((*it)))
- verticalStdG.append((*it));
- }
- break;
- case Auto:
- verticalAutoG.clear();
+ if (!m_verticalStdG.contains((*it)))
+ m_verticalStdG.append((*it));
+ }
+ break;
+ case Auto:
+ m_verticalAutoG.clear();
for (it = values.begin(); it != values.end(); ++it)
- verticalAutoG.append((*it));
+ m_verticalAutoG.append((*it));
break;
}
}
@@ -152,12 +152,12 @@
switch (type)
{
case Standard:
- horizontalStdG.removeAt(horizontalStdG.indexOf(value));
+ m_horizontalStdG.removeAt(m_horizontalStdG.indexOf(value));
if (UndoManager::undoEnabled())
{
SimpleState* ss = new SimpleState(Um::DelHGuide, 0, Um::IGuides);
ss->set("REMOVE_H", value);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
break;
case Auto:
@@ -170,12 +170,12 @@
switch (type)
{
case Standard:
- verticalStdG.removeAt(verticalStdG.indexOf(value));
+ m_verticalStdG.removeAt(m_verticalStdG.indexOf(value));
if (UndoManager::undoEnabled())
{
SimpleState* ss = new SimpleState(Um::DelVGuide, 0, Um::IGuides);
ss->set("REMOVE_V", value);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
break;
case Auto:
@@ -188,14 +188,14 @@
switch (type)
{
case Standard:
- return horizontalStdG;
- break;
- case Auto:
- return horizontalAutoG;
+ return m_horizontalStdG;
+ break;
+ case Auto:
+ return m_horizontalAutoG;
break;
}
// just to prevent the compiler warnings
- return horizontalStdG;
+ return m_horizontalStdG;
}
Guides GuideManagerCore::verticals(GuideType type)
@@ -203,13 +203,13 @@
switch (type)
{
case Standard:
- return verticalStdG;
- break;
- case Auto:
- return verticalAutoG;
- break;
- }
- return verticalStdG;
+ return m_verticalStdG;
+ break;
+ case Auto:
+ return m_verticalAutoG;
+ break;
+ }
+ return m_verticalStdG;
}
double GuideManagerCore::horizontal(uint ix, GuideType type)
@@ -217,7 +217,7 @@
switch (type)
{
case Standard:
- return horizontalStdG[ix];
+ return m_horizontalStdG[ix];
break;
case Auto:
break;
@@ -230,7 +230,7 @@
switch (type)
{
case Standard:
- return verticalStdG[ix];
+ return m_verticalStdG[ix];
break;
case Auto:
break;
@@ -343,31 +343,31 @@
switch (type)
{
case Standard:
- if (undoManager->undoEnabled())
- {
- for (int i = 0; i < horizontalStdG.count(); ++i)
+ if (m_undoManager->undoEnabled())
+ {
+ for (int i = 0; i < m_horizontalStdG.count(); ++i)
{
SimpleState* ss = new SimpleState(Um::DelHGuide, 0, Um::IGuides);
- ss->set("REMOVE_H", horizontalStdG[i]);
- undoManager->action(m_page, ss);
+ ss->set("REMOVE_H", m_horizontalStdG[i]);
+ m_undoManager->action(m_page, ss);
}
}
- horizontalStdG.clear();
- break;
- case Auto:
- if (undoManager->undoEnabled())
+ m_horizontalStdG.clear();
+ break;
+ case Auto:
+ if (m_undoManager->undoEnabled())
{
SimpleState * ss = new SimpleState(Um::DelHAGuide, 0, Um::IGuides);
ss->set("REMOVE_HA_GAP", m_horizontalAutoGap);
ss->set("REMOVE_HA_COUNT", m_horizontalAutoCount);
ss->set("REMOVE_HA_REFER", m_horizontalAutoRefer);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
m_horizontalAutoGap = 0.0;
m_horizontalAutoCount= 0;
m_horizontalAutoRefer = 0;
- horizontalAutoG.clear();
+ m_horizontalAutoG.clear();
break;
}
}
@@ -377,31 +377,31 @@
switch (type)
{
case Standard:
- if (undoManager->undoEnabled())
- {
- for (int i = 0; i < verticalStdG.count(); ++i)
+ if (m_undoManager->undoEnabled())
+ {
+ for (int i = 0; i < m_verticalStdG.count(); ++i)
{
SimpleState* ss = new SimpleState(Um::DelVGuide, 0, Um::IGuides);
- ss->set("REMOVE_V", verticalStdG[i]);
- undoManager->action(m_page, ss);
+ ss->set("REMOVE_V", m_verticalStdG[i]);
+ m_undoManager->action(m_page, ss);
}
}
- verticalStdG.clear();
- break;
- case Auto:
- if (undoManager->undoEnabled())
+ m_verticalStdG.clear();
+ break;
+ case Auto:
+ if (m_undoManager->undoEnabled())
{
SimpleState * ss = new SimpleState(Um::DelVAGuide, 0, Um::IGuides);
ss->set("REMOVE_VA_GAP", m_verticalAutoGap);
ss->set("REMOVE_VA_COUNT", m_verticalAutoCount);
ss->set("REMOVE_VA_REFER", m_verticalAutoRefer);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
m_verticalAutoGap = 0.0;
m_verticalAutoCount = 0;
m_verticalAutoRefer = 0;
- verticalAutoG.clear();
+ m_verticalAutoG.clear();
break;
}
}
@@ -410,14 +410,14 @@
switch (type)
{
case Standard:
- horizontalStdG.removeAt(horizontalStdG.indexOf(from));
- horizontalStdG.append(to);
+ m_horizontalStdG.removeAt(m_horizontalStdG.indexOf(from));
+ m_horizontalStdG.append(to);
if (UndoManager::undoEnabled())
{
SimpleState* ss = new SimpleState(Um::MoveHGuide, 0, Um::IGuides);
ss->set("MOVE_H_FROM", from);
ss->set("MOVE_H_TO", to);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
break;
case Auto:
@@ -430,14 +430,14 @@
switch (type)
{
case Standard:
- verticalStdG.removeAt(verticalStdG.indexOf(from));
- verticalStdG.append(to);
+ m_verticalStdG.removeAt(m_verticalStdG.indexOf(from));
+ m_verticalStdG.append(to);
if (UndoManager::undoEnabled())
{
SimpleState* ss = new SimpleState(Um::MoveVGuide, 0, Um::IGuides);
ss->set("MOVE_V_FROM", from);
ss->set("MOVE_V_TO", to);
- undoManager->action(m_page, ss);
+ m_undoManager->action(m_page, ss);
}
break;
case Auto:
@@ -456,8 +456,8 @@
switch (type)
{
case Standard:
- target->addHorizontals(horizontalStdG, Standard);
- target->addVerticals(verticalStdG, Standard);
+ target->addHorizontals(m_horizontalStdG, Standard);
+ target->addVerticals(m_verticalStdG, Standard);
break;
case Auto:
target->setHorizontalAutoCount(m_horizontalAutoCount);
@@ -466,8 +466,8 @@
target->setVerticalAutoGap(m_verticalAutoGap);
target->setHorizontalAutoRefer(m_horizontalAutoRefer);
target->setVerticalAutoRefer(m_verticalAutoRefer);
- target->addHorizontals(horizontalAutoG, Auto);
- target->addVerticals(verticalAutoG, Auto);
+ target->addHorizontals(m_horizontalAutoG, Auto);
+ target->addVerticals(m_verticalAutoG, Auto);
target->gx = gx;
target->gy = gy;
target->gw = gw;
@@ -492,11 +492,11 @@
// all standard
p->setPen(color, lineWidth, Qt::DashDotLine, Qt::FlatCap, Qt::MiterJoin);
- for (it = verticalStdG.begin(); it != verticalStdG.end(); ++it)
+ for (it = m_verticalStdG.begin(); it != m_verticalStdG.end(); ++it)
// if ((*it) >= 0 && (*it) <= m_page->width())
// p->drawLine(FPoint((*it), 0), FPoint((*it), m_page->height()));
p->drawLine(FPoint((*it), verticalFrom), FPoint((*it), verticalTo));
- for (it = horizontalStdG.begin(); it != horizontalStdG.end(); ++it)
+ for (it = m_horizontalStdG.begin(); it != m_horizontalStdG.end(); ++it)
// if ((*it) >= 0 && (*it) <= m_page->height())
// p->drawLine(FPoint(0, (*it)), FPoint(m_page->width(), (*it)));
p->drawLine(FPoint(horizontalFrom, (*it)), FPoint(horizontalTo, (*it)));
@@ -523,11 +523,11 @@
color = doc->guidesPrefs().guideColor;
p->setPen(color, lineWidth, Qt::DashDotLine, Qt::FlatCap, Qt::MiterJoin);
- for (it = verticalAutoG.begin(); it != verticalAutoG.end(); ++it)
+ for (it = m_verticalAutoG.begin(); it != m_verticalAutoG.end(); ++it)
// if ((*it) >= 0 && (*it) <= m_page->width())
// p->drawLine(FPoint((*it), 0), FPoint((*it), m_page->height()));
p->drawLine(FPoint((*it), verticalFrom), FPoint((*it), verticalTo));
- for (it = horizontalAutoG.begin(); it != horizontalAutoG.end(); ++it)
+ for (it = m_horizontalAutoG.begin(); it != m_horizontalAutoG.end(); ++it)
// if ((*it) >= 0 && (*it) <= m_page->height())
// p->drawLine(FPoint(0, (*it)), FPoint(m_page->width(), (*it)));
p->drawLine(FPoint(horizontalFrom, (*it)), FPoint(horizontalTo, (*it)));
@@ -541,10 +541,10 @@
switch (type)
{
case Standard:
- tmp = horizontalStdG;
- break;
- case Auto:
- tmp = horizontalAutoG;
+ tmp = m_horizontalStdG;
+ break;
+ case Auto:
+ tmp = m_horizontalAutoG;
break;
}
for (it = tmp.begin(); it != tmp.end(); ++it)
@@ -564,10 +564,10 @@
switch (type)
{
case Standard:
- tmp = verticalStdG;
- break;
- case Auto:
- tmp = horizontalAutoG;
+ tmp = m_verticalStdG;
+ break;
+ case Auto:
+ tmp = m_horizontalAutoG;
break;
}
for (it = tmp.begin(); it != tmp.end(); ++it)
@@ -602,16 +602,16 @@
double GuideManagerCore::closestHorAbove(double y)// const
{
double closest = 0.0;
- for (int i = 0; i < horizontalStdG.size(); ++i)
- {
- if (horizontalStdG[i] < y && horizontalStdG[i] > closest)
- closest = horizontalStdG[i];
- }
-
- for (int i = 0; i < horizontalAutoG.size(); ++i)
- {
- if (horizontalAutoG[i] < y && horizontalAutoG[i] > closest)
- closest = horizontalAutoG[i];
+ for (int i = 0; i < m_horizontalStdG.size(); ++i)
+ {
+ if (m_horizontalStdG[i] < y && m_horizontalStdG[i] > closest)
+ closest = m_horizontalStdG[i];
+ }
+
+ for (int i = 0; i < m_horizontalAutoG.size(); ++i)
+ {
+ if (m_horizontalAutoG[i] < y && m_horizontalAutoG[i] > closest)
+ closest = m_horizontalAutoG[i];
}
if (m_page->Margins.top() < y && m_page->Margins.top() > closest)
@@ -625,16 +625,16 @@
double GuideManagerCore::closestHorBelow(double y)// const
{
double closest = m_page->height();
- for (int i = 0; i < horizontalStdG.size(); ++i)
- {
- if (horizontalStdG[i] > y && horizontalStdG[i] < closest)
- closest = horizontalStdG[i];
- }
-
- for (int i = 0; i < horizontalAutoG.size(); ++i)
- {
- if (horizontalAutoG[i] > y && horizontalAutoG[i] < closest)
- closest = horizontalAutoG[i];
+ for (int i = 0; i < m_horizontalStdG.size(); ++i)
+ {
+ if (m_horizontalStdG[i] > y && m_horizontalStdG[i] < closest)
+ closest = m_horizontalStdG[i];
+ }
+
+ for (int i = 0; i < m_horizontalAutoG.size(); ++i)
+ {
+ if (m_horizontalAutoG[i] > y && m_horizontalAutoG[i] < closest)
+ closest = m_horizontalAutoG[i];
}
if (m_page->Margins.top() > y && m_page->Margins.top() < closest)
@@ -648,16 +648,16 @@
double GuideManagerCore::closestVertLeft(double x)// const
{
double closest = 0.0;
- for (int i = 0; i < verticalStdG.size(); ++i)
- {
- if (verticalStdG[i] < x && verticalStdG[i] > closest)
- closest = verticalStdG[i];
- }
-
- for (int i = 0; i < verticalAutoG.size(); ++i)
- {
- if (verticalAutoG[i] < x && verticalAutoG[i] > closest)
- closest = verticalAutoG[i];
+ for (int i = 0; i < m_verticalStdG.size(); ++i)
+ {
+ if (m_verticalStdG[i] < x && m_verticalStdG[i] > closest)
+ closest = m_verticalStdG[i];
+ }
+
+ for (int i = 0; i < m_verticalAutoG.size(); ++i)
+ {
+ if (m_verticalAutoG[i] < x && m_verticalAutoG[i] > closest)
+ closest = m_verticalAutoG[i];
}
if (m_page->Margins.left() < x && m_page->Margins.left() > closest)
@@ -671,16 +671,16 @@
double GuideManagerCore::closestVertRight(double x)// const
{
double closest = m_page->width();
- for (int i = 0; i < verticalStdG.size(); ++i)
- {
- if (verticalStdG[i] > x && verticalStdG[i] < closest)
- closest = verticalStdG[i];
- }
-
- for (int i = 0; i < verticalAutoG.size(); ++i)
- {
- if (verticalAutoG[i] > x && verticalAutoG[i] < closest)
- closest = verticalAutoG[i];
+ for (int i = 0; i < m_verticalStdG.size(); ++i)
+ {
+ if (m_verticalStdG[i] > x && m_verticalStdG[i] < closest)
+ closest = m_verticalStdG[i];
+ }
+
+ for (int i = 0; i < m_verticalAutoG.size(); ++i)
+ {
+ if (m_verticalAutoG[i] > x && m_verticalAutoG[i] < closest)
+ closest = m_verticalAutoG[i];
}
if (m_page->Margins.left() > x && m_page->Margins.left() < closest)
Modified: trunk/Scribus/scribus/guidemanagercore.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/guidemanagercore.h
==============================================================================
--- trunk/Scribus/scribus/guidemanagercore.h (original)
+++ trunk/Scribus/scribus/guidemanagercore.h Mon Nov 30 22:00:56 2015
@@ -109,12 +109,12 @@
private:
- UndoManager * const undoManager;
+ UndoManager * const m_undoManager;
ScPage* m_page;
- Guides horizontalStdG;
- Guides verticalStdG;
- Guides horizontalAutoG;
- Guides verticalAutoG;
+ Guides m_horizontalStdG;
+ Guides m_verticalStdG;
+ Guides m_horizontalAutoG;
+ Guides m_verticalAutoG;
double m_horizontalAutoGap;
double m_verticalAutoGap;
Modified: trunk/Scribus/scribus/guidesmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/guidesmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/guidesmodel.cpp (original)
+++ trunk/Scribus/scribus/guidesmodel.cpp Mon Nov 30 22:00:56 2015
@@ -48,13 +48,13 @@
if (role == Qt::DisplayRole)
{
QLocale l;
- return QVariant(l.toString(pts2value(m_values.at(index.row()) - rule,
+ return QVariant(l.toString(pts2value(m_values.at(index.row()) - m_rule,
m_docUnitIndex), 'f',
m_docUnitDecimals)
);
}
if (role == Qt::EditRole)
- return pts2value(m_values.at(index.row()) - rule, m_docUnitIndex);
+ return pts2value(m_values.at(index.row()) - m_rule, m_docUnitIndex);
if (role == Qt::BackgroundColorRole && m_values.at(index.row()) == 0.0)
return QVariant(QColor(Qt::red));
@@ -69,7 +69,7 @@
double newVal = value.toDouble(&ok);
if (!ok)
return false;
- m_values[index.row()] = value2pts(newVal, m_docUnitIndex) + rule;
+ m_values[index.row()] = value2pts(newVal, m_docUnitIndex) + m_rule;
qSort(m_values);
emit dataChanged(index, index);
emit valueChanged();
@@ -144,7 +144,7 @@
void GuidesModel::unitChange(int docUnitIndex, int docUnitDecimals,double offset)
{
beginResetModel();
- rule = offset;
+ m_rule = offset;
m_docUnitIndex = docUnitIndex;
m_docUnitDecimals = docUnitDecimals;
endResetModel();
Modified: trunk/Scribus/scribus/guidesmodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/guidesmodel.h
==============================================================================
--- trunk/Scribus/scribus/guidesmodel.h (original)
+++ trunk/Scribus/scribus/guidesmodel.h Mon Nov 30 22:00:56 2015
@@ -64,7 +64,7 @@
Guides m_values;
int m_docUnitIndex;
int m_docUnitDecimals;
- double rule;
+ double m_rule;
};
#endif
Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp (original)
+++ trunk/Scribus/scribus/iconmanager.cpp Mon Nov 30 22:00:56 2015
@@ -24,7 +24,7 @@
#include "prefsmanager.h"
#include "scpaths.h"
-IconManager* IconManager::_instance = 0;
+IconManager* IconManager::m_instance = 0;
IconManager::IconManager(QObject *parent)
: QObject(parent)
@@ -37,17 +37,17 @@
IconManager* IconManager::instance()
{
- if (_instance == 0)
- _instance = new IconManager();
-
- return _instance;
+ if (m_instance == 0)
+ m_instance = new IconManager();
+
+ return m_instance;
}
void IconManager::deleteInstance()
{
- if (_instance)
- delete _instance;
- _instance = 0;
+ if (m_instance)
+ delete m_instance;
+ m_instance = 0;
}
bool IconManager::setup()
Modified: trunk/Scribus/scribus/iconmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/iconmanager.h
==============================================================================
--- trunk/Scribus/scribus/iconmanager.h (original)
+++ trunk/Scribus/scribus/iconmanager.h Mon Nov 30 22:00:56 2015
@@ -72,7 +72,7 @@
* IconManager is singleton and the instance can be queried with the method
* instance().
*/
- static IconManager* _instance;
+ static IconManager* m_instance;
QMap<QString, ScIconSetData> m_iconSets;
ScPixmapCache<QString> m_pxCache;
QString m_activeSetBasename;
Modified: trunk/Scribus/scribus/latexhelpers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/latexhelpers.cpp
==============================================================================
--- trunk/Scribus/scribus/latexhelpers.cpp (original)
+++ trunk/Scribus/scribus/latexhelpers.cpp Mon Nov 30 22:00:56 2015
@@ -35,7 +35,7 @@
LatexHighlighter::LatexHighlighter(QTextDocument *document)
: QSyntaxHighlighter(document)
{
- rules = 0;
+ m_rules = 0;
}
void LatexHighlighter::highlightBlock(const QString &text)
@@ -44,8 +44,8 @@
static bool disable_highlighting = false;
if (disable_highlighting) return;
- if (!rules) return;
- foreach (LatexHighlighterRule *rule, *rules)
+ if (!m_rules) return;
+ foreach (LatexHighlighterRule *rule, *m_rules)
{
int index = text.indexOf(rule->regex);
while (index >= 0) {
@@ -394,29 +394,29 @@
return result;
}
-LatexConfigCache* LatexConfigCache::_instance = 0;
+LatexConfigCache* LatexConfigCache::m_instance = 0;
LatexConfigCache* LatexConfigCache::instance()
{
- if (!_instance)
- _instance = new LatexConfigCache();
- return _instance;
+ if (!m_instance)
+ m_instance = new LatexConfigCache();
+ return m_instance;
}
LatexConfigParser* LatexConfigCache::parser(QString filename, bool warnOnError)
{
- if (parsers.contains(filename))
- {
- if (warnOnError && error[filename])
+ if (m_parsers.contains(filename))
+ {
+ if (warnOnError && m_error[filename])
{
//Recreate element as error might have been fixed.
- delete parsers[filename];
+ delete m_parsers[filename];
createParser(filename, warnOnError);
}
}
else
createParser(filename, warnOnError);
- return parsers[filename];
+ return m_parsers[filename];
}
@@ -424,8 +424,8 @@
{
LatexConfigParser *parser = new LatexConfigParser();
bool hasError = !parser->parseConfigFile(filename);
- parsers[filename] = parser;
- error[filename] = hasError;
+ m_parsers[filename] = parser;
+ m_error[filename] = hasError;
if (hasError)
{
ScMessageBox::critical(0, QObject::tr("Error"), "<qt>" +
@@ -438,9 +438,9 @@
bool LatexConfigCache::hasError(QString filename)
{
- if (!error.contains(filename))
+ if (!m_error.contains(filename))
return true;
- return error[filename];
+ return m_error[filename];
}
QStringList LatexConfigCache::defaultConfigs()
Modified: trunk/Scribus/scribus/latexhelpers.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20606&path=/trunk/Scribus/scribus/latexhelpers.h
==============================================================================
--- trunk/Scribus/scribus/latexhelpers.h (original)
+++ trunk/Scribus/scribus/latexhelpers.h Mon Nov 30 22:00:56 2015
@@ -44,11 +44,11 @@
public:
LatexHighlighter(QTextDocument *document);
- void setConfig(QList<LatexHighlighterRule *> *config) { rules = config; rehighlight();}
+ void setConfig(QList<LatexHighlighterRule *> *config) { m_rules = config; rehighlight();}
protected:
void highlightBlock(const QString &text);
private:
- QList<LatexHighlighterRule *> *rules;
+ QList<LatexHighlighterRule *> *m_rules;
};
class I18nXmlStreamReader : public QXmlStreamReader
@@ -103,9 +103,9 @@
protected:
void createParser(QString filename, bool warnOnError);
private:
- QMap<QString, LatexConfigParser*> parsers;
- QMap<QString, bool> error;
- static LatexConfigCache *_instance;
+ QMap<QString, LatexConfigParser*> m_parsers;
+ QMap<QString, bool> m_error;
+ static LatexConfigCache *m_instance;
};
More information about the scribus-commit
mailing list