Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 21863 → Rev 21862

/branches/Version14x/Scribus/scribus/scrapbookpalette.cpp
184,7 → 184,6
QDir dd = QDir(dir);
dd.mkdir(QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName())));
}
QString baseDir = QDir::homePath();
QString source = "";
QString target = "";
bool first = true;
192,7 → 191,7
while(!DOC.isNull())
{
QDomElement pg = DOC.toElement();
if (pg.tagName() == "ITEM")
if(pg.tagName() == "ITEM")
{
if (first)
pg.setAttribute("ANNAME", fid.baseName());
208,7 → 207,7
source = QDir::cleanPath(QDir::toNativeSeparators(Pfile));
else
{
QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(baseDir+"/"+Pfile)));
QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(dir+"/"+Pfile)));
source = pfi2.absoluteFilePath();
}
QString target = QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
223,7 → 222,7
source = QDir::cleanPath(QDir::toNativeSeparators(Pfile2));
else
{
QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(baseDir+"/"+Pfile2)));
QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(dir+"/"+Pfile2)));
source = pfi2.absoluteFilePath();
}
QString target = QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
238,7 → 237,7
source = QDir::cleanPath(QDir::toNativeSeparators(Pfile3));
else
{
QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(baseDir+"/"+Pfile3)));
QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(dir+"/"+Pfile3)));
source = pfi2.absoluteFilePath();
}
QString target = QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));