Author: jghali
Date: Thu Sep 5 16:24:40 2019
New Revision: 23185
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23185
Log:
Remove lots of useless const qualifiers used with function arguments of basic
types
Modified:
trunk/Scribus/scribus/sclayer.cpp
trunk/Scribus/scribus/sclayer.h
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusdoc.h
Modified: trunk/Scribus/scribus/sclayer.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23185&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp (original)
+++ trunk/Scribus/scribus/sclayer.cpp Thu Sep 5 16:24:40 2019
@@ -143,7 +143,7 @@
}
}
-ScLayer* ScLayers::byLevel(const int level)
+ScLayer* ScLayers::byLevel(int level)
{
ScLayers::Iterator itend = end();
for (ScLayers::Iterator it = nullptr; it != itend; ++it)
@@ -154,7 +154,7 @@
return nullptr;
}
-ScLayer* ScLayers::byID(const int nr)
+ScLayer* ScLayers::byID(int nr)
{
ScLayers::Iterator itend = end();
for (ScLayers::Iterator it = nullptr; it != itend; ++it)
@@ -484,7 +484,7 @@
it->Level = level;
}
-bool ScLayers::layerPrintable(const int layerID) const
+bool ScLayers::layerPrintable(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -492,7 +492,7 @@
return false;
}
-bool ScLayers::setLayerPrintable(const int layerID, const bool isPrintable)
+bool ScLayers::setLayerPrintable(int layerID, bool isPrintable)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -503,7 +503,7 @@
return false;
}
-bool ScLayers::layerVisible(const int layerID) const
+bool ScLayers::layerVisible(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -511,7 +511,7 @@
return false;
}
-bool ScLayers::setLayerVisible(const int layerID, const bool isViewable)
+bool ScLayers::setLayerVisible(int layerID, bool isViewable)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -522,7 +522,7 @@
return false;
}
-bool ScLayers::layerLocked(const int layerID) const
+bool ScLayers::layerLocked(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -530,7 +530,7 @@
return false;
}
-bool ScLayers::setLayerLocked(const int layerID, const bool isLocked)
+bool ScLayers::setLayerLocked(int layerID, bool isLocked)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -541,7 +541,7 @@
return false;
}
-bool ScLayers::layerFlow(const int layerID) const
+bool ScLayers::layerFlow(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -549,7 +549,7 @@
return false;
}
-bool ScLayers::setLayerFlow(const int layerID, const bool flow)
+bool ScLayers::setLayerFlow(int layerID, bool flow)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -560,7 +560,7 @@
return false;
}
-bool ScLayers::layerOutline(const int layerID) const
+bool ScLayers::layerOutline(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -568,7 +568,7 @@
return false;
}
-bool ScLayers::setLayerOutline(const int layerID, const bool outline)
+bool ScLayers::setLayerOutline(int layerID, bool outline)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -579,7 +579,7 @@
return false;
}
-double ScLayers::layerTransparency(const int layerID) const
+double ScLayers::layerTransparency(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -587,7 +587,7 @@
return 1.0;
}
-bool ScLayers::setLayerTransparency(const int layerID, double trans)
+bool ScLayers::setLayerTransparency(int layerID, double trans)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -598,7 +598,7 @@
return false;
}
-int ScLayers::layerBlendMode(const int layerID) const
+int ScLayers::layerBlendMode(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -606,7 +606,7 @@
return 0;
}
-bool ScLayers::setLayerBlendMode(const int layerID, int blend)
+bool ScLayers::setLayerBlendMode(int layerID, int blend)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -617,7 +617,7 @@
return false;
}
-QColor ScLayers::layerMarker(const int layerID) const
+QColor ScLayers::layerMarker(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -625,7 +625,7 @@
return Qt::black;
}
-bool ScLayers::setLayerMarker(const int layerID, QColor color)
+bool ScLayers::setLayerMarker(int layerID, QColor color)
{
ScLayer* layer = byID(layerID);
if (layer)
@@ -636,7 +636,7 @@
return false;
}
-bool ScLayers::layerSelectable(const int layerID) const
+bool ScLayers::layerSelectable(int layerID) const
{
const ScLayer* layer = layerByID(layerID);
if (layer)
@@ -644,7 +644,7 @@
return false;
}
-bool ScLayers::setLayerSelectable(const int layerID, const bool isSelectable)
+bool ScLayers::setLayerSelectable(int layerID, bool isSelectable)
{
ScLayer* layer = byID(layerID);
if (layer)
Modified: trunk/Scribus/scribus/sclayer.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23185&path=/trunk/Scribus/scribus/sclayer.h
==============================================================================
--- trunk/Scribus/scribus/sclayer.h (original)
+++ trunk/Scribus/scribus/sclayer.h Thu Sep 5 16:24:40 2019
@@ -209,7 +209,7 @@
* @param layerID ID of the layer
* @return Printable or not
*/
- bool layerPrintable(const int layerID) const;
+ bool layerPrintable(int layerID) const;
/**
* @brief Set the layer printable via the layer ID
@@ -217,14 +217,14 @@
* @param isPrintable bool true = layer is prantable
* @return Success or failure
*/
- bool setLayerPrintable(const int layerID, const bool isPrintable);
+ bool setLayerPrintable(int layerID, bool isPrintable);
/**
* @brief Is the layer visible
* @param layerID ID of the layer
* @return Visible or not
*/
- bool layerVisible(const int layerID) const;
+ bool layerVisible(int layerID) const;
/**
* @brief Set the layer visible via the layer ID
@@ -232,14 +232,14 @@
* @param isViewable true = layer is visible
* @return Success or failure
*/
- bool setLayerVisible(const int layerID, const bool isViewable);
+ bool setLayerVisible(int layerID, bool isViewable);
/**
* @brief Is the layer locked
* @param layerID ID of the layer
* @return Locked or not
*/
- bool layerLocked(const int layerID) const;
+ bool layerLocked(int layerID) const;
/**
* @brief Set the layer locked via the layer ID
@@ -247,14 +247,14 @@
* @param isViewable true = layer is locked
* @return bool Success or failure
*/
- bool setLayerLocked(const int layerID, const bool isViewable);
+ bool setLayerLocked(int layerID, bool isViewable);
/**
* @brief does text flow around objects on this layer
* @param layerID ID of the layer
* @return flow or not
*/
- bool layerFlow(const int layerID) const;
+ bool layerFlow(int layerID) const;
/**
* @brief Set the layer flow via the layer ID
@@ -262,14 +262,14 @@
* @param flow true = Text flows around objects on this layer
* @return Success or failure
*/
- bool setLayerFlow(const int layerID, const bool flow);
+ bool setLayerFlow(int layerID, bool flow);
/**
* @brief is this layer in outline mode
* @param layerID ID of the layer
* @return outline or not
*/
- bool layerOutline(const int layerID) const;
+ bool layerOutline(int layerID) const;
/**
* @brief Set the layer outline mode via the layer ID
@@ -277,14 +277,14 @@
* @param outline true = layer is displayed in outlines only
* @return Success or failure
*/
- bool setLayerOutline(const int layerID, const bool outline);
+ bool setLayerOutline(int layerID, bool outline);
/**
* @brief returns the layer transparency
* @param layerID ID of the layer
* @return transparency value 0.0 - 1.0
*/
- double layerTransparency(const int layerID) const;
+ double layerTransparency(int layerID) const;
/**
* @brief Set the layer transparency via the layer ID
@@ -292,14 +292,14 @@
* @param trans transparency value 0.0 - 1.0
* @return Success or failure
*/
- bool setLayerTransparency(const int layerID, double trans);
+ bool setLayerTransparency(int layerID, double trans);
/**
* @brief returns the layer BlendMode
* @param layerID ID of the layer
* @return layerBlendMode
*/
- int layerBlendMode(const int layerID) const;
+ int layerBlendMode(int layerID) const;
/**
* @brief Set the layer layerBlendMode via the layer ID
@@ -307,14 +307,14 @@
* @param trans layerBlendMode
* @return Success or failure
*/
- bool setLayerBlendMode(const int layerID, int blend);
+ bool setLayerBlendMode(int layerID, int blend);
/**
* @brief returns the layer marker color
* @param layerID ID of the layer
* @return marker color
*/
- QColor layerMarker(const int layerID) const;
+ QColor layerMarker(int layerID) const;
/**
* @brief Set the layer marker color
@@ -322,14 +322,14 @@
* @param color color of the marker
* @return Success or failure
*/
- bool setLayerMarker(const int layerID, QColor color);
+ bool setLayerMarker(int layerID, QColor color);
/**
* @brief are objects on the layer selectable
* @param layerID ID of the layer
* @return Items selectable or not
*/
- bool layerSelectable(const int layerID) const;
+ bool layerSelectable(int layerID) const;
/**
* @brief Set objects on the layer selectable via the layer ID
@@ -337,7 +337,7 @@
* @param isSelectable true = layer objects are selectable
* @return bool Success or failure
*/
- bool setLayerSelectable(const int layerID, const bool isSelectable);
+ bool setLayerSelectable(int layerID, bool isSelectable);
};
uint qHash(const ScLayer& layer);
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23185&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Thu Sep 5 16:24:40 2019
@@ -681,7 +681,7 @@
return retList;
}
-void ScribusDoc::setup(const int unitIndex, const int fp, const int firstLeft,
const int orientation, const int firstPageNumber, const QString&
defaultPageSize, const QString& documentName)
+void ScribusDoc::setup(int unitIndex, int fp, int firstLeft, int orientation,
int firstPageNumber, const QString& defaultPageSize, const QString&
documentName)
{
m_docPrefsData.docSetupPrefs.docUnitIndex=unitIndex;
setPageSetFirstPage(fp, firstLeft);
@@ -760,7 +760,7 @@
}
-void ScribusDoc::setLoading(const bool docLoading)
+void ScribusDoc::setLoading(bool docLoading)
{
m_loading = docLoading;
}
@@ -1954,7 +1954,7 @@
Q_ASSERT(pos >= 0);
Q_ASSERT(currItem != nullptr);
Q_ASSERT(mrk != nullptr);
- currItem->itemText.removeChars(pos,1);
+ currItem->itemText.removeChars(pos, 1);
if (is->contains("strOLD"))
{
mrk->setString(is->get("strOLD"));
@@ -2089,7 +2089,7 @@
{
Q_ASSERT(currItem != nullptr);
Q_ASSERT(pos >= 0);
- currItem->itemText.removeChars(pos,1);
+ currItem->itemText.removeChars(pos, 1);
}
else if (is->get("MARK") == "delete")
{
@@ -2097,7 +2097,7 @@
{
Q_ASSERT(currItem != nullptr);
Q_ASSERT(pos >= 0);
-
currItem->itemText.removeChars(pos,1);
+
currItem->itemText.removeChars(pos, 1);
}
else
{
@@ -2281,7 +2281,7 @@
m_Selection->delaySignalsOff();
}
-void ScribusDoc::setModified(const bool isModified)
+void ScribusDoc::setModified(bool isModified)
{
if (m_modified != isModified)
{
@@ -2444,7 +2444,7 @@
}
-ScPage* ScribusDoc::addPage(const int pageIndex, const QString&
masterPageName, const bool addAutoFrame)
+ScPage* ScribusDoc::addPage(int pageIndex, const QString& masterPageName, bool
addAutoFrame)
{
assert(masterPageMode()==false);
ScPage* addedPage = new
ScPage(m_docPrefsData.displayPrefs.scratch.left(),
DocPages.count()*(m_docPrefsData.docSetupPrefs.pageHeight+m_docPrefsData.displayPrefs.scratch.bottom()+m_docPrefsData.displayPrefs.scratch.top())+m_docPrefsData.displayPrefs.scratch.top(),
m_docPrefsData.docSetupPrefs.pageWidth,
m_docPrefsData.docSetupPrefs.pageHeight);
@@ -2469,7 +2469,7 @@
}
-ScPage* ScribusDoc::addMasterPage(const int pageNumber, const QString&
pageName)
+ScPage* ScribusDoc::addMasterPage(int pageNumber, const QString& pageName)
{
ScPage* addedPage = new
ScPage(m_docPrefsData.displayPrefs.scratch.left(),
m_docPrefsData.displayPrefs.scratch.top(),
m_docPrefsData.docSetupPrefs.pageWidth,
m_docPrefsData.docSetupPrefs.pageHeight);
assert(addedPage!=nullptr);
@@ -2542,7 +2542,7 @@
}
-void ScribusDoc::deleteMasterPage(const int pageNumber)
+void ScribusDoc::deleteMasterPage(int pageNumber)
{
assert(masterPageMode());
assert( Pages->count() > 1 && Pages->count() > pageNumber );
@@ -2615,7 +2615,7 @@
}
-void ScribusDoc::deletePage(const int pageNumber)
+void ScribusDoc::deletePage(int pageNumber)
{
assert( Pages->count() > 1 && Pages->count() > pageNumber );
//#5561: If we are going to delete the first page, do not set the
current page to it
@@ -2626,7 +2626,7 @@
changed();
}
-void ScribusDoc::swapPage(const int a, const int b)
+void ScribusDoc::swapPage(int a, int b)
{
if (UndoManager::undoEnabled())
{
@@ -2652,7 +2652,7 @@
swapPage(a,b);
}
-void ScribusDoc::movePage(const int fromPage, const int toPage, const int
dest, const int position)
+void ScribusDoc::movePage(int fromPage, int toPage, int dest, int position)
{
QList<ScPage*> pageList;
int numPages = dest;
@@ -2736,7 +2736,7 @@
}
-int ScribusDoc::addAutomaticTextFrame(const int pageNumber)
+int ScribusDoc::addAutomaticTextFrame(int pageNumber)
{
if (!m_automaticTextFrames)
return -1;
@@ -2764,7 +2764,7 @@
}
-int ScribusDoc::addLayer(const QString& layerName, const bool activate)
+int ScribusDoc::addLayer(const QString& layerName, bool activate)
{
int lId = Layers.addLayer(layerName);
if (lId==-1)
@@ -2814,7 +2814,7 @@
}
-bool ScribusDoc::deleteLayer(const int layerID, const bool deleteItems)
+bool ScribusDoc::deleteLayer(int layerID, bool deleteItems)
{
if (Layers.count() < 2)
return false;
@@ -2866,7 +2866,7 @@
}
-bool ScribusDoc::setActiveLayer(const int layerToActivate)
+bool ScribusDoc::setActiveLayer(int layerToActivate)
{
const ScLayer* ll = Layers.layerByID(layerToActivate);
Q_ASSERT(ll);
@@ -2886,7 +2886,7 @@
}
-bool ScribusDoc::setLayerPrintable(const int layerID, const bool isPrintable)
+bool ScribusDoc::setLayerPrintable(int layerID, bool isPrintable)
{
bool found = false;
auto itend = Layers.end();
@@ -2913,7 +2913,7 @@
}
-bool ScribusDoc::layerPrintable(const int layerID) const
+bool ScribusDoc::layerPrintable(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -2925,7 +2925,7 @@
}
-bool ScribusDoc::setLayerVisible(const int layerID, const bool isViewable)
+bool ScribusDoc::setLayerVisible(int layerID, bool isViewable)
{
bool found = false;
auto itend = Layers.end();
@@ -2944,7 +2944,7 @@
}
-bool ScribusDoc::layerVisible(const int layerID) const
+bool ScribusDoc::layerVisible(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -2955,7 +2955,7 @@
return false;
}
-bool ScribusDoc::setLayerSelectable(const int layerID, const bool isSelectable)
+bool ScribusDoc::setLayerSelectable(int layerID, bool isSelectable)
{
bool found = false;
auto itend = Layers.end();
@@ -2974,7 +2974,7 @@
}
-bool ScribusDoc::layerSelectable(const int layerID) const
+bool ScribusDoc::layerSelectable(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -2986,7 +2986,7 @@
}
-bool ScribusDoc::setLayerLocked(const int layerID, const bool isLocked)
+bool ScribusDoc::setLayerLocked(int layerID, bool isLocked)
{
bool found = false;
auto itend = Layers.end();
@@ -3014,7 +3014,7 @@
}
-bool ScribusDoc::layerLocked(const int layerID) const
+bool ScribusDoc::layerLocked(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -3026,7 +3026,7 @@
}
-bool ScribusDoc::setLayerFlow(const int layerID, const bool flow)
+bool ScribusDoc::setLayerFlow(int layerID, bool flow)
{
bool found = false;
auto itend = Layers.end();
@@ -3062,7 +3062,7 @@
}
-bool ScribusDoc::layerFlow(const int layerID) const
+bool ScribusDoc::layerFlow(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -3074,7 +3074,7 @@
}
-bool ScribusDoc::setLayerTransparency(const int layerID, double trans)
+bool ScribusDoc::setLayerTransparency(int layerID, double trans)
{
bool found = false;
auto itend = Layers.end();
@@ -3102,7 +3102,7 @@
}
-double ScribusDoc::layerTransparency(const int layerID) const
+double ScribusDoc::layerTransparency(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -3114,7 +3114,7 @@
}
-bool ScribusDoc::setLayerBlendMode(const int layerID, int blend)
+bool ScribusDoc::setLayerBlendMode(int layerID, int blend)
{
bool found = false;
auto itend = Layers.end();
@@ -3142,7 +3142,7 @@
}
-int ScribusDoc::layerBlendMode(const int layerID) const
+int ScribusDoc::layerBlendMode(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -3154,7 +3154,7 @@
}
-bool ScribusDoc::setLayerOutline(const int layerID, const bool outline)
+bool ScribusDoc::setLayerOutline(int layerID, bool outline)
{
bool found = false;
auto itend = Layers.end();
@@ -3173,7 +3173,7 @@
}
-bool ScribusDoc::layerOutline(const int layerID) const
+bool ScribusDoc::layerOutline(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -3185,7 +3185,7 @@
}
-bool ScribusDoc::setLayerMarker(const int layerID, const QColor& color)
+bool ScribusDoc::setLayerMarker(int layerID, const QColor& color)
{
bool found = false;
auto itend = Layers.end();
@@ -3204,7 +3204,7 @@
}
-QColor ScribusDoc::layerMarker(const int layerID) const
+QColor ScribusDoc::layerMarker(int layerID) const
{
auto itend = Layers.cend();
for (auto it = Layers.cbegin(); it != itend; ++it)
@@ -3216,7 +3216,7 @@
}
-int ScribusDoc::layerLevelFromID(const int layerID) const
+int ScribusDoc::layerLevelFromID(int layerID) const
{
int layerCount = Layers.count();
for (int i=0; i < layerCount; ++i)
@@ -3235,7 +3235,7 @@
}
-int ScribusDoc::layerIDFromLevel(const int layerLevel) const
+int ScribusDoc::layerIDFromLevel(int layerLevel) const
{
int layerCount = Layers.count();
for (int i = 0; i < layerCount; ++i)
@@ -3258,13 +3258,13 @@
return -1;
}
-bool ScribusDoc::lowerLayer(const int layerID)
+bool ScribusDoc::lowerLayer(int layerID)
{
return lowerLayerByLevel(layerLevelFromID(layerID));
}
-bool ScribusDoc::lowerLayerByLevel(const int layerLevel)
+bool ScribusDoc::lowerLayerByLevel(int layerLevel)
{
if (Layers.count() < 2)
return false;
@@ -3305,13 +3305,13 @@
}
-bool ScribusDoc::raiseLayer(const int layerID)
+bool ScribusDoc::raiseLayer(int layerID)
{
return raiseLayerByLevel(layerLevelFromID(layerID));
}
-bool ScribusDoc::raiseLayerByLevel(const int layerLevel)
+bool ScribusDoc::raiseLayerByLevel(int layerLevel)
{
if (Layers.count() < 2)
return false;
@@ -3352,7 +3352,7 @@
}
-QString ScribusDoc::layerName(const int layerID) const
+QString ScribusDoc::layerName(int layerID) const
{
int layerCount = Layers.count();
for (int i=0; i < layerCount; ++i)
@@ -3365,7 +3365,7 @@
}
-bool ScribusDoc::changeLayerName(const int layerID, const QString& newName)
+bool ScribusDoc::changeLayerName(int layerID, const QString& newName)
{
int layerCount=Layers.count();
bool found=false;
@@ -3407,7 +3407,7 @@
return canSelect;
}
-bool ScribusDoc::layerContainsItems(const int layerID) const
+bool ScribusDoc::layerContainsItems(int layerID) const
{
QList<PageItem*> allItems;
int masterItemsCount = MasterItems.count();
@@ -3473,7 +3473,7 @@
return layerIDFromName(newNames.first());
}
-bool ScribusDoc::renumberLayer(const int layerID, const int newLayerID)
+bool ScribusDoc::renumberLayer(int layerID, int newLayerID)
{
int layerCount=Layers.count();
int foundIndex = 0;
@@ -4608,7 +4608,7 @@
return false;
}
-void ScribusDoc::setUnitIndex(const int newIndex)
+void ScribusDoc::setUnitIndex(int newIndex)
{
m_docPrefsData.docSetupPrefs.docUnitIndex=newIndex;
m_docUnitRatio = unitGetRatioFromIndex( newIndex );
@@ -4627,7 +4627,7 @@
}
-bool ScribusDoc::applyMasterPage(const QString& pageName, const int pageNumber)
+bool ScribusDoc::applyMasterPage(const QString& pageName, int pageNumber)
{
if (!MasterNames.contains(pageName))
return false;
@@ -4798,7 +4798,7 @@
}
-bool ScribusDoc::changePageProperties(const double initialTop, const double
initialBottom, const double initialLeft, const double initialRight, const
double initialHeight, const double initialWidth, const double height, const
double width, const int orientation, const QString& pageSize, const int
marginPreset, const bool moveObjects, const int pageNumber, const int pageType)
+bool ScribusDoc::changePageProperties(double initialTop, double initialBottom,
double initialLeft, double initialRight, double initialHeight, double
initialWidth, double height, double width, int orientation, const QString&
pageSize, int marginPreset, bool moveObjects, int pageNumber, int pageType)
{
if (pageNumber == -1 || m_currentPage ==nullptr)
return false;
@@ -5093,7 +5093,7 @@
m_undoManager->setUndoEnabled(true);
}
-bool ScribusDoc::copyPageToMasterPage(const int pageNumber, const int
leftPage, const int maxLeftPage, const QString& masterPageName, bool
copyFromAppliedMaster)
+bool ScribusDoc::copyPageToMasterPage(int pageNumber, int leftPage, int
maxLeftPage, const QString& masterPageName, bool copyFromAppliedMaster)
{
assert(!masterPageMode());
if (masterPageMode())
@@ -5293,7 +5293,7 @@
return newItem;
}
-int ScribusDoc::itemAdd(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, const double x, const double y, const double
b, const double h, const double w, const QString& fill, const QString& outline,
PageItem::ItemKind itemKind)
+int ScribusDoc::itemAdd(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, double x, double y, double b, double h,
double w, const QString& fill, const QString& outline, PageItem::ItemKind
itemKind)
{
UndoTransaction activeTransaction;
if (UndoManager::undoEnabled()) // && !m_itemCreationTransaction)
@@ -5343,7 +5343,7 @@
}
-int ScribusDoc::itemAddArea(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, const double x, const double y, const double
w, const QString& fill, const QString& outline, PageItem::ItemKind itemKind)
+int ScribusDoc::itemAddArea(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, double x, double y, double w, const QString&
fill, const QString& outline, PageItem::ItemKind itemKind)
{
double xo = m_currentPage->xOffset();
double yo = m_currentPage->yOffset();
@@ -5664,9 +5664,9 @@
return m_automaticTextFrames;
}
-void ScribusDoc::setUsesAutomaticTextFrames(const bool atf)
-{
- m_automaticTextFrames=atf;
+void ScribusDoc::setUsesAutomaticTextFrames(bool atf)
+{
+ m_automaticTextFrames = atf;
}
bool ScribusDoc::loadPict(const QString& fn, PageItem *pageItem, bool reload,
bool showMsg)
@@ -6213,14 +6213,14 @@
}
}
-double ScribusDoc::getXOffsetForPage(const int pageNumber)
+double ScribusDoc::getXOffsetForPage(int pageNumber)
{
if (Pages->at(pageNumber)!=nullptr)
return Pages->at(pageNumber)->xOffset();
return -1.0;
}
-double ScribusDoc::getYOffsetForPage(const int pageNumber)
+double ScribusDoc::getYOffsetForPage(int pageNumber)
{
if (Pages->at(pageNumber)!=nullptr)
return Pages->at(pageNumber)->yOffset();
@@ -6798,7 +6798,7 @@
}
}
-void ScribusDoc::addSection(const int number, const QString& name, const uint
fromindex, const uint toindex, const NumFormat type, const uint
sectionstartindex, const bool reversed, const bool active, const QChar
fillChar, int fieldWidth)
+void ScribusDoc::addSection(int number, const QString& name, const uint
fromindex, const uint toindex, const NumFormat type, const uint
sectionstartindex, bool reversed, bool active, const QChar fillChar, int
fieldWidth)
{
struct DocumentSection newSection;
int docPageCount=DocPages.count();
@@ -6867,7 +6867,7 @@
}
-int ScribusDoc::getSectionKeyForPageIndex(const uint pageIndex) const
+int ScribusDoc::getSectionKeyForPageIndex(uint pageIndex) const
{
int retVal = -1;
DocumentSectionMap::ConstIterator it =
m_docPrefsData.docSectionMap.begin();
@@ -6882,7 +6882,7 @@
return retVal;
}
-QString ScribusDoc::getSectionNameForPageIndex(const uint pageIndex) const
+QString ScribusDoc::getSectionNameForPageIndex(uint pageIndex) const
{
DocumentSectionMap::ConstIterator it =
m_docPrefsData.docSectionMap.begin();
for (; it != m_docPrefsData.docSectionMap.end(); ++it)
@@ -6894,7 +6894,7 @@
}
-const QString ScribusDoc::getSectionPageNumberForPageIndex(const uint
pageIndex) const
+const QString ScribusDoc::getSectionPageNumberForPageIndex(uint pageIndex)
const
{
QString retVal;
int key=getSectionKeyForPageIndex(pageIndex);
@@ -6907,16 +6907,16 @@
if (!m_docPrefsData.docSectionMap[key].reversed)
sectionIndexOffset = pageIndex -
m_docPrefsData.docSectionMap[key].fromindex +
m_docPrefsData.docSectionMap[key].sectionstartindex;
else
- sectionIndexOffset = -pageIndex +
m_docPrefsData.docSectionMap[key].toindex +
m_docPrefsData.docSectionMap[key].sectionstartindex;
- retVal=getStringFromSequence(m_docPrefsData.docSectionMap[key].type,
sectionIndexOffset);
+ sectionIndexOffset = - static_cast<int>(pageIndex) +
m_docPrefsData.docSectionMap[key].toindex +
m_docPrefsData.docSectionMap[key].sectionstartindex;
+ retVal = getStringFromSequence(m_docPrefsData.docSectionMap[key].type,
sectionIndexOffset);
return retVal;
}
-const QChar ScribusDoc::getSectionPageNumberFillCharForPageIndex(const uint
pageIndex) const
+const QChar ScribusDoc::getSectionPageNumberFillCharForPageIndex(uint
pageIndex) const
{
QChar retVal;
- int key=getSectionKeyForPageIndex(pageIndex);
- if (key==-1)
+ int key = getSectionKeyForPageIndex(pageIndex);
+ if (key == -1)
return retVal;
//If a section is inactive, theres no page numbers printed
@@ -6928,11 +6928,11 @@
return retVal;
}
-int ScribusDoc::getSectionPageNumberWidthForPageIndex(const uint pageIndex)
const
-{
- int retVal=0;
- int key=getSectionKeyForPageIndex(pageIndex);
- if (key==-1)
+int ScribusDoc::getSectionPageNumberWidthForPageIndex(uint pageIndex) const
+{
+ int retVal = 0;
+ int key = getSectionKeyForPageIndex(pageIndex);
+ if (key == -1)
return retVal;
//If a section is inactive, theres no page numbers printed
@@ -7221,7 +7221,7 @@
}
-void ScribusDoc::setLocationBasedPageLRMargins(const uint pageIndex)
+void ScribusDoc::setLocationBasedPageLRMargins(uint pageIndex)
{
int
setcol=pageSets()[m_docPrefsData.docSetupPrefs.pagePositioning].Columns;
if (setcol==1)
@@ -11929,10 +11929,10 @@
{
buildAlignItemList();
int alignObjectsCount = AObjects.count();
- if (alignObjectsCount < minObjects)
+ if (alignObjectsCount < static_cast<int>(minObjects))
return false;
- bool oneLocked=false;
+ bool oneLocked = false;
for (int i = 0; i < alignObjectsCount && !oneLocked; ++i)
{
if (AObjects[i].Object->locked())
@@ -13845,7 +13845,7 @@
void ScribusDoc::createNewDocPages(int pageCount)
{
int setcol =
pageSets()[m_docPrefsData.docSetupPrefs.pagePositioning].Columns;
- int createCount=qMax(pageCount,1);
+ int createCount=qMax(pageCount, 1);
if (setcol == 1)
{
for (int i = 0; i < createCount; ++i)
@@ -14018,7 +14018,7 @@
}
}
-void ScribusDoc::getClosestPageBoundaries(const double xin, const double yin,
double &xout, double &yout, ScPage* refPage)
+void ScribusDoc::getClosestPageBoundaries(double xin, double yin, double
&xout, double &yout, ScPage* refPage)
{
ScPage* page = (refPage == nullptr) ? currentPage() : refPage;
@@ -16051,7 +16051,7 @@
}
-void ScribusDoc::setRotationMode(const int val)
+void ScribusDoc::setRotationMode(int val)
{
if (m_rotMode == val)
return;
@@ -16200,8 +16200,8 @@
}
if (resizePageMargins)
{
- pp->initialMargins=m_docPrefsData.docSetupPrefs.margins;
-
pp->marginPreset=m_docPrefsData.docSetupPrefs.marginPreset;
+ pp->initialMargins =
m_docPrefsData.docSetupPrefs.margins;
+ pp->marginPreset =
m_docPrefsData.docSetupPrefs.marginPreset;
}
else
if (resizeMasterPageMargins)
@@ -16216,8 +16216,8 @@
pp->initialMargins.right() ==
mp->initialMargins.right() &&
pp->initialMargins.bottom() ==
mp->initialMargins.bottom())
{
-
pp->initialMargins=m_docPrefsData.docSetupPrefs.margins;
-
pp->marginPreset=m_docPrefsData.docSetupPrefs.marginPreset;
+ pp->initialMargins =
m_docPrefsData.docSetupPrefs.margins;
+ pp->marginPreset =
m_docPrefsData.docSetupPrefs.marginPreset;
}
}
}
@@ -17023,7 +17023,7 @@
if (mrk->isType(MARKNoteFrameType) && MPos > 1
&& item->itemText.text(MPos -1) == SpecialChars::PARSEP)
item->itemText.removeChars(MPos-1,2);
else
- item->itemText.removeChars(MPos,1);
+ item->itemText.removeChars(MPos, 1);
found = true;
MPos = findMarkCPos(mrk, item);
}
@@ -17039,7 +17039,7 @@
MPos = findMarkCPos(mrk, item);
while (MPos > -1)
{
- item->itemText.removeChars(MPos,1);
+ item->itemText.removeChars(MPos, 1);
MPos = findMarkCPos(mrk, item);
}
found = true;
Modified: trunk/Scribus/scribus/scribusdoc.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23185&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Thu Sep 5 16:24:40 2019
@@ -102,9 +102,9 @@
QList<PageItem*> getAllItems(QList<PageItem*> &items);
QList<PageItem*> *parentGroup(PageItem* item, QList<PageItem*> *list);
void setup(int, int, int, int, int, const QString&, const QString&);
- void setLoading(const bool);
+ void setLoading(bool);
bool isLoading() const;
- void setModified(const bool);
+ void setModified(bool);
bool isModified() const;
/** Setzt die Seitenattribute */
void setPage(double w, double h, double t, double l, double r, double
b, double sp, double ab, bool atf, int fp);
@@ -218,7 +218,7 @@
// Add, delete and move pages
- ScPage* addPage(int pageNumber, const QString&
masterPageName=QString(), const bool addAutoFrame=false);
+ ScPage* addPage(int pageNumber, const QString&
masterPageName=QString(), bool addAutoFrame=false);
void deletePage(int);
//! @brief Add a master page with this function, do not use addPage
ScPage* addMasterPage(int, const QString&);
@@ -238,7 +238,7 @@
* @param pageNumber page number
* @return number of frame
*/
- int addAutomaticTextFrame(const int pageNumber);
+ int addAutomaticTextFrame(int pageNumber);
/**
* Set the left and right margins based on the location of the page
* @param pageIndex
@@ -249,7 +249,7 @@
* @param a page index
* @param b page index
*/
- void swapPage(const int a, const int b);
+ void swapPage(int a, int b);
/**
* @brief Move page(s) within the document
* @param fromPage page index
@@ -257,7 +257,7 @@
* @param count target to move to (page index)
* @param position Before, After or at the end
*/
- void movePage(const int fromPage, const int toPage, const int dest,
const int position);
+ void movePage(int fromPage, int toPage, int dest, int position);
/**
* @brief Copy a page (pageNumberToCopy) copyCount times,
whereToInsert(before or after) the existingPage or at the end.
@@ -275,7 +275,7 @@
* @param activate the layer active
* @return Number of the layer created
*/
- int addLayer(const QString& layerName, const bool activate=false);
+ int addLayer(const QString& layerName, bool activate=false);
/**
* @brief Copies a layer from the current document
* @param layerIDToCopy source layer
@@ -289,7 +289,7 @@
* @param deleteItems the items on the layer too?
* @return Success or failure
*/
- bool deleteLayer(const int layerID, const bool deleteItems);
+ bool deleteLayer(int layerID, bool deleteItems);
/**
* @brief Return the number of the current layer
* @return Active layer number
@@ -306,7 +306,7 @@
* @param layerToActivate Number of the layer
* @return Success or failure
*/
- bool setActiveLayer(const int layerToActivate);
+ bool setActiveLayer(int layerToActivate);
/**
* @brief Set the active layer via the layer name
* @param layerNameToActivate Name of the layer
@@ -319,129 +319,129 @@
* @param isPrintable bool true = layer is prantable
* @return Success or failure
*/
- bool setLayerPrintable(const int layerID, const bool isPrintable);
+ bool setLayerPrintable(int layerID, bool isPrintable);
/**
* @brief Is the layer printable
* @param layerID ID of the layer
* @return Printable or not
*/
- bool layerPrintable(const int layerID) const;
+ bool layerPrintable(int layerID) const;
/**
* @brief Set the layer visible via the layer number
* @param layerID ID of the layer
* @param isViewable true = layer is visible
* @return Success or failure
*/
- bool setLayerVisible(const int layerID, const bool isViewable);
+ bool setLayerVisible(int layerID, bool isViewable);
/**
* @brief Is the layer visible
* @param layerID ID of the layer
* @return Visible or not
*/
- bool layerVisible(const int layerID) const;
+ bool layerVisible(int layerID) const;
/**
* @brief are objects on the layer selectable
* @param layerID ID of the layer
* @return Items selectable or not
*/
- bool layerSelectable(const int layerID) const;
+ bool layerSelectable(int layerID) const;
/**
* @brief Set objects on the layer selectable via the layer ID
* @param layerID ID of the layer
* @param isSelectable true = layer objects are selectable
* @return bool Success or failure
*/
- bool setLayerSelectable(const int layerID, const bool isSelectable);
+ bool setLayerSelectable(int layerID, bool isSelectable);
/**
* @brief Set the layer locked via the layer number
* @param layerID ID of the layer
* @param isLocked true = layer is locked
* @return Success or failure
*/
- bool setLayerLocked(const int layerID, const bool isLocked);
+ bool setLayerLocked(int layerID, bool isLocked);
/**
* @brief Is the layer locked
* @param layerID ID of the layer
* @return Locked or not
*/
- bool layerLocked(const int layerID) const;
+ bool layerLocked(int layerID) const;
/**
* @brief Set the layer flow via the layer number
* @param layerID ID of the layer
* @param flow true = Text flows around objects on this layer
* @return Success or failure
*/
- bool setLayerFlow(const int layerID, const bool flow);
+ bool setLayerFlow(int layerID, bool flow);
/**
* @brief does text flow around objects on this layer
* @param layerID ID of the layer
* @return flow or not
*/
- bool layerFlow(const int layerID) const;
+ bool layerFlow(int layerID) const;
/**
* @brief Set the layer transparency via the layer number
* @param layerID ID of the layer
* @param trans transparency value 0.0 - 1.0
* @return Success or failure
*/
- bool setLayerTransparency(const int layerID, double trans);
+ bool setLayerTransparency(int layerID, double trans);
/**
* @brief returns the layer transparency
* @param layerID ID of the layer
* @return transparency value 0.0 - 1.0
*/
- double layerTransparency(const int layerID) const;
+ double layerTransparency(int layerID) const;
/**
* @brief Set the layer layerBlendMode via the layer number
* @param layerID ID of the layer
* @param blend layerBlendMode
* @return Success or failure
*/
- bool setLayerBlendMode(const int ID, int blend);
+ bool setLayerBlendMode(int ID, int blend);
/**
* @brief returns the layer BlendMode
* @param layerID ID of the layer
* @return layerBlendMode
*/
- int layerBlendMode(const int ID) const;
+ int layerBlendMode(int ID) const;
/**
* @brief Return the level of the requested layer
* @param layerID ID of the layer
* @return Level of the layer
*/
- int layerLevelFromID(const int layerID) const;
+ int layerLevelFromID(int layerID) const;
/**
* @brief Set the layer marker color
* @param ID Number of the layer
* @param color color of the marker
* @return Success or failure
*/
- bool setLayerMarker(const int layerID, const QColor& color);
+ bool setLayerMarker(int layerID, const QColor& color);
/**
* @brief returns the layer marker color
* @param layerID ID of the layer
* @return marker color
*/
- QColor layerMarker(const int layerID) const;
+ QColor layerMarker(int layerID) const;
/**
* @brief Set the layer outline mode via the layer number
* @param layerID ID of the layer
* @param outline true = layer is displayed in outlines only
* @return Success or failure
*/
- bool setLayerOutline(const int layerID, const bool outline);
+ bool setLayerOutline(int layerID, bool outline);
/**
* @brief is this layer in outline mode
* @param layerID ID of the layer
* @return outline or not
*/
- bool layerOutline(const int layerID) const;
+ bool layerOutline(int layerID) const;
/**
* @brief Return the number of the layer at a certain level
* @param layerLevel Layer level
* @return Layer ID
*/
- int layerIDFromLevel(const int layerLevel) const;
+ int layerIDFromLevel(int layerLevel) const;
/**
* @brief Return the layer count
* @return Number of layers in doc
@@ -453,38 +453,38 @@
* @param layerID ID of the layer
* @return Success or failure
*/
- bool lowerLayer(const int layerID);
+ bool lowerLayer(int layerID);
/**
* @brief Lower a layer using the level
* @param layerLevel Level of the layer
* @return Success or failure
*/
- bool lowerLayerByLevel(const int layerLevel);
+ bool lowerLayerByLevel(int layerLevel);
/**
* @brief Raise a layer
* @param layerID ID of the layer
* @return Success or failure
*/
- bool raiseLayer(const int layerID);
+ bool raiseLayer(int layerID);
/**
* @brief Raise a layer using the level
* @param layerLevel Level of the layer
* @return Success or failure
*/
- bool raiseLayerByLevel(const int layerLevel);
+ bool raiseLayerByLevel(int layerLevel);
/**
* @brief Return the layer name
* @param layerID ID of the layer
* @return Name of the layer
*/
- QString layerName(const int layerID) const;
+ QString layerName(int layerID) const;
/**
* @brief Change the name of a layer
* @param layerID ID of the layer
* @param newName new name of the layer
* @return Success or failure
*/
- bool changeLayerName(const int layerID, const QString& newName);
+ bool changeLayerName(int layerID, const QString& newName);
/**
* @brief Test if items can be selected on a specific layer
*
@@ -500,14 +500,14 @@
* @param layerID ID of the layer
* @return Layer contains items bool
*/
- bool layerContainsItems(const int layerID) const;
+ bool layerContainsItems(int layerID) const;
/**
* @brief Renumber a layer. Used in particular for reinsertion for
undo/redo
* @param layerID old layer ID
* @param newLayerID New layer ID
* @return Success or failure
*/
- bool renumberLayer(const int layerID, const int newLayerID);
+ bool renumberLayer(int layerID, int newLayerID);
/**
* @brief Return a list of the layers in their order
* @param list QStringList to insert the layer names into
@@ -732,13 +732,13 @@
/**
* @brief Set and get the document's unit index
*/
- void setUnitIndex(const int);
+ void setUnitIndex(int);
int unitIndex() const;
double unitRatio() const;
/**
* @brief Apply a master page
*/
- bool applyMasterPage(const QString& pageName, const int pageNumber);
+ bool applyMasterPage(const QString& pageName, int pageNumber);
/**
* @brief Undo function for applying a master page
*/
@@ -766,7 +766,7 @@
/**
* @brief Set the page margins. Current code uses current page only,
also provide a (currently, TODO) option for this.
*/
- bool changePageProperties(const double initialTop, const double
initialBottom, const double initialLeft, const double initialRight, const
double initialHeight, const double initialWidth, const double Height, const
double width, const int orientation, const QString& pageSize, const int
marginPreset, const bool moveObjects, const int pageNumber=-1, const int
pageType = 0);
+ bool changePageProperties(double initialTop, double initialBottom,
double initialLeft, double initialRight, double initialHeight, double
initialWidth, double Height, double width, int orientation, const QString&
pageSize, int marginPreset, bool moveObjects, int pageNumber=-1, int pageType =
0);
/**
* @brief Recalculate the colors after CMS settings change. Update the
items in the doc accordingly.
*/
@@ -776,7 +776,7 @@
/**
* @brief Copies a normal page to be a master pages
*/
- bool copyPageToMasterPage(const int, const int, const int, const
QString&, bool);
+ bool copyPageToMasterPage(int, int, int, const QString&, bool);
/**
@@ -802,10 +802,10 @@
\param outline outline color name
\param noteFrame optional (default false) indicates that noteframes
should be created, not text frame
*/
- int itemAdd(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, const double x, const double y, const double
b, const double h, const double w, const QString& fill, const QString& outline,
PageItem::ItemKind itemKind = PageItem::StandardItem);
+ int itemAdd(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, double x, double y, double b, double h,
double w, const QString& fill, const QString& outline, PageItem::ItemKind
itemKind = PageItem::StandardItem);
/** Add an item to the page based on the x/y position. Item will be
fitted to the closest guides/margins */
- int itemAddArea(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, const double x, const double y, const double
w, const QString& fill, const QString& outline, PageItem::ItemKind itemKind =
PageItem::StandardItem);
+ int itemAddArea(const PageItem::ItemType itemType, const
PageItem::ItemFrameType frameType, double x, double y, double w, const QString&
fill, const QString& outline, PageItem::ItemKind itemKind =
PageItem::StandardItem);
/**
* @brief Allow the user to create a frame easily with some simple
placement and sizing options
@@ -844,7 +844,7 @@
* @brief Doc uses automatic text frames?
*/
bool usesAutomaticTextFrames() const;
- void setUsesAutomaticTextFrames(const bool);
+ void setUsesAutomaticTextFrames(bool);
/**
*
@@ -902,8 +902,8 @@
* @retval double containing the offset. Returns -1.0 if page not in
Pages list (as -ve is not possible).
* Mostly saves bringing in extra includes into files that already have
scribusdoc.h
*/
- double getXOffsetForPage(const int);
- double getYOffsetForPage(const int);
+ double getXOffsetForPage(int);
+ double getYOffsetForPage(int);
void getBleeds(int pageNumber, MarginStruct& bleedData);
void getBleeds(const ScPage* page, MarginStruct& bleedData);
void getBleeds(const ScPage* page, const MarginStruct& baseValues,
MarginStruct& bleedData);
@@ -957,31 +957,31 @@
* @brief Add a section to the document sections list
* Set number to -1 to add in the default section if the map is empty
*/
- void addSection(const int number=0, const QString& name=QString(),
const uint fromindex=0, const uint toindex=0, const NumFormat type=Type_1_2_3,
const uint sectionstartindex=0, const bool reversed=false, const bool
active=true, const QChar fillChar=QChar(), int fieldWidth=0);
+ void addSection(int number=0, const QString& name=QString(), const uint
fromindex=0, const uint toindex=0, const NumFormat type=Type_1_2_3, const uint
sectionstartindex=0, bool reversed=false, bool active=true, const QChar
fillChar=QChar(), int fieldWidth=0);
/**
* @brief Delete a section from the document sections list
*/
- bool deleteSection(const uint);
+ bool deleteSection(uint);
/**
* @brief Gets the page number to be printed based on the section it is
in.
* Returns QString() on failure to find the pageIndex
*/
- const QString getSectionPageNumberForPageIndex(const uint) const;
+ const QString getSectionPageNumberForPageIndex(uint) const;
/**
* @brief Gets the page number fill character to be printed based on
the section it is in.
* Returns QString() on failure to find the pageIndex
*/
- const QChar getSectionPageNumberFillCharForPageIndex(const uint) const;
+ const QChar getSectionPageNumberFillCharForPageIndex(uint) const;
/**
* @brief Gets the page number fill character to be printed based on
the section it is in.
* Returns QString() on failure to find the pageIndex
*/
- int getSectionPageNumberWidthForPageIndex(const uint) const;
+ int getSectionPageNumberWidthForPageIndex(uint) const;
/**
* @brief Gets the key of the sections map based on the section the
page index is in.
* Returns -1 on failure to find the pageIndex
*/
- int getSectionKeyForPageIndex(const uint pageIndex) const;
+ int getSectionKeyForPageIndex(uint pageIndex) const;
/**
*
*
@@ -997,7 +997,7 @@
*
* @param pageIndex
*/
- void removePageFromSection(const uint pageIndex);
+ void removePageFromSection(uint pageIndex);
/**
*
*/
@@ -1006,7 +1006,7 @@
* @param pageIndex page nr
* @brief Returns name of section where page is located
*/
- QString getSectionNameForPageIndex(const uint pageIndex) const;
+ QString getSectionNameForPageIndex(uint pageIndex) const;
/**
* Update annotation links when a page is added
@@ -1189,11 +1189,12 @@
//! \brief Get the closest border of another element to the given point
void getClosestElementBorder(double xin, double yin, double *xout,
double *yout, SelectionSkipBehavior behavior = IncludeSelection);
//! \brief Get the closest page margin or bleed
- void getClosestPageBoundaries(const double xin, const double yin,
double &xout, double &yout, ScPage* refPage);
+ void getClosestPageBoundaries(double xin, double yin, double &xout,
double &yout, ScPage* refPage);
//! \brief Snap an item to the guides
void SnapToGuides(PageItem *currItem);
bool ApplyGuides(double *x, double *y, bool elementSnap = false);
bool ApplyGuides(FPoint* point, bool elementSnap = false);
+
bool moveItem(double newX, double newY, PageItem* ite);
void rotateItem(double win, PageItem *currItem);
void moveRotated(PageItem *currItem, const FPoint& npv);
@@ -1214,7 +1215,7 @@
//! \brief Get rotation mode
int rotationMode() const {return m_rotMode;}
//! \brief Set rotation mode
- void setRotationMode(const int val);
+ void setRotationMode(int val);
//! \brief Fonctions which avoid doc updater and update manager to send
too much
// unncessary signals when doing updates on multiple items
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
