From 6cde471ec8fba409fcab62377cab0ffb901acba7 Mon Sep 17 00:00:00 2001 From: Andre Woebbeking Date: Thu, 7 Jun 2012 00:38:13 +0200 Subject: [PATCH] -pedantic --- libkwineffects/kwinglobals.h | 2 +- scripting/scriptingutils.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libkwineffects/kwinglobals.h b/libkwineffects/kwinglobals.h index c029089b65..689fe4da2a 100644 --- a/libkwineffects/kwinglobals.h +++ b/libkwineffects/kwinglobals.h @@ -104,7 +104,7 @@ enum TabBoxMode { TabBoxWindowsMode, // Primary window switching mode TabBoxWindowsAlternativeMode, // Secondary window switching mode TabBoxCurrentAppWindowsMode, // Same as primary window switching mode but only for windows of current application - TabBoxCurrentAppWindowsAlternativeMode, // Same as secondary switching mode but only for windows of current application + TabBoxCurrentAppWindowsAlternativeMode // Same as secondary switching mode but only for windows of current application }; enum KWinOption { diff --git a/scripting/scriptingutils.h b/scripting/scriptingutils.h index 74c145ff67..ff8f99fa44 100644 --- a/scripting/scriptingutils.h +++ b/scripting/scriptingutils.h @@ -117,7 +117,7 @@ QScriptValue globalShortcut(QScriptContext *context, QScriptEngine *engine) a->setGlobalShortcut(KShortcut(context->argument(2).toString())); script->registerShortcut(a, context->argument(3)); return engine->newVariant(true); -}; +} template void callGlobalShortcutCallback(T script, QObject *sender) @@ -132,7 +132,7 @@ void callGlobalShortcutCallback(T script, QObject *sender) } QScriptValue value(it.value()); value.call(); -}; +} template QScriptValue registerScreenEdge(QScriptContext *context, QScriptEngine *engine) @@ -164,7 +164,7 @@ QScriptValue registerScreenEdge(QScriptContext *context, QScriptEngine *engine) it->append(context->argument(1)); } return engine->newVariant(true); -}; +} template void screenEdgeActivated(T *script, int edge) @@ -176,7 +176,7 @@ void screenEdgeActivated(T *script, int edge) callback.call(); } } -}; +} template QScriptValue scriptingAssert(QScriptContext *context, QScriptEngine *engine, int min, int max, T defaultVal = T()) @@ -239,14 +239,14 @@ inline void registerGlobalShortcutFunction(QObject *parent, QScriptEngine *engin QScriptValue shortcutFunc = engine->newFunction(function); shortcutFunc.setData(engine->newQObject(parent)); engine->globalObject().setProperty("registerShortcut", shortcutFunc); -}; +} inline void registerScreenEdgeFunction(QObject *parent, QScriptEngine *engine, QScriptEngine::FunctionSignature function) { QScriptValue shortcutFunc = engine->newFunction(function); shortcutFunc.setData(engine->newQObject(parent)); engine->globalObject().setProperty("registerScreenEdge", shortcutFunc); -}; +} } // namespace KWin #endif // KWIN_SCRIPTINGUTILS_H