From 3642531856d1a2653e044f0a5b6d8fb43c538023 Mon Sep 17 00:00:00 2001 From: Hugo Lefeuvre <hugo.lefeuvre@savoirfairelinux.com> Date: Tue, 24 Jul 2018 16:46:01 -0400 Subject: [PATCH] fix spelling errors Change-Id: Iacc77f28f77fef4da0a315063b1d8abe3ef9ed99 Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> --- src/accountcreationwizard.cpp | 2 +- src/avatarmanipulation.cpp | 2 +- src/chatview.cpp | 2 +- src/currentcallview.cpp | 4 ++-- src/newaccountsettingsview.cpp | 2 +- src/ring_client.cpp | 6 +++--- src/ringmainwindow.cpp | 2 +- src/utils/models.h | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/accountcreationwizard.cpp b/src/accountcreationwizard.cpp index fc9d7296..dc958311 100644 --- a/src/accountcreationwizard.cpp +++ b/src/accountcreationwizard.cpp @@ -606,7 +606,7 @@ account_creation_wizard_show_preview(AccountCreationWizard *win, gboolean show_p { AccountCreationWizardPrivate *priv = ACCOUNT_CREATION_WIZARD_GET_PRIVATE(win); - /* Similarily to general settings view, we construct and destroy the avatar manipulation widget + /* Similarly to general settings view, we construct and destroy the avatar manipulation widget each time the profile is made visible / hidden. While not the most elegant solution, this allows us to run the preview if and only if it is displayed, and always stop it when hidden. */ if (show_preview && !priv->avatar_manipulation) { diff --git a/src/avatarmanipulation.cpp b/src/avatarmanipulation.cpp index c7bc3e89..651dbaea 100644 --- a/src/avatarmanipulation.cpp +++ b/src/avatarmanipulation.cpp @@ -219,7 +219,7 @@ avatar_manipulation_init(AvatarManipulation *self) static void set_state(AvatarManipulation *self, AvatarManipulationState state) { - // note: this funciton does not check if the state transition is valid, this is assumed to have + // note: this function does not check if the state transition is valid, this is assumed to have // been done by the caller AvatarManipulationPrivate *priv = AVATAR_MANIPULATION_GET_PRIVATE(self); diff --git a/src/chatview.cpp b/src/chatview.cpp index c452aaf6..770e8bf3 100644 --- a/src/chatview.cpp +++ b/src/chatview.cpp @@ -236,7 +236,7 @@ webkit_chat_container_script_dialog(GtkWidget* webview, gchar *interaction, Chat lrc::api::datatransfer::Info info = {}; (*priv->accountInfo_)->conversationModel->getTransferInfo(interactionId, info); - // get prefered directory destination. + // get preferred directory destination. auto* download_directory_variant = g_settings_get_value(priv->settings, "download-folder"); char* download_directory_value; g_variant_get(download_directory_variant, "&s", &download_directory_value); diff --git a/src/currentcallview.cpp b/src/currentcallview.cpp index 16d8dbe6..b45a17c3 100644 --- a/src/currentcallview.cpp +++ b/src/currentcallview.cpp @@ -434,7 +434,7 @@ on_mouse_moved(CurrentCallView* view) } } - return FALSE; // propogate event + return FALSE; // propagate event } static void @@ -532,7 +532,7 @@ on_video_widget_focus(GtkWidget* widget, GtkDirectionType direction, CurrentCall return TRUE; } - // did not select the next child, propogate the event + // did not select the next child, propagate the event return FALSE; } diff --git a/src/newaccountsettingsview.cpp b/src/newaccountsettingsview.cpp index 01d22666..5b061b15 100644 --- a/src/newaccountsettingsview.cpp +++ b/src/newaccountsettingsview.cpp @@ -914,7 +914,7 @@ choose_export_file(NewAccountSettingsView *view) { g_return_if_fail(IS_NEW_ACCOUNT_SETTINGS_VIEW(view)); auto* priv = NEW_ACCOUNT_SETTINGS_VIEW_GET_PRIVATE(view); - // Get prefered path + // Get preferred path GtkWidget* dialog; GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SAVE; gint res; diff --git a/src/ring_client.cpp b/src/ring_client.cpp index bac0b364..da36280a 100644 --- a/src/ring_client.cpp +++ b/src/ring_client.cpp @@ -256,9 +256,9 @@ on_close_window(GtkWidget *window, G_GNUC_UNUSED GdkEvent *event, RingClient *cl /* we want to simply hide the window and keep the client running */ ring_window_hide(client); ring_main_window_reset(RING_MAIN_WINDOW(window)); - return TRUE; /* do not propogate event */ + return TRUE; /* do not propagate event */ } else { - /* we want to quit the application, so just propogate the event */ + /* we want to quit the application, so just propagate the event */ return FALSE; } } @@ -491,7 +491,7 @@ ring_client_startup(GApplication *app) int clutter_error; if ((clutter_error = gtk_clutter_init(&priv->argc, &priv->argv)) != CLUTTER_INIT_SUCCESS) { g_error("Could not init clutter : %d\n", clutter_error); - exit(1); /* the g_error above should normally cause the applicaiton to exit */ + exit(1); /* the g_error above should normally cause the application to exit */ } /* init libRingClient and make sure its connected to the dbus */ diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp index 3c2d2460..9b2c3e3c 100644 --- a/src/ringmainwindow.cpp +++ b/src/ringmainwindow.cpp @@ -580,7 +580,7 @@ on_dtmf_pressed(RingMainWindow* self, GdkEventKey* event, gpointer user_data) QString val = QString::fromUcs4(&unicode_val, 1); g_debug("attemptingto play DTMF tone during ongoing call: %s", val.toUtf8().constData()); priv->cpp->accountInfo_->callModel->playDTMF(current_item.callId, val.toStdString()); - // always propogate the key, so we don't steal accelerators/shortcuts + // always propagate the key, so we don't steal accelerators/shortcuts return GDK_EVENT_PROPAGATE; } diff --git a/src/utils/models.h b/src/utils/models.h index 03caadd5..ccbabf38 100644 --- a/src/utils/models.h +++ b/src/utils/models.h @@ -49,8 +49,8 @@ gtk_combo_box_set_qmodel(GtkComboBox *box, QAbstractItemModel *qmodel, QItemSele /** * Like gtk_combo_box_set_qmodel, but sets a GtkCellRendererText for the combo box which will - * display the Qt::DisplayRole as simple text. This function is a usefull default for most - * combo boxes. If you want to customize the GtkCellRenderer of your combo box, you should usefull + * display the Qt::DisplayRole as simple text. This function is a useful default for most + * combo boxes. If you want to customize the GtkCellRenderer of your combo box, you should useful * gtk_combo_box_set_qmodel() */ QMetaObject::Connection -- GitLab