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)
2012-02-14 12:32:25 +01:00 · 2012-02-14 12:32:25 +01:00 · 083d157684
commit 083d157684
parent 9b40224a87 454cbaa7cb
21 changed files with 50 additions and 50 deletions
--- 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();
--- 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
--- 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..."));
--- 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
 };
--- 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<StorageJob *>();
    qRegisterMetaType<QWeakPointer<StorageJob> >();
 }
--- 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
--- 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;
 }
--- 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;
--- 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());
--- 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);
--- 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()