Commit 4530b39f authored by Kurt Hindenburg's avatar Kurt Hindenburg

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

parent 1480b5ca
......@@ -45,8 +45,8 @@ public:
HistoryFile();
virtual ~HistoryFile();
virtual void add(const char *bytes, qint64 len);
virtual void get(char *bytes, qint64 len, qint64 loc);
virtual void add(const char *buffer, qint64 count);
virtual void get(char *buffer, qint64 size, qint64 loc);
virtual qint64 len() const;
//mmaps the file in read-only mode
......@@ -92,7 +92,7 @@ public:
virtual int getLines() = 0;
virtual int getLineLen(int lineno) = 0;
virtual void getCells(int lineno, int colno, int count, Character res[]) = 0;
virtual bool isWrappedLine(int lineno) = 0;
virtual bool isWrappedLine(int lineNumber) = 0;
// adding lines.
virtual void addCells(const Character a[], int count) = 0;
......@@ -134,7 +134,7 @@ public:
void getCells(int lineno, int colno, int count, Character res[]) Q_DECL_OVERRIDE;
bool isWrappedLine(int lineno) Q_DECL_OVERRIDE;
void addCells(const Character a[], int count) Q_DECL_OVERRIDE;
void addCells(const Character text[], int count) Q_DECL_OVERRIDE;
void addLine(bool previousWrapped = false) Q_DECL_OVERRIDE;
private:
......@@ -231,7 +231,7 @@ public:
return _blockLength;
}
virtual void *allocate(size_t length);
virtual void *allocate(size_t size);
virtual bool contains(void *addr)
{
return addr >= _blockStart && addr < (_blockStart + _blockLength);
......@@ -285,7 +285,7 @@ public:
/* do nothing, deallocation from pool is done in destructor*/
}
virtual void getCharacters(Character *array, int length, int startColumn);
virtual void getCharacters(Character *array, int size, int startColumn);
virtual void getCharacter(int index, Character &r);
virtual bool isWrapped() const
{
......@@ -320,15 +320,15 @@ public:
~CompactHistoryScroll() Q_DECL_OVERRIDE;
int getLines() Q_DECL_OVERRIDE;
int getLineLen(int lineno) Q_DECL_OVERRIDE;
void getCells(int lineno, int colno, int count, Character res[]) Q_DECL_OVERRIDE;
bool isWrappedLine(int lineno) Q_DECL_OVERRIDE;
int getLineLen(int lineNumber) Q_DECL_OVERRIDE;
void getCells(int lineNumber, int startColumn, int count, Character buffer[]) Q_DECL_OVERRIDE;
bool isWrappedLine(int lineNumber) Q_DECL_OVERRIDE;
void addCells(const Character a[], int count) Q_DECL_OVERRIDE;
void addCellsVector(const TextLine &cells) Q_DECL_OVERRIDE;
void addLine(bool previousWrapped = false) Q_DECL_OVERRIDE;
void setMaxNbLines(unsigned int nbLines);
void setMaxNbLines(unsigned int lineCount);
private:
bool hasDifferentColors(const TextLine &line) const;
......@@ -400,7 +400,7 @@ protected:
class KONSOLEPRIVATE_EXPORT CompactHistoryType : public HistoryType
{
public:
explicit CompactHistoryType(unsigned int size);
explicit CompactHistoryType(unsigned int nbLines);
bool isEnabled() const Q_DECL_OVERRIDE;
int maximumLineCount() const Q_DECL_OVERRIDE;
......
......@@ -629,29 +629,29 @@ void KeyboardTranslator::Entry::insertModifier(QString &item, int modifier) cons
}
}
void KeyboardTranslator::Entry::insertState(QString &item, int aState) const
void KeyboardTranslator::Entry::insertState(QString &item, int state) const
{
if ((aState & _stateMask) == 0) {
if ((state & _stateMask) == 0) {
return;
}
if ((aState & _state) != 0) {
if ((state & _state) != 0) {
item += QLatin1Char('+');
} else {
item += QLatin1Char('-');
}
if (aState == KeyboardTranslator::AlternateScreenState) {
if (state == KeyboardTranslator::AlternateScreenState) {
item += QLatin1String("AppScreen");
} else if (aState == KeyboardTranslator::NewLineState) {
} else if (state == KeyboardTranslator::NewLineState) {
item += QLatin1String("NewLine");
} else if (aState == KeyboardTranslator::AnsiState) {
} else if (state == KeyboardTranslator::AnsiState) {
item += QLatin1String("Ansi");
} else if (aState == KeyboardTranslator::CursorKeysState) {
} else if (state == KeyboardTranslator::CursorKeysState) {
item += QLatin1String("AppCursorKeys");
} else if (aState == KeyboardTranslator::AnyModifierState) {
} else if (state == KeyboardTranslator::AnyModifierState) {
item += QLatin1String("AnyModifier");
} else if (aState == KeyboardTranslator::ApplicationKeypadState) {
} else if (state == KeyboardTranslator::ApplicationKeypadState) {
item += QLatin1String("AppKeypad");
}
}
......@@ -700,9 +700,9 @@ QString KeyboardTranslator::Entry::conditionToString() const
return result;
}
KeyboardTranslator::KeyboardTranslator(const QString &aName) :
KeyboardTranslator::KeyboardTranslator(const QString &name) :
_entries(QMultiHash<int, Entry>()),
_name(aName),
_name(name),
_description(QString())
{
}
......@@ -719,9 +719,9 @@ FallbackKeyboardTranslator::FallbackKeyboardTranslator() :
addEntry(entry);
}
void KeyboardTranslator::setDescription(const QString &aDescription)
void KeyboardTranslator::setDescription(const QString &description)
{
_description = aDescription;
_description = description;
}
QString KeyboardTranslator::description() const
......@@ -729,9 +729,9 @@ QString KeyboardTranslator::description() const
return _description;
}
void KeyboardTranslator::setName(const QString &aName)
void KeyboardTranslator::setName(const QString &name)
{
_name = aName;
_name = name;
}
QString KeyboardTranslator::name() const
......
......@@ -95,7 +95,7 @@ private:
// loads the translator with the given name
KeyboardTranslator *loadTranslator(const QString &name);
KeyboardTranslator *loadTranslator(QIODevice *device, const QString &name);
KeyboardTranslator *loadTranslator(QIODevice *source, const QString &name);
bool saveTranslator(const KeyboardTranslator *translator);
QString findTranslatorPath(const QString &name);
......
......@@ -881,7 +881,7 @@ void MainWindow::setMenuBarInitialVisibility(bool visible)
_menuBarInitialVisibility = visible;
}
void MainWindow::showEvent(QShowEvent *aEvent)
void MainWindow::showEvent(QShowEvent *event)
{
// Make sure the 'initial' visibility is applied only once.
if (!_menuBarInitialVisibilityApplied) {
......@@ -898,7 +898,7 @@ void MainWindow::showEvent(QShowEvent *aEvent)
}
// Call parent method
KXmlGuiWindow::showEvent(aEvent);
KXmlGuiWindow::showEvent(event);
}
bool MainWindow::focusNextPrevChild(bool)
......
......@@ -104,8 +104,8 @@ public:
void setNavigationVisibility(int visibility);
void setNavigationPosition(int position);
void setNavigationStyleSheet(const QString &stylesheet);
void setNavigationStyleSheetFromFile(const QUrl &stylesheetfile);
void setNavigationStyleSheet(const QString &styleSheet);
void setNavigationStyleSheetFromFile(const QUrl &styleSheetFile);
void setNavigationBehavior(int behavior);
void setNavigationTabWidthExpanding(bool expand);
void setShowQuickButtons(bool show);
......@@ -156,7 +156,7 @@ private Q_SLOTS:
void disconnectController(SessionController *controller);
void activeViewTitleChanged(ViewProperties *);
void profileListChanged(const QList<QAction *> &actions);
void profileListChanged(const QList<QAction *> &sessionActions);
void configureNotifications();
void updateWindowIcon();
......
......@@ -103,7 +103,7 @@ public:
* SessionManager::createSession() to create a new session using
* this profile.
*/
Profile::Ptr loadProfile(const QString &path);
Profile::Ptr loadProfile(const QString &shortPath);
/**
* Searches for available profiles on-disk and returns a list
......
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