summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Hindenburg <[email protected]>2018-01-06 16:39:16 -0500
committerKurt Hindenburg <[email protected]>2018-01-06 16:39:16 -0500
commitbed548e85a1df8ccf00269fe3f9923843be955cd (patch)
tree79724486ba19fe3fc491fee7d2926454bd941b50
parent4530b39f0aef2decd7724e88c653912420df1587 (diff)
sync declarations with definitions (have .h and .cpp variable names match)
-rw-r--r--src/ProcessInfo.cpp138
-rw-r--r--src/Screen.cpp8
-rw-r--r--src/Screen.h50
-rw-r--r--src/Session.h14
-rw-r--r--src/SessionController.h4
-rw-r--r--src/SessionManager.h2
-rw-r--r--src/TabTitleFormatButton.cpp4
-rw-r--r--src/TabTitleFormatButton.h2
-rw-r--r--src/TerminalDisplay.h38
9 files changed, 130 insertions, 130 deletions
diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp
index 186822c..410682b 100644
--- a/src/ProcessInfo.cpp
+++ b/src/ProcessInfo.cpp
@@ -67,7 +67,7 @@
using namespace Konsole;
-ProcessInfo::ProcessInfo(int aPid) :
+ProcessInfo::ProcessInfo(int pid) :
_fields(ARGUMENTS) // arguments
// are currently always valid,
// they just return an empty
@@ -75,7 +75,7 @@ ProcessInfo::ProcessInfo(int aPid) :
// if no arguments
// have been explicitly set
,
- _pid(aPid),
+ _pid(pid),
_parentPid(0),
_foregroundPid(0),
_userId(0),
@@ -231,9 +231,9 @@ QString ProcessInfo::localHost()
return QHostInfo::localHostName();
}
-void ProcessInfo::setPid(int aPid)
+void ProcessInfo::setPid(int pid)
{
- _pid = aPid;
+ _pid = pid;
_fields |= PROCESS_ID;
}
@@ -259,15 +259,15 @@ void ProcessInfo::setUserHomeDir()
}
}
-void ProcessInfo::setParentPid(int aPid)
+void ProcessInfo::setParentPid(int pid)
{
- _parentPid = aPid;
+ _parentPid = pid;
_fields |= PARENT_PID;
}
-void ProcessInfo::setForegroundPid(int aPid)
+void ProcessInfo::setForegroundPid(int pid)
{
- _foregroundPid = aPid;
+ _foregroundPid = pid;
_fields |= FOREGROUND_PID;
}
@@ -331,8 +331,8 @@ void ProcessInfo::setFileError(QFile::FileError error)
// implementations of the UnixProcessInfo abstract class.
//
-NullProcessInfo::NullProcessInfo(int aPid, const QString & /*titleFormat*/) :
- ProcessInfo(aPid)
+NullProcessInfo::NullProcessInfo(int pid, const QString & /*titleFormat*/) :
+ ProcessInfo(pid)
{
}
@@ -350,21 +350,21 @@ void NullProcessInfo::readUserName()
}
#if !defined(Q_OS_WIN)
-UnixProcessInfo::UnixProcessInfo(int aPid, const QString &titleFormat) :
- ProcessInfo(aPid)
+UnixProcessInfo::UnixProcessInfo(int pid, const QString &titleFormat) :
+ ProcessInfo(pid)
{
setUserNameRequired(titleFormat.contains(QLatin1String("%u")));
}
-void UnixProcessInfo::readProcessInfo(int aPid)
+void UnixProcessInfo::readProcessInfo(int pid)
{
// prevent _arguments from growing longer and longer each time this
// method is called.
clearArguments();
- if (readProcInfo(aPid)) {
- readArguments(aPid);
- readCurrentDir(aPid);
+ if (readProcInfo(pid)) {
+ readArguments(pid);
+ readCurrentDir(pid);
}
}
@@ -407,17 +407,17 @@ void UnixProcessInfo::readUserName()
class LinuxProcessInfo : public UnixProcessInfo
{
public:
- LinuxProcessInfo(int aPid, const QString &titleFormat) :
- UnixProcessInfo(aPid, titleFormat)
+ LinuxProcessInfo(int pid, const QString &titleFormat) :
+ UnixProcessInfo(pid, titleFormat)
{
}
protected:
- bool readCurrentDir(int aPid) Q_DECL_OVERRIDE
+ bool readCurrentDir(int pid) Q_DECL_OVERRIDE
{
char path_buffer[MAXPATHLEN + 1];
path_buffer[MAXPATHLEN] = 0;
- QByteArray procCwd = QFile::encodeName(QStringLiteral("/proc/%1/cwd").arg(aPid));
+ QByteArray procCwd = QFile::encodeName(QStringLiteral("/proc/%1/cwd").arg(pid));
const int length = static_cast<int>(readlink(procCwd.constData(), path_buffer, MAXPATHLEN));
if (length == -1) {
setError(UnknownError);
@@ -432,7 +432,7 @@ protected:
}
private:
- bool readProcInfo(int aPid) Q_DECL_OVERRIDE
+ bool readProcInfo(int pid) Q_DECL_OVERRIDE
{
// indicies of various fields within the process status file which
// contain various information about the process
@@ -449,7 +449,7 @@ private:
// For user id read process status file ( /proc/<pid>/status )
// Can not use getuid() due to it does not work for 'su'
- QFile statusInfo(QStringLiteral("/proc/%1/status").arg(aPid));
+ QFile statusInfo(QStringLiteral("/proc/%1/status").arg(pid));
if (statusInfo.open(QIODevice::ReadOnly)) {
QTextStream stream(&statusInfo);
QString statusLine;
@@ -492,7 +492,7 @@ private:
//
// FIELD FIELD (FIELD WITH SPACES) FIELD FIELD
//
- QFile processInfo(QStringLiteral("/proc/%1/stat").arg(aPid));
+ QFile processInfo(QStringLiteral("/proc/%1/stat").arg(pid));
if (processInfo.open(QIODevice::ReadOnly)) {
QTextStream stream(&processInfo);
const QString &data = stream.readAll();
@@ -548,18 +548,18 @@ private:
}
// update object state
- setPid(aPid);
+ setPid(pid);
return ok;
}
- bool readArguments(int aPid) Q_DECL_OVERRIDE
+ bool readArguments(int pid) Q_DECL_OVERRIDE
{
// read command-line arguments file found at /proc/<pid>/cmdline
// the expected format is a list of strings delimited by null characters,
// and ending in a double null character pair.
- QFile argumentsFile(QStringLiteral("/proc/%1/cmdline").arg(aPid));
+ QFile argumentsFile(QStringLiteral("/proc/%1/cmdline").arg(pid));
if (argumentsFile.open(QIODevice::ReadOnly)) {
QTextStream stream(&argumentsFile);
const QString &data = stream.readAll();
@@ -583,13 +583,13 @@ private:
class FreeBSDProcessInfo : public UnixProcessInfo
{
public:
- FreeBSDProcessInfo(int aPid, const QString &titleFormat) :
- UnixProcessInfo(aPid, titleFormat)
+ FreeBSDProcessInfo(int pid, const QString &titleFormat) :
+ UnixProcessInfo(pid, titleFormat)
{
}
protected:
- bool readCurrentDir(int aPid) Q_DECL_OVERRIDE
+ bool readCurrentDir(int pid) Q_DECL_OVERRIDE
{
#if defined(HAVE_OS_DRAGONFLYBSD)
char buf[PATH_MAX];
@@ -599,7 +599,7 @@ protected:
managementInfoBase[0] = CTL_KERN;
managementInfoBase[1] = KERN_PROC;
managementInfoBase[2] = KERN_PROC_CWD;
- managementInfoBase[3] = aPid;
+ managementInfoBase[3] = pid;
len = sizeof(buf);
if (sysctl(managementInfoBase, 4, buf, &len, NULL, 0) == -1) {
@@ -613,7 +613,7 @@ protected:
int numrecords;
struct kinfo_file *info = 0;
- info = kinfo_getfile(aPid, &numrecords);
+ info = kinfo_getfile(pid, &numrecords);
if (!info) {
return false;
@@ -634,7 +634,7 @@ protected:
}
private:
- bool readProcInfo(int aPid) Q_DECL_OVERRIDE
+ bool readProcInfo(int pid) Q_DECL_OVERRIDE
{
int managementInfoBase[4];
size_t mibLength;
@@ -643,7 +643,7 @@ private:
managementInfoBase[0] = CTL_KERN;
managementInfoBase[1] = KERN_PROC;
managementInfoBase[2] = KERN_PROC_PID;
- managementInfoBase[3] = aPid;
+ managementInfoBase[3] = pid;
if (sysctl(managementInfoBase, 4, NULL, &mibLength, NULL, 0) == -1) {
return false;
@@ -676,7 +676,7 @@ private:
return true;
}
- bool readArguments(int aPid) Q_DECL_OVERRIDE
+ bool readArguments(int pid) Q_DECL_OVERRIDE
{
char args[ARG_MAX];
int managementInfoBase[4];
@@ -685,7 +685,7 @@ private:
managementInfoBase[0] = CTL_KERN;
managementInfoBase[1] = KERN_PROC;
managementInfoBase[2] = KERN_PROC_ARGS;
- managementInfoBase[3] = aPid;
+ managementInfoBase[3] = pid;
len = sizeof(args);
if (sysctl(managementInfoBase, 4, args, &len, NULL, 0) == -1) {
@@ -708,13 +708,13 @@ private:
class OpenBSDProcessInfo : public UnixProcessInfo
{
public:
- OpenBSDProcessInfo(int aPid, const QString &titleFormat) :
- UnixProcessInfo(aPid, titleFormat)
+ OpenBSDProcessInfo(int pid, const QString &titleFormat) :
+ UnixProcessInfo(pid, titleFormat)
{
}
protected:
- bool readCurrentDir(int aPid) Q_DECL_OVERRIDE
+ bool readCurrentDir(int pid) Q_DECL_OVERRIDE
{
char buf[PATH_MAX];
int managementInfoBase[3];
@@ -722,7 +722,7 @@ protected:
managementInfoBase[0] = CTL_KERN;
managementInfoBase[1] = KERN_PROC_CWD;
- managementInfoBase[2] = aPid;
+ managementInfoBase[2] = pid;
len = sizeof(buf);
if (::sysctl(managementInfoBase, 3, buf, &len, NULL, 0) == -1) {
@@ -735,7 +735,7 @@ protected:
}
private:
- bool readProcInfo(int aPid) Q_DECL_OVERRIDE
+ bool readProcInfo(int pid) Q_DECL_OVERRIDE
{
int managementInfoBase[6];
size_t mibLength;
@@ -744,7 +744,7 @@ private:
managementInfoBase[0] = CTL_KERN;
managementInfoBase[1] = KERN_PROC;
managementInfoBase[2] = KERN_PROC_PID;
- managementInfoBase[3] = aPid;
+ managementInfoBase[3] = pid;
managementInfoBase[4] = sizeof(struct kinfo_proc);
managementInfoBase[5] = 1;
@@ -772,7 +772,7 @@ private:
return true;
}
- char **readProcArgs(int aPid, int whatMib)
+ char **readProcArgs(int pid, int whatMib)
{
void *buf = NULL;
void *nbuf;
@@ -782,7 +782,7 @@ private:
managementInfoBase[0] = CTL_KERN;
managementInfoBase[1] = KERN_PROC_ARGS;
- managementInfoBase[2] = aPid;
+ managementInfoBase[2] = pid;
managementInfoBase[3] = whatMib;
do {
@@ -805,11 +805,11 @@ private:
return (char **)buf;
}
- bool readArguments(int aPid) Q_DECL_OVERRIDE
+ bool readArguments(int pid) Q_DECL_OVERRIDE
{
char **argv;
- argv = readProcArgs(aPid, KERN_PROC_ARGV);
+ argv = readProcArgs(pid, KERN_PROC_ARGV);
if (argv == NULL) {
return false;
}
@@ -826,16 +826,16 @@ private:
class MacProcessInfo : public UnixProcessInfo
{
public:
- MacProcessInfo(int aPid, const QString &titleFormat) :
- UnixProcessInfo(aPid, titleFormat)
+ MacProcessInfo(int pid, const QString &titleFormat) :
+ UnixProcessInfo(pid, titleFormat)
{
}
protected:
- bool readCurrentDir(int aPid) Q_DECL_OVERRIDE
+ bool readCurrentDir(int pid) Q_DECL_OVERRIDE
{
struct proc_vnodepathinfo vpi;
- const int nb = proc_pidinfo(aPid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi));
+ const int nb = proc_pidinfo(pid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi));
if (nb == sizeof(vpi)) {
setCurrentDir(QString::fromUtf8(vpi.pvi_cdir.vip_path));
return true;
@@ -844,7 +844,7 @@ protected:
}
private:
- bool readProcInfo(int aPid) Q_DECL_OVERRIDE
+ bool readProcInfo(int pid) Q_DECL_OVERRIDE
{
int managementInfoBase[4];
size_t mibLength;
@@ -855,7 +855,7 @@ private:
managementInfoBase[0] = CTL_KERN;
managementInfoBase[1] = KERN_PROC;
managementInfoBase[2] = KERN_PROC_PID;
- managementInfoBase[3] = aPid;
+ managementInfoBase[3] = pid;
if (sysctl(managementInfoBase, 4, NULL, &mibLength, NULL, 0) == -1) {
return false;
@@ -900,14 +900,14 @@ private:
delete [] kInfoProc;
}
- setPid(aPid);
+ setPid(pid);
}
return true;
}
- bool readArguments(int aPid) Q_DECL_OVERRIDE
+ bool readArguments(int pid) Q_DECL_OVERRIDE
{
- Q_UNUSED(aPid);
+ Q_UNUSED(pid);
return false;
}
};
@@ -927,17 +927,17 @@ private:
class SolarisProcessInfo : public UnixProcessInfo
{
public:
- SolarisProcessInfo(int aPid, const QString &titleFormat) :
- UnixProcessInfo(aPid, titleFormat)
+ SolarisProcessInfo(int pid, const QString &titleFormat) :
+ UnixProcessInfo(pid, titleFormat)
{
}
protected:
// FIXME: This will have the same issues as BKO 251351; the Linux
// version uses readlink.
- bool readCurrentDir(int aPid) Q_DECL_OVERRIDE
+ bool readCurrentDir(int pid) Q_DECL_OVERRIDE
{
- QFileInfo info(QString("/proc/%1/path/cwd").arg(aPid));
+ QFileInfo info(QString("/proc/%1/path/cwd").arg(pid));
const bool readable = info.isReadable();
if (readable && info.isSymLink()) {
@@ -955,9 +955,9 @@ protected:
}
private:
- bool readProcInfo(int aPid) Q_DECL_OVERRIDE
+ bool readProcInfo(int pid) Q_DECL_OVERRIDE
{
- QFile psinfo(QString("/proc/%1/psinfo").arg(aPid));
+ QFile psinfo(QString("/proc/%1/psinfo").arg(pid));
if (psinfo.open(QIODevice::ReadOnly)) {
struct psinfo info;
if (psinfo.read((char *)&info, sizeof(info)) != sizeof(info)) {
@@ -967,7 +967,7 @@ private:
setParentPid(info.pr_ppid);
setForegroundPid(info.pr_pgid);
setName(info.pr_fname);
- setPid(aPid);
+ setPid(pid);
// Bogus, because we're treating the arguments as one single string
info.pr_psargs[PRARGSZ - 1] = 0;
@@ -1158,22 +1158,22 @@ QString SSHProcessInfo::format(const QString &input) const
return output;
}
-ProcessInfo *ProcessInfo::newInstance(int aPid, const QString &titleFormat)
+ProcessInfo *ProcessInfo::newInstance(int pid, const QString &titleFormat)
{
ProcessInfo *info;
#if defined(Q_OS_LINUX)
- info = new LinuxProcessInfo(aPid, titleFormat);
+ info = new LinuxProcessInfo(pid, titleFormat);
#elif defined(Q_OS_SOLARIS)
- info = new SolarisProcessInfo(aPid, titleFormat);
+ info = new SolarisProcessInfo(pid, titleFormat);
#elif defined(Q_OS_MACOS)
- info = new MacProcessInfo(aPid, titleFormat);
+ info = new MacProcessInfo(pid, titleFormat);
#elif defined(Q_OS_FREEBSD)
- info = new FreeBSDProcessInfo(aPid, titleFormat);
+ info = new FreeBSDProcessInfo(pid, titleFormat);
#elif defined(Q_OS_OPENBSD)
- info = new OpenBSDProcessInfo(aPid, titleFormat);
+ info = new OpenBSDProcessInfo(pid, titleFormat);
#else
- info = new NullProcessInfo(aPid, titleFormat);
+ info = new NullProcessInfo(pid, titleFormat);
#endif
- info->readProcessInfo(aPid);
+ info->readProcessInfo(pid);
return info;
}
diff --git a/src/Screen.cpp b/src/Screen.cpp
index 8031c85..5642df8 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -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();
}
diff --git a/src/Screen.h b/src/Screen.h
index da0d541..570f04f 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -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;
diff --git a/src/Session.h b/src/Session.h
index 858e6b1..3cf8134 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -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
diff --git a/src/SessionController.h b/src/SessionController.h
index dc399d2..81fef60 100644
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -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
diff --git a/src/SessionManager.h b/src/SessionManager.h
index d0ac677..76202b5 100644
--- a/src/SessionManager.h
+++ b/src/SessionManager.h
@@ -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);
diff --git a/src/TabTitleFormatButton.cpp b/src/TabTitleFormatButton.cpp
index ec84318..c492328 100644
--- a/src/TabTitleFormatButton.cpp
+++ b/src/TabTitleFormatButton.cpp
@@ -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"));
diff --git a/src/TabTitleFormatButton.h b/src/TabTitleFormatButton.h
index 6865535..73cb272 100644
--- a/src/TabTitleFormatButton.h
+++ b/src/TabTitleFormatButton.h
@@ -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:
diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
index 76fe3a2..06c7728 100644
--- a/src/TerminalDisplay.h
+++ b/src/TerminalDisplay.h
@@ -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);