Commit bed548e8 authored by Kurt Hindenburg's avatar Kurt Hindenburg

sync declarations with definitions (have .h and .cpp variable names match)

parent 4530b39f
This diff is collapsed.
......@@ -1046,15 +1046,15 @@ void Screen::clearEntireLine()
clearImage(loc(0, _cuY), loc(_columns - 1, _cuY), ' ');
}
void Screen::setRendition(RenditionFlags rendention)
void Screen::setRendition(RenditionFlags rendition)
{
_currentRendition |= rendention;
_currentRendition |= rendition;
updateEffectiveRendition();
}
void Screen::resetRendition(RenditionFlags rendention)
void Screen::resetRendition(RenditionFlags rendition)
{
_currentRendition &= ~rendention;
_currentRendition &= ~rendition;
updateEffectiveRendition();
}
......
......@@ -121,10 +121,10 @@ public:
/**
* Sets the margins for scrolling the screen.
*
* @param topLine The top line of the new scrolling margin.
* @param bottomLine The bottom line of the new scrolling margin.
* @param top The top line of the new scrolling margin.
* @param bot The bottom line of the new scrolling margin.
*/
void setMargins(int topLine, int bottomLine);
void setMargins(int top, int bot);
/** Returns the top line of the scrolling region. */
int topMargin() const;
/** Returns the bottom line of the scrolling region. */
......@@ -228,19 +228,19 @@ public:
/** Sets or removes a tab stop at the cursor's current column. */
void changeTabStop(bool set);
/** Resets (clears) the specified screen @p mode. */
void resetMode(int mode);
/** Sets (enables) the specified screen @p mode. */
void setMode(int mode);
/** Resets (clears) the specified screen @p m. */
void resetMode(int m);
/** Sets (enables) the specified screen @p m. */
void setMode(int m);
/**
* Saves the state of the specified screen @p mode. It can be restored
* Saves the state of the specified screen @p m. It can be restored
* using restoreMode()
*/
void saveMode(int mode);
/** Restores the state of a screen @p mode saved by calling saveMode() */
void restoreMode(int mode);
/** Returns whether the specified screen @p mode is enabled or not .*/
bool getMode(int mode) const;
void saveMode(int m);
/** Restores the state of a screen @p m saved by calling saveMode() */
void restoreMode(int m);
/** Returns whether the specified screen @p me is enabled or not .*/
bool getMode(int m) const;
/**
* Saves the current position and appearance (text color and style) of the cursor.
......@@ -411,19 +411,19 @@ public:
/**
* Sets the start of the selection.
*
* @param column The column index of the first character in the selection.
* @param line The line index of the first character in the selection.
* @param xThe column index of the first character in the selection.
* @param y The line index of the first character in the selection.
* @param blockSelectionMode True if the selection is in column mode.
*/
void setSelectionStart(const int column, const int line, const bool blockSelectionMode);
void setSelectionStart(const int x, const int y, const bool blockSelectionMode);
/**
* Sets the end of the current selection.
*
* @param column The column index of the last character in the selection.
* @param line The line index of the last character in the selection.
* @param x The column index of the last character in the selection.
* @param y The line index of the last character in the selection.
*/
void setSelectionEnd(const int column, const int line);
void setSelectionEnd(const int x, const int y);
/**
* Retrieves the start of the selection or the cursor position if there
......@@ -441,10 +441,10 @@ public:
void clearSelection();
/**
* Returns true if the character at (@p column, @p line) is part of the
* Returns true if the character at (@p x, @p y) is part of the
* current selection.
*/
bool isSelected(const int column, const int line) const;
bool isSelected(const int x, const int y) const;
/**
* Convenience method. Returns the currently selected text.
......@@ -626,10 +626,10 @@ private:
//
//NOTE: moveImage() can only move whole lines
void moveImage(int dest, int sourceBegin, int sourceEnd);
// scroll up 'i' lines in current region, clearing the bottom 'i' lines
void scrollUp(int from, int i);
// scroll down 'i' lines in current region, clearing the top 'i' lines
void scrollDown(int from, int i);
// scroll up 'n' lines in current region, clearing the bottom 'n' lines
void scrollUp(int from, int n);
// scroll down 'n' lines in current region, clearing the top 'n' lines
void scrollDown(int from, int n);
//when we handle scroll commands, we need to know which screenwindow will scroll
TerminalDisplay *_currentTerminalDisplay;
......
......@@ -97,7 +97,7 @@ public:
*
* @param masterFd The file descriptor of the pseudo-teletype master (See KPtyProcess::KPtyProcess())
*/
void openTeletype(int masterFd);
void openTeletype(int fd);
/**
* Returns true if the session is currently running. This will be true
......@@ -210,7 +210,7 @@ public:
* remembered before they are lost and the storage
* (in memory, on-disk etc.) used.
*/
void setHistoryType(const HistoryType &type);
void setHistoryType(const HistoryType &hType);
/**
* Returns the type of history store used by this session.
*/
......@@ -272,7 +272,7 @@ public:
QString iconText() const;
/** Sets the session's title for the specified @p role to @p title. */
void setTitle(TitleRole role, const QString &title);
void setTitle(TitleRole role, const QString &newTitle);
/** Returns the session's title for the specified @p role. */
QString title(TitleRole role) const;
......@@ -329,7 +329,7 @@ public:
*/
void refresh();
void startZModem(const QString &rz, const QString &dir, const QStringList &list);
void startZModem(const QString &zmodem, const QString &dir, const QStringList &list);
void cancelZModem();
bool isZModemBusy()
{
......@@ -509,7 +509,7 @@ public Q_SLOTS:
* Overloaded to accept a QByteArray for convenience since DBus
* does not accept QTextCodec directly.
*/
Q_SCRIPTABLE bool setCodec(const QByteArray &codec);
Q_SCRIPTABLE bool setCodec(const QByteArray &name);
/** Returns the codec used to decode incoming characters in this
* terminal emulation
......@@ -681,7 +681,7 @@ private Q_SLOTS:
void fireZModemDetected();
void onReceiveBlock(const char *buffer, int len);
void onReceiveBlock(const char *buf, int len);
void silenceTimerDone();
void activityTimerDone();
......@@ -724,7 +724,7 @@ private:
bool updateForegroundProcessInfo();
void updateWorkingDirectory();
QString validDirectory(const QString &directory) const;
QString validDirectory(const QString &dir) const;
QUuid _uniqueIdentifier; // SHELL_SESSION_ID
......
......@@ -494,7 +494,7 @@ public:
void addScreenWindow(Session *session, ScreenWindow *searchWindow);
/** Sets the regular expression which is searched for when execute() is called */
void setRegExp(const QRegularExpression &regExp);
void setRegExp(const QRegularExpression &expression);
/** Returns the regular expression which is searched for when execute() is called */
QRegularExpression regExp() const;
......@@ -504,7 +504,7 @@ public:
Enum::SearchDirection searchDirection() const;
/** The line from which the search will be done **/
void setStartLine(int startLine);
void setStartLine(int line);
/**
* Performs a search through the session's history, starting at the position
......
......@@ -107,7 +107,7 @@ protected Q_SLOTS:
*
* @param session The Session which has finished executing.
*/
void sessionTerminated(QObject *session);
void sessionTerminated(QObject *sessionObject);
private Q_SLOTS:
void sessionProfileCommandReceived(const QString &text);
......
......@@ -53,8 +53,8 @@ const TabTitleFormatButton::Element TabTitleFormatButton::_remoteElements[] = {
const int TabTitleFormatButton::_remoteElementCount
= sizeof(_remoteElements) / sizeof(TabTitleFormatButton::Element);
TabTitleFormatButton::TabTitleFormatButton(QWidget *aParent) :
QPushButton(aParent),
TabTitleFormatButton::TabTitleFormatButton(QWidget *parent) :
QPushButton(parent),
_context(Session::LocalTabTitle)
{
setText(i18n("Insert"));
......
......@@ -36,7 +36,7 @@ public:
explicit TabTitleFormatButton(QWidget *parent);
~TabTitleFormatButton() Q_DECL_OVERRIDE;
void setContext(Session::TabTitleContext context);
void setContext(Session::TabTitleContext titleContext);
Session::TabTitleContext context() const;
Q_SIGNALS:
......
......@@ -77,7 +77,7 @@ public:
* Sets the seed used to generate random colors for the display
* (in color schemes that support them).
*/
void setRandomSeed(uint seed);
void setRandomSeed(uint randomSeed);
/**
* Returns the seed used to generate random colors for the display
* (in color schemes that support them).
......@@ -106,7 +106,7 @@ public:
* @param cursor The position of the scroll bar's thumb.
* @param lines The maximum value of the scroll bar.
*/
void setScroll(int cursor, int lines);
void setScroll(int cursor, int slines);
void setScrollFullPage(bool fullPage);
bool scrollFullPage() const;
......@@ -405,7 +405,7 @@ public:
* Sets the font used to draw the display. Has no effect if @p font
* is larger than the size of the display itself.
*/
void setVTFont(const QFont &font);
void setVTFont(const QFont &f);
/** Increases the font size */
void increaseFontSize();
......@@ -592,7 +592,7 @@ public Q_SLOTS:
* Changes whether the flow control warning box should be shown when the flow control
* stop key (Ctrl+S) are pressed.
*/
void setFlowControlWarningEnabled(bool enabled);
void setFlowControlWarningEnabled(bool enable);
/**
* Causes the widget to display or hide a message informing the user that terminal
* output has been suspended (by using the flow control key combination Ctrl+S)
......@@ -617,9 +617,9 @@ public Q_SLOTS:
* @param usesMouse Set to true if the program running in the terminal is interested in mouse events
* or false otherwise.
*/
void setUsesMouse(bool usesMouse);
void setUsesMouse(bool on);
void setBracketedPasteMode(bool bracketedPasteMode);
void setBracketedPasteMode(bool on);
/**
* Shows a notification that a bell event has occurred in the terminal.
......@@ -694,7 +694,7 @@ Q_SIGNALS:
protected:
bool event(QEvent *event) Q_DECL_OVERRIDE;
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
void paintEvent(QPaintEvent *pe) Q_DECL_OVERRIDE;
void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE;
......@@ -708,12 +708,12 @@ protected:
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
void leaveEvent(QEvent *event) Q_DECL_OVERRIDE;
void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
virtual void extendSelection(const QPoint &pos);
void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
void mouseDoubleClickEvent(QMouseEvent *ev) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE;
virtual void extendSelection(const QPoint &position);
void wheelEvent(QWheelEvent *ev) Q_DECL_OVERRIDE;
bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE;
......@@ -741,7 +741,7 @@ protected:
void clearImage();
void mouseTripleClickEvent(QMouseEvent *event);
void mouseTripleClickEvent(QMouseEvent *ev);
void selectLine(QPoint pos, bool entireLine);
// reimplemented
......@@ -791,11 +791,11 @@ private:
// if useOpacitySetting is true then the color's alpha value will be set to
// the display's transparency (set with setOpacity()), otherwise the background
// will be drawn fully opaque
void drawBackground(QPainter &painter, const QRect &rect, const QColor &color,
void drawBackground(QPainter &painter, const QRect &rect, const QColor &backgroundColor,
bool useOpacitySetting);
// draws the cursor character
void drawCursor(QPainter &painter, const QRect &rect, const QColor &foregroundColor,
const QColor &backgroundColor, bool &invertColors);
const QColor &backgroundColor, bool &invertCharacterColor);
// draws the characters or line graphics in a text fragment
void drawCharacters(QPainter &painter, const QRect &rect, const QString &text,
const Character *style, bool invertCharacterColor);
......@@ -828,7 +828,7 @@ private:
// 'region' is the part of the image to scroll - currently only
// the top, bottom and height of 'region' are taken into account,
// the left and right are ignored.
void scrollImage(int lines, const QRect &region);
void scrollImage(int lines, const QRect &screenWindowRegion);
void calcGeometry();
void propagateSize();
......@@ -847,11 +847,11 @@ private:
// redraws the cursor
void updateCursor();
bool handleShortcutOverrideEvent(QKeyEvent *event);
bool handleShortcutOverrideEvent(QKeyEvent *keyEvent);
void doPaste(QString text, bool appendReturn);
void processMidButtonClick(QMouseEvent *event);
void processMidButtonClick(QMouseEvent *ev);
QPoint findLineStart(const QPoint &pnt);
QPoint findLineEnd(const QPoint &pnt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment