|
|
@ -19,10 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*********************************************************************/
|
|
|
|
*********************************************************************/
|
|
|
|
#include "../virtualdesktops.h"
|
|
|
|
#include "../virtualdesktops.h"
|
|
|
|
// KDE
|
|
|
|
// KDE
|
|
|
|
#include <KDE/KAction>
|
|
|
|
|
|
|
|
#include <KDE/KActionCollection>
|
|
|
|
#include <KDE/KActionCollection>
|
|
|
|
#include <KDE/KConfigGroup>
|
|
|
|
#include <KDE/KConfigGroup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <QAction>
|
|
|
|
#include <QtTest/QtTest>
|
|
|
|
#include <QtTest/QtTest>
|
|
|
|
|
|
|
|
|
|
|
|
namespace KWin {
|
|
|
|
namespace KWin {
|
|
|
@ -278,7 +278,6 @@ void TestVirtualDesktops::testDirection(const QString &actionName)
|
|
|
|
vds->initShortcuts(keys.data());
|
|
|
|
vds->initShortcuts(keys.data());
|
|
|
|
QAction *action = keys->action(actionName);
|
|
|
|
QAction *action = keys->action(actionName);
|
|
|
|
QVERIFY(action);
|
|
|
|
QVERIFY(action);
|
|
|
|
QVERIFY(static_cast<KAction*>(action)->isGlobalShortcutEnabled());
|
|
|
|
|
|
|
|
action->trigger();
|
|
|
|
action->trigger();
|
|
|
|
QCOMPARE(vds->current(), result);
|
|
|
|
QCOMPARE(vds->current(), result);
|
|
|
|
QCOMPARE(functor(initCurrent, wrap), result);
|
|
|
|
QCOMPARE(functor(initCurrent, wrap), result);
|
|
|
@ -563,7 +562,6 @@ void TestVirtualDesktops::switchToShortcuts()
|
|
|
|
const QString desktop(toDesktop.arg(i));
|
|
|
|
const QString desktop(toDesktop.arg(i));
|
|
|
|
QAction *action = keys->action(desktop);
|
|
|
|
QAction *action = keys->action(desktop);
|
|
|
|
QVERIFY2(action, desktop.toUtf8().constData());
|
|
|
|
QVERIFY2(action, desktop.toUtf8().constData());
|
|
|
|
QVERIFY(static_cast<KAction*>(action)->isGlobalShortcutEnabled());
|
|
|
|
|
|
|
|
action->trigger();
|
|
|
|
action->trigger();
|
|
|
|
QCOMPARE(vds->current(), i);
|
|
|
|
QCOMPARE(vds->current(), i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|