kdescendantsproxymodel.h   kdescendantsproxymodel.h 
skipping to change at line 93 skipping to change at line 93
* Destroys the descendant entities proxy model. * Destroys the descendant entities proxy model.
*/ */
virtual ~KDescendantsProxyModel(); virtual ~KDescendantsProxyModel();
/** /**
* Sets the source @p model of the proxy. * Sets the source @p model of the proxy.
*/ */
virtual void setSourceModel( QAbstractItemModel *model ); virtual void setSourceModel( QAbstractItemModel *model );
/** /**
* Sets the root index to @p index. This is the root of the proxy model * @deprecated
.
*
* @param index The root index in the *source* model which will be show
n in this model.
* If the index is invalid, the model is empty.
* *
* \note You must set the model before setting the root index. * This method does nothing.
*/ */
void setRootIndex( const QModelIndex &index); void setRootIndex( const QModelIndex &index);
/** /**
* Set whether to show ancestor data in the model. If @p display is tru e, then * Set whether to show ancestor data in the model. If @p display is tru e, then
* a source model which is displayed as * a source model which is displayed as
* *
* @code * @code
* -> "Item 0-0" (this is row-depth) * -> "Item 0-0" (this is row-depth)
* -> -> "Item 0-1" * -> -> "Item 0-1"
 End of changes. 2 change blocks. 
7 lines changed or deleted 2 lines changed or added


 kdeversion.h   kdeversion.h 
skipping to change at line 47 skipping to change at line 47
* This macro contains the KDE version in string form. As it is a macro, * This macro contains the KDE version in string form. As it is a macro,
* it contains the version at compile time. See versionString() if you need * it contains the version at compile time. See versionString() if you need
* the KDE version used at runtime. * the KDE version used at runtime.
* *
* @note The version string might contain a section in parentheses, * @note The version string might contain a section in parentheses,
* especially for development versions of KDE. * especially for development versions of KDE.
* If you use that macro directly for a file format (e.g. OASIS Open Docume nt) * If you use that macro directly for a file format (e.g. OASIS Open Docume nt)
* or for a protocol (e.g. http) be careful that it is appropriate. * or for a protocol (e.g. http) be careful that it is appropriate.
* (Fictional) example: "4.0.90 (>=20070101)" * (Fictional) example: "4.0.90 (>=20070101)"
*/ */
#define KDE_VERSION_STRING "4.7.1 (4.7.1)" #define KDE_VERSION_STRING "4.7.2 (4.7.2)"
/** /**
* @def KDE_VERSION_MAJOR * @def KDE_VERSION_MAJOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Major version of KDE, at compile time * @brief Major version of KDE, at compile time
*/ */
#define KDE_VERSION_MAJOR 4 #define KDE_VERSION_MAJOR 4
/** /**
* @def KDE_VERSION_MINOR * @def KDE_VERSION_MINOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Minor version of KDE, at compile time * @brief Minor version of KDE, at compile time
*/ */
#define KDE_VERSION_MINOR 7 #define KDE_VERSION_MINOR 7
/** /**
* @def KDE_VERSION_RELEASE * @def KDE_VERSION_RELEASE
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Release version of KDE, at compile time * @brief Release version of KDE, at compile time
*/ */
#define KDE_VERSION_RELEASE 1 #define KDE_VERSION_RELEASE 2
/** /**
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Make a number from the major, minor and release number of a KDE v ersion * @brief Make a number from the major, minor and release number of a KDE v ersion
* *
* This function can be used for preprocessing when KDE_IS_VERSION is not * This function can be used for preprocessing when KDE_IS_VERSION is not
* appropriate. * appropriate.
*/ */
#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ktabwidget.h   ktabwidget.h 
skipping to change at line 89 skipping to change at line 89
* This is simply a convenience method for QTabBar::tabTextColor. * This is simply a convenience method for QTabBar::tabTextColor.
*/ */
QColor tabTextColor( int index ) const; QColor tabTextColor( int index ) const;
/** /**
* Returns true if tab ordering with the middle mouse button * Returns true if tab ordering with the middle mouse button
* has been enabled. * has been enabled.
* *
* @deprecated Use QTabWidget::isMovable() instead. * @deprecated Use QTabWidget::isMovable() instead.
*/ */
bool isTabReorderingEnabled() const; #ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED bool isTabReorderingEnabled() const;
#endif
/** /**
* Returns true if the close button is shown on tabs * Returns true if the close button is shown on tabs
* when mouse is hovering over them. * when mouse is hovering over them.
* *
* @deprecated Use QTabWidget::tabsClosable() instead. * @deprecated Use QTabWidget::tabsClosable() instead.
*/ */
#ifndef KDE_NO_DEPRECATED #ifndef KDE_NO_DEPRECATED
KDE_DEPRECATED bool hoverCloseButton() const; KDE_DEPRECATED bool hoverCloseButton() const;
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added


 movingrange.h   movingrange.h 
skipping to change at line 40 skipping to change at line 40
#include <ktexteditor/movingcursor.h> #include <ktexteditor/movingcursor.h>
namespace KTextEditor namespace KTextEditor
{ {
class Document; class Document;
class View; class View;
class MovingRangeFeedback; class MovingRangeFeedback;
/** /**
* \short A range which is bound to a specific Document, and maintains its * \short A range that is bound to a specific Document, and maintains its
position. * position.
* *
* \ingroup kte_group_moving_classes * \ingroup kte_group_moving_classes
* *
* \section movingrange_intro Introduction
*
* A MovingRange is an extension of the basic Range class. It maintains its * A MovingRange is an extension of the basic Range class. It maintains its
* position in the document. As a result of this, MovingRange%s may not be * position in the document. As a result of this, MovingRange%s may not be
copied, as they need * copied, as they need to maintain a connection to the associated Document
* to maintain a connection to the associated Document. .
* *
* Create a new MovingRange like this: * Create a new MovingRange like this:
* \code * \code
* // Retrieve the MovingInterface * // Retrieve the MovingInterface
* KTextEditor::MovingInterface* moving = * KTextEditor::MovingInterface* moving =
* qobject_cast<KTextEditor::MovingInterface*>( yourDocument ); * qobject_cast<KTextEditor::MovingInterface*>( yourDocument );
* *
* if ( moving ) { * if ( moving ) {
* KTextEditor::MovingRange* range = moving->newMovingRange(); * KTextEditor::MovingRange* range = moving->newMovingRange();
* } * }
* \endcode * \endcode
* *
* When finished with a MovingRange, simply delete it. * When finished with a MovingRange, simply delete it.
* If the document the cursor belong to is deleted, it will get deleted aut * If the document the cursor belong to is deleted, it will get deleted
omatically. * automatically.
* *
* \sa Cursor, MovingCursor, Range and MovingInterface. * \section movingrange_behavior Editing Behavior
*
* The insert behavior controls how the range reacts to characters inserted
* at the range boundaries, i.e. at the start of the range or the end of th
e
* range. Either the range boundary moves with text insertion, or it stays.
* Use setInsertBehaviors() and insertBehaviors() to set and query the curr
ent
* insert behavior.
*
* When the start() and end() Cursor of a range equal, isEmpty() returns tr
ue.
* Further, the empty-behavior can be changed such that the start() and end
()
* Cursor%s of MovingRange%s that get empty are automatically set to (-1, -
1).
* Use setEmptyBehavior() and emptyBehavior() to control the empty behavior
.
*
* \warning MovingRanges may be set to (-1, -1, -1, -1) at any time, if the
* user reloads a document (F5)! Use a MovingRangeFeedback to get notified
* if you need to catch this case.
*
* \section movingrange_feedback MovingRange Feedback
*
* With setFeedback() a feedback instance can be associated with the moving
* range. The MovingRangeFeedback notifies about the following events:
* - the text cursor (caret) entered the range,
* - the text cursor (caret) left the range,
* - the mouse cursor entered the range,
* - the mouse cursor left the range,
* - the range got empty, i.e. start() == end(),
* - the range got invalid, i.e. start() == end() == (-1, -1).
*
* If a feedback is not needed anymore, call setFeedback(0).
*
* \section movingrange_details Working with Ranges
*
* There are several convenience methods that make working with MovingRange
s
* very simple. For instance, use isEmpty() to check if the start() Cursor
* equals the end() Cursor. Use contains(), containsLine() or containsColum
n()
* to check whether the MovingRange contains a Range, a Cursor, a line or
* column. The same holds for overlaps(), overlapsLine() and overlapsColumn
().
* Besides onSingleLine() returns whether a MovingRange spans only one line
.
*
* For compatibility, a MovingRange can be explicitly converted to a simple
* Range by calling toRange(), or implicitly by the Range operator.
*
* \section movingrange_highlighting Arbitrary Highlighting
*
* With setAttribute() highlighting Attribute%s can be assigned to a
* MovingRange. By default, this highlighting is used in all views of a
* document. Use setView(), if the highlighting should only appear in a
* specific view. Further, if the additional highlighting should not be
* printed call setAttributeOnlyForViews() with the parameter true.
*
* \sa Cursor, MovingCursor, Range, MovingInterface, MovingRangeFeedback
* *
* \author Christoph Cullmann \<cullmann@kde.org\> * \author Christoph Cullmann \<cullmann@kde.org\>
* *
* \since 4.5 * \since 4.5
*/ */
class KTEXTEDITOR_EXPORT MovingRange class KTEXTEDITOR_EXPORT MovingRange
{ {
// //
// sub types // sub types
// //
skipping to change at line 94 skipping to change at line 148
/** /**
* Behavior of range if it becomes empty. * Behavior of range if it becomes empty.
*/ */
enum EmptyBehavior { enum EmptyBehavior {
AllowEmpty = 0x0, ///< allow range to be empty AllowEmpty = 0x0, ///< allow range to be empty
InvalidateIfEmpty = 0x1 ///< invalidate range, if it becomes empty InvalidateIfEmpty = 0x1 ///< invalidate range, if it becomes empty
}; };
// //
// stuff that needs to be implemented by editor part cusors // stuff that needs to be implemented by editor part cursors
// //
public: public:
/** /**
* Set insert behaviors. * Set insert behaviors.
* @param insertBehaviors new insert behaviors * @param insertBehaviors new insert behaviors
*/ */
virtual void setInsertBehaviors (InsertBehaviors insertBehaviors) = 0; virtual void setInsertBehaviors (InsertBehaviors insertBehaviors) = 0;
/** /**
* Get current insert behaviors. * Get current insert behaviors.
 End of changes. 6 change blocks. 
9 lines changed or deleted 71 lines changed or added


 tcpslavebase.h   tcpslavebase.h 
skipping to change at line 116 skipping to change at line 116
* @param host hostname * @param host hostname
* @param port port number * @param port port number
* *
* @return on succes, true is returned. * @return on succes, true is returned.
* on failure, false is returned and an appropriate * on failure, false is returned and an appropriate
* error message is sent to the application. * error message is sent to the application.
*/ */
bool connectToHost(const QString &protocol, const QString& host, quint1 6 port); bool connectToHost(const QString &protocol, const QString& host, quint1 6 port);
/** /**
* Same as above function except
*
* @param host hostname
* @param port port number
* @param errorString if not NULL, the error string will be set.
*
* @return on success, 0 is returned. on failure, a KIO::Error code is
returned.
* @ref errorString, if not NULL, will contain the appropriate
error message
* that can be sent back to the client.
*
* @since 4.7.2
*/
int connectToHost(const QString& host, quint16 port, QString* errorStri
ng = 0);
/**
* the current port for this service * the current port for this service
* *
*/ */
quint16 port() const; quint16 port() const;
/** /**
* Will start SSL after connecting? * Will start SSL after connecting?
* *
* @return if so, true is returned. * @return if so, true is returned.
* if not, false is returned. * if not, false is returned.
 End of changes. 1 change blocks. 
0 lines changed or deleted 18 lines changed or added


 wallpaper.h   wallpaper.h 
skipping to change at line 67 skipping to change at line 67
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QRectF boundingRect READ boundingRect WRITE setBoundingRect) Q_PROPERTY(QRectF boundingRect READ boundingRect WRITE setBoundingRect)
Q_PROPERTY(QString name READ name) Q_PROPERTY(QString name READ name)
Q_PROPERTY(QString pluginName READ pluginName) Q_PROPERTY(QString pluginName READ pluginName)
Q_PROPERTY(QString icon READ icon) Q_PROPERTY(QString icon READ icon)
Q_PROPERTY(KServiceAction renderingMode READ renderingMode) Q_PROPERTY(KServiceAction renderingMode READ renderingMode)
Q_PROPERTY(QList<KServiceAction> listRenderingModes READ listRenderingM odes) Q_PROPERTY(QList<KServiceAction> listRenderingModes READ listRenderingM odes)
Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE se tUsingRenderingCache) Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE se tUsingRenderingCache)
Q_PROPERTY(bool previewing READ isPreviewing WRITE setPreviewing) Q_PROPERTY(bool previewing READ isPreviewing WRITE setPreviewing)
Q_PROPERTY(ResizeMethod resizeMethod READ resizeMethodHint WRITE setRes
izeMethodHint)
Q_PROPERTY(QSizeF targetSize READ targetSizeHint WRITE setTargetSizeHin
t)
public: public:
/** /**
* Various resize modes supported by the built in image renderer * Various resize modes supported by the built in image renderer
*/ */
enum ResizeMethod { enum ResizeMethod {
ScaledResize /**< Scales the image to fit the full area*/, ScaledResize /**< Scales the image to fit the full area*/,
CenteredResize /**< Centers the image within the area */, CenteredResize /**< Centers the image within the area */,
ScaledAndCroppedResize /**< Scales and crops the image, preserv ing the aspect ratio */, ScaledAndCroppedResize /**< Scales and crops the image, preserv ing the aspect ratio */,
TiledResize /**< Tiles the image to fill the area */, TiledResize /**< Tiles the image to fill the area */,
CenterTiledResize /**< Tiles the image to fill the area, starti ng with a centered tile */, CenterTiledResize /**< Tiles the image to fill the area, starti ng with a centered tile */,
MaxpectResize /**< Best fit resize */ MaxpectResize /**< Best fit resize */,
LastResizeMethod = MaxpectResize
}; };
Q_ENUMS(ResizeMethod) Q_ENUMS(ResizeMethod)
/** /**
* Default constructor for an empty or null wallpaper * Default constructor for an empty or null wallpaper
*/ */
explicit Wallpaper(QObject * parent = 0); explicit Wallpaper(QObject * parent = 0);
~Wallpaper(); ~Wallpaper();
skipping to change at line 335 skipping to change at line 338
* for instance. * for instance.
* *
* @param resizeMethod The resize method to assume will be used for future wallpaper * @param resizeMethod The resize method to assume will be used for future wallpaper
* scaling; may later be changed by calls to rend er() * scaling; may later be changed by calls to rend er()
* *
* @since 4.3 * @since 4.3
*/ */
void setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod); void setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod);
/** /**
* @return the current resize method hint
* @since 4.7.2
*/
Wallpaper::ResizeMethod resizeMethodHint() const;
/**
* Allows one to set rendering hints that may differ from the actua lities of the * Allows one to set rendering hints that may differ from the actua lities of the
* Wallpaper's current state, allowing for better selection of pape rs from packages, * Wallpaper's current state, allowing for better selection of pape rs from packages,
* for instance. * for instance.
* *
* @param targetSize The size to assume will be used for future wal lpaper scaling * @param targetSize The size to assume will be used for future wal lpaper scaling
* *
* @since 4.3 * @since 4.3
*/ */
void setTargetSizeHint(const QSizeF &targetSize); void setTargetSizeHint(const QSizeF &targetSize);
/** /**
* @return the current target size method hint
* @since 4.7.2
*/
QSizeF targetSizeHint() const;
/**
* Returns a list of wallpaper contextual actions (nothing by defau lt) * Returns a list of wallpaper contextual actions (nothing by defau lt)
*/ */
QList<QAction*> contextualActions() const; QList<QAction*> contextualActions() const;
/** /**
* @return true if in preview mode, such as in a configuation dialo g * @return true if in preview mode, such as in a configuation dialo g
* @since 4.5 * @since 4.5
*/ */
bool isPreviewing() const; bool isPreviewing() const;
 End of changes. 4 change blocks. 
1 lines changed or deleted 18 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/