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

Conflicts:
	kdecore/network/k3datagramsocket.cpp
	kdeui/actions/kstandardaction.cpp
	kdeui/dialogs/kconfigdialogmanager.cpp
	kdeui/icons/kicondialog.cpp
	kdeui/itemviews/kviewstatesaver.h
	kfile/knewfilemenu.cpp
	kio/misc/kpac/downloader.cpp
	kio/tests/kdirlistertest.cpp
	kparts/browserextension.cpp
	nepomuk/core/nepomukmainmodel.cpp
	nepomuk/query/queryserviceclient.cpp
	nepomuk/test/ratingpaintertestwidget.cpp
	nepomuk/ui/kedittagsdialog.cpp
	nepomuk/ui/ktagcloudwidget.cpp
	nepomuk/ui/ktagdisplaywidget.cpp
	nepomuk/ui/nepomukmassupdatejob.cpp
	nepomuk/ui/tagwidget.cpp
	nepomuk/utils/daterangeselectionwidget.cpp
	nepomuk/utils/facetwidget.cpp
	nepomuk/utils/searchwidget.cpp
	plasma/containment.cpp
	plasma/datacontainer.cpp
	plasma/deprecated/animator.cpp
	plasma/extenders/extender.cpp
	plasma/plasma.h
	plasma/scripting/wallpaperscript.cpp
	tier1/solid/tests/networkingclient.cpp
(signal/slot normalization changes conflicted with KUrl->QUrl changes
and with other changes in frameworks)

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&)));
+                    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

@@ -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

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&)),
+                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..."));

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*)));
 

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

plasma.h

@@ -42,21 +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 position of the popup needs to be recalculated*/
-    PopupConstraint = 128,
     AllConstraints = FormFactorConstraint | LocationConstraint | ScreenConstraint |
     SizeConstraint | ImmutableConstraint | PopupConstraint
 };

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

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)), this,
-                SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
+                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)), this,
-            SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
+            SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
     d->scrollAnimation->setEasingCurve(QEasingCurve::OutCirc);
 
     if (parent) {

private/qtjolie-branch/qtjolie/serverthread.cpp

@@ -97,8 +97,8 @@ void ServerThread::run()
 {
     m_serverSocket = new QTcpServer;
 
-    connect(this, SIGNAL(messageReceived(int, Jolie::Message)),
+    connect(this, SIGNAL(messageReceived(int,Jolie::Message)),
-            m_server, SLOT(messageReceived(int, Jolie::Message)));
+            m_server, SLOT(messageReceived(int,Jolie::Message)));
     connect(m_serverSocket, SIGNAL(newConnection()),
             this, SLOT(onIncomingConnection()), Qt::QueuedConnection);
 

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)),
+        connect(adaptor, SIGNAL(added(int,int,int)),
-                this, SLOT(onAdded(int, int, int)));
+                this, SLOT(onAdded(int,int,int)));
         m_server->registerAdaptor("/", adaptor);
 
         m_meta.addRedirection(QString::fromUtf8("Calculator"),

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

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;

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,8 +45,8 @@ 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)));
 }
 
 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;
 }

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

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;

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/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)));
 
 
 

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()