Commit 8d774b19 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Code style fixes

Removed "void" from functions that take no parameters, removed a few
"get" prefixes, etc.
parent 793de72a
......@@ -47,7 +47,7 @@ public:
virtual ~IOutputPane() {}
virtual QWidget *outputWidget(QWidget *parent) = 0;
virtual QList<QWidget*> toolBarWidgets(void) const = 0;
virtual QList<QWidget*> toolBarWidgets() const = 0;
virtual QString name() const = 0;
// -1 don't show in statusBar
......
......@@ -48,7 +48,7 @@ public:
~MessageOutputWindow();
QWidget *outputWidget(QWidget *parent);
QList<QWidget*> toolBarWidgets(void) const { return QList<QWidget *>(); }
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
QString name() const;
int priorityInStatusBar() const;
......
......@@ -46,7 +46,7 @@ public:
DebuggerOutputWindow(QWidget *parent = 0);
QWidget *outputWidget(QWidget *) { return this; }
QList<QWidget*> toolBarWidgets(void) const { return QList<QWidget *>(); }
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
QString name() const { return windowTitle(); }
void visibilityChanged(bool /*visible*/) {}
......
......@@ -31,7 +31,7 @@
using namespace Find::Internal;
SearchResultTreeItem::SearchResultTreeItem(SearchResultTreeItem::itemType type, const SearchResultTreeItem *parent)
SearchResultTreeItem::SearchResultTreeItem(SearchResultTreeItem::ItemType type, const SearchResultTreeItem *parent)
: m_type(type), m_parent(parent)
{
}
......@@ -41,33 +41,33 @@ SearchResultTreeItem::~SearchResultTreeItem()
clearChildren();
}
void SearchResultTreeItem::clearChildren(void)
void SearchResultTreeItem::clearChildren()
{
qDeleteAll(m_children);
m_children.clear();
}
SearchResultTreeItem::itemType SearchResultTreeItem::getItemType(void) const
SearchResultTreeItem::ItemType SearchResultTreeItem::itemType() const
{
return m_type;
}
int SearchResultTreeItem::getChildrenCount(void) const
int SearchResultTreeItem::childrenCount() const
{
return m_children.count();
}
int SearchResultTreeItem::getRowOfItem(void) const
int SearchResultTreeItem::rowOfItem() const
{
return (m_parent?m_parent->m_children.indexOf(const_cast<SearchResultTreeItem*>(this)):0);
return (m_parent ? m_parent->m_children.indexOf(const_cast<SearchResultTreeItem*>(this)):0);
}
const SearchResultTreeItem* SearchResultTreeItem::getChild(int index) const
const SearchResultTreeItem* SearchResultTreeItem::childAt(int index) const
{
return m_children.at(index);
}
const SearchResultTreeItem *SearchResultTreeItem::getParent(void) const
const SearchResultTreeItem *SearchResultTreeItem::parent() const
{
return m_parent;
}
......@@ -78,8 +78,10 @@ void SearchResultTreeItem::appendChild(SearchResultTreeItem *child)
}
SearchResultTextRow::SearchResultTextRow(int index, int lineNumber,
const QString &rowText, int searchTermStart, int searchTermLength, const SearchResultTreeItem *parent)
: SearchResultTreeItem(resultRow, parent),
const QString &rowText,
int searchTermStart, int searchTermLength,
const SearchResultTreeItem *parent):
SearchResultTreeItem(ResultRow, parent),
m_index(index),
m_lineNumber(lineNumber),
m_rowText(rowText),
......@@ -113,12 +115,13 @@ int SearchResultTextRow::searchTermLength() const
return m_searchTermLength;
}
SearchResultFile::SearchResultFile(const QString &fileName, const SearchResultTreeItem *parent)
: SearchResultTreeItem(resultFile, parent), m_fileName(fileName)
SearchResultFile::SearchResultFile(const QString &fileName, const SearchResultTreeItem *parent):
SearchResultTreeItem(ResultFile, parent),
m_fileName(fileName)
{
}
QString SearchResultFile::getFileName(void) const
QString SearchResultFile::fileName() const
{
return m_fileName;
}
......@@ -126,6 +129,7 @@ QString SearchResultFile::getFileName(void) const
void SearchResultFile::appendResultLine(int index, int lineNumber, const QString &rowText, int searchTermStart,
int searchTermLength)
{
SearchResultTreeItem *child = new SearchResultTextRow(index, lineNumber, rowText, searchTermStart, searchTermLength, this);
SearchResultTreeItem *child = new SearchResultTextRow(index, lineNumber, rowText,
searchTermStart, searchTermLength, this);
appendChild(child);
}
......@@ -42,35 +42,35 @@ class SearchResultTreeItem;
class SearchResultTreeItem
{
public:
enum itemType
enum ItemType
{
root,
resultRow,
resultFile
Root,
ResultRow,
ResultFile
};
SearchResultTreeItem(itemType type = root, const SearchResultTreeItem *parent = NULL);
SearchResultTreeItem(ItemType type = Root, const SearchResultTreeItem *parent = NULL);
virtual ~SearchResultTreeItem();
itemType getItemType() const;
const SearchResultTreeItem *getParent() const;
const SearchResultTreeItem *getChild(int index) const;
ItemType itemType() const;
const SearchResultTreeItem *parent() const;
const SearchResultTreeItem *childAt(int index) const;
void appendChild(SearchResultTreeItem *child);
int getChildrenCount() const;
int getRowOfItem() const;
int childrenCount() const;
int rowOfItem() const;
void clearChildren();
private:
itemType m_type;
ItemType m_type;
const SearchResultTreeItem *m_parent;
QList<SearchResultTreeItem *> m_children;
};
class SearchResultTextRow: public SearchResultTreeItem
class SearchResultTextRow : public SearchResultTreeItem
{
public:
SearchResultTextRow(int index, int lineNumber, const QString &rowText, int searchTermStart,
int searchTermLength, const SearchResultTreeItem *parent);
int searchTermLength, const SearchResultTreeItem *parent);
int index() const;
QString rowText() const;
int lineNumber() const;
......@@ -85,13 +85,13 @@ private:
int m_searchTermLength;
};
class SearchResultFile: public SearchResultTreeItem
class SearchResultFile : public SearchResultTreeItem
{
public:
SearchResultFile(const QString &fileName, const SearchResultTreeItem *parent);
QString getFileName() const;
QString fileName() const;
void appendResultLine(int index, int lineNumber, const QString &rowText, int searchTermStart,
int searchTermLength);
int searchTermLength);
private:
QString m_fileName;
......
......@@ -48,7 +48,7 @@ SearchResultTreeModel::~SearchResultTreeModel()
}
QModelIndex SearchResultTreeModel::index(int row, int column,
const QModelIndex &parent) const
const QModelIndex &parent) const
{
if (!hasIndex(row, column, parent))
return QModelIndex();
......@@ -60,7 +60,7 @@ QModelIndex SearchResultTreeModel::index(int row, int column,
else
parentItem = static_cast<const SearchResultTreeItem*>(parent.internalPointer());
const SearchResultTreeItem *childItem = parentItem->getChild(row);
const SearchResultTreeItem *childItem = parentItem->childAt(row);
if (childItem)
return createIndex(row, column, (void *)childItem);
else
......@@ -73,12 +73,12 @@ QModelIndex SearchResultTreeModel::parent(const QModelIndex &index) const
return QModelIndex();
const SearchResultTreeItem *childItem = static_cast<const SearchResultTreeItem*>(index.internalPointer());
const SearchResultTreeItem *parentItem = childItem->getParent();
const SearchResultTreeItem *parentItem = childItem->parent();
if (parentItem == m_rootItem)
return QModelIndex();
return createIndex(parentItem->getRowOfItem(), 0, (void *)parentItem);
return createIndex(parentItem->rowOfItem(), 0, (void *)parentItem);
}
int SearchResultTreeModel::rowCount(const QModelIndex &parent) const
......@@ -93,7 +93,7 @@ int SearchResultTreeModel::rowCount(const QModelIndex &parent) const
else
parentItem = static_cast<const SearchResultTreeItem*>(parent.internalPointer());
return parentItem->getChildrenCount();
return parentItem->childrenCount();
}
int SearchResultTreeModel::columnCount(const QModelIndex &parent) const
......@@ -111,12 +111,12 @@ QVariant SearchResultTreeModel::data(const QModelIndex &index, int role) const
QVariant result;
if (item->getItemType() == SearchResultTreeItem::resultRow)
if (item->itemType() == SearchResultTreeItem::ResultRow)
{
const SearchResultTextRow *row = static_cast<const SearchResultTextRow *>(item);
result = data(row, role);
}
else if (item->getItemType() == SearchResultTreeItem::resultFile)
else if (item->itemType() == SearchResultTreeItem::ResultFile)
{
const SearchResultFile *file = static_cast<const SearchResultFile *>(item);
result = data(file, role);
......@@ -158,8 +158,8 @@ QVariant SearchResultTreeModel::data(const SearchResultTextRow *row, int role) c
break;
case ItemDataRoles::FileNameRole:
{
const SearchResultFile *file = dynamic_cast<const SearchResultFile *>(row->getParent());
result = file->getFileName();
const SearchResultFile *file = dynamic_cast<const SearchResultFile *>(row->parent());
result = file->fileName();
break;
}
default:
......@@ -187,14 +187,14 @@ QVariant SearchResultTreeModel::data(const SearchResultFile *file, int role) con
break;
}
case Qt::DisplayRole:
result = file->getFileName() + " (" + QString::number(file->getChildrenCount()) + ")";
result = file->fileName() + " (" + QString::number(file->childrenCount()) + ")";
break;
case ItemDataRoles::FileNameRole:
case Qt::ToolTipRole:
result = file->getFileName();
result = file->fileName();
break;
case ItemDataRoles::ResultLinesCountRole:
result = file->getChildrenCount();
result = file->childrenCount();
break;
case ItemDataRoles::TypeRole:
result = "file";
......@@ -220,20 +220,20 @@ void SearchResultTreeModel::appendResultFile(const QString &fileName)
{
m_lastAppendedResultFile = new SearchResultFile(fileName, m_rootItem);
beginInsertRows(QModelIndex(), m_rootItem->getChildrenCount(), m_rootItem->getChildrenCount());
beginInsertRows(QModelIndex(), m_rootItem->childrenCount(), m_rootItem->childrenCount());
m_rootItem->appendChild(m_lastAppendedResultFile);
endInsertRows();
}
void SearchResultTreeModel::appendResultLine(int index, int lineNumber, const QString &rowText, int searchTermStart,
int searchTermLength)
void SearchResultTreeModel::appendResultLine(int index, int lineNumber, const QString &rowText,
int searchTermStart, int searchTermLength)
{
if (!m_lastAppendedResultFile)
return;
QModelIndex lastFile(createIndex(m_lastAppendedResultFile->getRowOfItem(), 0, m_lastAppendedResultFile));
QModelIndex lastFile(createIndex(m_lastAppendedResultFile->rowOfItem(), 0, m_lastAppendedResultFile));
beginInsertRows(lastFile, m_lastAppendedResultFile->getChildrenCount(), m_lastAppendedResultFile->getChildrenCount());
beginInsertRows(lastFile, m_lastAppendedResultFile->childrenCount(), m_lastAppendedResultFile->childrenCount());
m_lastAppendedResultFile->appendResultLine(index, lineNumber, rowText, searchTermStart, searchTermLength);
endInsertRows();
......@@ -243,13 +243,13 @@ void SearchResultTreeModel::appendResultLine(int index, int lineNumber, const QS
void SearchResultTreeModel::appendResultLine(int index, const QString &fileName, int lineNumber, const QString &rowText,
int searchTermStart, int searchTermLength)
{
if (!m_lastAppendedResultFile || (m_lastAppendedResultFile->getFileName() != fileName))
if (!m_lastAppendedResultFile || (m_lastAppendedResultFile->fileName() != fileName))
appendResultFile(fileName);
appendResultLine(index, lineNumber, rowText, searchTermStart, searchTermLength);
}
void SearchResultTreeModel::clear(void)
void SearchResultTreeModel::clear()
{
m_lastAppendedResultFile = NULL;
m_rootItem->clearChildren();
......
......@@ -47,8 +47,7 @@ public:
SearchResultTreeModel(QObject *parent = 0);
~SearchResultTreeModel();
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &child) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
......@@ -57,7 +56,7 @@ public:
signals:
void jumpToSearchResult(const QString &fileName, int lineNumber,
int searchTermStart, int searchTermLength);
int searchTermStart, int searchTermLength);
void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
public slots:
......@@ -71,8 +70,8 @@ private:
void appendResultFile(const QString &fileName);
QVariant data(const SearchResultTextRow *row, int role) const;
QVariant data(const SearchResultFile *file, int role) const;
void initializeData(void);
void disposeData(void);
void initializeData();
void disposeData();
SearchResultTreeItem *m_rootItem;
SearchResultFile *m_lastAppendedResultFile;
......
......@@ -46,7 +46,7 @@ SearchResultTreeView::SearchResultTreeView(QWidget *parent)
setIndentation(14);
header()->hide();
connect (this, SIGNAL(activated(QModelIndex)), this, SLOT(emitJumpToSearchResult(QModelIndex)));
connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(emitJumpToSearchResult(QModelIndex)));
}
void SearchResultTreeView::setAutoExpandResults(bool expand)
......@@ -54,13 +54,13 @@ void SearchResultTreeView::setAutoExpandResults(bool expand)
m_autoExpandResults = expand;
}
void SearchResultTreeView::clear(void)
void SearchResultTreeView::clear()
{
m_model->clear();
}
void SearchResultTreeView::appendResultLine(int index, const QString &fileName, int lineNumber, const QString &rowText,
int searchTermStart, int searchTermLength)
int searchTermStart, int searchTermLength)
{
int rowsBefore = m_model->rowCount();
m_model->appendResultLine(index, fileName, lineNumber, rowText, searchTermStart, searchTermLength);
......
......@@ -48,12 +48,12 @@ public:
signals:
void jumpToSearchResult(int index, const QString &fileName, int lineNumber,
int searchTermStart, int searchTermLength);
int searchTermStart, int searchTermLength);
public slots:
void clear();
void appendResultLine(int index, const QString &fileName, int lineNumber, const QString &lineText,
int searchTermStart, int searchTermLength);
int searchTermStart, int searchTermLength);
private slots:
void emitJumpToSearchResult(const QModelIndex &index);
......
......@@ -107,7 +107,7 @@ QWidget *SearchResultWindow::outputWidget(QWidget *)
return m_widget;
}
QList<QWidget*> SearchResultWindow::toolBarWidgets(void) const
QList<QWidget*> SearchResultWindow::toolBarWidgets() const
{
return QList<QWidget*>() << m_expandCollapseToolButton;
}
......@@ -120,7 +120,7 @@ void SearchResultWindow::clearContents()
m_items.clear();
}
void SearchResultWindow::showNoMatchesFound(void)
void SearchResultWindow::showNoMatchesFound()
{
m_widget->setCurrentWidget(m_noMatchesFoundDisplay);
}
......@@ -169,7 +169,7 @@ void SearchResultWindow::handleExpandCollapseToolButton(bool checked)
m_searchResultTreeView->collapseAll();
}
void SearchResultWindow::readSettings(void)
void SearchResultWindow::readSettings()
{
QSettings *s = Core::ICore::instance()->settings();
if (s) {
......@@ -179,7 +179,7 @@ void SearchResultWindow::readSettings(void)
}
}
void SearchResultWindow::writeSettings(void)
void SearchResultWindow::writeSettings()
{
QSettings *s = Core::ICore::instance()->settings();
if (s) {
......
......@@ -64,7 +64,7 @@ public:
~SearchResultWindow();
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets(void) const;
QList<QWidget*> toolBarWidgets() const;
QString name() const { return tr("Search Results"); }
int priorityInStatusBar() const;
......
......@@ -50,7 +50,7 @@ public:
~PerforceOutputWindow();
QWidget *outputWidget(QWidget *parent);
QList<QWidget*> toolBarWidgets(void) const { return QList<QWidget *>(); }
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
QString name() const;
int priorityInStatusBar() const;
......
......@@ -47,7 +47,7 @@ class CompileOutputWindow : public Core::IOutputPane
public:
CompileOutputWindow(BuildManager *bm);
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets(void) const { return QList<QWidget *>(); }
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
QString name() const { return tr("Compile Output"); }
int priorityInStatusBar() const;
void clearContents();
......
......@@ -61,7 +61,7 @@ public:
~OutputPane();
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets(void) const;
QList<QWidget*> toolBarWidgets() const;
QString name() const;
int priorityInStatusBar() const;
void clearContents();
......
......@@ -56,7 +56,7 @@ public:
~TaskWindow();
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets(void) const;
QList<QWidget*> toolBarWidgets() const;
QString name() const { return tr("Build Issues"); }
int priorityInStatusBar() const;
......
......@@ -56,21 +56,21 @@ class InfoItemConfigurationCross : public SPEInfoItem
{
public:
InfoItemConfigurationCross(): SPEInfoItem("", Configuration) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Debug and Release"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Debug and Release"); }
};
class InfoItemConfigurationDebug : public SPEInfoItem
{
public:
InfoItemConfigurationDebug(): SPEInfoItem("debug", Configuration) {}
QString name(void) const {return QCoreApplication::translate("SimpleProEditor", "Debug specific");}
QString name() const {return QCoreApplication::translate("SimpleProEditor", "Debug specific");}
};
class InfoItemConfigurationRelease : public SPEInfoItem
{
public:
InfoItemConfigurationRelease(): SPEInfoItem("release", Configuration) {}
QString name(void) const {return QCoreApplication::translate("SimpleProEditor", "Release specific");}
QString name() const {return QCoreApplication::translate("SimpleProEditor", "Release specific");}
};
......@@ -79,28 +79,28 @@ class InfoItemPlatformCross : public SPEInfoItem
{
public:
InfoItemPlatformCross(): SPEInfoItem("", Platform) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "All platforms"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "All platforms"); }
};
class InfoItemPlatformWindows : public SPEInfoItem
{
public:
InfoItemPlatformWindows(): SPEInfoItem("win32", Platform) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "MS Windows specific"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "MS Windows specific"); }
};
class InfoItemPlatformUnix : public SPEInfoItem
{
public:
InfoItemPlatformUnix(): SPEInfoItem("unix", Platform) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Linux/Unix specific"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Linux/Unix specific"); }
};
class InfoItemPlatformOSX : public SPEInfoItem
{
public:
InfoItemPlatformOSX(): SPEInfoItem("macx", Platform) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Mac OSX specific"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Mac OSX specific"); }
};
......@@ -113,8 +113,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/target.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Target Options");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Target Options");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Type and name of the target.");
......@@ -129,8 +129,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/defines.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Preprocessor Definitions");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Preprocessor Definitions");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Setting of the preprocessor definitions.");
......@@ -146,8 +146,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/includes.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Include path"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Include path"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Setting of the pathes where the header files are located.");
......@@ -162,8 +162,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/libs.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Libraries");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Libraries");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Defining the libraries to link the target against and the pathes where these are located.");
......@@ -179,8 +179,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/sources.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Source Files");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Source Files");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"");
......@@ -196,8 +196,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/headers.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Header Files");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Header Files");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"");
......@@ -213,8 +213,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/forms.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Forms");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Forms");}
QString description() const