Skip to content

Commit

Permalink
Remove references to topaz (flutter#12565)
Browse files Browse the repository at this point in the history
* Add clangd directory to gitignore

* Remove references to TOPAZ_ from #ifdefs

We missed these in the migration.
  • Loading branch information
iskakaushik authored Sep 27, 2019
1 parent 123e854 commit c25cdfe
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.DS_Store
.ccls-cache
.classpath
.clangd/
.cproject
.dart_tool
.gdb_history
Expand Down
6 changes: 3 additions & 3 deletions shell/platform/fuchsia/dart_runner/builtin_libraries.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef TOPAZ_RUNTIME_DART_RUNNER_BUILTIN_LIBRARIES_H_
#define TOPAZ_RUNTIME_DART_RUNNER_BUILTIN_LIBRARIES_H_
#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_

#include <memory>
#include <string>
Expand All @@ -25,4 +25,4 @@ void InitBuiltinLibrariesForIsolate(

} // namespace dart_runner

#endif // TOPAZ_RUNTIME_DART_RUNNER_BUILTIN_LIBRARIES_H_
#endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef TOPAZ_RUNTIME_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
#define TOPAZ_RUNTIME_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_

#include <memory>

Expand Down Expand Up @@ -92,4 +92,4 @@ class DartComponentController : public fuchsia::sys::ComponentController {

} // namespace dart_runner

#endif // TOPAZ_RUNTIME_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
#endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
6 changes: 3 additions & 3 deletions shell/platform/fuchsia/dart_runner/dart_runner.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef TOPAZ_RUNTIME_DART_RUNNER_DART_RUNNER_H_
#define TOPAZ_RUNTIME_DART_RUNNER_DART_RUNNER_H_
#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_
#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_

#include <fuchsia/sys/cpp/fidl.h>
#include <lib/fidl/cpp/binding_set.h>
Expand Down Expand Up @@ -41,4 +41,4 @@ class DartRunner : public fuchsia::sys::Runner {

} // namespace dart_runner

#endif // TOPAZ_RUNTIME_DART_RUNNER_DART_RUNNER_H_
#endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_
6 changes: 3 additions & 3 deletions shell/platform/fuchsia/dart_runner/logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef TOPAZ_RUNTIME_DART_RUNNER_LOGGING_H_
#define TOPAZ_RUNTIME_DART_RUNNER_LOGGING_H_
#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_LOGGING_H_
#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_LOGGING_H_

namespace dart_runner {

Expand All @@ -12,4 +12,4 @@ namespace dart_runner {

} // namespace dart_runner

#endif // TOPAZ_RUNTIME_DART_RUNNER_LOGGING_H_
#endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_LOGGING_H_
6 changes: 3 additions & 3 deletions shell/platform/fuchsia/flutter/accessibility_bridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef TOPAZ_RUNTIME_FLUTTER_RUNNER_ACCESSIBILITY_BRIDGE_H_
#define TOPAZ_RUNTIME_FLUTTER_RUNNER_ACCESSIBILITY_BRIDGE_H_
#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ACCESSIBILITY_BRIDGE_H_
#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ACCESSIBILITY_BRIDGE_H_

#include <fuchsia/accessibility/semantics/cpp/fidl.h>
#include <fuchsia/sys/cpp/fidl.h>
Expand Down Expand Up @@ -136,4 +136,4 @@ class AccessibilityBridge
};
} // namespace flutter_runner

#endif // TOPAZ_RUNTIME_FLUTTER_RUNNER_ACCESSIBILITY_BRIDGE_H_
#endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ACCESSIBILITY_BRIDGE_H_

0 comments on commit c25cdfe

Please sign in to comment.