remove the deprecated DBusMenuImporter::menuReadyToBeShown() signal

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/dbusmenuimporter.cpp b/src/dbusmenuimporter.cpp
index 9f5acbd..a71136c 100644 (file)
--- a/src/dbusmenuimporter.cpp
+++ b/src/dbusmenuimporter.cpp
@@ -527,9 +527,6 @@ void DBusMenuImporter::slotMenuAboutToShow()
         d->m_mustEmitMenuUpdated = false;
         menuUpdated();
     }
-    if (menu == d->m_menu) {
-        menuReadyToBeShown();
-    }
 
     d->sendEvent(id, QString("opened"));
 }

diff --git a/src/dbusmenuimporter.h b/src/dbusmenuimporter.h
index 9f82808..b55735c 100644 (file)
--- a/src/dbusmenuimporter.h
+++ b/src/dbusmenuimporter.h
@@ -94,15 +94,6 @@ Q_SIGNALS:
     void menuUpdated();
 
     /**
-     * Emitted after every aboutToShow of the root menu.
-     * This signal is deprecated and only kept to keep compatibility with
-     * dbusmenu-qt 0.3.x. New code should use updateMenu() and menuUpdated()
-     *
-     * @deprecated
-     */
-    void menuReadyToBeShown();
-
-    /**
      * Emitted when the exporter was asked to activate an action
      */
     void actionActivationRequested(QAction *);

diff --git a/tests/dbusmenuimportertest.cpp b/tests/dbusmenuimportertest.cpp
index e81faec..eb40068 100644 (file)
--- a/tests/dbusmenuimportertest.cpp
+++ b/tests/dbusmenuimportertest.cpp
@@ -153,7 +153,6 @@ void DBusMenuImporterTest::testDynamicMenu()
 
     // Update menu, a1 and a2 should get added
     QSignalSpy spy(&importer, SIGNAL(menuUpdated()));
-    QSignalSpy spyOld(&importer, SIGNAL(menuReadyToBeShown()));
     importer.updateMenu();
     while (spy.isEmpty()) {
         QTest::qWait(500);
@@ -174,10 +173,8 @@ void DBusMenuImporterTest::testDynamicMenu()
 
     QCOMPARE(a1OutputMenu->actions().count(), 1);
 
-    // menuUpdated() and menuReadyToBeShown() should only have been emitted
-    // once
+    // menuUpdated() should only have been emitted once
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(spyOld.count(), 1);
 }
 
 void DBusMenuImporterTest::testActionActivationRequested()