Skip to content

Commit 67c2a4a

Browse files
gspencergooggspencergoog
committed
Fix formatting
1 parent 5edfc9c commit 67c2a4a

File tree

14 files changed

+164
-171
lines changed

14 files changed

+164
-171
lines changed

‎packages/diagram_generator/linux/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "my_application.h"
22

3-
int main(int argc, char** argv) {
3+
int main(int argc, char **argv) {
44
g_autoptr(MyApplication) app = my_application_new();
55
return g_application_run(G_APPLICATION(app), argc, argv);
66
}

‎packages/diagram_generator/linux/my_application.cc

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
struct _MyApplication {
1111
GtkApplication parent_instance;
12-
char** dart_entrypoint_arguments;
12+
char **dart_entrypoint_arguments;
1313
};
1414

1515
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
1616

1717
// Implements GApplication::activate.
18-
static void my_application_activate(GApplication* application) {
19-
MyApplication* self = MY_APPLICATION(application);
20-
GtkWindow* window =
18+
static void my_application_activate(GApplication *application) {
19+
MyApplication *self = MY_APPLICATION(application);
20+
GtkWindow *window =
2121
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
2222

2323
// Use a header bar when running in GNOME as this is the common style used
@@ -29,16 +29,16 @@ static void my_application_activate(GApplication* application) {
2929
// if future cases occur).
3030
gboolean use_header_bar = TRUE;
3131
#ifdef GDK_WINDOWING_X11
32-
GdkScreen* screen = gtk_window_get_screen(window);
32+
GdkScreen *screen = gtk_window_get_screen(window);
3333
if (GDK_IS_X11_SCREEN(screen)) {
34-
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
34+
const gchar *wm_name = gdk_x11_screen_get_window_manager_name(screen);
3535
if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
3636
use_header_bar = FALSE;
3737
}
3838
}
3939
#endif
4040
if (use_header_bar) {
41-
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
41+
GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
4242
gtk_widget_show(GTK_WIDGET(header_bar));
4343
gtk_header_bar_set_title(header_bar, "diagram_generator");
4444
gtk_header_bar_set_show_close_button(header_bar, TRUE);
@@ -51,9 +51,10 @@ static void my_application_activate(GApplication* application) {
5151
gtk_widget_show(GTK_WIDGET(window));
5252

5353
g_autoptr(FlDartProject) project = fl_dart_project_new();
54-
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
54+
fl_dart_project_set_dart_entrypoint_arguments(
55+
project, self->dart_entrypoint_arguments);
5556

56-
FlView* view = fl_view_new(project);
57+
FlView *view = fl_view_new(project);
5758
gtk_widget_show(GTK_WIDGET(view));
5859
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
5960

@@ -63,16 +64,18 @@ static void my_application_activate(GApplication* application) {
6364
}
6465

6566
// Implements GApplication::local_command_line.
66-
static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
67-
MyApplication* self = MY_APPLICATION(application);
67+
static gboolean my_application_local_command_line(GApplication *application,
68+
gchar ***arguments,
69+
int *exit_status) {
70+
MyApplication *self = MY_APPLICATION(application);
6871
// Strip out the first argument as it is the binary name.
6972
self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
7073

7174
g_autoptr(GError) error = nullptr;
7275
if (!g_application_register(application, nullptr, &error)) {
73-
g_warning("Failed to register: %s", error->message);
74-
*exit_status = 1;
75-
return TRUE;
76+
g_warning("Failed to register: %s", error->message);
77+
*exit_status = 1;
78+
return TRUE;
7679
}
7780

7881
g_application_activate(application);
@@ -82,43 +85,43 @@ static gboolean my_application_local_command_line(GApplication* application, gch
8285
}
8386

8487
// Implements GApplication::startup.
85-
static void my_application_startup(GApplication* application) {
86-
//MyApplication* self = MY_APPLICATION(object);
88+
static void my_application_startup(GApplication *application) {
89+
// MyApplication* self = MY_APPLICATION(object);
8790

8891
// Perform any actions required at application startup.
8992

9093
G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
9194
}
9295

9396
// Implements GApplication::shutdown.
94-
static void my_application_shutdown(GApplication* application) {
95-
//MyApplication* self = MY_APPLICATION(object);
97+
static void my_application_shutdown(GApplication *application) {
98+
// MyApplication* self = MY_APPLICATION(object);
9699

97100
// Perform any actions required at application shutdown.
98101

99102
G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
100103
}
101104

102105
// Implements GObject::dispose.
103-
static void my_application_dispose(GObject* object) {
104-
MyApplication* self = MY_APPLICATION(object);
106+
static void my_application_dispose(GObject *object) {
107+
MyApplication *self = MY_APPLICATION(object);
105108
g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
106109
G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
107110
}
108111

109-
static void my_application_class_init(MyApplicationClass* klass) {
112+
static void my_application_class_init(MyApplicationClass *klass) {
110113
G_APPLICATION_CLASS(klass)->activate = my_application_activate;
111-
G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
114+
G_APPLICATION_CLASS(klass)->local_command_line =
115+
my_application_local_command_line;
112116
G_APPLICATION_CLASS(klass)->startup = my_application_startup;
113117
G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
114118
G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
115119
}
116120

117-
static void my_application_init(MyApplication* self) {}
121+
static void my_application_init(MyApplication *self) {}
118122

119-
MyApplication* my_application_new() {
123+
MyApplication *my_application_new() {
120124
return MY_APPLICATION(g_object_new(my_application_get_type(),
121-
"application-id", APPLICATION_ID,
122-
"flags", G_APPLICATION_NON_UNIQUE,
123-
nullptr));
125+
"application-id", APPLICATION_ID, "flags",
126+
G_APPLICATION_NON_UNIQUE, nullptr));
124127
}

‎packages/diagram_generator/linux/my_application.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
1313
*
1414
* Returns: a new #MyApplication.
1515
*/
16-
MyApplication* my_application_new();
16+
MyApplication *my_application_new();
1717

18-
#endif // FLUTTER_MY_APPLICATION_H_
18+
#endif // FLUTTER_MY_APPLICATION_H_

‎packages/diagram_viewer/linux/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "my_application.h"
22

3-
int main(int argc, char** argv) {
3+
int main(int argc, char **argv) {
44
g_autoptr(MyApplication) app = my_application_new();
55
return g_application_run(G_APPLICATION(app), argc, argv);
66
}

‎packages/diagram_viewer/linux/my_application.cc

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
struct _MyApplication {
1111
GtkApplication parent_instance;
12-
char** dart_entrypoint_arguments;
12+
char **dart_entrypoint_arguments;
1313
};
1414

1515
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
1616

1717
// Implements GApplication::activate.
18-
static void my_application_activate(GApplication* application) {
19-
MyApplication* self = MY_APPLICATION(application);
20-
GtkWindow* window =
18+
static void my_application_activate(GApplication *application) {
19+
MyApplication *self = MY_APPLICATION(application);
20+
GtkWindow *window =
2121
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
2222

2323
// Use a header bar when running in GNOME as this is the common style used
@@ -29,16 +29,16 @@ static void my_application_activate(GApplication* application) {
2929
// if future cases occur).
3030
gboolean use_header_bar = TRUE;
3131
#ifdef GDK_WINDOWING_X11
32-
GdkScreen* screen = gtk_window_get_screen(window);
32+
GdkScreen *screen = gtk_window_get_screen(window);
3333
if (GDK_IS_X11_SCREEN(screen)) {
34-
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
34+
const gchar *wm_name = gdk_x11_screen_get_window_manager_name(screen);
3535
if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
3636
use_header_bar = FALSE;
3737
}
3838
}
3939
#endif
4040
if (use_header_bar) {
41-
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
41+
GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
4242
gtk_widget_show(GTK_WIDGET(header_bar));
4343
gtk_header_bar_set_title(header_bar, "diagram_viewer");
4444
gtk_header_bar_set_show_close_button(header_bar, TRUE);
@@ -51,9 +51,10 @@ static void my_application_activate(GApplication* application) {
5151
gtk_widget_show(GTK_WIDGET(window));
5252

5353
g_autoptr(FlDartProject) project = fl_dart_project_new();
54-
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
54+
fl_dart_project_set_dart_entrypoint_arguments(
55+
project, self->dart_entrypoint_arguments);
5556

56-
FlView* view = fl_view_new(project);
57+
FlView *view = fl_view_new(project);
5758
gtk_widget_show(GTK_WIDGET(view));
5859
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
5960

@@ -63,16 +64,18 @@ static void my_application_activate(GApplication* application) {
6364
}
6465

6566
// Implements GApplication::local_command_line.
66-
static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
67-
MyApplication* self = MY_APPLICATION(application);
67+
static gboolean my_application_local_command_line(GApplication *application,
68+
gchar ***arguments,
69+
int *exit_status) {
70+
MyApplication *self = MY_APPLICATION(application);
6871
// Strip out the first argument as it is the binary name.
6972
self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
7073

7174
g_autoptr(GError) error = nullptr;
7275
if (!g_application_register(application, nullptr, &error)) {
73-
g_warning("Failed to register: %s", error->message);
74-
*exit_status = 1;
75-
return TRUE;
76+
g_warning("Failed to register: %s", error->message);
77+
*exit_status = 1;
78+
return TRUE;
7679
}
7780

7881
g_application_activate(application);
@@ -82,43 +85,43 @@ static gboolean my_application_local_command_line(GApplication* application, gch
8285
}
8386

8487
// Implements GApplication::startup.
85-
static void my_application_startup(GApplication* application) {
86-
//MyApplication* self = MY_APPLICATION(object);
88+
static void my_application_startup(GApplication *application) {
89+
// MyApplication* self = MY_APPLICATION(object);
8790

8891
// Perform any actions required at application startup.
8992

9093
G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
9194
}
9295

9396
// Implements GApplication::shutdown.
94-
static void my_application_shutdown(GApplication* application) {
95-
//MyApplication* self = MY_APPLICATION(object);
97+
static void my_application_shutdown(GApplication *application) {
98+
// MyApplication* self = MY_APPLICATION(object);
9699

97100
// Perform any actions required at application shutdown.
98101

99102
G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
100103
}
101104

102105
// Implements GObject::dispose.
103-
static void my_application_dispose(GObject* object) {
104-
MyApplication* self = MY_APPLICATION(object);
106+
static void my_application_dispose(GObject *object) {
107+
MyApplication *self = MY_APPLICATION(object);
105108
g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
106109
G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
107110
}
108111

109-
static void my_application_class_init(MyApplicationClass* klass) {
112+
static void my_application_class_init(MyApplicationClass *klass) {
110113
G_APPLICATION_CLASS(klass)->activate = my_application_activate;
111-
G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
114+
G_APPLICATION_CLASS(klass)->local_command_line =
115+
my_application_local_command_line;
112116
G_APPLICATION_CLASS(klass)->startup = my_application_startup;
113117
G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
114118
G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
115119
}
116120

117-
static void my_application_init(MyApplication* self) {}
121+
static void my_application_init(MyApplication *self) {}
118122

119-
MyApplication* my_application_new() {
123+
MyApplication *my_application_new() {
120124
return MY_APPLICATION(g_object_new(my_application_get_type(),
121-
"application-id", APPLICATION_ID,
122-
"flags", G_APPLICATION_NON_UNIQUE,
123-
nullptr));
125+
"application-id", APPLICATION_ID, "flags",
126+
G_APPLICATION_NON_UNIQUE, nullptr));
124127
}

‎packages/diagram_viewer/linux/my_application.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
1313
*
1414
* Returns: a new #MyApplication.
1515
*/
16-
MyApplication* my_application_new();
16+
MyApplication *my_application_new();
1717

18-
#endif // FLUTTER_MY_APPLICATION_H_
18+
#endif // FLUTTER_MY_APPLICATION_H_

‎packages/diagram_viewer/windows/runner/flutter_window.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "flutter/generated_plugin_registrant.h"
66

7-
FlutterWindow::FlutterWindow(const flutter::DartProject& project)
7+
FlutterWindow::FlutterWindow(const flutter::DartProject &project)
88
: project_(project) {}
99

1010
FlutterWindow::~FlutterWindow() {}
@@ -27,9 +27,7 @@ bool FlutterWindow::OnCreate() {
2727
RegisterPlugins(flutter_controller_->engine());
2828
SetChildContent(flutter_controller_->view()->GetNativeWindow());
2929

30-
flutter_controller_->engine()->SetNextFrameCallback([&]() {
31-
this->Show();
32-
});
30+
flutter_controller_->engine()->SetNextFrameCallback([&]() { this->Show(); });
3331

3432
// Flutter can complete the first frame before the "show window" callback is
3533
// registered. The following call ensures a frame is pending to ensure the
@@ -62,9 +60,9 @@ FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
6260
}
6361

6462
switch (message) {
65-
case WM_FONTCHANGE:
66-
flutter_controller_->engine()->ReloadSystemFonts();
67-
break;
63+
case WM_FONTCHANGE:
64+
flutter_controller_->engine()->ReloadSystemFonts();
65+
break;
6866
}
6967

7068
return Win32Window::MessageHandler(hwnd, message, wparam, lparam);

‎packages/diagram_viewer/windows/runner/flutter_window.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010

1111
// A window that does nothing but host a Flutter view.
1212
class FlutterWindow : public Win32Window {
13-
public:
13+
public:
1414
// Creates a new FlutterWindow hosting a Flutter view running |project|.
15-
explicit FlutterWindow(const flutter::DartProject& project);
15+
explicit FlutterWindow(const flutter::DartProject &project);
1616
virtual ~FlutterWindow();
1717

18-
protected:
18+
protected:
1919
// Win32Window:
2020
bool OnCreate() override;
2121
void OnDestroy() override;
2222
LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam,
2323
LPARAM const lparam) noexcept override;
2424

25-
private:
25+
private:
2626
// The project to run.
2727
flutter::DartProject project_;
2828

2929
// The Flutter instance hosted by this window.
3030
std::unique_ptr<flutter::FlutterViewController> flutter_controller_;
3131
};
3232

33-
#endif // RUNNER_FLUTTER_WINDOW_H_
33+
#endif // RUNNER_FLUTTER_WINDOW_H_

‎packages/diagram_viewer/windows/runner/main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
1919

2020
flutter::DartProject project(L"data");
2121

22-
std::vector<std::string> command_line_arguments =
23-
GetCommandLineArguments();
22+
std::vector<std::string> command_line_arguments = GetCommandLineArguments();
2423

2524
project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
2625

‎packages/diagram_viewer/windows/runner/resource.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
// Microsoft Visual C++ generated include file.
33
// Used by Runner.rc
44
//
5-
#define IDI_APP_ICON 101
5+
#define IDI_APP_ICON 101
66

77
// Next default values for new objects
88
//
99
#ifdef APSTUDIO_INVOKED
1010
#ifndef APSTUDIO_READONLY_SYMBOLS
11-
#define _APS_NEXT_RESOURCE_VALUE 102
12-
#define _APS_NEXT_COMMAND_VALUE 40001
13-
#define _APS_NEXT_CONTROL_VALUE 1001
14-
#define _APS_NEXT_SYMED_VALUE 101
11+
#define _APS_NEXT_RESOURCE_VALUE 102
12+
#define _APS_NEXT_COMMAND_VALUE 40001
13+
#define _APS_NEXT_CONTROL_VALUE 1001
14+
#define _APS_NEXT_SYMED_VALUE 101
1515
#endif
1616
#endif

0 commit comments

Comments
 (0)