From dc698bfc643dc4a6987889d63a5e22a9cefaf0c4 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Fri, 1 May 2020 15:00:20 -0400 Subject: [PATCH] Fixed some comments Partially cherry-picked from 3a997ce6f4299a465eee1299a58e581304cb9a07. --- res/doc | 2 +- src/action_cc.cc | 2 +- src/menu.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/doc b/res/doc index baf6bec..1e78ed0 100644 --- a/res/doc +++ b/res/doc @@ -70,7 +70,7 @@ # # You will need to reboot to see any changes. # -# If there is a error in the configuration, an item which displays it will be +# If there is an error in the configuration, an item which displays it will be # added to the main menu. If an internal error occurs, it is written to syslog, # which can be viewed over telnet or SSH (the username is root) with the command # logread. diff --git a/src/action_cc.cc b/src/action_cc.cc index af4f581..43a179a 100644 --- a/src/action_cc.cc +++ b/src/action_cc.cc @@ -61,7 +61,7 @@ NM_ACTION_(nickel_setting) { // vtable pointer at the beginning needs to be replaced with the target // vtable address plus 8 (for the header) (and if we don't do this, the // virtual functions such as sectionName won't get resolved properly) (it - // it also needs to be restored after each function call, as that call may + // also needs to be restored after each function call, as that call may // change it to something itself). // warning: this is highly unportable, unsafe, and implementation diff --git a/src/menu.cc b/src/menu.cc index 9e50f81..1df4d98 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -12,7 +12,7 @@ #include "menu.h" #include "util.h" -typedef QWidget MenuTextItem; // it's actually a subclass, but we don't need it's functionality directly, so we'll stay on the safe side +typedef QWidget MenuTextItem; // it's actually a subclass, but we don't need its functionality directly, so we'll stay on the safe side typedef void MainWindowController; // AbstractNickelMenuController::createMenuTextItem creates a menu item in the @@ -30,7 +30,7 @@ static MenuTextItem* (*AbstractNickelMenuController_createMenuTextItem)(void*, Q // Second bool is whether the entry is enabled (false: grayed out) // Third bool is whether to add a separator after the entry (false: no separator) // Note that, even in the Main Menu, it'll inherit the color of a Reader Menu separator (#66), -// instead of the usual dim (#BB) or solid (#00) seen in the stock Main Menu. +// instead of the usual dim (#BB) or solid (#00) ones seen in the stock Main Menu. static QAction* (*AbstractNickelMenuController_createAction)(void*, QMenu*, QWidget*, bool, bool, bool); // ConfirmationDialogFactory::showOKDialog does what it says, with the provided