codecompletionmodel.h   codecompletionmodel.h 
skipping to change at line 353 skipping to change at line 353
* The recommended grouping order is: Argument-hint depth, inheritanc e depth, attributes. * The recommended grouping order is: Argument-hint depth, inheritanc e depth, attributes.
* *
* This role can also be used to define completely custom groups, byp assing the editors builtin grouping: * This role can also be used to define completely custom groups, byp assing the editors builtin grouping:
* - Return Qt::DisplayRole when GroupRole is requested * - Return Qt::DisplayRole when GroupRole is requested
* - Return the lable text of the group when Qt::DisplayRole * - Return the lable text of the group when Qt::DisplayRole
* - Optional: Return an integer sorting-value when InheritanceDept h is requested. This number will * - Optional: Return an integer sorting-value when InheritanceDept h is requested. This number will
* be used to determine the order of the groups. The or der of the builtin groups is: * be used to determine the order of the groups. The or der of the builtin groups is:
* 1 = Best Matches, 100 = Local Scope, 200 = Public, 3 00 = Protected, 400 = Private, 500 = Namespace, 600 = Global * 1 = Best Matches, 100 = Local Scope, 200 = Public, 3 00 = Protected, 400 = Private, 500 = Namespace, 600 = Global
* You can pick any arbitrary number to position your g roup relative to these builtin groups. * You can pick any arbitrary number to position your g roup relative to these builtin groups.
* */ * */
GroupRole GroupRole,
/**
* Return a nonzero value here to enforce sorting the item at the end
of the list.
*/
UnimportantItemRole,
LastExtraItemDataRole
}; };
// KDE5 remove
static const int LastItemDataRole = AccessibilityAccept; static const int LastItemDataRole = AccessibilityAccept;
void setRowCount(int rowCount); void setRowCount(int rowCount);
enum InvocationType { enum InvocationType {
AutomaticInvocation, AutomaticInvocation,
UserInvocation, UserInvocation,
ManualInvocation ManualInvocation
}; };
 End of changes. 2 change blocks. 
1 lines changed or deleted 10 lines changed or added


 dialog.h   dialog.h 
// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
/* /*
* Copyright 2008 by Alessandro Diaferia <alediaferia@gmail.com> * dialog.h
* Copyright 2007 by Alexis Ménard <darktears31@gmail.com> *
* Copyright 2007 Sebastian Kuegler <sebas@kde.org> * Copyright (C) 2003 Zack Rusin <zack@kde.org>
* Copyright 2006 Aaron Seigo <aseigo@kde.org> * Copyright (C) 2009-2010 Michel Ludwig <michel.ludwig@kdemail.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* Boston, MA 02110-1301 USA * 02110-1301 USA
*/ */
#ifndef SONNET_DIALOG_H
#define SONNET_DIALOG_H
#ifndef PLASMA_DIALOG_H #include <kdialog.h>
#define PLASMA_DIALOG_H
#include <QtGui/QWidget>
#include <QtGui/QGraphicsSceneEvent>
#include <QtGui/QGraphicsView>
#include <plasma/plasma_export.h> class QListWidgetItem;
#include <plasma/plasma.h> class QModelIndex;
namespace Plasma namespace Sonnet
{ {
class BackgroundChecker;
class DialogPrivate; /**
* @short Spellcheck dialog
/** *
* @class Dialog plasma/dialog.h <Plasma/Dialog> * \code
* * Sonnet::Dialog dlg = new Sonnet::Dialog(
* @short A dialog that uses the Plasma style * new Sonnet::BackgroundChecker(this), this);
* * //connect signals
* Dialog provides a dialog-like widget that can be used to display additio * ...
nal * dlg->setBuffer( someText );
* information. * dlg->show();
* * \endcode
* Dialog uses the plasma theme, and usually has no window decoration. It's *
meant * You can change buffer inside a slot connected to done() signal
* as an interim solution to display widgets as extension to plasma applets * and spellcheck will continue with new data automatically.
, for */
* example when you click on an applet like the devicenotifier or the clock class KDEUI_EXPORT Dialog : public KDialog
, the {
* widget that is then displayed, is a Dialog. Q_OBJECT
*/
class PLASMA_EXPORT Dialog : public QWidget
{
Q_OBJECT
public: public:
/** Dialog(BackgroundChecker *checker,
* Use these flags to choose the active resize corners. QWidget *parent);
*/ ~Dialog();
enum ResizeCorner {
NoCorner = 0, QString originalBuffer() const;
NorthEast = 1, QString buffer() const;
SouthEast = 2,
NorthWest = 4, void show();
SouthWest = 8, void activeAutoCorrect(bool _active);
All = NorthEast | SouthEast | NorthWest | SouthWest
}; // Hide warning about done(), which is a slot in QDialog and a sign
Q_DECLARE_FLAGS(ResizeCorners, ResizeCorner) al here.
using KDialog::done;
/**
* @param parent the parent widget, for plasmoids, this is usually /**
0. * Controls whether an (indefinite) progress dialog is shown when t
* @param f the Qt::WindowFlags, default is to not show a windowbor he spell
der. * checking takes longer than the given time to complete. By defaul
*/ t no
explicit Dialog(QWidget * parent = 0, Qt::WindowFlags f = Qt::Wind * progress dialog is shown. If the progress dialog is set to be sh
ow); own, no
virtual ~Dialog(); * time consuming operation (for example, showing a notification me
ssage) should
/** * be performed in a slot connected to the 'done' signal as this mi
* Sets a QGraphicsWidget to be shown as the content in this dialog ght trigger
. * the progress dialog unnecessarily.
* The dialog will then set up a QGraphicsView and coordinate geome
try with
* the widget automatically.
* *
* @param widget the QGraphicsWidget to display in this dialog * @param timeout time after which the progress dialog should appea
*/ r; a negative
void setGraphicsWidget(QGraphicsWidget *widget); * value can be used to hide it
* @since 4.4
/**
* @return the graphics widget shown in this dialog
*/
QGraphicsWidget *graphicsWidget();
/**
* @param corners the corners the resize handlers should be placed
in.
*/
void setResizeHandleCorners(ResizeCorners corners);
/**
* Convenience method to get the enabled resize corners.
* @return which resize corners are active.
*/
ResizeCorners resizeCorners() const;
/**
* @return true if currently being resized by the user
*/ */
bool isUserResizing() const; void showProgressDialog(int timeout = 500);
/** /**
* Sets the minimum values that each of four sides of the rect may * Controls whether a message box indicating the completion of the
expand to or from spell checking
* is shown or not. By default it is not shown.
* *
* @param left the screen coordinate that the left may not go beyon * @since 4.4
d; -1 for no limit
* @param top the screen coordinate that the top may not go beyond;
-1 for no limit
* @param right the screen coordinate that the right may not go bey
ond; -1 for no limit
* @param bottom the screen coordinate that the bottom may not go b
eyond; -1 for no limit
*/ */
void setMinimumResizeLimits(int left, int top, int right, int botto m); void showSpellCheckCompletionMessage( bool b = true );
/** /**
* Retrives the minimum resize limits for the dialog * Controls whether the spell checking is continued after the repla
cement of a
* misspelled word has been performed. By default it is continued.
* *
* @param left the screen coordinate that the left may not go beyon
d; -1 for no limit
* @param top the screen coordinate that the top may not go beyond;
-1 for no limit
* @param right the screen coordinate that the right may not go bey
ond; -1 for no limit
* @param bottom the screen coordinate that the bottom may not go b
eyond; -1 for no limit
*/
void getMinimumResizeLimits(int *left, int *top, int *right, int *b
ottom);
/**
* Causes an animated hide; requires compositing to work, otherwise
* the dialog will simply hide.
* @since 4.3
*/
void animatedHide(Plasma::Direction direction);
/**
* Causes an animated show; requires compositing to work, otherwise
* the dialog will simply show.
* @since 4.3
*/
void animatedShow(Plasma::Direction direction);
/**
* @return the preferred aspect ratio mode for placement and resizi
ng
* @since 4.4 * @since 4.4
*/ */
Plasma::AspectRatioMode aspectRatioMode() const; void setSpellCheckContinuedAfterReplacement( bool b );
/** public Q_SLOTS:
* Sets the preferred aspect ratio mode for placement and resizing void setBuffer(const QString &);
* @since 4.4
*/
void setAspectRatioMode(Plasma::AspectRatioMode mode);
Q_SIGNALS: Q_SIGNALS:
/** /**
* Fires when the dialog automatically resizes. * The dialog won't be closed if you setBuffer() in slot connected
to this signal
*
* Also emitted after stop() signal
*/ */
void dialogResized(); void done( const QString& newBuffer );
void misspelling( const QString& word, int start );
void replace( const QString& oldWord, int start,
const QString& newWord );
/** void stop();
* Emit a signal when the dialog become visible/invisible void cancel();
*/ void autoCorrect( const QString & currentWord, const QString & repl
void dialogVisible(bool status); aceWord );
public Q_SLOTS:
/** /**
* Adjusts the dialog to the associated QGraphicsWidget's geometry * Signal sends when spell checking is finished/stopped/completed
* Should not normally need to be called by users of Dialog as Dial * @since 4.1
og
* does it automatically. Event compression may cause unwanted dela
ys,
* however, and so this method may be called to immediately cause a
* synchronization.
* @since 4.5
*/
void syncToGraphicsWidget();
protected:
/**
* Reimplemented from QWidget
*/
void paintEvent(QPaintEvent *e);
bool event(QEvent *event);
void resizeEvent(QResizeEvent *e);
bool eventFilter(QObject *watched, QEvent *event);
void hideEvent(QHideEvent *event);
void showEvent(QShowEvent *event);
void focusInEvent(QFocusEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void keyPressEvent(QKeyEvent *event);
void moveEvent(QMoveEvent *event);
/**
* Convenience method to know whether the point is in a control are
a (e.g. resize area)
* or not.
* @return true if the point is in the control area.
*/ */
bool inControlArea(const QPoint &point); void spellCheckStatus(const QString &);
private:
DialogPrivate *const d;
friend class DialogPrivate;
/** /**
* React to theme changes * Emitted when the user changes the language used for spellcheckin
g,
* which is shown in a combobox of this dialog.
*
* @param dictionary the new language the user selected
* @since 4.1
*/ */
Q_PRIVATE_SLOT(d, void themeChanged()) void languageChanged( const QString &language );
Q_PRIVATE_SLOT(d, void checkBorders())
Q_PRIVATE_SLOT(d, void delayedAdjustSize())
friend class PopupAppletPrivate; private Q_SLOTS:
}; void slotMisspelling(const QString& word, int start );
void slotDone();
void slotFinished();
void slotCancel();
void slotAddWord();
void slotReplaceWord();
void slotReplaceAll();
void slotSkip();
void slotSkipAll();
void slotSuggest();
void slotChangeLanguage( const QString& );
void slotSelectionChanged(const QModelIndex &);
void slotAutocorrect();
} // Plasma namespace void setGuiEnabled(bool b);
void setProgressDialogVisible(bool b);
Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::Dialog::ResizeCorners) private:
void updateDialog( const QString& word );
void fillDictionaryComboBox();
void updateDictionaryComboBox();
void fillSuggestions( const QStringList& suggs );
void initConnections();
void initGui();
void continueChecking();
private:
class Private;
Private* const d;
Q_DISABLE_COPY( Dialog )
};
}
#endif #endif
 End of changes. 31 change blocks. 
190 lines changed or deleted 129 lines changed or added


 global.h   global.h 
skipping to change at line 29 skipping to change at line 29
#ifndef KIO_GLOBAL_H #ifndef KIO_GLOBAL_H
#define KIO_GLOBAL_H #define KIO_GLOBAL_H
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QFile> // for QFile::Permissions
#include <kiconloader.h> #include <kiconloader.h>
#include <QtGui/QPixmap> // for pixmapForUrl #include <QtGui/QPixmap> // for pixmapForUrl
#include <sys/stat.h> // S_ISDIR #include <sys/stat.h> // S_ISDIR
#include <sys/types.h> // mode_t #include <sys/types.h> // mode_t
#include <kjob.h> #include <kjob.h>
#ifdef Q_CC_MSVC #ifdef Q_CC_MSVC
skipping to change at line 379 skipping to change at line 380
* KIconLoader::ActiveState or KIconLoader::DisabledState. * KIconLoader::ActiveState or KIconLoader::DisabledState.
* @param _path Output parameter to get the full path. Seldom needed. * @param _path Output parameter to get the full path. Seldom needed.
* Ignored if 0 * Ignored if 0
* @return the pixmap of the URL, can be a default icon if not found * @return the pixmap of the URL, can be a default icon if not found
*/ */
KIO_EXPORT QPixmap pixmapForUrl( const KUrl & _url, mode_t _mode = 0, KIc onLoader::Group _group = KIconLoader::Desktop, KIO_EXPORT QPixmap pixmapForUrl( const KUrl & _url, mode_t _mode = 0, KIc onLoader::Group _group = KIconLoader::Desktop,
int _force_size = 0, int _state = 0, QSt ring * _path = 0 ); int _force_size = 0, int _state = 0, QSt ring * _path = 0 );
KIO_EXPORT KJobTrackerInterface *getJobTracker(); KIO_EXPORT KJobTrackerInterface *getJobTracker();
/**
* Converts KIO file permissions from mode_t to QFile::Permissions format
.
*
* This is a convenience function for converting KIO permissions paramete
r from
* mode_t to QFile::Permissions.
*
* @param permissions KIO file permissions.
*
* @return -1 if @p permissions is -1, otherwise its OR'ed QFile::Permiss
ion equivalent.
* @since 4.12
*/
KIO_EXPORT QFile::Permissions convertPermissions(int permissions);
/** /**
* MetaData is a simple map of key/value strings. * MetaData is a simple map of key/value strings.
*/ */
class KIO_EXPORT MetaData : public QMap<QString, QString> class KIO_EXPORT MetaData : public QMap<QString, QString>
{ {
public: public:
/** /**
* Creates an empty meta data map. * Creates an empty meta data map.
*/ */
MetaData() : QMap<QString, QString>() { } MetaData() : QMap<QString, QString>() { }
 End of changes. 2 change blocks. 
0 lines changed or deleted 17 lines changed or added


 karchive.h   karchive.h 
skipping to change at line 583 skipping to change at line 583
*/ */
const KArchiveEntry* entry( const QString& name ) const; const KArchiveEntry* entry( const QString& name ) const;
/** /**
* @internal * @internal
* Adds a new entry to the directory. * Adds a new entry to the directory.
*/ */
void addEntry( KArchiveEntry* ); void addEntry( KArchiveEntry* );
/** /**
* @internal
* Adds a new entry to the directory.
*/
void removeEntry( KArchiveEntry* );
/**
* Checks whether this entry is a directory. * Checks whether this entry is a directory.
* @return true, since this entry is a directory * @return true, since this entry is a directory
*/ */
virtual bool isDirectory() const; virtual bool isDirectory() const;
/** /**
* Extracts all entries in this archive directory to the directory * Extracts all entries in this archive directory to the directory
* @p dest. * @p dest.
* @param dest the directory to extract to * @param dest the directory to extract to
* @param recursive if set to true, subdirectories are extracted as wel l * @param recursive if set to true, subdirectories are extracted as wel l
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 kbuttongroup.h   kbuttongroup.h 
skipping to change at line 41 skipping to change at line 41
* @short Group box with index of the selected button * @short Group box with index of the selected button
* KButtonGroup is a simple group box that can keep track of the current se lected * KButtonGroup is a simple group box that can keep track of the current se lected
* button of the ones added to it. * button of the ones added to it.
* *
* Use normally as you would with a QGroupBox. * Use normally as you would with a QGroupBox.
* *
* \image html kbuttongroup.png "KDE Button Group containing 3 KPushButtons " * \image html kbuttongroup.png "KDE Button Group containing 3 KPushButtons "
* *
* @author Pino Toscano <toscano.pino@tiscali.it> * @author Pino Toscano <toscano.pino@tiscali.it>
*/ */
class KDEUI_EXPORT KButtonGroup class KDEUI_EXPORT KButtonGroup : public QGroupBox
: public QGroupBox
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int current READ selected WRITE setSelected NOTIFY changed USE R true) Q_PROPERTY(int current READ selected WRITE setSelected NOTIFY changed U SER true)
public: public:
/** /**
* Construct a new empty KGroupBox. * Construct a new empty KGroupBox.
*/ */
explicit KButtonGroup( QWidget* parent = 0 ); explicit KButtonGroup(QWidget* parent = 0);
/** /**
* Destroys the widget. * Destroys the widget.
*/ */
~KButtonGroup(); ~KButtonGroup();
/** /**
* Return the index of the selected QAbstractButton, among the QAbstrac tButton's * Return the index of the selected QAbstractButton, among the QAbstrac tButton's
* added to the widget. * added to the widget.
* @return the index of the selected button * @return the index of the selected button
*/ */
int selected() const; int selected() const;
/** /**
* @return the index of @p button. * @return the index of @p button.
* @since 4.3 * @since 4.3
*/ */
int id( QAbstractButton* button ) const; int id(QAbstractButton* button) const;
public Q_SLOTS: public Q_SLOTS:
/** /**
* Select the \p id -th button * Select the \p id -th button
*/ */
void setSelected( int id ); void setSelected(int id);
Q_SIGNALS: Q_SIGNALS:
/** /**
* The button with index \p id was clicked * The button with index \p id was clicked
*/ */
void clicked( int id ); void clicked(int id);
/** /**
* The button with index \p id was pressed * The button with index \p id was pressed
*/ */
void pressed( int id ); void pressed(int id);
/** /**
* The button with index \p id was released * The button with index \p id was released
*/ */
void released( int id ); void released(int id);
/** /**
* Emitted when anything (a click on a button, or calling setSelected() ) * Emitted when anything (a click on a button, or calling setSelected() )
* change the id of the current selected. \p id is the index of the new * change the id of the current selected. \p id is the index of the new
* selected button. * selected button.
*/ */
void changed( int id ); void changed(int id);
protected: protected:
/** /**
* Reimplemented from QGroupBox. * Reimplemented from QGroupBox.
*/ */
virtual void childEvent( QChildEvent* event ); virtual void childEvent(QChildEvent* event);
private: private:
Q_PRIVATE_SLOT(d, void slotClicked( int id )) Q_PRIVATE_SLOT(d, void slotClicked(int id))
private:
class Private; class Private;
friend class Private; friend class Private;
Private * const d; Private * const d;
}; };
#endif #endif
 End of changes. 17 change blocks. 
19 lines changed or deleted 18 lines changed or added


 kcmdlineargs.h   kcmdlineargs.h 
skipping to change at line 82 skipping to change at line 82
~KCmdLineOptions (); ~KCmdLineOptions ();
/** /**
* Add command line option, by providing its name, description, and * Add command line option, by providing its name, description, and
* possibly a default value. These will print out when <i>myapp --help< /i> * possibly a default value. These will print out when <i>myapp --help< /i>
* is called on the command line. * is called on the command line.
* *
* Note that a long option can only have one short (single character) a lias * Note that a long option can only have one short (single character) a lias
* *
* @since 4.6 Note that the following does not apply to options that be gin * @since 4.6 Note that the following does not apply to options that be gin
* with "no" and expect a parameter, like "nooption4" in the example be llow. * with "no" and expect a parameter, like "nooption4" in the example be low.
* *
* Note that if the option name begin with "no" that you will need to t est * Note that if the option name begin with "no" that you will need to t est
* for the name without the "no" and the result will be the inverse of what * for the name without the "no" and the result will be the inverse of what
* is specified. i.e. if "nofoo" is the name of the option and * is specified. i.e. if "nofoo" is the name of the option and
* <i>myapp --nofoo</i> is called: * <i>myapp --nofoo</i> is called:
* *
* @code * @code
* KCmdLineArgs::parsedArgs()->isSet("foo"); // false * KCmdLineArgs::parsedArgs()->isSet("foo"); // false
* @endcode * @endcode
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 kconfig.h   kconfig.h 
skipping to change at line 196 skipping to change at line 196
const KComponentData &componentData() const; // krazy:exclude=constref const KComponentData &componentData() const; // krazy:exclude=constref
/** /**
* Returns the filename used to store the configuration. * Returns the filename used to store the configuration.
*/ */
QString name() const; QString name() const;
/// @reimp /// @reimp
void sync(); void sync();
/// Returns true if sync has any changes to write out.
/// @since 4.12
bool isDirty() const;
/// @reimp /// @reimp
void markAsClean(); void markAsClean();
/// @{ configuration object state /// @{ configuration object state
/// @reimp /// @reimp
AccessMode accessMode() const; AccessMode accessMode() const;
/** /**
* Whether the configuration can be written to. * Whether the configuration can be written to.
* *
skipping to change at line 404 skipping to change at line 408
/** Virtual hook, used to add new "virtual" functions while maintaining /** Virtual hook, used to add new "virtual" functions while maintaining
* binary compatibility. Unused in this class. * binary compatibility. Unused in this class.
*/ */
virtual void virtual_hook( int id, void* data ); virtual void virtual_hook( int id, void* data );
KConfigPrivate *const d_ptr; KConfigPrivate *const d_ptr;
KConfig(KConfigPrivate &d); KConfig(KConfigPrivate &d);
private: private:
bool isDirty() const;
friend class KConfigTest; friend class KConfigTest;
QStringList keyList(const QString& aGroup=QString()) const; QStringList keyList(const QString& aGroup=QString()) const;
Q_DISABLE_COPY(KConfig) Q_DISABLE_COPY(KConfig)
Q_DECLARE_PRIVATE(KConfig) Q_DECLARE_PRIVATE(KConfig)
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS( KConfig::OpenFlags ) Q_DECLARE_OPERATORS_FOR_FLAGS( KConfig::OpenFlags )
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 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.11.3" #define KDE_VERSION_STRING "4.12.0"
/** /**
* @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 11 #define KDE_VERSION_MINOR 12
/** /**
* @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 3 #define KDE_VERSION_RELEASE 0
/** /**
* @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. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 kfilemetadataconfigurationwidget.h   kfilemetadataconfigurationwidget.h 
skipping to change at line 29 skipping to change at line 29
#ifndef KFILEMETADATACONFIGURATIONWIDGET_H #ifndef KFILEMETADATACONFIGURATIONWIDGET_H
#define KFILEMETADATACONFIGURATIONWIDGET_H #define KFILEMETADATACONFIGURATIONWIDGET_H
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <kfileitem.h> #include <kfileitem.h>
#include <QWidget> #include <QWidget>
/** /**
* @deprecated since 4.12, use Nepomuk2::FileMetaDataConfigurationWidget
*
* @brief Widget which allows to configure which meta data should be shown * @brief Widget which allows to configure which meta data should be shown
* in the KFileMetaDataWidget. * in the KFileMetaDataWidget.
* *
* Note that the class is marked as internal and the API might change. * Note that the class is marked as internal and the API might change.
* It is planned to make the class public in future KDE SC's, after the API has * It is planned to make the class public in future KDE SC's, after the API has
* been stabilized. * been stabilized.
* *
* @see KFileMetaDataWidget * @see KFileMetaDataWidget
* @since 4.5 * @since 4.5
* @internal * @internal
*/ */
// TODO: A signal is required which indicates configuration changes. Otherw ise // TODO: A signal is required which indicates configuration changes. Otherw ise
// it would not be possible for an application developer to enable/disable an // it would not be possible for an application developer to enable/disable an
// "Apply" button of a dialog. // "Apply" button of a dialog.
class KIO_EXPORT KFileMetaDataConfigurationWidget : public QWidget class KIO_EXPORT_DEPRECATED KFileMetaDataConfigurationWidget : public QWidg et
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit KFileMetaDataConfigurationWidget(QWidget* parent = 0); explicit KFileMetaDataConfigurationWidget(QWidget* parent = 0);
virtual ~KFileMetaDataConfigurationWidget(); virtual ~KFileMetaDataConfigurationWidget();
/** /**
* Sets the items, for which the visibility of the meta data should * Sets the items, for which the visibility of the meta data should
* be configured. Note that the visibility of the meta data is not * be configured. Note that the visibility of the meta data is not
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 kfilemetadatawidget.h   kfilemetadatawidget.h 
skipping to change at line 33 skipping to change at line 33
#include <kio/kio_export.h> #include <kio/kio_export.h>
#include <kfileitem.h> #include <kfileitem.h>
#include <QList> #include <QList>
#include <QWidget> #include <QWidget>
class KUrl; class KUrl;
/** /**
* @deprecated since 4.12 use Nepomuk2::FileMetaDataWidget
*
* @brief Shows the meta data of one or more file items. * @brief Shows the meta data of one or more file items.
* *
* Meta data like name, size, rating, comment, ... are * Meta data like name, size, rating, comment, ... are
* shown as several rows containing a description and * shown as several rows containing a description and
* the meta data value. It is possible for the user * the meta data value. It is possible for the user
* to change specific meta data like rating, tags and * to change specific meta data like rating, tags and
* comment. The changes are stored automatically by the * comment. The changes are stored automatically by the
* meta data widget. * meta data widget.
* *
* @since 4.5 * @since 4.5
*/ */
class KIO_EXPORT KFileMetaDataWidget : public QWidget class KIO_EXPORT_DEPRECATED KFileMetaDataWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
public: public:
explicit KFileMetaDataWidget(QWidget* parent = 0); explicit KFileMetaDataWidget(QWidget* parent = 0);
virtual ~KFileMetaDataWidget(); virtual ~KFileMetaDataWidget();
/** /**
* Sets the items for which the meta data should be shown. * Sets the items for which the meta data should be shown.
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 kmountpoint.h   kmountpoint.h 
skipping to change at line 117 skipping to change at line 117
*/ */
QString mountType() const; QString mountType() const;
/** /**
* Options used to mount the filesystem. * Options used to mount the filesystem.
* Only available when the NeedMountOptions flag was set. * Only available when the NeedMountOptions flag was set.
*/ */
QStringList mountOptions() const; QStringList mountOptions() const;
/** /**
* Checks if the filesystem that is probably slow (nfs mounts). * Checks if the filesystem that is probably slow (network mounts).
* @return true if the filesystem is probably slow * @return true if the filesystem is probably slow
*/ */
bool probablySlow() const; bool probablySlow() const;
enum FileSystemFlag { SupportsChmod, SupportsChown, SupportsUTime, enum FileSystemFlag { SupportsChmod, SupportsChown, SupportsUTime,
SupportsSymlinks, CaseInsensitive }; SupportsSymlinks, CaseInsensitive };
/** /**
* Checks the capabilities of the filesystem. * Checks the capabilities of the filesystem.
* @param flag the flag to check * @param flag the flag to check
* @return true if the filesystem has that flag, false if not * @return true if the filesystem has that flag, false if not
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ktcpsocket.h   ktcpsocket.h 
skipping to change at line 239 skipping to change at line 239
virtual bool canReadLine() const; virtual bool canReadLine() const;
virtual void close(); virtual void close();
virtual bool isSequential() const; virtual bool isSequential() const;
virtual bool open(QIODevice::OpenMode open); virtual bool open(QIODevice::OpenMode open);
virtual bool waitForBytesWritten(int msecs); virtual bool waitForBytesWritten(int msecs);
//### Document that this actually tries to read *more* data //### Document that this actually tries to read *more* data
virtual bool waitForReadyRead(int msecs = 30000); virtual bool waitForReadyRead(int msecs = 30000);
protected: protected:
virtual qint64 readData (char *data, qint64 maxSize); virtual qint64 readData (char *data, qint64 maxSize);
virtual qint64 writeData (const char *data, qint64 maxSize); virtual qint64 writeData (const char *data, qint64 maxSize);
signals: Q_SIGNALS:
/// @since 4.8.1 /// @since 4.8.1
/// Forwarded from QSslSocket /// Forwarded from QSslSocket
void encryptedBytesWritten( qint64 written ); void encryptedBytesWritten( qint64 written );
public: public:
//from QAbstractSocket //from QAbstractSocket
void abort(); void abort();
void connectToHost(const QString &hostName, quint16 port, ProxyPolicy p olicy = AutoProxy); void connectToHost(const QString &hostName, quint16 port, ProxyPolicy p olicy = AutoProxy);
void connectToHost(const QHostAddress &hostAddress, quint16 port, Proxy Policy policy = AutoProxy); void connectToHost(const QHostAddress &hostAddress, quint16 port, Proxy Policy policy = AutoProxy);
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ktextbrowser.h   ktextbrowser.h 
skipping to change at line 41 skipping to change at line 41
* An extended QTextBrowser. * An extended QTextBrowser.
* *
* By default it will * By default it will
* invoke the system mailer or the system browser when a link is * invoke the system mailer or the system browser when a link is
* activated, or it can emit the signal urlClick() or mailClick() * activated, or it can emit the signal urlClick() or mailClick()
* when a link is activated. * when a link is activated.
* *
* If the link starts with the text "whatsthis:" a QWhatsThis * If the link starts with the text "whatsthis:" a QWhatsThis
* box will appear and then display the rest of the text. * box will appear and then display the rest of the text.
* *
* @warning The "whatsthis:" feature is considered deprecated: it is not
* available in KDE Frameworks 5, because KDE Frameworks 5 does
* not provide KTextBrowser anymore.
*
* \image html ktextbrowser.png "KDE Text Browser" * \image html ktextbrowser.png "KDE Text Browser"
* *
* @author Espen Sand (espensa@online.no) * @author Espen Sand (espensa@online.no)
*/ */
class KDEUI_EXPORT KTextBrowser : public QTextBrowser class KDEUI_EXPORT KTextBrowser : public QTextBrowser
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick ) Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 kxmlguiwindow.h   kxmlguiwindow.h 
skipping to change at line 117 skipping to change at line 117
/** /**
* \brief Destructor. * \brief Destructor.
* *
* Will also destroy the toolbars, and menubar if * Will also destroy the toolbars, and menubar if
* needed. * needed.
*/ */
virtual ~KXmlGuiWindow(); virtual ~KXmlGuiWindow();
/** /**
* Enables the build of a standard help menu when calling createGUI(). * Enables the build of a standard help menu when calling createGUI/set upGUI().
* *
* The default behavior is to build one, you must call this function * The default behavior is to build one, you must call this function
* to disable it * to disable it
*/ */
void setHelpMenuEnabled(bool showHelpMenu = true); void setHelpMenuEnabled(bool showHelpMenu = true);
/** /**
* Return @p true when the help menu is enabled * Return @p true when the help menu is enabled
*/ */
bool isHelpMenuEnabled() const; bool isHelpMenuEnabled() const;
virtual KXMLGUIFactory *guiFactory(); virtual KXMLGUIFactory *guiFactory();
/** /**
* Create a GUI given a local XML file. * Create a GUI given a local XML file. In a regular app you usually wa
nt to use
* setupGUI() instead of this one since it does more things for free
* like setting up the toolbar/shortcut edit actions, etc.
* *
* If @p xmlfile is NULL, * If @p xmlfile is NULL,
* then it will try to construct a local XML filename like * then it will try to construct a local XML filename like
* appnameui.rc where 'appname' is your app's name. If that file * appnameui.rc where 'appname' is your app's name. If that file
* does not exist, then the XML UI code will only use the global * does not exist, then the XML UI code will only use the global
* (standard) XML file for the layout purposes. * (standard) XML file for the layout purposes.
* *
* @param xmlfile The local xmlfile (relative or absolute) * @param xmlfile The local xmlfile (relative or absolute)
*/ */
void createGUI( const QString &xmlfile = QString() ); void createGUI( const QString &xmlfile = QString() );
 End of changes. 2 change blocks. 
2 lines changed or deleted 5 lines changed or added


 slavebase.h   slavebase.h 
skipping to change at line 457 skipping to change at line 457
* be issued, i.e. the whole file will be downloaded before * be issued, i.e. the whole file will be downloaded before
* determining the mimetype on it - this is obviously not a * determining the mimetype on it - this is obviously not a
* good thing in most cases. * good thing in most cases.
*/ */
virtual void mimetype( const KUrl& url ); virtual void mimetype( const KUrl& url );
/** /**
* Lists the contents of @p url. * Lists the contents of @p url.
* The slave should emit ERR_CANNOT_ENTER_DIRECTORY if it doesn't exist , * The slave should emit ERR_CANNOT_ENTER_DIRECTORY if it doesn't exist ,
* if we don't have enough permissions. * if we don't have enough permissions.
* It should also emit totalFiles as soon as it knows how many
* files it will list. * files it will list.
* You should not list files if the path in @p url is empty, but redire
ct
* to a non-empty path instead.
*/ */
virtual void listDir( const KUrl& url ); virtual void listDir( const KUrl& url );
/** /**
* Create a directory * Create a directory
* @param url path to the directory to create * @param url path to the directory to create
* @param permissions the permissions to set after creating the directo ry * @param permissions the permissions to set after creating the directo ry
* (-1 if no permissions to be set) * (-1 if no permissions to be set)
* The slave emits ERR_COULD_NOT_MKDIR if failure. * The slave emits ERR_COULD_NOT_MKDIR if failure.
*/ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 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/