r25100 by jghali - Code style fixes
scribus-commit
scribus-commit at lists.scribus.net
Sun Jun 5 17:26:10 UTC 2022
Author: jghali
Date: Sun Jun 5 17:26:09 2022
New Revision: 25100
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=25100
Log:
Code style fixes
Modified:
trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=25100&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Sun Jun 5 17:26:09 2022
@@ -1286,34 +1286,34 @@
return nullptr;
if (!checkHaveDocument())
return nullptr;
- PageItem *fromitem = GetUniqueItem(QString::fromUtf8(name1));
- if (fromitem == nullptr)
- return nullptr;
- PageItem *toitem = GetUniqueItem(QString::fromUtf8(name2));
- if (toitem == nullptr)
- return nullptr;
- if (!(fromitem->isTextFrame()) || !(toitem->isTextFrame()))
+ PageItem *fromItem = GetUniqueItem(QString::fromUtf8(name1));
+ if (fromItem == nullptr)
+ return nullptr;
+ PageItem *toItem = GetUniqueItem(QString::fromUtf8(name2));
+ if (toItem == nullptr)
+ return nullptr;
+ if (!(fromItem->isTextFrame()) || !(toItem->isTextFrame()))
{
PyErr_SetString(WrongFrameTypeError, QObject::tr("Can only link text frames.", "python error").toLocal8Bit().constData());
return nullptr;
}
- if (fromitem->nextInChain() != nullptr)
+ if (fromItem->nextInChain() != nullptr)
{
PyErr_SetString(ScribusException, QObject::tr("Source frame is linked to another frame.", "python error").toLocal8Bit().constData());
return nullptr;
}
- if (toitem->prevInChain() != nullptr)
+ if (toItem->prevInChain() != nullptr)
{
PyErr_SetString(ScribusException, QObject::tr("Target frame is linked to by another frame.", "python error").toLocal8Bit().constData());
return nullptr;
}
- if (toitem == fromitem)
+ if (toItem == fromItem)
{
PyErr_SetString(ScribusException, QObject::tr("Source and target are the same object.", "python error").toLocal8Bit().constData());
return nullptr;
}
// references to the others boxes
- fromitem->link(toitem);
+ fromItem->link(toItem);
ScCore->primaryMainWindow()->view->DrawNew();
// enable 'save icon' stuff
ScCore->primaryMainWindow()->slotDocCh();
More information about the scribus-commit
mailing list