kwin: remove ActivitiesMode related code

kwin/kcmkwin/kwintabbox/main.cpp

@@ -227,8 +227,6 @@ void KWinTabBoxConfig::loadConfig(const KConfigGroup& config, KWin::TabBox::TabB
 {
     tabBoxConfig.setClientDesktopMode(TabBoxConfig::ClientDesktopMode(
                                        config.readEntry<int>("DesktopMode", TabBoxConfig::defaultDesktopMode())));
-    tabBoxConfig.setClientActivitiesMode(TabBoxConfig::ClientActivitiesMode(
-                                       config.readEntry<int>("ActivitiesMode", TabBoxConfig::defaultActivitiesMode())));
     tabBoxConfig.setClientApplicationsMode(TabBoxConfig::ClientApplicationsMode(
                                        config.readEntry<int>("ApplicationsMode", TabBoxConfig::defaultApplicationsMode())));
     tabBoxConfig.setClientMinimizedMode(TabBoxConfig::ClientMinimizedMode(
@@ -250,7 +248,6 @@ void KWinTabBoxConfig::saveConfig(KConfigGroup& config, const KWin::TabBox::TabB
 {
     // combo boxes
     config.writeEntry("DesktopMode",        int(tabBoxConfig.clientDesktopMode()));
-    config.writeEntry("ActivitiesMode",     int(tabBoxConfig.clientActivitiesMode()));
     config.writeEntry("ApplicationsMode",   int(tabBoxConfig.clientApplicationsMode()));
     config.writeEntry("MinimizedMode",      int(tabBoxConfig.clientMinimizedMode()));
     config.writeEntry("ShowDesktopMode",    int(tabBoxConfig.showDesktopMode()));

kwin/kwin.kcfg

@@ -276,9 +276,6 @@
         <entry name="DesktopMode" type="UInt">
             <default>1</default>
         </entry>
-        <entry name="ActivitiesMode" type="UInt">
-            <default>1</default>
-        </entry>
         <entry name="ApplicationsMode" type="UInt">
             <default>0</default>
         </entry>

kwin/tabbox/tabboxconfig.cpp

@@ -32,7 +32,6 @@ public:
         , highlightWindows(TabBoxConfig::defaultHighlightWindow())
         , tabBoxMode(TabBoxConfig::ClientTabBox)
         , clientDesktopMode(TabBoxConfig::defaultDesktopMode())
-        , clientActivitiesMode(TabBoxConfig::defaultActivitiesMode())
         , clientApplicationsMode(TabBoxConfig::defaultApplicationsMode())
         , clientMinimizedMode(TabBoxConfig::defaultMinimizedMode())
         , showDesktopMode(TabBoxConfig::defaultShowDesktopMode())
@@ -48,7 +47,6 @@ public:
 
     TabBoxConfig::TabBoxMode tabBoxMode;
     TabBoxConfig::ClientDesktopMode clientDesktopMode;
-    TabBoxConfig::ClientActivitiesMode clientActivitiesMode;
     TabBoxConfig::ClientApplicationsMode clientApplicationsMode;
     TabBoxConfig::ClientMinimizedMode clientMinimizedMode;
     TabBoxConfig::ShowDesktopMode showDesktopMode;
@@ -74,7 +72,6 @@ TabBoxConfig& TabBoxConfig::operator=(const KWin::TabBox::TabBoxConfig& object)
     d->highlightWindows = object.isHighlightWindows();
     d->tabBoxMode = object.tabBoxMode();
     d->clientDesktopMode = object.clientDesktopMode();
-    d->clientActivitiesMode = object.clientActivitiesMode();
     d->clientApplicationsMode = object.clientApplicationsMode();
     d->clientMinimizedMode = object.clientMinimizedMode();
     d->showDesktopMode = object.showDesktopMode();
@@ -125,16 +122,6 @@ void TabBoxConfig::setClientDesktopMode(ClientDesktopMode desktopMode)
     d->clientDesktopMode = desktopMode;
 }
 
-TabBoxConfig::ClientActivitiesMode TabBoxConfig::clientActivitiesMode() const
-{
-    return d->clientActivitiesMode;
-}
-
-void TabBoxConfig::setClientActivitiesMode(ClientActivitiesMode activitiesMode)
-{
-    d->clientActivitiesMode = activitiesMode;
-}
-
 TabBoxConfig::ClientApplicationsMode TabBoxConfig::clientApplicationsMode() const
 {
     return d->clientApplicationsMode;

kwin/tabbox/tabboxconfig.h

@@ -61,15 +61,6 @@ public:
         ExcludeCurrentDesktopClients ///< Exclude TabBoxClients on current desktop
     };
     /**
-    * ClientActivitiesMode defines whether windows from the current activity or from all
-    * activities are included in the TabBoxClient List in the TabBoxClientModel
-    */
-    enum ClientActivitiesMode {
-        AllActivitiesClients, ///< TabBoxClients from all Activities are included.
-        OnlyCurrentActivityClients, ///< Only TabBoxClients on current activity are included
-        ExcludeCurrentActivityClients ///< Exclude TabBoxClients on current activity
-    };
-    /**
     * ClientApplicationsMode defines which windows from the current application or from all
     * applications are included in the TabBoxClient List in the TabBoxClientModel
     */
@@ -160,13 +151,6 @@ public:
     */
     ClientDesktopMode clientDesktopMode() const;
     /**
-    * @return The current ClientActivitiesMode
-    * This option only applies for TabBoxMode ClientTabBox.
-    * @see setClientActivitiesMode
-    * @see defaultActivitiesMode
-    */
-    ClientActivitiesMode clientActivitiesMode() const;
-    /**
     * @return The current ClientApplicationsMode
     * This option only applies for TabBoxMode ClientTabBox.
     * @see setClientApplicationsMode
@@ -238,12 +222,6 @@ public:
     */
     void setClientDesktopMode(ClientDesktopMode desktopMode);
     /**
-    * @param activitiesMode The new ClientActivitiesMode to be used.
-    * This option only applies for TabBoxMode ClientTabBox.
-    * @see clientActivitiesMode
-    */
-    void setClientActivitiesMode(ClientActivitiesMode activitiesMode);
-    /**
     * @param applicationsMode The new ClientApplicationsMode to be used.
     * This option only applies for TabBoxMode ClientTabBox.
     * @see clientApplicationsMode
@@ -289,9 +267,6 @@ public:
     static ClientDesktopMode defaultDesktopMode() {
         return OnlyCurrentDesktopClients;
     }
-    static ClientActivitiesMode defaultActivitiesMode() {
-        return OnlyCurrentActivityClients;
-    }
     static ClientApplicationsMode defaultApplicationsMode() {
         return AllWindowsAllApplications;
     }

kwin/tabbox/tests/test_tabbox_config.cpp

@@ -37,7 +37,6 @@ void TestTabBoxConfig::testDefaultCtor()
     QCOMPARE(config.isHighlightWindows(), TabBoxConfig::defaultHighlightWindow());
     QCOMPARE(config.tabBoxMode(), TabBoxConfig::ClientTabBox);
     QCOMPARE(config.clientDesktopMode(), TabBoxConfig::defaultDesktopMode());
-    QCOMPARE(config.clientActivitiesMode(), TabBoxConfig::defaultActivitiesMode());
     QCOMPARE(config.clientApplicationsMode(), TabBoxConfig::defaultApplicationsMode());
     QCOMPARE(config.clientMinimizedMode(), TabBoxConfig::defaultMinimizedMode());
     QCOMPARE(config.showDesktopMode(), TabBoxConfig::defaultShowDesktopMode());
@@ -55,7 +54,6 @@ void TestTabBoxConfig::testAssignmentOperator()
     config.setHighlightWindows(!TabBoxConfig::defaultHighlightWindow());
     config.setTabBoxMode(TabBoxConfig::DesktopTabBox);
     config.setClientDesktopMode(TabBoxConfig::AllDesktopsClients);
-    config.setClientActivitiesMode(TabBoxConfig::AllActivitiesClients);
     config.setClientApplicationsMode(TabBoxConfig::OneWindowPerApplication);
     config.setClientMinimizedMode(TabBoxConfig::ExcludeMinimizedClients);
     config.setShowDesktopMode(TabBoxConfig::ShowDesktopClient);
@@ -70,7 +68,6 @@ void TestTabBoxConfig::testAssignmentOperator()
     QCOMPARE(config2.isHighlightWindows(), !TabBoxConfig::defaultHighlightWindow());
     QCOMPARE(config2.tabBoxMode(), TabBoxConfig::DesktopTabBox);
     QCOMPARE(config2.clientDesktopMode(), TabBoxConfig::AllDesktopsClients);
-    QCOMPARE(config2.clientActivitiesMode(), TabBoxConfig::AllActivitiesClients);
     QCOMPARE(config2.clientApplicationsMode(), TabBoxConfig::OneWindowPerApplication);
     QCOMPARE(config2.clientMinimizedMode(), TabBoxConfig::ExcludeMinimizedClients);
     QCOMPARE(config2.showDesktopMode(), TabBoxConfig::ShowDesktopClient);