Shutted down warnings.

preferencesAboutTextFull
Yimgo 12 years ago
parent cae2caecac
commit b94b86291e
  1. 38
      plugins/cffadaptor/src/UBCFFAdaptor.cpp
  2. 47
      src/adaptors/UBImportImage.cpp
  3. 2
      src/gui/UBMessagesDialog.h
  4. 2
      src/gui/UBRubberBand.cpp

@ -654,29 +654,25 @@ QDomElement UBCFFAdaptor::UBToCFFConverter::parseSvgPageSection(const QDomElemen
void UBCFFAdaptor::UBToCFFConverter::writeQDomElementToXML(const QDomNode &node) void UBCFFAdaptor::UBToCFFConverter::writeQDomElementToXML(const QDomNode &node)
{ {
if (!node.isNull()) if (!node.isNull()) {
if (node.isText()) if (node.isText())
{ mIWBContentWriter->writeCharacters(node.nodeValue());
mIWBContentWriter->writeCharacters(node.nodeValue()); else {
} mIWBContentWriter->writeStartElement(node.namespaceURI(), node.toElement().tagName());
else
{ for (int i = 0; i < node.toElement().attributes().count(); i++) {
mIWBContentWriter->writeStartElement(node.namespaceURI(), node.toElement().tagName()); QDomAttr attr = node.toElement().attributes().item(i).toAttr();
mIWBContentWriter->writeAttribute(attr.name(), attr.value());
}
QDomNode child = node.firstChild();
while(!child.isNull()) {
writeQDomElementToXML(child);
child = child.nextSibling();
}
for (int i = 0; i < node.toElement().attributes().count(); i++) mIWBContentWriter->writeEndElement();
{
QDomAttr attr = node.toElement().attributes().item(i).toAttr();
mIWBContentWriter->writeAttribute(attr.name(), attr.value());
} }
QDomNode child = node.firstChild(); }
while(!child.isNull())
{
writeQDomElementToXML(child);
child = child.nextSibling();
}
mIWBContentWriter->writeEndElement();
}
} }
bool UBCFFAdaptor::UBToCFFConverter::writeExtendedIwbSection() bool UBCFFAdaptor::UBToCFFConverter::writeExtendedIwbSection()

@ -74,31 +74,32 @@ QString UBImportImage::importFileFilter()
return filter; return filter;
} }
QList<UBGraphicsItem*> UBImportImage::import(const QUuid& uuid, const QString& filePath) QList<UBGraphicsItem*> UBImportImage::import(const QUuid& uuid, const QString& filePath)
{ {
QList<UBGraphicsItem*> result; Q_UNUSED(uuid);
QList<UBGraphicsItem*> result;
QPixmap pix(filePath);
if (pix.isNull()) QPixmap pix(filePath);
return result; if (pix.isNull())
return result;
UBGraphicsPixmapItem* pixmapItem = new UBGraphicsPixmapItem(); UBGraphicsPixmapItem* pixmapItem = new UBGraphicsPixmapItem();
pixmapItem->setPixmap(pix); pixmapItem->setPixmap(pix);
result << pixmapItem; result << pixmapItem;
return result; return result;
} }
void UBImportImage::placeImportedItemToScene(UBGraphicsScene* scene, UBGraphicsItem* item) void UBImportImage::placeImportedItemToScene(UBGraphicsScene* scene, UBGraphicsItem* item)
{ {
UBGraphicsPixmapItem* pixmapItem = (UBGraphicsPixmapItem*)item; UBGraphicsPixmapItem* pixmapItem = (UBGraphicsPixmapItem*)item;
UBGraphicsPixmapItem* sceneItem = scene->addPixmap(pixmapItem->pixmap(), NULL, QPointF(0, 0)); UBGraphicsPixmapItem* sceneItem = scene->addPixmap(pixmapItem->pixmap(), NULL, QPointF(0, 0));
scene->setAsBackgroundObject(sceneItem, true); scene->setAsBackgroundObject(sceneItem, true);
// Only stored pixmap, should be deleted now // Only stored pixmap, should be deleted now
delete pixmapItem; delete pixmapItem;
} }
const QString& UBImportImage::folderToCopy() const QString& UBImportImage::folderToCopy()
{ {
static QString f(""); static QString f("");

@ -34,4 +34,4 @@ private:
int mMessagesFontSize; int mMessagesFontSize;
}; };
#endif UB_MESSAGES_DIALOG_H_ #endif /* UB_MESSAGES_DIALOG_H_ */

@ -32,8 +32,8 @@
UBRubberBand::UBRubberBand(Shape s, QWidget * p) UBRubberBand::UBRubberBand(Shape s, QWidget * p)
: QRubberBand(s, p) : QRubberBand(s, p)
, mResizingMode(None) , mResizingMode(None)
, mMouseIsPressed(false)
, mResizingBorderHeight(20) , mResizingBorderHeight(20)
, mMouseIsPressed(false)
, mLastPressedPoint(QPoint()) , mLastPressedPoint(QPoint())
{ {
customStyle = NULL; customStyle = NULL;

Loading…
Cancel
Save