Commit 3ab0a28c authored by con's avatar con
Browse files

Less use of slow methods.

parent 9097149c
......@@ -95,7 +95,7 @@ public:
loop->exec();
futureInterface.reportFinished();
QThreadPool::globalInstance()->reserveThread();
qDeleteAll(watchers.values());
qDeleteAll(watchers);
delete selfWatcher;
delete loop;
}
......@@ -113,8 +113,7 @@ protected:
if (finished.contains(watcher))
finished[watcher] = true;
bool allFinished = true;
const QList<bool> finishedValues = finished.values();
foreach (bool isFinished, finishedValues) {
foreach (bool isFinished, finished) {
if (!isFinished) {
allFinished = false;
break;
......@@ -146,8 +145,7 @@ private:
void updateProgress()
{
int progressSum = 0;
const QList<QFutureWatcher<R> *> watchersValues = watchers.values();
foreach (QFutureWatcher<R> *watcher, watchersValues) {
foreach (QFutureWatcher<R> *watcher, watchers) {
if (watcher->progressMinimum() == watcher->progressMaximum()) {
if (watcher->future().isFinished() && !watcher->future().isCanceled())
progressSum += 100;
......@@ -161,8 +159,7 @@ private:
void updateProgressText()
{
QString text;
const QList<QFutureWatcher<R> *> watchersValues = watchers.values();
foreach (QFutureWatcher<R> *watcher, watchersValues) {
foreach (QFutureWatcher<R> *watcher, watchers) {
if (!watcher->progressText().isEmpty())
text += watcher->progressText() + "\n";
}
......
......@@ -329,7 +329,7 @@ BookmarkManager::~BookmarkManager()
end = m_bookmarksMap.end();
for (it = m_bookmarksMap.begin(); it != end; ++it) {
FileNameBookmarksMap *bookmarks = it.value();
qDeleteAll(bookmarks->values());
qDeleteAll(*bookmarks);
delete bookmarks;
}
}
......
......@@ -34,6 +34,7 @@
#include <coreplugin/inavigationwidgetfactory.h>
#include <QtCore/QAbstractItemModel>
#include <QtCore/QMultiMap>
#include <QtCore/QList>
#include <QtGui/QListView>
#include <QtGui/QPixmap>
......
......@@ -390,8 +390,8 @@ QList<IFile *> FileManager::saveModifiedFiles(const QList<IFile *> &files,
// There can be several FileInterfaces pointing to the same file
// Select one that is not readonly.
if (!(modifiedFilesMap.values().contains(name)
&& file->isReadOnly()))
if (!(modifiedFilesMap.key(name, 0)
&& file->isReadOnly()))
modifiedFilesMap.insert(file, name);
}
}
......
......@@ -194,9 +194,10 @@ void ModeManager::addAction(Command *command, int priority, QMenu *menu)
// Count the number of commands with a higher priority
int index = 0;
foreach (int p, m_actions.values())
foreach (int p, m_actions) {
if (p > priority)
++index;
}
m_actionBar->insertAction(index, command->action(), menu);
}
......
......@@ -316,7 +316,7 @@ void ProgressManagerPrivate::taskFinished()
m_runningTasks.remove(task);
delete task;
if (!m_runningTasks.values().contains(type)) {
if (!m_runningTasks.key(type, 0)) {
emit allTasksFinished(type);
}
}
......
......@@ -68,7 +68,7 @@ SideBar::SideBar(QList<SideBarItem*> itemList,
SideBar::~SideBar()
{
qDeleteAll(m_itemMap.values());
qDeleteAll(m_itemMap);
}
QStringList SideBar::availableItems() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment