r24900 by craig - Qt6: Warning cleanup

scribus-commit scribus-commit at lists.scribus.net
Fri Feb 4 21:52:30 UTC 2022


Author: craig
Date: Fri Feb  4 21:52:30 2022
New Revision: 24900

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24900
Log:
Qt6: Warning cleanup

Modified:
    trunk/Scribus/scribus/iconmanager.cpp
    trunk/Scribus/scribus/main_nix.cpp
    trunk/Scribus/scribus/navigator.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scpainter.h
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/ui/colorchart.cpp
    trunk/Scribus/scribus/ui/dasheditor.cpp
    trunk/Scribus/scribus/ui/gradientpreview.cpp
    trunk/Scribus/scribus/ui/helpbrowser.cpp
    trunk/Scribus/scribus/ui/hruler.cpp

Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp	(original)
+++ trunk/Scribus/scribus/iconmanager.cpp	Fri Feb  4 21:52:30 2022
@@ -65,7 +65,6 @@
 	QString baseIconDir(ScPaths::instance().iconDir());
 	QStringList locations;
 	locations << baseIconDir;
-	QStringList configNames;
 	for (QStringList::Iterator it = locations.begin(); it != locations.end(); ++it)
 	{
 		QFileInfo iconDir(*it);

Modified: trunk/Scribus/scribus/main_nix.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/main_nix.cpp
==============================================================================
--- trunk/Scribus/scribus/main_nix.cpp	(original)
+++ trunk/Scribus/scribus/main_nix.cpp	Fri Feb  4 21:52:30 2022
@@ -65,7 +65,6 @@
 {
 	emergencyActivated = false;
 
-	ScribusQApp::setAttribute(Qt::AA_EnableHighDpiScaling);
 	ScribusQApp app(argc, argv);
 	initCrashHandler();
 	app.parseCommandLine();

Modified: trunk/Scribus/scribus/navigator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/navigator.cpp
==============================================================================
--- trunk/Scribus/scribus/navigator.cpp	(original)
+++ trunk/Scribus/scribus/navigator.cpp	Fri Feb  4 21:52:30 2022
@@ -54,22 +54,22 @@
 
 void Navigator::mouseMoveEvent(QMouseEvent *m)
 {
-	drawMark(m->x(), m->y());
-	emit Coords(static_cast<double>(m->x()) / static_cast<double>(pmx.width()),
-			    static_cast<double>(m->y()) / static_cast<double>(pmx.height()));
+	drawMark(m->position().x(), m->position().y());
+	emit Coords(static_cast<double>(m->position().x()) / static_cast<double>(pmx.width()),
+				static_cast<double>(m->position().y()) / static_cast<double>(pmx.height()));
 }
 
 void Navigator::mousePressEvent(QMouseEvent *m)
 {
-	drawMark(m->x(), m->y());
-	emit Coords(static_cast<double>(m->x()) / static_cast<double>(pmx.width()),
-			    static_cast<double>(m->y()) / static_cast<double>(pmx.height()));
+	drawMark(m->position().x(), m->position().y());
+	emit Coords(static_cast<double>(m->position().x()) / static_cast<double>(pmx.width()),
+				static_cast<double>(m->position().y()) / static_cast<double>(pmx.height()));
 }
 
 void Navigator::mouseReleaseEvent(QMouseEvent *m)
 {
-	emit Coords(static_cast<double>(m->x()) / static_cast<double>(pmx.width()),
-			    static_cast<double>(m->y()) / static_cast<double>(pmx.height()));
+	emit Coords(static_cast<double>(m->position().x()) / static_cast<double>(pmx.width()),
+				static_cast<double>(m->position().y()) / static_cast<double>(pmx.height()));
 }
 
 void Navigator::paintEvent(QPaintEvent *e)

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Fri Feb  4 21:52:30 2022
@@ -1587,14 +1587,12 @@
 	painter->setPen(ScColorShade(Qt::black, 100), 0.5, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 	if (options.cropMarks)
 	{
-		FPoint start, end;
 		double left = offsetX, right = offsetX + width;
 		double bottom = offsetY + height, top = offsetY;
 		drawBoxMarks(painter, QRectF(QPointF(left, top), QPointF(right, bottom)), bleedBox, markOffs, markLength);
 	}
 	if (options.bleedMarks)
 	{
-		FPoint start, end;
 		double left = offsetX - bleedLeft, right = offsetX + width + bleedRight;
 		double bottom = offsetY + height + bleedBottom, top = offsetY - bleedTop;
 		drawBoxMarks(painter, QRectF(QPointF(left, top), QPointF(right, bottom)), bleedBox, markOffs, markLength);

Modified: trunk/Scribus/scribus/scpainter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/scpainter.h
==============================================================================
--- trunk/Scribus/scribus/scpainter.h	(original)
+++ trunk/Scribus/scribus/scpainter.h	Fri Feb  4 21:52:30 2022
@@ -180,8 +180,8 @@
 	int  m_blendMode { 0 };
 	int  m_blendModeFill { 0 };
 	int  m_blendModeStroke { 0 };
-	unsigned int m_width;
-	unsigned int m_height;
+//	unsigned int m_width;
+//	unsigned int m_height;
 	QTransform m_matrix;
 	ScFace m_font;
 	double m_fontSize { 0.0 };

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Fri Feb  4 21:52:30 2022
@@ -3214,8 +3214,10 @@
 		int signOfY = (angleDelta.y() == 0) ? 0 : ((angleDelta.y() < 0) ? -1 : 1);
 		int dX = -Prefs->uiPrefs.wheelJump * signOfX;
 		int dY = -Prefs->uiPrefs.wheelJump * signOfY;
+#ifndef Q_OS_MACOS
 		if (w->modifiers() == Qt::ShiftModifier)
 			std::swap(dX, dY);
+#endif
 		scrollBy(dX, dY);
 	}
 	w->accept();
@@ -3311,10 +3313,10 @@
 	{
 		auto* m = dynamic_cast<QMouseEvent*> (event);
 		m_mousePointDoc=m_canvas->globalToCanvas(m->globalPos());
-		FPoint p = m_canvas->localToCanvas(QPoint(m->x(),m->y()));
+		FPoint p = m_canvas->localToCanvas(QPoint(m->position().x(),m->position().y()));
 		emit MousePos(p.x(),p.y());
-		horizRuler->draw(m->x() + qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale())); //  - 2 * contentsX());
-		vertRuler->draw(m->y() + qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
+		horizRuler->draw(m->position().x() + qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale())); //  - 2 * contentsX());
+		vertRuler->draw(m->position().y() + qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 		m_canvasMode->mouseMoveEvent(m);
 		return true;
 	}

Modified: trunk/Scribus/scribus/ui/colorchart.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/ui/colorchart.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorchart.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorchart.cpp	Fri Feb  4 21:52:30 2022
@@ -50,29 +50,29 @@
 
 void ColorChart::mouseMoveEvent(QMouseEvent *m)
 {
-	drawMark(m->x(), m->y());
-	if (drawMode > 0)
-		emit ColorVal(m->x() * 256 / width() - 128, 256 - (m->y() * 256 / height()) - 128, true);
-	else
-		emit ColorVal(m->x() * 359 / width(), m->y() * 255 / height(), true);
+	drawMark(m->position().x(), m->position().y());
+	if (drawMode > 0)
+		emit ColorVal(m->position().x() * 256 / width() - 128, 256 - (m->position().y() * 256 / height()) - 128, true);
+	else
+		emit ColorVal(m->position().x() * 359 / width(), m->position().y() * 255 / height(), true);
 }
 
 void ColorChart::mousePressEvent(QMouseEvent *m)
 {
-	drawMark(m->x(), m->y());
-	if (drawMode > 0)
-		emit ColorVal(m->x() * 256 / width() - 128, 256 - (m->y() * 256 / height()) - 128, true);
-	else
-		emit ColorVal(m->x() * 359 / width(), m->y() * 255 / height(), true);
+	drawMark(m->position().x(), m->position().y());
+	if (drawMode > 0)
+		emit ColorVal(m->position().x() * 256 / width() - 128, 256 - (m->position().y() * 256 / height()) - 128, true);
+	else
+		emit ColorVal(m->position().x() * 359 / width(), m->position().y() * 255 / height(), true);
 }
 
 void ColorChart::mouseReleaseEvent(QMouseEvent *m)
 {
-	drawMark(m->x(), m->y());
-	if (drawMode > 0)
-		emit ColorVal(m->x() * 256 / width() - 128, 256 - (m->y() * 256 / height()) - 128, true);
-	else
-		emit ColorVal(m->x() * 359 / width(), m->y() * 255 / height(), true);
+	drawMark(m->position().x(), m->position().y());
+	if (drawMode > 0)
+		emit ColorVal(m->position().x() * 256 / width() - 128, 256 - (m->position().y() * 256 / height()) - 128, true);
+	else
+		emit ColorVal(m->position().x() * 359 / width(), m->position().y() * 255 / height(), true);
 }
 
 void ColorChart::paintEvent(QPaintEvent *e)

Modified: trunk/Scribus/scribus/ui/dasheditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/ui/dasheditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dasheditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/dasheditor.cpp	Fri Feb  4 21:52:30 2022
@@ -139,7 +139,7 @@
 {
 	m->accept();
 	qApp->restoreOverrideCursor();
-	if ((m_mousePressed) && (m_stops.count() > 2) && (m_outside || m->y() > 30))
+	if ((m_mousePressed) && (m_stops.count() > 2) && (m_outside || m->position().y() > 30))
 	{
 		m_stops.removeAt(m_currentStop);
 		m_dashValues.clear();
@@ -158,7 +158,7 @@
 		emit dashChanged();
 		return;
 	}
-	if ((m->y() < height()) && (m->y() > 16) && (m->x() > 9) && (m->x() < width() - 9))
+	if ((m->position().y() < height()) && (m->position().y() > 16) && (m->position().x() > 9) && (m->position().x() < width() - 9))
 	{
 		if (m_currentStop != -1)
 		{
@@ -167,12 +167,12 @@
 				m_mousePressed = false;
 				return;
 			}
-			m_stops[m_currentStop] = m->x() - 10;
+			m_stops[m_currentStop] = m->position().x() - 10;
 		}
 		else
 		{
 			if (m_dashValues.count() < 10)
-				m_stops.append(m->x() - 10);
+				m_stops.append(m->position().x() - 10);
 			std::sort(m_stops.begin(), m_stops.end());
 			m_currentStop = 0;
 			for (int i = 0; i < m_stops.count(); ++i)
@@ -206,7 +206,7 @@
 	m->accept();
 
 	QRect fpo;
-	if ((!m_mousePressed) && (m->y() < height()) && (m->y() > 16) && (m->x() > 9) && (m->x() < width() - 9) && (m_dashValues.count() < 10))
+	if ((!m_mousePressed) && (m->position().y() < height()) && (m->position().y() > 16) && (m->position().x() > 9) && (m->position().x() < width() - 9) && (m_dashValues.count() < 10))
 	{
 		setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
 		for (int i = 0; i < m_stops.count(); ++i)
@@ -219,20 +219,20 @@
 			}
 		}
 	}
-	if ((m_mousePressed) && (m->y() < height()) && (m->y() > 16) && (m->x() > 9) && (m->x() < width() - 9) && (m_currentStop != -1))
+	if ((m_mousePressed) && (m->position().y() < height()) && (m->position().y() > 16) && (m->position().x() > 9) && (m->position().x() < width() - 9) && (m_currentStop != -1))
 	{
 		qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
 		if (m_currentStop > 1)
 		{
-			if (static_cast<int>(m_stops[m_currentStop - 1] + 10) + 2 >= m->x())
+			if (static_cast<int>(m_stops[m_currentStop - 1] + 10) + 2 >= m->position().x())
 				return;
 		}
 		if (m_currentStop < static_cast<int>(m_stops.count() - 2))
 		{
-			if (static_cast<int>(m_stops[m_currentStop + 1] + 10) - 2 < m->x())
+			if (static_cast<int>(m_stops[m_currentStop + 1] + 10) - 2 < m->position().x())
 				return;
 		}
-		m_stops[m_currentStop] = m->x() - 10;
+		m_stops[m_currentStop] = m->position().x() - 10;
 		m_dashValues.clear();
 		double startX = 0.0;
 		for (int i = 0; i < m_stops.count(); ++i)
@@ -250,7 +250,7 @@
 		}
 		emit currStep(m_stops[m_currentStop] / 10.0 - startX);
 	}
-	if ((m_mousePressed) && (m_outside || m->y() > 30) && (m_currentStop >= 0) && (m_stops.count() > 2))
+	if ((m_mousePressed) && (m_outside || m->position().y() > 30) && (m_currentStop >= 0) && (m_stops.count() > 2))
 		qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
 }
 

Modified: trunk/Scribus/scribus/ui/gradientpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/ui/gradientpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/gradientpreview.cpp	(original)
+++ trunk/Scribus/scribus/ui/gradientpreview.cpp	Fri Feb  4 21:52:30 2022
@@ -179,10 +179,10 @@
 				QList<VColorStop*> cstops = fill_gradient.colorStops();
 				emit selectedStop(cstops.at(ActStop));
 			}
-			if ((m->y() < height()) && (m->y() > 43) && (m->x() > 0) && (m->x() < width()) && (ActStop == -1))
+			if ((m->position().y() < height()) && (m->position().y() > 43) && (m->position().x() > 0) && (m->position().x() < width()) && (ActStop == -1))
 			{
 				QList<VColorStop*> cstops = fill_gradient.colorStops();
-				double  newStop = static_cast<double>((m->x() - 10)) / (static_cast<double>(width()) - 20);
+				double  newStop = static_cast<double>((m->position().x() - 10)) / (static_cast<double>(width()) - 20);
 				QColor  stopColor = (cstops.count() > 0) ? cstops.at(0)->color : QColor(255, 255, 255);
 				QString stopName  = (cstops.count() > 0) ? cstops.at(0)->name  : QString("White");
 				int     stopShade = (cstops.count() > 0) ? cstops.at(0)->shade : 100;
@@ -244,7 +244,7 @@
 	{
 		QRect fpo;
 		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-		if ((!Mpressed) && (m->y() < height()) && (m->y() > 43) && (m->x() > 9) && (m->x() < width()-9))
+		if ((!Mpressed) && (m->position().y() < height()) && (m->position().y() > 43) && (m->position().x() > 9) && (m->position().x() < width()-9))
 		{
 			setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
 			for (int yg = 0; yg < static_cast<int>(StopM.count()); ++yg)
@@ -259,21 +259,21 @@
 		}
 		if (m->buttons() & Qt::LeftButton)
 		{
-			if ((Mpressed) && (m->y() < height()) && (m->y() > 43) && (m->x() > 9) && (m->x() < width() - 9) && (ActStop != -1))
+			if ((Mpressed) && (m->position().y() < height()) && (m->position().y() > 43) && (m->position().x() > 9) && (m->position().x() < width() - 9) && (ActStop != -1))
 			{
 				qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
-				double newStop = static_cast<double>((m->x() - 10)) / (static_cast<double>(width()) - 20);
+				double newStop = static_cast<double>((m->position().x() - 10)) / (static_cast<double>(width()) - 20);
 				if (ActStop > 1)
 				{
-					if (StopM[ActStop-1]+2 >= m->x())
+					if (StopM[ActStop-1]+2 >= m->position().x())
 						return;
 				}
 				if (ActStop < static_cast<int>(StopM.count()-2))
 				{
-					if (StopM[ActStop+1]-2 < m->x())
+					if (StopM[ActStop+1]-2 < m->position().x())
 						return;
 				}
-				StopM[ActStop] = m->x();
+				StopM[ActStop] = m->position().x();
 				QList<VColorStop*> cstops = fill_gradient.colorStops();
 				cstops.at(ActStop)->rampPoint = newStop;
 				std::sort(cstops.begin(), cstops.end());

Modified: trunk/Scribus/scribus/ui/helpbrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp	(original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp	Fri Feb  4 21:52:30 2022
@@ -260,13 +260,13 @@
 	histMenu = new QMenu(this);
 
 	//Add Menu items
-	filePrint = fileMenu->addAction(iconManager.loadIcon("16/document-print.png"), "", this, SLOT(print()), Qt::CTRL+Qt::Key_P);
+	filePrint = fileMenu->addAction(iconManager.loadIcon("16/document-print.png"), "", this, SLOT(print()), Qt::CTRL|Qt::Key_P);
 	fileMenu->addSeparator();
-	fileExit = fileMenu->addAction(iconManager.loadIcon("exit.png"), "", this, SLOT(close()), Qt::CTRL+Qt::Key_W);
-	editFind = editMenu->addAction(iconManager.loadIcon("find.png"), "", this, SLOT(find()), Qt::CTRL+Qt::Key_F);
+	fileExit = fileMenu->addAction(iconManager.loadIcon("exit.png"), "", this, SLOT(close()), Qt::CTRL|Qt::Key_W);
+	editFind = editMenu->addAction(iconManager.loadIcon("find.png"), "", this, SLOT(find()), Qt::CTRL|Qt::Key_F);
 	editFindNext = editMenu->addAction( "", this, SLOT(findNext()), Qt::Key_F3);
-	editFindPrev = editMenu->addAction( "", this, SLOT(findPrevious()), Qt::SHIFT+Qt::Key_F3);
-	bookAdd = bookMenu->addAction( "", this, SLOT(bookmarkButton_clicked()), Qt::CTRL+Qt::Key_D);
+	editFindPrev = editMenu->addAction( "", this, SLOT(findPrevious()), Qt::SHIFT|Qt::Key_F3);
+	bookAdd = bookMenu->addAction( "", this, SLOT(bookmarkButton_clicked()), Qt::CTRL|Qt::Key_D);
 	bookDel = bookMenu->addAction( "", this, SLOT(deleteBookmarkButton_clicked()));
 	bookDelAll = bookMenu->addAction( "", this, SLOT(deleteAllBookmarkButton_clicked()));
 

Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24900&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp	(original)
+++ trunk/Scribus/scribus/ui/hruler.cpp	Fri Feb  4 21:52:30 2022
@@ -177,7 +177,7 @@
 	if (m_doc->isLoading())
 		return;
 	m_mousePressed = true;
-	m_mouseX = m->x();
+	m_mouseX = m->position().x();
 	if (m_textEditMode)
 	{
 		m_rulerCode = findRulerHandle(m->pos(), m_doc->guidesPrefs().grabRadius);
@@ -185,7 +185,7 @@
 		if ((m_rulerCode == rc_none) && (m_currCol != 0) && (m->button() == Qt::LeftButton))
 		{
 			ParagraphStyle::TabRecord tb;
-			tb.tabPosition = localToTextPos(m->x());
+			tb.tabPosition = localToTextPos(m->position().x());
 			tb.tabType = 0;
 			tb.tabFillChar = m_doc->itemToolPrefs().textTabFillChar[0];
 			m_tabValues.prepend(tb);
@@ -216,7 +216,7 @@
 	}
 	if (m_textEditMode && m_currItem)
 	{
-		if ((m->y() < height()) && (m->y() > 0))
+		if ((m->position().y() < height()) && (m->position().y() > 0))
 		{
 			bool mustApplyStyle = false;
 			ParagraphStyle paraStyle;
@@ -328,7 +328,7 @@
 			ColStart = textPosToLocal((colWidth + m_colGap) * (m_currCol- 1));
 			ColEnd   = textPosToLocal((colWidth + m_colGap) * (m_currCol- 1) + colWidth);
 		}
-		if ((m_mousePressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > ColStart - m_doc->guidesPrefs().grabRadius) && (m->x() < ColEnd + m_doc->guidesPrefs().grabRadius))
+		if ((m_mousePressed) && (m->position().y() < height()) && (m->position().y() > 0) && (m->position().x() > ColStart - m_doc->guidesPrefs().grabRadius) && (m->position().x() < ColEnd + m_doc->guidesPrefs().grabRadius))
 		{
 			qApp->changeOverrideCursor(QCursor(Qt::SizeHorCursor));
 			double toplimit = textWidth() + m_distRight - (m_colGap * (m_cols - 1)) - 1;
@@ -336,7 +336,7 @@
 			switch (m_rulerCode)
 			{
 				case rc_leftFrameDist:
-					m_distLeft -= (m_mouseX - m->x()) / m_scaling;
+					m_distLeft -= (m_mouseX - m->position().x()) / m_scaling;
 					if (m_distLeft < 0)
 						m_distLeft = 0;
 					if (m_distLeft > toplimit2)
@@ -345,7 +345,7 @@
 					repaint();
 					break;
 				case rc_rightFrameDist:
-					m_distRight += (m_mouseX - m->x()) / m_scaling;
+					m_distRight += (m_mouseX - m->position().x()) / m_scaling;
 					if (m_distRight < 0)
 						m_distRight = 0;
 					if (m_distRight > toplimit)
@@ -354,7 +354,7 @@
 					repaint();
 					break;
 				case rc_indentFirst:
-					m_firstIndent -= (m_mouseX - m->x()) / m_scaling;
+					m_firstIndent -= (m_mouseX - m->position().x()) / m_scaling;
 					if (m_firstIndent + m_leftMargin < 0)
 						m_firstIndent = -m_leftMargin;
 					if (m_firstIndent + m_leftMargin > colWidth)
@@ -364,7 +364,7 @@
 					break;
 				case rc_leftMargin:
 					oldInd = m_leftMargin + m_firstIndent;
-					m_leftMargin -= (m_mouseX - m->x()) / m_scaling;
+					m_leftMargin -= (m_mouseX - m->position().x()) / m_scaling;
 					if (m_leftMargin < 0)
 						m_leftMargin = 0;
 					if (m_leftMargin > colWidth - 1)
@@ -374,7 +374,7 @@
 					repaint();
 					break;
 				case rc_rightMargin:
-					m_rightMargin -= (m_mouseX - m->x()) / m_scaling;
+					m_rightMargin -= (m_mouseX - m->position().x()) / m_scaling;
 					if (m_rightMargin < 0)
 						m_rightMargin = 0;
 					if (m_rightMargin > colWidth - 1)
@@ -383,7 +383,7 @@
 					repaint();
 					break;
 				case rc_tab:
-					m_tabValues[m_currTab].tabPosition -= (m_mouseX - m->x()) / m_scaling;
+					m_tabValues[m_currTab].tabPosition -= (m_mouseX - m->position().x()) / m_scaling;
 					if (m_tabValues[m_currTab].tabPosition < 0)
 						m_tabValues[m_currTab].tabPosition = 0;
 					if (m_tabValues[m_currTab].tabPosition > colWidth - 1)
@@ -395,7 +395,7 @@
 				default:
 					break;
 			}
-			m_mouseX = m->x();
+			m_mouseX = m->position().x();
 			return;
 		}
 		if ((!m_mousePressed) && (m->y() < height()) && (m->y() > 0) && (m->x() > ColStart - 2*m_doc->guidesPrefs().grabRadius) && (m->x() < ColEnd + 2*m_doc->guidesPrefs().grabRadius))
@@ -422,12 +422,12 @@
 					setCursor(QCursor(Qt::SizeHorCursor));
 					break;
 			}
-			draw(m->x());
-			double marker = localToTextPos(m->x());
+			draw(m->position().x());
+			double marker = localToTextPos(m->position().x());
 			emit MarkerMoved(textBase(), marker);
 			return;
 		}
-		if ((m_mousePressed) && (m_rulerCode == rc_tab) && ((m->y() > height()) || (m->y() < 0)))
+		if ((m_mousePressed) && (m_rulerCode == rc_tab) && ((m->position().y() > height()) || (m->position().y() < 0)))
 		{
 			setCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
 			return;




More information about the scribus-commit mailing list