Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5752 → Rev 5753

/branches/Version13x/Scribus/scribus/documentchecker.cpp
228,7 → 228,7
#ifndef NLS_PROTO
if ( currItem->frameOverflows() && (checkerSettings.checkOverflow))
itemError.insert(TextOverflow, 0);
for (uint e = 0; e < currItem->itemText.length(); ++e)
for (int e = 0; e < currItem->itemText.length(); ++e)
{
uint chr = currItem->itemText.text(e).unicode();
if ((chr == 13) || (chr == 32) || (chr == 29) || (chr == 28) || (chr == 27) || (chr == 26) || (chr == 25))
/branches/Version13x/Scribus/scribus/helpbrowser.cpp
287,7 → 287,7
listView->addColumn( tr( "Link" ) , 0 );
listView->setColumnWidthMode( 0, QListView::Maximum );
listView->setColumnWidthMode( 1, QListView::Manual );
listView->setSorting(-1,-1);
listView->setSorting(-1,true);
listView->setRootIsDecorated( true );
listView->setSelectionMode(QListView::Single);
listView->setDefaultRenameAction(QListView::Reject);
328,7 → 328,7
bookmarksView->addColumn( tr( "Link" ) , 0 );
bookmarksView->setColumnWidthMode( 0, QListView::Maximum );
bookmarksView->setColumnWidthMode( 1, QListView::Manual );
bookmarksView->setSorting(1, -1);
bookmarksView->setSorting(1, true);
bookmarksView->setRootIsDecorated( true );
bookmarksView->setSelectionMode(QListView::Single);
bookmarksView->setDefaultRenameAction(QListView::Reject);
/branches/Version13x/Scribus/scribus/scfonts_ttf.cpp
187,7 → 187,7
memcpy(bb.data() + OFFSET_TABLE_LEN + TDIR_ENTRY_LEN * i + 8, &pos, 4);
pos += tableSize;
// pad
while (pos & 3 != 0)
while ((pos & 3) != 0)
bb.data()[pos++] = '\0';
}
}
/branches/Version13x/Scribus/scribus/serializer.cpp
103,7 → 103,7
{
newstyle = it->itemText.defaultStyle().charStyle();
}
int insPos = Append? it->CPos : it->itemText.length();
uint insPos = Append? it->CPos : it->itemText.length();
it->itemText.insertChars(insPos, txt);
it->itemText.applyCharStyle(insPos, txt.length(), newstyle);
#if 0
111,8 → 111,8
it->itemText.item(i)->cab = Absatz;
}
#else
for (int i=0; i < it->itemText.nrOfParagraphs(); ++i) {
int pos = it->itemText.startOfParagraph(i);
for (uint i=0; i < it->itemText.nrOfParagraphs(); ++i) {
uint pos = it->itemText.startOfParagraph(i);
if (pos >= insPos + txt.length())
break;
if (pos >= insPos)
/branches/Version13x/Scribus/scribus/pdflib.cpp
3158,7 → 3158,7
QString out2;
//CB Section numbering
//out2 = out.arg(PNr+doc.FirstPnum, -zae);
out2=out.arg(doc.getSectionPageNumberForPageIndex(PNr), -zae);
out2=out.arg(doc.getSectionPageNumberForPageIndex(PNr), -(int)zae);
chstr = out2.mid(d-za2, 1);
}
uint cc = chstr[0].unicode();
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
4120,7 → 4120,7
#ifndef NLS_PROTO
// if (appMode != modeEdit)
// currItem->setFontStrokeColor(farbe);
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4156,7 → 4156,7
#ifndef NLS_PROTO
// if (appMode != modeEdit)
// currItem->setFontStrokeShade(sha);
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4191,7 → 4191,7
#ifndef NLS_PROTO
// if (appMode != modeEdit)
// currItem->setFontHeight(sha);
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4227,7 → 4227,7
#ifndef NLS_PROTO
// if (appMode != modeEdit)
// currItem->setFontWidth(sha);
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4264,7 → 4264,7
currItem->TxtShadowY = shy;
}
*/
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4305,7 → 4305,7
currItem->TxtUnderWidth = wid;
}
*/
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4346,7 → 4346,7
currItem->TxtStrikeWidth = wid;
}
*/
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4383,7 → 4383,7
#ifndef NLS_PROTO
// if (appMode != modeEdit)
// currItem->TxtBase = sha;
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4414,7 → 4414,7
#ifndef NLS_PROTO
// if (appMode != modeEdit)
// currItem->TxtOutline = sha;
for (uint i=0; i<currItem->itemText.length(); ++i)
for (int i=0; i<currItem->itemText.length(); ++i)
{
if (appMode == modeEdit)
{
4531,7 → 4531,7
#ifndef NLS_PROTO
if (appMode == modeEdit)
{
for (uint a = 0; a < currItem->itemText.length(); ++a)
for (int a = 0; a < currItem->itemText.length(); ++a)
{
if (currItem->itemText.selected(a))
{
4544,7 → 4544,7
}
else
{
for (uint a = 0; a < currItem->itemText.length(); ++a)
for (int a = 0; a < currItem->itemText.length(); ++a)
{
StyleFlag fl = currItem->itemText.item(a)->effects();
fl &= static_cast<StyleFlag>(~1919); // 1024+512+256+64+32+16+8+4+2+1
4859,7 → 4859,7
#ifndef NLS_PROTO
if (currItem->itemText.length() != 0)
{
for (uint a = 0; a < currItem->itemText.length(); ++a)
for (int a = 0; a < currItem->itemText.length(); ++a)
{
if (currItem->itemText.selected(a))
currItem->itemText.item(a)->setTracking(us);
4875,7 → 4875,7
#ifndef NLS_PROTO
if (currItem->itemText.length() != 0)
{
for (uint a = 0; a < currItem->itemText.length(); ++a)
for (int a = 0; a < currItem->itemText.length(); ++a)
{
currItem->itemText.item(a)->setTracking(us);
}
5736,7 → 5736,6
uint selectedItemCount=itemSelection->count();
if (selectedItemCount == 0)
return;
uint a, c;
QPtrList<PageItem> delItems;
PageItem *currItem;
uint offs = 0;
/branches/Version13x/Scribus/scribus/loadsaveplugin.cpp
214,7 → 214,7
return false;
}
 
bool LoadSavePlugin::readLineStyles(const QString& /*fileName*/, QMap<QString,multiLine> */*Sty*/)
bool LoadSavePlugin::readLineStyles(const QString& /*fileName*/, QMap<QString,multiLine>* /*Sty*/)
{
return false;
}
224,7 → 224,7
return false;
}
 
bool LoadSavePlugin::readPageCount(const QString& /*fileName*/, int */*num1*/, int */*num2*/, QStringList & /*masterPageNames*/)
bool LoadSavePlugin::readPageCount(const QString& /*fileName*/, int* /*num1*/, int* /*num2*/, QStringList & /*masterPageNames*/)
{
return false;
}
/branches/Version13x/Scribus/scribus/scgtplugin.h
29,7 → 29,7
{
public:
ScGTPlugin();
~ScGTPlugin();
~ScGTPlugin() {};
 
/**
@brief Returns the file format's name that this plugin can import or QString::null
/branches/Version13x/Scribus/scribus/scribusXml.cpp
1009,7 → 1009,7
if (((item->asTextFrame()) || (item->asPathText())) && (item->itemText.length() != 0))
{
#ifndef NLS_PROTO
for (uint tx = 0; tx < item->itemText.length(); ++tx)
for (int tx = 0; tx < item->itemText.length(); ++tx)
{
if (item->itemText.text(tx) == SpecialChars::PARSEP)
{
/branches/Version13x/Scribus/scribus/pageitem_pathtext.cpp
66,7 → 66,7
 
void PageItem_PathText::DrawObj_Item(ScPainter *p, QRect /*e*/, double sc)
{
uint a;
int a;
int chs;
double wide;
QString chstr, chstr2, chstr3;
/branches/Version13x/Scribus/scribus/scpageoutput.cpp
788,7 → 788,7
 
void ScPageOutput::DrawItem_PathText( PageItem_PathText* item, ScPainterExBase* painter, double scale )
{
uint a;
int a;
int chs;
double wide;
QString chstr, chstr2, chstr3;
1090,7 → 1090,7
QPoint pt1, pt2;
FPoint ColBound;
QRegion cm;
uint a;
int a;
int chs, CurrCol;
double oldCurY, wide, lineCorr, ColWidth;
QString chstr, chstr2, chstr3;
/branches/Version13x/Scribus/scribus/pageitem.cpp
1272,7 → 1272,7
QString out2;
//CB Section numbering
//out2 = out.arg(OwnPage+Doc->FirstPnum, -zae);
out2=out.arg(m_Doc->getSectionPageNumberForPageIndex(OwnPage), -zae);
out2=out.arg(m_Doc->getSectionPageNumberForPageIndex(OwnPage), -(int)zae);
//out2=out.arg(out2, -zae);
chstr = out2.mid(base-za2, 1);
}
/branches/Version13x/Scribus/scribus/scribusview.cpp
3037,7 → 3037,7
emit ItemTextBase(currItem->TxtBase);
*/
#ifndef NLS_PROTO
for (uint aa = 0; aa < currItem->itemText.length(); ++aa)
for (int aa = 0; aa < currItem->itemText.length(); ++aa)
{
currItem->itemText.item(aa)->setFontSize(QMAX(qRound(currItem->itemText.item(aa)->fontSize()*scy), 1));
currItem->itemText.item(aa)->setScaleH(QMAX(QMIN(qRound(currItem->itemText.item(aa)->scaleH()*scx), 4000), 100));
6923,7 → 6923,7
}
PageItem *bb;
double gx, gy, gh, gw, x, y;
uint aa;
int aa;
double sc = Scale;
 
getGroupRect(&gx, &gy, &gw, &gh);
7245,7 → 7245,7
};
int a, xp=0, yp=0, h;
bool breakAndReturn=false;
uint currItemTextCount=currItem->itemText.length();
int currItemTextCount=currItem->itemText.length();
for (a = currItem->firstInFrame(); a <= currItem->lastInFrame(); ++a)
{
xp = static_cast<int>(currItem->itemText.item(a)->glyph.xoffset);
9972,7 → 9972,7
double x, y, wide;
QString chstr, ccounter;
PageItem* bb;
for (uint a = 0; a < currItem->itemText.length(); ++a)
for (int a = 0; a < currItem->itemText.length(); ++a)
{
pts.resize(0);
x = 0.0;
/branches/Version13x/Scribus/scribus/bookmwin.cpp
122,7 → 122,7
QString bm = "";
QString bm2 = "";
QString cc;
for (uint d = 0; d < ite->itemText.length(); ++d)
for (int d = 0; d < ite->itemText.length(); ++d)
{
cc = ite->itemText.text(d);
if ((cc == QChar(13)) || (cc == QChar(10)))
522,7 → 522,7
QString bm = "";
QString bm2 = "";
QString cc;
for (uint d = 0; d < currItem->itemText.length(); ++d)
for (int d = 0; d < currItem->itemText.length(); ++d)
{
cc = currItem->itemText.text(d);
if ((cc == QChar(13)) || (cc == QChar(10)))
/branches/Version13x/Scribus/scribus/text/storytext.cpp
22,8 → 22,9
QChar SpecialChars::ZWSPACE;
//QChar SpecialChars::SPACE = QChar(32);
 
struct ScText_Shared : public QPtrList<ScText>
{
class ScText_Shared : public QPtrList<ScText>
{
public:
ParagraphStyle defaultStyle;
uint refs;
uint len;
/branches/Version13x/Scribus/scribus/scribus.cpp
1078,7 → 1078,7
}
}
 
bool ScribusMainWindow::eventFilter( QObject */*o*/, QEvent *e )
bool ScribusMainWindow::eventFilter( QObject* /*o*/, QEvent *e )
{
bool retVal;
if ( e->type() == QEvent::KeyPress ) {
6576,7 → 6576,8
{
if (HaveDoc)
{
int c, d;
uint c;
int d;
QMap<QString,QString> ers;
PageItem *ite;
QColor tmpc;
/branches/Version13x/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
576,7 → 576,7
{
int mode = ScMW->doc->appMode;
ScMW->doc->appMode = modeEdit;
for (int i = 0; i < ScMW->doc->m_Selection->count(); ++i)
for (uint i = 0; i < ScMW->doc->m_Selection->count(); ++i)
ScMW->doc->chAbStyle(ScMW->doc->m_Selection->itemAt(i), styleid);
ScMW->doc->appMode = mode;
}
/branches/Version13x/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
31,7 → 31,7
return NULL;
if ((it->HasSel) && ((it->itemType() == PageItem::TextFrame) || (it->itemType() == PageItem::PathText)))
{
for (uint b = 0; b < it->itemText.length(); ++b)
for (int b = 0; b < it->itemText.length(); ++b)
{
if (it->itemText.selected(b))
return PyString_FromString(it->itemText.charStyle(b).fillColor().utf8());
67,7 → 67,7
return NULL;
if ((it->HasSel) && ((it->itemType() == PageItem::TextFrame) || (it->itemType() == PageItem::PathText)))
{
for (uint b = 0; b < it->itemText.length(); ++b)
for (int b = 0; b < it->itemText.length(); ++b)
{
if (it->itemText.selected(b))
return PyInt_FromLong(static_cast<long>(it->itemText.charStyle(b).fillShade()));
/branches/Version13x/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
28,7 → 28,7
}
if (it->HasSel)
{
for (uint b = 0; b < it->itemText.length(); b++)
for (int b = 0; b < it->itemText.length(); b++)
if (it->itemText.selected(b))
return PyFloat_FromDouble(static_cast<double>(it->itemText.charStyle(b).fontSize() / 10.0));
return NULL;
54,7 → 54,7
}
if (it->HasSel)
{
for (uint b = 0; b < it->itemText.length(); b++)
for (int b = 0; b < it->itemText.length(); b++)
if (it->itemText.selected(b))
return PyString_FromString(it->itemText.charStyle(b).font()->scName().utf8());
return NULL;
151,7 → 151,7
PyErr_SetString(WrongFrameTypeError, QObject::tr("Cannot get text of non-text frame.","python error"));
return NULL;
}
for (uint a = it->firstInFrame(); a < it->lastInFrame(); a++)
for (int a = it->firstInFrame(); a < it->lastInFrame(); a++)
{
if (it->HasSel)
{
184,7 → 184,7
}
 
// collect all chars from a storytext
for (uint a = 0; a < it->itemText.length(); a++)
for (int a = 0; a < it->itemText.length(); a++)
{
if (it->HasSel)
{
546,7 → 546,7
}
else
{
for (uint b = 0; b < it->itemText.length(); b++)
for (int b = 0; b < it->itemText.length(); b++)
{
//FIXME: doc method
if (it->HasSel)
581,7 → 581,7
}
else
{
for (uint b = 0; b < it->itemText.length(); b++)
for (int b = 0; b < it->itemText.length(); b++)
{
//FIXME:NLS use document method for this
if (it->HasSel)
622,7 → 622,7
else
{
//FIXME:NLS use document method for that
for (uint b = 0; b < it->itemText.length(); ++b)
for (int b = 0; b < it->itemText.length(); ++b)
{
if (it->HasSel)
{
/branches/Version13x/Scribus/scribus/pslib.cpp
2284,7 → 2284,7
if (ite->lineColor() != CommonStrings::None)
tabDist += ite->lineWidth() / 2.0;
 
uint d;
int d;
for (d = ite->firstInFrame(); d <= ite->lastInFrame(); ++d)
{
hl = ite->itemText.item(d);
2457,7 → 2457,7
QString out2;
//CB Section numbering
//out2 = out.arg(a+Doc->FirstPnum, -zae);
out2=out.arg(Doc->getSectionPageNumberForPageIndex(a), -zae);
out2=out.arg(Doc->getSectionPageNumberForPageIndex(a), -(int)zae);
chstr = out2.mid(d-za2, 1);
}
}
/branches/Version13x/Scribus/scribus/printerutil.cpp
173,7 → 173,7
char64 *paperNames = new char64[nPaperNames];
DWORD s1 = DeviceCapabilities( printerName.data(), NULL, DC_PAPERS, (LPSTR) papers, NULL );
DWORD s2 = DeviceCapabilities( printerName.data(), NULL, DC_PAPERNAMES, (LPSTR) paperNames, NULL );
for ( int i = 0; i < nPaperNames; i++ )
for ( uint i = 0; i < nPaperNames; i++ )
{
if ( pageSize == QString(paperNames[i]) )
{
/branches/Version13x/Scribus/scribus/colorm.cpp
604,7 → 604,7
}
if ((ite->asTextFrame()) || (ite->asPathText()))
{
for (uint d=0; d<ite->itemText.length(); ++d)
for (int d=0; d<ite->itemText.length(); ++d)
{
if (it.key() == ite->itemText.charStyle(d).fillColor())
found = true;
638,7 → 638,7
}
if ((ite->asTextFrame()) || (ite->asPathText()))
{
for (uint d=0; d<ite->itemText.length(); ++d)
for (int d=0; d<ite->itemText.length(); ++d)
{
if (it.key() == ite->itemText.charStyle(d).fillColor())
found = true;
675,7 → 675,7
found = true;
if ((ite->asTextFrame()) || (ite->asPathText()))
{
for (uint d=0; d<ite->itemText.length(); ++d)
for (int d=0; d<ite->itemText.length(); ++d)
{
/* PFJ - 29.02.04 - Merged if's */
if ((it.key() == ite->itemText.charStyle(d).fillColor()) ||