e885a33 · unity8 · git.iko.soy

git.iko.soy/unity8

style tweaks

commite885a33ca042981aef314bb8d710d38f58ea610f authorNick Dedekind <nick.dedekind@canonical.com> dateWed 1 Apr 2015, 16:03 (12 years ago) parentf723e6a

3 files changed+23−26

compare with xenial

unifiedsplit

plugins/Utils/plugin.cpp+1−3 qml/Panel/Indicators/MenuItemFactory.qml−1 tests/mocks/indicator-service/mock-indicator-service.c+22−22

plugins/Utils/plugin.cpp+1−3

@@ -50,7 +50,6 @@ static QObject *createConstants(QQmlEngine *engine, QJSEngine *scriptEngine)

5050 return new Constants();

5151}

5252

53−

5453void UtilsPlugin::registerTypes(const char *uri)

5554{

5655 Q_ASSERT(uri == QLatin1String("Utils"));

@@ -64,8 +63,7 @@ void UtilsPlugin::registerTypes(const char *uri)

6463 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

6564 qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");

6665 qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);

67−

68− qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "Constants", createConstants);

66+ qmlRegisterSingletonType<Constants>(uri, 0, 1, "Constants", createConstants);

6967}

7068

7169void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

qml/Panel/Indicators/MenuItemFactory.qml−1

@@ -320,7 +320,6 @@ Item {

320320 objectName: "switchMenu"

321321 property QtObject menuData: null

322322 property int menuIndex: -1

323−

324323 property bool serverChecked: menuData && menuData.isToggled || false

325324

326325 text: menuData && menuData.label || ""

tests/mocks/indicator-service/mock-indicator-service.c+22−22

@@ -31,17 +31,17 @@ typedef struct

3131

3232static void

3333bus_acquired (GDBusConnection *connection,

34− const gchar *name,

35− gpointer user_data)

34+ const gchar *name,

35+ gpointer user_data)

3636{

3737 (void) name;

3838 IndicatorTestService *indicator = user_data;

3939 GError *error = NULL;

4040

4141 indicator->actions_export_id = g_dbus_connection_export_action_group (connection,

42− "/com/canonical/indicator/mock",

43− G_ACTION_GROUP (indicator->actions),

44− &error);

42+ "/com/canonical/indicator/mock",

43+ G_ACTION_GROUP (indicator->actions),

44+ &error);

4545 if (indicator->actions_export_id == 0)

4646 {

4747 g_warning ("cannot export action group: %s", error->message);

@@ -50,9 +50,9 @@ bus_acquired (GDBusConnection *connection,

5050 }

5151

5252 indicator->menu_export_id = g_dbus_connection_export_menu_model (connection,

53− "/com/canonical/indicator/mock/desktop",

54− G_MENU_MODEL (indicator->menu),

55− &error);

53+ "/com/canonical/indicator/mock/desktop",

54+ G_MENU_MODEL (indicator->menu),

55+ &error);

5656 if (indicator->menu_export_id == 0)

5757 {

5858 g_warning ("cannot export menu: %s", error->message);

@@ -63,8 +63,8 @@ bus_acquired (GDBusConnection *connection,

6363

6464static void

6565name_lost (GDBusConnection *connection,

66− const gchar *name,

67− gpointer user_data)

66+ const gchar *name,

67+ gpointer user_data)

6868{

6969 (void) name;

7070 IndicatorTestService *indicator = user_data;

@@ -78,8 +78,8 @@ name_lost (GDBusConnection *connection,

7878

7979static void

8080activate_show (GSimpleAction *action,

81− GVariant *parameter,

82− gpointer user_data)

81+ GVariant *parameter,

82+ gpointer user_data)

8383{

8484 (void) action;

8585 (void) parameter;

@@ -105,8 +105,8 @@ actual_switch (gpointer user_data)

105105

106106static void

107107activate_switch (GSimpleAction *action,

108− GVariant *parameter,

109− gpointer user_data)

108+ GVariant *parameter,

109+ gpointer user_data)

110110{

111111 (void) action;

112112 (void) parameter;

@@ -240,13 +240,13 @@ main (int argc, char **argv)

240240 g_menu_append_item (indicator.menu, item);

241241

242242 g_bus_own_name (G_BUS_TYPE_SESSION,

243− "com.canonical.indicator.mock",

244− G_BUS_NAME_OWNER_FLAGS_NONE,

245− bus_acquired,

246− NULL,

247− name_lost,

248− &indicator,

249− NULL);

243+ "com.canonical.indicator.mock",

244+ G_BUS_NAME_OWNER_FLAGS_NONE,

245+ bus_acquired,

246+ NULL,

247+ name_lost,

248+ &indicator,

249+ NULL);

250250

251251 loop = g_main_loop_new (NULL, FALSE);

252252 g_main_loop_run (loop);

@@ -258,4 +258,4 @@ main (int argc, char **argv)

258258 g_object_unref (loop);

259259

260260 return 1;

261−}

261+}