r24148 by craig - Fix some compiler warnings
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 1 15:18:16 UTC 2020
Author: craig
Date: Sun Nov 1 15:18:16 2020
New Revision: 24148
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24148
Log:
Fix some compiler warnings
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/scpreview.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/ui/nodeeditpalette.h
trunk/Scribus/scribus/ui/pageselector.cpp
trunk/Scribus/scribus/undogui.h
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sun Nov 1 15:18:16 2020
@@ -10392,7 +10392,7 @@
void PageItem::setInlineData(const QString& data)
{
QByteArray inlineImageData;
- inlineImageData.append(data);
+ inlineImageData.append(data.toUtf8());
if (inlineImageData.size() > 0)
{
QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + "/scribus_temp_XXXXXX." + inlineExt);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Sun Nov 1 15:18:16 2020
@@ -2610,7 +2610,7 @@
bool inlineF = attrs.valueAsBool("isInlineImage", false);
QString dat = attrs.valueAsString("ImageData", "");
QByteArray inlineImageData;
- inlineImageData.append(dat);
+ inlineImageData.append(dat.toUtf8());
QString inlineImageExt = attrs.valueAsString("inlineImageExt", "");
if (inlineF)
{
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Sun Nov 1 15:18:16 2020
@@ -5023,7 +5023,7 @@
bool inlineF = attrs.valueAsBool("isInlineImage", false);
QString dat = attrs.valueAsString("ImageData", "");
QByteArray inlineImageData;
- inlineImageData.append(dat);
+ inlineImageData.append(dat.toUtf8());
QString inlineImageExt = attrs.valueAsString("inlineImageExt", "");
if (inlineF)
{
Modified: trunk/Scribus/scribus/scpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/scpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/scpreview.cpp (original)
+++ trunk/Scribus/scribus/scpreview.cpp Sun Nov 1 15:18:16 2020
@@ -32,7 +32,7 @@
{
QString dat = elem.attribute("previewData", "");
QByteArray inlineImageData;
- inlineImageData.append(dat);
+ inlineImageData.append(dat.toUtf8());
inlineImageData = QByteArray::fromBase64(inlineImageData);
QImage tmp;
tmp.loadFromData(inlineImageData);
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Nov 1 15:18:16 2020
@@ -589,11 +589,11 @@
{
QString downArrow(IconManager::instance().pathForIcon("16/go-down.png"));
QByteArray da;
- da.append(downArrow);
+ da.append(downArrow.toUtf8());
stylesheet.replace("___downArrow___", da);
QString toolbararrow(IconManager::instance().pathForIcon("stylesheet/down_arrow.png"));
QByteArray tba;
- tba.append(toolbararrow);
+ tba.append(toolbararrow.toUtf8());
stylesheet.replace("___tb_menu_arrow___", tba);
}
Modified: trunk/Scribus/scribus/ui/nodeeditpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/ui/nodeeditpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.h (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.h Sun Nov 1 15:18:16 2020
@@ -127,7 +127,7 @@
void ResetToEditDefaults();
protected slots:
- virtual void reject();
+ void reject() override;
protected:
void connectSignals();
Modified: trunk/Scribus/scribus/ui/pageselector.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/ui/pageselector.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pageselector.cpp (original)
+++ trunk/Scribus/scribus/ui/pageselector.cpp Sun Nov 1 15:18:16 2020
@@ -91,7 +91,7 @@
{
QString downArrow(IconManager::instance().pathForIcon("16/go-down.png"));
QByteArray da;
- da.append(downArrow);
+ da.append(downArrow.toUtf8());
stylesheet.replace("___downArrow___", da);
setStyleSheet(QString(stylesheet));
}
@@ -221,7 +221,7 @@
{
QString downArrow(IconManager::instance().pathForIcon("16/go-down.png"));
QByteArray da;
- da.append(downArrow);
+ da.append(downArrow.toUtf8());
stylesheet.replace("___downArrow___", da);
setStyleSheet(QString(stylesheet));
}
Modified: trunk/Scribus/scribus/undogui.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24148&path=/trunk/Scribus/scribus/undogui.h
==============================================================================
--- trunk/Scribus/scribus/undogui.h (original)
+++ trunk/Scribus/scribus/undogui.h Sun Nov 1 15:18:16 2020
@@ -171,7 +171,7 @@
virtual ~UndoWidget();
/** @brief Empties the undo stack for this widget. */
- void clear();
+ void clear() override;
/**
* @brief Update the scrActions
*/
@@ -193,14 +193,14 @@
* @param target Target of the undo action
* @param state State describing the action
*/
- void insertUndoItem(UndoObject* target, UndoState* state);
+ void insertUndoItem(UndoObject* target, UndoState* state) override;
/**
* @brief Insert a new redo item.
* @param target Target of the redo action
* @param state State describing the action
*/
- void insertRedoItem(UndoObject* target, UndoState* state);
+ void insertRedoItem(UndoObject* target, UndoState* state) override;
/**
* @brief Update undo stack representation with number of steps.
@@ -210,7 +210,7 @@
* representation.
* @param steps Number of steps to take
*/
- void updateUndo(int steps);
+ void updateUndo(int steps) override;
/**
* @brief Update redo stack representation with number of steps.
@@ -220,13 +220,13 @@
* representation.
* @param steps Number of steps to take
*/
- void updateRedo(int steps);
+ void updateRedo(int steps) override;
/** @brief Clear the redo action items. */
- void clearRedo();
+ void clearRedo() override;
/** @brief Remove the last (oldest) item from the undo stack representation. */
- void popBack();
+ void popBack() override;
signals:
/**
@@ -276,7 +276,7 @@
~UndoPalette();
/** @brief Empties the undo stack for this widget. */
- void clear();
+ void clear() override;
/**
* @brief Update the scrActions
*/
@@ -370,14 +370,14 @@
* @param target Target of the undo action
* @param state State describing the action
*/
- void insertUndoItem(UndoObject* target, UndoState* state);
+ void insertUndoItem(UndoObject* target, UndoState* state) override;
/**
* @brief Insert a new redo item.
* @param target Target of the redo action
* @param state State describing the action
*/
- void insertRedoItem(UndoObject* target, UndoState* state);
+ void insertRedoItem(UndoObject* target, UndoState* state) override;
/**
* @brief Update undo stack representation with number of steps.
@@ -387,7 +387,7 @@
* representation.
* @param steps Number of steps to take
*/
- void updateUndo(int steps);
+ void updateUndo(int steps) override;
/**
* @brief Update redo stack representation with number of steps.
@@ -397,13 +397,13 @@
* representation.
* @param steps Number of steps to take
*/
- void updateRedo(int steps);
+ void updateRedo(int steps) override;
/** @brief Clear the redo action items. */
- void clearRedo();
+ void clearRedo() override;
/** @brief Remove the last (oldest) item from the undo stack representation. */
- void popBack();
+ void popBack() override;
/** @brief Receive prefsChanged() signal to update shortcuts. */
void updateFromPrefs();
More information about the scribus-commit
mailing list