diff --git a/applet.cpp b/applet.cpp index f3953f6b4..e4443c6d6 100644 --- a/applet.cpp +++ b/applet.cpp @@ -1017,8 +1017,8 @@ void Applet::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW wallpaperConfig = KConfigGroup(&wallpaperConfig, "Wallpaper"); wallpaperConfig = KConfigGroup(&wallpaperConfig, w->pluginName()); w->restore(wallpaperConfig); - disconnect(w, SIGNAL(update(const QRectF&)), this, SLOT(updateRect(const QRectF&))); - connect(w, SIGNAL(update(const QRectF&)), this, SLOT(updateRect(const QRectF&))); + disconnect(w, SIGNAL(update(QRectF)), this, SLOT(updateRect(QRectF))); + connect(w, SIGNAL(update(QRectF)), this, SLOT(updateRect(QRectF))); } painter->save(); diff --git a/applet.h b/applet.h index d42150d15..f1a567cf3 100644 --- a/applet.h +++ b/applet.h @@ -888,9 +888,15 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget void showMessage(const QIcon &icon, const QString &message, const Plasma::MessageButtons buttons); /** - * Called when any of the geometry constraints have been updated. + * Called when any of the constraints for the applet have been updated. These constraints + * range from notifying when the applet has officially "started up" to when geometry changes + * to when the form factor changes. * - * This is always called prior to painting and should be used as an + * Each constraint that has been changed is passed in the constraints flag. + * All of the constraints and how they work is documented in the @see Plasma::Constraints + * enumeration. + * + * On applet creation, this is always called prior to painting and can be used as an * opportunity to layout the widget, calculate sizings, etc. * * Do not call update() from this method; an update() will be triggered diff --git a/containment.cpp b/containment.cpp index 214335e7a..ce5558f15 100644 --- a/containment.cpp +++ b/containment.cpp @@ -1315,8 +1315,8 @@ void ContainmentPrivate::dropData(QPointF scenePos, QPoint screenPos, QGraphicsS } QObject::connect(job, SIGNAL(result(KJob*)), q, SLOT(dropJobResult(KJob*))); - QObject::connect(job, SIGNAL(mimeType(KIO::Job *, const QString&)), - q, SLOT(mimeTypeRetrieved(KIO::Job *, const QString&))); + QObject::connect(job, SIGNAL(mimetype(KIO::Job*,QString)), + q, SLOT(mimeTypeRetrieved(KIO::Job*,QString))); KMenu *choices = new KMenu("Content dropped"); choices->addAction(KIcon("process-working"), i18n("Fetching file type...")); diff --git a/dataengine.cpp b/dataengine.cpp index 0da11e53f..e7d517c4f 100644 --- a/dataengine.cpp +++ b/dataengine.cpp @@ -594,7 +594,7 @@ DataContainer *DataEnginePrivate::source(const QString &sourceName, bool createW DataContainer *s = new DataContainer(q); s->setObjectName(sourceName); sources.insert(sourceName, s); - QObject::connect(s, SIGNAL(destroyed(QObject *)), q, SLOT(sourceDestroyed(QObject *))); + QObject::connect(s, SIGNAL(destroyed(QObject*)), q, SLOT(sourceDestroyed(QObject*))); QObject::connect(s, SIGNAL(updateRequested(DataContainer*)), q, SLOT(internalUpdateSource(DataContainer*))); diff --git a/dataenginemanager.cpp b/dataenginemanager.cpp index afff5a076..8286090ec 100644 --- a/dataenginemanager.cpp +++ b/dataenginemanager.cpp @@ -225,7 +225,7 @@ void DataEngineManager::timerEvent(QTimerEvent *) out << " * " << dc->objectName() << endl; out << " Data count: " << dc->d->data.count() << endl; out << " Stored: " << dc->isStorageEnabled() << ' ' << endl; - const int directs = dc->receivers(SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data))); + const int directs = dc->receivers(SIGNAL(dataUpdated(QString,Plasma::DataEngine::Data))); if (directs > 0) { out << " Direction Connections: " << directs << ' ' << endl; } diff --git a/plasma.h b/plasma.h index 46a989605..000193d37 100644 --- a/plasma.h +++ b/plasma.h @@ -42,21 +42,15 @@ namespace Plasma * for instance in Applet::constraintsUpdated */ enum Constraint { - NoConstraint = 0, - /** The FormFactor for an object */ - FormFactorConstraint = 1, - /** The Location of an object */ - LocationConstraint = 2, - /** Which screen an object is on */ - ScreenConstraint = 4, - /** the size of the applet was changed */ - SizeConstraint = 8, - /** the immutability (locked) nature of the applet changed */ - ImmutableConstraint = 16, - /** application startup has completed */ - StartupCompletedConstraint = 32, - /** the position of the popup needs to be recalculated*/ - PopupConstraint = 128, + NoConstraint = 0, /**< No constraint; never passed in to Applet::constraintsEvent on its own */ + FormFactorConstraint = 1, /**< The FormFactor for an object */ + LocationConstraint = 2, /**< The Location of an object */ + ScreenConstraint = 4, /**< Which screen an object is on */ + SizeConstraint = 8, /**< the size of the applet was changed */ + ImmutableConstraint = 16, /**< the immutability (locked) nature of the applet changed */ + StartupCompletedConstraint = 32, /**< application startup has completed */ + ContextConstraint = 64, /**< the context (e.g. activity) has changed */ + PopupConstraint = 128, /**< the position of the popup needs to be recalculated*/ AllConstraints = FormFactorConstraint | LocationConstraint | ScreenConstraint | SizeConstraint | ImmutableConstraint | PopupConstraint }; diff --git a/private/associatedapplicationmanager.cpp b/private/associatedapplicationmanager.cpp index 9da0fd2ce..ed309ef6e 100644 --- a/private/associatedapplicationmanager.cpp +++ b/private/associatedapplicationmanager.cpp @@ -92,7 +92,7 @@ void AssociatedApplicationManager::setApplication(Plasma::Applet *applet, const if (service || !KStandardDirs::findExe(application).isNull() || QFile::exists(application)) { d->applicationNames[applet] = application; if (!d->urlLists.contains(applet)) { - connect(applet, SIGNAL(destroyed(QObject *)), this, SLOT(cleanupApplet(QObject *))); + connect(applet, SIGNAL(destroyed(QObject*)), this, SLOT(cleanupApplet(QObject*))); } } } diff --git a/private/kineticscroll.cpp b/private/kineticscroll.cpp index fe162288b..c2ddd7d6b 100644 --- a/private/kineticscroll.cpp +++ b/private/kineticscroll.cpp @@ -349,8 +349,8 @@ void KineticScrolling::setWidget(QGraphicsWidget *parent) d->parent->removeEventFilter(this); disconnect(d->scrollAnimation, SIGNAL(finished()), this, SLOT(overshoot())); disconnect(d->scrollAnimation, - SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)), this, - SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State))); + SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)), this, + SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State))); delete d->scrollAnimation; } @@ -361,8 +361,8 @@ void KineticScrolling::setWidget(QGraphicsWidget *parent) d->scrollAnimation = new QPropertyAnimation(parent, "scrollPosition", parent); connect(d->scrollAnimation, SIGNAL(finished()), this, SLOT(overshoot())); connect(d->scrollAnimation, - SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)), this, - SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State))); + SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)), this, + SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State))); d->scrollAnimation->setEasingCurve(QEasingCurve::OutCirc); if (parent) { diff --git a/private/qtjolie-branch/qtjolie/serverthread.cpp b/private/qtjolie-branch/qtjolie/serverthread.cpp index 30aa39248..aca59a3c6 100644 --- a/private/qtjolie-branch/qtjolie/serverthread.cpp +++ b/private/qtjolie-branch/qtjolie/serverthread.cpp @@ -97,8 +97,8 @@ void ServerThread::run() { m_serverSocket = new QTcpServer; - connect(this, SIGNAL(messageReceived(int, Jolie::Message)), - m_server, SLOT(messageReceived(int, Jolie::Message))); + connect(this, SIGNAL(messageReceived(int,Jolie::Message)), + m_server, SLOT(messageReceived(int,Jolie::Message))); connect(m_serverSocket, SIGNAL(newConnection()), this, SLOT(onIncomingConnection()), Qt::QueuedConnection); diff --git a/private/qtjolie-branch/tests/calculatorservice.cpp b/private/qtjolie-branch/tests/calculatorservice.cpp index 03da8df9d..287cf8aa9 100644 --- a/private/qtjolie-branch/tests/calculatorservice.cpp +++ b/private/qtjolie-branch/tests/calculatorservice.cpp @@ -88,8 +88,8 @@ private slots: { m_server = new Server(8000); CalculatorAdaptor *adaptor = new CalculatorAdaptor(this); - connect(adaptor, SIGNAL(added(int, int, int)), - this, SLOT(onAdded(int, int, int))); + connect(adaptor, SIGNAL(added(int,int,int)), + this, SLOT(onAdded(int,int,int))); m_server->registerAdaptor("/", adaptor); m_meta.addRedirection(QString::fromUtf8("Calculator"), diff --git a/private/remoteservice.cpp b/private/remoteservice.cpp index 32d4c71e1..7f5f5e59d 100644 --- a/private/remoteservice.cpp +++ b/private/remoteservice.cpp @@ -267,7 +267,7 @@ ServiceJob* RemoteService::createJob(const QString& operation, } ServiceJob *job = new RemoteServiceJob(m_location, destination(), operation, parameters, m_token, this); - connect(job, SIGNAL(finished(KJob *)), this, SLOT(slotFinished())); + connect(job, SIGNAL(finished(KJob*)), this, SLOT(slotFinished())); return job; } diff --git a/private/serviceprovider.cpp b/private/serviceprovider.cpp index dd3f5d57b..df8fff67a 100644 --- a/private/serviceprovider.cpp +++ b/private/serviceprovider.cpp @@ -52,7 +52,7 @@ ServiceProvider::ServiceProvider(const QString &name, Service *service) : Jolie::AbstractAdaptor(service), m_service(service) { - connect(service, SIGNAL(finished(Plasma::ServiceJob *)), + connect(service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(operationCompleted(Plasma::ServiceJob*))); m_providerName = name; diff --git a/private/storage.cpp b/private/storage.cpp index 3b86d48bf..2ebeb1c93 100644 --- a/private/storage.cpp +++ b/private/storage.cpp @@ -49,7 +49,7 @@ StorageJob::StorageJob(const QString& destination, m_clientName(destination) { Plasma::StorageThread::self()->start(); - connect(Plasma::StorageThread::self(), SIGNAL(newResult(StorageJob *, const QVariant &)), this, SLOT(resultSlot(StorageJob *, const QVariant &))); + connect(Plasma::StorageThread::self(), SIGNAL(newResult(StorageJob*,QVariant)), this, SLOT(resultSlot(StorageJob*,QVariant))); qRegisterMetaType(); qRegisterMetaType >(); } diff --git a/scripting/wallpaperscript.cpp b/scripting/wallpaperscript.cpp index 8ed7f0d2e..4b1dd2a77 100644 --- a/scripting/wallpaperscript.cpp +++ b/scripting/wallpaperscript.cpp @@ -45,8 +45,8 @@ WallpaperScript::~WallpaperScript() void WallpaperScript::setWallpaper(Wallpaper *wallpaper) { d->wallpaper = wallpaper; - connect(wallpaper, SIGNAL(renderCompleted(const QImage&)), - this, SLOT(renderCompleted(const QImage&))); + connect(wallpaper, SIGNAL(renderCompleted(QImage)), + this, SLOT(renderCompleted(QImage))); } Wallpaper *WallpaperScript::wallpaper() const diff --git a/tests/testcontainmentactionsplugin/test.cpp b/tests/testcontainmentactionsplugin/test.cpp index fb5bb6692..8a09ff3cb 100644 --- a/tests/testcontainmentactionsplugin/test.cpp +++ b/tests/testcontainmentactionsplugin/test.cpp @@ -88,7 +88,7 @@ QWidget* ContextTest::createConfigurationInterface(QWidget* parent) m_ui.text->setText(m_text); //FIXME this way or just get it on close? - //connect(m_ui.text, SIGNAL(changed(const QColor&)), this, SLOT(setColor(const QColor&))); + //connect(m_ui.text, SIGNAL(changed(QColor)), this, SLOT(setColor(QColor))); //connect(this, SIGNAL(settingsChanged(bool)), parent, SLOT(settingsChanged(bool))); return widget; } diff --git a/view.cpp b/view.cpp index 8bedf9149..c3b666da3 100644 --- a/view.cpp +++ b/view.cpp @@ -234,7 +234,7 @@ void View::setContainment(Plasma::Containment *containment) if (d->containment) { disconnect(d->containment, SIGNAL(destroyed(QObject*)), this, SLOT(containmentDestroyed())); disconnect(d->containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect())); - disconnect(d->containment, SIGNAL(screenChanged(int, int, Plasma::Containment *)), this, SLOT(containmentScreenChanged(int, int, Plasma::Containment *))); + disconnect(d->containment, SIGNAL(screenChanged(int,int,Plasma::Containment*)), this, SLOT(containmentScreenChanged(int,int,Plasma::Containment*))); d->containment->removeAssociatedWidget(this); } @@ -300,7 +300,7 @@ void View::setContainment(Plasma::Containment *containment) d->updateSceneRect(); connect(containment, SIGNAL(destroyed(QObject*)), this, SLOT(containmentDestroyed())); connect(containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect())); - connect(containment, SIGNAL(screenChanged(int, int, Plasma::Containment *)), this, SLOT(containmentScreenChanged(int, int, Plasma::Containment *))); + connect(containment, SIGNAL(screenChanged(int,int,Plasma::Containment*)), this, SLOT(containmentScreenChanged(int,int,Plasma::Containment*))); } Containment *View::containment() const diff --git a/wallpaper.cpp b/wallpaper.cpp index ba2d31609..3317e1002 100644 --- a/wallpaper.cpp +++ b/wallpaper.cpp @@ -575,7 +575,7 @@ bool WallpaperPrivate::findInCache(const QString &key, unsigned int lastModified } LoadImageThread *loadImageT = new LoadImageThread(cache); - q->connect(loadImageT, SIGNAL(done(const QImage&)), q, SIGNAL(renderCompleted(const QImage&))); + q->connect(loadImageT, SIGNAL(done(QImage)), q, SIGNAL(renderCompleted(QImage))); QThreadPool::globalInstance()->start(loadImageT); return true; diff --git a/widgets/combobox.cpp b/widgets/combobox.cpp index 733ea8d0c..84e7592fa 100644 --- a/widgets/combobox.cpp +++ b/widgets/combobox.cpp @@ -160,11 +160,11 @@ void ComboBox::setNativeWidget(KComboBox *nativeWidget) widget()->deleteLater(); } - connect(nativeWidget, SIGNAL(activated(const QString &)), this, SIGNAL(activated(const QString &))); + connect(nativeWidget, SIGNAL(activated(QString)), this, SIGNAL(activated(QString))); connect(nativeWidget, SIGNAL(currentIndexChanged(int)), this, SIGNAL(currentIndexChanged(int))); - connect(nativeWidget, SIGNAL(currentIndexChanged(const QString &)), - this, SIGNAL(textChanged(const QString &))); + connect(nativeWidget, SIGNAL(currentIndexChanged(QString)), + this, SIGNAL(textChanged(QString))); d->setWidget(nativeWidget); nativeWidget->setWindowIcon(QIcon()); diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp index 2a53b2a6d..08683299d 100644 --- a/widgets/lineedit.cpp +++ b/widgets/lineedit.cpp @@ -125,8 +125,8 @@ void LineEdit::setNativeWidget(KLineEdit *nativeWidget) connect(nativeWidget, SIGNAL(editingFinished()), this, SIGNAL(editingFinished())); connect(nativeWidget, SIGNAL(returnPressed()), this, SIGNAL(returnPressed())); - connect(nativeWidget, SIGNAL(textEdited(const QString&)), this, SIGNAL(textEdited(const QString&))); - connect(nativeWidget, SIGNAL(textChanged(const QString&)), this, SIGNAL(textChanged(const QString&))); + connect(nativeWidget, SIGNAL(textEdited(QString)), this, SIGNAL(textEdited(QString))); + connect(nativeWidget, SIGNAL(textChanged(QString)), this, SIGNAL(textChanged(QString))); nativeWidget->setWindowFlags(nativeWidget->windowFlags()|Qt::BypassGraphicsProxyWidget); diff --git a/widgets/videowidget.cpp b/widgets/videowidget.cpp index 360ad6865..daebfe4d9 100644 --- a/widgets/videowidget.cpp +++ b/widgets/videowidget.cpp @@ -325,7 +325,7 @@ void VideoWidget::setUsedControls(const Controls controls) d->controlsWidget = 0; //disconnect all the stuff that wasn't automatically disconnected 'cause widget deaths - disconnect(d->media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, SLOT(stateChanged(Phonon::State, Phonon::State))); + disconnect(d->media, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(stateChanged(Phonon::State,Phonon::State))); disconnect(d->media, SIGNAL(tick(qint64)), this, SLOT(ticked(qint64))); disconnect(d->media, SIGNAL(totalTimeChanged(qint64)), this, SLOT(totalTimeChanged(qint64))); disconnect(d->audioOutput, SIGNAL(volumeChanged(qreal)), this, SLOT(volumeChanged(qreal))); @@ -411,7 +411,7 @@ void VideoWidget::setUsedControls(const Controls controls) d->nextButton = 0; } - connect(d->media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, SLOT(stateChanged(Phonon::State, Phonon::State))); + connect(d->media, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(stateChanged(Phonon::State,Phonon::State))); diff --git a/widgets/webview.cpp b/widgets/webview.cpp index a76e82ca0..df4abc1fa 100644 --- a/widgets/webview.cpp +++ b/widgets/webview.cpp @@ -86,8 +86,8 @@ WebView::WebView(QGraphicsItem *parent) this, SIGNAL(loadProgress(int))); connect(d->webView, SIGNAL(loadFinished(bool)), this, SLOT(loadingFinished(bool))); - connect(d->webView, SIGNAL(urlChanged(const QUrl &)), - this, SIGNAL(urlChanged(const QUrl &))); + connect(d->webView, SIGNAL(urlChanged(QUrl)), + this, SIGNAL(urlChanged(QUrl))); } WebView::~WebView()