Dialog | Dialog | |||
---|---|---|---|---|
#include "../../sonnet/dialog.h" | #include "../../plasma/dialog.h" | |||
End of changes. 1 change blocks. | ||||
lines changed or deleted | lines changed or added | |||
Job.h | Job.h | |||
---|---|---|---|---|
skipping to change at line 131 | skipping to change at line 131 | |||
Call this method to ask the Job to abort if it is currently exe cuted. | Call this method to ask the Job to abort if it is currently exe cuted. | |||
Please note that the default implementation of the method does | Please note that the default implementation of the method does | |||
nothing (!). This is due to the fact that there is no generic | nothing (!). This is due to the fact that there is no generic | |||
method to abort a processing Job. Not even a default boolean fl ag | method to abort a processing Job. Not even a default boolean fl ag | |||
makes sense, as Job could, for example, be in an event loop and | makes sense, as Job could, for example, be in an event loop and | |||
will need to create an exit event. | will need to create an exit event. | |||
You have to reimplement the method to actually initiate an abor t | You have to reimplement the method to actually initiate an abor t | |||
action. | action. | |||
The method is not pure virtual because users are not supposed t o | The method is not pure virtual because users are not supposed t o | |||
be forced to always implement requestAbort(). | be forced to always implement requestAbort(). | |||
Also, this method is supposed to return immidiately, not after the | Also, this method is supposed to return immediately, not after the | |||
abort has completed. It requests the abort, the Job has to act on | abort has completed. It requests the abort, the Job has to act on | |||
the request. */ | the request. */ | |||
// FIXME (Mirko) this should be private, I guess? | // FIXME (Mirko) this should be private, I guess? | |||
virtual void requestAbort () {} | virtual void requestAbort () {} | |||
/** The job is about to be added to the weaver's job queue. | /** The job is about to be added to the weaver's job queue. | |||
The job will be added right after this method finished. The | The job will be added right after this method finished. The | |||
default implementation does nothing. | default implementation does nothing. | |||
Use this method to, for example, queue sub-operations as jobs | Use this method to, for example, queue sub-operations as jobs | |||
before the job itself is queued. | before the job itself is queued. | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
WeaverInterface.h | WeaverInterface.h | |||
---|---|---|---|---|
skipping to change at line 96 | skipping to change at line 96 | |||
(threads, jobs). Usually, access to the signals of those object s | (threads, jobs). Usually, access to the signals of those object s | |||
is not provided through the weaver API. Use an observer to reve ice | is not provided through the weaver API. Use an observer to reve ice | |||
notice, for example, on thread activity. | notice, for example, on thread activity. | |||
To unregister, simply delete the observer. | To unregister, simply delete the observer. | |||
*/ | */ | |||
virtual void registerObserver ( WeaverObserver* ) = 0; | virtual void registerObserver ( WeaverObserver* ) = 0; | |||
/** Add a job to be executed. | /** Add a job to be executed. | |||
It depends on the state if execution of the job will be attempt ed | It depends on the state if execution of the job will be attempt ed | |||
immidiately. In suspended state, jobs can be added to the queue , | immediately. In suspended state, jobs can be added to the queue , | |||
but the threads remain suspended. In WorkongHard state, an idle | but the threads remain suspended. In WorkongHard state, an idle | |||
thread may immidiately execute the job, or it might be queued i f | thread may immediately execute the job, or it might be queued i f | |||
all threads are busy. | all threads are busy. | |||
*/ | */ | |||
virtual void enqueue ( Job* ) = 0; | virtual void enqueue ( Job* ) = 0; | |||
/** Remove a job from the queue. | /** Remove a job from the queue. | |||
If the job was queued but not started so far, it is simply | If the job was queued but not started so far, it is simply | |||
removed from the queue. For now, it is unsupported to | removed from the queue. For now, it is unsupported to | |||
dequeue a job once its execution has started. | dequeue a job once its execution has started. | |||
For that case, you will have to provide a method to interrupt yo ur | For that case, you will have to provide a method to interrupt yo ur | |||
job's execution (and receive the done signal). | job's execution (and receive the done signal). | |||
Returns true if the job has been dequeued, false if the | Returns true if the job has been dequeued, false if the | |||
skipping to change at line 134 | skipping to change at line 134 | |||
Warning: If one of your jobs enters an infinite loop, this | Warning: If one of your jobs enters an infinite loop, this | |||
will never return! */ | will never return! */ | |||
virtual void finish () = 0; | virtual void finish () = 0; | |||
/** Suspend job execution. | /** Suspend job execution. | |||
When suspending, all threads are allowed to finish the | When suspending, all threads are allowed to finish the | |||
currently assigned job but will not receive a new | currently assigned job but will not receive a new | |||
assignment. | assignment. | |||
When all threads are done processing the assigned job, the | When all threads are done processing the assigned job, the | |||
signal suspended will() be emitted. | signal suspended will() be emitted. | |||
If you call suspend() and there are no jobs left to | If you call suspend() and there are no jobs left to | |||
be done, you will immidiately receive the suspended() | be done, you will immediately receive the suspended() | |||
signal. */ | signal. */ | |||
virtual void suspend () = 0; | virtual void suspend () = 0; | |||
/** Resume job queueing. | /** Resume job queueing. | |||
@see suspend | @see suspend | |||
*/ | */ | |||
virtual void resume () = 0; | virtual void resume () = 0; | |||
/** Is the queue empty? | /** Is the queue empty? | |||
The queue is empty if no more jobs are queued. */ | The queue is empty if no more jobs are queued. */ | |||
virtual bool isEmpty () const = 0; | virtual bool isEmpty () const = 0; | |||
/** Is the weaver idle? | /** Is the weaver idle? | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
applet.h | applet.h | |||
---|---|---|---|---|
skipping to change at line 80 | skipping to change at line 80 | |||
* look and feel in just one line of code for applets), loading and startin g | * look and feel in just one line of code for applets), loading and startin g | |||
* of scripting support for each applet, providing access to the associated | * of scripting support for each applet, providing access to the associated | |||
* plasmoid package (if any) and access to configuration data. | * plasmoid package (if any) and access to configuration data. | |||
* | * | |||
* See techbase.kde.org for tutorials on writing Applets using this class. | * See techbase.kde.org for tutorials on writing Applets using this class. | |||
*/ | */ | |||
class PLASMA_EXPORT Applet : public QGraphicsWidget | class PLASMA_EXPORT Applet : public QGraphicsWidget | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(bool hasConfigurationInterface READ hasConfigurationInterfac e) | Q_PROPERTY(bool hasConfigurationInterface READ hasConfigurationInterfac e) | |||
Q_PROPERTY(QString name READ name) | Q_PROPERTY(QString name READ name CONSTANT) | |||
Q_PROPERTY(QString pluginName READ pluginName) | Q_PROPERTY(QString pluginName READ pluginName CONSTANT) | |||
Q_PROPERTY(QString category READ category) | Q_PROPERTY(QString category READ category CONSTANT) | |||
Q_PROPERTY(ImmutabilityType immutability READ immutability WRITE setImm utability) | Q_PROPERTY(ImmutabilityType immutability READ immutability WRITE setImm utability) | |||
Q_PROPERTY(bool hasFailedToLaunch READ hasFailedToLaunch WRITE setFaile dToLaunch) | Q_PROPERTY(bool hasFailedToLaunch READ hasFailedToLaunch WRITE setFaile dToLaunch) | |||
Q_PROPERTY(bool isBusy READ isBusy WRITE setBusy) //KDE5: remove | Q_PROPERTY(bool isBusy READ isBusy WRITE setBusy) //KDE5: remove | |||
Q_PROPERTY(bool busy READ isBusy WRITE setBusy) | Q_PROPERTY(bool busy READ isBusy WRITE setBusy) | |||
Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired) | Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired) | |||
Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry) | Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry) | |||
Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources) | Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources) | |||
Q_PROPERTY(uint id READ id) | Q_PROPERTY(uint id READ id CONSTANT) | |||
Q_PROPERTY(bool userConfiguring READ isUserConfiguring) | Q_PROPERTY(bool userConfiguring READ isUserConfiguring) | |||
Q_PROPERTY(BackgroundHints backgroundHints READ backgroundHints WRITE s etBackgroundHints) | Q_PROPERTY(BackgroundHints backgroundHints READ backgroundHints WRITE s etBackgroundHints) | |||
Q_ENUMS(BackgroundHints) | Q_ENUMS(BackgroundHints) | |||
public: | public: | |||
typedef QList<Applet*> List; | typedef QList<Applet*> List; | |||
typedef QHash<QString, Applet*> Dict; | typedef QHash<QString, Applet*> Dict; | |||
/** | /** | |||
* Description on how draw a background for the applet | * Description on how draw a background for the applet | |||
End of changes. 2 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added | |||
browserrun.h | browserrun.h | |||
---|---|---|---|---|
skipping to change at line 193 | skipping to change at line 193 | |||
/** | /** | |||
* Helper for foundMimeType: call this if the mimetype couldn't be embedded | * Helper for foundMimeType: call this if the mimetype couldn't be embedded | |||
* @param mimeType the mimetype found for the URL | * @param mimeType the mimetype found for the URL | |||
* @param pSelectedService Output variable: pointer to a KService:: Ptr, which will be set | * @param pSelectedService Output variable: pointer to a KService:: Ptr, which will be set | |||
* to the service selected in the BrowserOpenOrSaveQuestion dialog, if any. | * to the service selected in the BrowserOpenOrSaveQuestion dialog, if any. | |||
* | * | |||
* How to handle this properly: if pSelectedService is non-zero, th en the dialog will show | * How to handle this properly: if pSelectedService is non-zero, th en the dialog will show | |||
* additional "open with" buttons. In your code, you should write: | * additional "open with" buttons. In your code, you should write: | |||
* @code | * @code | |||
if (selectedService) { | if (selectedService) { | |||
KRun::setPreferredService(selectedService->desktopEntryName | KRun::setPreferredService(selectedService->desktopEntryName | |||
()); | ()); // not necessary since 4.9.3 | |||
// and let this code path fall back to KRun::foundMimeType( | KRun::foundMimeType(mimeType); | |||
mimeType); | } else { // the user requested an open-with dialog | |||
} else { | ||||
KRun::displayOpenWithDialog(url(), m_window, false, suggest edFileName()); | KRun::displayOpenWithDialog(url(), m_window, false, suggest edFileName()); | |||
setFinished(true); | setFinished(true); | |||
} | } | |||
* @endcode | * @endcode | |||
* | * | |||
* @since 4.5 | * @since 4.5 | |||
*/ | */ | |||
NonEmbeddableResult handleNonEmbeddable(const QString& mimeType, KS ervice::Ptr* pSelectedService); | NonEmbeddableResult handleNonEmbeddable(const QString& mimeType, KS ervice::Ptr* pSelectedService); | |||
protected Q_SLOTS: | protected Q_SLOTS: | |||
End of changes. 1 change blocks. | ||||
5 lines changed or deleted | 4 lines changed or added | |||
codecompletionmodelcontrollerinterface.h | codecompletionmodelcontrollerinterface.h | |||
---|---|---|---|---|
skipping to change at line 340 | skipping to change at line 340 | |||
* Called whenever an item in the completion-list perfectly matches the current filter text. | * Called whenever an item in the completion-list perfectly matches the current filter text. | |||
* \param The index that is matched | * \param The index that is matched | |||
* \return Whether the completion-list should be hidden on this event. The default-implementation always returns HideListIfAutomaticInvocation | * \return Whether the completion-list should be hidden on this event. The default-implementation always returns HideListIfAutomaticInvocation | |||
*/ | */ | |||
virtual MatchReaction matchingItem(const QModelIndex& matched); | virtual MatchReaction matchingItem(const QModelIndex& matched); | |||
}; | }; | |||
//END V3 | //END V3 | |||
} | } | |||
#ifndef KTEXTEDITOR_NO_DEPRECATED | ||||
Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface, "o rg.kde.KTextEditor.CodeCompletionModelControllerInterface") | Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface, "o rg.kde.KTextEditor.CodeCompletionModelControllerInterface") | |||
Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface2, " org.kde.KTextEditor.CodeCompletionModelControllerInterface2") | Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface2, " org.kde.KTextEditor.CodeCompletionModelControllerInterface2") | |||
#endif | ||||
Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface3, " org.kde.KTextEditor.CodeCompletionModelControllerInterface3") | Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface3, " org.kde.KTextEditor.CodeCompletionModelControllerInterface3") | |||
#endif // KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODELCONTROLLERINTERFACE_H | #endif // KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODELCONTROLLERINTERFACE_H | |||
End of changes. 3 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added | |||
configinterface.h | configinterface.h | |||
---|---|---|---|---|
skipping to change at line 72 | skipping to change at line 72 | |||
* A list of available config variables (or keys) can be optained by callin g | * A list of available config variables (or keys) can be optained by callin g | |||
* configKeys(). For all available keys configValue() returns the correspon ding | * configKeys(). For all available keys configValue() returns the correspon ding | |||
* value as QVariant. A value for a given key can be set by calling | * value as QVariant. A value for a given key can be set by calling | |||
* setConfigValue(). Right now, when using KatePart as editor component, | * setConfigValue(). Right now, when using KatePart as editor component, | |||
* KTextEditor::View has support for the following tuples: | * KTextEditor::View has support for the following tuples: | |||
* - line-numbers [bool], show/hide line numbers | * - line-numbers [bool], show/hide line numbers | |||
* - icon-bar [bool], show/hide icon bar | * - icon-bar [bool], show/hide icon bar | |||
* - dynamic-word-wrap [bool], enable/disable dynamic word wrap | * - dynamic-word-wrap [bool], enable/disable dynamic word wrap | |||
* - background-color [QColor], read/set the default background color | * - background-color [QColor], read/set the default background color | |||
* - selection-color [QColor], read/set the default color for selections | * - selection-color [QColor], read/set the default color for selections | |||
* - search-highlight-color [QColor], read/set the background color for se | ||||
arch | ||||
* - replace-highlight-color [QColor], read/set the background color for r | ||||
eplaces | ||||
* - default-mark-type [uint], read/set the default mark type | * - default-mark-type [uint], read/set the default mark type | |||
* - allow-mark-menu [bool], enable/disable the menu shown when right clic king | * - allow-mark-menu [bool], enable/disable the menu shown when right clic king | |||
* on the left gutter. When disabled, click on the gutter will always se t | * on the left gutter. When disabled, click on the gutter will always se t | |||
* or clear the mark of default type. | * or clear the mark of default type. | |||
* | * | |||
* KTextEditor::Document has support for the following: | * KTextEditor::Document has support for the following: | |||
* - auto-brackets [bool], enable/disable automatic bracket completion | ||||
* - backup-on-save-local [bool], enable/disable backup when saving local files | * - backup-on-save-local [bool], enable/disable backup when saving local files | |||
* - backup-on-save-remote [bool], enable/disable backup when saving remot e files | * - backup-on-save-remote [bool], enable/disable backup when saving remot e files | |||
* - backup-on-save-suffix [string], set the suffix for file backups, e.g. "~" | * - backup-on-save-suffix [string], set the suffix for file backups, e.g. "~" | |||
* - backup-on-save-prefix [string], set the prefix for file backups, e.g. "." | * - backup-on-save-prefix [string], set the prefix for file backups, e.g. "." | |||
* | * | |||
* Either interface should emit the \p configChanged signal when appropriat e. | * Either interface should emit the \p configChanged signal when appropriat e. | |||
* TODO: Add to interface in KDE 5. | * TODO: Add to interface in KDE 5. | |||
* | * | |||
* For instance, if you want to enable dynamic word wrap of a KTextEditor:: View | * For instance, if you want to enable dynamic word wrap of a KTextEditor:: View | |||
* simply call | * simply call | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 4 lines changed or added | |||
dockmainwindow3.h | dockmainwindow3.h | |||
---|---|---|---|---|
skipping to change at line 54 | skipping to change at line 54 | |||
* It implements all internal interfaces in the case of a K3DockMainWindow3 as host: | * It implements all internal interfaces in the case of a K3DockMainWindow3 as host: | |||
* the builder and servant interface (for menu merging). | * the builder and servant interface (for menu merging). | |||
*/ | */ | |||
class KDE3SUPPORT_EXPORT DockMainWindow3 : public K3DockMainWindow, virtual public PartBase | class KDE3SUPPORT_EXPORT DockMainWindow3 : public K3DockMainWindow, virtual public PartBase | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
/** | /** | |||
* Constructor, same signature as K3DockMainWindow3. | * Constructor, same signature as K3DockMainWindow3. | |||
*/ | */ | |||
DockMainWindow3( QWidget* parent = 0L, const char *name = 0L, Qt::WFlags f = 0 ); | DockMainWindow3( QWidget* parent = 0L, const char *name = 0L, Qt::WindowF lags f = 0 ); | |||
/** | /** | |||
* Destructor. | * Destructor. | |||
*/ | */ | |||
virtual ~DockMainWindow3(); | virtual ~DockMainWindow3(); | |||
protected Q_SLOTS: | protected Q_SLOTS: | |||
/** | /** | |||
* Create the GUI (by merging the host's and the active part's) | * Create the GUI (by merging the host's and the active part's) | |||
* | * | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
document.h | document.h | |||
---|---|---|---|---|
skipping to change at line 222 | skipping to change at line 222 | |||
/** | /** | |||
* This signal is emitted whenever the \p document's buffer changed fro m | * This signal is emitted whenever the \p document's buffer changed fro m | |||
* either state \e unmodified to \e modified or vice versa. | * either state \e unmodified to \e modified or vice versa. | |||
* | * | |||
* \param document document which changed its modified state | * \param document document which changed its modified state | |||
* \see KParts::ReadWritePart::isModified(). | * \see KParts::ReadWritePart::isModified(). | |||
* \see KParts::ReadWritePart::setModified() | * \see KParts::ReadWritePart::setModified() | |||
*/ | */ | |||
void modifiedChanged ( KTextEditor::Document *document ); | void modifiedChanged ( KTextEditor::Document *document ); | |||
/** | ||||
* This signal is emitted whenever the readWrite state of a document ch | ||||
anges | ||||
*/ | ||||
//warning ADD IN KDE5 | ||||
// void readWriteChanged (KTextEditor::Document *document); | ||||
/* | /* | |||
* VERY IMPORTANT: Methods to set and query the current encoding of the | * VERY IMPORTANT: Methods to set and query the current encoding of the | |||
* document | * document | |||
*/ | */ | |||
public: | public: | |||
/** | /** | |||
* Set the encoding for this document. This encoding will be used | * Set the encoding for this document. This encoding will be used | |||
* while loading and saving files, it will \e not affect the already | * while loading and saving files, it will \e not affect the already | |||
* existing content of the document, e.g. if the file has already been | * existing content of the document, e.g. if the file has already been | |||
* opened without the correct encoding, this will \e not fix it, you | * opened without the correct encoding, this will \e not fix it, you | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 7 lines changed or added | |||
highlightinterface.h | highlightinterface.h | |||
---|---|---|---|---|
skipping to change at line 104 | skipping to change at line 104 | |||
/** | /** | |||
* Returns the attribute used for the style \p ds. | * Returns the attribute used for the style \p ds. | |||
*/ | */ | |||
virtual Attribute::Ptr defaultStyle(const DefaultStyle ds) const = 0; | virtual Attribute::Ptr defaultStyle(const DefaultStyle ds) const = 0; | |||
/// An AttributeBlock represents an Attribute with its | /// An AttributeBlock represents an Attribute with its | |||
/// dimension in a given line. | /// dimension in a given line. | |||
/// | /// | |||
/// \see lineAttributes() | /// \see lineAttributes() | |||
/// | ||||
/// TODO: KDE5 mark as movable | ||||
struct AttributeBlock { | struct AttributeBlock { | |||
AttributeBlock(const int _start, const int _length, const Attribute:: Ptr & _attribute) | AttributeBlock(const int _start, const int _length, const Attribute:: Ptr & _attribute) | |||
: start(_start), length(_length), attribute(_attribute) | : start(_start), length(_length), attribute(_attribute) | |||
{ | { | |||
} | } | |||
/// The column this attribute starts at. | /// The column this attribute starts at. | |||
int start; | int start; | |||
/// The number of columns this attribute spans. | /// The number of columns this attribute spans. | |||
int length; | int length; | |||
/// The attribute for the current range. | /// The attribute for the current range. | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
kassistantdialog.h | kassistantdialog.h | |||
---|---|---|---|---|
skipping to change at line 63 | skipping to change at line 63 | |||
class KDEUI_EXPORT KAssistantDialog : public KPageDialog | class KDEUI_EXPORT KAssistantDialog : public KPageDialog | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
/** | /** | |||
* Construct a new assistant dialog with @p parent as parent. | * Construct a new assistant dialog with @p parent as parent. | |||
* @param parent is the parent of the widget. | * @param parent is the parent of the widget. | |||
* @flags the window flags to give to the assistant dialog. The | * @flags the window flags to give to the assistant dialog. The | |||
* default of zero is usually what you want. | * default of zero is usually what you want. | |||
*/ | */ | |||
explicit KAssistantDialog(QWidget *parent=0, Qt::WFlags flags=0); | explicit KAssistantDialog(QWidget *parent=0, Qt::WindowFlags flags= 0); | |||
virtual ~KAssistantDialog(); | virtual ~KAssistantDialog(); | |||
/** | /** | |||
* Specify if the content of the page is valid, and if the next but ton may be enabled on this page. | * Specify if the content of the page is valid, and if the next but ton may be enabled on this page. | |||
* By default all pages are valid. | * By default all pages are valid. | |||
* | * | |||
* This will disable or enable the next button on the specified pag e | * This will disable or enable the next button on the specified pag e | |||
* | * | |||
* @param page the page on which the next button will be enabled/di sable | * @param page the page on which the next button will be enabled/di sable | |||
* @param enable if true the next button will be enabled, if false it will be disabled | * @param enable if true the next button will be enabled, if false it will be disabled | |||
skipping to change at line 132 | skipping to change at line 132 | |||
virtual void next(); | virtual void next(); | |||
protected: | protected: | |||
/** | /** | |||
* Construct an assistant dialog from a single widget. | * Construct an assistant dialog from a single widget. | |||
* @param widget the widget to construct the dialog with | * @param widget the widget to construct the dialog with | |||
* @param parent the parent of the assistant dialog | * @param parent the parent of the assistant dialog | |||
* @flags the window flags to use when creating the widget. The def ault | * @flags the window flags to use when creating the widget. The def ault | |||
* of zero is usually fine. | * of zero is usually fine. | |||
* | * | |||
* Calls the KPageDialog(KPageWidget *widget, QWidget *parent, Qt:: WFlags flags) constructor | * Calls the KPageDialog(KPageWidget *widget, QWidget *parent, Qt:: WindowFlags flags) constructor | |||
*/ | */ | |||
explicit KAssistantDialog(KPageWidget *widget, QWidget *parent=0, Q t::WFlags flags=0); | explicit KAssistantDialog(KPageWidget *widget, QWidget *parent=0, Q t::WindowFlags flags=0); | |||
virtual void showEvent(QShowEvent * event); | virtual void showEvent(QShowEvent * event); | |||
private: | private: | |||
class Private; | class Private; | |||
Private * const d; | Private * const d; | |||
Q_PRIVATE_SLOT( d, void _k_slotUpdateButtons() ) | Q_PRIVATE_SLOT( d, void _k_slotUpdateButtons() ) | |||
Q_DISABLE_COPY( KAssistantDialog ) | Q_DISABLE_COPY( KAssistantDialog ) | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
kcmultidialog.h | kcmultidialog.h | |||
---|---|---|---|---|
skipping to change at line 129 | skipping to change at line 129 | |||
* | * | |||
* @param componentName The name of the instance that needs to reload i ts | * @param componentName The name of the instance that needs to reload i ts | |||
* configuration. | * configuration. | |||
*/ | */ | |||
void configCommitted( const QByteArray & componentName ); | void configCommitted( const QByteArray & componentName ); | |||
protected: | protected: | |||
/** | /** | |||
* This constructor can be used by subclasses to provide a custom K PageWidget. | * This constructor can be used by subclasses to provide a custom K PageWidget. | |||
*/ | */ | |||
KCMultiDialog(KPageWidget *pageWidget, QWidget *parent, Qt::WFlags | KCMultiDialog(KPageWidget *pageWidget, QWidget *parent, Qt::WindowF | |||
flags = 0); | lags flags = 0); | |||
KCMultiDialog(KCMultiDialogPrivate &dd, KPageWidget *pageWidget, QW | KCMultiDialog(KCMultiDialogPrivate &dd, KPageWidget *pageWidget, QW | |||
idget *parent, Qt::WFlags flags = 0); | idget *parent, Qt::WindowFlags flags = 0); | |||
protected Q_SLOTS: | protected Q_SLOTS: | |||
/** | /** | |||
* This slot is called when the user presses the "Default" Button. | * This slot is called when the user presses the "Default" Button. | |||
* You can reimplement it if needed. | * You can reimplement it if needed. | |||
* | * | |||
* @note Make sure you call the original implementation. | * @note Make sure you call the original implementation. | |||
**/ | **/ | |||
void slotDefaultClicked(); | void slotDefaultClicked(); | |||
End of changes. 1 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added | |||
kcodecs.h | kcodecs.h | |||
---|---|---|---|---|
skipping to change at line 382 | skipping to change at line 382 | |||
*/ | */ | |||
void update(const QByteArray& in ); | void update(const QByteArray& in ); | |||
/** | /** | |||
* @overload | * @overload | |||
* | * | |||
* reads the data from an I/O device, i.e. from a file (QFile). | * reads the data from an I/O device, i.e. from a file (QFile). | |||
* | * | |||
* NOTE that the file must be open for reading. | * NOTE that the file must be open for reading. | |||
* | * | |||
* @param file a pointer to FILE as returned by calls like f{d,re}o pen | * @param file a QIODevice opened for reading | |||
* | * | |||
* @returns false if an error occurred during reading. | * @returns false if an error occurred during reading. | |||
*/ | */ | |||
bool update(QIODevice& file); | bool update(QIODevice& file); | |||
/** | /** | |||
* Calling this function will reset the calculated message digest. | * Calling this function will reset the calculated message digest. | |||
* Use this method to perform another message digest calculation | * Use this method to perform another message digest calculation | |||
* without recreating the KMD5 object. | * without recreating the KMD5 object. | |||
*/ | */ | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
kcolordialog.h | kcolordialog.h | |||
---|---|---|---|---|
skipping to change at line 42 | skipping to change at line 42 | |||
#include <kcolorchoosermode.h> | #include <kcolorchoosermode.h> | |||
/** | /** | |||
* A table of editable color cells. | * A table of editable color cells. | |||
* | * | |||
* @author Martin Jones <mjones@kde.org> | * @author Martin Jones <mjones@kde.org> | |||
*/ | */ | |||
class KDEUI_EXPORT KColorCells : public QTableWidget | class KDEUI_EXPORT KColorCells : public QTableWidget | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(bool acceptDrags READ acceptDrags WRITE setAcceptDrags) | ||||
Q_PROPERTY(bool shading READ shading WRITE setShading) | ||||
public: | public: | |||
/** | /** | |||
* Constructs a new table of color cells, consisting of | * Constructs a new table of color cells, consisting of | |||
* @p rows * @p columns colors. | * @p rows * @p columns colors. | |||
* | * | |||
* @param parent The parent of the new widget | * @param parent The parent of the new widget | |||
* @param rows The number of rows in the table | * @param rows The number of rows in the table | |||
* @param columns The number of columns in the table | * @param columns The number of columns in the table | |||
*/ | */ | |||
KColorCells( QWidget *parent, int rows, int columns ); | KColorCells( QWidget *parent, int rows, int columns ); | |||
~KColorCells(); | ~KColorCells(); | |||
/** Sets the color in the given index in the table */ | /** Sets the color in the given index in the table */ | |||
void setColor( int index, const QColor &col ); | void setColor( int index, const QColor &col ); | |||
/** Returns the color at a given index in the table */ | /** Returns the color at a given index in the table */ | |||
QColor color( int index ) const; | QColor color( int index ) const; | |||
/** Returns the total number of color cells in the table */ | /** Returns the total number of color cells in the table */ | |||
int count() const; | int count() const; | |||
void setShading(bool shade); | void setShading(bool shade); | |||
bool shading() const; | ||||
void setAcceptDrags(bool acceptDrags); | void setAcceptDrags(bool acceptDrags); | |||
bool acceptDrags() const; | ||||
/** Sets the currently selected cell to @p index */ | /** Sets the currently selected cell to @p index */ | |||
void setSelected(int index); | void setSelected(int index); | |||
/** Returns the index of the cell which is currently selected */ | /** Returns the index of the cell which is currently selected */ | |||
int selectedIndex() const; | int selectedIndex() const; | |||
Q_SIGNALS: | Q_SIGNALS: | |||
/** Emitted when a color is selected in the table */ | /** Emitted when a color is selected in the table */ | |||
void colorSelected( int index , const QColor& color ); | void colorSelected( int index , const QColor& color ); | |||
/** Emitted when a color in the table is double-clicked */ | /** Emitted when a color in the table is double-clicked */ | |||
skipping to change at line 206 | skipping to change at line 212 | |||
* | * | |||
* On the right side of the dialog you see a KColorTable showing | * On the right side of the dialog you see a KColorTable showing | |||
* a number of colors with a combo box which offers several predefined | * a number of colors with a combo box which offers several predefined | |||
* palettes or a palette configured by the user. The small field showing | * palettes or a palette configured by the user. The small field showing | |||
* the currently selected color is a KColorPatch. | * the currently selected color is a KColorPatch. | |||
* | * | |||
**/ | **/ | |||
class KDEUI_EXPORT KColorDialog : public KDialog | class KDEUI_EXPORT KColorDialog : public KDialog | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(bool isAlphaChannelEnabled READ isAlphaChannelEnabled WRITE se | ||||
tAlphaChannelEnabled) | ||||
Q_PROPERTY(QColor defaultColor READ defaultColor WRITE setDefaultColor) | ||||
Q_PROPERTY(QColor color READ color WRITE setColor) | ||||
public: | public: | |||
/** | /** | |||
* Constructs a color selection dialog. | * Constructs a color selection dialog. | |||
*/ | */ | |||
explicit KColorDialog( QWidget *parent = 0L, bool modal = false ); | explicit KColorDialog( QWidget *parent = 0L, bool modal = false ); | |||
/** | /** | |||
* Destroys the color selection dialog. | * Destroys the color selection dialog. | |||
*/ | */ | |||
~KColorDialog(); | ~KColorDialog(); | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 10 lines changed or added | |||
kdeclarative.h | kdeclarative.h | |||
---|---|---|---|---|
skipping to change at line 25 | skipping to change at line 25 | |||
* License along with this program; if not, write to the | * License along with this program; if not, write to the | |||
* Free Software Foundation, Inc., | * Free Software Foundation, Inc., | |||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |||
*/ | */ | |||
#ifndef KDECLARATIVE_H | #ifndef KDECLARATIVE_H | |||
#define KDECLARATIVE_H | #define KDECLARATIVE_H | |||
#include <kdeclarative_export.h> | #include <kdeclarative_export.h> | |||
#include <QStringList> | ||||
class QDeclarativeEngine; | class QDeclarativeEngine; | |||
class QScriptEngine; | class QScriptEngine; | |||
class KDeclarativePrivate; | class KDeclarativePrivate; | |||
class KDECLARATIVE_EXPORT KDeclarative | class KDECLARATIVE_EXPORT KDeclarative | |||
{ | { | |||
public: | public: | |||
explicit KDeclarative(); | explicit KDeclarative(); | |||
~KDeclarative(); | ~KDeclarative(); | |||
skipping to change at line 51 | skipping to change at line 53 | |||
QScriptEngine *scriptEngine() const; | QScriptEngine *scriptEngine() const; | |||
/** | /** | |||
* This method must be called very early at startup time to ensure the | * This method must be called very early at startup time to ensure the | |||
* QDeclarativeDebugger is enabled. Ideally it should be called in main (), | * QDeclarativeDebugger is enabled. Ideally it should be called in main (), | |||
* after command-line options are defined. | * after command-line options are defined. | |||
*/ | */ | |||
static void setupQmlJsDebugger(); | static void setupQmlJsDebugger(); | |||
/** | ||||
* @return the runtime platform, e.g. "desktop" or "tablet, touch". The | ||||
first entry/ies in | ||||
* the list relate to the platform formfactor and the last is t | ||||
he input method | ||||
* specialization. If the string is empty, there is no specifie | ||||
d runtime platform | ||||
* and a traditional desktop environment may be assumed | ||||
* @since 4.10 | ||||
*/ | ||||
static QStringList runtimePlatform(); | ||||
/** | ||||
* @return the QML components target, based on the runtime platform. e. | ||||
g. touch or desktop | ||||
* @since 4.10 | ||||
*/ | ||||
static QString componentsTarget(); | ||||
/** | ||||
* @return the default components target; can be used to compare agains | ||||
t the returned value | ||||
* from @see componentsTarget() | ||||
* @since 4.10 | ||||
*/ | ||||
static QString defaultComponentsTarget(); | ||||
private: | private: | |||
KDeclarativePrivate *const d; | KDeclarativePrivate *const d; | |||
friend class EngineAccess; | friend class EngineAccess; | |||
}; | }; | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 29 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.9.3" | #define KDE_VERSION_STRING "4.10.00" | |||
/** | /** | |||
* @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 9 | #define KDE_VERSION_MINOR 10 | |||
/** | /** | |||
* @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 00 | |||
/** | /** | |||
* @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 | |||
kdialog.h | kdialog.h | |||
---|---|---|---|---|
skipping to change at line 172 | skipping to change at line 172 | |||
}; | }; | |||
Q_DECLARE_FLAGS(ButtonPopupModes, ButtonPopupMode) | Q_DECLARE_FLAGS(ButtonPopupModes, ButtonPopupMode) | |||
public: | public: | |||
/** | /** | |||
* Creates a dialog. | * Creates a dialog. | |||
* | * | |||
* @param parent The parent of the dialog. | * @param parent The parent of the dialog. | |||
* @param flags The widget flags passed to the QDialog constructor | * @param flags The widget flags passed to the QDialog constructor | |||
*/ | */ | |||
explicit KDialog( QWidget *parent = 0, Qt::WFlags flags = 0 ); | explicit KDialog( QWidget *parent = 0, Qt::WindowFlags flags = 0 ); | |||
/** | /** | |||
* Destroys the dialog. | * Destroys the dialog. | |||
*/ | */ | |||
~KDialog(); | ~KDialog(); | |||
/** | /** | |||
* Creates (or recreates) the button box and all the buttons in it. | * Creates (or recreates) the button box and all the buttons in it. | |||
* | * | |||
* Note that some combinations are not possible. That means, you can't | * Note that some combinations are not possible. That means, you can't | |||
skipping to change at line 854 | skipping to change at line 854 | |||
/** | /** | |||
* Updates the margins and spacings. | * Updates the margins and spacings. | |||
* | * | |||
* @deprecated KDialog respects the style's margins and spacings automa tically. Calling | * @deprecated KDialog respects the style's margins and spacings automa tically. Calling | |||
* this function has no effect. | * this function has no effect. | |||
*/ | */ | |||
void updateGeometry(); | void updateGeometry(); | |||
protected: | protected: | |||
KDialog(KDialogPrivate &dd, QWidget *parent, Qt::WFlags flags = 0); | KDialog(KDialogPrivate &dd, QWidget *parent, Qt::WindowFlags flags = 0); | |||
KDialogPrivate *const d_ptr; | KDialogPrivate *const d_ptr; | |||
private: | private: | |||
Q_DISABLE_COPY(KDialog) | Q_DISABLE_COPY(KDialog) | |||
Q_PRIVATE_SLOT(d_ptr, void queuedLayoutUpdate()) | Q_PRIVATE_SLOT(d_ptr, void queuedLayoutUpdate()) | |||
Q_PRIVATE_SLOT(d_ptr, void helpLinkClicked()) | Q_PRIVATE_SLOT(d_ptr, void helpLinkClicked()) | |||
}; | }; | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(KDialog::ButtonCodes) | Q_DECLARE_OPERATORS_FOR_FLAGS(KDialog::ButtonCodes) | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(KDialog::CaptionFlags) | Q_DECLARE_OPERATORS_FOR_FLAGS(KDialog::CaptionFlags) | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
kfileitem.h | kfileitem.h | |||
---|---|---|---|---|
skipping to change at line 493 | skipping to change at line 493 | |||
/** | /** | |||
* Return true if this item is a regular file, | * Return true if this item is a regular file, | |||
* false otherwise (directory, link, character/block device, fifo, sock et) | * false otherwise (directory, link, character/block device, fifo, sock et) | |||
* @since 4.3 | * @since 4.3 | |||
*/ | */ | |||
bool isRegularFile() const; | bool isRegularFile() const; | |||
/** | /** | |||
* Somewhat like a comparison operator, but more explicit, | * Somewhat like a comparison operator, but more explicit, | |||
* and it can detect that two kfileitems are equal even when they do | * and it can detect that two fileitems differ if any property of the f | |||
* not share the same internal pointer - e.g. when KDirLister compares | ile item | |||
* fileitems after listing a directory again, to detect changes. | * has changed (file size, modification date, etc.). Two items are equa | |||
l if | ||||
* all properties are equal. In contrast, operator== only compares URLs | ||||
. | ||||
* @param item the item to compare | * @param item the item to compare | |||
* @return true if all values are equal | * @return true if all values are equal | |||
*/ | */ | |||
bool cmp( const KFileItem & item ) const; | bool cmp( const KFileItem & item ) const; | |||
/** | ||||
* Returns true if both items share the same URL. | ||||
*/ | ||||
bool operator==(const KFileItem& other) const; | bool operator==(const KFileItem& other) const; | |||
/** | ||||
* Returns true if both items do not share the same URL. | ||||
*/ | ||||
bool operator!=(const KFileItem& other) const; | bool operator!=(const KFileItem& other) const; | |||
/** | /** | |||
* Converts this KFileItem to a QVariant, this allows to use KFileItem | * Converts this KFileItem to a QVariant, this allows to use KFileItem | |||
* in QVariant() constructor | * in QVariant() constructor | |||
*/ | */ | |||
operator QVariant() const; | operator QVariant() const; | |||
/** | /** | |||
* This allows to associate some "extra" data to a KFileItem. As one | * This allows to associate some "extra" data to a KFileItem. As one | |||
skipping to change at line 648 | skipping to change at line 654 | |||
* Return true if default-constructed | * Return true if default-constructed | |||
*/ | */ | |||
bool isNull() const; | bool isNull() const; | |||
private: | private: | |||
QSharedDataPointer<KFileItemPrivate> d; | QSharedDataPointer<KFileItemPrivate> d; | |||
private: | private: | |||
KIO_EXPORT friend QDataStream & operator<< ( QDataStream & s, const KFi leItem & a ); | KIO_EXPORT friend QDataStream & operator<< ( QDataStream & s, const KFi leItem & a ); | |||
KIO_EXPORT friend QDataStream & operator>> ( QDataStream & s, KFileItem & a ); | KIO_EXPORT friend QDataStream & operator>> ( QDataStream & s, KFileItem & a ); | |||
friend class KFileItemTest; | ||||
}; | }; | |||
Q_DECLARE_METATYPE(KFileItem) | Q_DECLARE_METATYPE(KFileItem) | |||
Q_CORE_EXPORT uint qHash(const QString &key); | Q_CORE_EXPORT uint qHash(const QString &key); | |||
inline uint qHash(const KFileItem& item){ return qHash(item.url().url()); } | inline uint qHash(const KFileItem& item){ return qHash(item.url().url()); } | |||
/** | /** | |||
* List of KFileItems, which adds a few helper | * List of KFileItems, which adds a few helper | |||
* methods to QList<KFileItem>. | * methods to QList<KFileItem>. | |||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 14 lines changed or added | |||
klistwidget.h | klistwidget.h | |||
---|---|---|---|---|
skipping to change at line 97 | skipping to change at line 97 | |||
* You should normally not need to use this. In most cases it's better | * You should normally not need to use this. In most cases it's better | |||
* to use executed() instead. | * to use executed() instead. | |||
*/ | */ | |||
void doubleClicked( QListWidgetItem *item, const QPoint &pos ); | void doubleClicked( QListWidgetItem *item, const QPoint &pos ); | |||
protected: | protected: | |||
virtual void keyPressEvent(QKeyEvent *e); | virtual void keyPressEvent(QKeyEvent *e); | |||
virtual void focusOutEvent(QFocusEvent *e); | virtual void focusOutEvent(QFocusEvent *e); | |||
virtual void leaveEvent(QEvent *e); | virtual void leaveEvent(QEvent *e); | |||
virtual void mousePressEvent(QMouseEvent *e); | virtual void mousePressEvent(QMouseEvent *e); | |||
virtual void mouseDoubleClickEvent (QMouseEvent *e); | virtual void mouseDoubleClickEvent(QMouseEvent *e); | |||
virtual void mouseReleaseEvent(QMouseEvent *e); | ||||
private: | private: | |||
class KListWidgetPrivate; | class KListWidgetPrivate; | |||
KListWidgetPrivate* const d; | KListWidgetPrivate* const d; | |||
Q_PRIVATE_SLOT(d, void _k_slotItemEntered(QListWidgetItem*)) | Q_PRIVATE_SLOT(d, void _k_slotItemEntered(QListWidgetItem*)) | |||
Q_PRIVATE_SLOT(d, void _k_slotOnViewport()) | Q_PRIVATE_SLOT(d, void _k_slotOnViewport()) | |||
Q_PRIVATE_SLOT(d, void _k_slotSettingsChanged(int)) | Q_PRIVATE_SLOT(d, void _k_slotSettingsChanged(int)) | |||
Q_PRIVATE_SLOT(d, void _k_slotAutoSelect()) | Q_PRIVATE_SLOT(d, void _k_slotAutoSelect()) | |||
Q_PRIVATE_SLOT(d, void _k_slotEmitExecute(QListWidgetItem*)) | ||||
}; | }; | |||
#endif // KLISTWIDGET_H | #endif // KLISTWIDGET_H | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 3 lines changed or added | |||
klocale.h | klocale.h | |||
---|---|---|---|---|
skipping to change at line 649 | skipping to change at line 649 | |||
* This enum chooses what dialect is used for binary units. | * This enum chooses what dialect is used for binary units. | |||
* | * | |||
* Note: Although JEDEC abuses the metric prefixes and can therefore be | * Note: Although JEDEC abuses the metric prefixes and can therefore be | |||
* confusing, it has been used to describe *memory* sizes for quite som e time | * confusing, it has been used to describe *memory* sizes for quite som e time | |||
* and programs should therefore use either Default, JEDEC, or IEC 6002 7-2 | * and programs should therefore use either Default, JEDEC, or IEC 6002 7-2 | |||
* for memory sizes. | * for memory sizes. | |||
* | * | |||
* On the other hand network transmission rates are typically in metric so | * On the other hand network transmission rates are typically in metric so | |||
* Default, Metric, or IEC (which is unambiguous) should be chosen. | * Default, Metric, or IEC (which is unambiguous) should be chosen. | |||
* | * | |||
* Normally choosing DefaultBinaryUnits is the best option as that uses | * Normally choosing DefaultBinaryDialect is the best option as that us es | |||
* the user's selection for units. | * the user's selection for units. | |||
* | * | |||
* @since 4.4 | * @since 4.4 | |||
* @see binaryUnitDialect | * @see binaryUnitDialect | |||
* @see setBinaryUnitDialect | * @see setBinaryUnitDialect | |||
*/ | */ | |||
enum BinaryUnitDialect { | enum BinaryUnitDialect { | |||
DefaultBinaryDialect = -1, ///< Used if no specific preference | DefaultBinaryDialect = -1, ///< Used if no specific preference | |||
IECBinaryDialect, ///< KDE Default, KiB, MiB, etc. 2^(10*n ) | IECBinaryDialect, ///< KDE Default, KiB, MiB, etc. 2^(10*n ) | |||
JEDECBinaryDialect, ///< KDE 3.5 default, KB, MB, etc. 2^(10 *n) | JEDECBinaryDialect, ///< KDE 3.5 default, KB, MB, etc. 2^(10 *n) | |||
skipping to change at line 686 | skipping to change at line 686 | |||
*/ | */ | |||
QString formatByteSize(double size) const; | QString formatByteSize(double size) const; | |||
/** | /** | |||
* @since 4.4 | * @since 4.4 | |||
* | * | |||
* Converts @p size from bytes to the appropriate string representation | * Converts @p size from bytes to the appropriate string representation | |||
* using the binary unit dialect @p dialect and the specific units @p s pecificUnit. | * using the binary unit dialect @p dialect and the specific units @p s pecificUnit. | |||
* | * | |||
* Example: | * Example: | |||
* formatByteSize(1000, unit, KLocale::BinaryUnitKilo) returns: | * formatByteSize(1000, unit, KLocale::UnitKiloByte) returns: | |||
* for KLocale::MetricBinaryUnits, "1.0 kB", | * for KLocale::MetricBinaryDialect, "1.0 kB", | |||
* for KLocale::IECBinaryUnits, "0.9 KiB", | * for KLocale::IECBinaryDialect, "0.9 KiB", | |||
* for KLocale::JEDECBinaryUnits, "0.9 KB". | * for KLocale::JEDECBinaryDialect, "0.9 KB". | |||
* | * | |||
* @param size size in bytes | * @param size size in bytes | |||
* @param precision number of places after the decimal point to use. K DE uses | * @param precision number of places after the decimal point to use. K DE uses | |||
* 1 by default so when in doubt use 1. | * 1 by default so when in doubt use 1. | |||
* @param dialect binary unit standard to use. Use DefaultBinaryUnits to | * @param dialect binary unit standard to use. Use DefaultBinaryDialec t to | |||
* use the localized user selection unless you need to use a spe cific | * use the localized user selection unless you need to use a spe cific | |||
* unit type (such as displaying a flash memory size in JEDEC). | * unit type (such as displaying a flash memory size in JEDEC). | |||
* @param specificUnit specific unit size to use in result. Use | * @param specificUnit specific unit size to use in result. Use | |||
* DefaultBinarySize to automatically select a unit that will re turn | * DefaultBinaryUnits to automatically select a unit that will r eturn | |||
* a sanely-sized number. | * a sanely-sized number. | |||
* @return converted size as a translated string including the units. | * @return converted size as a translated string including the units. | |||
* E.g. "1.23 KiB", "2 GB" (JEDEC), "4.2 kB" (Metric). | * E.g. "1.23 KiB", "2 GB" (JEDEC), "4.2 kB" (Metric). | |||
* @see BinaryUnitDialect | * @see BinaryUnitDialect | |||
*/ | */ | |||
QString formatByteSize(double size, int precision, | QString formatByteSize(double size, int precision, | |||
BinaryUnitDialect dialect = KLocale::DefaultBina ryDialect, | BinaryUnitDialect dialect = KLocale::DefaultBina ryDialect, | |||
BinarySizeUnits specificUnit = KLocale::DefaultB inaryUnits) const; | BinarySizeUnits specificUnit = KLocale::DefaultB inaryUnits) const; | |||
/** | /** | |||
End of changes. 4 change blocks. | ||||
7 lines changed or deleted | 7 lines changed or added | |||
kmainwindow.h | kmainwindow.h | |||
---|---|---|---|---|
skipping to change at line 687 | skipping to change at line 687 | |||
* // Save settings if auto-save is enabled, and settings have changed | * // Save settings if auto-save is enabled, and settings have changed | |||
* if ( settingsDirty() && autoSaveSettings() ) | * if ( settingsDirty() && autoSaveSettings() ) | |||
* saveAutoSaveSettings(); | * saveAutoSaveSettings(); | |||
* .. | * .. | |||
* } | * } | |||
* \endcode | * \endcode | |||
*/ | */ | |||
void saveAutoSaveSettings(); | void saveAutoSaveSettings(); | |||
protected: | protected: | |||
KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WFlags f); | KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WindowFlags f) ; | |||
KMainWindowPrivate * const k_ptr; | KMainWindowPrivate * const k_ptr; | |||
private: | private: | |||
Q_PRIVATE_SLOT(k_func(), void _k_shuttingDown()) | Q_PRIVATE_SLOT(k_func(), void _k_shuttingDown()) | |||
Q_PRIVATE_SLOT(k_func(), void _k_slotSettingsChanged(int)) | Q_PRIVATE_SLOT(k_func(), void _k_slotSettingsChanged(int)) | |||
Q_PRIVATE_SLOT(k_func(), void _k_slotSaveAutoSaveSize()) | Q_PRIVATE_SLOT(k_func(), void _k_slotSaveAutoSaveSize()) | |||
}; | }; | |||
/** | /** | |||
* @def RESTORE | * @def RESTORE | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
kmessagewidget.h | kmessagewidget.h | |||
---|---|---|---|---|
skipping to change at line 157 | skipping to change at line 157 | |||
* KGlobalSettings::graphicsEffectLevel() does not allow simple effects . | * KGlobalSettings::graphicsEffectLevel() does not allow simple effects . | |||
*/ | */ | |||
void animatedShow(); | void animatedShow(); | |||
/** | /** | |||
* Hide the widget using an animation, unless | * Hide the widget using an animation, unless | |||
* KGlobalSettings::graphicsEffectLevel() does not allow simple effects . | * KGlobalSettings::graphicsEffectLevel() does not allow simple effects . | |||
*/ | */ | |||
void animatedHide(); | void animatedHide(); | |||
Q_SIGNALS: | ||||
/** | ||||
* This signal is emitted when the user clicks a link in the text label | ||||
. | ||||
* The URL referred to by the href anchor is passed in contents. | ||||
* @param contents text of the href anchor | ||||
* @see QLabel::linkActivated() | ||||
* @since 4.10 | ||||
*/ | ||||
void linkActivated(const QString& contents); | ||||
protected: | protected: | |||
void paintEvent(QPaintEvent *event); | void paintEvent(QPaintEvent *event); | |||
bool event(QEvent *event); | bool event(QEvent *event); | |||
void resizeEvent(QResizeEvent *event); | void resizeEvent(QResizeEvent *event); | |||
void showEvent(QShowEvent *event); | void showEvent(QShowEvent *event); | |||
private: | private: | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 11 lines changed or added | |||
kmimetypetrader.h | kmimetypetrader.h | |||
---|---|---|---|---|
skipping to change at line 125 | skipping to change at line 125 | |||
* @param error The string passed here will contain an error descriptio n. | * @param error The string passed here will contain an error descriptio n. | |||
* @return A pointer to the newly created object or a null pointer if t he | * @return A pointer to the newly created object or a null pointer if t he | |||
* factory was unable to create an object of the given type. | * factory was unable to create an object of the given type. | |||
*/ | */ | |||
template <class T> | template <class T> | |||
static T *createPartInstanceFromQuery(const QString &mimeType, QWidget *parentWidget = 0, QObject *parent = 0, | static T *createPartInstanceFromQuery(const QString &mimeType, QWidget *parentWidget = 0, QObject *parent = 0, | |||
const QString &constraint = QString() , | const QString &constraint = QString() , | |||
const QVariantList &args = QVariantLi st(), | const QVariantList &args = QVariantLi st(), | |||
QString *error = 0) | QString *error = 0) | |||
{ | { | |||
const KService::List offers = self()->query(mimeType, QString::from Ascii("KParts/ReadOnlyPart"), constraint); | const KService::List offers = self()->query(mimeType, QString::from Latin1("KParts/ReadOnlyPart"), constraint); | |||
Q_FOREACH (const KService::Ptr &ptr, offers) { | Q_FOREACH (const KService::Ptr &ptr, offers) { | |||
T *component = ptr->template createInstance<T>(parentWidget, pa rent, args, error); | T *component = ptr->template createInstance<T>(parentWidget, pa rent, args, error); | |||
if (component) { | if (component) { | |||
if (error) | if (error) | |||
error->clear(); | error->clear(); | |||
return component; | return component; | |||
} | } | |||
} | } | |||
if (error) | if (error) | |||
*error = i18n("No service matching the requirements was found") ; | *error = i18n("No service matching the requirements was found") ; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
knewstuff_export.h | knewstuff_export.h | |||
---|---|---|---|---|
/* This file is part of the KDE project | /* This file is part of the KDE project | |||
Copyright (C) 2007 David Faure <faure@kde.org> | Copyright (C) 2007 David Faure <faure@kde.org> | |||
Copyright (C) 2009 Jeremy Whiting <jpwhiting@kde.org> | ||||
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, see <http://www.gnu.org/licen ses/>. | License along with this library. If not, see <http://www.gnu.org/licen ses/>. | |||
*/ | */ | |||
#ifndef KNEWSTUFF3_EXPORT_H | #ifndef KNEWSTUFF2_EXPORT_H | |||
#define KNEWSTUFF3_EXPORT_H | #define KNEWSTUFF2_EXPORT_H | |||
/* needed for KDE_EXPORT and KDE_IMPORT macros */ | /* needed for KDE_EXPORT and KDE_IMPORT macros */ | |||
#include <kdemacros.h> | #include <kdemacros.h> | |||
#ifndef KNEWSTUFF_EXPORT | #ifndef KNEWSTUFF_EXPORT | |||
# if defined(KDELIBS_STATIC_LIBS) | # if defined(KDELIBS_STATIC_LIBS) | |||
/* No export/import for static libraries */ | /* No export/import for static libraries */ | |||
# define KNEWSTUFF_EXPORT | # define KNEWSTUFF_EXPORT | |||
# elif defined(MAKE_KNEWSTUFF3_LIB) | # elif defined(MAKE_KNEWSTUFF2_LIB) | |||
/* We are building this library */ | /* We are building this library */ | |||
# define KNEWSTUFF_EXPORT KDE_EXPORT | # define KNEWSTUFF_EXPORT KDE_EXPORT | |||
# else | # else | |||
/* We are using this library */ | /* We are using this library */ | |||
# define KNEWSTUFF_EXPORT KDE_IMPORT | # define KNEWSTUFF_EXPORT KDE_IMPORT | |||
# endif | # endif | |||
#endif | #endif | |||
# ifndef KNEWSTUFF_EXPORT_DEPRECATED | # ifndef KNEWSTUFF_EXPORT_DEPRECATED | |||
# define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT | # define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT | |||
End of changes. 3 change blocks. | ||||
4 lines changed or deleted | 3 lines changed or added | |||
kpagedialog.h | kpagedialog.h | |||
---|---|---|---|---|
skipping to change at line 100 | skipping to change at line 100 | |||
Plain = KPageView::Plain, | Plain = KPageView::Plain, | |||
List = KPageView::List, | List = KPageView::List, | |||
Tree = KPageView::Tree, | Tree = KPageView::Tree, | |||
Tabbed = KPageView::Tabbed | Tabbed = KPageView::Tabbed | |||
}; | }; | |||
public: | public: | |||
/** | /** | |||
* Creates a new page dialog. | * Creates a new page dialog. | |||
*/ | */ | |||
explicit KPageDialog( QWidget *parent = 0, Qt::WFlags flags = 0 ); | explicit KPageDialog( QWidget *parent = 0, Qt::WindowFlags flags = 0 ); | |||
/** | /** | |||
* Destroys the page dialog. | * Destroys the page dialog. | |||
*/ | */ | |||
~KPageDialog(); | ~KPageDialog(); | |||
/** | /** | |||
* Sets the face type of the dialog. | * Sets the face type of the dialog. | |||
*/ | */ | |||
void setFaceType( FaceType faceType ); | void setFaceType( FaceType faceType ); | |||
skipping to change at line 210 | skipping to change at line 210 | |||
**/ | **/ | |||
void pageRemoved( KPageWidgetItem *page ); | void pageRemoved( KPageWidgetItem *page ); | |||
protected: | protected: | |||
/** | /** | |||
* This constructor can be used by subclasses to provide a custom page widget. | * This constructor can be used by subclasses to provide a custom page widget. | |||
* | * | |||
* \param widget The KPageWidget object will be reparented to this obje ct, so you can create | * \param widget The KPageWidget object will be reparented to this obje ct, so you can create | |||
* it without parent and you are not allowed to delete it. | * it without parent and you are not allowed to delete it. | |||
*/ | */ | |||
KPageDialog(KPageWidget *widget, QWidget *parent, Qt::WFlags flags = 0) | KPageDialog(KPageWidget *widget, QWidget *parent, Qt::WindowFlags flags | |||
; | = 0); | |||
KPageDialog(KPageDialogPrivate &dd, KPageWidget *widget, QWidget *paren | KPageDialog(KPageDialogPrivate &dd, KPageWidget *widget, QWidget *paren | |||
t, Qt::WFlags flags = 0); | t, Qt::WindowFlags flags = 0); | |||
/** | /** | |||
* Returns the page widget of the dialog or 0 if no page widget is set. | * Returns the page widget of the dialog or 0 if no page widget is set. | |||
*/ | */ | |||
KPageWidget *pageWidget(); | KPageWidget *pageWidget(); | |||
/** | /** | |||
* Returns the page widget of the dialog or 0 if no page widget is set. | * Returns the page widget of the dialog or 0 if no page widget is set. | |||
*/ | */ | |||
const KPageWidget *pageWidget() const; | const KPageWidget *pageWidget() const; | |||
End of changes. 2 change blocks. | ||||
5 lines changed or deleted | 5 lines changed or added | |||
kpassivepopup.h | kpassivepopup.h | |||
---|---|---|---|---|
skipping to change at line 100 | skipping to change at line 100 | |||
enum PopupStyle | enum PopupStyle | |||
{ | { | |||
Boxed, ///< Information will appear in a framed box (de fault) | Boxed, ///< Information will appear in a framed box (de fault) | |||
Balloon, ///< Information will appear in a comic-alike ba lloon | Balloon, ///< Information will appear in a comic-alike ba lloon | |||
CustomStyle=128 ///< Ids greater than this are reserved for use b y subclasses | CustomStyle=128 ///< Ids greater than this are reserved for use b y subclasses | |||
}; | }; | |||
/** | /** | |||
* Creates a popup for the specified widget. | * Creates a popup for the specified widget. | |||
*/ | */ | |||
explicit KPassivePopup( QWidget *parent=0, Qt::WFlags f = 0 ); | explicit KPassivePopup( QWidget *parent=0, Qt::WindowFlags f = 0 ); | |||
/** | /** | |||
* Creates a popup for the specified window. | * Creates a popup for the specified window. | |||
*/ | */ | |||
explicit KPassivePopup( WId parent ); | explicit KPassivePopup( WId parent ); | |||
#if 0 // These break macos and win32 where the definition of WId makes them ambiguous | #if 0 // These break macos and win32 where the definition of WId makes them ambiguous | |||
/** | /** | |||
* Creates a popup for the specified widget. | * Creates a popup for the specified widget. | |||
* THIS WILL BE REMOVED, USE setPopupStyle(). | * THIS WILL BE REMOVED, USE setPopupStyle(). | |||
*/ | */ | |||
explicit KPassivePopup( int popupStyle, QWidget *parent=0, Qt::WFlags f =0 ) KDE_DEPRECATED; | explicit KPassivePopup( int popupStyle, QWidget *parent=0, Qt::WindowFl ags f=0 ) KDE_DEPRECATED; | |||
/** | /** | |||
* Creates a popup for the specified window. | * Creates a popup for the specified window. | |||
* THIS WILL BE REMOVED, USE setPopupStyle(). | * THIS WILL BE REMOVED, USE setPopupStyle(). | |||
*/ | */ | |||
KPassivePopup( int popupStyle, WId parent, Qt::WFlags f=0 ) KDE_DEPRECA TED; | KPassivePopup( int popupStyle, WId parent, Qt::WindowFlags f=0 ) KDE_DE PRECATED; | |||
#endif | #endif | |||
/** | /** | |||
* Cleans up. | * Cleans up. | |||
*/ | */ | |||
virtual ~KPassivePopup(); | virtual ~KPassivePopup(); | |||
/** | /** | |||
* Sets the main view to be the specified widget (which must be a child of the popup). | * Sets the main view to be the specified widget (which must be a child of the popup). | |||
*/ | */ | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
kprogressdialog.h | kprogressdialog.h | |||
---|---|---|---|---|
skipping to change at line 61 | skipping to change at line 61 | |||
public: | public: | |||
/** | /** | |||
* Constructs a KProgressDialog | * Constructs a KProgressDialog | |||
* | * | |||
* @param parent Parent of the widget | * @param parent Parent of the widget | |||
* @param caption Text to display in window title bar | * @param caption Text to display in window title bar | |||
* @param text Text to display in the dialog | * @param text Text to display in the dialog | |||
* @param flags The widget flags | * @param flags The widget flags | |||
*/ | */ | |||
explicit KProgressDialog(QWidget* parent = 0, const QString& captio n = QString(), | explicit KProgressDialog(QWidget* parent = 0, const QString& captio n = QString(), | |||
const QString& text = QString(), Qt::WFlag s flags = 0); | const QString& text = QString(), Qt::Windo wFlags flags = 0); | |||
/** | /** | |||
* Destructor | * Destructor | |||
*/ | */ | |||
~KProgressDialog(); | ~KProgressDialog(); | |||
/** | /** | |||
* Returns the QProgressBar used in this dialog. | * Returns the QProgressBar used in this dialog. | |||
* To set the number of steps or other progress bar related | * To set the number of steps or other progress bar related | |||
* settings, access the QProgressBar object directly via this metho d. | * settings, access the QProgressBar object directly via this metho d. | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
kprotocolinfo.h | kprotocolinfo.h | |||
---|---|---|---|---|
skipping to change at line 27 | skipping to change at line 27 | |||
Boston, MA 02110-1301, USA. | Boston, MA 02110-1301, USA. | |||
*/ | */ | |||
#ifndef KPROTOCOLINFO_H | #ifndef KPROTOCOLINFO_H | |||
#define KPROTOCOLINFO_H | #define KPROTOCOLINFO_H | |||
#include <kglobal.h> | #include <kglobal.h> | |||
#include <kurl.h> | #include <kurl.h> | |||
#include <ksycocaentry.h> | #include <ksycocaentry.h> | |||
#include <ksycocatype.h> | #include <ksycocatype.h> | |||
#include <kservice.h> | ||||
#include <QtCore/QVariant> | #include <QtCore/QVariant> | |||
#include <QtCore/QStringList> | #include <QtCore/QStringList> | |||
class QDataStream; | class QDataStream; | |||
class KProtocolInfoPrivate; | class KProtocolInfoPrivate; | |||
/** | /** | |||
* \class KProtocolInfo kprotocolinfo.h <KProtocolInfo> | * \class KProtocolInfo kprotocolinfo.h <KProtocolInfo> | |||
* | * | |||
* Information about I/O (Internet, etc.) protocols supported by KDE. | * Information about I/O (Internet, etc.) protocols supported by KDE. | |||
skipping to change at line 372 | skipping to change at line 373 | |||
private: | private: | |||
/** | /** | |||
* Read a protocol description file | * Read a protocol description file | |||
* @param path the path of the description file | * @param path the path of the description file | |||
*/ | */ | |||
KProtocolInfo( const QString & path); | KProtocolInfo( const QString & path); | |||
Q_DECLARE_PRIVATE(KProtocolInfo) | Q_DECLARE_PRIVATE(KProtocolInfo) | |||
void load(QDataStream &s); | void load(QDataStream &s); | |||
static void selectServiceOrHelper(const QString& protocol, KProtocolInf | ||||
o::Ptr& returnProtocol, KService::Ptr& returnService); | ||||
}; | }; | |||
KDECORE_EXPORT QDataStream& operator>>( QDataStream& s, KProtocolInfo::Extr aField& field ); | KDECORE_EXPORT QDataStream& operator>>( QDataStream& s, KProtocolInfo::Extr aField& field ); | |||
KDECORE_EXPORT QDataStream& operator<<( QDataStream& s, const KProtocolInfo ::ExtraField& field ); | KDECORE_EXPORT QDataStream& operator<<( QDataStream& s, const KProtocolInfo ::ExtraField& field ); | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added | |||
kprotocolmanager.h | kprotocolmanager.h | |||
---|---|---|---|---|
skipping to change at line 665 | skipping to change at line 665 | |||
*/ | */ | |||
static QString slaveProtocol(const KUrl &url, QStringList &proxy); | static QString slaveProtocol(const KUrl &url, QStringList &proxy); | |||
/** | /** | |||
* Return Accept-Languages header built up according to user's desktop | * Return Accept-Languages header built up according to user's desktop | |||
* language settings. | * language settings. | |||
* @return Accept-Languages header string | * @return Accept-Languages header string | |||
*/ | */ | |||
static QString acceptLanguagesHeader(); | static QString acceptLanguagesHeader(); | |||
/** | ||||
* Returns the charset to use for the specified @ref url. | ||||
* | ||||
* @since 4.10 | ||||
*/ | ||||
static QString charsetFor(const KUrl& url); | ||||
private: | private: | |||
friend class KIO::SlaveConfigPrivate; | friend class KIO::SlaveConfigPrivate; | |||
/** | /** | |||
* @internal | * @internal | |||
* (Shared with SlaveConfig) | * (Shared with SlaveConfig) | |||
*/ | */ | |||
KDE_NO_EXPORT static KSharedConfigPtr config(); | KDE_NO_EXPORT static KSharedConfigPtr config(); | |||
}; | }; | |||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 7 lines changed or added | |||
krichtextedit.h | krichtextedit.h | |||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
#include <ktextedit.h> | #include <ktextedit.h> | |||
class QMouseEvent; | class QMouseEvent; | |||
class QKeyEvent; | class QKeyEvent; | |||
class KRichTextEditPrivate; | class KRichTextEditPrivate; | |||
#include <kdeui_export.h> | #include <kdeui_export.h> | |||
#define HAVE_INSERTPLAINTEXT 1 | ||||
/** | /** | |||
* The KRichTextEdit class provides a widget to edit and display rich text. | * The KRichTextEdit class provides a widget to edit and display rich text. | |||
* | * | |||
* It offers several additional rich text editing functions to KTextEdit an d makes | * It offers several additional rich text editing functions to KTextEdit an d makes | |||
* them easier to access including: | * them easier to access including: | |||
* | * | |||
* @li Changing fonts, sizes. | * @li Changing fonts, sizes. | |||
* @li Font formatting, such as bold, underline, italic, foreground and | * @li Font formatting, such as bold, underline, italic, foreground and | |||
* background color. | * background color. | |||
* @li Paragraph alignment | * @li Paragraph alignment | |||
skipping to change at line 344 | skipping to change at line 346 | |||
void setTextSuperScript(bool superscript); | void setTextSuperScript(bool superscript); | |||
/** | /** | |||
* Toggles the subscript formatting of the current word or selection at the current | * Toggles the subscript formatting of the current word or selection at the current | |||
* cursor position. | * cursor position. | |||
* | * | |||
* @param subscript If true, the text will be set to subscript | * @param subscript If true, the text will be set to subscript | |||
*/ | */ | |||
void setTextSubScript(bool subscript); | void setTextSubScript(bool subscript); | |||
/** | ||||
* @since 4.10 | ||||
* Because of binary compatibility constraints, insertPlainText | ||||
* is not virtual. Therefore it must dynamically detect and call this s | ||||
lot. | ||||
*/ | ||||
void insertPlainTextImplementation(); | ||||
Q_SIGNALS: | Q_SIGNALS: | |||
/** | /** | |||
* Emitted whenever the text mode is changed. | * Emitted whenever the text mode is changed. | |||
* | * | |||
* @param mode The new text mode | * @param mode The new text mode | |||
*/ | */ | |||
void textModeChanged(KRichTextEdit::Mode mode); | void textModeChanged(KRichTextEdit::Mode mode); | |||
/** | /** | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 10 lines changed or added | |||
kruler.h | kruler.h | |||
---|---|---|---|---|
skipping to change at line 131 | skipping to change at line 131 | |||
* | * | |||
* @p parent and @p f are passed to QFrame. | * @p parent and @p f are passed to QFrame. | |||
* The default look is a raised widget | * The default look is a raised widget | |||
* but may be changed with the inherited QFrame methods. | * but may be changed with the inherited QFrame methods. | |||
* | * | |||
* @param orient Orientation of the ruler. | * @param orient Orientation of the ruler. | |||
* @param parent Will be handed over to QFrame. | * @param parent Will be handed over to QFrame. | |||
* @param f Will be handed over to QFrame. | * @param f Will be handed over to QFrame. | |||
* | * | |||
**/ | **/ | |||
explicit KRuler(Qt::Orientation orient, QWidget *parent=0, Qt::WFlags f=0 ); | explicit KRuler(Qt::Orientation orient, QWidget *parent=0, Qt::WindowFlag s f=0); | |||
/** | /** | |||
* Constructs a ruler with orientation @p orient and initial width @p wid getWidth. | * Constructs a ruler with orientation @p orient and initial width @p wid getWidth. | |||
* | * | |||
* The width sets the fixed width of the widget. This is useful if you | * The width sets the fixed width of the widget. This is useful if you | |||
* want to draw the ruler bigger or smaller than the default size. | * want to draw the ruler bigger or smaller than the default size. | |||
* Note: The size of the marks doesn't change. | * Note: The size of the marks doesn't change. | |||
* @p parent and @p f are passed to QFrame. | * @p parent and @p f are passed to QFrame. | |||
* | * | |||
* @param orient Orientation of the ruler. | * @param orient Orientation of the ruler. | |||
* @param widgetWidth Fixed width of the widget. | * @param widgetWidth Fixed width of the widget. | |||
* @param parent Will be handed over to QFrame. | * @param parent Will be handed over to QFrame. | |||
* @param f Will be handed over to QFrame. | * @param f Will be handed over to QFrame. | |||
* | * | |||
*/ | */ | |||
KRuler(Qt::Orientation orient, int widgetWidth, QWidget *parent=0, | KRuler(Qt::Orientation orient, int widgetWidth, QWidget *parent=0, | |||
Qt::WFlags f=0); | Qt::WindowFlags f=0); | |||
/** | /** | |||
* Destructor. | * Destructor. | |||
*/ | */ | |||
~KRuler(); | ~KRuler(); | |||
/** | /** | |||
* Sets the minimal value of the ruler pointer (default is 0). | * Sets the minimal value of the ruler pointer (default is 0). | |||
* | * | |||
* This method calls update() so that the widget is painted after leaving | * This method calls update() so that the widget is painted after leaving | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
kseparator.h | kseparator.h | |||
---|---|---|---|---|
skipping to change at line 45 | skipping to change at line 45 | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrienta tion ) | Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrienta tion ) | |||
public: | public: | |||
/** | /** | |||
* Constructor. | * Constructor. | |||
* @param parent parent object. | * @param parent parent object. | |||
* @param f extra QWidget flags. | * @param f extra QWidget flags. | |||
**/ | **/ | |||
explicit KSeparator(QWidget* parent=0, Qt::WFlags f=0); | explicit KSeparator(QWidget* parent=0, Qt::WindowFlags f=0); | |||
/** | /** | |||
* Constructor. | * Constructor. | |||
* @param orientation Set the orientation of the separator. | * @param orientation Set the orientation of the separator. | |||
* Possible values are Horizontal or Vertical. | * Possible values are Horizontal or Vertical. | |||
* @param parent parent object. | * @param parent parent object. | |||
* @param f extra QWidget flags. | * @param f extra QWidget flags. | |||
**/ | **/ | |||
explicit KSeparator(Qt::Orientation orientation, QWidget* parent=0, Qt::W Flags f=0); | explicit KSeparator(Qt::Orientation orientation, QWidget* parent=0, Qt::W indowFlags f=0); | |||
/** | /** | |||
* Returns the orientation of the separator. | * Returns the orientation of the separator. | |||
* @return int Possible values Horizontal or Vertical. | * @return int Possible values Horizontal or Vertical. | |||
**/ | **/ | |||
Qt::Orientation orientation() const; | Qt::Orientation orientation() const; | |||
/** | /** | |||
* Set the orientation of the separator to @p orientation | * Set the orientation of the separator to @p orientation | |||
* | * | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
kservicetypetrader.h | kservicetypetrader.h | |||
---|---|---|---|---|
skipping to change at line 183 | skipping to change at line 183 | |||
* @param error The string passed here will contain an error descriptio n. | * @param error The string passed here will contain an error descriptio n. | |||
* @return A pointer to the newly created object or a null pointer if t he | * @return A pointer to the newly created object or a null pointer if t he | |||
* factory was unable to create an object of the given type. | * factory was unable to create an object of the given type. | |||
*/ | */ | |||
template <class T> | template <class T> | |||
static T *createInstanceFromQuery(const QString &serviceType, | static T *createInstanceFromQuery(const QString &serviceType, | |||
QWidget *parentWidget, QObject *parent, const QString &constrai nt = QString(), | QWidget *parentWidget, QObject *parent, const QString &constrai nt = QString(), | |||
const QVariantList &args = QVariantList(), QString *error = 0) | const QVariantList &args = QVariantList(), QString *error = 0) | |||
{ | { | |||
const KService::List offers = self()->query(serviceType, constraint ); | const KService::List offers = self()->query(serviceType, constraint ); | |||
if (error) | ||||
error->clear(); | ||||
Q_FOREACH (const KService::Ptr &ptr, offers) { | Q_FOREACH (const KService::Ptr &ptr, offers) { | |||
T *component = ptr->template createInstance<T>(parentWidget, pa rent, args, error); | T *component = ptr->template createInstance<T>(parentWidget, pa rent, args, error); | |||
if (component) { | if (component) { | |||
if (error) | ||||
error->clear(); | ||||
return component; | return component; | |||
} | } | |||
} | } | |||
if (error) | if (error && error->isEmpty()) | |||
*error = i18n("No service matching the requirements was found") ; | *error = i18n("No service matching the requirements was found") ; | |||
return 0; | return 0; | |||
} | } | |||
/** | /** | |||
* @deprecated Use | * @deprecated Use | |||
* createInstanceFromQuery(const QString&, const QString&, QObject*, co nst QVariantList&, QString*) | * createInstanceFromQuery(const QString&, const QString&, QObject*, co nst QVariantList&, QString*) | |||
* instead | * instead | |||
*/ | */ | |||
#ifndef KDE_NO_DEPRECATED | #ifndef KDE_NO_DEPRECATED | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
ksplashscreen.h | ksplashscreen.h | |||
---|---|---|---|---|
skipping to change at line 51 | skipping to change at line 51 | |||
*/ | */ | |||
class KDEUI_EXPORT KSplashScreen : public QSplashScreen //krazy:exclude=qcl asses | class KDEUI_EXPORT KSplashScreen : public QSplashScreen //krazy:exclude=qcl asses | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
/** | /** | |||
* Constructs a splash screen. | * Constructs a splash screen. | |||
*/ | */ | |||
explicit KSplashScreen(const QPixmap &pixmap, Qt::WFlags f = 0); | explicit KSplashScreen(const QPixmap &pixmap, Qt::WindowFlags f = 0); | |||
/** | /** | |||
* Destructor. | * Destructor. | |||
* | * | |||
* Deletes all internal objects. | * Deletes all internal objects. | |||
*/ | */ | |||
~KSplashScreen(); | ~KSplashScreen(); | |||
private: | private: | |||
class Private; | class Private; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
ktabwidget.h | ktabwidget.h | |||
---|---|---|---|---|
skipping to change at line 64 | skipping to change at line 64 | |||
Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE set AutomaticResizeTabs ) | Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE set AutomaticResizeTabs ) | |||
public: | public: | |||
/** | /** | |||
* Creates a new tab widget. | * Creates a new tab widget. | |||
* | * | |||
* @param parent The parent widgets. | * @param parent The parent widgets. | |||
* @param flags The Qt window flags @see QWidget. | * @param flags The Qt window flags @see QWidget. | |||
*/ | */ | |||
explicit KTabWidget( QWidget *parent = 0, Qt::WFlags flags = 0 ); | explicit KTabWidget( QWidget *parent = 0, Qt::WindowFlags flags = 0 ); | |||
/** | /** | |||
* Destroys the tab widget. | * Destroys the tab widget. | |||
*/ | */ | |||
virtual ~KTabWidget(); | virtual ~KTabWidget(); | |||
/** | /** | |||
* Set the tab of the given widget to \a color. | * Set the tab of the given widget to \a color. | |||
* This is simply a convenience method for QTabBar::setTabTextColor. | * This is simply a convenience method for QTabBar::setTabTextColor. | |||
*/ | */ | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
ktextedit.h | ktextedit.h | |||
---|---|---|---|---|
skipping to change at line 27 | skipping to change at line 27 | |||
Boston, MA 02110-1301, USA. | Boston, MA 02110-1301, USA. | |||
*/ | */ | |||
#ifndef KTEXTEDIT_H | #ifndef KTEXTEDIT_H | |||
#define KTEXTEDIT_H | #define KTEXTEDIT_H | |||
#include <kdeui_export.h> | #include <kdeui_export.h> | |||
#include <sonnet/highlighter.h> | #include <sonnet/highlighter.h> | |||
#include <QtGui/QTextEdit> | #include <QtGui/QTextEdit> | |||
#define HAVE_SHOWTABACTION 1 | ||||
#define HAVE_AUTOCORRECTFEATURE 1 | ||||
#define HAVE_FORCESPELLCHECKING 1 | ||||
#define HAVE_MOUSEPOPUPMENUIMPLEMENTATION 1 | ||||
/** | /** | |||
* This interface is a workaround to keep binary compatibility in KDE4, bec ause | * This interface is a workaround to keep binary compatibility in KDE4, bec ause | |||
* adding the virtual keyword to functions is not BC. | * adding the virtual keyword to functions is not BC. | |||
* | * | |||
* Call KTextEdit::setSpellInterface() to set this interface to a KTextEdit , | * Call KTextEdit::setSpellInterface() to set this interface to a KTextEdit , | |||
* and some functions of KTextEdit will delegate their calls to this interf ace | * and some functions of KTextEdit will delegate their calls to this interf ace | |||
* instead, which provides a way for derived classes to modifiy the behavio r | * instead, which provides a way for derived classes to modifiy the behavio r | |||
* or those functions. | * or those functions. | |||
* | * | |||
* @since 4.2 | * @since 4.2 | |||
skipping to change at line 255 | skipping to change at line 259 | |||
* @since 4.4 | * @since 4.4 | |||
*/ | */ | |||
void setClickMessage(const QString &msg); | void setClickMessage(const QString &msg); | |||
/** | /** | |||
* @return the message set with setClickMessage | * @return the message set with setClickMessage | |||
* @since 4.4 | * @since 4.4 | |||
*/ | */ | |||
QString clickMessage() const; | QString clickMessage() const; | |||
/** | ||||
* @since 4.10 | ||||
*/ | ||||
void showTabAction(bool show); | ||||
/** | ||||
* @since 4.10 | ||||
*/ | ||||
void showAutoCorrectButton(bool show); | ||||
/** | ||||
* @since 4.10 | ||||
* create a modal spellcheck dialogbox and spellCheckingFinished signal | ||||
we sent when | ||||
* we finish spell checking or spellCheckingCanceled signal when we can | ||||
cel spell checking | ||||
*/ | ||||
void forceSpellChecking(); | ||||
Q_SIGNALS: | Q_SIGNALS: | |||
/** | /** | |||
* emit signal when we activate or not autospellchecking | * emit signal when we activate or not autospellchecking | |||
* | * | |||
* @since 4.1 | * @since 4.1 | |||
*/ | */ | |||
void checkSpellingChanged( bool ); | void checkSpellingChanged( bool ); | |||
/** | /** | |||
* Signal sends when spell checking is finished/stopped/completed | * Signal sends when spell checking is finished/stopped/completed | |||
skipping to change at line 293 | skipping to change at line 314 | |||
* | * | |||
* NOTE: Do not store the pointer to the QMenu | * NOTE: Do not store the pointer to the QMenu | |||
* provided through since it is created and deleted | * provided through since it is created and deleted | |||
* on demand. | * on demand. | |||
* | * | |||
* @param p the context menu about to be displayed | * @param p the context menu about to be displayed | |||
* @since 4.5 | * @since 4.5 | |||
*/ | */ | |||
void aboutToShowContextMenu(QMenu* menu); | void aboutToShowContextMenu(QMenu* menu); | |||
/** | ||||
* @since 4.10 | ||||
*/ | ||||
void spellCheckerAutoCorrect(const QString& currentWord, const QString& | ||||
autoCorrectWord); | ||||
/** | ||||
* signal spellCheckingFinished is sent when we finish spell check or w | ||||
e click on "Terminate" button in sonnet dialogbox | ||||
* @since 4.10 | ||||
*/ | ||||
void spellCheckingFinished(); | ||||
/** | ||||
* signal spellCheckingCanceled is sent when we cancel spell checking. | ||||
* @since 4.10 | ||||
*/ | ||||
void spellCheckingCanceled(); | ||||
public Q_SLOTS: | public Q_SLOTS: | |||
/** | /** | |||
* Set the spell check language which will be used for highlighting spe lling | * Set the spell check language which will be used for highlighting spe lling | |||
* mistakes and for the spellcheck dialog. | * mistakes and for the spellcheck dialog. | |||
* The languageChanged() signal will be emitted when the new language i s | * The languageChanged() signal will be emitted when the new language i s | |||
* different from the old one. | * different from the old one. | |||
* | * | |||
* @since 4.1 | * @since 4.1 | |||
*/ | */ | |||
skipping to change at line 334 | skipping to change at line 372 | |||
*/ | */ | |||
void showSpellConfigDialog(const QString &configFileName, | void showSpellConfigDialog(const QString &configFileName, | |||
const QString &windowIcon = QString()); | const QString &windowIcon = QString()); | |||
/** | /** | |||
* Create replace dialogbox | * Create replace dialogbox | |||
* @since 4.1 | * @since 4.1 | |||
*/ | */ | |||
void replace(); | void replace(); | |||
/** | ||||
* @since 4.10 | ||||
* Because of binary compatibility constraints, mousePopupMenu() | ||||
* is not virtual. Therefore it must dynamically detect and call this s | ||||
lot. | ||||
*/ | ||||
void mousePopupMenuImplementation(const QPoint& pos); | ||||
protected Q_SLOTS: | protected Q_SLOTS: | |||
/** | /** | |||
* @since 4.1 | * @since 4.1 | |||
*/ | */ | |||
void slotDoReplace(); | void slotDoReplace(); | |||
void slotReplaceNext(); | void slotReplaceNext(); | |||
void slotDoFind(); | void slotDoFind(); | |||
void slotFind(); | void slotFind(); | |||
void slotFindNext(); | void slotFindNext(); | |||
void slotReplace(); | void slotReplace(); | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 50 lines changed or added | |||
movingcursor.h | movingcursor.h | |||
---|---|---|---|---|
skipping to change at line 73 | skipping to change at line 73 | |||
* | * | |||
* \since 4.5 | * \since 4.5 | |||
*/ | */ | |||
class KTEXTEDITOR_EXPORT MovingCursor | class KTEXTEDITOR_EXPORT MovingCursor | |||
{ | { | |||
// | // | |||
// sub types | // sub types | |||
// | // | |||
public: | public: | |||
/** | /** | |||
* Insert behavior of this cursor, should it stay if text is insert at it's position | * Insert behavior of this cursor, should it stay if text is insert at its position | |||
* or should it move. | * or should it move. | |||
*/ | */ | |||
enum InsertBehavior { | enum InsertBehavior { | |||
StayOnInsert = 0x0, ///< stay on insert | StayOnInsert = 0x0, ///< stay on insert | |||
MoveOnInsert = 0x1 ///< move on insert | MoveOnInsert = 0x1 ///< move on insert | |||
}; | }; | |||
/** | /** | |||
* Wrap behavior for end of line treatement used in move(). | * Wrap behavior for end of line treatement used in move(). | |||
*/ | */ | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
movinginterface.h | movinginterface.h | |||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
#include <ktexteditor/ktexteditor_export.h> | #include <ktexteditor/ktexteditor_export.h> | |||
#include <ktexteditor/movingcursor.h> | #include <ktexteditor/movingcursor.h> | |||
#include <ktexteditor/movingrange.h> | #include <ktexteditor/movingrange.h> | |||
#include <ktexteditor/movingrangefeedback.h> | #include <ktexteditor/movingrangefeedback.h> | |||
namespace KTextEditor | namespace KTextEditor | |||
{ | { | |||
/** | /** | |||
* \brief Document interface for for MovingCursor%s and MovingRange%s. | * \brief Document interface for MovingCursor%s and MovingRange%s. | |||
* | * | |||
* \ingroup kte_group_document_extension | * \ingroup kte_group_document_extension | |||
* \ingroup kte_group_moving_classes | * \ingroup kte_group_moving_classes | |||
* | * | |||
* This class provides the interface for KTextEditor::Documents to create M ovingCursors/Ranges. | * This class provides the interface for KTextEditor::Documents to create M ovingCursors/Ranges. | |||
* | * | |||
* \author Christoph Cullmann \<cullmann@kde.org\> | * \author Christoph Cullmann \<cullmann@kde.org\> | |||
* | * | |||
* \since 4.5 | * \since 4.5 | |||
*/ | */ | |||
skipping to change at line 113 | skipping to change at line 113 | |||
/** | /** | |||
* Release a revision. | * Release a revision. | |||
* @param revision revision to release | * @param revision revision to release | |||
*/ | */ | |||
virtual void unlockRevision (qint64 revision) = 0; | virtual void unlockRevision (qint64 revision) = 0; | |||
/** | /** | |||
* Transform a cursor from one revision to an other. | * Transform a cursor from one revision to an other. | |||
* @param cursor cursor to transform | * @param cursor cursor to transform | |||
* @param insertBehavior behavior of this cursor on insert of text at i t's position | * @param insertBehavior behavior of this cursor on insert of text at i ts position | |||
* @param fromRevision from this revision we want to transform | * @param fromRevision from this revision we want to transform | |||
* @param toRevision to this revision we want to transform, default of -1 is current revision | * @param toRevision to this revision we want to transform, default of -1 is current revision | |||
*/ | */ | |||
virtual void transformCursor (KTextEditor::Cursor &cursor, KTextEditor: :MovingCursor::InsertBehavior insertBehavior, qint64 fromRevision, qint64 t oRevision = -1) = 0; | virtual void transformCursor (KTextEditor::Cursor &cursor, KTextEditor: :MovingCursor::InsertBehavior insertBehavior, qint64 fromRevision, qint64 t oRevision = -1) = 0; | |||
/** | /** | |||
* Transform a cursor from one revision to an other. | * Transform a cursor from one revision to an other. | |||
* @param line line number of the cursor to transform | * @param line line number of the cursor to transform | |||
* @param column column number of the cursor to transform | * @param column column number of the cursor to transform | |||
* @param insertBehavior behavior of this cursor on insert of text at i t's position | * @param insertBehavior behavior of this cursor on insert of text at i ts position | |||
* @param fromRevision from this revision we want to transform | * @param fromRevision from this revision we want to transform | |||
* @param toRevision to this revision we want to transform, default of -1 is current revision | * @param toRevision to this revision we want to transform, default of -1 is current revision | |||
*/ | */ | |||
virtual void transformCursor (int& line, int& column, KTextEditor::Movi ngCursor::InsertBehavior insertBehavior, qint64 fromRevision, qint64 toRevi sion = -1) = 0; | virtual void transformCursor (int& line, int& column, KTextEditor::Movi ngCursor::InsertBehavior insertBehavior, qint64 fromRevision, qint64 toRevi sion = -1) = 0; | |||
/** | /** | |||
* Transform a range from one revision to an other. | * Transform a range from one revision to an other. | |||
* @param range range to transform | * @param range range to transform | |||
* @param insertBehaviors behavior of this range on insert of text at i t's position | * @param insertBehaviors behavior of this range on insert of text at i ts position | |||
* @param emptyBehavior behavior on becoming empty | * @param emptyBehavior behavior on becoming empty | |||
* @param fromRevision from this revision we want to transform | * @param fromRevision from this revision we want to transform | |||
* @param toRevision to this revision we want to transform, default of -1 is current revision | * @param toRevision to this revision we want to transform, default of -1 is current revision | |||
*/ | */ | |||
virtual void transformRange (KTextEditor::Range &range, KTextEditor::Mo vingRange::InsertBehaviors insertBehaviors, MovingRange::EmptyBehavior empt yBehavior, qint64 fromRevision, qint64 toRevision = -1) = 0; | virtual void transformRange (KTextEditor::Range &range, KTextEditor::Mo vingRange::InsertBehaviors insertBehaviors, MovingRange::EmptyBehavior empt yBehavior, qint64 fromRevision, qint64 toRevision = -1) = 0; | |||
// | // | |||
// Signals | // Signals | |||
// | // | |||
public: | public: | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added | |||
networking.h | networking.h | |||
---|---|---|---|---|
skipping to change at line 32 | skipping to change at line 32 | |||
#ifndef SOLID_NETWORKING | #ifndef SOLID_NETWORKING | |||
#define SOLID_NETWORKING | #define SOLID_NETWORKING | |||
#include <QtCore/QObject> | #include <QtCore/QObject> | |||
#include <solid/solid_export.h> | #include <solid/solid_export.h> | |||
namespace Solid | namespace Solid | |||
{ | { | |||
/** | /** | |||
* This class allow to query the underlying system to discover the avai | * This namespace contains all the network-related high-level methods: | |||
lable | * querying the underlying system for network availability, | |||
* network interfaces and reachable network.It has also the | * being notified when network availability changes | |||
* responsibility to notify when a network interface or a network appea | * (e.g. due to interfaces appearing or disappearing). | |||
r or disappear. | ||||
* | * | |||
* It's the unique entry point for network management. Applications sho | * It also allows application to specify the connection and disconnecti | |||
uld use | on policies | |||
* it to find network interfaces, or to be notified about network relat | * that it would like to use, for the network. | |||
ed changes. | ||||
* | ||||
* Note that it's implemented as a singleton and encapsulates the backe | ||||
nd logic. | ||||
*/ | */ | |||
namespace Networking | namespace Networking | |||
{ | { | |||
/** | /** | |||
* Describes the state of the networking system | * Describes the state of the networking system | |||
*/ | */ | |||
enum Status { | enum Status { | |||
Unknown, /**< the networking system is not active or unable to report its status - proceed with caution */ | Unknown, /**< the networking system is not active or unable to report its status - proceed with caution */ | |||
Unconnected,/**< the system is not connected to any network */ | Unconnected,/**< the system is not connected to any network */ | |||
Disconnecting, /**< the system is breaking the connection */ | Disconnecting, /**< the system is breaking the connection */ | |||
End of changes. 2 change blocks. | ||||
12 lines changed or deleted | 7 lines changed or added | |||
part.h | part.h | |||
---|---|---|---|---|
skipping to change at line 656 | skipping to change at line 656 | |||
* @p pendingAction true if a pending action exists, false otherwise. | * @p pendingAction true if a pending action exists, false otherwise. | |||
*/ | */ | |||
void completed( bool pendingAction ); | void completed( bool pendingAction ); | |||
/** | /** | |||
* Emit this if loading is canceled by the user or by an error. | * Emit this if loading is canceled by the user or by an error. | |||
* @param errMsg the error message, empty if the user canceled the load ing voluntarily. | * @param errMsg the error message, empty if the user canceled the load ing voluntarily. | |||
*/ | */ | |||
void canceled( const QString &errMsg ); | void canceled( const QString &errMsg ); | |||
/** | ||||
* Emitted by the part when url() changes | ||||
* @since 4.10 | ||||
*/ | ||||
void urlChanged( const KUrl & url ); | ||||
protected: | protected: | |||
/** | /** | |||
* If the part uses the standard implementation of openUrl(), | * If the part uses the standard implementation of openUrl(), | |||
* it must reimplement this, to open the local file. | * it must reimplement this, to open the local file. | |||
* The default implementation is simply { return false; } | * The default implementation is simply { return false; } | |||
*/ | */ | |||
virtual bool openFile(); | virtual bool openFile(); | |||
/** | /** | |||
* @internal | * @internal | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 6 lines changed or added | |||
partmanager.h | partmanager.h | |||
---|---|---|---|---|
skipping to change at line 254 | skipping to change at line 254 | |||
void activePartChanged( KParts::Part *newPart ); | void activePartChanged( KParts::Part *newPart ); | |||
protected: | protected: | |||
/** | /** | |||
* Changes the active instance when the active part changes. | * Changes the active instance when the active part changes. | |||
* The active instance is used by KBugReport and KAboutDialog. | * The active instance is used by KBugReport and KAboutDialog. | |||
* Override if you really need to - usually you don't need to. | * Override if you really need to - usually you don't need to. | |||
*/ | */ | |||
virtual void setActiveComponent(const KComponentData &instance); | virtual void setActiveComponent(const KComponentData &instance); | |||
/** | ||||
* Sets whether the PartManager ignores explict set focus requests | ||||
* from the part. | ||||
* | ||||
* By default this option is set to false. Set it to true to prevent | ||||
* the part from sending explicit set focus requests to the client | ||||
* application. | ||||
* | ||||
* @since 4.10 | ||||
*/ | ||||
void setIgnoreExplictFocusRequests(bool); | ||||
protected Q_SLOTS: | protected Q_SLOTS: | |||
/** | /** | |||
* Removes a part when it is destroyed. | * Removes a part when it is destroyed. | |||
**/ | **/ | |||
void slotObjectDestroyed(); | void slotObjectDestroyed(); | |||
/** | /** | |||
* @internal | * @internal | |||
*/ | */ | |||
void slotWidgetDestroyed(); | void slotWidgetDestroyed(); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 12 lines changed or added | |||
plasma.h | plasma.h | |||
---|---|---|---|---|
skipping to change at line 77 | skipping to change at line 77 | |||
desktop, laptop or tablet usage: a high | desktop, laptop or tablet usage: a high | |||
resolution screen 1-3 feet distant from the | resolution screen 1-3 feet distant from the | |||
viewer. */ | viewer. */ | |||
MediaCenter, /**< As with Planar, the applet lives in a plane | MediaCenter, /**< As with Planar, the applet lives in a plane | |||
but the interface should be optimized for | but the interface should be optimized for | |||
medium-to-high resolution screens that are | medium-to-high resolution screens that are | |||
5-15 feet distant from the viewer. Sometimes | 5-15 feet distant from the viewer. Sometimes | |||
referred to as a "ten foot interface".*/ | referred to as a "ten foot interface".*/ | |||
Horizontal, /**< The applet is constrained vertically, but | Horizontal, /**< The applet is constrained vertically, but | |||
can expand horizontally. */ | can expand horizontally. */ | |||
Vertical /**< The applet is constrained horizontally, but | Vertical, /**< The applet is constrained horizontally, but | |||
can expand vertically. */ | can expand vertically. */ | |||
Application /**< The Applet lives in a plane and should be optimized to | ||||
look as a full application, | ||||
for the desktop or the particular device. */ | ||||
}; | }; | |||
/** | /** | |||
* The Direction enumeration describes in which direction, relative to the | * The Direction enumeration describes in which direction, relative to the | |||
* Applet (and its managing container), popup menus, expanders, balloons, | * Applet (and its managing container), popup menus, expanders, balloons, | |||
* message boxes, arrows and other such visually associated widgets should | * message boxes, arrows and other such visually associated widgets should | |||
* appear in. This is usually the oposite of the Location. | * appear in. This is usually the oposite of the Location. | |||
**/ | **/ | |||
enum Direction { | enum Direction { | |||
Down = 0, /**< Display downards */ | Down = 0, /**< Display downards */ | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 4 lines changed or added | |||
runnercontext.h | runnercontext.h | |||
---|---|---|---|---|
skipping to change at line 166 | skipping to change at line 166 | |||
bool addMatch(const QString &term, const QueryMatch &match); | bool addMatch(const QString &term, const QueryMatch &match); | |||
/** | /** | |||
* Removes a match from the existing list of matches. | * Removes a match from the existing list of matches. | |||
* | * | |||
* If you are going to be removing multiple matches, use removeMatc hes instead. | * If you are going to be removing multiple matches, use removeMatc hes instead. | |||
* | * | |||
* @param matchId the id of match to remove | * @param matchId the id of match to remove | |||
* | * | |||
* @return true if the match was removed, false otherwise. | * @return true if the match was removed, false otherwise. | |||
* @since 4.4 | * @since 4.4 | |||
*/ | */ | |||
bool removeMatch(const QString matchId); | bool removeMatch(const QString matchId); | |||
/** | /** | |||
* Removes lists of matches from the existing list of matches. | * Removes lists of matches from the existing list of matches. | |||
* | * | |||
* This method is thread safe and causes the matchesChanged() signa l to be emitted. | * This method is thread safe and causes the matchesChanged() signa l to be emitted. | |||
* | * | |||
* @param matchIdList the list of matches id to remove | * @param matchIdList the list of matches id to remove | |||
* | * | |||
* @return true if at least one match was removed, false otherwise. | * @return true if at least one match was removed, false otherwise. | |||
* @since 4.4 | * @since 4.4 | |||
*/ | */ | |||
bool removeMatches(const QStringList matchIdList); | bool removeMatches(const QStringList matchIdList); | |||
/** | /** | |||
* Removes lists of matches from a given AbstractRunner | ||||
* | ||||
* This method is thread safe and causes the matchesChanged() signa | ||||
l to be emitted. | ||||
* | ||||
* @param runner the AbstractRunner from which to remove matches | ||||
* | ||||
* @return true if at least one match was removed, false otherwise. | ||||
* @since 4.10 | ||||
*/ | ||||
bool removeMatches(AbstractRunner *runner); | ||||
/** | ||||
* Retrieves all available matches for the current search term. | * Retrieves all available matches for the current search term. | |||
* | * | |||
* @return a list of matches | * @return a list of matches | |||
*/ | */ | |||
QList<QueryMatch> matches() const; | QList<QueryMatch> matches() const; | |||
/** | /** | |||
* Retrieves a match by id. | * Retrieves a match by id. | |||
* | * | |||
* @param id the id of the match to return | * @param id the id of the match to return | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 15 lines changed or added | |||
slavebase.h | slavebase.h | |||
---|---|---|---|---|
skipping to change at line 184 | skipping to change at line 184 | |||
* and resuming is implemented by this protocol. | * and resuming is implemented by this protocol. | |||
*/ | */ | |||
void canResume(); | void canResume(); | |||
/////////// | /////////// | |||
// Info Signals to send to the job | // Info Signals to send to the job | |||
/////////// | /////////// | |||
/** | /** | |||
* Call this in get and copy, to give the total size | * Call this in get and copy, to give the total size | |||
* of the file | * of the file. | |||
* Call in listDir too, when you know the total number of items. | ||||
*/ | */ | |||
void totalSize( KIO::filesize_t _bytes ); | void totalSize( KIO::filesize_t _bytes ); | |||
/** | /** | |||
* Call this during get and copy, once in a while, | * Call this during get and copy, once in a while, | |||
* to give some info about the current state. | * to give some info about the current state. | |||
* Don't emit it in listDir, listEntries speaks for itself. | * Don't emit it in listDir, listEntries speaks for itself. | |||
*/ | */ | |||
void processedSize( KIO::filesize_t _bytes ); | void processedSize( KIO::filesize_t _bytes ); | |||
void position( KIO::filesize_t _pos ); | void position( KIO::filesize_t _pos ); | |||
skipping to change at line 457 | skipping to change at line 456 | |||
* If the slave doesn't reimplement it, a get will | * If the slave doesn't reimplement it, a get will | |||
* 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, or if it is a file | * 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. | |||
*/ | */ | |||
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. | ||||
4 lines changed or deleted | 2 lines changed or added | |||
theme.h | theme.h | |||
---|---|---|---|---|
skipping to change at line 196 | skipping to change at line 196 | |||
Q_INVOKABLE void setFont(const QFont &font, FontRole role = Default Font); | Q_INVOKABLE void setFont(const QFont &font, FontRole role = Default Font); | |||
/** | /** | |||
* Returns the font to be used by themed items | * Returns the font to be used by themed items | |||
* | * | |||
* @param role which role (usage pattern) to get the font for | * @param role which role (usage pattern) to get the font for | |||
*/ | */ | |||
Q_INVOKABLE QFont font(FontRole role) const; | Q_INVOKABLE QFont font(FontRole role) const; | |||
/** | /** | |||
* Returns the font metrics for the font to be used by themed items | * @return the font metrics for the font to be used by themed items | |||
*/ | */ | |||
Q_INVOKABLE QFontMetrics fontMetrics() const; | Q_INVOKABLE QFontMetrics fontMetrics() const; | |||
/** | /** | |||
* Returns if the window manager effects (e.g. translucency, compos iting) is active or not | * @return true if the window manager effects (e.g. translucency, c ompositing) is active or not | |||
*/ | */ | |||
Q_INVOKABLE bool windowTranslucencyEnabled() const; | Q_INVOKABLE bool windowTranslucencyEnabled() const; | |||
/** | /** | |||
* Tells the theme whether to follow the global settings or use app lication | * Tells the theme whether to follow the global settings or use app lication | |||
* specific settings | * specific settings | |||
* | * | |||
* @param useGlobal pass in true to follow the global settings | * @param useGlobal pass in true to follow the global settings | |||
*/ | */ | |||
void setUseGlobalSettings(bool useGlobal); | void setUseGlobalSettings(bool useGlobal); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||