Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 7e0a7c4f authored by Christian Mueller's avatar Christian Mueller

- Fixed common typos (most of them reported by the EBN checks)

- Use consistently American English


svn path=/trunk/koffice/; revision=588325
parent 1fdc3b7d
......@@ -119,7 +119,7 @@ public:
virtual KoUnit::Unit unit() = 0;
#if 0
/* The next list of methods are naming taken from Krita, which means they have allready been
/* The next list of methods are naming taken from Krita, which means they have already been
toughened by time. So, if you ever need a method in this interface; please uncomment the
respective one here for good naming conventions. It will probably save you time in
implementing some of the methods in the different KOffice apps as well ;)
......@@ -188,7 +188,7 @@ public:
virtual void zoomOut(qint32 x, qint32 y) 0;
/**
* To centre the view on the given point with the given zoom factor.
* To center the view on the given point with the given zoom factor.
*
* @param x the x coordinate of the center point in document coordinates
* @param y the y coordinate of the center point in document coordinates
......
......@@ -42,7 +42,7 @@ KCommand* KoCreateShapeStrategy::createCommand() {
KoCreateShapesTool *parent = static_cast<KoCreateShapesTool*>(m_parent);
KoShapeFactory *factory = KoShapeRegistry::instance()->get(parent->shapeId());
if(! factory) {
kWarning(30001) << "Application requested a shape that is not registred '" <<
kWarning(30001) << "Application requested a shape that is not registered '" <<
static_cast<KoCreateShapesTool*>(m_parent)->shapeId() << "'" << endl;
return 0;
}
......
......@@ -51,7 +51,7 @@ public:
void paint( QPainter &painter, KoViewConverter &converter );
/**
* Returns the shape Controller that is registred to hold the shapes this tool creates.
* Returns the shape Controller that is registered to hold the shapes this tool creates.
* @return the shape controller.
*/
KoShapeControllerBase* controller() const { return m_shapeController; }
......@@ -59,7 +59,7 @@ public:
/**
* Set the shape controller that this tool adds its created shapes to.
* This tool will create a shape after user input and that shape has to be
* registred to the hosting application. We add/remove the shape via the
* registered to the hosting application. We add/remove the shape via the
* KoShapeControllerBase interface.<br>
* Note that this tool will create a command that can be used for undo/redo.
* The undo will actually call the remove.
......
......@@ -1022,7 +1022,7 @@ bool KoPathShape::breakAt( const KoPathSegment &segment )
if( pos1.first != pos2.first )
return false;
// get ordered point indeces
// get ordered point indexes
KoSubpath *subpath = pos1.first;
int index1 = pos1.second < pos2.second ? pos1.second : pos2.second;
int index2 = pos1.second > pos2.second ? pos1.second : pos2.second;
......
......@@ -456,7 +456,7 @@ public:
/**
* @brief Breaks the path at the given segment.
*
* The subpath is broken by deleteing the given segment. If the
* The subpath is broken by deleting the given segment. If the
* segment points are the start and end point of a single closed
* subpath, the subpath is simply unclosed. If the segment points
* are in the middle of the subpath, two new subpath are mode out
......
......@@ -45,7 +45,7 @@ public:
/**
* For classes that are handed this event, you can choose to accept (default) this event.
* Acceptance signifies that you have handled this event and found it usefull, the effect
* Acceptance signifies that you have handled this event and found it useful, the effect
* of that will be that the event will not be handled to other event handlers.
*/
void accept() { m_event->accept(); }
......
......@@ -85,7 +85,7 @@ public:
* @brief Paint the shape
* The class extending this one is responsible for painting itself. Since we do not
* assume the shape is square the paint must also clear its background if it will draw
* something transparant on top.
* something transparent on top.
* This can be done with a method like:
* <code>
painter.fillRect(converter.normalToView(QRectF(QPointF(0.0,0.0), size())), background());</code>
......@@ -231,27 +231,27 @@ public:
/**
* Set the background of the shape.
* A QBrush can have a plain color, be fully transparant or have a complex fill.
* A QBrush can have a plain color, be fully transparent or have a complex fill.
* setting such a brush will allow the shape to fill itself using that brush and
* will be able to tell if its transparant or not.
* will be able to tell if its transparent or not.
* @param brush the brush for the background.
*/
void setBackground ( const QBrush & brush ) { m_backgroundBrush = brush; }
/**
* return the brush used to paint te background of this shape with.
* A QBrush can have a plain color, be fully transparant or have a complex fill.
* A QBrush can have a plain color, be fully transparent or have a complex fill.
* setting such a brush will allow the shape to fill itself using that brush and
* will be able to tell if its transparant or not.
* will be able to tell if its transparent or not.
* @return the background-brush
*/
const QBrush& background () { return m_backgroundBrush; }
/**
* Returns true if there is some transparancy, false if the shape is fully opaque.
* The default implementation will just return if the background has some transparancy,
* Returns true if there is some transparency, false if the shape is fully opaque.
* The default implementation will just return if the background has some transparency,
* you should override it and always return true if your shape is not square.
* @return if the shape is (partly) transparant.
* @return if the shape is (partly) transparent.
*/
virtual bool hasTransparancy();
......@@ -271,7 +271,7 @@ public:
* <p>Just like two objects having the same x or y coordinate will make them 'touch',
* so will two objects with the same z-index touch on the z plane. In layering the
* shape this, however, can cause a little confusion as one always has to be on top.
* The layering if two overlapping objects have the same index is implementation dependant
* The layering if two overlapping objects have the same index is implementation dependent
* and probably depends on the order in which they are added to the shape manager.
* @param zIndex the new z-index;
*/
......@@ -434,7 +434,7 @@ public:
/**
* Set a data object on the shape to be used by an application.
* This is specifically usefull when a shape is created in a plugin and that data from that
* This is specifically useful when a shape is created in a plugin and that data from that
* shape should be accessible outside the plugin.
* @param userData the new user data, or 0 to delete the current one.
*/
......
......@@ -60,8 +60,8 @@ public:
*/
virtual KoInsets* borderInsets(const KoShape *shape, KoInsets &insets) = 0;
/**
* Returns true if there is some transparancy, false if the border is fully opaque.
* @return if the border is transparant.
* Returns true if there is some transparency, false if the border is fully opaque.
* @return if the border is transparent.
*/
virtual bool hasTransparancy() = 0;
/**
......
......@@ -74,8 +74,8 @@ public:
virtual bool childClipped(const KoShape *child) const = 0;
/**
* Return the current number of children registred.
* @return the current number of children registred.
* Return the current number of children registered.
* @return the current number of children registered.
*/
virtual int count() const = 0;
......@@ -108,7 +108,7 @@ public:
* all children move with it.
* <p>Each child can optionally be said to be 'clipped' by the container.
* This feature will give the effect that even if the child has a size and
* position outside the container, it will not be shown. This is especially usefull
* position outside the container, it will not be shown. This is especially useful
* for showing cutouts of content, like images, without changing the actual content.
* <p>For so called clipped children any modification made to the container is
* propagated to the child. This includes rotation as well as scaling and shearing.
......@@ -117,7 +117,7 @@ public:
* data model KoGraphicsContainerModel and if you provide a custom implementation
* of that model any means can be used to maintain a list of children, as long as
* you will take care to register them with the appropriate object manager.
* <p>An example usage where a custom model might be usefull is when you have a
* <p>An example usage where a custom model might be useful is when you have a
* container for text areas which are split into columns. If you resize the container
* and the width of the individual columns gets too small, the model can choose to
* remove a child or add one when the width allows another column.
......@@ -150,8 +150,8 @@ public:
void removeChild(KoShape *object);
/**
* Return the current number of children registred.
* @return the current number of children registred.
* Return the current number of children registered.
* @return the current number of children registered.
*/
int childCount() const;
......
......@@ -188,7 +188,7 @@ protected:
void setToolTip(const QString & tooltip);
/**
* Set an icon to be used in a selector of shapes
* @param iconName the basename (without extention) of the icon
* @param iconName the basename (without extension) of the icon
* @see KIconLoader
*/
void setIcon(const QString & iconName);
......
......@@ -31,7 +31,7 @@
* The group shape allows you to add children which will then be grouped in selections
* and actions.
* <p>If you have a set of shapes, that together make up a bigger shape it is often
* usefull to group them together so the user will perceive the different shapes as
* useful to group them together so the user will perceive the different shapes as
* actually being one. This means that if the user clicks on one object, all objects
* in the group will be selected at ones, making the tools that works on
* selections alter all of them at the same time.
......
......@@ -37,7 +37,7 @@
* Each subclass should provide a reimplementation of the destructor to ensure that
* any private data is automatically cleaned up when user data objects are deleted.
* Please note that this object is a QObject to allow a
* qobject_cast<MyData*> (shape->userData()) to work which is usefull in an environment
* qobject_cast<MyData*> (shape->userData()) to work which is useful in an environment
* where classes from plugins may not be castable using a static_cast or a dynamic_cast
*/
class FLAKE_EXPORT KoShapeUserData : public QObject {
......
......@@ -160,7 +160,7 @@ signals:
* Emitted when this tool wants itself to temporarily be replaced by another tool.
* For instance, a paint tool could desire to be
* temporarily replaced by a pan tool which could be temporarily
* replaced by a colourpicker.
* replaced by a colorpicker.
* @param id the identification of the desired tool
*/
void sigActivateTemporary(const QString & id);
......
......@@ -143,7 +143,7 @@ protected:
void setToolType(const QString & toolType);
/**
* Set an icon to be used in the toolBox.
* @param iconName the basename (without extention) of the icon
* @param iconName the basename (without extension) of the icon
* @see KIconLoader
*/
void setIcon(const QString & iconName);
......
......@@ -37,7 +37,7 @@ namespace KFormula {
*/
class TextElement : public BasicElement {
public:
/// The standart constructor
/// The standard constructor
TextElement( BasicElement* parent = 0 );
/**
......
......@@ -347,7 +347,7 @@ private:
bool centerSymbol;
/**
* Whether we want coloured formulae.
* Whether we want colored formulae.
*/
bool m_syntaxHighlighting;
......
......@@ -61,7 +61,7 @@ public:
protected:
// This is going to disappear in favour of a real macro facility some day.
// This is going to disappear in favor of a real macro facility some day.
void fillNameTable( SymbolTable::NameTable& names );
static void testFont( QStringList& missing, const QString& fontName );
......
......@@ -169,8 +169,8 @@ public:
*
* @param painter the painter do modify.
* @param combine tells whether the new clip region is an intersection
* of the current region with the childs region or whether only
* the childs region is set.
* of the current region with the child's region or whether only
* the child's region is set.
*/
virtual void setClipRegion( QPainter& painter, bool combine = true );
......
......@@ -689,13 +689,13 @@ public:
* document as their root document.
*
* This method is automatically called from KoMainWindow::setRootDocument,
* so you dont need to call it.
* so you do not need to call it.
*/
virtual void addShell( KoMainWindow *shell );
/**
* Removes the shell from the list. That happens automatically if the shell changes its
* root document. Usually you dont need to call this method.
* root document. Usually you do not need to call this method.
*/
virtual void removeShell( KoMainWindow *shell );
......
......@@ -128,7 +128,7 @@ private:
* a filter is Kontour's MSOD (MS Office Drawing) filter.
*
* The more complex case is embedding various streams from within the same filter
* library. This is neccesary for OLE like files (at least with the current design
* library. This is necessary for OLE like files (at least with the current design
* of the OLEFilter). In this case you have to use @ref #startInternalEmbedding and
* @ref #endInternalEmbedding accordingly. Try to use the previous method if possible.
*
......
......@@ -124,7 +124,7 @@ public:
* This function allow to search a KoID from the name.
* @param t the name to search
* @param result The result is filled in this variable
* @return true if the search has been successfull, false otherwise
* @return true if the search has been successful, false otherwise
*/
bool search(const QString& t, KoID& result) const
{
......
......@@ -290,7 +290,7 @@ void KoOasisStyles::importDataStyle( const KoXmlElement& parent )
format += shortForm ? "s" : "ss";
} else if ( localName == "am-pm" ) {
format += "ap";
} else if ( localName == "text" ) { // litteral
} else if ( localName == "text" ) { // literal
format += e.text();
} else if ( localName == "suffix" ) {
suffix = e.text();
......@@ -1314,7 +1314,8 @@ QString KoOasisStyles::saveOasisTextStyle( KoGenStyles &mainStyles, const QStrin
return mainStyles.lookup( currentStyle, "N" );
}
//This is an extension of numeric style. For the moment we used namespace of oasis format for specific koffice extention. change it for the futur.
//This is an extension of numeric style. For the moment we used namespace of
//oasis format for specific koffice extension. Change it for the future.
void KoOasisStyles::addKofficeNumericStyleExtension( KoXmlWriter & elementWriter, const QString &_suffix, const QString &_prefix )
{
if ( !_suffix.isEmpty() )
......
......@@ -77,7 +77,7 @@ QImage KoPictureEps::scaleWithGhostScript(const QSize& size, const int resolutio
// ### TODO: do not call GhostScript up to three times for each re-scaling (one call of GhostScript should be enough to know which device is available: gs --help)
// png16m is better, but not always available -> fallback to bmp16m, then fallback to ppm (256 colors)
// ### TODO: pcx24b is also a true colour format
// ### TODO: pcx24b is also a true color format
// ### TODO: support alpha (other gs devices needed)
const char* deviceTable[] = { "png16m", "bmp16m", "ppm", 0 };
......
......@@ -109,7 +109,7 @@ private:
*
* @param array the array which is read
* @param start start position of the PostScript stream
* @param lenght lenght of the PostScript stream
* @param length length of the PostScript stream
* @param pos current position (which is also returned)
* @param lastCharWasCr defines if the previous line ended with a Carriage Return,
* to skip an eventual Line Feed at the start of this line
......
......@@ -83,7 +83,7 @@ public:
* int age = props->getProperty("age").toInt();
* @endcode
* @return a property by name, wrapped in a QVariant.
* @param name the name (or key) with which the variant was registred.
* @param name the name (or key) with which the variant was registered.
* @see getInt() getString()
*/
virtual QVariant getProperty(const QString & name) const;
......@@ -97,20 +97,20 @@ public:
* int age = props->getInt("age");
* @endcode
* @return an integer property by name
* @param name the name (or key) with which the variant was registred.
* @param name the name (or key) with which the variant was registered.
* @param def the default value, should there not be no propery by the name this will be returned.
* @see getProperty() getString()
*/
int getInt(const QString & name, int def = 0) const;
/**
* Return a double property by name.
* @param name the name (or key) with which the variant was registred.
* @param name the name (or key) with which the variant was registered.
* @param def the default value, should there not be no propery by the name this will be returned.
*/
double getDouble(const QString & name, double def = 0.0) const;
/**
* Return a boolean property by name.
* @param name the name (or key) with which the variant was registred.
* @param name the name (or key) with which the variant was registered.
* @param def the default value, should there not be no propery by the name this will be returned.
*/
bool getBool(const QString & name, bool def = false) const;
......@@ -123,7 +123,7 @@ public:
* QString name = props->getString("name");
* @endcode
* @return an QString property by name
* @param name the name (or key) with which the variant was registred.
* @param name the name (or key) with which the variant was registered.
* @see getProperty() getInt()
* @param def the default value, should there not be no propery by the name this will be returned.
*/
......
......@@ -61,7 +61,7 @@ public:
/**
* @brief Insert data item into the tree
*
* This will insert a data item into the tree. If neccessary the tree will
* This will insert a data item into the tree. If necessary the tree will
* adjust itself.
*
* @param data
......@@ -72,7 +72,7 @@ public:
/**
* @brief Remove a data item from the tree
*
* This removed a data item from the tree. If neccessary the tree will
* This removed a data item from the tree. If necessary the tree will
* adjust itself.
*
* @param data
......@@ -519,7 +519,7 @@ QPair< typename KoRTree<T>::Node*, typename KoRTree<T>::Node* > KoRTree<T>::spli
Q_ASSERT( n1->childCount() + n2->childCount() == node->childCount() );
// move the data back to the old node
// this has to be done as the current node is allready in the tree.
// this has to be done as the current node is already in the tree.
node->clear();
for ( int i = 0; i < n1->childCount(); ++i )
{
......
......@@ -168,7 +168,7 @@ public:
* Set the type of properties that will be looked for.
* For instance setTypeProperties("paragraph") will make hasAttribute() and attribute()
* look into "paragraph-properties".
* If @p typeProperties is 0, the stylestack is resetted to look for "properties"
* If @p typeProperties is 0, the stylestack is reset to look for "properties"
* as it does by default.
*/
void setTypeProperties( const char* typeProperties );
......
......@@ -105,7 +105,7 @@ void KoGuides::paintGuides( QPainter &painter )
Q3ValueList<KoGuideLine *>::iterator it = m_guideLines[i].begin();
for ( ; it != m_guideLines[i].end(); ++it )
{
if ( !( *it )->automatic || ( *it )->snapping ) // dont paint autoStyle guides when they are not snapping
if ( !( *it )->automatic || ( *it )->snapping ) // do not paint autoStyle guides when they are not snapping
{
if ( ( *it )->snapping )
painter.setPen( QPen( Qt::green, 0, Qt::DotLine ) );
......
......@@ -488,7 +488,7 @@ void KoTemplateChooseDia::setupTemplateDialog(QWidget * widgetbase, QGridLayout
bool ischecked = startwithoutdialog == QString("yes");
// When not starting up, display a tri-state button telling whether
// the user actually choosed the template to start with next times (bug:77542)
// the user actually chose the template to start with next times (bug:77542)
if (d->m_dialogType == Everything)
{
d->m_nodiag->setChecked( ischecked );
......
......@@ -72,7 +72,7 @@ public:
* For a button added to this toolbox you can regiter a visibility-code by which that
* button will be known. Using setButtonsVisible() you can then show only the buttons
* you want visible.
* @param button the previously registred button
* @param button the previously registered button
* @param code that we recognize this button by, does not have to be unique.
*/
void setVisibilityCode(QAbstractButton *button, const QString &code);
......@@ -87,9 +87,9 @@ public slots:
/**
* Show only the dynamic buttons that have a code from parameter codes.
* The toolbox allows buttons to be optionally registred with a visibilityCode. This code
* The toolbox allows buttons to be optionally registered with a visibilityCode. This code
* can be passed here and all buttons that have that code are shown. All buttons that
* have another visibility code registred are hidden.
* have another visibility code registered are hidden.
* @param codes a list of all the codes to show.
*/
void setButtonsVisible(const QList<QString> &codes);
......
......@@ -74,7 +74,7 @@ public:
/**
* Create a new ToolBox with title.
* This creates a new toolbox that is initialized with all tools registred for you
* This creates a new toolbox that is initialized with all tools registered for you
* to attach to the view of your application.
* If your view extends KoView the line of code is:
@code
......@@ -107,7 +107,7 @@ public:
/**
* Return the tool that is able to create shapes for this param canvas.
* This is typically used by the KoShapeSelector to set which shape to create next.
* @param canvas the canvas that is a child of a previously registred controller
* @param canvas the canvas that is a child of a previously registered controller
* who's tool you want.
* @see addControllers()
*/
......
......@@ -86,7 +86,7 @@ protected:
/**
* Transfrom a string into a double, while taking care of locale specific symbols.
* @param str the string to transform into a number
* @param ok true, if the conversion was succesful
* @param ok true, if the conversion was successful
* @return the value as double
*/
double toDouble( const QString& str, bool* ok ) const;
......
......@@ -43,7 +43,7 @@ KoZoomMode::Mode KoZoomMode::toMode(const QString& mode)
return ZOOM_CONSTANT;
// we return ZOOM_CONSTANT else because then we can pass '10%' or '15%'
// or whatever, it's automatically converted. ZOOM_CONSTANT is
// changable, whereas all other zoom modes (non-constants) are normal
// changeable, whereas all other zoom modes (non-constants) are normal
// text like "Fit to xxx". they let the view grow/shrink according
// to windowsize, hence the term 'non-constant'
}
......@@ -50,12 +50,12 @@ public:
/// @return true if we're inside a list (i.e. the stack isn't empty)
bool hasListStyle() const { return !m_stack.isEmpty(); }
/// @return currenty applicable list style, i.e. the one on top of the stack
/// @return currently applicable list style, i.e. the one on top of the stack
/// Most list-level properties are the attributes of that element.
QDomElement currentListStyle() const;
/**
* @return the style:list-level-properties for the currenty applicable list style.
* @return the style:list-level-properties for the currently applicable list style.
* The list-level properties that are only "style" information,
* like text:min-label-width, text:space-before, and style:font-name
* are the attributes of that element.
......@@ -63,13 +63,13 @@ public:
QDomElement currentListStyleProperties() const;
/**
* @return the style:text-properties for the currenty applicable list style.
* @return the style:text-properties for the currently applicable list style.
*/
QDomElement currentListStyleTextProperties() const;
/**
* Set the initial level of the list, i.e. of item at the bottom of the stack.
* This is used when a level is explicitely specified in the
* This is used when a level is explicitly specified in the
* [un]ordered-list tag (OASIS extension)
*/
void setInitialLevel( int initialLevel );
......
......@@ -1695,9 +1695,9 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
rAlignLeft->setText( i18n( "&Left" ) );
ButtonGroup1Layout->addWidget( rAlignLeft );
rAlignCentre = new QRadioButton( bgAlign );
rAlignCentre->setText( i18n( "C&enter" ) );
ButtonGroup1Layout->addWidget( rAlignCentre );
rAlignCenter = new QRadioButton( bgAlign );
rAlignCenter->setText( i18n( "C&enter" ) );
ButtonGroup1Layout->addWidget( rAlignCenter );
rAlignRight = new QRadioButton( bgAlign );
rAlignRight->setText( i18n( "&Right" ) );
......
......@@ -438,7 +438,7 @@ private:
KoTabulatorsLineEdit* sTabPos;
Q3ButtonGroup* bgAlign;
QRadioButton* rAlignLeft;
QRadioButton* rAlignCentre;
QRadioButton* rAlignCenter;
QRadioButton* rAlignRight;
QRadioButton* rAlignVar;
QLineEdit* sAlignChar;
......
......@@ -105,7 +105,7 @@ public:
/**
* The background color is used for text that has no background color set,
* and for parts of the paragraph that are not covered by text.
* In theory anyway: the background colour isn't used in rendering text
* In theory anyway: the background color isn't used in rendering text
* yet, but it's nice to preserve the value.
*/
QColor backgroundColor;
......
......@@ -1600,7 +1600,7 @@ void KoTextParag::paintLines( QPainter &painter, const QColorGroup &cg, KoTextCu
#endif
// we flush before and after tabs
flush = flush || ( chr->c == '\t' || nextchr->c == '\t' );
// we flush on soft hypens
// we flush on soft hyphens
flush = flush || ( chr->c.unicode() == 0xad );
// we flush on custom items
flush = flush || chr->isCustom();
......@@ -3003,7 +3003,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
{
lastFormatRaw = newFormat;
// Remove isMisspelled from format, to avoid useless derived styles
// (which would be indentical to their parent style)
// (which would be identical to their parent style)
KoTextFormat tmpFormat( *newFormat );
tmpFormat.setMisspelled( false );
newFormat = formatCollection()->format( &tmpFormat );
......
......@@ -58,7 +58,7 @@ public:
double documentOffset() const { return m_offset; }
/**
* Set the amount of points into the document (y direction) that is relevant for this
* datas-shape. This allows multiple shapes to all use one document at different offsets
* data-shape. This allows multiple shapes to all use one document at different offsets
* into the document.
*/
void setDocumentOffset(double offset) { m_offset = offset; }
......
......@@ -67,7 +67,7 @@ void KoTextTool::paint( QPainter &painter, KoViewConverter &converter) {
return;
#if 0
Hmm, not usefull right now due to the implementation of QAbstractTextDocumentLayout
Hmm, not useful right now due to the implementation of QAbstractTextDocumentLayout
if(m_caret.selectionStart() != m_caret.selectionEnd()) { // paint selection
//kDebug(32500) << "Selection: " << m_caret.selectionStart() << "-" << m_caret.selectionEnd() << "\n";
bool first = true;
......@@ -146,7 +146,7 @@ int KoTextTool::pointToPosition(const QPointF & point) const {
int caretPos = m_caret.block().document()->documentLayout()->hitTest(p, Qt::FuzzyHit);
caretPos = qMax(caretPos, m_textShapeData->position());
if(m_textShapeData->endPosition() == -1)
kWarning() << "Clicking in not fully layed-out textframe\n";
kWarning() << "Clicking in not fully laid-out textframe\n";
caretPos = qMin(caretPos, m_textShapeData->endPosition());
return caretPos;
}
......
......@@ -148,7 +148,7 @@ public:
//return false if there is not a link
bool changeLinkVariableName( const QString & _name) const;
//be carefull these functions return QString::null when there is not
//be careful these functions return QString::null when there is not
//a variable
QString linkVariableUrl( ) const;
QString linkVariableName( ) const;
......
......@@ -135,7 +135,7 @@ public:
return static_cast<Qt::Alignment> (propertyInt(QTextFormat::BlockAlignment));
}
/**
* Paragraphs that are broken accross two frames are normally broken at the bottom
* Paragraphs that are broken across two frames are normally broken at the bottom
* of the frame. Using this property we can set the minimum number of lines that should
* appear in the second frame to avoid really short paragraphs standing alone (also called
* widows). So, if a 10 line parag is broken in a way that only one line is in the second
......@@ -148,7 +148,7 @@ public:
*/
int widowThreshold() const { return propertyInt(WidowThreshold); }
/**
* Paragraphs that are broken accross two frames are normally broken at the bottom
* Paragraphs that are broken across two frames are normally broken at the bottom
* of the frame. Using this property we can set the minimum number of lines that should
* appear in the first frame to avoid really short paragraphs standing alone (also called
* orphans). So, if a paragraph is broken so only 2 line is left in the first frame
......
......@@ -84,7 +84,7 @@ void KoStyleManager::alteredStyle(const KoParagraphStyle *style) {
Q_ASSERT(style);
int id = style->styleId();
if(id <= 0) {
kWarning(32500) << "alteredStyle received from a non registred style!" << endl;
kWarning(32500) << "alteredStyle received from a non registered style!" << endl;
return;
}
if(! m_updateQueue.contains(id))
......@@ -102,7 +102,7 @@ void KoStyleManager::alteredStyle(const KoCharacterStyle *style) {
Q_ASSERT(style);
int id = style->styleId();
if(id <= 0) {
kWarning(32500) << "alteredStyle received from a non registred style!" << endl;
kWarning(32500) << "alteredStyle received from a non registered style!" << endl;
return;
}
if(! m_updateQueue.contains(id))
......
......@@ -61,11 +61,11 @@ public:
/**
* Add a document for which the styles will be applied.
* Whenever a style is changed (signified by a alteredStyle() call) all
* registred documents will be updated to reflect that change.
* registered documents will be updated to reflect that change.
*/
void add(QTextDocument *document);
/**
* Remove a previously registred document.