-pedantic

This commit is contained in:
Andre Woebbeking 2012-06-07 00:38:13 +02:00
parent 08a8ecaaa5
commit 6cde471ec8
2 changed files with 7 additions and 7 deletions

View file

@ -104,7 +104,7 @@ enum TabBoxMode {
TabBoxWindowsMode, // Primary window switching mode TabBoxWindowsMode, // Primary window switching mode
TabBoxWindowsAlternativeMode, // Secondary window switching mode TabBoxWindowsAlternativeMode, // Secondary window switching mode
TabBoxCurrentAppWindowsMode, // Same as primary window switching mode but only for windows of current application 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 { enum KWinOption {

View file

@ -117,7 +117,7 @@ QScriptValue globalShortcut(QScriptContext *context, QScriptEngine *engine)
a->setGlobalShortcut(KShortcut(context->argument(2).toString())); a->setGlobalShortcut(KShortcut(context->argument(2).toString()));
script->registerShortcut(a, context->argument(3)); script->registerShortcut(a, context->argument(3));
return engine->newVariant(true); return engine->newVariant(true);
}; }
template<class T> template<class T>
void callGlobalShortcutCallback(T script, QObject *sender) void callGlobalShortcutCallback(T script, QObject *sender)
@ -132,7 +132,7 @@ void callGlobalShortcutCallback(T script, QObject *sender)
} }
QScriptValue value(it.value()); QScriptValue value(it.value());
value.call(); value.call();
}; }
template<class T> template<class T>
QScriptValue registerScreenEdge(QScriptContext *context, QScriptEngine *engine) QScriptValue registerScreenEdge(QScriptContext *context, QScriptEngine *engine)
@ -164,7 +164,7 @@ QScriptValue registerScreenEdge(QScriptContext *context, QScriptEngine *engine)
it->append(context->argument(1)); it->append(context->argument(1));
} }
return engine->newVariant(true); return engine->newVariant(true);
}; }
template<class T> template<class T>
void screenEdgeActivated(T *script, int edge) void screenEdgeActivated(T *script, int edge)
@ -176,7 +176,7 @@ void screenEdgeActivated(T *script, int edge)
callback.call(); callback.call();
} }
} }
}; }
template<class T> template<class T>
QScriptValue scriptingAssert(QScriptContext *context, QScriptEngine *engine, int min, int max, T defaultVal = T()) 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); QScriptValue shortcutFunc = engine->newFunction(function);
shortcutFunc.setData(engine->newQObject(parent)); shortcutFunc.setData(engine->newQObject(parent));
engine->globalObject().setProperty("registerShortcut", shortcutFunc); engine->globalObject().setProperty("registerShortcut", shortcutFunc);
}; }
inline void registerScreenEdgeFunction(QObject *parent, QScriptEngine *engine, QScriptEngine::FunctionSignature function) inline void registerScreenEdgeFunction(QObject *parent, QScriptEngine *engine, QScriptEngine::FunctionSignature function)
{ {
QScriptValue shortcutFunc = engine->newFunction(function); QScriptValue shortcutFunc = engine->newFunction(function);
shortcutFunc.setData(engine->newQObject(parent)); shortcutFunc.setData(engine->newQObject(parent));
engine->globalObject().setProperty("registerScreenEdge", shortcutFunc); engine->globalObject().setProperty("registerScreenEdge", shortcutFunc);
}; }
} // namespace KWin } // namespace KWin
#endif // KWIN_SCRIPTINGUTILS_H #endif // KWIN_SCRIPTINGUTILS_H