Merge remote-tracking branch 'origin/KDE/4.8'

applet.cpp

@@ -1442,8 +1442,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&)));
+                    disconnect(w, SIGNAL(update(QRectF)), this, SLOT(updateRect(QRectF)));
-                    connect(w, SIGNAL(update(const QRectF&)), this, SLOT(updateRect(const QRectF&)));
+                    connect(w, SIGNAL(update(QRectF)), this, SLOT(updateRect(QRectF)));
                 }
 
                 painter->save();

applet.h

@@ -1003,9 +1003,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

containment.cpp

@@ -1332,8 +1332,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&)),
+                QObject::connect(job, SIGNAL(mimetype(KIO::Job*,QString)),
-                                 q, SLOT(mimeTypeRetrieved(KIO::Job *, const QString&)));
+                                 q, SLOT(mimeTypeRetrieved(KIO::Job*,QString)));
 
                 KMenu *choices = new KMenu("Content dropped");
                 choices->addAction(KIcon("process-working"), i18n("Fetching file type..."));

extenders/extender.cpp

@@ -111,8 +111,8 @@ Extender::Extender(Applet *applet)
     d->mainWidget = new QGraphicsWidget(d->scrollWidget);
     d->scrollWidget->setWidget(d->mainWidget);
     d->mainWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    connect(d->scrollWidget, SIGNAL(viewportGeometryChanged(const QRectF &)),
+    connect(d->scrollWidget, SIGNAL(viewportGeometryChanged(QRectF)),
-            this, SLOT(viewportGeometryChanged(const QRectF &)));
+            this, SLOT(viewportGeometryChanged(QRectF)));
 
     d->layout = new QGraphicsLinearLayout(d->mainWidget);
     d->layout->setOrientation(Qt::Vertical);

plasma.h

@@ -42,23 +42,15 @@ namespace Plasma
  * for instance in Applet::constraintsUpdated
  */
 enum Constraint {
-    NoConstraint = 0,
+    NoConstraint = 0, /**< No constraint; never passed in to Applet::constraintsEvent on its own */
-    /** The FormFactor for an object */
+    FormFactorConstraint = 1, /**< The FormFactor for an object */
-    FormFactorConstraint = 1,
+    LocationConstraint = 2, /**< The Location of an object */
-    /** The Location of an object */
+    ScreenConstraint = 4, /**< Which screen an object is on */
-    LocationConstraint = 2,
+    SizeConstraint = 8, /**< the size of the applet was changed */
-    /** Which screen an object is on */
+    ImmutableConstraint = 16, /**< the immutability (locked) nature of the applet changed  */
-    ScreenConstraint = 4,
+    StartupCompletedConstraint = 32, /**< application startup has completed */
-    /** the size of the applet was changed */
+    ContextConstraint = 64, /**< the context (e.g. activity) has changed */
-    SizeConstraint = 8,
+    PopupConstraint = 128, /**< the position of the popup needs to be recalculated*/
-    /** the immutability (locked) nature of the applet changed  */
-    ImmutableConstraint = 16,
-    /** application startup has completed */
-    StartupCompletedConstraint = 32,
-    /** the desktop context has changed */
-    ContextConstraint = 64,
-    /** the position of the popup needs to be recalculated*/
-    PopupConstraint = 128,
     AllConstraints = FormFactorConstraint | LocationConstraint | ScreenConstraint |
     SizeConstraint | ImmutableConstraint | ContextConstraint | PopupConstraint
 };

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<StorageJob *>();
     qRegisterMetaType<QWeakPointer<StorageJob> >();
 }

scripting/wallpaperscript.cpp

@@ -45,10 +45,10 @@ WallpaperScript::~WallpaperScript()
 void WallpaperScript::setWallpaper(Wallpaper *wallpaper)
 {
     d->wallpaper = wallpaper;
-    connect(wallpaper, SIGNAL(renderCompleted(const QImage&)),
+    connect(wallpaper, SIGNAL(renderCompleted(QImage)),
-            this, SLOT(renderCompleted(const QImage&)));
+            this, SLOT(renderCompleted(QImage)));
-    connect(wallpaper, SIGNAL(urlDropped(const KUrl&)),
+    connect(wallpaper, SIGNAL(urlDropped(KUrl)),
-            this, SLOT(urlDropped(const KUrl&)));
+            this, SLOT(urlDropped(KUrl)));
 }
 
 Wallpaper *WallpaperScript::wallpaper() const

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;
 }

wallpaper.cpp

@@ -598,7 +598,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;

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 &)),
+    connect(nativeWidget, SIGNAL(currentIndexChanged(QString)),
-            this, SIGNAL(textChanged(const QString &)));
+            this, SIGNAL(textChanged(QString)));
 
     d->setWidget(nativeWidget);
     nativeWidget->setWindowIcon(QIcon());

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(textEdited(QString)), this, SIGNAL(textEdited(QString)));
-    connect(nativeWidget, SIGNAL(textChanged(const QString&)), this, SIGNAL(textChanged(const QString&)));
+    connect(nativeWidget, SIGNAL(textChanged(QString)), this, SIGNAL(textChanged(QString)));
 
 
     nativeWidget->setWindowFlags(nativeWidget->windowFlags()|Qt::BypassGraphicsProxyWidget);

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 &)),
+    connect(d->webView, SIGNAL(urlChanged(QUrl)),
-            this, SIGNAL(urlChanged(const QUrl &)));
+            this, SIGNAL(urlChanged(QUrl)));
 }
 
 WebView::~WebView()