Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 10515 → Rev 10516

/trunk/Scribus/scribus/oneclick.cpp
182,7 → 182,7
if (mode == 0)
{
linkSize = new LinkButton( SizeGroup );
linkSize->setToggleButton( true );
linkSize->setCheckable( true );
linkSize->setAutoRaise( true );
linkSize->setMaximumSize( QSize( 15, 32767 ) );
SizeGroupLayout->addMultiCellWidget( linkSize, 0, 1, 2, 2 );
221,7 → 221,7
{
disconnect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(changeSizesW()));
disconnect(spinHeight, SIGNAL(valueChanged(double)), this, SLOT(changeSizesH()));
if (linkSize->isOn())
if (linkSize->isChecked())
spinHeight->setValue(spinWidth->value());
connect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(changeSizesW()));
connect(spinHeight, SIGNAL(valueChanged(double)), this, SLOT(changeSizesH()));
231,7 → 231,7
{
disconnect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(changeSizesW()));
disconnect(spinHeight, SIGNAL(valueChanged(double)), this, SLOT(changeSizesH()));
if (linkSize->isOn())
if (linkSize->isChecked())
spinWidth->setValue(spinHeight->value());
connect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(changeSizesW()));
connect(spinHeight, SIGNAL(valueChanged(double)), this, SLOT(changeSizesH()));
241,7 → 241,7
{
disconnect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(changeSizesW()));
disconnect(spinHeight, SIGNAL(valueChanged(double)), this, SLOT(changeSizesH()));
if (linkSize->isOn())
if (linkSize->isChecked())
spinHeight->setValue(spinWidth->value());
connect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(changeSizesW()));
connect(spinHeight, SIGNAL(valueChanged(double)), this, SLOT(changeSizesH()));
/trunk/Scribus/scribus/stylemanager.cpp
407,7 → 407,7
for (itc = LColors.begin(); itc != LColors.end(); ++itc)
{
if (neededColors.contains(itc.key()))
doc_->PageColors.insert(itc.key(), itc.data());
doc_->PageColors.insert(itc.key(), itc.value());
}
}
}
1009,7 → 1009,7
for (QMap<QString,Keys>::Iterator it=prefsData->KeyActions.begin();
it!=prefsData->KeyActions.end(); ++it)
{
if (key.matches(it.data().keySequence) != QKeySequence::NoMatch)
if (key.matches(it.value().keySequence) != QKeySequence::NoMatch)
return true;
}
 
/trunk/Scribus/scribus/menumanager.cpp
312,7 → 312,7
bool menuBarItemFound=false;
for ( menuListIt = menuList.begin(); menuListIt!=menuList.end(); ++menuListIt)
{
if(menuListIt.data()->getMenuBarID()==menuBarMenuID)
if(menuListIt.value()->getMenuBarID()==menuBarMenuID)
{
menuBarItemFound=true;
break;
320,9 → 320,9
}
if (menuBarItemFound)
{
if (menuListIt.data())
if (menuListIt.value())
{
ScrPopupMenu *currentMenu=menuListIt.data();
ScrPopupMenu *currentMenu=menuListIt.value();
currentMenu->generateEntryList(actionNames);
}
}
/trunk/Scribus/scribus/tabkeyboardshortcutswidget.cpp
171,7 → 171,7
 
//clear current menu entries
for (QMap<QString,Keys>::Iterator it=keyMap.begin(); it!=keyMap.end(); ++it)
it.data().keySequence = QKeySequence();
it.value().keySequence = QKeySequence();
//load in new set
QDomNode n = docElem.firstChild();
217,11 → 217,11
QMap<QString,Keys>::Iterator itEnd=keyMap.end();
for (QMap<QString,Keys>::Iterator it=keyMap.begin(); it!=itEnd; ++it)
{
if (it.data().keySequence.isEmpty() && it.key().isEmpty())
if (it.value().keySequence.isEmpty() && it.key().isEmpty())
continue;
QDomElement function_shortcut=doc.createElement("function");
function_shortcut.setAttribute("name",it.key());
function_shortcut.setAttribute("shortcut",getKeyText(it.data().keySequence));
function_shortcut.setAttribute("shortcut",getKeyText(it.value().keySequence));
keySetElement.appendChild(function_shortcut);
}
QFile f(filename);
559,7 → 559,7
QKeySequence key = QKeySequence(code);
for (QMap<QString,Keys>::Iterator it=keyMap.begin(); it!=keyMap.end(); ++it)
{
if (key.matches(it.data().keySequence) != QKeySequence::NoMatch)
if (key.matches(it.value().keySequence) != QKeySequence::NoMatch)
{
ret = true;
break;
/trunk/Scribus/scribus/about.cpp
62,8 → 62,8
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
QString BUILD_DAY = "31";
QString BUILD_MONTH = CommonStrings::august;
QString BUILD_DAY = "1";
QString BUILD_MONTH = CommonStrings::september;
QString BUILD_YEAR = "2007";
QString BUILD_TIME = "";
QString BUILD_TZ = "";
/trunk/Scribus/scribus/prefsmanager.cpp
482,7 → 482,7
for( QMap<QString, QKeySequence >::ConstIterator it = map->begin(); it!=map->end(); ++it )
{
appPrefs.KeyActions[it.key()].actionName = it.key();
appPrefs.KeyActions[it.key()].keySequence = it.data();
appPrefs.KeyActions[it.key()].keySequence = it.value();
}
}
 
/trunk/Scribus/scribus/tabtools.cpp
612,7 → 612,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboText->insertSmallItem( itc.data(), docu, itc.key() );
colorComboText->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dPenText)
colorComboText->setCurrentItem(colorComboText->count()-1);
}
626,7 → 626,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboStrokeText->insertSmallItem( itc.data(), docu, itc.key() );
colorComboStrokeText->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dStrokeText)
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1);
}
639,7 → 639,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboTextBackground->insertSmallItem( itc.data(), docu, itc.key() );
colorComboTextBackground->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dTextBackGround)
colorComboTextBackground->setCurrentItem(colorComboTextBackground->count()-1);
}
652,7 → 652,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboTextLine->insertSmallItem( itc.data(), docu, itc.key() );
colorComboTextLine->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dTextLineColor)
colorComboTextLine->setCurrentItem(colorComboTextLine->count()-1);
}
699,7 → 699,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboLineShape->insertSmallItem( itc.data(), docu, itc.key() );
colorComboLineShape->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dPen)
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1);
}
712,7 → 712,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
comboFillShape->insertSmallItem( itc.data(), docu, itc.key() );
comboFillShape->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dBrush)
comboFillShape->setCurrentItem(comboFillShape->count()-1);
}
749,7 → 749,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboLine->insertSmallItem( itc.data(), docu, itc.key() );
colorComboLine->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dPenLine)
colorComboLine->setCurrentItem(colorComboLine->count()-1);
}
805,7 → 805,7
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
comboFillImage->insertSmallItem( itc.data(), docu, itc.key() );
comboFillImage->insertSmallItem( itc.value(), docu, itc.key() );
if (itc.key() == prefsData->dBrushPict)
comboFillImage->setCurrentItem(comboFillImage->count()-1);
}
/trunk/Scribus/scribus/scribusview.cpp
2786,7 → 2786,7
for (int m = 0; m < m_ScMW->scrapbookPalette->tempBView->objectMap.count(); ++m)
{
QString strippedName = it.key();
QPixmap pm = it.data().Preview;
QPixmap pm = it.value().Preview;
// Qt4 pmen3->insertItem(pm, strippedName);
pmen3->addAction(pm, strippedName);
it--;
9127,7 → 9127,7
}
if (tmpGuidesSel.count() != 0)
{
GyM = tmpGuidesSel.begin().data();
GyM = tmpGuidesSel.begin().value();
QPoint py = viewport()->mapFromGlobal(m->globalPos());
DrHY = py.y();
}
9140,7 → 9140,7
}
if (tmpGuidesSel.count() != 0)
{
GxM = tmpGuidesSel.begin().data();
GxM = tmpGuidesSel.begin().value();
QPoint py = viewport()->mapFromGlobal(m->globalPos());
DrVX = py.x();
}
/trunk/Scribus/scribus/prefsdialogbase.cpp
108,7 → 108,7
layout5 = new QVBoxLayout;
layout5->setMargin(0);
layout5->setSpacing(5);
tabNameLabel = new QLabel( this, "tabNameLabel" );
tabNameLabel = new QLabel( this );
QFont f(tabNameLabel->font());
f.setPointSize(f.pointSize()+4);
f.setBold(true);
122,25 → 122,25
layout4 = new QHBoxLayout;
layout4->setMargin(0);
layout4->setSpacing(5);
saveButton = new QPushButton(this, "saveButton");
saveButton = new QPushButton(this );
saveButton->setAutoDefault( false );
saveButton->setDefault( false );
layout4->addWidget(saveButton);
QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout4->addItem( spacer );
backToDefaults = new QPushButton( this, "backToDefaults" );
backToDefaults = new QPushButton( this );
backToDefaults->setAutoDefault( false );
backToDefaults->setDefault( false );
layout4->addWidget( backToDefaults );
applyChangesButton = new QPushButton( this, "applyChangesButton" );
applyChangesButton = new QPushButton( this );
applyChangesButton->setAutoDefault( false );
applyChangesButton->setDefault( false );
layout4->addWidget( applyChangesButton );
buttonOk = new QPushButton( this, "buttonOk" );
buttonOk = new QPushButton( this );
buttonOk->setAutoDefault( false );
buttonOk->setDefault( false );
layout4->addWidget( buttonOk );
buttonCancel = new QPushButton( this, "buttonCancel" );
buttonCancel = new QPushButton( this );
buttonCancel->setAutoDefault( false );
buttonCancel->setDefault( false );
layout4->addWidget( buttonCancel );
190,12 → 190,7
 
void PrefsDialogBase::saveButton_clicked()
{
QString s = QFileDialog::getSaveFileName(
QDir::currentPath(),
"All Files (*)",
this,
"save prefs",
tr("Save Preferences"));
QString s = QFileDialog::getSaveFileName(this, tr("Save Preferences"), QDir::currentPath(), "All Files (*)");
if (s.isEmpty())
return;
PrefsManager *pm = PrefsManager::instance();
/trunk/Scribus/scribus/scribus.cpp
406,14 → 406,14
{
for( QMap<QString, QPointer<ScrAction> >::Iterator it = scrActions.begin(); it!=scrActions.end(); ++it )
{
if ((ScrAction*)(it.data())!=NULL)
if ((ScrAction*)(it.value())!=NULL)
{
QString accelerator=it.data()->accel();
prefsManager->setKeyEntry(it.key(), it.data()->cleanMenuText(), accelerator,0);
QString accelerator=it.value()->accel();
prefsManager->setKeyEntry(it.key(), it.value()->cleanMenuText(), accelerator,0);
}
//else
// qDebug(it.key());
//qDebug(QString("|-\n|%1||%2||%3").arg(it.key()).arg(it.data()->cleanMenuText()).arg(QString(it.data()->accel())));
//qDebug(QString("|-\n|%1||%2||%3").arg(it.key()).arg(it.value()->cleanMenuText()).arg(QString(it.data()->accel())));
}
}
 
3310,7 → 3310,7
for (int m = 0; m < max; ++m)
{
strippedName = it.key();
QPixmap pm = it.data().Preview;
QPixmap pm = it.value().Preview;
scrRecentPasteActions.insert(strippedName, new ScrAction(ScrAction::RecentPaste, pm, QPixmap(), QString("&%1 %2").arg(m+1).arg(strippedName), QKeySequence(), this, 0,0.0,it.key()));
connect( scrRecentPasteActions[strippedName], SIGNAL(activatedData(QString)), this, SLOT(pasteRecent(QString)) );
scrMenuMgr->addMenuItem(scrRecentPasteActions[strippedName], recentPasteMenuName);
8533,9 → 8533,9
{
for (QMap<QString,Keys>::Iterator it = prefsManager->appPrefs.KeyActions.begin(); it != prefsManager->appPrefs.KeyActions.end(); ++it )
{
if (!it.data().actionName.isEmpty())
if (scrActions[it.data().actionName])
scrActions[it.data().actionName]->setAccel(it.data().keySequence);
if (!it.value().actionName.isEmpty())
if (scrActions[it.value().actionName])
scrActions[it.value().actionName]->setAccel(it.value().keySequence);
}
}
 
8637,7 → 8637,7
translatedLang="";
translatedLang = trans->translate("ScribusMainWindow", it.key(), "");
if (!translatedLang.isEmpty())
it.data().append(translatedLang);
it.value().append(translatedLang);
}
delete trans;
}
8675,8 → 8675,8
QMap<QString, QStringList>::Iterator itlend=InstLang.end();
for (QMap<QString, QStringList>::Iterator itl = InstLang.begin(); itl != itlend; ++itl)
{
QStringList::Iterator itlrend=itl.data().end();
for (QStringList::Iterator itlr = itl.data().begin(); itlr != itlrend; ++itlr)
QStringList::Iterator itlrend=itl.value().end();
for (QStringList::Iterator itlr = itl.value().begin(); itlr != itlrend; ++itlr)
{
if ((*itlr) == inLang)
return itl.key();
9019,7 → 9019,7
ColorList::Iterator it;
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
if (selectedColor== ScColorEngine::getRGBColor(it.data(), doc))
if (selectedColor== ScColorEngine::getRGBColor(it.value(), doc))
{
found=true;
break;
/trunk/Scribus/scribus/pdflib_core.cpp
6772,7 → 6772,7
PutDoc("]\n/OFF [ ");
for (itoc = OCGEntries.begin(); itoc != OCGEntries.end(); ++itoc)
{
if (!itoc.data().visible)
if (!itoc.value().visible)
PutDoc(QString::number(itoc.value().ObjNum)+" 0 R ");
}
PutDoc("] >>\n/OCGs [ ");
/trunk/Scribus/scribus/scimgdataloader_ps.cpp
1322,18 → 1322,18
{
for (QMap<QString, plateOffsets>::Iterator it = colorPlates2.begin(); it != colorPlates2.end(); ++it)
{
QByteArray imgc(it.data().len);
QByteArray imgc(it.value().len);
QFile f(picFile);
if (f.open(QIODevice::ReadOnly))
{
f.at(it.data().pos);
uint readB = f.readBlock(imgc.data(), it.data().len);
f.at(it.value().pos);
uint readB = f.readBlock(imgc.data(), it.value().len);
readB = 0;
}
f.close();
QFile f2(tmpFile2);
if (f2.open(QIODevice::WriteOnly))
f2.writeBlock(imgc.data(), it.data().len);
f2.writeBlock(imgc.data(), it.value().len);
f2.close();
imgc.resize(0);
if ((isPhotoshop) && (hasPhotoshopImageData))
1364,7 → 1364,7
{
for (QMap<QString, QString>::Iterator it = colorPlates.begin(); it != colorPlates.end(); ++it)
{
tmpFile2 = QDir::convertSeparators(baseFile+"/"+it.data());
tmpFile2 = QDir::convertSeparators(baseFile+"/"+it.value());
if ((isPhotoshop) && (hasPhotoshopImageData))
{
QImage tmpImg;
/trunk/Scribus/scribus/smcstylewidget.cpp
100,7 → 100,7
language_->clear();
 
for (it = langMap.begin(); it != langMap.end(); ++it)
sortList.push_back(it.data());
sortList.push_back(it.value());
 
language_->insertStringList(sortQStringList(sortList));
 
121,8 → 121,8
ScribusDoc* doc = colors.document();
for (ColorList::Iterator it = colors.begin(); it != itend; ++it)
{
fillColor_->insertSmallItem(it.data(), doc, it.key());
strokeColor_->insertSmallItem(it.data(), doc, it.key());
fillColor_->insertSmallItem(it.value(), doc, it.key());
strokeColor_->insertSmallItem(it.value(), doc, it.key());
}
fillColor_->view()->setMinimumWidth(fillColor_->view()->maximumViewportSize().width()+24);
strokeColor_->view()->setMinimumWidth(strokeColor_->view()->maximumViewportSize().width()+24);
/trunk/Scribus/scribus/mpalette.cpp
3785,7 → 3785,7
{
QMap<QString,multiLine>::Iterator it;
for (it = dd->MLineStyles.begin(); it != dd->MLineStyles.end(); ++it)
StyledLine->addItem( new LineFormatItem(dd, it.data(), it.key()) );
StyledLine->addItem( new LineFormatItem(dd, it.value(), it.key()) );
StyledLine->sortItems();
StyledLine->insertItem( 0, tr("No Style"));
if (StyledLine->currentItem())
4192,7 → 4192,7
return;
langCombo->clear();
for (it = langMap.begin(); it != langMap.end(); ++it)
sortList.push_back(it.data());
sortList.push_back(it.value());
langCombo->insertStringList(sortQStringList(sortList));
QListView *tmpView = dynamic_cast<QListView*>(langCombo->view()); Q_ASSERT(tmpView);
int tmpWidth = tmpView->sizeHintForColumn(0);
/trunk/Scribus/scribus/patterndialog.cpp
73,7 → 73,7
for (QMap<QString, ScPattern>::Iterator it = dialogPatterns.begin(); it != dialogPatterns.end(); ++it)
{
QPixmap pm;
if (it.data().getPattern()->width() >= it.value().getPattern()->height())
if (it.value().getPattern()->width() >= it.value().getPattern()->height())
pm=QPixmap::fromImage(it.value().getPattern()->scaledToWidth(48, Qt::SmoothTransformation));
else
pm=QPixmap::fromImage(it.value().getPattern()->scaledToHeight(48, Qt::SmoothTransformation));
/trunk/Scribus/scribus/preview.cpp
874,9 → 874,9
{
QString fnam;
if (GsMinor < 54)
fnam = QString(ScPaths::getTempFileDir()+"/sc.tif.s%1.tif").arg(sepit.data());
fnam = QString(ScPaths::getTempFileDir()+"/sc.tif.s%1.tif").arg(sepit.value());
else
fnam = QString(ScPaths::getTempFileDir()+"/sc.s%1.tif").arg(sepit.data());
fnam = QString(ScPaths::getTempFileDir()+"/sc.s%1.tif").arg(sepit.value());
if (!im.LoadPicture(fnam, cms, false, false, ScImage::RGBData, 72, &mode))
{
imageLoadError(Bild, Seite);
/trunk/Scribus/scribus/scribusdoc.cpp
2371,13 → 2371,13
QMap<QString,multiLine>::iterator itl;
for (itl = MLineStyles.begin(); itl != MLineStyles.end(); ++itl)
{
multiLine& mline = itl.data();
multiLine& mline = itl.value();
for (its = mline.begin(); its != mline.end(); ++its)
{
struct SingleLine& sline = *its;
it = colorMap.find(sline.Color);
if (it != colorMap.end())
sline.Color = it.data();
sline.Color = it.value();
}
}
}
2440,7 → 2440,7
itmend = MLineStyles.constEnd();
for (itm = MLineStyles.constBegin(); itm != itmend && !found; ++itm)
{
const multiLine& ml = itm.data();
const multiLine& ml = itm.value();
itsend = ml.constEnd();
for (its = ml.constBegin(); its != itsend; ++its)
{
4437,7 → 4437,7
void ScribusDoc::setFirstSectionFromFirstPageNumber()
{
DocumentSectionMap::Iterator it = sections.begin();
it.data().sectionstartindex=FirstPnum;
it.value().sectionstartindex=FirstPnum;
updateSectionPageNumbersToPages();
}
 
/trunk/Scribus/scribus/scfonts.cpp
591,8 → 591,8
QMap<QString,ScFace>::ConstIterator it;
for (it = begin(); it != end(); ++it)
{
if (it.data().isReplacement() && !skip.contains(it.key()))
result[it.key()] = it.data().replacementName();
if (it.value().isReplacement() && !skip.contains(it.key()))
result[it.key()] = it.value().replacementName();
}
return result;
}
603,12 → 603,12
QMap<QString,QString>::ConstIterator it;
for (it = substitutes.begin(); it != substitutes.end(); ++it)
{
if (it.key() == it.data())
if (it.key() == it.value())
continue;
ScFace& font(const_cast<ScFace&>(findFont(it.key(), doc)));
if (font.isReplacement())
{
font.chReplacementTo(const_cast<ScFace&>(findFont(it.data(), doc)), doc->DocName);
font.chReplacementTo(const_cast<ScFace&>(findFont(it.value(), doc)), doc->DocName);
}
}
}
786,12 → 786,12
QMap<QString, testCache>::Iterator it;
for (it = checkedFonts.begin(); it != checkedFonts.end(); ++it)
{
if (it.data().isChecked)
if (it.value().isChecked)
{
QDomElement fosu = docu.createElement("Font");
fosu.setAttribute("File",it.key());
fosu.setAttribute("Status",static_cast<int>(it.data().isOK));
fosu.setAttribute("Modified",it.data().lastMod.toString(Qt::ISODate));
fosu.setAttribute("Status",static_cast<int>(it.value().isOK));
fosu.setAttribute("Modified",it.value().lastMod.toString(Qt::ISODate));
elem.appendChild(fosu);
}
}
/trunk/Scribus/scribus/scrap.cpp
521,15 → 521,15
QMap<QString,Elem>::Iterator itf;
for (itf = objectMap.begin(); itf != objectMap.end(); ++itf)
{
if (itf.data().Preview.width() > 60)
itf.data().Preview = itf.data().Preview.scaledToWidth(60, Qt::SmoothTransformation);
if (itf.data().Preview.height() > 60)
itf.data().Preview = itf.data().Preview.scaledToHeight(60, Qt::SmoothTransformation);
if (itf.value().Preview.width() > 60)
itf.value().Preview = itf.value().Preview.scaledToWidth(60, Qt::SmoothTransformation);
if (itf.value().Preview.height() > 60)
itf.value().Preview = itf.value().Preview.scaledToHeight(60, Qt::SmoothTransformation);
QPixmap pm(60, 60);
pm.fill(palette().base());
QPainter p;
p.begin(&pm);
p.drawPixmap(30 - itf.data().Preview.width() / 2, 30 - itf.data().Preview.height() / 2, itf.data().Preview);
p.drawPixmap(30 - itf.value().Preview.width() / 2, 30 - itf.value().Preview.height() / 2, itf.value().Preview);
p.end();
new QListWidgetItem(QIcon(pm), itf.key(), this);
}
952,7 → 952,7
{
QMap<QString,BibView::Elem>::Iterator it;
it = tempBView->objectMap.begin();
QFile f(it.data().Data);
QFile f(it.value().Data);
f.remove();
QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
if (fi.exists())
1203,7 → 1203,7
{
QMap<QString,BibView::Elem>::Iterator it;
it = tempBView->objectMap.begin();
QFile f(it.data().Data);
QFile f(it.value().Data);
f.remove();
QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
if (fi.exists())
1273,7 → 1273,7
{
QMap<QString,BibView::Elem>::Iterator it;
it = tempBView->objectMap.begin();
QFile f(it.data().Data);
QFile f(it.value().Data);
f.remove();
QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
if (fi.exists())
1312,7 → 1312,7
QMap<QString,BibView::Elem>::Iterator it;
for (it = tempBView->objectMap.begin(); it != tempBView->objectMap.end(); ++it)
{
QFile f(it.data().Data);
QFile f(it.value().Data);
f.remove();
QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
if (fi.exists())
/trunk/Scribus/scribus/util_color.cpp
82,9 → 82,9
ColorList::Iterator it, itEnd = doc->PageColors.end();
for( it = doc->PageColors.begin(); it != itEnd; it++)
{
if ( it.data().getColorModel() == colorModelRGB )
if ( it.value().getColorModel() == colorModelRGB )
{
it.data().getRGB(&r, &g, &b);
it.value().getRGB(&r, &g, &b);
col2.setRgb(r, g, b);
if( col1 == col2 )
{
/trunk/Scribus/scribus/plugins/aiimplugin/importai.cpp
187,7 → 187,7
for (it = CustColors.begin(); it != CustColors.end(); ++it)
{
if (!m_Doc->PageColors.contains(it.key()))
m_Doc->PageColors.insert(it.key(), it.data());
m_Doc->PageColors.insert(it.key(), it.value());
}
Elements.clear();
FPoint minSize = m_Doc->minCanvasCoordinate;
/trunk/Scribus/scribus/plugins/colorwheel/colorwheelwidget.cpp
314,7 → 314,7
for (it = colorMap.begin(); it != colorMap.end(); ++it)
{
int tmph, tmps, tmpv;
QColor col(ScColorEngine::getRGBColor(it.data(), currentDoc));
QColor col(ScColorEngine::getRGBColor(it.value(), currentDoc));
col.hsv(&tmph, &tmps, &tmpv);
if (origh == tmph)
{
/trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
327,7 → 327,7
else
{
status += tr("Color %1 appended.").arg(it.key()) + "<br/>";
m_Doc->PageColors[it.key()] = it.data();
m_Doc->PageColors[it.key()] = it.value();
}
}
status += "<p>" + tr("Now opening the color manager.") + "</p></qt>";
345,7 → 345,7
{
for (ColorList::iterator it = colorWheel->colorList.begin(); it != colorWheel->colorList.end(); ++it)
{
m_Doc->PageColors[it.key()] = it.data();
m_Doc->PageColors[it.key()] = it.value();
}
m_Doc->scMW()->propertiesPalette->updateColorList();
accept();
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
785,7 → 785,7
QString key = attr.mid(start, end - start);
QMap<QString, FPointArray>::iterator it = m_clipPaths.find(key);
if (it != m_clipPaths.end())
clipPath = it.data().copy();
clipPath = it.value().copy();
}
}
}
1546,7 → 1546,7
ret.removeAttribute("width");
ret.removeAttribute("height");
ret.removeAttribute("xlink:href");
QDomNode clone = it.data().cloneNode();
QDomNode clone = it.value().cloneNode();
QDomElement cloneElm = clone.toElement();
if( cloneElm.tagName() == "symbol" )
cloneElm.setTagName("g"); // later fix to be svg
1562,7 → 1562,7
QString href = e.attribute("xlink:href").mid(1);
it = m_nodeMap.find(href);
if (it != m_nodeMap.end())
ret = it.data().cloneNode().toElement();
ret = it.value().cloneNode().toElement();
return ret;
}
 
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
713,7 → 713,7
{
// qDebug(QString("1.2 textframe links: %1->%2[%3]").arg(lc.key()).arg(itemRemap[lc.data()]).arg(lc.data()));
PageItem *Its = m_Doc->Items->at(lc.key());
PageItem *Itn = m_Doc->Items->at(itemRemap[lc.data()]);
PageItem *Itn = m_Doc->Items->at(itemRemap[lc.value()]);
assert(Its && Its->asTextFrame());
assert(Itn && Itn->asTextFrame());
if (Itn->prevInChain() || Its->nextInChain())
1227,7 → 1227,7
QString Nam2 = Nam;
int copyC = 1;
QMap<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(Nam2);
if (mlit != m_Doc->MLineStyles.end() && ml != mlit.data())
if (mlit != m_Doc->MLineStyles.end() && ml != mlit.value())
{
while (m_Doc->MLineStyles.contains(Nam2))
{
1410,7 → 1410,7
for (lc = itemNext.begin(); lc != itemNext.end(); ++lc)
{
PageItem *Its = m_Doc->Items->at(lc.key());
PageItem *Itn = m_Doc->Items->at(itemRemap[lc.data()]);
PageItem *Itn = m_Doc->Items->at(itemRemap[lc.value()]);
assert(Its && Its->asTextFrame());
assert(Itn && Itn->asTextFrame());
if (Itn->prevInChain() || Its->nextInChain())
1709,7 → 1709,7
QString Nam2 = Nam;
int copyC = 1;
QMap<QString,multiLine>::ConstIterator mlit = Sty->find(Nam2);
if (mlit != Sty->end() && ml != mlit.data())
if (mlit != Sty->end() && ml != mlit.value())
{
while (Sty->contains(Nam2))
{
/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
2587,7 → 2587,7
QString Nam2 = Nam;
int copyC = 1;
QMap<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(Nam2);
if (mlit != m_Doc->MLineStyles.end() && ml != mlit.data())
if (mlit != m_Doc->MLineStyles.end() && ml != mlit.value())
{
while (m_Doc->MLineStyles.contains(Nam2))
{
3032,7 → 3032,7
QString Nam2 = Nam;
int copyC = 1;
QMap<QString,multiLine>::ConstIterator mlit = Sty->find(Nam2);
if (mlit != Sty->end() && ml != mlit.data())
if (mlit != Sty->end() && ml != mlit.value())
{
while (Sty->contains(Nam2))
{
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
274,7 → 274,7
{
QDomElement MuL=docu.createElement("MultiLine");
MuL.setAttribute("Name",itMU.key());
multiLine ml = itMU.data();
multiLine ml = itMU.value();
multiLine::iterator itMU2;
for (itMU2 = ml.begin(); itMU2 != ml.end(); ++itMU2)
{
322,7 → 322,7
{
QDomElement jav=docu.createElement("JAVA");
jav.setAttribute("NAME",itja.key());
jav.setAttribute("SCRIPT",itja.data());
jav.setAttribute("SCRIPT",itja.value());
dc.appendChild(jav);
}
679,9 → 679,9
{
QDomElement pdf4 = docu.createElement("LPI");
pdf4.setAttribute("Color", itlp.key());
pdf4.setAttribute("Frequency", itlp.data().Frequency);
pdf4.setAttribute("Angle", itlp.data().Angle);
pdf4.setAttribute("SpotFunction", itlp.data().SpotFunc);
pdf4.setAttribute("Frequency", itlp.value().Frequency);
pdf4.setAttribute("Angle", itlp.value().Angle);
pdf4.setAttribute("SpotFunction", itlp.value().SpotFunc);
pdf.appendChild(pdf4);
}
dc.appendChild(pdf);
819,7 → 819,7
{
QDomElement pat = docu.createElement("Pattern");
pat.setAttribute("Name",itPat.key());
ScPattern pa = itPat.data();
ScPattern pa = itPat.value();
pat.setAttribute("width", pa.width);
pat.setAttribute("height", pa.height);
pat.setAttribute("scaleX", pa.scaleX);
1154,10 → 1154,10
{
QDomElement psd = docu->createElement("PSDLayer");
psd.setAttribute("Layer",it2.key());
psd.setAttribute("Visible", static_cast<int>(it2.data().visible));
psd.setAttribute("useMask", static_cast<int>(it2.data().useMask));
psd.setAttribute("Opacity", it2.data().opacity);
psd.setAttribute("Blend", it2.data().blend);
psd.setAttribute("Visible", static_cast<int>(it2.value().visible));
psd.setAttribute("useMask", static_cast<int>(it2.value().useMask));
psd.setAttribute("Opacity", it2.value().opacity);
psd.setAttribute("Blend", it2.value().blend);
ob.appendChild(psd);
}
}
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
2633,7 → 2633,7
QString Nam2 = Nam;
int copyC = 1;
QMap<QString,multiLine>::ConstIterator mlit = m_Doc->MLineStyles.find(Nam2);
if (mlit != m_Doc->MLineStyles.end() && ml != mlit.data())
if (mlit != m_Doc->MLineStyles.end() && ml != mlit.value())
{
while (m_Doc->MLineStyles.contains(Nam2))
{
3089,7 → 3089,7
QMap<PageItem*, int>::Iterator it;
for (it = groupID.begin(); it != groupID.end(); ++it)
{
it.key()->groupsLastItem = m_Doc->Items->at(it.data());
it.key()->groupsLastItem = m_Doc->Items->at(it.value());
}
}
/trunk/Scribus/scribus/plugins/psimport/importpsplugin.cpp
105,7 → 105,7
fmt2.trName = FormatsManager::instance()->nameOfFormat(FormatsManager::PDF); // Human readable name
fmt2.formatId = FORMATID_PDFIMPORT;
fmt2.filter = FormatsManager::instance()->extensionsForFormat(FormatsManager::PDF);// QFileDialog filter
fmt2.nameMatch = QRegExp("\\."+FormatsManager::instance()->extensionListForFormat(FormatsManager::PDF, 1)+"$", false);
fmt2.nameMatch = QRegExp("\\."+FormatsManager::instance()->extensionListForFormat(FormatsManager::PDF, 1)+"$", Qt::CaseInsensitive);
fmt2.load = true;
fmt2.save = false;
fmt2.mimeTypes = FormatsManager::instance()->mimetypeOfFormat(FormatsManager::PDF); // MIME types
/trunk/Scribus/scribus/plugins/psimport/importps.cpp
60,7 → 60,7
bool found = false;
CustColors.clear();
QFileInfo fi = QFileInfo(fName);
QString ext = fi.extension(false).toLower();
QString ext = fi.suffix().toLower();
if ( !ScCore->usingGUI() ) {
interactive = false;
showProgress = false;
162,7 → 162,7
f.close();
if (found)
{
QStringList bb = QStringList::split(" ", BBox);
QStringList bb = BBox.split(" ");
if (bb.count() == 4)
{
QTextStream ts2(&BBox, QIODevice::ReadOnly);
209,7 → 209,7
for (it = CustColors.begin(); it != CustColors.end(); ++it)
{
if (!m_Doc->PageColors.contains(it.key()))
m_Doc->PageColors.insert(it.key(), it.data());
m_Doc->PageColors.insert(it.key(), it.value());
}
Elements.clear();
FPoint minSize = m_Doc->minCanvasCoordinate;
220,7 → 220,7
m_Doc->scMW()->ScriptRunning = true;
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
QString CurDirP = QDir::currentPath();
QDir::setCurrent(fi.dirPath());
QDir::setCurrent(fi.path());
if (convert(fName, x, y, b, h))
{
// m_Doc->m_Selection->clear();
424,7 → 424,7
QString pfad = ScPaths::instance().libDir();
QString pfad2 = QDir::convertSeparators(pfad + "import.prolog");
QFileInfo fi = QFileInfo(fn);
QString ext = fi.extension(false).toLower();
QString ext = fi.suffix().toLower();
if (progressDialog) {
progressDialog->setOverallProgress(1);
470,7 → 470,7
exportFi.setFile(docDir + "/" + exportFi.baseName());
}
//qDebug(QString("using export path %1").arg(exportFi.absFilePath()));
args.append( QString("-sExportFiles=%1").arg(QDir::convertSeparators(exportFi.absFilePath())) );
args.append( QString("-sExportFiles=%1").arg(QDir::convertSeparators(exportFi.absoluteFilePath())) );
args.append( pfad2 );
args.append( QDir::convertSeparators(fn) );
args.append( "-c" );
553,7 → 553,7
tmp = "";
tmp = ts.readLine();
if (progressDialog && (++line_cnt % 100 == 0)) {
int fPos = f.at();
int fPos = f.pos();
int progress = static_cast<int>(ceil(fPos / (double) fSize * 100));
if (progress > fProgress)
{
876,7 → 876,7
filename = filename.mid(0, filename.length()-3) + "psd";
}
qDebug(QString("import %7 image %1: %2x%3 @ (%4,%5) °%6").arg(filename).arg(w).arg(h).arg(x).arg(y).arg(angle).arg(device));
qDebug("%s", QString("import %7 image %1: %2x%3 @ (%4,%5) °%6").arg(filename).arg(w).arg(h).arg(x).arg(y).arg(angle).arg(device).toLocal8Bit().data());
QString rawfile = filename.mid(0, filename.length()-3) + "dat";
QStringList args;
args.append( "-q" );
/trunk/Scribus/scribus/pluginmanager.cpp
112,7 → 112,7
{
// write configuration
for (PluginMap::Iterator it = pluginMap.begin(); it != pluginMap.end(); ++it)
prefs->set(it.data().pluginName, it.data().enableOnStartup);
prefs->set(it.value().pluginName, it.value().enableOnStartup);
}
 
QString PluginManager::getPluginName(QString fileName)
197,7 → 197,7
changes = 0;
for (it = allPlugs.begin(); it != allPlugs.end(); ++it)
{
if (it.data() != 0)
if (it.value() != 0)
continue;
int res = initPlugin(it.key());
allPlugs[it.key()] = res;
280,11 → 280,11
mw->scrMenuMgr->addMenuSeparator("Extras");
for (PluginMap::Iterator it = pluginMap.begin(); it != pluginMap.end(); ++it)
{
if (it.data().plugin->inherits("ScActionPlugin"))
if (it.value().plugin->inherits("ScActionPlugin"))
{
//Add in ScrAction based plugin linkage
//Insert DLL Action into Dictionary with values from plugin interface
plugin = dynamic_cast<ScActionPlugin*>(it.data().plugin);
plugin = dynamic_cast<ScActionPlugin*>(it.value().plugin);
assert(plugin);
ScActionPlugin::ActionInfo ai(plugin->actionInfo());
ScrAction* action = new ScrAction(ScrAction::ActionDLL, ai.icon1, ai.icon2, ai.text, ai.keySequence, mw);
294,7 → 294,7
// then enable and connect up the action
mw->scrActions[ai.name]->setEnabled(ai.enabledOnStartup);
// Connect action's activated signal with the plugin's run method
it.data().enabled = connect( mw->scrActions[ai.name], SIGNAL(activatedData(ScribusDoc*)),
it.value().enabled = connect( mw->scrActions[ai.name], SIGNAL(activatedData(ScribusDoc*)),
plugin, SLOT(run(ScribusDoc*)) );
//Get the menu manager to add the DLL's menu item to the right menu, after the chosen existing item
if ( ai.menuAfterName.isEmpty() )
307,7 → 307,7
afterAction=mw->scrActions[actionName];
mw->scrMenuMgr->addMenuItemAfter(mw->scrActions[ai.name], ai.menu, afterAction);
}
if (it.data().enabled)
if (it.value().enabled)
ScCore->setSplashStatus( tr("Plugin: %1 initialized ok ", "plugin manager")
.arg(plugin->fullTrName()));
else
316,7 → 316,7
}
else
{
it.data().plugin->addToMainWindowMenu(mw);
it.value().plugin->addToMainWindowMenu(mw);
}
 
}
393,8 → 393,8
void PluginManager::cleanupPlugins()
{
for (PluginMap::Iterator it = pluginMap.begin(); it != pluginMap.end(); ++it)
if (it.data().enabled == true)
finalizePlug(it.data());
if (it.value().enabled == true)
finalizePlug(it.value());
}
 
void PluginManager::finalizePlug(PluginData & pda)
483,7 → 483,7
ScrAction* pluginAction = 0;
for (PluginMap::Iterator it = pluginMap.begin(); it != pluginMap.end(); ++it)
{
plugin = it.data().plugin;
plugin = it.value().plugin;
if (plugin)
{
plugin->languageChange();
541,10 → 541,10
// Scan the plugin map for plugins...
QStringList names;
for (PluginMap::ConstIterator it = pluginMap.constBegin(); it != pluginMap.constEnd(); ++it)
if (includeDisabled || it.data().enabled)
if (includeDisabled || it.value().enabled)
// Only including plugins that inherit a named parent (if
// specified), using the QMetaObject system.
if (!inherits || it.data().plugin->inherits(inherits))
names.append(it.data().pluginName);
if (!inherits || it.value().plugin->inherits(inherits))
names.append(it.value().pluginName);
return names;
}
/trunk/Scribus/scribus/smtextstyles.cpp
996,7 → 996,7
{
for (it = doc_->scMW()->LangTransl.begin(); it != doc_->scMW()->LangTransl.end(); ++it)
{
if (it.data() == pwidget_->cpage->language_->currentText())
if (it.value() == pwidget_->cpage->language_->currentText())
{
language = it.key();
break;
1797,7 → 1797,7
{
for (it = doc_->scMW()->LangTransl.begin(); it != doc_->scMW()->LangTransl.end(); ++it)
{
if (it.data() == page_->language_->currentText())
if (it.value() == page_->language_->currentText())
{
language = it.key();
break;