[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kipi-plugins] /: code polish
From: Andi Clemens <andi.clemens () googlemail ! com>
Date: 2012-01-01 1:12:31
Message-ID: 20120101011231.CC194A60BB () git ! kde ! org
[Download RAW message or body]
Git commit 5f88108c36c06b073a9dbba365ee5645cce88935 by Andi Clemens.
Committed on 01/01/2012 at 01:53.
Pushed by aclemens into branch 'master'.
code polish
M +1 -1 advancedslideshow/dialogs/slideshowconfig.cpp
M +1 -1 advancedslideshow/widgets/listsounditems.cpp
M +1 -1 common/libkipiplugins/widgets/imageslist.cpp
M +1 -1 expoblending/manager/actionthread.cpp
M +6 -6 panorama/manager/actionthread.cpp
M +1 -1 panorama/manager/cpfindbinary.cpp
M +2 -2 photolayoutseditor/borders/BorderDrawersLoader.cpp
M +1 -1 photolayoutseditor/borders/BordersGroup.cpp
M +2 -2 photolayoutseditor/effects/PhotoEffectsLoader.cpp
M +2 -2 photolayoutseditor/models/LayersModel.cpp
M +2 -2 photolayoutseditor/models/LayersModelItem.cpp
M +5 -5 photolayoutseditor/plugin/photolayoutseditor.cpp
M +2 -2 photolayoutseditor/threads/ImageLoadingThread.cpp
M +1 -1 photolayoutseditor/undo/UndoRemoveItem.cpp
M +4 -4 photolayoutseditor/widgets/canvas/Canvas.cpp
M +4 -4 photolayoutseditor/widgets/canvas/CropWidgetItem.cpp
M +2 -2 photolayoutseditor/widgets/canvas/RotationWidgetItem.cpp
M +4 -4 photolayoutseditor/widgets/canvas/ScalingWidgetItem.cpp
M +21 -21 photolayoutseditor/widgets/canvas/Scene.cpp
M +1 -1 photolayoutseditor/widgets/items/AbstractPhoto.cpp
M +3 -3 photolayoutseditor/widgets/items/TextItem.cpp
M +2 -2 photolayoutseditor/widgets/tools/ToolsDockWidget.cpp
M +1 -1 photolayoutseditor/widgets/tools/ZoomTool.cpp
M +2 -2 sendimages/sendimages.cpp
M +2 -2 vkontakte/vkwindow.cpp
http://commits.kde.org/kipi-plugins/5f88108c36c06b073a9dbba365ee5645cce88935
diff --git a/advancedslideshow/dialogs/slideshowconfig.cpp \
b/advancedslideshow/dialogs/slideshowconfig.cpp index 006828e..37b5139 100644
--- a/advancedslideshow/dialogs/slideshowconfig.cpp
+++ b/advancedslideshow/dialogs/slideshowconfig.cpp
@@ -216,7 +216,7 @@ void SlideShowConfig::readSettings()
// load and check playlist files, if valid, add to tracklist widget
QStringList playlistFiles = soundGrp.readEntry("Tracks", QStringList());
- foreach (const QString& playlistFile, playlistFiles)
+ foreach(const QString& playlistFile, playlistFiles)
{
KUrl file(playlistFile);
QFileInfo fi(file.toLocalFile());
diff --git a/advancedslideshow/widgets/listsounditems.cpp \
b/advancedslideshow/widgets/listsounditems.cpp index 9f35732..f84a641 100644
--- a/advancedslideshow/widgets/listsounditems.cpp
+++ b/advancedslideshow/widgets/listsounditems.cpp
@@ -155,7 +155,7 @@ void ListSoundItems::dropEvent(QDropEvent* e)
QList<QUrl> list = e->mimeData()->urls();
KUrl::List urls;
- foreach (const QUrl &url, list)
+ foreach(const QUrl &url, list)
{
QFileInfo fi(url.toLocalFile());
if (fi.isFile() && fi.exists())
diff --git a/common/libkipiplugins/widgets/imageslist.cpp \
b/common/libkipiplugins/widgets/imageslist.cpp index 01b47d6..bf89948 100644
--- a/common/libkipiplugins/widgets/imageslist.cpp
+++ b/common/libkipiplugins/widgets/imageslist.cpp
@@ -413,7 +413,7 @@ void ImagesListView::dropEvent(QDropEvent* e)
QList<QUrl> list = e->mimeData()->urls();
KUrl::List urls;
- foreach(const QUrl & url, list)
+ foreach(const QUrl& url, list)
{
QFileInfo fi(url.path());
diff --git a/expoblending/manager/actionthread.cpp \
b/expoblending/manager/actionthread.cpp index 418e5cd..9ba14cc 100644
--- a/expoblending/manager/actionthread.cpp
+++ b/expoblending/manager/actionthread.cpp
@@ -252,7 +252,7 @@ void ActionThread::cancel()
if (d->alignProcess)
d->alignProcess->kill();
- foreach (QPointer<KDcraw> rawProcess, d->rawProcesses)
+ foreach(QPointer<KDcraw> rawProcess, d->rawProcesses)
{
if (rawProcess)
{
diff --git a/panorama/manager/actionthread.cpp b/panorama/manager/actionthread.cpp
index a606ef6..31f4cc8 100644
--- a/panorama/manager/actionthread.cpp
+++ b/panorama/manager/actionthread.cpp
@@ -248,7 +248,7 @@ void ActionThread::cancel()
if (d->makeProcess)
d->makeProcess->kill();
- foreach (QPointer<KDcraw> rawProcess, d->rawProcesses)
+ foreach(QPointer<KDcraw> rawProcess, d->rawProcesses)
{
if (rawProcess)
{
@@ -256,7 +256,7 @@ void ActionThread::cancel()
}
}
- foreach (KProcess* makeProcess, d->makeProcesses)
+ foreach(KProcess* makeProcess, d->makeProcesses)
{
if (makeProcess)
{
@@ -687,7 +687,7 @@ bool ActionThread::computePanoramaPreview(KUrl& ptoUrl, KUrl& \
previewUrl, const
KExiv2 metaPreview(preProcessedUrlsMap.begin().value().previewUrl.toLocalFile());
double scalingFactor = ((double) metaPreview.getPixelSize().width()) / ((double) \
metaOrig.getPixelSize().width());
- foreach (const QString& line, pto)
+ foreach(const QString& line, pto)
{
if (line.isEmpty())
{
@@ -700,7 +700,7 @@ bool ActionThread::computePanoramaPreview(KUrl& ptoUrl, KUrl& \
previewUrl, const if (line[0] == 'p')
{
tmp.clear();
- foreach (const QString& p, parameters)
+ foreach(const QString& p, parameters)
{
if (p[0] == 'w' || p[0] == 'h')
{
@@ -729,7 +729,7 @@ bool ActionThread::computePanoramaPreview(KUrl& ptoUrl, KUrl& \
previewUrl, const tmp.clear();
QStringList realParameters;
bool nRead = false;
- foreach (const QString& p, parameters)
+ foreach(const QString& p, parameters)
{
if (p[0] != 'n')
{
@@ -748,7 +748,7 @@ bool ActionThread::computePanoramaPreview(KUrl& ptoUrl, KUrl& \
previewUrl, const realParameters << p;
}
}
- foreach (const QString& p, realParameters)
+ foreach(const QString& p, realParameters)
{
if (p[0] == 'w')
{
diff --git a/panorama/manager/cpfindbinary.cpp b/panorama/manager/cpfindbinary.cpp
index f9f84a0..3823f54 100644
--- a/panorama/manager/cpfindbinary.cpp
+++ b/panorama/manager/cpfindbinary.cpp
@@ -58,7 +58,7 @@ void CPFindBinary::checkSystem()
QStringList lines = stdOut.split('\n');
dev = false;
- foreach (QString line, lines)
+ foreach(QString line, lines)
{
kDebug() << path() << " help header line: \n" << line;
m_version.clear();
diff --git a/photolayoutseditor/borders/BorderDrawersLoader.cpp \
b/photolayoutseditor/borders/BorderDrawersLoader.cpp index 3d975c1..866167b 100644
--- a/photolayoutseditor/borders/BorderDrawersLoader.cpp
+++ b/photolayoutseditor/borders/BorderDrawersLoader.cpp
@@ -71,7 +71,7 @@ void \
BorderDrawersLoader::registerDrawer(BorderDrawerFactoryInterface * factory) {
factory->setParent(instance());
QStringList names = factory->drawersNames().split(';', QString::SkipEmptyParts);
- foreach (QString name, names)
+ foreach(QString name, names)
instance()->d->factories.insert(name, factory);
}
@@ -236,7 +236,7 @@ QWidget * BorderDrawersLoader::createEditor(BorderDrawerInterface \
* drawer, bool }
property = variantManager->addProperty(metaProperty.type(), \
propertyName);
variantManager->setValue(property, metaProperty.read(drawer));
- foreach (QtProperty * p, property->subProperties())
+ foreach(QtProperty* p, property->subProperties())
p->setEnabled(false);
}
}
diff --git a/photolayoutseditor/borders/BordersGroup.cpp \
b/photolayoutseditor/borders/BordersGroup.cpp index 43019f4..da5926c 100644
--- a/photolayoutseditor/borders/BordersGroup.cpp
+++ b/photolayoutseditor/borders/BordersGroup.cpp
@@ -76,7 +76,7 @@ void BordersGroup::calculateShape()
{
QPainterPath photoShape = \
graphicsItem()->itemOpaqueArea();//graphicsItem()->transform().map(graphicsItem()->itemOpaqueArea());
d->shape = QPainterPath();
- foreach (BorderDrawerInterface * drawer, d->borders)
+ foreach(BorderDrawerInterface* drawer, d->borders)
{
if (drawer)
d->shape = d->shape.united( drawer->path(photoShape) );
diff --git a/photolayoutseditor/effects/PhotoEffectsLoader.cpp \
b/photolayoutseditor/effects/PhotoEffectsLoader.cpp index 2b24ffc..0e7b00c 100644
--- a/photolayoutseditor/effects/PhotoEffectsLoader.cpp
+++ b/photolayoutseditor/effects/PhotoEffectsLoader.cpp
@@ -82,7 +82,7 @@ bool PhotoEffectsLoader::registerEffect(AbstractPhotoEffectFactory \
* effectFacto QString effectName = effectFactory->effectName();
QStringList names = effectName.split(';', QString::SkipEmptyParts);
bool result = true;
- foreach (QString name, names)
+ foreach(QString name, names)
result &= (registeredEffects.insert(name, effectFactory) != \
registeredEffects.end()); effectFactory->setParent(instance());
return result;
@@ -178,7 +178,7 @@ QtAbstractPropertyBrowser * \
PhotoEffectsLoader::propertyBrowser(AbstractPhotoEff }
property = variantManager->addProperty(metaProperty.type(), \
propertyName);
variantManager->setValue(property, metaProperty.read(effect));
- foreach (QtProperty * p, property->subProperties())
+ foreach(QtProperty* p, property->subProperties())
p->setEnabled(false);
}
}
diff --git a/photolayoutseditor/models/LayersModel.cpp \
b/photolayoutseditor/models/LayersModel.cpp index c19e9bc..4de7a95 100644
--- a/photolayoutseditor/models/LayersModel.cpp
+++ b/photolayoutseditor/models/LayersModel.cpp
@@ -192,7 +192,7 @@ bool LayersModel::appendItems(const QList<AbstractPhoto*> & \
items, const QModelI
bool LayersModel::insertItems(const QList<AbstractPhoto*> & items, int position, \
const QModelIndex & parent) {
- foreach(AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
if (!insertItem(item, position++, parent))
return false;
return true;
@@ -228,7 +228,7 @@ QModelIndexList LayersModel::itemsToIndexes(const \
QList<AbstractPhoto*> & items) {
QModelIndexList indexes;
QModelIndex temp;
- foreach(AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
{
temp = findIndex(item);
if (temp.isValid())
diff --git a/photolayoutseditor/models/LayersModelItem.cpp \
b/photolayoutseditor/models/LayersModelItem.cpp index 92fed27..7e2f56b 100644
--- a/photolayoutseditor/models/LayersModelItem.cpp
+++ b/photolayoutseditor/models/LayersModelItem.cpp
@@ -53,7 +53,7 @@ LayersModelItem::LayersModelItem(AbstractPhoto * photo, \
LayersModelItem * parent
LayersModelItem::~LayersModelItem()
{
- foreach (LayersModelItem * child, childItems)
+ foreach(LayersModelItem* child, childItems)
delete child;
}
@@ -214,7 +214,7 @@ bool LayersModelItem::moveChildren(int sourcePosition, int count, \
LayersModelIte void LayersModelItem::refreshZValues()
{
int i = childItems.count();
- foreach (LayersModelItem * item, childItems)
+ foreach(LayersModelItem* item, childItems)
{
AbstractPhoto * photo = item->photo();
if (photo)
diff --git a/photolayoutseditor/plugin/photolayoutseditor.cpp \
b/photolayoutseditor/plugin/photolayoutseditor.cpp index 3369e8d..88af6d0 100644
--- a/photolayoutseditor/plugin/photolayoutseditor.cpp
+++ b/photolayoutseditor/plugin/photolayoutseditor.cpp
@@ -240,7 +240,7 @@ void PhotoLayoutsEditor::setupActions()
//------------------------------------------------------------------------
d->openRecentFilesMenu = KStandardAction::openRecent(this, SLOT(open(KUrl)), \
actionCollection()); KUrl::List urls = PLEConfigSkeleton::recentFiles();
- foreach (KUrl url, urls)
+ foreach(KUrl url, urls)
d->openRecentFilesMenu->addUrl(url);
connect(d->openRecentFilesMenu, SIGNAL(recentListCleared()), this, \
SLOT(clearRecentList())); actionCollection()->addAction("open_recent", \
d->openRecentFilesMenu); @@ -723,13 +723,13 @@ void PhotoLayoutsEditor::loadEffects()
PhotoEffectsLoader::registerEffect( stdEffects );
const KService::List offers = \
KServiceTypeTrader::self()->query("PhotoLayoutsEditor/EffectPlugin");
- foreach (const KService::Ptr& service, offers)
+ foreach(const KService::Ptr& service, offers)
{
if (service)
d->effectsServiceMap[service->name()] = service;
}
- foreach (const QString & name, d->effectsServiceMap.keys())
+ foreach(const QString& name, d->effectsServiceMap.keys())
{
KService::Ptr service = d->effectsServiceMap.value(name);
AbstractPhotoEffectFactory * plugin;
@@ -764,13 +764,13 @@ void PhotoLayoutsEditor::loadBorders()
BorderDrawersLoader::registerDrawer( stdBorders );
const KService::List offers = \
KServiceTypeTrader::self()->query("PhotoLayoutsEditor/BorderPlugin");
- foreach (const KService::Ptr& service, offers)
+ foreach(const KService::Ptr& service, offers)
{
if (service)
d->bordersServiceMap[service->name()] = service;
}
- foreach (const QString & name, d->bordersServiceMap.keys())
+ foreach(const QString& name, d->bordersServiceMap.keys())
{
KService::Ptr service = d->bordersServiceMap.value(name);
BorderDrawerFactoryInterface * plugin;
diff --git a/photolayoutseditor/threads/ImageLoadingThread.cpp \
b/photolayoutseditor/threads/ImageLoadingThread.cpp index 5fadd24..4688032 100644
--- a/photolayoutseditor/threads/ImageLoadingThread.cpp
+++ b/photolayoutseditor/threads/ImageLoadingThread.cpp
@@ -99,7 +99,7 @@ void ImageLoadingThread::run()
// Calculating reading progress
d->m_loaded_bytes = d->m_size = 0;
- foreach (KUrl url, urls)
+ foreach(KUrl url, urls)
{
QFile f(url.path());
f.open(QIODevice::ReadOnly);
@@ -116,7 +116,7 @@ void ImageLoadingThread::run()
goto finish_thread;
// Reading
- foreach (KUrl url, urls)
+ foreach(KUrl url, urls)
{
ProgressEvent * startEvent = new ProgressEvent(this);
startEvent->setData(ProgressEvent::Init, 0);
diff --git a/photolayoutseditor/undo/UndoRemoveItem.cpp \
b/photolayoutseditor/undo/UndoRemoveItem.cpp index cb5e553..c029dfe 100644
--- a/photolayoutseditor/undo/UndoRemoveItem.cpp
+++ b/photolayoutseditor/undo/UndoRemoveItem.cpp
@@ -95,7 +95,7 @@ void UndoRemoveItem::appendChild(AbstractPhoto * item, const \
QModelIndex & paren // Sort using z-Values (z-Value == models row)
qSort(items.begin(), items.end(), UndoRemoveItem::compareGraphicsItems);
int i = 0;
- foreach (QGraphicsItem * childItem, items)
+ foreach(QGraphicsItem* childItem, items)
{
AbstractPhoto * photo = dynamic_cast<AbstractPhoto*>(childItem);
if (photo)
diff --git a/photolayoutseditor/widgets/canvas/Canvas.cpp \
b/photolayoutseditor/widgets/canvas/Canvas.cpp index 1610af8..8f686b3 100644
--- a/photolayoutseditor/widgets/canvas/Canvas.cpp
+++ b/photolayoutseditor/widgets/canvas/Canvas.cpp
@@ -508,7 +508,7 @@ void Canvas::removeSelectedRows()
{
QList<AbstractPhoto*> items;
QModelIndexList selectedIndexes = selectionModel()->selectedRows();
- foreach (QModelIndex index, selectedIndexes)
+ foreach(QModelIndex index, selectedIndexes)
items << static_cast<LayersModelItem*>(index.internalPointer())->photo();
m_scene->removeItems(items);
}
@@ -521,7 +521,7 @@ void Canvas::selectionChanged()
QList<AbstractPhoto*> selectedItems = m_scene->selectedItems();
QModelIndexList oldSelected = selectionModel()->selectedIndexes();
QModelIndexList newSelected = model()->itemsToIndexes(selectedItems);
- foreach (QModelIndex index, oldSelected)
+ foreach(QModelIndex index, oldSelected)
{
if (!newSelected.contains(index) && index.column() == \
LayersModelItem::NameString)
selectionModel()->select(index, QItemSelectionModel::Rows | \
QItemSelectionModel::Deselect); @@ -561,7 +561,7 @@ void \
Canvas::selectionChanged(const QItemSelection & newSelection, const QItemSe const \
QModelIndexList & oldSel = oldSelection.indexes(); const QModelIndexList & newSel = \
newSelection.indexes();
QSet<QModelIndex> deselected = oldSel.toSet().subtract(newSel.toSet());
- foreach (QModelIndex index, deselected)
+ foreach(QModelIndex index, deselected)
{
if (index.column() != LayersModelItem::NameString)
continue;
@@ -570,7 +570,7 @@ void Canvas::selectionChanged(const QItemSelection & \
newSelection, const QItemSe temp->photo()->setSelected(false);
}
QSet<QModelIndex> selected = newSel.toSet().subtract(oldSel.toSet());
- foreach (QModelIndex index, selected)
+ foreach(QModelIndex index, selected)
{
if (index.column() != LayersModelItem::NameString)
continue;
diff --git a/photolayoutseditor/widgets/canvas/CropWidgetItem.cpp \
b/photolayoutseditor/widgets/canvas/CropWidgetItem.cpp index f529e03..f1c860b 100644
--- a/photolayoutseditor/widgets/canvas/CropWidgetItem.cpp
+++ b/photolayoutseditor/widgets/canvas/CropWidgetItem.cpp
@@ -248,7 +248,7 @@ void CropWidgetItem::keyPressEvent(QKeyEvent * event)
PhotoLayoutsEditor::instance()->beginUndoCommandGroup(i18n("Crop \
items")); }
- foreach (AbstractPhoto * item, d->m_items)
+ foreach(AbstractPhoto* item, d->m_items)
item->setCropShape( this->mapToItem(item, p) );
if (commandGroupOpened)
@@ -442,7 +442,7 @@ void CropWidgetItem::setItems(const QList<AbstractPhoto*> & \
items) {
d->m_items = items;
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
connect(item, SIGNAL(changed()), this, SLOT(updateShapes()));
this->updateShapes();
@@ -451,11 +451,11 @@ void CropWidgetItem::setItems(const QList<AbstractPhoto*> & \
items) void CropWidgetItem::updateShapes()
{
d->m_crop_shape = QPainterPath();
- foreach (AbstractPhoto * item, d->m_items)
+ foreach(AbstractPhoto* item, d->m_items)
d->m_crop_shape += this->mapFromItem(item, item->itemDrawArea());
QPainterPath temp;
- foreach (AbstractPhoto * item, d->m_items)
+ foreach(AbstractPhoto* item, d->m_items)
temp += this->mapFromItem(item, item->itemOpaqueArea());
d->m_rect = temp.boundingRect();
diff --git a/photolayoutseditor/widgets/canvas/RotationWidgetItem.cpp \
b/photolayoutseditor/widgets/canvas/RotationWidgetItem.cpp index c2bce66..8ea15fd \
100644
--- a/photolayoutseditor/widgets/canvas/RotationWidgetItem.cpp
+++ b/photolayoutseditor/widgets/canvas/RotationWidgetItem.cpp
@@ -331,7 +331,7 @@ void RotationWidgetItem::mouseMoveEvent(QGraphicsSceneMouseEvent \
* event)
this->scene()->invalidate(d->itemToViewportRect(refreshRect, \
event->widget()));
// Rotate items
- foreach (AbstractPhoto * item, d->m_items)
+ foreach(AbstractPhoto* item, d->m_items)
{
RotateItemCommand * rotCom = d->rotate_commands[item];
if (!rotCom)
@@ -363,7 +363,7 @@ void RotationWidgetItem::setItems(const QList<AbstractPhoto*> & \
items) return;
QPainterPath itemsPath;
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
itemsPath += this->mapFromItem(item, item->shape());
initRotation(itemsPath, items.at(0)->boundingRect().center() * \
items.at(0)->transform()); setPos(itemsPath.boundingRect().center());
diff --git a/photolayoutseditor/widgets/canvas/ScalingWidgetItem.cpp \
b/photolayoutseditor/widgets/canvas/ScalingWidgetItem.cpp index 8160e61..e281acb \
100644
--- a/photolayoutseditor/widgets/canvas/ScalingWidgetItem.cpp
+++ b/photolayoutseditor/widgets/canvas/ScalingWidgetItem.cpp
@@ -374,7 +374,7 @@ void ScalingWidgetItem::mouseMoveEvent(QGraphicsSceneMouseEvent * \
event) temp.translate(dif);
d->m_handlers_path.translate(dif);
dif = (event->scenePos()) - (event->lastScenePos());
- foreach (AbstractPhoto * item, d->m_items)
+ foreach(AbstractPhoto* item, d->m_items)
{
MoveItemCommand * moveCom = d->move_commands[item];
if (!moveCom)
@@ -442,7 +442,7 @@ void ScalingWidgetItem::mouseMoveEvent(QGraphicsSceneMouseEvent * \
event)
if (!sc.isIdentity())
{
- foreach(AbstractPhoto * item, d->m_items)
+ foreach(AbstractPhoto* item, d->m_items)
{
QRectF beforeScene = item->mapRectToScene(item->boundingRect());
item->setTransform( item->transform() * sc );
@@ -516,7 +516,7 @@ void ScalingWidgetItem::setScaleItems(const QList<AbstractPhoto*> \
& items) {
d->m_items = items;
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
connect(item, SIGNAL(changed()), this, SLOT(updateShapes()));
this->updateShapes();
@@ -525,7 +525,7 @@ void ScalingWidgetItem::setScaleItems(const QList<AbstractPhoto*> \
& items) void ScalingWidgetItem::updateShapes()
{
d->m_crop_shape = QPainterPath();
- foreach (AbstractPhoto * item, d->m_items)
+ foreach(AbstractPhoto* item, d->m_items)
d->m_crop_shape += this->mapFromItem(item, item->opaqueArea());
d->m_rect = d->m_crop_shape.boundingRect();
diff --git a/photolayoutseditor/widgets/canvas/Scene.cpp \
b/photolayoutseditor/widgets/canvas/Scene.cpp index 2d0625a..0f1ba2c 100644
--- a/photolayoutseditor/widgets/canvas/Scene.cpp
+++ b/photolayoutseditor/widgets/canvas/Scene.cpp
@@ -116,7 +116,7 @@ class KIPIPhotoLayoutsEditor::ScenePrivate
{
QList<QGraphicsItem*> items = itemsAtPosition(scenePos, widget);
QList<AbstractItemInterface*> r;
- foreach (QGraphicsItem * i, items)
+ foreach(QGraphicsItem* i, items)
{
AbstractItemInterface * iface = dynamic_cast<AbstractItemInterface*>(i);
if (iface)
@@ -185,7 +185,7 @@ class KIPIPhotoLayoutsEditor::ScenePrivate
void deselectSelected()
{
m_selected_items_all_movable = true;
- foreach (AbstractItemInterface * photo, m_selected_items.keys())
+ foreach(AbstractItemInterface* photo, m_selected_items.keys())
{
photo->setSelected(false);
if (photo->hasFocus())
@@ -296,13 +296,13 @@ class KIPIPhotoLayoutsEditor::AddItemsCommand : public \
QUndoCommand {
if (done)
return;
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
item->deleteLater();
items.clear();
}
virtual void redo()
{
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
scene->QGraphicsScene::addItem(item);
scene->model()->insertItems(items, position);
done = true;
@@ -310,7 +310,7 @@ class KIPIPhotoLayoutsEditor::AddItemsCommand : public \
QUndoCommand virtual void undo()
{
QRectF region;
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
{
region = region.united( item->mapRectToScene(item->boundingRect()) \
); if (item->isSelected())
@@ -447,7 +447,7 @@ class KIPIPhotoLayoutsEditor::RemoveItemsCommand : public \
QUndoCommand // Sort using z-Values (z-Value == models row)
qSort(items.begin(), items.end(), \
KIPIPhotoLayoutsEditor::RemoveItemsCommand::compareGraphicsItems); int i = 0;
- foreach (QGraphicsItem * childItem, items)
+ foreach(QGraphicsItem* childItem, items)
{
AbstractPhoto * photo = dynamic_cast<AbstractPhoto*>(childItem);
if (photo)
@@ -471,7 +471,7 @@ public:
QUndoCommand(i18n("Crop item(s)"), parent)
{
qDebug() << "scene crop shape" << path.boundingRect();
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
data.insert(item, item->mapFromScene(path));
}
virtual void redo()
@@ -562,7 +562,7 @@ void Scene::addItem(AbstractPhoto * item)
QModelIndexList selectedIndexes = d->selection_model->selectedIndexes();
unsigned insertionRow = -1;
- foreach (QModelIndex index, selectedIndexes)
+ foreach(QModelIndex index, selectedIndexes)
{
if (index.column() != LayersModelItem::NameString)
continue;
@@ -582,7 +582,7 @@ void Scene::addItems(const QList<AbstractPhoto*> & items)
{
// Prevent multiple addition of the item
QList<AbstractPhoto*> tempItems;
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
{
if (item->scene() == this && this->model()->findIndex(item).isValid())
continue;
@@ -593,7 +593,7 @@ void Scene::addItems(const QList<AbstractPhoto*> & items)
QModelIndexList selectedIndexes = d->selection_model->selectedIndexes();
unsigned insertionRow = -1;
- foreach (QModelIndex index, selectedIndexes)
+ foreach(QModelIndex index, selectedIndexes)
{
if (index.column() != LayersModelItem::NameString)
continue;
@@ -609,7 +609,7 @@ void Scene::addItems(const QList<AbstractPhoto*> & items)
if (items.count() > 1)
parent = new QUndoCommand(i18n("Add item(s)"));
- foreach (AbstractPhoto * item, tempItems)
+ foreach(AbstractPhoto* item, tempItems)
command = new AddItemsCommand(item, insertionRow++, this, parent);
if (parent)
@@ -636,7 +636,7 @@ void Scene::removeItems(const QList<AbstractPhoto *> & items)
QUndoCommand * parent = 0;
if (items.count() > 1)
parent = new QUndoCommand("Remove item(s)");
- foreach (AbstractPhoto * item, items)
+ foreach(AbstractPhoto* item, items)
command = new RemoveItemsCommand(item, this, parent);
if (parent)
PLE_PostUndoCommand(parent);
@@ -730,7 +730,7 @@ void Scene::mousePressEvent(QGraphicsSceneMouseEvent * event)
d->m_pressed_object = d->m_pressed_item = 0;
QList<AbstractItemInterface*> itemsList = d->itemsAt(event->scenePos(), \
event->widget());
- foreach (AbstractItemInterface * i, itemsList)
+ foreach(AbstractItemInterface* i, itemsList)
{
// Get pressed item
d->m_pressed_object = i;
@@ -835,7 +835,7 @@ void Scene::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
d->m_selected_items_path.translate(-difference);
difference = distance - difference;
d->m_selected_items_path.translate(difference);
- foreach (AbstractItemInterface * item, d->m_selected_items.keys())
+ foreach(AbstractItemInterface* item, d->m_selected_items.keys())
item->moveBy(difference.x(), difference.y());
}
}
@@ -1031,7 +1031,7 @@ void Scene::dropEvent(QGraphicsSceneDragDropEvent * event)
{
QList<QUrl> urls = mimeData->urls();
KUrl::List list;
- foreach (QUrl url, urls)
+ foreach(QUrl url, urls)
list << KUrl(url);
ImageLoadingThread * ilt = new ImageLoadingThread(this);
@@ -1306,7 +1306,7 @@ QDomDocument Scene::toSvg(ProgressObserver * observer)
//--------------------------------------------------------
int i = 1;
- foreach (QGraphicsItem * item, itemsList)
+ foreach(QGraphicsItem* item, itemsList)
{
AbstractPhoto * photo = dynamic_cast<AbstractPhoto*>(item);
if (photo)
@@ -1421,7 +1421,7 @@ QList<AbstractPhoto*> Scene::selectedItems() const
{
QList<AbstractPhoto*> result;
const QList<QGraphicsItem*> & list = QGraphicsScene::selectedItems();
- foreach (QGraphicsItem * item, list)
+ foreach(QGraphicsItem* item, list)
result << static_cast<AbstractPhoto*>(item);
return result;
}
@@ -1429,13 +1429,13 @@ QList<AbstractPhoto*> Scene::selectedItems() const
//#####################################################################################################
void Scene::updateSelection()
{
- foreach (AbstractPhoto * item, d->m_selected_items.keys())
+ foreach(AbstractPhoto* item, d->m_selected_items.keys())
if (!item->isSelected())
d->m_selected_items.remove(item);
d->m_selected_items_path = QPainterPath();
QList<AbstractPhoto*> itemsList = this->selectedItems();
- foreach (AbstractPhoto * item, itemsList)
+ foreach(AbstractPhoto* item, itemsList)
{
if (d->m_selection_filters.count() && !d->m_selection_filters.contains( \
item->metaObject()->className() )) {
@@ -1479,7 +1479,7 @@ void Scene::imageLoaded(const KUrl & url, const QImage & image)
void Scene::calcSelectionBoundingRect()
{
d->m_selected_items_path = QPainterPath();
- foreach (AbstractItemInterface * item, d->m_selected_items.keys())
+ foreach(AbstractItemInterface* item, d->m_selected_items.keys())
d->m_selected_items_path = \
d->m_selected_items_path.united(item->mapToScene(item->shape())); }
@@ -1503,7 +1503,7 @@ bool Scene::canDecode(const QMimeData * mimeData)
return true;
QList<QUrl> urls = mimeData->urls();
- foreach (QUrl url, urls)
+ foreach(QUrl url, urls)
{
QImageReader ir(url.toLocalFile());
if (!ir.canRead())
diff --git a/photolayoutseditor/widgets/items/AbstractPhoto.cpp \
b/photolayoutseditor/widgets/items/AbstractPhoto.cpp index 07d082f..c52968d 100644
--- a/photolayoutseditor/widgets/items/AbstractPhoto.cpp
+++ b/photolayoutseditor/widgets/items/AbstractPhoto.cpp
@@ -149,7 +149,7 @@ QString AbstractPhoto::uniqueName(const QString & name)
return result;
int nameNumber = 1;
QList<QGraphicsItem*> items = scene->items();
- foreach (QGraphicsItem * item, items)
+ foreach(QGraphicsItem* item, items)
{
AbstractPhoto * myItem = dynamic_cast<AbstractPhoto*>(item);
if (!myItem || myItem == this || myItem->name().isEmpty())
diff --git a/photolayoutseditor/widgets/items/TextItem.cpp \
b/photolayoutseditor/widgets/items/TextItem.cpp index 933bc79..0798725 100644
--- a/photolayoutseditor/widgets/items/TextItem.cpp
+++ b/photolayoutseditor/widgets/items/TextItem.cpp
@@ -716,7 +716,7 @@ void TextItem::refreshItem()
int maxBearing = 0;
int maxWidth = 0;
const int lineSpacing = m_metrics.lineSpacing();
- foreach (QString string, d->m_string_list)
+ foreach(QString string, d->m_string_list)
{
if (string.length())
{
@@ -758,7 +758,7 @@ QtAbstractPropertyBrowser * TextItem::propertyBrowser()
TextColorChangeListener * colorListener = new TextColorChangeListener(this);
colorListener->connect(browser, SIGNAL(destroyed()), SLOT(deleteLater()));
colorListener->connect(colorManager, SIGNAL(propertyChanged(QtProperty*)), \
SLOT(propertyChanged(QtProperty*)));
- foreach (QtProperty * p, colorProperty->subProperties())
+ foreach(QtProperty* p, colorProperty->subProperties())
p->setEnabled(false);
// Font
@@ -771,7 +771,7 @@ QtAbstractPropertyBrowser * TextItem::propertyBrowser()
TextFontChangeListener * fontListener = new TextFontChangeListener(this);
fontListener->connect(browser, SIGNAL(destroyed()), SLOT(deleteLater()));
fontListener->connect(fontManager, SIGNAL(propertyChanged(QtProperty*)), \
SLOT(propertyChanged(QtProperty*)));
- foreach (QtProperty * p, fontProperty->subProperties())
+ foreach(QtProperty* p, fontProperty->subProperties())
p->setEnabled(false);
return browser;
diff --git a/photolayoutseditor/widgets/tools/ToolsDockWidget.cpp \
b/photolayoutseditor/widgets/tools/ToolsDockWidget.cpp index 992b6ad..4821988 100644
--- a/photolayoutseditor/widgets/tools/ToolsDockWidget.cpp
+++ b/photolayoutseditor/widgets/tools/ToolsDockWidget.cpp
@@ -471,12 +471,12 @@ void ToolsDockWidget::resizeEvent(QResizeEvent * event)
<< m_effects_button
<< m_tool_border;
- foreach (QWidget * w, l)
+ foreach(QWidget* w, l)
d->formLayout->removeWidget(w);
int width = 0;
int col = 0, row = 0;
- foreach (QWidget * w, l)
+ foreach(QWidget* w, l)
{
width += w->size().width();
if (row < (int)(width / event->size().width()) )
diff --git a/photolayoutseditor/widgets/tools/ZoomTool.cpp \
b/photolayoutseditor/widgets/tools/ZoomTool.cpp index e27b361..8c934ce 100644
--- a/photolayoutseditor/widgets/tools/ZoomTool.cpp
+++ b/photolayoutseditor/widgets/tools/ZoomTool.cpp
@@ -101,7 +101,7 @@ void ZoomTool::zoom(const QPointF & point)
return;
QList<QGraphicsView*> views = scene->views();
qreal factor = 1 + (d->out->isChecked() ? -0.1 : 0.1);
- foreach (QGraphicsView * view, views)
+ foreach(QGraphicsView* view, views)
{
Canvas * canvas = qobject_cast<Canvas*>(view);
if (!canvas)
diff --git a/sendimages/sendimages.cpp b/sendimages/sendimages.cpp
index 1624768..3f6f211 100644
--- a/sendimages/sendimages.cpp
+++ b/sendimages/sendimages.cpp
@@ -149,7 +149,7 @@ void SendImages::sendImages()
{
// Add all original files to the attachments list.
- foreach (const EmailItem& item, d->settings.itemsList)
+ foreach(const EmailItem& item, d->settings.itemsList)
{
d->attachementFiles.append(item.orgUrl);
d->settings.setEmailUrl(item.orgUrl, item.orgUrl);
@@ -224,7 +224,7 @@ void SendImages::buildPropertiesFile()
QString propertiesText;
- foreach (const EmailItem& item, d->settings.itemsList)
+ foreach(const EmailItem& item, d->settings.itemsList)
{
QString comments = item.comments;
QString tags = item.tags.join(", ");
diff --git a/vkontakte/vkwindow.cpp b/vkontakte/vkwindow.cpp
index 4609607..a3b2300 100644
--- a/vkontakte/vkwindow.cpp
+++ b/vkontakte/vkwindow.cpp
@@ -575,7 +575,7 @@ void VkontakteWindow::slotAlbumsUpdateDone(KJob *kjob)
m_albumsCombo->clear();
m_albums = job->list();
- foreach (const Vkontakte::AlbumInfoPtr &album, m_albums)
+ foreach(const Vkontakte::AlbumInfoPtr &album, m_albums)
m_albumsCombo->addItem(KIcon("folder-image"), album->title());
if (m_albumToSelect != -1)
@@ -785,7 +785,7 @@ void VkontakteWindow::slotStartTransfer()
updateControls(false);
QStringList files;
- foreach (const KUrl &url, m_imgList->imageUrls(true))
+ foreach(const KUrl &url, m_imgList->imageUrls(true))
files.append(url.toLocalFile());
Vkontakte::UploadPhotosJob *job = new Vkontakte::UploadPhotosJob(
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic