SVN commit 1244198 by mlaurent: normalize signals/Slots M +8 -8 kscreensaver/kdesavers/banner.cpp U kscreensaver/kdesavers/fountain.cpp U kscreensaver/kdesavers/gravity.cpp M +10 -10 kscreensaver/kdesavers/kclock.cpp U kscreensaver/kdesavers/kvm.cpp M +6 -6 kscreensaver/kdesavers/lines.cpp U kscreensaver/kdesavers/lorenz.cpp U kscreensaver/kdesavers/polygon.cpp U kscreensaver/kdesavers/science.cpp M +4 -4 kscreensaver/kdesavers/slideshow.cpp U kscreensaver/kdesavers/wave.cpp M +4 -4 kscreensaver/kxsconfig/kxscontrol.cpp U kscreensaver/xsavers/space.cpp U kscreensaver/xsavers/swarm.cpp U kwin-styles/keramik/keramik.cpp --- trunk/KDE/kdeartwork/kscreensaver/kdesavers/banner.cpp #1244197:1244198 @@ -102,8 +102,8 @@ KFontComboBox* comboFonts = new KFontComboBox( group ); comboFonts->setCurrentFont( fontFamily ); gl->addWidget(comboFonts, 1, 1); - connect( comboFonts, SIGNAL(currentFontChanged( const QFont& ) ), - SLOT( slotFamily( const QFont& ) ) ); + connect( comboFonts, SIGNAL(currentFontChanged(QFont)), + SLOT(slotFamily(QFont)) ); label = new QLabel( i18n("Size:"), group ); gl->addWidget(label, 2, 0); @@ -113,8 +113,8 @@ fillFontSizes(); gl->addWidget(comboSizes, 2, 1); connect( comboSizes, SIGNAL( activated( int ) ), SLOT( slotSize( int ) ) ); - connect( comboSizes, SIGNAL( editTextChanged( const QString & ) ), - SLOT( slotSizeEdit( const QString & ) ) ); + connect( comboSizes, SIGNAL(editTextChanged(QString)), + SLOT(slotSizeEdit(QString)) ); QCheckBox *cb = new QCheckBox( i18n("Bold"), group ); @@ -132,8 +132,8 @@ colorPush = new KColorButton( fontColor, group ); gl->addWidget(colorPush, 4, 1); - connect( colorPush, SIGNAL( changed(const QColor &) ), - SLOT( slotColor(const QColor &) ) ); + connect( colorPush, SIGNAL(changed(QColor)), + SLOT(slotColor(QColor)) ); QCheckBox *cyclingColorCb=new QCheckBox(i18n("Cycling color"),group); cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint()); @@ -180,8 +180,8 @@ ed = new QLineEdit( main ); tl2->addWidget(ed); ed->setText( message ); - connect( ed, SIGNAL( textChanged( const QString & ) ), - SLOT( slotMessage( const QString & ) ) ); + connect( ed, SIGNAL(textChanged(QString)), + SLOT(slotMessage(QString)) ); QCheckBox *timeCb=new QCheckBox( i18n("Show current time"), main); timeCb->setFixedSize(timeCb->sizeHint()); --- trunk/KDE/kdeartwork/kscreensaver/kdesavers/kclock.cpp #1244197:1244198 @@ -102,8 +102,8 @@ colorButton = new KColorButton(_hourColor); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotHourColor(const QColor &))); + connect(colorButton, SIGNAL(changed(QColor)), + SLOT(slotHourColor(QColor))); grid->addWidget(label, 1, 1); grid->addWidget(colorButton, 1, 2); @@ -111,8 +111,8 @@ colorButton = new KColorButton(_minColor); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotMinColor(const QColor &))); + connect(colorButton, SIGNAL(changed(QColor)), + SLOT(slotMinColor(QColor))); grid->addWidget(label, 2, 1); grid->addWidget(colorButton, 2, 2); @@ -120,8 +120,8 @@ colorButton = new KColorButton(_secColor); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotSecColor(const QColor &))); + connect(colorButton, SIGNAL(changed(QColor)), + SLOT(slotSecColor(QColor))); grid->addWidget(label, 3, 1); grid->addWidget(colorButton, 3, 2); @@ -129,8 +129,8 @@ colorButton = new KColorButton(_scaleColor); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotScaleColor(const QColor &))); + connect(colorButton, SIGNAL(changed(QColor)), + SLOT(slotScaleColor(QColor))); grid->addWidget(label, 4, 1); grid->addWidget(colorButton, 4, 2); @@ -138,8 +138,8 @@ colorButton = new KColorButton(_bgndColor); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotBgndColor(const QColor &))); + connect(colorButton, SIGNAL(changed(QColor)), + SLOT(slotBgndColor(QColor))); grid->addWidget(label, 5, 1); grid->addWidget(colorButton, 5, 2); --- trunk/KDE/kdeartwork/kscreensaver/kdesavers/lines.cpp #1244197:1244198 @@ -175,24 +175,24 @@ tl1->addWidget(label); colorPush0=new KColorButton(colstart, main); - connect(colorPush0, SIGNAL(changed(const QColor &)), - SLOT(slotColstart(const QColor &))); + connect(colorPush0, SIGNAL(changed(QColor)), + SLOT(slotColstart(QColor))); tl1->addWidget(colorPush0); label=new QLabel(i18n("Middle:"), main); tl1->addWidget(label); colorPush1=new KColorButton(colmid, main); - connect(colorPush1, SIGNAL(changed(const QColor &)), - SLOT(slotColmid(const QColor &))); + connect(colorPush1, SIGNAL(changed(QColor)), + SLOT(slotColmid(QColor))); tl1->addWidget(colorPush1); label=new QLabel(i18n("End:"), main); tl1->addWidget(label); colorPush2=new KColorButton(colend, main); - connect(colorPush2, SIGNAL(changed(const QColor &)), - SLOT(slotColend(const QColor &))); + connect(colorPush2, SIGNAL(changed(QColor)), + SLOT(slotColend(QColor))); tl1->addWidget(colorPush2); tl1->addStretch(); --- trunk/KDE/kdeartwork/kscreensaver/kdesavers/slideshow.cpp #1244197:1244198 @@ -970,10 +970,10 @@ mSaver = new kSlideShowSaver(cfg->mPreview->winId()); cfg->mDirChooser->setMode(KFile::Directory | KFile::ExistingOnly); - connect(cfg->mDirChooser, SIGNAL(returnPressed(const QString &)), - SLOT(slotDirSelected(const QString &))); - connect(cfg->mDirChooser, SIGNAL(urlSelected(const KUrl &)), - SLOT(slotDirSelected(const KUrl &))); + connect(cfg->mDirChooser, SIGNAL(returnPressed(QString)), + SLOT(slotDirSelected(QString))); + connect(cfg->mDirChooser, SIGNAL(urlSelected(KUrl)), + SLOT(slotDirSelected(KUrl))); connect(this,SIGNAL(okClicked()),this,SLOT(slotOk())); connect(this,SIGNAL(helpClicked()),this,SLOT(slotHelp())); readSettings(); --- trunk/KDE/kdeartwork/kscreensaver/kxsconfig/kxscontrol.cpp #1244197:1244198 @@ -286,7 +286,7 @@ QLabel *label = new QLabel(mLabel, this); l->addWidget(label); mEdit = new QLineEdit(this); - connect(mEdit, SIGNAL(textChanged(const QString &)), SLOT(textChanged(const QString &))); + connect(mEdit, SIGNAL(textChanged(QString)), SLOT(textChanged(QString))); l->addWidget(mEdit); } @@ -301,7 +301,7 @@ QLabel *label = new QLabel(i18nc("@label:textbox", mLabel.toUtf8()), this); l->addWidget(label); mEdit = new QLineEdit(this); - connect(mEdit, SIGNAL(textChanged(const QString &)), SLOT(textChanged(const QString &))); + connect(mEdit, SIGNAL(textChanged(QString)), SLOT(textChanged(QString))); l->addWidget(mEdit); } @@ -326,7 +326,7 @@ QLabel *label = new QLabel(mLabel, this); l->addWidget(label); mEdit = new QLineEdit(this); - connect(mEdit, SIGNAL(textChanged(const QString &)), SLOT(textChanged(const QString &))); + connect(mEdit, SIGNAL(textChanged(QString)), SLOT(textChanged(QString))); l->addWidget(mEdit); } @@ -343,7 +343,7 @@ QHBoxLayout *hb = new QHBoxLayout(); l->addLayout(hb); mEdit = new QLineEdit(this); - connect(mEdit, SIGNAL(textChanged(const QString &)), SLOT(textChanged(const QString &))); + connect(mEdit, SIGNAL(textChanged(QString)), SLOT(textChanged(QString))); hb->addWidget(mEdit); QPushButton *pb = new QPushButton( QLatin1String( "..." ), this ); connect( pb, SIGNAL(clicked()), this, SLOT(selectFile()) );