Author: jghali
Date: Sun Nov 8 17:23:49 2020
New Revision: 24209
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24209
Log:
Code cleanups and warning fixes
Modified:
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp
trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp
trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddialog.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp
trunk/Scribus/scribus/text/textshaper.cpp
trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp
trunk/Scribus/scribus/ui/colorlistmodel.cpp
trunk/Scribus/scribus/ui/colorlistmodel.h
trunk/Scribus/scribus/ui/contentpalette.cpp
trunk/Scribus/scribus/ui/scdockpalette.cpp
trunk/Scribus/scribus/ui/scdockpalette.h
trunk/Scribus/scribus/ui/smstyleimport.cpp
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp Sun Nov
8 17:23:49 2020
@@ -314,14 +314,14 @@
bool ScImgDataLoader_WPG::loadPicture(const QString& fn, int /*page*/, int
/*res*/, bool /*thumbnail*/)
{
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << Qt::endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
- if ( !file.open( QIODevice::ReadOnly ) )
- {
- qDebug() << "Cannot open file " << QFile::encodeName(fn).data()
<< Qt::endl;
+ if (!file.open( QIODevice::ReadOnly))
+ {
+ qDebug() << "Cannot open file " << QFile::encodeName(fn).data();
return false;
}
QByteArray ba = file.readAll();
Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp
(original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/dialog.cpp Sun Nov
8 17:23:49 2020
@@ -26,7 +26,7 @@
#include "util.h"
ExportForm::ExportForm(QWidget* parent, ScribusDoc* doc, int size, int
quality, const QString& type)
- : QDialog(parent, nullptr), m_doc(doc),
m_PageCount(doc->DocPages.count())
+ : QDialog(parent, Qt::WindowFlags()), m_doc(doc),
m_PageCount(doc->DocPages.count())
{
setupUi(this);
setModal(true);
Modified: trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp Sun Nov 8
17:23:49 2020
@@ -323,10 +323,11 @@
{
importedColors.clear();
importedPatterns.clear();
+
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << Qt::endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
QFileInfo fi = QFileInfo(fn);
Modified: trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/importfh.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/fh/importfh.cpp Sun Nov 8
17:23:49 2020
@@ -323,12 +323,14 @@
{
importedColors.clear();
importedPatterns.clear();
+
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << Qt::endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
+
librevenge::RVNGFileStream input(QFile::encodeName(fn).data());
if (!libfreehand::FreeHandDocument::isSupported(&input))
{
Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp Sun Nov 8
17:23:49 2020
@@ -352,12 +352,14 @@
{
importedColors.clear();
importedPatterns.clear();
+
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
+
shared_ptr<librevenge::RVNGInputStream> input;
if
(librevenge::RVNGDirectoryStream::isDirectory(QFile::encodeName(fn).data()))
input.reset(new
librevenge::RVNGDirectoryStream(QFile::encodeName(fn).data()));
Modified: trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/importpm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pm/importpm.cpp Sun Nov 8
17:23:49 2020
@@ -319,12 +319,14 @@
{
importedColors.clear();
importedPatterns.clear();
+
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << Qt::endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
+
librevenge::RVNGFileStream input(QFile::encodeName(fn).data());
if (!libpagemaker::PMDocument::isSupported(&input))
{
Modified: trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/importpub.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pub/importpub.cpp Sun Nov 8
17:23:49 2020
@@ -322,12 +322,14 @@
{
importedColors.clear();
importedPatterns.clear();
+
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << Qt::endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
+
#if HAVE_REVENGE
librevenge::RVNGFileStream input(QFile::encodeName(fn).data());
#else
Modified: trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp Sun Nov 8
17:23:49 2020
@@ -330,12 +330,14 @@
{
importedColors.clear();
importedPatterns.clear();
+
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
+
librevenge::RVNGFileStream input(QFile::encodeName(fn).data());
libqxp::QXPDocument::Type type = libqxp::QXPDocument::TYPE_UNKNOWN;
if (!libqxp::QXPDocument::isSupported(&input, &type))
Modified: trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp Sun Nov 8
17:23:49 2020
@@ -325,13 +325,15 @@
bool VsdPlug::convert(const QString& fn)
{
importedColors.clear();
+
importedPatterns.clear();
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << Qt::endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
+
#if HAVE_REVENGE
librevenge::RVNGFileStream input(QFile::encodeName(fn).data());
#else
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Sun Nov 8
17:23:49 2020
@@ -375,17 +375,15 @@
bool WMFImport::loadWMF( const QString &fileName )
{
- QFile file( fileName );
-
- if ( !file.exists() )
- {
- cerr << "File " << QFile::encodeName(fileName).data() << " does
not exist" << endl;
+ QFile file(fileName);
+ if (!file.exists())
+ {
+ cerr << "File " << QFile::encodeName(fileName).data() << " does
not exist" << std::endl;
return false;
}
-
- if ( !file.open( QIODevice::ReadOnly ) )
- {
- cerr << "Cannot open file " <<
QFile::encodeName(fileName).data() << endl;
+ if (!file.open( QIODevice::ReadOnly))
+ {
+ cerr << "Cannot open file " <<
QFile::encodeName(fileName).data() << std::endl;
return false;
}
Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp Sun Nov 8
17:23:49 2020
@@ -677,14 +677,14 @@
importedColors.clear();
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << Qt::endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
- if ( !file.open( QIODevice::ReadOnly ) )
- {
- qDebug() << "Cannot open file " << QFile::encodeName(fn).data()
<< Qt::endl;
+ if (!file.open( QIODevice::ReadOnly))
+ {
+ qDebug() << "Cannot open file " << QFile::encodeName(fn).data();
return false;
}
QByteArray ba = file.readAll();
Modified: trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp Sun Nov 8
17:23:49 2020
@@ -330,12 +330,14 @@
{
importedColors.clear();
importedPatterns.clear();
+
QFile file(fn);
- if ( !file.exists() )
- {
- qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist" << endl;
+ if (!file.exists())
+ {
+ qDebug() << "File " << QFile::encodeName(fn).data() << " does
not exist";
return false;
}
+
librevenge::RVNGFileStream input(QFile::encodeName(fn).data());
if (!libzmf::ZMFDocument::isSupported(&input))
{
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp
(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdannotations.cpp Sun Nov
8 17:23:49 2020
@@ -618,7 +618,7 @@
PyObject *pagevalue = PyLong_FromLong((long)page);
PyDict_SetItem(rv, pagekey, pagevalue);
- QStringList qsl = action.split(" ", QString::SkipEmptyParts);
+ QStringList qsl = action.split(" ", Qt::SkipEmptyParts);
x = qsl[0].toInt();
const char x2[] = "x";
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp Sun Nov 8
17:23:49 2020
@@ -78,7 +78,7 @@
uint result;
QMessageBox::Icon ico = QMessageBox::NoIcon;
int butt[3] = { QMessageBox::Ok|QMessageBox::Default,
QMessageBox::NoButton, QMessageBox::NoButton };
- QMessageBox::StandardButtons buttons =
QMessageBox::StandardButtons(nullptr);
+ QMessageBox::StandardButtons buttons;
enum QMessageBox::StandardButton defaultButton = QMessageBox::NoButton;
char* kwargs[] = {const_cast<char*>("caption"),
const_cast<char*>("message"),
const_cast<char*>("icon"),
const_cast<char*>("button1"),
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp Sun Nov 8
17:23:49 2020
@@ -351,7 +351,6 @@
return nullptr;
}
- const ScLayer *layer = nullptr;
QString layerName = QString::fromUtf8(szLayerName);
if (!layerName.isEmpty())
{
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdstyle.cpp Sun Nov 8
17:23:49 2020
@@ -253,7 +253,7 @@
fillShade = qMax(0.0, qMin(fillShade, 1.0));
if (strokeShade >= 0)
strokeShade = qMax(0.0, qMin(strokeShade, 1.0));
- QStringList featuresList = QString(features).split(',',
QString::SkipEmptyParts);
+ QStringList featuresList = QString(features).split(',',
Qt::SkipEmptyParts);
QString qLanguage = QString(language);
CharStyle tmpCharStyle;
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddialog.cpp
(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddialog.cpp Sun Nov
8 17:23:49 2020
@@ -78,7 +78,7 @@
uint result;
QMessageBox::Icon ico = QMessageBox::NoIcon;
int butt[3] = { QMessageBox::Ok|QMessageBox::Default,
QMessageBox::NoButton, QMessageBox::NoButton };
- QMessageBox::StandardButtons buttons =
QMessageBox::StandardButtons(nullptr);
+ QMessageBox::StandardButtons buttons;
enum QMessageBox::StandardButton defaultButton = QMessageBox::NoButton;
char* kwargs[] = {const_cast<char*>("caption"),
const_cast<char*>("message"),
const_cast<char*>("icon"),
const_cast<char*>("button1"),
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp
(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp Sun Nov
8 17:23:49 2020
@@ -351,7 +351,6 @@
return nullptr;
}
- const ScLayer *layer = nullptr;
QString layerName = QString::fromUtf8(szLayerName);
if (!layerName.isEmpty())
{
Modified: trunk/Scribus/scribus/text/textshaper.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/text/textshaper.cpp
==============================================================================
--- trunk/Scribus/scribus/text/textshaper.cpp (original)
+++ trunk/Scribus/scribus/text/textshaper.cpp Sun Nov 8 17:23:49 2020
@@ -331,7 +331,7 @@
}
}
- for (auto textRun : qAsConst(textRuns))
+ for (const TextRun& textRun : qAsConst(textRuns))
{
const CharStyle &style =
m_story.charStyle(m_textMap.value(textRun.start));
Modified: trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp
==============================================================================
--- trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp (original)
+++ trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp Sun Nov 8
17:23:49 2020
@@ -102,7 +102,7 @@
Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
{
if (!index.isValid())
- return nullptr;
+ return Qt::ItemFlags();
return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
}
Modified: trunk/Scribus/scribus/ui/colorlistmodel.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/ui/colorlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.cpp (original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.cpp Sun Nov 8 17:23:49 2020
@@ -24,7 +24,7 @@
return *this;
}
-ColorPixmapValue::ColorPixmapValue( const ScColor& col, ScribusDoc* doc, const
QString& colName )
+ColorPixmapValue::ColorPixmapValue(const ScColor& col, ScribusDoc* doc, const
QString& colName)
{
m_doc = (doc) ? doc->guardedPtr() : nullptr;
m_color = col;
@@ -107,7 +107,7 @@
Qt::ItemFlags ColorListModel::flags(const QModelIndex &index) const
{
if (!index.isValid())
- return nullptr;
+ return Qt::ItemFlags();
Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
return flags;
Modified: trunk/Scribus/scribus/ui/colorlistmodel.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/ui/colorlistmodel.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.h (original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.h Sun Nov 8 17:23:49 2020
@@ -23,7 +23,7 @@
QString m_name;
ColorPixmapValue();
- ColorPixmapValue( const ScColor& col, ScribusDoc* doc, const QString&
colName );
+ ColorPixmapValue(const ScColor& col, ScribusDoc* doc, const QString&
colName);
ColorPixmapValue(const ColorPixmapValue& other);
ColorPixmapValue& operator= (const ColorPixmapValue& other);
};
Modified: trunk/Scribus/scribus/ui/contentpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/ui/contentpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contentpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/contentpalette.cpp Sun Nov 8 17:23:49 2020
@@ -26,7 +26,7 @@
#include "styles/charstyle.h"
ContentPalette::ContentPalette(QWidget* parent) :
- ScDockPalette(parent, "ContentPalette", nullptr)
+ ScDockPalette(parent, "ContentPalette", Qt::WindowFlags())
{
setObjectName(QString::fromLocal8Bit("ContentPalette"));
Modified: trunk/Scribus/scribus/ui/scdockpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp Sun Nov 8 17:23:49 2020
@@ -38,11 +38,11 @@
#include "scdockpalette.h"
#include "util.h"
-ScDockPalette::ScDockPalette( QWidget * parent, const QString& prefsContext,
Qt::WindowFlags f)
+ScDockPalette::ScDockPalette(QWidget * parent, const QString& prefsContext,
Qt::WindowFlags f)
#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
- : QDockWidget ( parent, f | Qt::Tool | Qt::CustomizeWindowHint |
Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint )
+ : QDockWidget(parent, f | Qt::Tool | Qt::CustomizeWindowHint |
Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint)
#else
- : QDockWidget ( parent, f | Qt::Tool | Qt::CustomizeWindowHint )
+ : QDockWidget(parent, f | Qt::Tool | Qt::CustomizeWindowHint)
#endif
{
if (PrefsManager::instance().appPrefs.uiPrefs.useSmallWidgets)
Modified: trunk/Scribus/scribus/ui/scdockpalette.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/ui/scdockpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.h (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.h Sun Nov 8 17:23:49 2020
@@ -40,7 +40,7 @@
Q_OBJECT
public:
- ScDockPalette( QWidget * parent = nullptr, const QString& prefsContext
= QString(), Qt::WindowFlags f = Qt::WindowFlags() );
+ ScDockPalette(QWidget * parent = nullptr, const QString& prefsContext =
QString(), Qt::WindowFlags f = Qt::WindowFlags());
~ScDockPalette() {}
/** @brief Sample way to grab keystrokes, simply calls superclass at
this point */
Modified: trunk/Scribus/scribus/ui/smstyleimport.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24209&path=/trunk/Scribus/scribus/ui/smstyleimport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smstyleimport.cpp (original)
+++ trunk/Scribus/scribus/ui/smstyleimport.cpp Sun Nov 8 17:23:49 2020
@@ -14,7 +14,7 @@
StyleSet<ParagraphStyle> *pstyleList,
StyleSet<CharStyle>
*cstyleList,
QHash<QString,
multiLine> *lstyleList)
- : QDialog( parent, nullptr )
+ : QDialog(parent, Qt::WindowFlags())
{
setupUi(this);
setModal(true);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
