feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Code style fixes

Browse Source 
Removed "void" from functions that take no parameters, removed a few
"get" prefixes, etc.
This commit is contained in:
Thorbjørn Lindeijer
2009-04-07 16:59:48 +02:00
parent 793de72a44
commit 8d774b19cd
20 changed files with 166 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/ioutputpane.h
View File

@@ -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

2
src/plugins/coreplugin/messageoutputwindow.h
View File

@@ -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;

2
src/plugins/debugger/debuggeroutputwindow.h
View File

@@ -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*/) {}

30
src/plugins/find/searchresulttreeitems.cpp
View File

@@ -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);
}
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);
}

24
src/plugins/find/searchresulttreeitems.h
View File

@@ -42,26 +42,26 @@ 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;
};
@@ -89,7 +89,7 @@ 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);

36
src/plugins/find/searchresulttreemodel.cpp
View File

@@ -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();

7
src/plugins/find/searchresulttreemodel.h
View File

@@ -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;
@@ -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;

2
src/plugins/find/searchresulttreeview.cpp
View File

@@ -54,7 +54,7 @@ void SearchResultTreeView::setAutoExpandResults(bool expand)
m_autoExpandResults = expand;
}
void SearchResultTreeView::clear(void)
void SearchResultTreeView::clear()
{
m_model->clear();
}

8
src/plugins/find/searchresultwindow.cpp
View File

@@ -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) {

2
src/plugins/find/searchresultwindow.h
View File

@@ -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;

2
src/plugins/perforce/perforceoutputwindow.h
View File

@@ -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;

2
src/plugins/projectexplorer/compileoutputwindow.h
View File

@@ -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();

2
src/plugins/projectexplorer/outputwindow.h
View File

@@ -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();

2
src/plugins/projectexplorer/taskwindow.h
View File

@@ -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;

148
src/plugins/qt4projectmanager/speinfo.cpp
View File

@@ -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
{
return QCoreApplication::translate("SimpleProEditor",
"");
@@ -229,8 +229,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/qtmodules.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Qt Modules");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Qt Modules");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Setting up which of the Qt modules will be used in the target application.");
@@ -246,8 +246,8 @@ public:
m_data.insert(keyImageFileName, ":/variableimages/images/resources.png");
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Resource files");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Resource files");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"");
@@ -258,8 +258,8 @@ class InfoItemVariableTarget : public SPEInfoItem
{
public:
InfoItemVariableTarget(): SPEInfoItem("TARGET", Variable) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Target name");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Target name");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"The name of the resulting target.");
@@ -270,8 +270,8 @@ class InfoItemVariableConfig : public SPEInfoItem
{
public:
InfoItemVariableConfig(): SPEInfoItem("CONFIG", Variable) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Configuration");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Configuration");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Configuration.");
@@ -282,8 +282,8 @@ class InfoItemVariableDestdir : public SPEInfoItem
{
public:
InfoItemVariableDestdir(): SPEInfoItem("DESTDIR", Variable) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Destination directory");}
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Destination directory");}
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Where the resulting target will be created.");
@@ -300,8 +300,8 @@ public:
m_data.insert(keyIncludedByDefault, true);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtCore Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtCore Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Core non-GUI classes used by other modules");
@@ -316,8 +316,8 @@ public:
m_data.insert(keyIncludedByDefault, true);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtGui Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtGui Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Graphical user interface components");
@@ -332,8 +332,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtNetwork Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtNetwork Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes for network programming");
@@ -348,8 +348,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtOpenGL Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtOpenGL Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"OpenGL support classes");
@@ -364,8 +364,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtSql Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtSql Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes for database integration using SQL");
@@ -380,8 +380,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtScript Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtScript Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes for evaluating Qt Scripts");
@@ -396,8 +396,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtSvg Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtSvg Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes for displaying the contents of SVG files");
@@ -412,8 +412,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtWebKit Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtWebKit Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes for displaying and editing Web content");
@@ -428,8 +428,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtXml Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtXml Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes for handling XML");
@@ -444,8 +444,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtXmlPatterns Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtXmlPatterns Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"An XQuery/XPath engine for XML and custom data models");
@@ -460,8 +460,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Phonon Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Phonon Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Multimedia framework classes");
@@ -476,8 +476,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Qt3Support Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Qt3Support Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes that ease porting from Qt 3 to Qt 4");
@@ -492,8 +492,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtTest Module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtTest Module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Tool classes for unit testing");
@@ -508,8 +508,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "QtDBus module"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "QtDBus module"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Classes for Inter-Process Communication using the D-Bus");
@@ -526,8 +526,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Application"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Application"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Create a standalone application");
@@ -542,8 +542,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Dynamic Library"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Dynamic Library"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Create a dynamic library for usage in other applications");
@@ -558,8 +558,8 @@ public:
m_data.insert(keyIncludedByDefault, false);
}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Static Library"); }
QString description(void) const
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Static Library"); }
QString description() const
{
return QCoreApplication::translate("SimpleProEditor",
"Create a static library for usage in other applications");
@@ -571,35 +571,35 @@ class InfoItemOperatorsAdd : public SPEInfoItem
{
public:
InfoItemOperatorsAdd(): SPEInfoItem("+=", Operator) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Add Operator"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Add Operator"); }
};
class InfoItemOperatorsRemove : public SPEInfoItem
{
public:
InfoItemOperatorsRemove(): SPEInfoItem("-=", Operator) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Remove Operator"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Remove Operator"); }
};
class InfoItemOperatorsReplace : public SPEInfoItem
{
public:
InfoItemOperatorsReplace(): SPEInfoItem("~=", Operator) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Replace Operator"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Replace Operator"); }
};
class InfoItemOperatorsSet : public SPEInfoItem
{
public:
InfoItemOperatorsSet(): SPEInfoItem("=", Operator) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Set Operator"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Set Operator"); }
};
class InfoItemOperatorsUniqueAdd : public SPEInfoItem
{
public:
InfoItemOperatorsUniqueAdd(): SPEInfoItem("*=", Operator) {}
QString name(void) const { return QCoreApplication::translate("SimpleProEditor", "Unique Add Operator"); }
QString name() const { return QCoreApplication::translate("SimpleProEditor", "Unique Add Operator"); }
};
@@ -625,7 +625,7 @@ QVariant SPEInfoItem::data(const QString &key) const
return m_data.value(key);
}
const SPEInfoItem *SPEInfoItem::parentItem(void) const
const SPEInfoItem *SPEInfoItem::parentItem() const
{
return m_parentItem;
}
@@ -651,7 +651,7 @@ QString SPEInfoItem::id() const
return m_id;
}
SPEInfoItem::InfoKind SPEInfoItem::infoKind(void) const
SPEInfoItem::InfoKind SPEInfoItem::infoKind() const
{
return m_infoKind;
}
@@ -686,7 +686,7 @@ void SPEInfo::addListToHash(const QList<SPEInfoItem*> &list)
m_itemHash.insert(qMakePair(item->infoKind(), item->id()), item);
}
void SPEInfo::initializeLists(void)
void SPEInfo::initializeLists()
{
InfoItemConfigurationCross *infoItemConfigurationCross = new InfoItemConfigurationCross;
InfoItemConfigurationDebug *infoItemConfigurationDebug = new InfoItemConfigurationDebug;
@@ -762,7 +762,7 @@ void SPEInfo::initializeLists(void)
m_listsInitialized = true;
}
void SPEInfo::deleteLists(void)
void SPEInfo::deleteLists()
{
m_itemHash.clear();

14
src/plugins/qt4projectmanager/speinfo.h
View File

@@ -52,12 +52,12 @@ public:
SPEInfoItem(const QString &id, InfoKind kind);
virtual ~SPEInfoItem() {}
QString id(void) const;
InfoKind infoKind(void) const;
virtual QString name(void) const;
virtual QString description(void) const;
QString id() const;
InfoKind infoKind() const;
virtual QString name() const;
virtual QString description() const;
QVariant data(const QString &key) const;
const SPEInfoItem *parentItem(void) const;
const SPEInfoItem *parentItem() const;
void setParentItem(const SPEInfoItem *parentItem);
bool isAncestorOf(const SPEInfoItem *ancestor) const;
@@ -92,8 +92,8 @@ public:
private:
static void addListToHash(const QList<SPEInfoItem*> &list);
static void initializeLists(void);
static void deleteLists(void);
static void initializeLists();
static void deleteLists();
static QList<SPEInfoItem*> m_configurationList;
static QList<SPEInfoItem*> m_platformList;

2
src/plugins/subversion/subversionoutputwindow.h
View File

@@ -50,7 +50,7 @@ public:
~SubversionOutputWindow();
QWidget *outputWidget(QWidget *parent);
QList<QWidget*> toolBarWidgets(void) const {
QList<QWidget*> toolBarWidgets() const {
return QList<QWidget *>();
}

7
src/shared/qrceditor/resourceview.cpp
View File

@@ -199,9 +199,8 @@ ResourceView::ResourceView(QUndoStack *history, QWidget *parent) :
enableContextMenu(true);
}
ResourceView::~ResourceView(void)
ResourceView::~ResourceView()
{
}
void ResourceView::currentChanged(const QModelIndex &current, const QModelIndex &previous)
@@ -477,7 +476,7 @@ void ResourceView::onEditAlias()
changeAlias(index);
}
bool ResourceView::load(QString fileName)
bool ResourceView::load(const QString &fileName)
{
const QFileInfo fi(fileName);
m_qrcModel->setFileName(fi.absoluteFilePath());
@@ -488,7 +487,7 @@ bool ResourceView::load(QString fileName)
return m_qrcModel->reload();
}
bool ResourceView::save(void)
bool ResourceView::save()
{
return m_qrcModel->save();
}

10
src/shared/qrceditor/resourceview.h
View File

@@ -84,10 +84,10 @@ public:
};
ResourceView(QUndoStack *history, QWidget *parent = 0);
~ResourceView(void);
~ResourceView();
bool load(QString fileName);
bool save(void);
bool load(const QString &fileName);
bool save();
QString fileName() const;
void setFileName(const QString &fileName);
@@ -158,8 +158,8 @@ public:
void changeValue(const QModelIndex &nodeIndex, NodeProperty property, const QString &value);
private:
void addUndoCommand(const QModelIndex &nodeIndex, NodeProperty property, const QString &before,
const QString &after);
void addUndoCommand(const QModelIndex &nodeIndex, NodeProperty property,
const QString &before, const QString &after);
QPoint m_releasePos;