r24931 by craig - Fix some slot connection normalisation warnings
scribus-commit
scribus-commit at lists.scribus.net
Wed Feb 9 20:34:54 UTC 2022
Author: craig
Date: Wed Feb 9 20:34:54 2022
New Revision: 24931
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24931
Log:
Fix some slot connection normalisation warnings
Modified:
trunk/Scribus/scribus/canvasmode_editpolygon.cpp
trunk/Scribus/scribus/canvasmode_editspiral.cpp
trunk/Scribus/scribus/chartableview.cpp
trunk/Scribus/scribus/fpointarray.cpp
trunk/Scribus/scribus/pluginmanager.cpp
trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
trunk/Scribus/scribus/plugins/picbrowser/loadimage.cpp
trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
trunk/Scribus/scribus/scimagecachemanager.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/third_party/lib2geom/basic-intersection.cpp
trunk/Scribus/scribus/third_party/lib2geom/point.h
trunk/Scribus/scribus/ui/guidemanager.cpp
trunk/Scribus/scribus/ui/helpbrowser.cpp
trunk/Scribus/scribus/ui/hyask.cpp
trunk/Scribus/scribus/ui/inlinepalette.cpp
trunk/Scribus/scribus/ui/javadocs.cpp
trunk/Scribus/scribus/ui/latexeditor.cpp
trunk/Scribus/scribus/ui/modetoolbar.cpp
trunk/Scribus/scribus/ui/movepage.cpp
trunk/Scribus/scribus/ui/newdocdialog.cpp
trunk/Scribus/scribus/ui/outlinepalette.cpp
trunk/Scribus/scribus/ui/outputpreview_pdf.cpp
trunk/Scribus/scribus/ui/outputpreview_ps.cpp
trunk/Scribus/scribus/ui/pagelayout.cpp
trunk/Scribus/scribus/ui/pagepalette_widgets.h
trunk/Scribus/scribus/ui/picsearchoptions.cpp
trunk/Scribus/scribus/ui/prefs_documentsections.h
trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
trunk/Scribus/scribus/ui/printpreview.cpp
trunk/Scribus/scribus/ui/propertiespalette.cpp
trunk/Scribus/scribus/ui/propertiespalette_line.cpp
trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
trunk/Scribus/scribus/ui/propertywidget_distance.cpp
trunk/Scribus/scribus/ui/propertywidget_dropcap.cpp
trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/scrapbookpalette.cpp
trunk/Scribus/scribus/ui/storyeditor.cpp
trunk/Scribus/scribus/ui/storyeditor.h
trunk/Scribus/scribus/ui/transparencypalette.h
trunk/Scribus/scribus/ui/unicodesearch.cpp
Modified: trunk/Scribus/scribus/canvasmode_editpolygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/canvasmode_editpolygon.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editpolygon.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editpolygon.cpp Wed Feb 9 20:34:54 2022
@@ -214,7 +214,7 @@
m_view->update();
connect(m_doc, SIGNAL(docChanged()), this, SLOT(updateFromItem()));
- connect(m_VectorDialog, SIGNAL(NewVectors(int, double, bool, double, double, double, double)), this, SLOT(applyValues(int, double, bool, double, double, double, double)));
+ connect(m_VectorDialog, SIGNAL(NewVectors(int,double,bool,double,double,double,double)), this, SLOT(applyValues(int,double,bool,double,double,double,double)));
connect(m_VectorDialog, SIGNAL(endEdit()), this, SLOT(endEditing()));
connect(m_VectorDialog, SIGNAL(paletteShown(bool)), this, SLOT(endEditing(bool)));
}
Modified: trunk/Scribus/scribus/canvasmode_editspiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/canvasmode_editspiral.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editspiral.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editspiral.cpp Wed Feb 9 20:34:54 2022
@@ -133,7 +133,7 @@
{
m_view->update();
}
- connect(m_VectorDialog, SIGNAL(NewVectors(double, double, double)), this, SLOT(applyValues(double, double, double)));
+ connect(m_VectorDialog, SIGNAL(NewVectors(double,double,double)), this, SLOT(applyValues(double,double,double)));
connect(m_VectorDialog, SIGNAL(endEdit()), this, SLOT(endEditing()));
connect(m_VectorDialog, SIGNAL(paletteShown(bool)), this, SLOT(endEditing(bool)));
connect(m_doc, SIGNAL(docChanged()), this, SLOT(updateFromItem()));
Modified: trunk/Scribus/scribus/chartableview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/chartableview.cpp
==============================================================================
--- trunk/Scribus/scribus/chartableview.cpp (original)
+++ trunk/Scribus/scribus/chartableview.cpp Wed Feb 9 20:34:54 2022
@@ -20,7 +20,7 @@
{
deleteAct = new QAction( tr("Delete"), this);
connect(deleteAct, SIGNAL(triggered()), this, SLOT(removeCharacter()));
- connect(this, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(viewDoubleClicked(const QModelIndex &)));
+ connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(viewDoubleClicked(QModelIndex&)));
actionMenu = new QMenu(this);
actionMenu->addAction(deleteAct);
Modified: trunk/Scribus/scribus/fpointarray.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/fpointarray.cpp
==============================================================================
--- trunk/Scribus/scribus/fpointarray.cpp (original)
+++ trunk/Scribus/scribus/fpointarray.cpp Wed Feb 9 20:34:54 2022
@@ -432,33 +432,33 @@
{
// Copy points.
FPoint q[ 4 ];
- q[ 0 ] = point(seg);
- q[ 1 ] = point(seg + 1);
- q[ 3 ] = point(seg + 2);
- q[ 2 ] = point(seg + 3);
+ q[0] = point(seg);
+ q[1] = point(seg + 1);
+ q[3] = point(seg + 2);
+ q[2] = point(seg + 3);
// The De Casteljau algorithm.
for (unsigned short j = 1; j <= 3; j++)
{
for (unsigned short i = 0; i <= 3 - j; i++)
{
- q[ i ] = (1.0 - t) * q[ i ] + t * q[ i + 1 ];
+ q[i] = (1.0 - t) * q[i] + t * q[ i + 1 ];
}
// Save second derivative now that we have it.
if (j == 1)
{
if (d2)
- *d2 = 6 * (q[ 2 ] - 2 * q[ 1 ] + q[ 0 ]);
+ *d2 = 6 * (q[2] - 2 * q[1] + q[0]);
}
// Save first derivative now that we have it.
else if (j == 2)
{
if (d1)
- *d1 = 3 * (q[ 1 ] - q[ 0 ]);
+ *d1 = 3 * (q[1] - q[0]);
}
}
// Save point.
if (p)
- *p = q[ 0 ];
+ *p = q[0];
}
bool FPointArray::isBezierClosed() const
@@ -501,7 +501,7 @@
QString FPointArray::svgPath(bool closed) const
{
- QString tmp = "";
+ QString tmp;
FPoint np, np1, np2, np3, np4, firstP;
bool nPath = true;
bool first = true;
@@ -719,14 +719,8 @@
void FPointArray::calculateArc(bool relative, double &curx, double &cury, double angle,
double x, double y, double r1, double r2, bool largeArcFlag, bool sweepFlag)
{
- double sin_th, cos_th;
- double a00, a01, a10, a11;
- double x0, y0, x1, y1, xc, yc;
- double d, sfactor, sfactor_sq;
- double th0, th1, th_arc;
- int i, n_segs;
- sin_th = sin(angle * (M_PI / 180.0));
- cos_th = cos(angle * (M_PI / 180.0));
+ double sin_th = sin(angle * (M_PI / 180.0));
+ double cos_th = cos(angle * (M_PI / 180.0));
double dx;
if (!relative)
dx = (curx - x) / 2.0;
@@ -750,12 +744,14 @@
r1 = r1 * sqrt(check);
r2 = r2 * sqrt(check);
}
- a00 = cos_th / r1;
- a01 = sin_th / r1;
- a10 = -sin_th / r2;
- a11 = cos_th / r2;
- x0 = a00 * curx + a01 * cury;
- y0 = a10 * curx + a11 * cury;
+
+ double a00 = cos_th / r1;
+ double a01 = sin_th / r1;
+ double a10 = -sin_th / r2;
+ double a11 = cos_th / r2;
+ double x0 = a00 * curx + a01 * cury;
+ double y0 = a10 * curx + a11 * cury;
+ double x1, y1;
if (!relative)
x1 = a00 * x + a01 * y;
else
@@ -769,52 +765,46 @@
The arc fits a unit-radius circle in this space.
*/
- d = (x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0);
- sfactor_sq = 1.0 / d - 0.25;
+ double d = (x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0);
+ double sfactor_sq = 1.0 / d - 0.25;
if (sfactor_sq < 0)
sfactor_sq = 0;
- sfactor = sqrt(sfactor_sq);
+ double sfactor = sqrt(sfactor_sq);
if (sweepFlag == largeArcFlag)
sfactor = -sfactor;
- xc = 0.5 * (x0 + x1) - sfactor * (y1 - y0);
- yc = 0.5 * (y0 + y1) + sfactor * (x1 - x0);
+
+ double xc = 0.5 * (x0 + x1) - sfactor * (y1 - y0);
+ double yc = 0.5 * (y0 + y1) + sfactor * (x1 - x0);
/* (xc, yc) is center of the circle. */
- th0 = atan2(y0 - yc, x0 - xc);
- th1 = atan2(y1 - yc, x1 - xc);
- th_arc = th1 - th0;
+ double th0 = atan2(y0 - yc, x0 - xc);
+ double th1 = atan2(y1 - yc, x1 - xc);
+ double th_arc = th1 - th0;
if (th_arc < 0 && sweepFlag)
th_arc += 2 * M_PI;
else if (th_arc > 0 && !sweepFlag)
th_arc -= 2 * M_PI;
- n_segs = static_cast<int>(ceil(fabs(th_arc / (M_PI * 0.5 + 0.001))));
- for (i = 0; i < n_segs; i++)
- {
- {
- double sin_th, cos_th;
- double a00, a01, a10, a11;
- double x1, y1, x2, y2, x3, y3;
- double t;
- double th_half;
+ int n_segs = static_cast<int>(ceil(fabs(th_arc / (M_PI * 0.5 + 0.001))));
+ for (int i = 0; i < n_segs; i++)
+ {
double _th0 = th0 + i * th_arc / n_segs;
double _th1 = th0 + (i + 1) * th_arc / n_segs;
- sin_th = sin(angle * (M_PI / 180.0));
- cos_th = cos(angle * (M_PI / 180.0));
+ double sin_th = sin(angle * (M_PI / 180.0));
+ double cos_th = cos(angle * (M_PI / 180.0));
/* inverse transform compared with rsvg_path_arc */
- a00 = cos_th * r1;
- a01 = -sin_th * r2;
- a10 = sin_th * r1;
- a11 = cos_th * r2;
- th_half = 0.5 * (_th1 - _th0);
- t = (8.0 / 3.0) * sin(th_half * 0.5) * sin(th_half * 0.5) / sin(th_half);
- x1 = xc + cos(_th0) - t * sin(_th0);
- y1 = yc + sin(_th0) + t * cos(_th0);
- x3 = xc + cos(_th1);
- y3 = yc + sin(_th1);
- x2 = x3 + t * sin(_th1);
- y2 = y3 - t * cos(_th1);
+ double a00 = cos_th * r1;
+ double a01 = -sin_th * r2;
+ double a10 = sin_th * r1;
+ double a11 = cos_th * r2;
+ double th_half = 0.5 * (_th1 - _th0);
+ double t = (8.0 / 3.0) * sin(th_half * 0.5) * sin(th_half * 0.5) / sin(th_half);
+ double x1 = xc + cos(_th0) - t * sin(_th0);
+ double y1 = yc + sin(_th0) + t * cos(_th0);
+ double x3 = xc + cos(_th1);
+ double y3 = yc + sin(_th1);
+ double x2 = x3 + t * sin(_th1);
+ double y2 = y3 - t * cos(_th1);
svgCurveToCubic(a00 * x1 + a01 * y1, a10 * x1 + a11 * y1, a00 * x2 + a01 * y2, a10 * x2 + a11 * y2, a00 * x3 + a01 * y3, a10 * x3 + a11 * y3);
- }
}
if (!relative)
curx = x;
@@ -829,16 +819,12 @@
static const char * getCoord(const char *ptr, double &number)
{
- int integer, exponent;
- double decimal, frac;
- int sign, expsign;
-
- exponent = 0;
- integer = 0;
- frac = 1.0;
- decimal = 0;
- sign = 1;
- expsign = 1;
+ int exponent = 0;
+ int integer = 0;
+ double frac = 1.0;
+ double decimal = 0;
+ int sign = 1;
+ int expsign = 1;
// read the sign
if (*ptr == '+')
Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Wed Feb 9 20:34:54 2022
@@ -411,7 +411,7 @@
sew->seActions[ai.name]->setEnabled(ai.enabledForStoryEditor);
// Connect action's activated signal with the plugin's run method
- it.value().enabled = connect(sew->seActions[ai.name], SIGNAL(triggeredData(QWidget*, ScribusDoc*)), plugin, SLOT(run(QWidget*, ScribusDoc*)));
+ it.value().enabled = connect(sew->seActions[ai.name], SIGNAL(triggeredData(QWidget*,ScribusDoc*)), plugin, SLOT(run(QWidget*,ScribusDoc*)));
//Get the menu manager to add the DLL's menu item to the right menu, after the chosen existing item
if (ai.menuAfterName.isEmpty())
Modified: trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp Wed Feb 9 20:34:54 2022
@@ -98,16 +98,11 @@
colorspaceTab_currentChanged(colorspaceTab->currentIndex());
// signals and slots that cannot be in ui file
- connect(colorWheel, SIGNAL(clicked(int, const QPoint&)),
- this, SLOT(colorWheel_clicked(int, const QPoint&)));
- connect(documentColorList, SIGNAL(currentTextChanged(QString)),
- this, SLOT(documentColorList_currentChanged(QString)));
- connect(colorList, SIGNAL(currentTextChanged(QString)),
- this, SLOT(colorList_currentChanged(QString)));
- connect(angleSpin, SIGNAL(valueChanged(int)),
- this, SLOT(angleSpin_valueChanged(int)));
- connect(colorspaceTab, SIGNAL(currentChanged(int)),
- this, SLOT(colorspaceTab_currentChanged(int)));
+ connect(colorWheel, SIGNAL(clicked(int,QPoint)),this, SLOT(colorWheel_clicked(int,QPoint)));
+ connect(documentColorList, SIGNAL(currentTextChanged(QString)), this, SLOT(documentColorList_currentChanged(QString)));
+ connect(colorList, SIGNAL(currentTextChanged(QString)), this, SLOT(colorList_currentChanged(QString)));
+ connect(angleSpin, SIGNAL(valueChanged(int)), this, SLOT(angleSpin_valueChanged(int)));
+ connect(colorspaceTab, SIGNAL(currentChanged(int)), this, SLOT(colorspaceTab_currentChanged(int)));
connect(typeCombo, SIGNAL(activated(int)), this, SLOT(typeCombo_activated(int)));
connect(defectCombo, SIGNAL(activated(int)), this, SLOT(defectCombo_activated(int)));
connect(addButton, SIGNAL(clicked()), this, SLOT(addButton_clicked()));
Modified: trunk/Scribus/scribus/plugins/picbrowser/loadimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/plugins/picbrowser/loadimage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/loadimage.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/loadimage.cpp Wed Feb 9 20:34:54 2022
@@ -53,9 +53,9 @@
// connect(&help, SIGNAL(imageLoadError(int, int, int)), pModel, SLOT(processImageLoadError(int, int, int)), Qt::QueuedConnection);
// connect(pictureBrowser, SIGNAL(loadImageJob(int, QString, int, int)), &help, SLOT(processLoadImageJob(int, QString, int, int)), Qt::QueuedConnection);
- connect(this, SIGNAL(imageLoaded(int, const QImage, ImageInformation*, int) ), pModel, SLOT(processLoadedImage(int, const QImage, ImageInformation*, int)), Qt::QueuedConnection);
- connect(this, SIGNAL(imageLoadError(int, int, int)), pModel, SLOT(processImageLoadError(int, int, int)), Qt::QueuedConnection);
- connect(pictureBrowser, SIGNAL(loadImageJob(int, QString, int, int)), this, SLOT(processLoadImageJob(int, QString, int, int)), Qt::QueuedConnection);
+ connect(this, SIGNAL(imageLoaded(int,QImage,ImageInformation*,int)), pModel, SLOT(processLoadedImage(int,QImage,ImageInformation*,int)), Qt::QueuedConnection);
+ connect(this, SIGNAL(imageLoadError(int,int,int)), pModel, SLOT(processImageLoadError(int,int,int)), Qt::QueuedConnection);
+ connect(pictureBrowser, SIGNAL(loadImageJob(int,QString,int,int)), this, SLOT(processLoadImageJob(int,QString,int,int)), Qt::QueuedConnection);
exec();
}
Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp Wed Feb 9 20:34:54 2022
@@ -67,9 +67,9 @@
//"goto page" button in documentbrowser
connect(gotoPageButton, SIGNAL(clicked()), this, SLOT(gotoPageButtonClicked()));
- connect(folderView, SIGNAL(activated(const QModelIndex &)), this, SLOT(dirChosen(const QModelIndex &)));
- connect(folderView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(dirChosen(const QModelIndex &)));
- connect(folderView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(dirChosen(const QModelIndex &)));
+ connect(folderView, SIGNAL(activated(QModelIndex)), this, SLOT(dirChosen(QModelIndex)));
+ connect(folderView, SIGNAL(clicked(QModelIndex)), this, SLOT(dirChosen(QModelIndex)));
+ connect(folderView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(dirChosen(QModelIndex)));
//changing page
connect(this, SIGNAL(selectPage(int)), ScCore->primaryMainWindow(), SLOT(selectPagesFromOutlines(int)));
@@ -127,28 +127,28 @@
lit = new loadImagesThread(this, pModel);
lit->start();
- connect(imageViewArea, SIGNAL(clicked(const QModelIndex &)), this, SLOT(previewIconClicked(const QModelIndex &)));
- connect(imageViewArea, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(previewIconDoubleClicked(const QModelIndex &)));
+ connect(imageViewArea, SIGNAL(clicked(QModelIndex)), this, SLOT(previewIconClicked(QModelIndex)));
+ connect(imageViewArea, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(previewIconDoubleClicked(QModelIndex)));
imageViewArea->SetIconSize(QSize(pbSettings.previewIconSize, pbSettings.previewIconSize));
imageViewArea->SetGridSize(QSize(qRound(( 1.1)*pbSettings.previewIconSize),(qRound(( 1.1)*pbSettings.previewIconSize)+ pbSettings.previewMode*10)));
imageViewArea->SetModel(pModel);
//register item selections
- connect(imageViewArea->SelectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)), this, SLOT(previewImageSelectionChanged(const QItemSelection &, const QItemSelection &)));
+ connect(imageViewArea->SelectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(previewImageSelectionChanged(QItemSelection, QItemSelection)));
//documentbrowser setup
- connect(documentWidget, SIGNAL(itemActivated(QTreeWidgetItem * , int)), this, SLOT(documentChosen(QTreeWidgetItem * , int)));
- connect(documentWidget, SIGNAL(itemClicked(QTreeWidgetItem * , int)), this, SLOT(documentChosen(QTreeWidgetItem * , int)));
+ connect(documentWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(documentChosen(QTreeWidgetItem*,int)));
+ connect(documentWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(documentChosen(QTreeWidgetItem*,int)));
documentWidget->setColumnCount(1);
documentWidget->setHeaderLabels(QStringList("Pages"));
//collectionsbrowser setup
- connect(collectionsWidget, SIGNAL(itemActivated(QTreeWidgetItem * , int)), this, SLOT(collectionChosen(QTreeWidgetItem * , int)));
- connect(collectionsWidget, SIGNAL(itemClicked(QTreeWidgetItem * , int)), this, SLOT(collectionChosen(QTreeWidgetItem * , int)));
- connect(collectionsWidget, SIGNAL(itemChanged(QTreeWidgetItem * , int)), this, SLOT(collectionsWidgetItemEdited(QTreeWidgetItem * , int)));
+ connect(collectionsWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(collectionChosen(QTreeWidgetItem*,int)));
+ connect(collectionsWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(collectionChosen(QTreeWidgetItem*,int)));
+ connect(collectionsWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(collectionsWidgetItemEdited(QTreeWidgetItem*,int)));
connect(collectionsNewCategoryButton, SIGNAL(clicked()), this, SLOT(collectionsNewCategoryButtonClicked()));
connect(collectionsNewButton, SIGNAL(clicked()), this, SLOT(collectionsNewButtonClicked()));
connect(collectionsImportButton, SIGNAL(clicked()), this, SLOT(collectionsImportButtonClicked()));
Modified: trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp (original)
+++ trunk/Scribus/scribus/plugins/shapes/shapepalette.cpp Wed Feb 9 20:34:54 2022
@@ -66,7 +66,7 @@
setItemDelegate(delegate);
setIconSize(QSize(48, 48));
- connect(this, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(HandleContextMenu(QPoint)));
+ connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(HandleContextMenu(QPoint)));
}
void ShapeView::HandleContextMenu(QPoint)
@@ -282,17 +282,17 @@
{
setMinimumSize( QSize( 220, 240 ) );
setObjectName(QString::fromLocal8Bit("Shap"));
- setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
- containerWidget = new QWidget(this);
- vLayout = new QVBoxLayout( containerWidget );
- vLayout->setSpacing(3);
- vLayout->setContentsMargins(3, 3, 3, 3);
- buttonLayout = new QHBoxLayout;
- buttonLayout->setSpacing(6);
- buttonLayout->setContentsMargins(0, 0, 0, 0);
-
- importButton = new QToolButton(this);
- importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+ setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+ containerWidget = new QWidget(this);
+ vLayout = new QVBoxLayout( containerWidget );
+ vLayout->setSpacing(3);
+ vLayout->setContentsMargins(3, 3, 3, 3);
+ buttonLayout = new QHBoxLayout;
+ buttonLayout->setSpacing(6);
+ buttonLayout->setContentsMargins(0, 0, 0, 0);
+
+ importButton = new QToolButton(this);
+ importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
importButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
importButton->setIconSize(QSize(16, 16));
buttonLayout->addWidget( importButton );
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp Wed Feb 9 20:34:54 2022
@@ -223,7 +223,7 @@
}
QPainterPath tmpPath = effectPath.toQPainterPath(false);
PathDialog *dia = new PathDialog(m_doc->scMW(), m_doc->unitIndex(), tmpPath.length(), true);
- connect(dia, SIGNAL(updateValues(int, double, double, double, int)), this, SLOT(updateEffectG(int, double, double, double, int)));
+ connect(dia, SIGNAL(updateValues(int,double,double,double,int)), this, SLOT(updateEffectG(int,double,double,double,int)));
if (dia->exec())
{
updateEffectG(dia->effectType, dia->offset, dia->offsetY, dia->gap, dia->rotate);
@@ -261,7 +261,7 @@
originalRot = patternItem->rotation();
QPainterPath tmpPath = effectPath.toQPainterPath(false);
PathDialog *dia = new PathDialog(m_doc->scMW(), m_doc->unitIndex(), tmpPath.length(), false);
- connect(dia, SIGNAL(updateValues(int, double, double, double, int)), this, SLOT(updateEffect(int, double, double, double, int)));
+ connect(dia, SIGNAL(updateValues(int,double,double,double,int)), this, SLOT(updateEffect(int,double,double,double,int)));
if (dia->exec())
{
updateEffect(dia->effectType, dia->offset, dia->offsetY, dia->gap, dia->rotate);
@@ -326,9 +326,8 @@
PageItem* bxi = patternItemG[bx];
FPointArray pathP = originalPathG[bx].copy();
FPoint tp(getMinClipF(&pathP));
- double deltaX, deltaY;
- deltaX = originalXPosG[bx] - originX;
- deltaY = originalYPosG[bx] - originY;
+ double deltaX = originalXPosG[bx] - originX;
+ double deltaY = originalYPosG[bx] - originY;
QTransform mm;
mm.rotate(originalRotG[bx]);
pathP.map(mm);
Modified: trunk/Scribus/scribus/scimagecachemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/scimagecachemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/scimagecachemanager.cpp (original)
+++ trunk/Scribus/scribus/scimagecachemanager.cpp Wed Feb 9 20:34:54 2022
@@ -713,9 +713,9 @@
return;
}
- connect(d2, SIGNAL(fileCreated(ScImageCacheFile *, const QFileInfo &)), SLOT(fileCreated(ScImageCacheFile *, const QFileInfo &)));
- connect(d2, SIGNAL(fileChanged(ScImageCacheFile *, const QFileInfo &)), SLOT(fileChanged(ScImageCacheFile *, const QFileInfo &)));
- connect(d2, SIGNAL(fileRemoved(ScImageCacheFile *)), SLOT(fileRemoved(ScImageCacheFile *)));
+ connect(d2, SIGNAL(fileCreated(ScImageCacheFile*, QFileInfo)), SLOT(fileCreated(ScImageCacheFile*, QFileInfo)));
+ connect(d2, SIGNAL(fileChanged(ScImageCacheFile*, QFileInfo)), SLOT(fileChanged(ScImageCacheFile*, QFileInfo)));
+ connect(d2, SIGNAL(fileRemoved(ScImageCacheFile*)), SLOT(fileRemoved(ScImageCacheFile *)));
}
}
}
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Feb 9 20:34:54 2022
@@ -4153,7 +4153,7 @@
doc->disconnectDocSignals();
disconnect(ScCore->fileWatcher, SIGNAL(fileChanged(QString )), doc, SLOT(updatePict(QString)));
disconnect(ScCore->fileWatcher, SIGNAL(fileDeleted(QString )), doc, SLOT(removePict(QString)));
- disconnect(ScCore->fileWatcher, SIGNAL(dirChanged(QString )), doc, SLOT(updatePictDir(QString )));
+ disconnect(ScCore->fileWatcher, SIGNAL(dirChanged(QString )), doc, SLOT(updatePictDir(QString)));
if (ScCore->haveCMS())
doc->CloseCMSProfiles();
//<<Palettes
Modified: trunk/Scribus/scribus/third_party/lib2geom/basic-intersection.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/third_party/lib2geom/basic-intersection.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/basic-intersection.cpp (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/basic-intersection.cpp Wed Feb 9 20:34:54 2022
@@ -306,7 +306,7 @@
if( ( s < 0.0 ) || ( s > 1.0 ) || ( t < 0.0 ) || ( t > 1.0 ) )
return;
parameters.push_back(std::pair<double, double>(t0 + s * ( t1 - t0 ),
- u0 + t * ( u1 - u0 )));
+ u0 + t * ( u1 - u0)));
}
}
}
Modified: trunk/Scribus/scribus/third_party/lib2geom/point.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/third_party/lib2geom/point.h
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/point.h (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/point.h Wed Feb 9 20:34:54 2022
@@ -155,7 +155,7 @@
/** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/
inline bool operator<=(Point const &a, Point const &b) {
return ( ( a[Y] < b[Y] ) ||
- (( a[Y] == b[Y] ) && ( a[X] < b[X] )));
+ (( a[Y] == b[Y] ) && ( a[X] < b[X])));
}
Coord L1(Point const &p);
Modified: trunk/Scribus/scribus/ui/guidemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/guidemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/guidemanager.cpp Wed Feb 9 20:34:54 2022
@@ -72,8 +72,8 @@
connect(addVerButton, SIGNAL(clicked()), this, SLOT(addVerButton_clicked()));
connect(delVerButton, SIGNAL(clicked()), this, SLOT(delVerButton_clicked()));
connect(verticalView, SIGNAL(deleteKeyPressed()), this, SLOT(delVerButton_clicked()));
- connect(horizontalView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(forceDrawGuides(QItemSelection, QItemSelection)));
- connect(verticalView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(forceDrawGuides(QItemSelection, QItemSelection)));
+ connect(horizontalView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(forceDrawGuides(QItemSelection,QItemSelection)));
+ connect(verticalView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(forceDrawGuides(QItemSelection,QItemSelection)));
connect(applyToAllStdButton, SIGNAL(clicked()), this, SLOT(applyToAllStdButton_clicked()));
connect(horizontalAutoCountSpin, SIGNAL(valueChanged(double)), this, SLOT(horizontalAutoCountSpin_valueChanged(double)));
Modified: trunk/Scribus/scribus/ui/helpbrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp (original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp Wed Feb 9 20:34:54 2022
@@ -656,7 +656,7 @@
helpNav->listView->setSelectionMode(QAbstractItemView::SingleSelection);
QItemSelectionModel *selectionModel = new QItemSelectionModel(m_menuModel);
helpNav->listView->setSelectionModel(selectionModel);
- connect(helpNav->listView->selectionModel(), SIGNAL(selectionChanged( const QItemSelection &, const QItemSelection &)), this, SLOT(itemSelected( const QItemSelection &, const QItemSelection &)));
+ connect(helpNav->listView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(itemSelected(QItemSelection, QItemSelection)));
helpNav->listView->setColumnHidden(1,true);
}
Modified: trunk/Scribus/scribus/ui/hyask.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/hyask.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hyask.cpp (original)
+++ trunk/Scribus/scribus/ui/hyask.cpp Wed Feb 9 20:34:54 2022
@@ -118,10 +118,10 @@
Layout1->addLayout(vboxLayout3);
HyAskLayout->addLayout ( Layout1 );
- connect ( OK, SIGNAL ( clicked() ), this, SLOT ( accept() ) );
- connect ( Cancel, SIGNAL ( clicked() ), this, SLOT ( reject() ) );
- connect ( Skip, SIGNAL ( clicked() ), this, SLOT ( DoSkip() ) );
- connect ( Wort, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( Check() ) );
+ connect(OK, SIGNAL(clicked()), this, SLOT(accept()));
+ connect(Cancel, SIGNAL(clicked()), this, SLOT(reject()));
+ connect(Skip, SIGNAL(clicked()), this, SLOT(DoSkip()));
+ connect(Wort, SIGNAL(textChanged(QString)), this, SLOT (Check()));
resize(minimumSizeHint());
}
Modified: trunk/Scribus/scribus/ui/inlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/inlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/inlinepalette.cpp Wed Feb 9 20:34:54 2022
@@ -100,13 +100,13 @@
drag->exec(Qt::CopyAction);
clearSelection();
}
-
-InlinePalette::InlinePalette( QWidget* parent) : ScDockPalette(parent, "Inline", Qt::WindowFlags())
-{
- setContentsMargins(3, 3, 3, 3);
- setMinimumSize( QSize( 220, 240 ) );
- setObjectName(QString::fromLocal8Bit("Inline"));
- setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+
+InlinePalette::InlinePalette( QWidget* parent) : ScDockPalette(parent, "Inline", Qt::WindowFlags())
+{
+ setContentsMargins(3, 3, 3, 3);
+ setMinimumSize( QSize( 220, 240 ) );
+ setObjectName(QString::fromLocal8Bit("Inline"));
+ setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
InlineViewWidget = new InlineView(this);
InlineViewWidget->clear();
setWidget( InlineViewWidget );
@@ -115,7 +115,7 @@
m_scMW = nullptr;
currentEditedItem = -1;
languageChange();
- connect(InlineViewWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
+ connect(InlineViewWidget, SIGNAL(itemDoubleClicked(QListWidgetItem )), this, SLOT(handleDoubleClick(QListWidgetItem*)));
connect(InlineViewWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(handleContextMenue(QPoint)));
connect(InlineViewWidget, SIGNAL(objectDropped(QString)), this, SIGNAL(objectDropped(QString)));
}
Modified: trunk/Scribus/scribus/ui/javadocs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/javadocs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/javadocs.cpp (original)
+++ trunk/Scribus/scribus/ui/javadocs.cpp Wed Feb 9 20:34:54 2022
@@ -75,7 +75,7 @@
connect(EditScript, SIGNAL(clicked()), this, SLOT(slotEdit()));
connect(DeleteScript, SIGNAL(clicked()), this, SLOT(slotDelete()));
connect(ExitDia, SIGNAL(clicked()), this, SLOT(accept()));
- connect(Scripts, SIGNAL(itemActivated (QListWidgetItem *)), this, SLOT(slotEdit()));
+ connect(Scripts, SIGNAL(itemActivated (QListWidgetItem*)), this, SLOT(slotEdit()));
connect(Scripts, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectionChanged()));
AddScript->setToolTip( "<qt>" + tr( "Adds a new Script, predefines a function with the same name. If you want to use this script as an \"Open Action\" script be sure not to change the name of the function." ) + "</qt>" );
}
Modified: trunk/Scribus/scribus/ui/latexeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/latexeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/latexeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/latexeditor.cpp Wed Feb 9 20:34:54 2022
@@ -559,13 +559,13 @@
iconList->setWrapping(true);
iconList->setResizeMode(QListView::Adjust);
- connect(iconList, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(newItemSelected(QListWidgetItem *, QListWidgetItem *)));
- connect(iconList, SIGNAL(itemDoubleClicked (QListWidgetItem *)), this, SLOT(itemDoubleClicked(QListWidgetItem *)));
+ connect(iconList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(newItemSelected(QListWidgetItem*,QListWidgetItem*)));
+ connect(iconList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemDoubleClicked(QListWidgetItem*)));
QHBoxLayout *hLayout = new QHBoxLayout();
QLabel *statusLabel = new QLabel(tr("No item selected!"));
DataPushButton *insertPushButton = new DataPushButton( tr("Insert Symbol") , iconList);
- connect(insertPushButton, SIGNAL(clickedWithData(QObject *)), this, SLOT(insertButtonClicked(QObject *)));
+ connect(insertPushButton, SIGNAL(clickedWithData(QObject*)), this, SLOT(insertButtonClicked(QObject*)));
hLayout->addWidget(statusLabel, 100);
hLayout->addWidget(insertPushButton, 0);
Modified: trunk/Scribus/scribus/ui/modetoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/modetoolbar.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/modetoolbar.cpp (original)
+++ trunk/Scribus/scribus/ui/modetoolbar.cpp Wed Feb 9 20:34:54 2022
@@ -106,7 +106,7 @@
this->addAction(m_ScMW->scrActions["toolsEyeDropper"]);
languageChange();
- connect(autoFormButtonGroup, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(SelShape(int, int, qreal *)));
+ connect(autoFormButtonGroup, SIGNAL(FormSel(int,int,qreal *)), this, SLOT(SelShape(int,int,qreal *)));
connect(Angle, SIGNAL(valueChanged(double)), this, SLOT(newCalValues()));
connect(PWidth, SIGNAL(valueChanged(double)), this, SLOT(newCalValues()));
}
Modified: trunk/Scribus/scribus/ui/movepage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/movepage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/movepage.cpp (original)
+++ trunk/Scribus/scribus/ui/movepage.cpp Wed Feb 9 20:34:54 2022
@@ -93,7 +93,7 @@
fromToLayout->addWidget( mvWhereData, currentRow, 0 );
fromToLayout->addItem(new QSpacerItem(moveLabel->fontMetrics().horizontalAdvance( tr( "Move Page(s):" )), 0), currentRow, 1);
fromToLayout->addWidget( mvWherePageData, currentRow, 2 );
-// fromToLayout->addColumnSpacing(0, moveLabel->fontMetrics().width( tr( "Move Page(s):" )));
+// fromToLayout->addColumnSpacing(0, moveLabel->fontMetrics().width( tr( "Move Page(s):")));
dialogLayout->addLayout( fromToLayout );
okCancelLayout = new QHBoxLayout();
Modified: trunk/Scribus/scribus/ui/newdocdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/newdocdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newdocdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/newdocdialog.cpp Wed Feb 9 20:34:54 2022
@@ -169,10 +169,10 @@
connect(unitOfMeasureComboBox, SIGNAL(activated(int)), this, SLOT(setUnit(int)));
connect(Distance, SIGNAL(valueChanged(double)), this, SLOT(setDistance(double)));
connect(autoTextFrame, SIGNAL(clicked()), this, SLOT(handleAutoFrame()));
- connect(layoutsView, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- connect(layoutsView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- connect(layoutsView, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- connect(layoutsView, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
+ connect(layoutsView, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ connect(layoutsView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ connect(layoutsView, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ connect(layoutsView, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
if (startUp)
{
connect(nftGui, SIGNAL(leaveOK()), this, SLOT(ExitOK()));
@@ -469,10 +469,10 @@
void NewDocDialog::selectItem(uint nr)
{
- disconnect(layoutsView, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- disconnect(layoutsView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- disconnect(layoutsView, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- disconnect(layoutsView, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
+ disconnect(layoutsView, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ disconnect(layoutsView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ disconnect(layoutsView, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ disconnect(layoutsView, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
if (nr > 0)
{
const QStringList& pageNames = prefsManager.appPrefs.pageSets[nr].pageNames;
@@ -489,10 +489,10 @@
}
layoutsView->setCurrentRow(nr);
layoutsView->item(nr)->setSelected(true);
- connect(layoutsView, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- connect(layoutsView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- connect(layoutsView, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
- connect(layoutsView, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem* )));
+ connect(layoutsView, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ connect(layoutsView, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ connect(layoutsView, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
+ connect(layoutsView, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
}
void NewDocDialog::itemSelected(QListWidgetItem* ic)
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Wed Feb 9 20:34:54 2022
@@ -480,12 +480,12 @@
// signals and slots connections
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
- connect(reportDisplay, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(slotRightClick(QPoint)));
+ connect(reportDisplay, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotRightClick(QPoint)));
connect(reportDisplay, SIGNAL(itemSelectionChanged()), this, SLOT(slotMultiSelect()));
- connect(reportDisplay, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(slotDoRename(QTreeWidgetItem*, int)));
+ connect(reportDisplay, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotDoRename(QTreeWidgetItem*,int)));
connect(filterEdit, SIGNAL(textChanged(QString)), this, SLOT(filterTree(QString)));
// connect(filterShortcut, SIGNAL(activated()), filterEdit, SLOT(setFocus()));
- connect(reportDisplay, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(slotDoubleClick(QTreeWidgetItem*, int)));
+ connect(reportDisplay, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(slotDoubleClick(QTreeWidgetItem*,int)));
}
void OutlinePalette::setMainWindow(ScribusMainWindow *mw)
Modified: trunk/Scribus/scribus/ui/outputpreview_pdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/outputpreview_pdf.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outputpreview_pdf.cpp (original)
+++ trunk/Scribus/scribus/ui/outputpreview_pdf.cpp Wed Feb 9 20:34:54 2022
@@ -130,7 +130,7 @@
connect(header, SIGNAL(sectionClicked(int)), this, SLOT(toggleAllFromHeader()));
connect(m_optionsUi->enableCMYK, SIGNAL(clicked()), this, SLOT(toggleCMYK()));
connect(m_optionsUi->displayInkCoverage, SIGNAL(clicked()), this, SLOT(toggleCMYK_Colour()));
- connect(m_optionsUi->inkTable, SIGNAL(cellDoubleClicked(int, int)), this, SLOT(onInkTableCellDoubleClicked(int)));
+ connect(m_optionsUi->inkTable, SIGNAL(cellDoubleClicked(int,int)), this, SLOT(onInkTableCellDoubleClicked(int)));
}
else
{
Modified: trunk/Scribus/scribus/ui/outputpreview_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/outputpreview_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outputpreview_ps.cpp (original)
+++ trunk/Scribus/scribus/ui/outputpreview_ps.cpp Wed Feb 9 20:34:54 2022
@@ -138,7 +138,7 @@
connect(header, SIGNAL(sectionClicked(int)), this, SLOT(toggleAllFromHeader()));
connect(m_optionsUi->enableCMYK, SIGNAL(clicked()), this, SLOT(toggleCMYK()));
connect(m_optionsUi->displayInkCoverage, SIGNAL(clicked()), this, SLOT(toggleCMYK_Colour()));
- connect(m_optionsUi->inkTable, SIGNAL(cellDoubleClicked(int, int)), this, SLOT(onInkTableCellDoubleClicked(int)));
+ connect(m_optionsUi->inkTable, SIGNAL(cellDoubleClicked(int,int)), this, SLOT(onInkTableCellDoubleClicked(int)));
}
else
{
Modified: trunk/Scribus/scribus/ui/pagelayout.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/pagelayout.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.cpp (original)
+++ trunk/Scribus/scribus/ui/pagelayout.cpp Wed Feb 9 20:34:54 2022
@@ -152,7 +152,7 @@
void PageLayouts::selectItem(uint nr)
{
if (modus)
- disconnect(layoutsView, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(itemSelected(QListWidgetItem* )));
+ disconnect(layoutsView, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(itemSelected(QListWidgetItem*)));
else
disconnect(layoutsCombo, SIGNAL(activated(int)), this, SLOT(itemSelected(int)));
disconnect(firstPage, SIGNAL(activated(int)), this, SIGNAL(selectedFirstPage(int)));
Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.h
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.h (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.h Wed Feb 9 20:34:54 2022
@@ -104,7 +104,7 @@
signals:
void UseTemp(QString, int);
void NewPage(int, QString);
- void movePage(int, int);
+ void movePage(int,int);
void Click(int, int, int);
void delPageRequest(int);
Modified: trunk/Scribus/scribus/ui/picsearchoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/picsearchoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picsearchoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/picsearchoptions.cpp Wed Feb 9 20:34:54 2022
@@ -122,7 +122,7 @@
int recurse = (recursiveSearch->isChecked()) ? -1 : 0;
FileSearch* search = new FileSearch(this, fileEdit->text(), m_strLastDirSearched, recurse, caseInsensitiveCheck->isChecked());
Q_CHECK_PTR(search);
- connect(search, SIGNAL(searchComplete(const QStringList&, const QString&)), SLOT(slotSearchPicFinished(const QStringList&, const QString&)));
+ connect(search, SIGNAL(searchComplete(QStringList, QString)), SLOT(slotSearchPicFinished(QStringList, QString)));
connect(search, SIGNAL(aborted(bool)), SLOT(slotSearchPicAborted(bool)));
// Set up the UI to let the user cancel the search, then start it
setSearchButton(true, search);
Modified: trunk/Scribus/scribus/ui/prefs_documentsections.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/prefs_documentsections.h
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsections.h (original)
+++ trunk/Scribus/scribus/ui/prefs_documentsections.h Wed Feb 9 20:34:54 2022
@@ -37,7 +37,7 @@
virtual void updateTable();
protected slots:
- virtual void tableItemChanged(int, int);
+ virtual void tableItemChanged(int,int);
virtual void addEntry();
virtual void deleteEntry();
};
Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp Wed Feb 9 20:34:54 2022
@@ -71,7 +71,7 @@
clearSearchButton->setIcon(IconManager::instance().loadIcon("clear_right.png"));
// signals and slots connections
- connect( keyTable, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(dispKey(QTreeWidgetItem*, QTreeWidgetItem*)));
+ connect( keyTable, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(dispKey(QTreeWidgetItem*,QTreeWidgetItem*)));
connect( noKey, SIGNAL(clicked()), this, SLOT(setNoKey()));
connect( setKeyButton, SIGNAL(clicked()), this, SLOT(setKeyText()));
connect( loadSetButton, SIGNAL(clicked()), this, SLOT(loadKeySetFile()));
Modified: trunk/Scribus/scribus/ui/printpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/printpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/printpreview.cpp (original)
+++ trunk/Scribus/scribus/ui/printpreview.cpp Wed Feb 9 20:34:54 2022
@@ -191,7 +191,7 @@
connect(header, SIGNAL(sectionClicked(int)), this, SLOT(toggleAllFromHeader()));
connect(m_ui->enableCMYK, SIGNAL(clicked()), this, SLOT(toggleCMYK()));
connect(m_ui->displayInkCoverage, SIGNAL(clicked()), this, SLOT(toggleCMYK_Colour()));
- connect(m_ui->inkTable, SIGNAL(cellDoubleClicked(int, int)), this, SLOT(onInkTableCellDoubleClicked(int)));
+ connect(m_ui->inkTable, SIGNAL(cellDoubleClicked(int,int)), this, SLOT(onInkTableCellDoubleClicked(int)));
}
else
{
Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Wed Feb 9 20:34:54 2022
@@ -95,9 +95,9 @@
connect(linePal, SIGNAL(lineModeChanged(int)), this, SLOT(NewLineMode(int)));
connect(TabStack, SIGNAL(currentChanged2(int)), this, SLOT(SelTab(int)));
- connect(colorPalette, SIGNAL(NewSpecial(double,double,double,double,double,double,double,double,double,double)), this, SLOT(NewSpGradient(double,double,double,double,double,double,double,double,double,double )));
+ connect(colorPalette, SIGNAL(NewSpecial(double,double,double,double,double,double,double,double,double,double)), this, SLOT(NewSpGradient(double,double,double,double,double,double,double,double,double,double)));
connect(colorPalette, SIGNAL(editGradient(int)), this, SLOT(toggleGradientEdit(int)));
- connect(transparencyPalette, SIGNAL(NewSpecial(double,double,double,double,double,double,double,double,double,double)), this, SLOT(NewSpGradientM(double,double,double,double,double,double,double,double )));
+ connect(transparencyPalette, SIGNAL(NewSpecial(double,double,double,double,double,double,double,double,double,double)), this, SLOT(NewSpGradientM(double,double,double,double,double,double,double,double)));
connect(transparencyPalette, SIGNAL(editGradient()), this, SLOT(toggleGradientEditM()));
m_haveItem = false;
Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Wed Feb 9 20:34:54 2022
@@ -75,10 +75,10 @@
connect(lineEndStyle, SIGNAL(activated(int)), this, SLOT(handleLineEnd()));
connect(lineMode, SIGNAL(activated(int)), this, SLOT(handleLineMode()));
connect(dashEditor, SIGNAL(dashChanged()), this, SLOT(handleDashChange()));
- connect(startArrow, SIGNAL(activated(int)), this, SLOT(handleStartArrow(int )));
- connect(endArrow, SIGNAL(activated(int)), this, SLOT(handleEndArrow(int )));
- connect(startArrowScale, SIGNAL(valueChanged(double)), this, SLOT(handleStartArrowScale(double )));
- connect(endArrowScale, SIGNAL(valueChanged(double)), this, SLOT(handleEndArrowScale(double )));
+ connect(startArrow, SIGNAL(activated(int)), this, SLOT(handleStartArrow(int)));
+ connect(endArrow, SIGNAL(activated(int)), this, SLOT(handleEndArrow(int)));
+ connect(startArrowScale, SIGNAL(valueChanged(double)), this, SLOT(handleStartArrowScale(double)));
+ connect(endArrowScale, SIGNAL(valueChanged(double)), this, SLOT(handleEndArrowScale(double)));
connect(lineStyles, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(handleLineStyle(QListWidgetItem*)));
}
Modified: trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp Wed Feb 9 20:34:54 2022
@@ -77,7 +77,7 @@
languageChange();
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- connect(this->model(), SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(handleNewValues()));
+ connect(this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(handleNewValues()));
connect(ScQApp, SIGNAL(localeChanged()), this, SLOT(localeChange()));
}
@@ -306,7 +306,7 @@
softShadowBlendMode->setStringValue( tr("Normal"));
softShadowBlendMode->setText(0, tr( "Blendmode:"));
- connect(this->model(), SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(handleNewValues()));
+ connect(this->model(), SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(handleNewValues()));
}
void PropertiesPalette_Shadow::updateSpinBoxConstants()
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Wed Feb 9 20:34:54 2022
@@ -52,11 +52,11 @@
connect(ScQApp, SIGNAL(localeChanged()), this, SLOT(localeChange()));
connect(textFlowBtnGroup, SIGNAL(idClicked(int)), this, SLOT(handleTextFlow()));
- connect(editShape , SIGNAL(clicked()) , this, SLOT(handleShapeEdit()));
- connect(roundRect , SIGNAL(valueChanged(double)) , this, SLOT(handleCornerRadius()));
- connect(evenOdd , SIGNAL(clicked()) , this, SLOT(handleFillRule()) );
- connect(nonZero , SIGNAL(clicked()) , this, SLOT(handleFillRule()) );
- connect(customShape, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(handleNewShape(int, int, qreal *)));
+ connect(editShape, SIGNAL(clicked()) , this, SLOT(handleShapeEdit()));
+ connect(roundRect, SIGNAL(valueChanged(double)) , this, SLOT(handleCornerRadius()));
+ connect(evenOdd, SIGNAL(clicked()), this, SLOT(handleFillRule()));
+ connect(nonZero, SIGNAL(clicked()), this, SLOT(handleFillRule()));
+ connect(customShape, SIGNAL(FormSel(int,int,qreal*)), this, SLOT(handleNewShape(int,int,qreal*)));
roundRect->showValue(0);
}
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Wed Feb 9 20:34:54 2022
@@ -117,7 +117,7 @@
{
m_ScMW = mw;
- connect(mw->appModeHelper, SIGNAL(AppModeChanged(int, int)), this, SLOT(handleAppModeChanged(int, int)));
+ connect(mw->appModeHelper, SIGNAL(AppModeChanged(int,int)), this, SLOT(handleAppModeChanged(int,int)));
}
void PropertiesPalette_XYZ::setDoc(ScribusDoc *d)
Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp Wed Feb 9 20:34:54 2022
@@ -55,7 +55,7 @@
{
m_ScMW = mw;
- connect(m_ScMW->appModeHelper, SIGNAL(AppModeChanged(int, int)), this, SLOT(handleAppModeChanged(int, int)));
+ connect(m_ScMW->appModeHelper, SIGNAL(AppModeChanged(int,int)), this, SLOT(handleAppModeChanged(int,int)));
connect(m_ScMW, SIGNAL(UpdateRequest(int)) , this, SLOT(handleUpdateRequest(int)));
}
Modified: trunk/Scribus/scribus/ui/propertywidget_dropcap.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertywidget_dropcap.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_dropcap.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_dropcap.cpp Wed Feb 9 20:34:54 2022
@@ -34,7 +34,7 @@
{
m_ScMW = mw;
- connect(m_ScMW, SIGNAL(AppModeChanged(int, int)), this, SLOT(handleAppModeChanged(int, int)));
+ connect(m_ScMW, SIGNAL(AppModeChanged(int,int)), this, SLOT(handleAppModeChanged(int,int)));
connect(m_ScMW, SIGNAL(UpdateRequest(int)), this , SLOT(handleUpdateRequest(int)));
}
Modified: trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp Wed Feb 9 20:34:54 2022
@@ -28,7 +28,7 @@
{
m_ScMW = mw;
- connect(m_ScMW->appModeHelper, SIGNAL(AppModeChanged(int, int)), this, SLOT(handleAppModeChanged(int, int)));
+ connect(m_ScMW->appModeHelper, SIGNAL(AppModeChanged(int,int)), this, SLOT(handleAppModeChanged(int,int)));
connect(m_ScMW, SIGNAL(UpdateRequest(int)), this , SLOT(handleUpdateRequest(int)));
}
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Wed Feb 9 20:34:54 2022
@@ -50,7 +50,7 @@
{
m_ScMW = mw;
- connect(m_ScMW->appModeHelper, SIGNAL(AppModeChanged(int, int)), this, SLOT(handleAppModeChanged(int, int)));
+ connect(m_ScMW->appModeHelper, SIGNAL(AppModeChanged(int,int)), this, SLOT(handleAppModeChanged(int,int)));
connect(m_ScMW, SIGNAL(UpdateRequest(int)), this , SLOT(handleUpdateRequest(int)));
}
Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Wed Feb 9 20:34:54 2022
@@ -797,7 +797,7 @@
connect(upButton, SIGNAL(clicked()), this, SLOT(goOneDirUp()));
connect(importButton, SIGNAL(clicked()), this, SLOT(Import()));
connect(closeButton, SIGNAL(clicked()), this, SLOT(closeLib()));
- connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
connect(configMenue, SIGNAL(triggered(QAction *)), this, SLOT(updateView()));
}
@@ -807,7 +807,7 @@
disconnect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int)));
disconnect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint)));
disconnect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
- disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
for (int rd = 0; rd < fileNames.count(); ++rd)
{
QString fileName = fileNames[rd];
@@ -832,7 +832,7 @@
Frame3->setCurrentIndex(0);
upButton->setEnabled(false);
updateView();
- connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
connect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(objFromMenu(QString)));
connect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int)));
connect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint)));
@@ -948,7 +948,7 @@
disconnect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int)));
disconnect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint)));
disconnect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
- disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
QDir d(fileName);
activeBView = new BibView(this);
QFileInfo fd(fileName);
@@ -968,7 +968,7 @@
activeBView->scrollToTop();
upButton->setEnabled(!((Frame3->currentIndex() == 0) || (Frame3->currentIndex() == 1)));
updateView();
- connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
connect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(objFromMenu(QString)));
connect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int)));
connect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint)));
@@ -1010,7 +1010,7 @@
disconnect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int)));
disconnect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint)));
disconnect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
- disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
QFileInfo fi(activeBView->ScFilename);
ScCore->fileWatcher->removeDir(fi.absolutePath());
Frame3->removeItem(Frame3->indexOf(activeBView));
@@ -1018,7 +1018,7 @@
activeBView = (BibView*)Frame3->widget(0);
Frame3->setCurrentIndex(0);
upButton->setEnabled(!((Frame3->currentIndex() == 0) || (Frame3->currentIndex() == 1)));
- connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
connect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(objFromMenu(QString)));
connect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int)));
connect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint)));
@@ -1059,12 +1059,12 @@
closeLib();
else
{
- disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
QFileInfo fi(bv->ScFilename);
ScCore->fileWatcher->removeDir(fi.absolutePath());
Frame3->removeItem(Frame3->indexOf(bv));
delete bv;
- connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
}
}
Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Wed Feb 9 20:34:54 2022
@@ -283,7 +283,7 @@
viewport()->setAcceptDrops(false);
setAutoFillBackground(true);
connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(ClipChange()));
- connect(this->document(), SIGNAL(contentsChange(int, int, int)), this, SLOT(handleContentsChange(int, int, int)));
+ connect(this->document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(handleContentsChange(int,int,int)));
}
void SEditor::setCurrentDocument(ScribusDoc *docc)
@@ -1427,9 +1427,9 @@
paraStyleCombo = new ParaStyleComboBox(this);
paraStyleComboAction=addWidget(paraStyleCombo);
paraStyleComboAction->setVisible(true);
- connect(paraStyleCombo, SIGNAL(newStyle(QString)), this, SIGNAL(newParaStyle(QString )));
- connect(GroupAlign, SIGNAL(State(int)), this, SIGNAL(newAlign(int )));
- connect(GroupDirection, SIGNAL(State(int)), this, SIGNAL(newDirection(int )));
+ connect(paraStyleCombo, SIGNAL(newStyle(QString)), this, SIGNAL(newParaStyle(QString)));
+ connect(GroupAlign, SIGNAL(State(int)), this, SIGNAL(newAlign(int)));
+ connect(GroupDirection, SIGNAL(State(int)), this, SIGNAL(newDirection(int)));
languageChange();
}
@@ -2063,7 +2063,6 @@
//Unicode Actions
ActionManager::languageChangeUnicodeActions(&seActions);
-
FileTools->setWindowTitle( tr("File"));
WordCT1->setText( tr("Current Paragraph:"));
@@ -2073,7 +2072,6 @@
ParCT->setText( tr("Paragraphs: "));
WordCT2->setText( tr("Words: "));
CharCT2->setText( tr("Chars: "));
-
}
void StoryEditor::disconnectSignals()
@@ -2091,21 +2089,17 @@
void StoryEditor::connectSignals()
{
connect(Editor, SIGNAL(textChanged()), this, SLOT(modifiedText()));
-// connect(Editor, SIGNAL(clicked(int, int)), this, SLOT(updateProps(int, int)));
- connect(Editor, SIGNAL(setProps(int,int)), this, SLOT(updateProps(int, int)));
+ connect(Editor, SIGNAL(setProps(int,int)), this, SLOT(updateProps(int,int)));
connect(Editor, SIGNAL(cursorPositionChanged()), this, SLOT(updateProps()));
connect(Editor, SIGNAL(copyAvailable(bool)), this, SLOT(CopyAvail(bool)));
connect(Editor, SIGNAL(PasteAvail()), this, SLOT(PasteAvail()));
- connect(Editor, SIGNAL(contentsMoving(int,int)), EditorBar, SLOT(doMove(int,int )));
+ connect(Editor, SIGNAL(contentsMoving(int,int)), EditorBar, SLOT(doMove(int,int)));
connect(Editor, SIGNAL(textChanged()), EditorBar, SLOT(doRepaint()));
- connect(Editor, SIGNAL(SideBarUp(bool)), EditorBar, SLOT(setRepaint(bool )));
+ connect(Editor, SIGNAL(SideBarUp(bool)), EditorBar, SLOT(setRepaint(bool)));
connect(Editor, SIGNAL(SideBarUpdate()), EditorBar, SLOT(doRepaint()));
connect(Editor->document(), SIGNAL(contentsChange(int,int,int)), Editor, SLOT(handleContentsChange(int,int,int)));
Editor->SuspendContentsChange = 0;
- // 10/12/2004 - pv - #1203: wrong selection on double click
-// connect(Editor, SIGNAL(doubleClicked(int, int)), this, SLOT(doubleClick(int, int)));
- connect(EditorBar, SIGNAL(ChangeStyle(int, QString)), this, SLOT(changeStyleSB(int, QString)));
-// connect(EditorBar, SIGNAL(sigEditStyles()), this, SLOT(slotEditStyles()));
+ connect(EditorBar, SIGNAL(ChangeStyle(int,QString)), this, SLOT(changeStyleSB(int,QString)));
connect(AlignTools, SIGNAL(newParaStyle(QString)), this, SLOT(newStyle(QString)));
connect(AlignTools, SIGNAL(newAlign(int)), this, SLOT(newAlign(int)));
connect(AlignTools, SIGNAL(newDirection(int)), this, SLOT(newDirection(int)));
Modified: trunk/Scribus/scribus/ui/storyeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/storyeditor.h
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.h (original)
+++ trunk/Scribus/scribus/ui/storyeditor.h Wed Feb 9 20:34:54 2022
@@ -184,11 +184,11 @@
void SelClipChange();
signals:
- void setProps(int, int);
+ void setProps(int,int);
void SideBarUp(bool);
void SideBarUpdate();
void PasteAvail();
- void contentsMoving(int, int);
+ void contentsMoving(int,int);
};
class SCRIBUS_API SideBar : public QLabel
@@ -257,7 +257,7 @@
void languageChange();
signals:
- void NewColor(int, int);
+ void NewColor(int,int);
};
class SCRIBUS_API SToolBColorS : public QToolBar
@@ -288,7 +288,7 @@
void languageChange();
signals:
- void NewColor(int, int);
+ void NewColor(int,int);
};
class SCRIBUS_API SToolBStyle : public QToolBar
Modified: trunk/Scribus/scribus/ui/transparencypalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/transparencypalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/transparencypalette.h (original)
+++ trunk/Scribus/scribus/ui/transparencypalette.h Wed Feb 9 20:34:54 2022
@@ -88,7 +88,7 @@
void changePatternProps();
void setSpecialGradient(double x1, double y1, double x2, double y2, double fx, double fy, double sg, double sk);
void setActTrans(double, double);
- void setActBlend(int, int);
+ void setActBlend(int,int);
void slotTransS(double val);
void slotTransF(double val);
void unitChange(double, double, int unitIndex);
Modified: trunk/Scribus/scribus/ui/unicodesearch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24931&path=/trunk/Scribus/scribus/ui/unicodesearch.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/unicodesearch.cpp (original)
+++ trunk/Scribus/scribus/ui/unicodesearch.cpp Wed Feb 9 20:34:54 2022
@@ -186,12 +186,9 @@
tableView->resizeColumnsToContents();
tableView->setColumnWidth(0, tableView->fontMetrics().maxWidth()*4);
- connect(searchEdit, SIGNAL(returnPressed()),
- this, SLOT(searchEdit_returnPressed()));
- connect(tableView, SIGNAL(doubleClicked(const QModelIndex &)),
- this, SLOT(itemChosen(const QModelIndex &)));
- connect(tableView, SIGNAL(activated(const QModelIndex &)),
- this, SLOT(itemChosen(const QModelIndex &)));
+ connect(searchEdit, SIGNAL(returnPressed()), this, SLOT(searchEdit_returnPressed()));
+ connect(tableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(itemChosen(QModelIndex)));
+ connect(tableView, SIGNAL(activated(QModelIndex)), this, SLOT(itemChosen(QModelIndex)));
}
UnicodeSearch::~UnicodeSearch()
More information about the scribus-commit
mailing list