| Index: webrtc/examples/peerconnection/client/linux/main_wnd.cc
|
| diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.cc b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
|
| index 55a59aea2cb8682d154433510bb849d6cbd58287..cfa5b39ac62f9b90387f66dc894bfcfca6ab5d81 100644
|
| --- a/webrtc/examples/peerconnection/client/linux/main_wnd.cc
|
| +++ b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
|
| @@ -60,8 +60,8 @@ gboolean SimulateLastRowActivated(gpointer data) {
|
| GtkTreeView* tree_view = reinterpret_cast<GtkTreeView*>(data);
|
| GtkTreeModel* model = gtk_tree_view_get_model(tree_view);
|
|
|
| - // "if iter is NULL, then the number of toplevel nodes is returned."
|
| - int rows = gtk_tree_model_iter_n_children(model, NULL);
|
| + // "if iter is null, then the number of toplevel nodes is returned."
|
| + int rows = gtk_tree_model_iter_n_children(model, nullptr);
|
| GtkTreePath* lastpath = gtk_tree_path_new_from_indices(rows - 1, -1);
|
|
|
| // Select the last item in the list
|
| @@ -81,7 +81,7 @@ gboolean SimulateLastRowActivated(gpointer data) {
|
| void InitializeList(GtkWidget* list) {
|
| GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
|
| GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes(
|
| - "List Items", renderer, "text", 0, NULL);
|
| + "List Items", renderer, "text", 0, nullptr);
|
| gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
|
| GtkListStore* store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
|
| gtk_tree_view_set_model(GTK_TREE_VIEW(list), GTK_TREE_MODEL(store));
|
| @@ -131,11 +131,20 @@ gboolean Draw(GtkWidget* widget, cairo_t* cr, gpointer data) {
|
| // GtkMainWnd implementation.
|
| //
|
|
|
| -GtkMainWnd::GtkMainWnd(const char* server, int port, bool autoconnect,
|
| +GtkMainWnd::GtkMainWnd(const char* server,
|
| + int port,
|
| + bool autoconnect,
|
| bool autocall)
|
| - : window_(NULL), draw_area_(NULL), vbox_(NULL), server_edit_(NULL),
|
| - port_edit_(NULL), peer_list_(NULL), callback_(NULL),
|
| - server_(server), autoconnect_(autoconnect), autocall_(autocall) {
|
| + : window_(nullptr),
|
| + draw_area_(nullptr),
|
| + vbox_(nullptr),
|
| + server_edit_(nullptr),
|
| + port_edit_(nullptr),
|
| + peer_list_(nullptr),
|
| + callback_(nullptr),
|
| + server_(server),
|
| + autoconnect_(autoconnect),
|
| + autocall_(autocall) {
|
| char buffer[10];
|
| sprintfn(buffer, sizeof(buffer), "%i", port);
|
| port_ = buffer;
|
| @@ -150,7 +159,7 @@ void GtkMainWnd::RegisterObserver(MainWndCallback* callback) {
|
| }
|
|
|
| bool GtkMainWnd::IsWindow() {
|
| - return window_ != NULL && GTK_IS_WINDOW(window_);
|
| + return window_ != nullptr && GTK_IS_WINDOW(window_);
|
| }
|
|
|
| void GtkMainWnd::MessageBox(const char* caption, const char* text,
|
| @@ -198,7 +207,7 @@ void GtkMainWnd::QueueUIThreadCallback(int msg_id, void* data) {
|
| }
|
|
|
| bool GtkMainWnd::Create() {
|
| - RTC_DCHECK(window_ == NULL);
|
| + RTC_DCHECK(window_ == nullptr);
|
|
|
| window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
| if (window_) {
|
| @@ -213,7 +222,7 @@ bool GtkMainWnd::Create() {
|
| SwitchToConnectUI();
|
| }
|
|
|
| - return window_ != NULL;
|
| + return window_ != nullptr;
|
| }
|
|
|
| bool GtkMainWnd::Destroy() {
|
| @@ -221,7 +230,7 @@ bool GtkMainWnd::Destroy() {
|
| return false;
|
|
|
| gtk_widget_destroy(window_);
|
| - window_ = NULL;
|
| + window_ = nullptr;
|
|
|
| return true;
|
| }
|
| @@ -230,13 +239,13 @@ void GtkMainWnd::SwitchToConnectUI() {
|
| LOG(INFO) << __FUNCTION__;
|
|
|
| RTC_DCHECK(IsWindow());
|
| - RTC_DCHECK(vbox_ == NULL);
|
| + RTC_DCHECK(vbox_ == nullptr);
|
|
|
| gtk_container_set_border_width(GTK_CONTAINER(window_), 10);
|
|
|
| if (peer_list_) {
|
| gtk_widget_destroy(peer_list_);
|
| - peer_list_ = NULL;
|
| + peer_list_ = nullptr;
|
| }
|
|
|
| #if GTK_MAJOR_VERSION == 2
|
| @@ -289,12 +298,12 @@ void GtkMainWnd::SwitchToPeerList(const Peers& peers) {
|
| gtk_container_set_border_width(GTK_CONTAINER(window_), 0);
|
| if (vbox_) {
|
| gtk_widget_destroy(vbox_);
|
| - vbox_ = NULL;
|
| - server_edit_ = NULL;
|
| - port_edit_ = NULL;
|
| + vbox_ = nullptr;
|
| + server_edit_ = nullptr;
|
| + port_edit_ = nullptr;
|
| } else if (draw_area_) {
|
| gtk_widget_destroy(draw_area_);
|
| - draw_area_ = NULL;
|
| + draw_area_ = nullptr;
|
| draw_buffer_.reset();
|
| }
|
|
|
| @@ -322,12 +331,12 @@ void GtkMainWnd::SwitchToPeerList(const Peers& peers) {
|
| void GtkMainWnd::SwitchToStreamingUI() {
|
| LOG(INFO) << __FUNCTION__;
|
|
|
| - RTC_DCHECK(draw_area_ == NULL);
|
| + RTC_DCHECK(draw_area_ == nullptr);
|
|
|
| gtk_container_set_border_width(GTK_CONTAINER(window_), 0);
|
| if (peer_list_) {
|
| gtk_widget_destroy(peer_list_);
|
| - peer_list_ = NULL;
|
| + peer_list_ = nullptr;
|
| }
|
|
|
| draw_area_ = gtk_drawing_area_new();
|
| @@ -339,12 +348,12 @@ void GtkMainWnd::SwitchToStreamingUI() {
|
|
|
| void GtkMainWnd::OnDestroyed(GtkWidget* widget, GdkEvent* event) {
|
| callback_->Close();
|
| - window_ = NULL;
|
| - draw_area_ = NULL;
|
| - vbox_ = NULL;
|
| - server_edit_ = NULL;
|
| - port_edit_ = NULL;
|
| - peer_list_ = NULL;
|
| + window_ = nullptr;
|
| + draw_area_ = nullptr;
|
| + vbox_ = nullptr;
|
| + server_edit_ = nullptr;
|
| + port_edit_ = nullptr;
|
| + peer_list_ = nullptr;
|
| }
|
|
|
| void GtkMainWnd::OnClicked(GtkWidget* widget) {
|
| @@ -381,7 +390,7 @@ void GtkMainWnd::OnKeyPress(GtkWidget* widget, GdkEventKey* key) {
|
| case GDK_KEY_Return:
|
| #endif
|
| if (vbox_) {
|
| - OnClicked(NULL);
|
| + OnClicked(nullptr);
|
| } else if (peer_list_) {
|
| // OnRowActivated will be called automatically when the user
|
| // presses enter.
|
| @@ -396,7 +405,7 @@ void GtkMainWnd::OnKeyPress(GtkWidget* widget, GdkEventKey* key) {
|
|
|
| void GtkMainWnd::OnRowActivated(GtkTreeView* tree_view, GtkTreePath* path,
|
| GtkTreeViewColumn* column) {
|
| - RTC_DCHECK(peer_list_ != NULL);
|
| + RTC_DCHECK(peer_list_ != nullptr);
|
| GtkTreeIter iter;
|
| GtkTreeModel* model;
|
| GtkTreeSelection* selection =
|
| @@ -415,8 +424,8 @@ void GtkMainWnd::OnRedraw() {
|
| gdk_threads_enter();
|
|
|
| VideoRenderer* remote_renderer = remote_renderer_.get();
|
| - if (remote_renderer && remote_renderer->image() != NULL &&
|
| - draw_area_ != NULL) {
|
| + if (remote_renderer && remote_renderer->image() != nullptr &&
|
| + draw_area_ != nullptr) {
|
| width_ = remote_renderer->width();
|
| height_ = remote_renderer->height();
|
|
|
|
|