From 2bc45cc8e5ca9b7259b30564e7971e6453aec7a8 Mon Sep 17 00:00:00 2001 From: con Date: Wed, 8 Apr 2009 12:02:15 +0200 Subject: [PATCH 1/5] Remove superfluous TODO --- dist/changes-1.1.0 | 2 -- 1 file changed, 2 deletions(-) diff --git a/dist/changes-1.1.0 b/dist/changes-1.1.0 index 207a086fb06..28e9f0c9b61 100644 --- a/dist/changes-1.1.0 +++ b/dist/changes-1.1.0 @@ -77,5 +77,3 @@ Lots of improvements to Additional credits go to: * Martin Aumueller (FakeVim improvements) * Kris Wong (different patches) - -//TODO: this refers to commit c6419ff008bbf1afd2dfa4ed18a09de039cccef6 From 793de72a44fc631a6a648dcb8164137caa786077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 7 Apr 2009 16:39:51 +0200 Subject: [PATCH 2/5] Honour the default path passed to the generic project wizard --- .../genericprojectmanager/genericprojectwizard.cpp | 12 +++++++++++- .../genericprojectmanager/genericprojectwizard.h | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index 780ce468586..5a0f2196b04 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -50,7 +50,7 @@ using namespace Core::Utils; namespace { -class DirModel: public QDirModel +class DirModel : public QDirModel { public: DirModel(QObject *parent) @@ -178,6 +178,11 @@ QString GenericProjectWizardDialog::path() const return m_firstPage->path(); } +void GenericProjectWizardDialog::setPath(const QString &path) +{ + m_firstPage->setPath(path); +} + QString GenericProjectWizardDialog::projectName() const { return m_firstPage->name(); @@ -201,6 +206,7 @@ void GenericProjectWizardDialog::updateFilesView(const QModelIndex ¤t, void GenericProjectWizardDialog::initializePage(int id) { + Q_UNUSED(id) #if 0 if (id == m_secondPageId) { using namespace Core::Utils; @@ -251,6 +257,8 @@ QWizard *GenericProjectWizard::createWizardDialog(QWidget *parent, GenericProjectWizardDialog *wizard = new GenericProjectWizardDialog(parent); setupWizard(wizard); + wizard->setPath(defaultPath); + foreach (QWizardPage *p, extensionPages) wizard->addPage(p); @@ -302,6 +310,8 @@ bool GenericProjectWizard::isValidDir(const QFileInfo &fileInfo) const Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w, QString *errorMessage) const { + Q_UNUSED(errorMessage) + const GenericProjectWizardDialog *wizard = qobject_cast(w); const QString projectPath = wizard->path(); const QDir dir(projectPath); diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.h b/src/plugins/genericprojectmanager/genericprojectwizard.h index ffbb74d5420..f15790bcf85 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.h +++ b/src/plugins/genericprojectmanager/genericprojectwizard.h @@ -64,6 +64,8 @@ public: virtual ~GenericProjectWizardDialog(); QString path() const; + void setPath(const QString &path); + QString projectName() const; private Q_SLOTS: From 8d774b19cd349635a4d252866c12b541b9bac092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 7 Apr 2009 16:59:48 +0200 Subject: [PATCH 3/5] Code style fixes Removed "void" from functions that take no parameters, removed a few "get" prefixes, etc. --- src/plugins/coreplugin/ioutputpane.h | 2 +- src/plugins/coreplugin/messageoutputwindow.h | 2 +- src/plugins/debugger/debuggeroutputwindow.h | 2 +- src/plugins/find/searchresulttreeitems.cpp | 32 ++-- src/plugins/find/searchresulttreeitems.h | 32 ++-- src/plugins/find/searchresulttreemodel.cpp | 38 ++--- src/plugins/find/searchresulttreemodel.h | 9 +- src/plugins/find/searchresulttreeview.cpp | 6 +- src/plugins/find/searchresulttreeview.h | 4 +- src/plugins/find/searchresultwindow.cpp | 8 +- src/plugins/find/searchresultwindow.h | 2 +- src/plugins/perforce/perforceoutputwindow.h | 2 +- .../projectexplorer/compileoutputwindow.h | 2 +- src/plugins/projectexplorer/outputwindow.h | 2 +- src/plugins/projectexplorer/taskwindow.h | 2 +- src/plugins/qt4projectmanager/speinfo.cpp | 148 +++++++++--------- src/plugins/qt4projectmanager/speinfo.h | 14 +- .../subversion/subversionoutputwindow.h | 2 +- src/shared/qrceditor/resourceview.cpp | 7 +- src/shared/qrceditor/resourceview.h | 14 +- 20 files changed, 166 insertions(+), 164 deletions(-) diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h index 5977ce14d24..e38e9fbe8b3 100644 --- a/src/plugins/coreplugin/ioutputpane.h +++ b/src/plugins/coreplugin/ioutputpane.h @@ -47,7 +47,7 @@ public: virtual ~IOutputPane() {} virtual QWidget *outputWidget(QWidget *parent) = 0; - virtual QList toolBarWidgets(void) const = 0; + virtual QList toolBarWidgets() const = 0; virtual QString name() const = 0; // -1 don't show in statusBar diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h index a537366f3fc..70e1308e0dd 100644 --- a/src/plugins/coreplugin/messageoutputwindow.h +++ b/src/plugins/coreplugin/messageoutputwindow.h @@ -48,7 +48,7 @@ public: ~MessageOutputWindow(); QWidget *outputWidget(QWidget *parent); - QList toolBarWidgets(void) const { return QList(); } + QList toolBarWidgets() const { return QList(); } QString name() const; int priorityInStatusBar() const; diff --git a/src/plugins/debugger/debuggeroutputwindow.h b/src/plugins/debugger/debuggeroutputwindow.h index 904e0456199..a912b7e2a47 100644 --- a/src/plugins/debugger/debuggeroutputwindow.h +++ b/src/plugins/debugger/debuggeroutputwindow.h @@ -46,7 +46,7 @@ public: DebuggerOutputWindow(QWidget *parent = 0); QWidget *outputWidget(QWidget *) { return this; } - QList toolBarWidgets(void) const { return QList(); } + QList toolBarWidgets() const { return QList(); } QString name() const { return windowTitle(); } void visibilityChanged(bool /*visible*/) {} diff --git a/src/plugins/find/searchresulttreeitems.cpp b/src/plugins/find/searchresulttreeitems.cpp index dbdef04ee1e..986767666b3 100644 --- a/src/plugins/find/searchresulttreeitems.cpp +++ b/src/plugins/find/searchresulttreeitems.cpp @@ -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(this)):0); + return (m_parent ? m_parent->m_children.indexOf(const_cast(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); } diff --git a/src/plugins/find/searchresulttreeitems.h b/src/plugins/find/searchresulttreeitems.h index a33974fee8c..cf792d897ab 100644 --- a/src/plugins/find/searchresulttreeitems.h +++ b/src/plugins/find/searchresulttreeitems.h @@ -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 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; diff --git a/src/plugins/find/searchresulttreemodel.cpp b/src/plugins/find/searchresulttreemodel.cpp index 03fb1c5c017..0ae10d50594 100644 --- a/src/plugins/find/searchresulttreemodel.cpp +++ b/src/plugins/find/searchresulttreemodel.cpp @@ -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(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(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(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(item); result = data(row, role); } - else if (item->getItemType() == SearchResultTreeItem::resultFile) + else if (item->itemType() == SearchResultTreeItem::ResultFile) { const SearchResultFile *file = static_cast(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(row->getParent()); - result = file->getFileName(); + const SearchResultFile *file = dynamic_cast(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(); diff --git a/src/plugins/find/searchresulttreemodel.h b/src/plugins/find/searchresulttreemodel.h index cd32d55a7e3..3a1ac87efc7 100644 --- a/src/plugins/find/searchresulttreemodel.h +++ b/src/plugins/find/searchresulttreemodel.h @@ -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; diff --git a/src/plugins/find/searchresulttreeview.cpp b/src/plugins/find/searchresulttreeview.cpp index e74458593dd..5b20a763997 100644 --- a/src/plugins/find/searchresulttreeview.cpp +++ b/src/plugins/find/searchresulttreeview.cpp @@ -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); diff --git a/src/plugins/find/searchresulttreeview.h b/src/plugins/find/searchresulttreeview.h index a7ff9b4b11c..be1420b3438 100644 --- a/src/plugins/find/searchresulttreeview.h +++ b/src/plugins/find/searchresulttreeview.h @@ -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); diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index 908bf703158..323d26bf3ba 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -107,7 +107,7 @@ QWidget *SearchResultWindow::outputWidget(QWidget *) return m_widget; } -QList SearchResultWindow::toolBarWidgets(void) const +QList SearchResultWindow::toolBarWidgets() const { return QList() << 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) { diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h index c6022f951e9..a6f4b705a98 100644 --- a/src/plugins/find/searchresultwindow.h +++ b/src/plugins/find/searchresultwindow.h @@ -64,7 +64,7 @@ public: ~SearchResultWindow(); QWidget *outputWidget(QWidget *); - QList toolBarWidgets(void) const; + QList toolBarWidgets() const; QString name() const { return tr("Search Results"); } int priorityInStatusBar() const; diff --git a/src/plugins/perforce/perforceoutputwindow.h b/src/plugins/perforce/perforceoutputwindow.h index d738dabec71..d88d5b57789 100644 --- a/src/plugins/perforce/perforceoutputwindow.h +++ b/src/plugins/perforce/perforceoutputwindow.h @@ -50,7 +50,7 @@ public: ~PerforceOutputWindow(); QWidget *outputWidget(QWidget *parent); - QList toolBarWidgets(void) const { return QList(); } + QList toolBarWidgets() const { return QList(); } QString name() const; int priorityInStatusBar() const; diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h index 4687bf3816b..55a4b988b00 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.h +++ b/src/plugins/projectexplorer/compileoutputwindow.h @@ -47,7 +47,7 @@ class CompileOutputWindow : public Core::IOutputPane public: CompileOutputWindow(BuildManager *bm); QWidget *outputWidget(QWidget *); - QList toolBarWidgets(void) const { return QList(); } + QList toolBarWidgets() const { return QList(); } QString name() const { return tr("Compile Output"); } int priorityInStatusBar() const; void clearContents(); diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h index 67f71e7c685..7542269bfc5 100644 --- a/src/plugins/projectexplorer/outputwindow.h +++ b/src/plugins/projectexplorer/outputwindow.h @@ -61,7 +61,7 @@ public: ~OutputPane(); QWidget *outputWidget(QWidget *); - QList toolBarWidgets(void) const; + QList toolBarWidgets() const; QString name() const; int priorityInStatusBar() const; void clearContents(); diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index b76c158f1f4..fffd6904e77 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -56,7 +56,7 @@ public: ~TaskWindow(); QWidget *outputWidget(QWidget *); - QList toolBarWidgets(void) const; + QList toolBarWidgets() const; QString name() const { return tr("Build Issues"); } int priorityInStatusBar() const; diff --git a/src/plugins/qt4projectmanager/speinfo.cpp b/src/plugins/qt4projectmanager/speinfo.cpp index 8ab9d128373..3367eea3137 100644 --- a/src/plugins/qt4projectmanager/speinfo.cpp +++ b/src/plugins/qt4projectmanager/speinfo.cpp @@ -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 &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(); diff --git a/src/plugins/qt4projectmanager/speinfo.h b/src/plugins/qt4projectmanager/speinfo.h index 4a21ee9bc00..a4395212916 100644 --- a/src/plugins/qt4projectmanager/speinfo.h +++ b/src/plugins/qt4projectmanager/speinfo.h @@ -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 &list); - static void initializeLists(void); - static void deleteLists(void); + static void initializeLists(); + static void deleteLists(); static QList m_configurationList; static QList m_platformList; diff --git a/src/plugins/subversion/subversionoutputwindow.h b/src/plugins/subversion/subversionoutputwindow.h index 85d59afcbbd..fc5b76eec46 100644 --- a/src/plugins/subversion/subversionoutputwindow.h +++ b/src/plugins/subversion/subversionoutputwindow.h @@ -50,7 +50,7 @@ public: ~SubversionOutputWindow(); QWidget *outputWidget(QWidget *parent); - QList toolBarWidgets(void) const { + QList toolBarWidgets() const { return QList(); } diff --git a/src/shared/qrceditor/resourceview.cpp b/src/shared/qrceditor/resourceview.cpp index 4ad1ad2900f..c641082d9ff 100644 --- a/src/shared/qrceditor/resourceview.cpp +++ b/src/shared/qrceditor/resourceview.cpp @@ -199,9 +199,8 @@ ResourceView::ResourceView(QUndoStack *history, QWidget *parent) : enableContextMenu(true); } -ResourceView::~ResourceView(void) +ResourceView::~ResourceView() { - } void ResourceView::currentChanged(const QModelIndex ¤t, 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(); } diff --git a/src/shared/qrceditor/resourceview.h b/src/shared/qrceditor/resourceview.h index bd99cacc340..034aef16d7c 100644 --- a/src/shared/qrceditor/resourceview.h +++ b/src/shared/qrceditor/resourceview.h @@ -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); @@ -114,9 +114,9 @@ public: bool defaultAddFileEnabled() const; void findSamePlacePostDeletionModelIndex(int &row, QModelIndex &parent) const; - EntryBackup * removeEntry(const QModelIndex &index); + EntryBackup *removeEntry(const QModelIndex &index); void addFiles(int prefixIndex, const QStringList &fileNames, int cursorFile, - int &firstFile, int &lastFile); + int &firstFile, int &lastFile); void removeFiles(int prefixIndex, int firstFileIndex, int lastFileIndex); QStringList fileNamesToAdd(); QModelIndex addPrefix(); @@ -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; From 30c357b218ca859241b2c524a28d58339a218e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 8 Apr 2009 14:32:10 +0200 Subject: [PATCH 4/5] Removed unused method from CPPEditor --- src/plugins/cppeditor/cppeditor.cpp | 14 -------------- src/plugins/cppeditor/cppeditor.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index c616a7b8a93..8ca868ad75d 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -1073,20 +1073,6 @@ void CPPEditor::unCommentSelection() cursor.endEditBlock(); } -int CPPEditor::endOfNameAtPosition(int pos) -{ - if (pos == -1) - pos = position(); - - QChar chr = characterAt(pos); - - // Skip to the start of a name - while (chr.isLetterOrNumber() || chr == QLatin1Char('_')) - chr = characterAt(++pos); - - return pos; -} - CPPEditor::Link CPPEditor::linkToSymbol(CPlusPlus::Symbol *symbol) { const QString fileName = QString::fromUtf8(symbol->fileName(), diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index bd30f3031f9..ae352b8d6d5 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -127,8 +127,6 @@ private: void createToolBar(CPPEditorEditable *editable); - int endOfNameAtPosition(int pos); - struct Link { Link(const QString &fileName = QString(), From 29a620fa974b6771b2585e4310e0a2e098a1c6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 8 Apr 2009 14:32:31 +0200 Subject: [PATCH 5/5] Made font of search results match text editor font Before it would use Courier on all platforms, which didn't always look nice. Now it uses the configured text editor font. The file paths are now also normal size, at least personally I don't see why they should use a larger font. --- .../find/searchresulttreeitemdelegate.cpp | 12 +++--- src/plugins/find/searchresulttreeitemroles.h | 4 +- src/plugins/find/searchresulttreemodel.cpp | 20 +++++----- src/plugins/find/searchresulttreemodel.h | 12 ++++-- src/plugins/find/searchresulttreeview.cpp | 8 +++- src/plugins/find/searchresulttreeview.h | 2 + src/plugins/find/searchresultwindow.cpp | 37 +++++++++++-------- src/plugins/find/searchresultwindow.h | 4 +- src/plugins/texteditor/texteditorplugin.cpp | 16 +++++++- src/plugins/texteditor/texteditorplugin.h | 6 +++ 10 files changed, 80 insertions(+), 41 deletions(-) diff --git a/src/plugins/find/searchresulttreeitemdelegate.cpp b/src/plugins/find/searchresulttreeitemdelegate.cpp index 533b47e5c91..d72ca5c2b0f 100644 --- a/src/plugins/find/searchresulttreeitemdelegate.cpp +++ b/src/plugins/find/searchresulttreeitemdelegate.cpp @@ -72,7 +72,7 @@ void SearchResultTreeItemDelegate::paint(QPainter *painter, const QStyleOptionVi } int SearchResultTreeItemDelegate::drawLineNumber(QPainter *painter, const QStyleOptionViewItemV3 &option, - const QModelIndex &index) const + const QModelIndex &index) const { static const int lineNumberAreaHorizontalPadding = 4; const bool isSelected = option.state & QStyle::State_Selected; @@ -90,10 +90,10 @@ int SearchResultTreeItemDelegate::drawLineNumber(QPainter *painter, const QStyle else if (!(option.state & QStyle::State_Enabled)) cg = QPalette::Disabled; - painter->fillRect(lineNumberAreaRect, QBrush(isSelected? - option.palette.brush(cg, QPalette::Highlight):QBrush(qRgb(230, 230, 230)))); - painter->setPen(isSelected? - option.palette.color(cg, QPalette::HighlightedText):Qt::darkGray); + painter->fillRect(lineNumberAreaRect, QBrush(isSelected ? + option.palette.brush(cg, QPalette::Highlight) : QBrush(qRgb(230, 230, 230)))); + painter->setPen(isSelected ? + option.palette.color(cg, QPalette::HighlightedText) : Qt::darkGray); painter->drawText(lineNumberAreaRect.adjusted(0, 0, -lineNumberAreaHorizontalPadding, 0), Qt::AlignRight, QString::number(lineNumber)); @@ -101,7 +101,7 @@ int SearchResultTreeItemDelegate::drawLineNumber(QPainter *painter, const QStyle } void SearchResultTreeItemDelegate::drawMarker(QPainter *painter, const QModelIndex &index, const QString text, - const QRect &rect) const + const QRect &rect) const { const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1; int searchTermStart = index.model()->data(index, ItemDataRoles::SearchTermStartRole).toInt(); diff --git a/src/plugins/find/searchresulttreeitemroles.h b/src/plugins/find/searchresulttreeitemroles.h index fd9450e6c0b..486e7907c6f 100644 --- a/src/plugins/find/searchresulttreeitemroles.h +++ b/src/plugins/find/searchresulttreeitemroles.h @@ -34,7 +34,7 @@ namespace Find { namespace Internal { namespace ItemDataRoles { -enum roles +enum Roles { TypeRole = Qt::UserRole, FileNameRole, @@ -49,6 +49,6 @@ enum roles } // namespace Internal } // namespace Find -} // namespace itemDataRoles +} // namespace ItemDataRoles #endif // SEARCHRESULTTREEITEMROLES_H diff --git a/src/plugins/find/searchresulttreemodel.cpp b/src/plugins/find/searchresulttreemodel.cpp index 0ae10d50594..68beb2afb8f 100644 --- a/src/plugins/find/searchresulttreemodel.cpp +++ b/src/plugins/find/searchresulttreemodel.cpp @@ -37,9 +37,11 @@ using namespace Find::Internal; SearchResultTreeModel::SearchResultTreeModel(QObject *parent) - : QAbstractItemModel(parent), m_lastAppendedResultFile(0) + : QAbstractItemModel(parent) + , m_lastAppendedResultFile(0) { m_rootItem = new SearchResultTreeItem(); + m_textEditorFont = QFont("Courier"); } SearchResultTreeModel::~SearchResultTreeModel() @@ -47,6 +49,11 @@ SearchResultTreeModel::~SearchResultTreeModel() delete m_rootItem; } +void SearchResultTreeModel::setTextEditorFont(const QFont &font) +{ + m_textEditorFont = font; +} + QModelIndex SearchResultTreeModel::index(int row, int column, const QModelIndex &parent) const { @@ -135,7 +142,7 @@ QVariant SearchResultTreeModel::data(const SearchResultTextRow *row, int role) c result = row->rowText().trimmed(); break; case Qt::FontRole: - result = QFont("courier"); + result = m_textEditorFont; break; case ItemDataRoles::ResultLineRole: case Qt::DisplayRole: @@ -179,13 +186,6 @@ QVariant SearchResultTreeModel::data(const SearchResultFile *file, int role) con case Qt::BackgroundRole: result = QColor(qRgb(245, 245, 245)); break; - case Qt::FontRole: - { - QFont font; - font.setPointSize(font.pointSize() + 1); - result = font; - break; - } case Qt::DisplayRole: result = file->fileName() + " (" + QString::number(file->childrenCount()) + ")"; break; @@ -241,7 +241,7 @@ 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) + int searchTermStart, int searchTermLength) { if (!m_lastAppendedResultFile || (m_lastAppendedResultFile->fileName() != fileName)) appendResultFile(fileName); diff --git a/src/plugins/find/searchresulttreemodel.h b/src/plugins/find/searchresulttreemodel.h index 3a1ac87efc7..b4036c0e7b6 100644 --- a/src/plugins/find/searchresulttreemodel.h +++ b/src/plugins/find/searchresulttreemodel.h @@ -31,6 +31,7 @@ #define SEARCHRESULTTREEMODEL_H #include +#include namespace Find { namespace Internal { @@ -47,6 +48,8 @@ public: SearchResultTreeModel(QObject *parent = 0); ~SearchResultTreeModel(); + void setTextEditorFont(const QFont &font); + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex parent(const QModelIndex &child) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -61,10 +64,10 @@ signals: public slots: void clear(); - void appendResultLine(int index, int lineNumber, const QString &rowText, int searchTermStart, - int searchTermLength); - void appendResultLine(int index, const QString &fileName, int lineNumber, const QString &rowText, int searchTermStart, - int searchTermLength); + void appendResultLine(int index, int lineNumber, const QString &rowText, + int searchTermStart, int searchTermLength); + void appendResultLine(int index, const QString &fileName, int lineNumber, const QString &rowText, + int searchTermStart, int searchTermLength); private: void appendResultFile(const QString &fileName); @@ -75,6 +78,7 @@ private: SearchResultTreeItem *m_rootItem; SearchResultFile *m_lastAppendedResultFile; + QFont m_textEditorFont; }; } // namespace Internal diff --git a/src/plugins/find/searchresulttreeview.cpp b/src/plugins/find/searchresulttreeview.cpp index 5b20a763997..b12e3f15885 100644 --- a/src/plugins/find/searchresulttreeview.cpp +++ b/src/plugins/find/searchresulttreeview.cpp @@ -37,7 +37,8 @@ using namespace Find::Internal; SearchResultTreeView::SearchResultTreeView(QWidget *parent) - : QTreeView(parent), m_autoExpandResults(false) + : QTreeView(parent) + , m_autoExpandResults(false) { m_model = new SearchResultTreeModel(this); setModel(m_model); @@ -54,6 +55,11 @@ void SearchResultTreeView::setAutoExpandResults(bool expand) m_autoExpandResults = expand; } +void SearchResultTreeView::setTextEditorFont(const QFont &font) +{ + m_model->setTextEditorFont(font); +} + void SearchResultTreeView::clear() { m_model->clear(); diff --git a/src/plugins/find/searchresulttreeview.h b/src/plugins/find/searchresulttreeview.h index be1420b3438..1fcf03599f4 100644 --- a/src/plugins/find/searchresulttreeview.h +++ b/src/plugins/find/searchresulttreeview.h @@ -44,7 +44,9 @@ class SearchResultTreeView : public QTreeView public: SearchResultTreeView(QWidget *parent = 0); + void setAutoExpandResults(bool expand); + void setTextEditorFont(const QFont &font); signals: void jumpToSearchResult(int index, const QString &fileName, int lineNumber, diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index 323d26bf3ba..19c252a4177 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -82,22 +82,6 @@ SearchResultWindow::~SearchResultWindow() m_items.clear(); } -bool SearchResultWindow::hasFocus() -{ - return m_searchResultTreeView->hasFocus(); -} - -bool SearchResultWindow::canFocus() -{ - return !m_items.isEmpty(); -} - -void SearchResultWindow::setFocus() -{ - if (!m_items.isEmpty()) - m_searchResultTreeView->setFocus(); -} - void SearchResultWindow::visibilityChanged(bool /*visible*/) { } @@ -135,6 +119,27 @@ int SearchResultWindow::numberOfResults() const return m_searchResultTreeView->model()->rowCount(); } +bool SearchResultWindow::hasFocus() +{ + return m_searchResultTreeView->hasFocus(); +} + +bool SearchResultWindow::canFocus() +{ + return !m_items.isEmpty(); +} + +void SearchResultWindow::setFocus() +{ + if (!m_items.isEmpty()) + m_searchResultTreeView->setFocus(); +} + +void SearchResultWindow::setTextEditorFont(const QFont &font) +{ + m_searchResultTreeView->setTextEditorFont(font); +} + void SearchResultWindow::handleJumpToSearchResult(int index, const QString &fileName, int lineNumber, int searchTermStart, int searchTermLength) { diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h index a6f4b705a98..da371971cf7 100644 --- a/src/plugins/find/searchresultwindow.h +++ b/src/plugins/find/searchresultwindow.h @@ -75,11 +75,13 @@ public: bool canFocus(); void setFocus(); + void setTextEditorFont(const QFont &font); + public slots: void clearContents(); void showNoMatchesFound(); ResultWindowItem *addResult(const QString &fileName, int lineNumber, const QString &lineText, - int searchTermStart, int searchTermLength); + int searchTermStart, int searchTermLength); private slots: void handleExpandCollapseToolButton(bool checked); diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 12e3ef92825..d1e4ce5c8fd 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -63,7 +64,8 @@ TextEditorPlugin::TextEditorPlugin() : m_settings(0), m_wizard(0), m_editorFactory(0), - m_lineNumberFilter(0) + m_lineNumberFilter(0), + m_searchResultWindow(0) { QTC_ASSERT(!m_instance, return); m_instance = this; @@ -137,6 +139,13 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe void TextEditorPlugin::extensionsInitialized() { m_editorFactory->actionHandler()->initializeActions(); + + m_searchResultWindow = ExtensionSystem::PluginManager::instance()->getObject(); + + connect(m_settings, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)), + this, SLOT(updateSearchResultsFont(TextEditor::FontSettings))); + + updateSearchResultsFont(m_settings->fontSettings()); } void TextEditorPlugin::initializeEditor(PlainTextEditor *editor) @@ -155,5 +164,10 @@ void TextEditorPlugin::invokeCompletion() editor->triggerCompletions(); } +void TextEditorPlugin::updateSearchResultsFont(const FontSettings &settings) +{ + if (m_searchResultWindow) + m_searchResultWindow->setTextEditorFont(QFont(settings.family(), settings.fontSize())); +} Q_EXPORT_PLUGIN(TextEditorPlugin) diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h index 73fb4538bb0..17f601dd24c 100644 --- a/src/plugins/texteditor/texteditorplugin.h +++ b/src/plugins/texteditor/texteditorplugin.h @@ -32,6 +32,10 @@ #include +namespace Find { +class SearchResultWindow; +} + namespace TextEditor { class FontSettings; @@ -65,6 +69,7 @@ public: private slots: void invokeCompletion(); + void updateSearchResultsFont(const TextEditor::FontSettings &); private: static TextEditorPlugin *m_instance; @@ -72,6 +77,7 @@ private: TextFileWizard *m_wizard; PlainTextEditorFactory *m_editorFactory; LineNumberFilter *m_lineNumberFilter; + Find::SearchResultWindow *m_searchResultWindow; }; } // namespace Internal