diff --git a/src/Application.cpp b/src/Application.cpp index aaaccf3b4..fb7e09da7 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -160,7 +160,7 @@ int Application::newInstance() * * ;; is the token separator * # at the beginning of line results in line being ignored. - * supported stokens are title, command and profile. + * supported tokens are title, command and profile. * * Note that the title is static and the tab will close when the * command is complete (do not use --noclose). You can start new tabs. @@ -203,7 +203,7 @@ void Application::processTabsFromFileArgs(KCmdLineArgs* args, createTabFromArgs(args, window, lineTokens); sessions++; } else { - kWarning() << "Each line should contain at least one of 'commad' and 'profile'."; + kWarning() << "Each line should contain at least one of 'command' and 'profile'."; } } tabsFile.close(); @@ -235,7 +235,7 @@ void Application::createTabFromArgs(KCmdLineArgs* args, MainWindow* window, Profile::Ptr newProfile = Profile::Ptr(new Profile(baseProfile)); newProfile->setHidden(true); - // FIXME: the method of determining whethter to use newProfile does not + // FIXME: the method of determining whether to use newProfile does not // scale well when we support more fields in the future bool shouldUseNewProfile = false; diff --git a/src/BookmarkHandler.cpp b/src/BookmarkHandler.cpp index 99bf0ce13..9fc1600aa 100644 --- a/src/BookmarkHandler.cpp +++ b/src/BookmarkHandler.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -// Born as kdelibs/kio/kfile/kfilebookmarkhandler.characterpp +// Born as kdelibs/kio/kfile/kfilebookmarkhandler.cpp // Own #include "BookmarkHandler.h" diff --git a/src/ColorSchemeManager.cpp b/src/ColorSchemeManager.cpp index 07becc9c2..72b8ed6b9 100644 --- a/src/ColorSchemeManager.cpp +++ b/src/ColorSchemeManager.cpp @@ -311,7 +311,7 @@ bool ColorSchemeManager::deleteColorScheme(const QString& name) { Q_ASSERT(_colorSchemes.contains(name)); - // lookup the path and delete + // look up the path and delete QString path = findColorSchemePath(name); if (QFile::remove(path)) { delete _colorSchemes[name]; diff --git a/src/Emulation.h b/src/Emulation.h index aa24d69cf..92a0ea7d9 100644 --- a/src/Emulation.h +++ b/src/Emulation.h @@ -363,7 +363,7 @@ signals: void titleChanged(int title, const QString& newTitle); /** - * Emitted when the terminal emualtor's size has changed + * Emitted when the terminal emulator's size has changed */ void imageSizeChanged(int lineCount , int columnCount); diff --git a/src/ExtendedCharTable.cpp b/src/ExtendedCharTable.cpp index 5fea846d5..f8ceca950 100644 --- a/src/ExtendedCharTable.cpp +++ b/src/ExtendedCharTable.cpp @@ -112,7 +112,7 @@ ushort ExtendedCharTable::createExtendedChar(const ushort* unicodePoints , ushor ushort* ExtendedCharTable::lookupExtendedChar(ushort hash , ushort& length) const { - // lookup index in table and if found, set the length + // look up index in table and if found, set the length // argument and return a pointer to the character sequence ushort* buffer = extendedCharTable[hash]; diff --git a/src/HistorySizeWidget.h b/src/HistorySizeWidget.h index d2b0a8382..fe0b11b79 100644 --- a/src/HistorySizeWidget.h +++ b/src/HistorySizeWidget.h @@ -37,7 +37,7 @@ class HistorySizeWidget; namespace Konsole { /** - * A widget for controlling hisotry related options + * A widget for controlling history related options */ class HistorySizeWidget : public QWidget { diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp index 48fd6d50b..005b9e320 100644 --- a/src/KeyBindingEditor.cpp +++ b/src/KeyBindingEditor.cpp @@ -118,7 +118,7 @@ bool KeyBindingEditor::eventFilter(QObject* watched , QEvent* event) // The state here is currently set to the state that a newly started // terminal in Konsole will be in ( which is also the same as the - // state just after a reset ), this has 'Ansi' turned on and all other + // state just after a reset ), this has 'ANSI' turned on and all other // states off. // // TODO: It may be useful to be able to specify the state in the 'test input' diff --git a/src/KeyboardTranslator.h b/src/KeyboardTranslator.h index c9777d241..99c71743d 100644 --- a/src/KeyboardTranslator.h +++ b/src/KeyboardTranslator.h @@ -37,7 +37,7 @@ class QTextStream; namespace Konsole { /** - * A convertor which maps between key sequences pressed by the user and the + * A converter which maps between key sequences pressed by the user and the * character strings which should be sent to the terminal and commands * which should be invoked when those character sequences are pressed. * @@ -68,7 +68,7 @@ public: */ NewLineState = 1, /** - * Indicates that the terminal is in 'Ansi' mode. + * Indicates that the terminal is in 'ANSI' mode. * TODO: More documentation */ AnsiState = 2, diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 7f3d43b70..0ba82f097 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -60,7 +60,7 @@ using namespace Konsole; /* Normally it would be enough to just have this determined via the window manager. But there exist GPU drivers (NVIDIA) that have serious performance - issues if transparency is enbled inside Konsole. The rest of the system + issues if transparency is enabled inside Konsole. The rest of the system works fine. NVIDIA users might want to use --notransparency to work around such issues. */ static bool useTransparency() @@ -78,7 +78,7 @@ MainWindow::MainWindow() , _menuBarInitialVisibilityApplied(false) { if (useTransparency()) { - // It is userful to have translucent terminal area + // It is useful to have translucent terminal area setAttribute(Qt::WA_TranslucentBackground, true); // But it is mostly annoying to have translucent menubar and tabbar setAttribute(Qt::WA_NoSystemBackground, false); @@ -119,7 +119,7 @@ MainWindow::MainWindow() // create menus createGUI(); - // rememebr the original menu accelerators for later use + // remember the original menu accelerators for later use rememberMenuAccelerators(); // replace standard shortcuts which cannot be used in a terminal diff --git a/src/ManageProfilesDialog.h b/src/ManageProfilesDialog.h index 8b9a7e53c..7c55fd6f7 100644 --- a/src/ManageProfilesDialog.h +++ b/src/ManageProfilesDialog.h @@ -60,7 +60,7 @@ public: virtual ~ManageProfilesDialog(); /** - * Specifies whether the shorcut editor should be show. + * Specifies whether the shortcut editor should be show. * The shortcut editor allows shortcuts to be associated with * profiles. When a shortcut is changed, the dialog will call * SessionManager::instance()->setShortcut() to update the shortcut diff --git a/src/Part.cpp b/src/Part.cpp index 9e119434b..33e2d3849 100644 --- a/src/Part.cpp +++ b/src/Part.cpp @@ -268,7 +268,7 @@ void Part::activeViewChanged(SessionController* controller) void Part::overrideTerminalShortcut(QKeyEvent* event, bool& override) { - // Shift+Insert is commonly used as the alternate shorcut for + // Shift+Insert is commonly used as the alternate shortcut for // pasting in KDE apps(including konsole), so it deserves some // special treatment. if ((event->modifiers() & Qt::ShiftModifier) && diff --git a/src/Part.h b/src/Part.h index b5fc77557..2806bcdb0 100644 --- a/src/Part.h +++ b/src/Part.h @@ -83,7 +83,7 @@ public slots: void createSession(const QString& profileName = QString(), const QString& directory = QString()); /** - * Returns a list of names of all available proifles + * Returns a list of names of all available profiles * * This is highly experimental. Do not use it at the moment */ diff --git a/src/ProcessInfo.h b/src/ProcessInfo.h index 5eb48d3c1..9d0c3a576 100644 --- a/src/ProcessInfo.h +++ b/src/ProcessInfo.h @@ -244,7 +244,7 @@ protected: void setPid(int pid); /** Sets the parent process id as returned by parentPid() */ void setParentPid(int pid); - /** Sets the foreground process id as returend by foregroundPid() */ + /** Sets the foreground process id as returned by foregroundPid() */ void setForegroundPid(int pid); /** Sets the user id associated with this ProcessInfo instance */ void setUserId(int uid); diff --git a/src/Profile.h b/src/Profile.h index 6ba9bf5f6..fea0d73a7 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -79,7 +79,7 @@ public: Path, /** (QString) The descriptive name of this profile. */ Name, - /** (QString) The untranslted name of this profile. + /** (QString) The untranslated name of this profile. * Warning: this is an internal property. Do not touch it. */ UntranslatedName, diff --git a/src/ProfileList.h b/src/ProfileList.h index 450dcec8d..410aa2e3b 100644 --- a/src/ProfileList.h +++ b/src/ProfileList.h @@ -66,7 +66,7 @@ public: /** * Returns a list of actions representing profiles * - * The user-data associated with each action is the corresonding profile + * The user-data associated with each action is the corresponding profile */ QList actions(); diff --git a/src/ProfileManager.cpp b/src/ProfileManager.cpp index f442a4775..b5bf1037b 100644 --- a/src/ProfileManager.cpp +++ b/src/ProfileManager.cpp @@ -139,7 +139,7 @@ Profile::Ptr ProfileManager::loadProfile(const QString& shortPath) if (!fileInfo.isAbsolute()) path = KStandardDirs::locate("data", path); - // if the file is not found, return imediately + // if the file is not found, return immediately if (path.isEmpty()) { return Profile::Ptr(); } diff --git a/src/Screen.cpp b/src/Screen.cpp index 1ed4eb5b2..632967bc3 100644 --- a/src/Screen.cpp +++ b/src/Screen.cpp @@ -364,7 +364,7 @@ void Screen::setDefaultMargins() is to poor to distinguish between bold (which is a font attribute) and intensive (which is a color attribute), we translate - this and RE_BOLD in falls eventually appart + this and RE_BOLD in falls eventually apart into RE_BOLD and RE_INTENSIVE. */ @@ -509,7 +509,7 @@ void Screen::reset(bool clearScreen) saveMode(MODE_Wrap); // wrap at end of margin resetMode(MODE_Origin); - saveMode(MODE_Origin); // position refere to [1,1] + saveMode(MODE_Origin); // position refer to [1,1] resetMode(MODE_Insert); saveMode(MODE_Insert); // overstroke @@ -1183,7 +1183,7 @@ int Screen::copyLineToStream(int line , bool trimTrailingSpaces) const { //buffer to hold characters for decoding - //the buffer is static to avoid initialising every + //the buffer is static to avoid initializing every //element on each call to copyLineToStream //(which is unnecessary since all elements will be overwritten anyway) static const int MAX_CHARS = 1024; diff --git a/src/Screen.h b/src/Screen.h index 620424c1a..613f24dfe 100644 --- a/src/Screen.h +++ b/src/Screen.h @@ -287,7 +287,7 @@ public: void setForeColor(int space, int color); /** * Sets the cursor's background color. - * @param space The color space used by the @p color argumnet. + * @param space The color space used by the @p color argument. * @param color The new background color. The meaning of this depends on * the color @p space used. * diff --git a/src/Session.cpp b/src/Session.cpp index 1cf9061c2..e27bf7894 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -542,7 +542,7 @@ void Session::setUserTitle(int what, const QString& caption) } } - /* I don't belive this has ever worked in KDE 4.x + /* I don't believe this has ever worked in KDE 4.x if (what == 31) { QString cwd = caption; cwd = cwd.replace(QRegExp("^~"), QDir::homePath()); @@ -654,7 +654,7 @@ void Session::activityStateSet(int state) _activityTimer->start(activityMaskInSeconds * 1000); } - // reset the counter for monitoring continuous silence since ther is activity + // reset the counter for monitoring continuous silence since there is activity if (_monitorSilence) { _silenceTimer->start(_silenceSeconds * 1000); } diff --git a/src/Session.h b/src/Session.h index 7822dd427..37d1b2743 100644 --- a/src/Session.h +++ b/src/Session.h @@ -491,7 +491,7 @@ public slots: /** Sets the text codec used by this sessions terminal emulation. * Overloaded to accept a QByteArray for convenience since DBus - * does not accept QTextCodec directky. + * does not accept QTextCodec directly. */ Q_SCRIPTABLE bool setCodec(QByteArray codec); @@ -576,7 +576,7 @@ signals: /** * Emitted when the current working directory of this session changes. * - * @param dir The new current woking directory of the session. + * @param dir The new current working directory of the session. */ void currentDirectoryChanged(const QString& dir); @@ -635,7 +635,7 @@ signals: void flowControlEnabledChanged(bool enabled); /** - * Emitted when the active screen is swiched, to indicate whether the primary + * Emitted when the active screen is switched, to indicate whether the primary * screen is in use. * * This signal serves as a relayer of Emulation::priamyScreenInUse(bool), diff --git a/src/SessionController.h b/src/SessionController.h index aefdbc636..390cc0116 100644 --- a/src/SessionController.h +++ b/src/SessionController.h @@ -170,7 +170,7 @@ signals: void rawTitleChanged(); /** - * Emitted when the curreent working directory of the session associated with + * Emitted when the current working directory of the session associated with * the controller is changed. */ void currentDirectoryChanged(const QString& dir); @@ -188,7 +188,7 @@ public slots: void openUrl(const KUrl& url); /** - * update actions which are meaningful only when rimary screen is in use. + * update actions which are meaningful only when primary screen is in use. */ void setupPrimaryScreenSpecificActions(bool use); diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 9c07e5a12..a2c562193 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -266,7 +266,7 @@ void TerminalDisplay::setLineSpacing(uint i) namespace Konsole { /** - * This function installs the factory function which lets Qt instanciate the QAccessibleInterface + * This function installs the factory function which lets Qt instantiate the QAccessibleInterface * for the TerminalDisplay. */ QAccessibleInterface* accessibleInterfaceFactory(const QString &key, QObject *object) @@ -1003,7 +1003,7 @@ void TerminalDisplay::updateImage() bool updateLine = false; // The dirty mask indicates which characters need repainting. We also - // mark surrounding neighbours dirty, in case the character exceeds + // mark surrounding neighbors dirty, in case the character exceeds // its cell boundaries memset(dirtyMask, 0, columnsToUpdate + 2); @@ -1293,7 +1293,7 @@ void TerminalDisplay::paintFilters(QPainter& painter) painter.drawLine(r.left() , underlinePos , r.right() , underlinePos); } - // Marker hotspots simply have a transparent rectanglular shape + // Marker hotspots simply have a transparent rectangular shape // drawn on top of them } else if (spot->type() == Filter::HotSpot::Marker) { //TODO - Do not use a hardcoded color for this @@ -2952,7 +2952,7 @@ void TerminalDisplay::visualBell() void TerminalDisplay::swapFGBGColors() { - // swap the default foreground & backround color + // swap the default foreground & background color ColorEntry color = _colorTable[DEFAULT_BACK_COLOR]; _colorTable[DEFAULT_BACK_COLOR] = _colorTable[DEFAULT_FORE_COLOR]; _colorTable[DEFAULT_FORE_COLOR] = color; diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h index 1843e3129..da7512c47 100644 --- a/src/TerminalDisplay.h +++ b/src/TerminalDisplay.h @@ -806,8 +806,8 @@ private: bool _allowBlinkingText; // allow text to blink bool _allowBlinkingCursor; // allow cursor to blink - bool _textBlinking; // text is blinkingi, hide it when drawing - bool _cursorBlinking; // cursor is blinking, hide it whe drawing + bool _textBlinking; // text is blinking, hide it when drawing + bool _cursorBlinking; // cursor is blinking, hide it when drawing bool _hasTextBlinker; // has characters to blink QTimer* _blinkTextTimer; QTimer* _blinkCursorTimer; @@ -856,7 +856,7 @@ private: }; InputMethodData _inputMethodData; - bool _antialiasText; // do we antialias or not + bool _antialiasText; // do we anti-alias or not bool _printerFriendly; // are we currently painting to a printer in black/white mode diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp index d6d17a91b..63c187dd6 100644 --- a/src/ViewContainer.cpp +++ b/src/ViewContainer.cpp @@ -324,7 +324,7 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject* connect(_newTabButton, SIGNAL(clicked()), this, SIGNAL(newViewRequest())); connect(_closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentTab())); - // Combin tab bar and 'new/close tab' buttons + // Combine tab bar and 'new/close tab' buttons _tabBarLayout = new QHBoxLayout; _tabBarLayout->setSpacing(0); _tabBarLayout->setContentsMargins(0, 0, 0, 0); @@ -493,7 +493,7 @@ void TabbedViewContainer::startTabDrag(int tab) removeView(view); break; case Qt::IgnoreAction: - // The IgroreAction is used by the tabbar to indicate the + // The IgnoreAction is used by the tabbar to indicate the // special case of dropping one tab into its existing position. // So nothing need to do here. break; @@ -502,7 +502,7 @@ void TabbedViewContainer::startTabDrag(int tab) } } else { // if the tab is dragged onto something that does not accept this - // drop(for example, a different application or a differnt konsole + // drop(for example, a different application or a different konsole // process), then detach the tab to achieve the effect of "dragging tab // out of current window and into its own window" // diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp index f9e58416a..4071b8bc5 100644 --- a/src/ViewManager.cpp +++ b/src/ViewManager.cpp @@ -736,7 +736,7 @@ void ViewManager::viewDestroyed(QWidget* view) updateDetachViewState(); } // The below causes the menus to be messed up - // Only happenss when using the tab bar close button + // Only happens when using the tab bar close button // if (_pluggedController) // emit unplugController(_pluggedController); } @@ -791,7 +791,7 @@ void ViewManager::applyProfileToView(TerminalDisplay* view , const Profile::Ptr else if (scrollBarPosition == Enum::ScrollBarHidden) view->setScrollBarPosition(Enum::ScrollBarHidden); - // show hint about termianl size after resizing + // show hint about terminal size after resizing view->setShowTerminalSizeHint(profile->showTerminalSizeHint()); // terminal features diff --git a/src/ViewManager.h b/src/ViewManager.h index 7d1079e3c..f039a27ef 100644 --- a/src/ViewManager.h +++ b/src/ViewManager.h @@ -78,7 +78,7 @@ public: ~ViewManager(); /** - * Creates a new view to display the outout from and deliver input to @p session. + * Creates a new view to display the output from and deliver input to @p session. * Constructs a new container to hold the views if no container has yet been created. */ void createView(Session* session); diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp index 7f663f2a1..7b59f7ce2 100644 --- a/src/Vt102Emulation.cpp +++ b/src/Vt102Emulation.cpp @@ -50,7 +50,7 @@ using Konsole::Vt102Emulation; QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals come in here as proper unicode characters. - We treat non-iso10646 fonts as VT100 extended and do the requiered mapping + We treat non-iso10646 fonts as VT100 extended and do the required mapping from unicode to 0x00..0x1f. The remaining translation is then left to the QCodec. */ @@ -160,7 +160,7 @@ void Vt102Emulation::reset() The last two forms allow list of arguments. Since the elements of the lists are treated individually the same way, they are passed as individual tokens to the interpretation. Further, because the - meaning of the parameters are names (althought represented as numbers), + meaning of the parameters are names (although represented as numbers), they are includes within the token ('N'). */ @@ -435,7 +435,7 @@ void Vt102Emulation::updateTitle() meaning is assigned to them. These are either operations of the current _screen, or of the emulation class itself. - The token to be interpreteted comes in as a machine word + The token to be interpreted comes in as a machine word possibly accompanied by two parameters. Likewise, the operations assigned to, come with up to two @@ -855,7 +855,7 @@ void Vt102Emulation::reportTerminalType() void Vt102Emulation::reportSecondaryAttributes() { - // Seconday device attribute response (Request was: ^[[>0c or ^[[>c) + // Secondary device attribute response (Request was: ^[[>0c or ^[[>c) if (getMode(MODE_Ansi)) sendString("\033[>0;115;0c"); // Why 115? ;) else @@ -988,7 +988,7 @@ void Vt102Emulation::sendKeyEvent(QKeyEvent* event) } } - // lookup key binding + // look up key binding if (_keyTranslator) { KeyboardTranslator::Entry entry = _keyTranslator->findEntry( event->key() , @@ -1184,7 +1184,7 @@ void Vt102Emulation::restoreCursor() void Vt102Emulation::resetModes() { // MODE_Allow132Columns is not reset here - // to match Xterm's behaviour (see Xterm's VTReset() function) + // to match Xterm's behavior (see Xterm's VTReset() function) resetMode(MODE_132Columns); saveMode(MODE_132Columns); resetMode(MODE_Mouse1000); saveMode(MODE_Mouse1000); diff --git a/src/main.cpp b/src/main.cpp index 3e81a3044..f779b158f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -88,7 +88,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char** argv) bool shouldUseNewProcess() { // The "unique process" model of konsole is incompatible with some or all - // Qt/KDE options. When those incompatile options are given, konsole must + // Qt/KDE options. When those incompatible options are given, konsole must // use new process // // TODO: make sure the existing list is OK and add more incompatible options.