Author: craig
Date: Mon Aug 27 19:13:21 2018
New Revision: 22652
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22652
Log:
clazy and clang fixes, part 20
Modified:
trunk/Scribus/scribus/canvasmode_create.cpp
trunk/Scribus/scribus/canvasmode_create.h
trunk/Scribus/scribus/canvasmode_eyedropper.cpp
trunk/Scribus/scribus/canvasmode_eyedropper.h
trunk/Scribus/scribus/colorblind.cpp
trunk/Scribus/scribus/exif.cpp
trunk/Scribus/scribus/exif.h
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
trunk/Scribus/scribus/loadsaveplugin.cpp
trunk/Scribus/scribus/loadsaveplugin.h
trunk/Scribus/scribus/pagesize.cpp
trunk/Scribus/scribus/pdflib.cpp
trunk/Scribus/scribus/pdflib.h
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/pdflib_core.h
trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h
trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.h
trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
trunk/Scribus/scribus/pslib.cpp
trunk/Scribus/scribus/pslib.h
trunk/Scribus/scribus/sccolor.cpp
trunk/Scribus/scribus/sccolor.h
trunk/Scribus/scribus/scimage.cpp
trunk/Scribus/scribus/scimage.h
trunk/Scribus/scribus/scpageoutput_ps2.cpp
trunk/Scribus/scribus/scpageoutput_ps2.h
trunk/Scribus/scribus/scpainter.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scslainforeader.cpp
trunk/Scribus/scribus/scslainforeader.h
trunk/Scribus/scribus/scstreamfilter.cpp
trunk/Scribus/scribus/scstreamfilter.h
trunk/Scribus/scribus/scstreamfilter_flate.cpp
trunk/Scribus/scribus/scstreamfilter_jpeg.cpp
trunk/Scribus/scribus/scstreamfilter_rc4.cpp
trunk/Scribus/scribus/text/boxes.cpp
trunk/Scribus/scribus/ui/collectforoutput_ui.cpp
trunk/Scribus/scribus/ui/effectsdialog.cpp
trunk/Scribus/scribus/ui/gtfiledialog.cpp
trunk/Scribus/scribus/ui/gtfiledialog.h
trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
trunk/Scribus/scribus/ui/propertywidget_advanced.h
trunk/Scribus/scribus/ui/propertywidget_distance.cpp
trunk/Scribus/scribus/ui/propertywidget_distance.h
trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
trunk/Scribus/scribus/ui/propertywidget_hyphenation.h
trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
trunk/Scribus/scribus/ui/propertywidget_optmargins.h
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
trunk/Scribus/scribus/ui/propertywidget_textcolor.h
trunk/Scribus/scribus/ui/propertywidgetbase.cpp
trunk/Scribus/scribus/ui/scmessagebox.cpp
trunk/Scribus/scribus/ui/scmessagebox.h
trunk/Scribus/scribus/ui/sctreewidget.cpp
trunk/Scribus/scribus/util.cpp
Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Mon Aug 27 19:13:21 2018
@@ -580,7 +580,7 @@
}
}
-PageItem* CreateMode::doCreateNewObject(void)
+PageItem* CreateMode::doCreateNewObject()
{
int z = -1;
double rot, len;
Modified: trunk/Scribus/scribus/canvasmode_create.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/canvasmode_create.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.h (original)
+++ trunk/Scribus/scribus/canvasmode_create.h Mon Aug 27 19:13:21 2018
@@ -57,7 +57,7 @@
void selectPage(QMouseEvent *m);
void SetupDrawNoResize(int nr);
- PageItem* doCreateNewObject(void);
+ PageItem* doCreateNewObject();
bool doOneClick(FPoint& startPoint, FPoint& endPoint);
// We do not use PageItem::ItemType and PageItem::FrameType here
Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp Mon Aug 27 19:13:21 2018
@@ -45,7 +45,7 @@
m_mouseGrabbed = false;
}
-void CanvasMode_EyeDropper::grabMouse(void)
+void CanvasMode_EyeDropper::grabMouse()
{
if (!m_mouseGrabbed)
{
@@ -54,7 +54,7 @@
}
}
-void CanvasMode_EyeDropper::releaseMouse(void)
+void CanvasMode_EyeDropper::releaseMouse()
{
if (m_mouseGrabbed)
{
Modified: trunk/Scribus/scribus/canvasmode_eyedropper.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/canvasmode_eyedropper.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.h (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.h Mon Aug 27 19:13:21 2018
@@ -50,8 +50,8 @@
bool m_mouseGrabbed;
ScribusMainWindow* m_ScMW;
- void grabMouse(void);
- void releaseMouse(void);
+ void grabMouse();
+ void releaseMouse();
};
Modified: trunk/Scribus/scribus/colorblind.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/colorblind.cpp
==============================================================================
--- trunk/Scribus/scribus/colorblind.cpp (original)
+++ trunk/Scribus/scribus/colorblind.cpp Mon Aug 27 19:13:21 2018
@@ -5,9 +5,8 @@
for which a new license (GPL+exception) is in place.
*/
#include "colorblind.h"
-//#include "colorblind.moc"
-
-#include <math.h>
+
+#include <cmath>
//#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ?
(low) : (x)))
Modified: trunk/Scribus/scribus/exif.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/exif.cpp
==============================================================================
--- trunk/Scribus/scribus/exif.cpp (original)
+++ trunk/Scribus/scribus/exif.cpp Mon Aug 27 19:13:21 2018
@@ -338,7 +338,7 @@
//--------------------------------------------------------------------------
// Discard read data.
//--------------------------------------------------------------------------
-void ExifData::DiscardData ( void )
+void ExifData::DiscardData()
{
// for ( int a=0; a < SectionsRead; a++ )
// free ( Sections[a].Data );
Modified: trunk/Scribus/scribus/exif.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/exif.h
==============================================================================
--- trunk/Scribus/scribus/exif.h (original)
+++ trunk/Scribus/scribus/exif.h Mon Aug 27 19:13:21 2018
@@ -85,7 +85,7 @@
int getch ( QFile &infile );
int ReadJpegSections ( QFile & infile, ReadMode_t ReadMode );
- void DiscardData ( void );
+ void DiscardData();
int Get16u ( void * Short );
int Get32s ( void * Long );
unsigned Get32u ( void * Long );
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp Mon Aug
27 19:13:21 2018
@@ -13,7 +13,7 @@
initSupportedFormatList();
}
-void ScImgDataLoader_GIMP::initSupportedFormatList(void)
+void ScImgDataLoader_GIMP::initSupportedFormatList()
{
m_supportedFormats.clear();
m_supportedFormats.append( "pat" );
Modified: trunk/Scribus/scribus/loadsaveplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/loadsaveplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.cpp (original)
+++ trunk/Scribus/scribus/loadsaveplugin.cpp Mon Aug 27 19:13:21 2018
@@ -502,7 +502,7 @@
return (plug && load) ? plug->loadPalette(fileName) : false;
}
-QString FileFormat::lastSavedFile(void) const
+QString FileFormat::lastSavedFile() const
{
if (plug)
return plug->lastSavedFile();
Modified: trunk/Scribus/scribus/loadsaveplugin.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/loadsaveplugin.h
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.h (original)
+++ trunk/Scribus/scribus/loadsaveplugin.h Mon Aug 27 19:13:21 2018
@@ -204,7 +204,7 @@
bool savePalette(const QString & fileName) const;
QString saveElements(double xp, double yp, double wp, double
hp, Selection* selection, QByteArray &prevData) const;
// Get last saved file
- QString lastSavedFile(void) const;
+ QString lastSavedFile() const;
void setupTargets(ScribusDoc *targetDoc, ScribusView*
targetView, ScribusMainWindow* targetMW, QProgressBar* targetMWPRogressBar,
SCFonts* targetAvailableFonts) const;
void getReplacedFontData(bool & getNewReplacement,
QMap<QString,QString> &getReplacedFonts, QList<ScFace> &getDummyScFaces) const;
Modified: trunk/Scribus/scribus/pagesize.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/pagesize.cpp
==============================================================================
--- trunk/Scribus/scribus/pagesize.cpp (original)
+++ trunk/Scribus/scribus/pagesize.cpp Mon Aug 27 19:13:21 2018
@@ -97,7 +97,7 @@
}
}
-QStringList PageSize::sizeList(void) const
+QStringList PageSize::sizeList() const
{
QStringList pageSizes;
pageSizes.clear();
@@ -107,7 +107,7 @@
return QStringList(pageSizes);
}
-QStringList PageSize::sizeTRList(void) const
+QStringList PageSize::sizeTRList() const
{
QStringList pageSizes;
pageSizes.clear();
@@ -117,7 +117,7 @@
return QStringList(pageSizes);
}
-QStringList PageSize::activeSizeList(void) const
+QStringList PageSize::activeSizeList() const
{
QStringList pageSizes=sizeList();
if (PrefsManager::instance()->appPrefs.activePageSizes.count()==0)
@@ -132,7 +132,7 @@
return QStringList(activeSizes);
}
-QStringList PageSize::activeSizeTRList(void) const
+QStringList PageSize::activeSizeTRList() const
{
QStringList pageTRSizes=sizeTRList();
QStringList pageSizes=sizeList();
Modified: trunk/Scribus/scribus/pdflib.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/pdflib.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib.cpp (original)
+++ trunk/Scribus/scribus/pdflib.cpp Mon Aug 27 19:13:21 2018
@@ -19,12 +19,12 @@
return static_cast<PDFLibCore*>(m_impl)->doExport(fn, nam, Components,
pageNs, thumbs);
}
-const QString& PDFlib::errorMessage(void)
+const QString& PDFlib::errorMessage()
{
return static_cast<PDFLibCore*>(m_impl)->errorMessage();
}
-bool PDFlib::exportAborted(void)
+bool PDFlib::exportAborted()
{
return static_cast<PDFLibCore*>(m_impl)->exportAborted();
}
Modified: trunk/Scribus/scribus/pdflib.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/pdflib.h
==============================================================================
--- trunk/Scribus/scribus/pdflib.h (original)
+++ trunk/Scribus/scribus/pdflib.h Mon Aug 27 19:13:21 2018
@@ -57,11 +57,11 @@
/**
* Return an error message in case export has failed.
*/
- const QString& errorMessage(void);
+ const QString& errorMessage();
/**
* Return if export has been aborted
*/
- bool exportAborted(void);
+ bool exportAborted();
private:
/// A pointer to the real implementation of pdflib .
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Mon Aug 27 19:13:21 2018
@@ -2747,7 +2747,7 @@
sr = 0;
PutPage(FToStr(cr)+" "+FToStr(sr)+"
"+FToStr(-sr)+" "+FToStr(cr)+" 0 0 cm\n");
}
- PutPage(PDF_PutSoftShadow(ite,pag));
+ PutPage(PDF_PutSoftShadow(ite));
switch (ite->itemType())
{
case PageItem::ImageFrame:
@@ -4157,7 +4157,7 @@
return retString;
}
-QByteArray PDFLibCore::PDF_PutSoftShadow(PageItem* ite, const ScPage *pag)
+QByteArray PDFLibCore::PDF_PutSoftShadow(PageItem* ite)
{
if ((Options.Version < PDFOptions::PDFVersion_14 && Options.Version !=
PDFOptions::PDFVersion_X4) || !ite->hasSoftShadow() || ite->softShadowColor()
== CommonStrings::None || !ite->printEnabled())
return "";
@@ -4444,7 +4444,7 @@
sr = 0;
tmp += FToStr(cr)+" "+FToStr(sr)+" "+FToStr(-sr)+"
"+FToStr(cr)+" 0 0 cm\n";
}
- tmp += PDF_PutSoftShadow(ite,pag);
+ tmp += PDF_PutSoftShadow(ite);
switch (ite->itemType())
{
case PageItem::ImageFrame:
Modified: trunk/Scribus/scribus/pdflib_core.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/pdflib_core.h
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.h (original)
+++ trunk/Scribus/scribus/pdflib_core.h Mon Aug 27 19:13:21 2018
@@ -202,7 +202,7 @@
// QByteArray ComputeMD5(const QString& in);
// QByteArray ComputeRC4Key(PdfId ObjNum);
- QByteArray PDF_PutSoftShadow(PageItem* ite, const ScPage* pag);
+ QByteArray PDF_PutSoftShadow(PageItem* ite);
bool PDF_ProcessItem(QByteArray& output, PageItem* ite, const
ScPage* pag, uint PNr, bool embedded = false, bool pattern = false);
void PDF_Bookmark(PageItem *currItem, double ypos);
bool PDF_HatchFill(QByteArray& output, PageItem *currItem);
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp Mon Aug 27
19:13:21 2018
@@ -473,7 +473,7 @@
xmlSAXParseFile(sSAXHandler, fn.data(), 1);
}
-gtStyle* StyleReader::getDefaultStyle(void)
+gtStyle* StyleReader::getDefaultStyle()
{
gtStyle* defStyle = writer->getDefaultStyle();
StyleMap::Iterator it, itEnd = styles.end();
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h Mon Aug 27
19:13:21 2018
@@ -78,7 +78,7 @@
bool startElement(const QString&, const QString&, const QString &name,
const QXmlAttributes &attrs);
bool endElement(const QString&, const QString&, const QString &name);
void parse(const QString& fileName);
- gtStyle* getDefaultStyle(void);
+ gtStyle* getDefaultStyle();
gtStyle* getStyle(const QString& name);
void setStyle(const QString& name, gtStyle* style);
QString getFont(const QString& key);
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.cpp Mon Aug 27
19:13:21 2018
@@ -10,7 +10,7 @@
using namespace std;
-WMFGraphicsState::WMFGraphicsState(void)
+WMFGraphicsState::WMFGraphicsState()
: windowOrg(0.0, 0.0),
windowExt(1.0, 1.0),
viewportOrg(0.0, 0.0),
@@ -49,7 +49,7 @@
updateWorldMatrix();
}
-void WMFGraphicsState::updateWorldMatrix(void)
+void WMFGraphicsState::updateWorldMatrix()
{
double xscale = (windowExt.width() != 0.0) ? (viewportExt.width() /
windowExt.width()) : 1.0;
double yscale = (windowExt.height() != 0.0) ? (viewportExt.height() /
windowExt.height()) : 1.0;
@@ -58,12 +58,12 @@
worldMatrix = QTransform( xscale, 0.0, 0.0, yscale, dx, dy );
}
-WMFContext::WMFContext(void)
+WMFContext::WMFContext()
{
push( WMFGraphicsState() ) ;
}
-void WMFContext::save(void)
+void WMFContext::save()
{
if ( this->count() > 0 )
push( WMFGraphicsState(top()) );
@@ -73,7 +73,7 @@
}
}
-void WMFContext::restore(void)
+void WMFContext::restore()
{
if ( this->count() > 1 )
pop();
@@ -83,13 +83,13 @@
}
}
-void WMFContext::reset(void)
+void WMFContext::reset()
{
clear();
push( WMFGraphicsState() ) ;
}
-WMFGraphicsState& WMFContext::current(void)
+WMFGraphicsState& WMFContext::current()
{
if ( this->count() <= 0 )
push( WMFGraphicsState() ) ;
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.h (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfcontext.h Mon Aug 27
19:13:21 2018
@@ -26,7 +26,7 @@
QPointF viewportOrg;
QSizeF viewportExt;
- void updateWorldMatrix(void);
+ void updateWorldMatrix();
public:
QFont font;
@@ -44,7 +44,7 @@
QTransform worldMatrix;
public:
- WMFGraphicsState(void);
+ WMFGraphicsState();
void setWindowOrg(double x, double y);
void setWindowExt(double x, double y);
@@ -56,27 +56,27 @@
{
public:
- WMFContext(void);
+ WMFContext();
- void save(void);
- void restore(void);
- void reset(void);
+ void save();
+ void restore();
+ void reset();
- WMFGraphicsState& current(void);
+ WMFGraphicsState& current();
- QFont font(void) { return current().font; }
- QPoint position(void) { return current().position; }
- QPen pen(void) { return current().pen; }
- QBrush brush(void) { return current().brush; }
- QColor backgroundColor(void) { return current().backgroundColor; }
- Qt::BGMode backgroundMode(void) { return current().backgroundMode; }
- QColor textColor(void) { return current().textColor; }
- int textAlign(void) { return current().textAlign; }
- int textCharSet(void) { return current().textCharset; }
- double textRotation(void) { return current().textRotation; }
- bool windingFill(void) { return current().windingFill; }
- FPointArray& path (void) { return current().path; }
- QTransform& worldMatrix (void) { return current().worldMatrix; }
+ QFont font() { return current().font; }
+ QPoint position() { return current().position; }
+ QPen pen() { return current().pen; }
+ QBrush brush() { return current().brush; }
+ QColor backgroundColor() { return current().backgroundColor; }
+ Qt::BGMode backgroundMode() { return current().backgroundMode; }
+ QColor textColor() { return current().textColor; }
+ int textAlign() { return current().textAlign; }
+ int textCharSet() { return current().textCharset; }
+ double textRotation() { return current().textRotation; }
+ bool windingFill() { return current().windingFill; }
+ FPointArray& path () { return current().path; }
+ QTransform& worldMatrix () { return current().worldMatrix; }
void setFont (const QFont& font) { current().font = font; }
void setPosition (const QPoint& pos) { current().position = pos; }
void setPen (const QPen& pen) { current().pen = pen; }
Modified: trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/previewimage.cpp Mon Aug 27
19:13:21 2018
@@ -525,7 +525,7 @@
return ( Qt::ItemIsEnabled | Qt::ItemIsSelectable |
Qt::ItemIsDragEnabled );
//Qt modeltest requests 0 here
- return 0;
+ return Qt::NoItemFlags;
}
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp Mon Aug 27
19:13:21 2018
@@ -118,10 +118,10 @@
PyErr_SetString(PyExc_ValueError, QString("Cannot accept empty
name for pageitem").toLocal8Bit().constData());
return nullptr;
}
- for (int j = 0; j<ScCore->primaryMainWindow()->doc->Items->count(); j++)
- {
- if
(name==ScCore->primaryMainWindow()->doc->Items->at(j)->itemName())
- return ScCore->primaryMainWindow()->doc->Items->at(j);
+ for (int i = 0; i<ScCore->primaryMainWindow()->doc->Items->count(); i++)
+ {
+ if
(name==ScCore->primaryMainWindow()->doc->Items->at(i)->itemName())
+ return ScCore->primaryMainWindow()->doc->Items->at(i);
} // for items
PyErr_SetString(NoValidObjectError, QString("Object not
found").toLocal8Bit().constData());
return nullptr;
@@ -137,9 +137,9 @@
{
if (name.length() == 0)
return false;
- for (int j = 0; j<ScCore->primaryMainWindow()->doc->Items->count(); j++)
- {
- if
(name==ScCore->primaryMainWindow()->doc->Items->at(j)->itemName())
+ for (int i = 0; i<ScCore->primaryMainWindow()->doc->Items->count(); i++)
+ {
+ if
(name==ScCore->primaryMainWindow()->doc->Items->at(i)->itemName())
return true;
} // for items
return false;
Modified: trunk/Scribus/scribus/pslib.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Mon Aug 27 19:13:21 2018
@@ -557,7 +557,7 @@
return ret;
}
-bool PSLib::PS_begin_doc(ScribusDoc *doc, double x, double y, double width,
double height, int numpage, bool doDev, bool sep, bool farb)
+bool PSLib::PS_begin_doc(ScribusDoc *doc, double x, double y, double width,
double height, int numpage, bool sep, bool farb)
{
m_Doc = doc;
PutStream(Header);
@@ -1599,20 +1599,20 @@
int pgNum = pageNs[0]-1;
gx -= Doc->Pages->at(pgNum)->xOffset();
gy -= Doc->Pages->at(pgNum)->yOffset();
- errorOccured = !PS_begin_doc(Doc, gx, Doc->pageHeight() -
(gy+gh), gx + gw, Doc->pageHeight() - gy, 1*pagemult, false, sep, farb);
+ errorOccured = !PS_begin_doc(Doc, gx, Doc->pageHeight() -
(gy+gh), gx + gw, Doc->pageHeight() - gy, 1*pagemult, sep, farb);
}
else
{
- uint a;
+ int a;
double maxWidth = 0.0;
double maxHeight = 0.0;
- for (uint aa = 0; aa < pageNs.size(); ++aa)
- {
- a = pageNs[aa]-1;
+ for (int i = 0; i < pageNs.size(); ++i)
+ {
+ a = pageNs[i]-1;
maxWidth = qMax(Doc->Pages->at(a)->width(), maxWidth);
maxHeight = qMax(Doc->Pages->at(a)->height(),
maxHeight);
}
- errorOccured = !PS_begin_doc(Doc, 0.0, 0.0, maxWidth,
maxHeight, pageNs.size()*pagemult, doDev, sep, farb);
+ errorOccured = !PS_begin_doc(Doc, 0.0, 0.0, maxWidth,
maxHeight, pageNs.size()*pagemult, sep, farb);
}
int ap=0;
for (; ap < Doc->MasterPages.count() && !abortExport && !errorOccured;
++ap)
Modified: trunk/Scribus/scribus/pslib.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/pslib.h
==============================================================================
--- trunk/Scribus/scribus/pslib.h (original)
+++ trunk/Scribus/scribus/pslib.h Mon Aug 27 19:13:21 2018
@@ -72,17 +72,17 @@
void setOptimization (Optimization opt) { optimization = opt; }
virtual int CreatePS(ScribusDoc* Doc, PrintOptions &options);
- virtual const QString& errorMessage(void);
+ virtual const QString& errorMessage();
virtual void PS_Error(const QString& message);
- virtual void PS_Error_ImageDataWriteFailure(void);
+ virtual void PS_Error_ImageDataWriteFailure();
virtual void PS_Error_ImageLoadFailure(const QString& fileName);
virtual void PS_Error_MaskLoadFailure(const QString& fileName);
- virtual void PS_Error_InsufficientMemory(void);
+ virtual void PS_Error_InsufficientMemory();
virtual bool PS_set_file(const QString& fn);
virtual void PS_set_Info(const QString& art, const QString&
was);
- virtual bool PS_begin_doc(ScribusDoc *doc, double x, double y,
double width, double height, int numpage, bool doDev, bool sep, bool farb);
+ virtual bool PS_begin_doc(ScribusDoc *doc, double x, double y,
double width, double height, int numpage, bool sep, bool farb);
virtual void PS_begin_page(ScPage* pg, MarginStruct* Ma, bool
Clipping);
virtual void PS_end_page();
virtual void PS_curve(double x1, double y1, double x2, double
y2, double x3, double y3);
Modified: trunk/Scribus/scribus/sccolor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/sccolor.cpp
==============================================================================
--- trunk/Scribus/scribus/sccolor.cpp (original)
+++ trunk/Scribus/scribus/sccolor.cpp Mon Aug 27 19:13:21 2018
@@ -21,7 +21,7 @@
* *
***************************************************************************/
-#include <assert.h>
+#include <cassert>
#include "commonstrings.h"
#include "sccolor.h"
@@ -381,22 +381,22 @@
return name;
}
-void ScColor::setNamedColor(QString name)
+void ScColor::setNamedColor(QString colorName)
{
bool ok;
- if (name.length () == 9)
- {
- int c = name.midRef(1,2).toInt(&ok, 16);
- int m = name.midRef(3,2).toInt(&ok, 16);
- int y = name.midRef(5,2).toInt(&ok, 16);
- int k = name.midRef(7,2).toInt(&ok, 16);
+ if (colorName.length () == 9)
+ {
+ int c = colorName.midRef(1,2).toInt(&ok, 16);
+ int m = colorName.midRef(3,2).toInt(&ok, 16);
+ int y = colorName.midRef(5,2).toInt(&ok, 16);
+ int k = colorName.midRef(7,2).toInt(&ok, 16);
setColor(c, m, y, k);
}
- else if (name.length () == 7)
- {
- int r = name.midRef(1,2).toInt(&ok, 16);
- int g = name.midRef(3,2).toInt(&ok, 16);
- int b = name.midRef(5,2).toInt(&ok, 16);
+ else if (colorName.length () == 7)
+ {
+ int r = colorName.midRef(1,2).toInt(&ok, 16);
+ int g = colorName.midRef(3,2).toInt(&ok, 16);
+ int b = colorName.midRef(5,2).toInt(&ok, 16);
setRgbColor(r, g, b);
}
}
@@ -464,19 +464,19 @@
addColors(colorList, overwrite);
}
-ScribusDoc* ColorList::document(void) const
+ScribusDoc* ColorList::document() const
{
return m_doc;
}
-void ColorList::ensureDefaultColors(void)
+void ColorList::ensureDefaultColors()
{
ensureBlack();
ensureWhite();
ensureRegistration();
}
-void ColorList::ensureBlack(void)
+void ColorList::ensureBlack()
{
bool addBlack = true;
ColorList::Iterator itb = find("Black");
@@ -496,7 +496,7 @@
insert("Black", ScColor(0, 0, 0, 255));
}
-void ColorList::ensureWhite(void)
+void ColorList::ensureWhite()
{
bool addWhite = true;
ColorList::Iterator itw = find("White");
@@ -516,7 +516,7 @@
insert("White", ScColor(0, 0, 0, 0));
}
-void ColorList::ensureRegistration(void)
+void ColorList::ensureRegistration()
{
ScColor cc = ScColor(255, 255, 255, 255);
cc.setRegistrationColor(true);
Modified: trunk/Scribus/scribus/sccolor.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/sccolor.h
==============================================================================
--- trunk/Scribus/scribus/sccolor.h (original)
+++ trunk/Scribus/scribus/sccolor.h Mon Aug 27 19:13:21 2018
@@ -134,7 +134,7 @@
QString nameCMYK(const ScribusDoc* doc = nullptr) const;
/** \brief Sets the Values of a color from an Hex-String in the Form
#CCMMYYKK or #RRGGBB */
- void setNamedColor(QString nam);
+ void setNamedColor(QString colorName);
/** \brief If the color is a process color (ie neither spot, nor
registration) */
bool isProcessColor() const;
@@ -173,13 +173,13 @@
bool m_retainDoc;
/** \brief Ensure availability of black color. */
- void ensureBlack(void);
+ void ensureBlack();
/** \brief Ensure availability of white color. */
- void ensureWhite(void);
+ void ensureWhite();
/** \brief Ensure availability of registration color. */
- void ensureRegistration(void);
+ void ensureRegistration();
public:
ColorList(ScribusDoc* doc = nullptr, bool retainDoc = false);
Modified: trunk/Scribus/scribus/scimage.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp (original)
+++ trunk/Scribus/scribus/scimage.cpp Mon Aug 27 19:13:21 2018
@@ -9,7 +9,7 @@
#include <cmath>
#include <cstdlib>
#include <memory>
-#include <setjmp.h>
+#include <csetjmp>
#include <QByteArray>
#include <QFile>
@@ -1251,7 +1251,7 @@
return imgArray;
}
-void ScImage::convertToGray(void)
+void ScImage::convertToGray()
{
int k;
int h = height();
Modified: trunk/Scribus/scribus/scimage.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scimage.h
==============================================================================
--- trunk/Scribus/scribus/scimage.h (original)
+++ trunk/Scribus/scribus/scimage.h Mon Aug 27 19:13:21 2018
@@ -81,7 +81,7 @@
// Routines for PDF/PS output of images
QByteArray ImageToArray() const;
- void convertToGray(void);
+ void convertToGray();
bool writeRGBDataToFilter(ScStreamFilter* filter) const;
bool writeGrayDataToFilter(ScStreamFilter* filter, bool precal) const;
Modified: trunk/Scribus/scribus/scpageoutput_ps2.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scpageoutput_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput_ps2.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput_ps2.cpp Mon Aug 27 19:13:21 2018
@@ -36,7 +36,7 @@
m_stream.setDevice(m_device);
}
-void ScPageOutput_Ps2::begin(void)
+void ScPageOutput_Ps2::begin()
{
m_stream << QString("%%Page: %1
%2\n").arg(m_pageIndex).arg(m_pageIndex);
m_stream << QString("/saveobj save def \n");
@@ -71,7 +71,7 @@
ScPageOutput::drawPage(page, &painter);
}
-void ScPageOutput_Ps2::end(void)
+void ScPageOutput_Ps2::end()
{
m_stream << "%%PageTrailer\n";
m_stream << "saveobj restore\n";
Modified: trunk/Scribus/scribus/scpageoutput_ps2.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scpageoutput_ps2.h
==============================================================================
--- trunk/Scribus/scribus/scpageoutput_ps2.h (original)
+++ trunk/Scribus/scribus/scpageoutput_ps2.h Mon Aug 27 19:13:21 2018
@@ -25,9 +25,9 @@
ScPageOutput_Ps2(QIODevice* dev, ScribusDoc* doc, int pageIndex,
ScPs2OutputParams& options);
virtual ~ScPageOutput_Ps2();
- virtual void begin(void);
+ virtual void begin();
virtual void drawPage(ScPage* page);
- virtual void end(void);
+ virtual void end();
const QRect clip(void);
void setClip(const QRect& rect) { m_clip = rect; }
Modified: trunk/Scribus/scribus/scpainter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp (original)
+++ trunk/Scribus/scribus/scpainter.cpp Mon Aug 27 19:13:21 2018
@@ -19,7 +19,7 @@
#include "text/textshaper.h"
#include "text/glyphcluster.h"
-#include <math.h>
+#include <cmath>
#include <QDebug>
ScPainter::ScPainter( QImage *target, int w, int h, double transparency, int
blendmode )
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Mon Aug 27 19:13:21 2018
@@ -90,7 +90,7 @@
#include <iostream>
#include <sstream>
-#include <signal.h>
+#include <csignal>
#include <string>
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Mon Aug 27 19:13:21 2018
@@ -139,14 +139,14 @@
return m_updateEnabled > 0;
}
- void beginUpdate(void)
+ void beginUpdate()
{
if (m_updateEnabled == 0)
m_docChangeNeeded = false;
++m_updateEnabled;
}
- void endUpdate(void)
+ void endUpdate()
{
--m_updateEnabled;
if (m_updateEnabled <= 0)
Modified: trunk/Scribus/scribus/scslainforeader.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scslainforeader.cpp
==============================================================================
--- trunk/Scribus/scribus/scslainforeader.cpp (original)
+++ trunk/Scribus/scribus/scslainforeader.cpp Mon Aug 27 19:13:21 2018
@@ -13,7 +13,7 @@
#include <QXmlStreamReader>
#include "qtiocompressor.h"
-void ScSlaInfoReader::resetFileInfos(void)
+void ScSlaInfoReader::resetFileInfos()
{
m_title.resize(0);
m_author.resize(0);
Modified: trunk/Scribus/scribus/scslainforeader.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scslainforeader.h
==============================================================================
--- trunk/Scribus/scribus/scslainforeader.h (original)
+++ trunk/Scribus/scribus/scslainforeader.h Mon Aug 27 19:13:21 2018
@@ -16,14 +16,14 @@
QString m_author;
QString m_format;
- void resetFileInfos(void);
+ void resetFileInfos();
public:
- ScSlaInfoReader(void) {};
+ ScSlaInfoReader() {};
- const QString& title(void) { return m_title; }
- const QString& author(void) { return m_author; }
- const QString& format(void) { return m_format; }
+ const QString& title() { return m_title; }
+ const QString& author() { return m_author; }
+ const QString& format() { return m_format; }
bool readInfos(const QString& fileName);
};
Modified: trunk/Scribus/scribus/scstreamfilter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scstreamfilter.cpp
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter.cpp (original)
+++ trunk/Scribus/scribus/scstreamfilter.cpp Mon Aug 27 19:13:21 2018
@@ -49,7 +49,7 @@
return writeData(data.constData(), data.size());
}
-bool ScStreamFilter::openFilter (void)
+bool ScStreamFilter::openFilter ()
{
m_writtenToStream = 0;
if (m_filterMode == FilterToFilter)
@@ -57,14 +57,14 @@
return true;
}
-bool ScStreamFilter::closeFilter(void)
+bool ScStreamFilter::closeFilter()
{
if (m_filterMode == FilterToFilter)
return m_filter->closeFilter();
return true;
}
-int ScStreamFilter::writtenToStream(void)
+int ScStreamFilter::writtenToStream()
{
if (m_filterMode == FilterToFilter)
return (m_writtenToStream + m_filter->writtenToStream());
Modified: trunk/Scribus/scribus/scstreamfilter.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scstreamfilter.h
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter.h (original)
+++ trunk/Scribus/scribus/scstreamfilter.h Mon Aug 27 19:13:21 2018
@@ -34,13 +34,13 @@
ScStreamFilter(ScStreamFilter* filter);
virtual ~ScStreamFilter() {};
- virtual bool openFilter (void);
- virtual bool closeFilter(void);
+ virtual bool openFilter();
+ virtual bool closeFilter();
virtual bool writeData(const QByteArray& data);
virtual bool writeData(const char* data, int dataLen) = 0;
- int writtenToStream(void);
+ int writtenToStream();
};
class ScNullEncodeFilter : public ScStreamFilter
Modified: trunk/Scribus/scribus/scstreamfilter_flate.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scstreamfilter_flate.cpp
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter_flate.cpp (original)
+++ trunk/Scribus/scribus/scstreamfilter_flate.cpp Mon Aug 27 19:13:21 2018
@@ -9,7 +9,7 @@
#include "scstreamfilter_flate.h"
-#include <stdlib.h>
+#include <cstdlib>
#include <zlib.h>
#include <QDataStream>
Modified: trunk/Scribus/scribus/scstreamfilter_jpeg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scstreamfilter_jpeg.cpp
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter_jpeg.cpp (original)
+++ trunk/Scribus/scribus/scstreamfilter_jpeg.cpp Mon Aug 27 19:13:21 2018
@@ -9,9 +9,9 @@
#include "scstreamfilter_jpeg.h"
#include <cstdlib>
-#include <setjmp.h>
-#include <stdio.h>
-#include <string.h>
+#include <csetjmp>
+#include <cstdio>
+#include <cstring>
extern "C"
{
Modified: trunk/Scribus/scribus/scstreamfilter_rc4.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/scstreamfilter_rc4.cpp
==============================================================================
--- trunk/Scribus/scribus/scstreamfilter_rc4.cpp (original)
+++ trunk/Scribus/scribus/scstreamfilter_rc4.cpp Mon Aug 27 19:13:21 2018
@@ -7,7 +7,7 @@
#include "scstreamfilter_rc4.h"
-#include <stdlib.h>
+#include <cstdlib>
#include "rc4.h"
#define BUFFER_SIZE 16384
Modified: trunk/Scribus/scribus/text/boxes.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/text/boxes.cpp
==============================================================================
--- trunk/Scribus/scribus/text/boxes.cpp (original)
+++ trunk/Scribus/scribus/text/boxes.cpp Mon Aug 27 19:13:21 2018
@@ -5,7 +5,7 @@
for which a new license (GPL+exception) is in place.
*/
-#include <math.h>
+#include <cmath>
#include "pageitem.h"
#include "boxes.h"
Modified: trunk/Scribus/scribus/ui/collectforoutput_ui.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/collectforoutput_ui.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/collectforoutput_ui.cpp (original)
+++ trunk/Scribus/scribus/ui/collectforoutput_ui.cpp Mon Aug 27 19:13:21 2018
@@ -23,7 +23,7 @@
CollectForOutput(doc, outputDirectory, withFonts, withProfiles,
compressDoc)
{
uiCollect = true;
- progressDialog = 0;
+ progressDialog = nullptr;
connect(this, SIGNAL(fontsCollected(int)), this,
SLOT(collectedFonts(int)));
connect(this, SIGNAL(itemsCollected(int)), this,
SLOT(collectedItems(int)));
Modified: trunk/Scribus/scribus/ui/effectsdialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/effectsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/effectsdialog.cpp Mon Aug 27 19:13:21 2018
@@ -714,7 +714,7 @@
if (enable)
widget->item(itemNr)->setFlags(Qt::ItemIsSelectable |
Qt::ItemIsEnabled);
else
- widget->item(itemNr)->setFlags(0);
+ widget->item(itemNr)->setFlags(Qt::NoItemFlags);
}
void EffectsDialog::leaveOK()
Modified: trunk/Scribus/scribus/ui/gtfiledialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/gtfiledialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gtfiledialog.cpp (original)
+++ trunk/Scribus/scribus/ui/gtfiledialog.cpp Mon Aug 27 19:13:21 2018
@@ -83,7 +83,7 @@
accept();
}
-void gtFileDialog::loadSettings(void)
+void gtFileDialog::loadSettings()
{
PrefsContext* context =
PrefsManager::instance()->prefsFile->getContext("textimport_dialog");
if (context->contains("filter"))
@@ -119,7 +119,7 @@
}
}
-void gtFileDialog::saveSettings(void)
+void gtFileDialog::saveSettings()
{
PrefsContext* context =
PrefsManager::instance()->prefsFile->getContext("textimport_dialog");
context->set("filter" , fileWidget->selectedNameFilter());
Modified: trunk/Scribus/scribus/ui/gtfiledialog.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/gtfiledialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/gtfiledialog.h (original)
+++ trunk/Scribus/scribus/ui/gtfiledialog.h Mon Aug 27 19:13:21 2018
@@ -33,8 +33,8 @@
void okClicked();
protected:
- void loadSettings(void);
- void saveSettings(void);
+ void loadSettings();
+ void saveSettings();
};
#endif
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp Mon Aug 27
19:13:21 2018
@@ -142,7 +142,7 @@
disconnect(maxGlyphExtSpinBox , SIGNAL(valueChanged(double)), this,
SLOT(handleMaxGlyphExtension()) );
}
-void PropertyWidget_Advanced::configureWidgets(void)
+void PropertyWidget_Advanced::configureWidgets()
{
bool enabled = false;
if (m_item && m_doc)
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.h Mon Aug 27 19:13:21 2018
@@ -35,7 +35,7 @@
PageItem* m_item;
ScribusMainWindow* m_ScMW;
- void configureWidgets(void);
+ void configureWidgets();
void setCurrentItem(PageItem *i);
virtual void changeEvent(QEvent *e);
Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp Mon Aug 27
19:13:21 2018
@@ -185,7 +185,7 @@
disconnect(verticalAlign , SIGNAL(activated(int)) , this,
SLOT(handleVAlign()));
}
-void PropertyWidget_Distance::configureWidgets(void)
+void PropertyWidget_Distance::configureWidgets()
{
bool enabled = false;
if (m_item && m_doc)
Modified: trunk/Scribus/scribus/ui/propertywidget_distance.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_distance.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.h Mon Aug 27 19:13:21 2018
@@ -33,7 +33,7 @@
double m_unitRatio;
int m_unitIndex;
- void configureWidgets(void);
+ void configureWidgets();
void setCurrentItem(PageItem *item);
virtual void changeEvent(QEvent *e);
Modified: trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp Mon Aug 27
19:13:21 2018
@@ -163,7 +163,7 @@
disconnect(hyphenCharLineEdit, SIGNAL(textChanged(const
QString&)), this, SLOT(handleHyphenChar(const QString&)));
}
-void PropertyWidget_Hyphenation::configureWidgets(void)
+void PropertyWidget_Hyphenation::configureWidgets()
{
bool enabled = false;
if (m_item && m_doc)
Modified: trunk/Scribus/scribus/ui/propertywidget_hyphenation.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_hyphenation.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_hyphenation.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_hyphenation.h Mon Aug 27
19:13:21 2018
@@ -30,7 +30,7 @@
PageItem* m_item;
ScribusMainWindow* m_ScMW;
- void configureWidgets(void);
+ void configureWidgets();
void setCurrentItem(PageItem *item);
virtual void changeEvent(QEvent *e);
Modified: trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp Mon Aug 27
19:13:21 2018
@@ -112,7 +112,7 @@
disconnect(optMarginResetButton, SIGNAL(clicked()), this,
SLOT(resetOpticalMargins()) );
}
-void PropertyWidget_OptMargins::configureWidgets(void)
+void PropertyWidget_OptMargins::configureWidgets()
{
bool enabled = false;
if (m_item && m_doc)
Modified: trunk/Scribus/scribus/ui/propertywidget_optmargins.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_optmargins.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmargins.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmargins.h Mon Aug 27
19:13:21 2018
@@ -33,7 +33,7 @@
void connectSignals();
void disconnectSignals();
- void configureWidgets(void);
+ void configureWidgets();
void setCurrentItem(PageItem *item);
virtual void changeEvent(QEvent *e);
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Mon Aug 27
19:13:21 2018
@@ -332,7 +332,7 @@
disconnect(peCharStyleCombo, SIGNAL(newStyle(QString)), this,
SLOT(handlePECharStyle(QString)));
}
-void PropertyWidget_ParEffect::configureWidgets(void)
+void PropertyWidget_ParEffect::configureWidgets()
{
bool enabled = false;
if (m_item && m_doc)
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp Mon Aug 27
19:13:21 2018
@@ -157,7 +157,7 @@
disconnect(textEffects->StrikeVal->LWidth ,
SIGNAL(valueChanged(double)), this, SLOT(handleStrikeThru()));
}
-void PropertyWidget_TextColor::configureWidgets(void)
+void PropertyWidget_TextColor::configureWidgets()
{
bool enabled = false;
if (m_item && m_doc)
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.h Mon Aug 27 19:13:21 2018
@@ -33,7 +33,7 @@
void connectSignals();
void disconnectSignals();
- void configureWidgets(void);
+ void configureWidgets();
virtual void changeEvent(QEvent *e);
Modified: trunk/Scribus/scribus/ui/propertywidgetbase.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/propertywidgetbase.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidgetbase.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidgetbase.cpp Mon Aug 27 19:13:21 2018
@@ -17,26 +17,24 @@
PageItem* PropertyWidgetBase::currentItemFromSelection()
{
+ if (!m_doc)
+ return nullptr;
+
PageItem *currentItem = nullptr;
- if (m_doc)
+ if (m_doc->m_Selection->count() > 1)
{
- if (m_doc->m_Selection->count() > 1)
- {
- /*uint lowestItem = 999999;
+ /*uint lowestItem = 999999;
for (int a=0; a<m_doc->m_Selection->count(); ++a)
{
currentItem = m_doc->m_Selection->itemAt(a);
lowestItem = qMin(lowestItem,
currentItem->ItemNr);
}
currentItem = m_doc->Items->at(lowestItem);*/
- currentItem = m_doc->m_Selection->itemAt(0);
- }
- else if (m_doc->m_Selection->count() == 1)
- {
- currentItem = m_doc->m_Selection->itemAt(0);
- }
+ currentItem = m_doc->m_Selection->itemAt(0);
}
+ else if (m_doc->m_Selection->count() == 1)
+ currentItem = m_doc->m_Selection->itemAt(0);
return currentItem;
}
Modified: trunk/Scribus/scribus/ui/scmessagebox.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/scmessagebox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scmessagebox.cpp (original)
+++ trunk/Scribus/scribus/ui/scmessagebox.cpp Mon Aug 27 19:13:21 2018
@@ -30,7 +30,7 @@
#include "scribuscore.h"
#include "ui/scmessagebox.h"
-void ScMessageBox::initScMessageBox(void)
+void ScMessageBox::initScMessageBox()
{
messageTitle = "";
defaultBatchPushButton = nullptr;
Modified: trunk/Scribus/scribus/ui/scmessagebox.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/scmessagebox.h
==============================================================================
--- trunk/Scribus/scribus/ui/scmessagebox.h (original)
+++ trunk/Scribus/scribus/ui/scmessagebox.h Mon Aug 27 19:13:21 2018
@@ -76,7 +76,7 @@
StandardButton defaultBatchStandardButton;
// Initialize private variables
- void initScMessageBox(void);
+ void initScMessageBox();
// Find the appropriate default button
static QMessageBox::StandardButton
findDefaultButton(QMessageBox::StandardButtons buttons,
QMessageBox::StandardButton defaultButton, StandardButton defaultBatchButton);
Modified: trunk/Scribus/scribus/ui/sctreewidget.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/ui/sctreewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/sctreewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/sctreewidget.cpp Mon Aug 27 19:13:21 2018
@@ -175,7 +175,7 @@
if (enable)
topLevelItem(index)->setFlags(Qt::ItemIsEnabled);
else
- topLevelItem(index)->setFlags(0);
+ topLevelItem(index)->setFlags(Qt::NoItemFlags);
QTreeWidgetItem *child = topLevelItem(index)->child(0);
if (child != nullptr)
itemWidget(child, 0)->setEnabled(enable);
Modified: trunk/Scribus/scribus/util.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22652&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp (original)
+++ trunk/Scribus/scribus/util.cpp Mon Aug 27 19:13:21 2018
@@ -38,7 +38,7 @@
#include "scpainter.h"
#include "ui/scmessagebox.h"
-#include <signal.h>
+#include <csignal>
#if !defined(_WIN32) && !defined(Q_OS_MAC)
#include <execinfo.h>
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
