[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/libs (silent)
From: Thomas Zander <zander () kde ! org>
Date: 2009-02-28 22:09:09
Message-ID: 1235858949.119522.29659.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 933430 by zander:
SVN_SILENT
Fix indenting
M +1 -1 flake/KoCanvasController_p.cpp
M +2 -2 flake/KoPathShape.cpp
M +4 -4 flake/KoSelection.cpp
M +2 -2 flake/KoShapeController.cpp
M +3 -3 flake/KoShapeManager.cpp
M +1 -1 flake/KoToolManager.cpp
M +1 -1 flake/commands/KoPathFillRuleCommand.cpp
M +8 -8 flake/commands/KoPathSeparateCommand.cpp
M +1 -1 flake/commands/KoShapeDeleteCommand.cpp
M +1 -1 flake/commands/KoShapeReorderCommand.cpp
M +2 -2 flake/tools/KoPathToolSelection.cpp
M +5 -6 guiutils/KoShapePainter.cpp
M +1 -1 kotext/KoTextLocator.cpp
M +5 -0 kotext/styles/KoCharacterStyle.cpp
M +1 -1 main/KoApplicationAdaptor.cpp
M +12 -11 main/KoDocument.cpp
M +8 -7 main/KoMainWindow.cpp
M +1 -1 main/KoView.cpp
M +3 -3 odf/KoOdfStylesReader.cpp
--- trunk/koffice/libs/flake/KoCanvasController_p.cpp #933429:933430
@@ -175,7 +175,7 @@
// repaint selection before selecting newly create shape
foreach(KoShape * shape, selection->selectedShapes())
- shape->update();
+ shape->update();
selection->deselectAll();
selection->select(m_draggedShape);
--- trunk/koffice/libs/flake/KoPathShape.cpp #933429:933430
@@ -208,7 +208,7 @@
{
foreach(KoSubpath *subpath, m_subpaths) {
foreach(KoPathPoint *point, *subpath)
- delete point;
+ delete point;
delete subpath;
}
m_subpaths.clear();
@@ -844,7 +844,7 @@
// append the second subpath to the first
foreach(KoPathPoint * p, *nextSubpath)
- subpath->append(p);
+ subpath->append(p);
// remove the nextSubpath from path
m_subpaths.removeAt(subpathIndex + 1);
--- trunk/koffice/libs/flake/KoSelection.cpp #933429:933430
@@ -250,8 +250,8 @@
{
int count = 0;
foreach(KoShape *shape, d->selectedShapes)
- if (dynamic_cast<KoShapeGroup*>(shape) == 0)
- ++count;
+ if (dynamic_cast<KoShapeGroup*>(shape) == 0)
+ ++count;
return count;
}
@@ -311,8 +311,8 @@
return true;
foreach(KoShape *shape, d->selectedShapes)
- if (shape == object)
- return true;
+ if (shape == object)
+ return true;
return false;
}
--- trunk/koffice/libs/flake/KoShapeController.cpp #933429:933430
@@ -51,7 +51,7 @@
Q_ASSERT(factory);
int z = 0;
foreach(KoShape *sh, canvas->shapeManager()->shapes())
- z = qMax(z, sh->zIndex());
+ z = qMax(z, sh->zIndex());
shape->setZIndex(z + 1);
// show config dialog.
@@ -98,7 +98,7 @@
return 0;
}
foreach(KoShapeConfigWidgetBase *widget, widgets)
- widget->save();
+ widget->save();
}
delete dialog;
}
--- trunk/koffice/libs/flake/KoShapeManager.cpp #933429:933430
@@ -329,7 +329,7 @@
KoShapeContainer *container = dynamic_cast<KoShapeContainer*>(shape);
if (container) {
foreach(KoShape *child, container->iterator())
- d->aggregate4update.insert(child);
+ d->aggregate4update.insert(child);
}
}
@@ -361,7 +361,7 @@
void fireSignals() {
foreach(KoShape *shape, shapesWithCollisionDetection)
- shape->shapeChanged(KoShape::CollisionDetected);
+ shape->shapeChanged(KoShape::CollisionDetected);
}
private:
@@ -384,7 +384,7 @@
// do it again to see which shapes we intersect with _after_ moving.
foreach(KoShape *shape, d->aggregate4update)
- detector.detect(d->tree, shape, d->shapeIndexesBeforeUpdate[shape]);
+ detector.detect(d->tree, shape, d->shapeIndexesBeforeUpdate[shape]);
d->aggregate4update.clear();
d->shapeIndexesBeforeUpdate.clear();
--- trunk/koffice/libs/flake/KoToolManager.cpp #933429:933430
@@ -188,7 +188,7 @@
// connect to all tools so we can hear their button-clicks
foreach(ToolHelper *tool, d->tools)
- connect(tool, SIGNAL(toolActivated(ToolHelper*)), this, \
SLOT(toolActivated(ToolHelper*))); + connect(tool, \
SIGNAL(toolActivated(ToolHelper*)), this, SLOT(toolActivated(ToolHelper*)));
// load pluggable input devices
KoDeviceRegistry::instance();
--- trunk/koffice/libs/flake/commands/KoPathFillRuleCommand.cpp #933429:933430
@@ -39,7 +39,7 @@
{
d->shapes = shapes;
foreach(KoPathShape *shape, d->shapes)
- d->oldFillRules.append(shape->fillRule());
+ d->oldFillRules.append(shape->fillRule());
setText(i18n("Set fill rule"));
}
--- trunk/koffice/libs/flake/commands/KoPathSeparateCommand.cpp #933429:933430
@@ -35,10 +35,10 @@
~Private() {
if (isSeparated && controller) {
foreach(KoPathShape* p, paths)
- delete p;
+ delete p;
} else {
foreach(KoPathShape* p, separatedPaths)
- delete p;
+ delete p;
}
}
@@ -76,12 +76,12 @@
if (d->controller) {
foreach(KoPathShape* p, d->paths)
- d->controller->removeShape(p);
+ d->controller->removeShape(p);
foreach(KoPathShape *p, d->separatedPaths)
- d->controller->addShape(p);
+ d->controller->addShape(p);
}
foreach(KoPathShape* p, d->paths)
- p->update();
+ p->update();
}
void KoPathSeparateCommand::undo()
@@ -89,13 +89,13 @@
QUndoCommand::undo();
if (d->controller) {
foreach(KoPathShape *p, d->separatedPaths)
- d->controller->removeShape(p);
+ d->controller->removeShape(p);
foreach(KoPathShape* p, d->paths)
- d->controller->addShape(p);
+ d->controller->addShape(p);
}
d->isSeparated = false;
foreach(KoPathShape* p, d->paths)
- p->update();
+ p->update();
}
--- trunk/koffice/libs/flake/commands/KoShapeDeleteCommand.cpp #933429:933430
@@ -37,7 +37,7 @@
return;
foreach(KoShape *shape, shapes)
- delete shape;
+ delete shape;
}
KoShapeControllerBase *controller; ///< the shape controller to use for \
removing/readding
--- trunk/koffice/libs/flake/commands/KoShapeReorderCommand.cpp #933429:933430
@@ -32,7 +32,7 @@
{
Q_ASSERT(m_shapes.count() == m_newIndexes.count());
foreach(KoShape *shape, shapes)
- m_previousIndexes.append(shape->zIndex());
+ m_previousIndexes.append(shape->zIndex());
setText(i18n("Reorder shapes"));
}
--- trunk/koffice/libs/flake/tools/KoPathToolSelection.cpp #933429:933430
@@ -51,7 +51,7 @@
KoShape::applyConversion(painter, converter);
foreach(KoPathPoint *p, it.value())
- p->paint(painter, handleRadius, KoPathPoint::All);
+ p->paint(painter, handleRadius, KoPathPoint::All);
painter.restore();
}
@@ -119,7 +119,7 @@
if (parameterShape && parameterShape->isParametricShape())
continue;
foreach(KoPathPoint* point, shape->pointsAt(shape->documentToShape(rect)))
- add(point, false);
+ add(point, false);
}
blockSignals(false);
emit selectionChanged();
--- trunk/koffice/libs/guiutils/KoShapePainter.cpp #933429:933430
@@ -189,19 +189,18 @@
QRectF KoShapePainter::contentRect()
{
QRectF bound;
- foreach( KoShape * shape, d->canvas->shapeManager()->shapes() )
- {
- if( ! shape->isVisible( true ) )
+ foreach(KoShape * shape, d->canvas->shapeManager()->shapes()) {
+ if (! shape->isVisible( true ))
continue;
- if( dynamic_cast<KoShapeGroup*>( shape ) )
+ if (dynamic_cast<KoShapeGroup*>(shape))
continue;
QRectF shapeRect = shape->boundingRect();
- if( bound.isEmpty() )
+ if (bound.isEmpty())
bound = shapeRect;
else
- bound = bound.united( shapeRect );
+ bound = bound.united(shapeRect);
}
return bound;
}
--- trunk/koffice/libs/kotext/KoTextLocator.cpp #933429:933430
@@ -71,7 +71,7 @@
}
if (pageTmp != pageNumber || chapterTmp != chapterPosition) {
foreach(KoTextReference* reference, listeners)
- reference->variableMoved(0, 0, 0);
+ reference->variableMoved(0, 0, 0);
}
}
--- trunk/koffice/libs/kotext/styles/KoCharacterStyle.cpp #933429:933430
@@ -155,6 +155,11 @@
void KoCharacterStyle::applyStyle(QTextCharFormat &format) const
{
+ // Since Qt takes its default size from the user config we will set a default \
size if nobody else does. + if (!format.hasProperty(QTextFormat::FontPointSize))
+ format.setFontPointSize(12);
+ // TODO same for color and font-family
+
QList<int> keys = d->stylesPrivate.keys();
for (int i = 0; i < keys.count(); i++) {
QVariant variant = d->stylesPrivate.value(keys[i]);
--- trunk/koffice/libs/main/KoApplicationAdaptor.cpp #933429:933430
@@ -77,7 +77,7 @@
Q3PtrListIterator<KoDocument> it(*documents);
for (; it.current(); ++it) {
foreach(KoView* view, it.current()->views())
- lst.append('/' + view->objectName());
+ lst.append('/' + view->objectName());
}
}
return lst;
--- trunk/koffice/libs/main/KoDocument.cpp #933429:933430
@@ -301,7 +301,7 @@
// Tell our views that the document is already destroyed and
// that they shouldn't try to access it.
foreach(KoView* view, d->m_views)
- view->setDocumentDeleted();
+ view->setDocumentDeleted();
delete d->m_startUpWidget;
d->m_startUpWidget = 0;
@@ -627,7 +627,7 @@
KParts::ReadWritePart::setReadWrite(readwrite);
foreach(KoView* view, d->m_views)
- view->updateReadWrite(readwrite);
+ view->updateReadWrite(readwrite);
Q3PtrListIterator<KoDocumentChild> dIt(d->m_children);
for (; dIt.current(); ++dIt)
@@ -719,18 +719,19 @@
KParts::Part *KoDocument::hitTest(QWidget *widget, const QPoint &globalPos)
{
- foreach(KoView* view, d->m_views)
- if (static_cast<QWidget *>(view) == widget) {
- QPoint canvasPos(view->canvas()->mapFromGlobal(globalPos));
- canvasPos.rx() += view->canvasXOffset();
- canvasPos.ry() += view->canvasYOffset();
+ foreach(KoView* view, d->m_views) {
+ if (static_cast<QWidget *>(view) == widget) {
+ QPoint canvasPos(view->canvas()->mapFromGlobal(globalPos));
+ canvasPos.rx() += view->canvasXOffset();
+ canvasPos.ry() += view->canvasYOffset();
- KParts::Part *part = view->hitTest(canvasPos);
- if (part)
- return part;
+ KParts::Part *part = view->hitTest(canvasPos);
+ if (part)
+ return part;
+ }
}
- return 0L;
+ return 0;
}
KoDocument* KoDocument::hitTest(const QPoint &pos, KoView* view, const QMatrix \
&matrix)
--- trunk/koffice/libs/main/KoMainWindow.cpp #933429:933430
@@ -578,7 +578,7 @@
// Tell all windows to reload their list, after saving
// Doesn't work multi-process, but it's a start
foreach(KMainWindow* window, KMainWindow::memberList())
- static_cast<KoMainWindow *>(window)->reloadRecentFileList();
+ static_cast<KoMainWindow *>(window)->reloadRecentFileList();
}
void KoMainWindow::reloadRecentFileList()
@@ -1072,7 +1072,7 @@
setRootDocument(0L);
if (!d->m_dockWidgetVisibilityMap.isEmpty()) { // re-enable dockers for \
persistency foreach(QDockWidget* dockWidget, d->m_dockWidgetMap)
- dockWidget->setVisible(d->m_dockWidgetVisibilityMap.value(dockWidget));
+ dockWidget->setVisible(d->m_dockWidgetVisibilityMap.value(dockWidget));
}
KParts::MainWindow::closeEvent(e);
} else
@@ -1429,11 +1429,12 @@
tb->hide();
// Update the action appropriately
- foreach(QAction* action, d->m_toolbarList)
- if (action->objectName() != tbName) {
- //kDebug(30003) <<"KoMainWindow::showToolbar setChecked" << shown;
- static_cast<KToggleAction *>(action)->setChecked(shown);
- break;
+ foreach(QAction* action, d->m_toolbarList) {
+ if (action->objectName() != tbName) {
+ //kDebug(30003) <<"KoMainWindow::showToolbar setChecked" << shown;
+ static_cast<KToggleAction *>(action)->setChecked(shown);
+ break;
+ }
}
}
--- trunk/koffice/libs/main/KoView.cpp #933429:933430
@@ -190,7 +190,7 @@
actionCollection()->addAssociatedWidget(this);
foreach(QAction* action, actionCollection()->actions())
- action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+ action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
}
KoView::~KoView()
--- trunk/koffice/libs/odf/KoOdfStylesReader.cpp #933429:933430
@@ -59,11 +59,11 @@
KoOdfStylesReader::~KoOdfStylesReader()
{
foreach(const QString& family, d->customStyles.keys())
- qDeleteAll(d->customStyles[family]);
+ qDeleteAll(d->customStyles[family]);
foreach(const QString& family, d->contentAutoStyles.keys())
- qDeleteAll(d->contentAutoStyles[family]);
+ qDeleteAll(d->contentAutoStyles[family]);
foreach(const QString& family, d->stylesAutoStyles.keys())
- qDeleteAll(d->stylesAutoStyles[family]);
+ qDeleteAll(d->stylesAutoStyles[family]);
qDeleteAll(d->defaultStyles);
qDeleteAll(d->styles);
qDeleteAll(d->masterPages);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic