| kjob.h | | kjob.h | |
| | | | |
| skipping to change at line 34 | | skipping to change at line 34 | |
| | | | |
| #include <kdecore_export.h> | | #include <kdecore_export.h> | |
| #include <QtCore/QObject> | | #include <QtCore/QObject> | |
| #include <QtCore/QPair> | | #include <QtCore/QPair> | |
| | | | |
| class KJobUiDelegate; | | class KJobUiDelegate; | |
| | | | |
| class KJobPrivate; | | class KJobPrivate; | |
| /** | | /** | |
| * The base class for all jobs. | | * The base class for all jobs. | |
|
| * For all jobs created in an application, the code looks like | | | |
| * | | * | |
|
| | | * For all jobs created in an application, the code looks like | |
| * \code | | * \code | |
| * void SomeClass::methodWithAsynchronousJobCall() | | * void SomeClass::methodWithAsynchronousJobCall() | |
| * { | | * { | |
| * KJob * job = someoperation( some parameters ); | | * KJob * job = someoperation( some parameters ); | |
| * connect( job, SIGNAL( result( KJob * ) ), | | * connect( job, SIGNAL( result( KJob * ) ), | |
| * this, SLOT( handleResult( KJob * ) ) ); | | * this, SLOT( handleResult( KJob * ) ) ); | |
| * job->start(); | | * job->start(); | |
| * } | | * } | |
| * \endcode | | * \endcode | |
| * (other connects, specific to the job) | | * (other connects, specific to the job) | |
| * | | * | |
| * And handleResult is usually at least: | | * And handleResult is usually at least: | |
|
| * | | | |
| * \code | | * \code | |
| * void SomeClass::handleResult( KJob *job ) | | * void SomeClass::handleResult( KJob *job ) | |
| * { | | * { | |
| * if ( job->error() ) | | * if ( job->error() ) | |
| * doSomething(); | | * doSomething(); | |
| * } | | * } | |
| * \endcode | | * \endcode | |
| * | | * | |
| * With the synchronous interface the code looks like | | * With the synchronous interface the code looks like | |
|
| * | | | |
| * \code | | * \code | |
| * void SomeClass::methodWithSynchronousJobCall() | | * void SomeClass::methodWithSynchronousJobCall() | |
| * { | | * { | |
| * KJob *job = someoperation( some parameters ); | | * KJob *job = someoperation( some parameters ); | |
| * if ( !job->exec() ) | | * if ( !job->exec() ) | |
| * { | | * { | |
| * // An error occurred | | * // An error occurred | |
| * } | | * } | |
| * else | | * else | |
| * { | | * { | |
| * // Do something | | * // Do something | |
| * } | | * } | |
| * } | | * } | |
| * \endcode | | * \endcode | |
| * | | * | |
|
| * @note: KJob and its subclasses is meant to be used | | * Subclasses must implement start(), which should trigger | |
| * in a fire-and-forget way. It's deleting itself when | | * the execution of the job (although the work should be | |
| * it has finished using deleteLater() so the job | | * done asynchronously). errorString() should also be | |
| * instance disappears after the next event loop run. | | * reimplemented by any subclasses that introduce new | |
| | | * error codes. | |
| | | * | |
| | | * @note: KJob and its subclasses are meant to be used | |
| | | * in a fire-and-forget way. Jobs will delete themselves | |
| | | * when they finish using deleteLater() (although this | |
| | | * behaviour can be changed), so a job instance will | |
| | | * disappear after the next event loop run. | |
| */ | | */ | |
| class KDECORE_EXPORT KJob : public QObject | | class KDECORE_EXPORT KJob : public QObject | |
| { | | { | |
| Q_OBJECT | | Q_OBJECT | |
| Q_ENUMS( KillVerbosity Capability Unit ) | | Q_ENUMS( KillVerbosity Capability Unit ) | |
| Q_FLAGS( Capabilities ) | | Q_FLAGS( Capabilities ) | |
| | | | |
| public: | | public: | |
| enum Unit { Bytes, Files, Directories }; | | enum Unit { Bytes, Files, Directories }; | |
| | | | |
| | | | |
| skipping to change at line 141 | | skipping to change at line 146 | |
| | | | |
| /** | | /** | |
| * Returns if the job was suspended with the suspend() call. | | * Returns if the job was suspended with the suspend() call. | |
| * | | * | |
| * @return if the job was suspended | | * @return if the job was suspended | |
| * @see suspend() resume() | | * @see suspend() resume() | |
| */ | | */ | |
| bool isSuspended() const; | | bool isSuspended() const; | |
| | | | |
| /** | | /** | |
|
| * Starts the job asynchronously. When the job is finished, | | * Starts the job asynchronously. | |
| * result() is emitted. | | * | |
| | | * When the job is finished, result() is emitted. | |
| * | | * | |
| * Warning: Never implement any synchronous workload in this method. Th
is method | | * Warning: Never implement any synchronous workload in this method. Th
is method | |
| * should just trigger the job startup, not do any work itself. It is e
xpected to | | * should just trigger the job startup, not do any work itself. It is e
xpected to | |
| * be non-blocking. | | * be non-blocking. | |
| * | | * | |
| * This is the method all subclasses need to implement. | | * This is the method all subclasses need to implement. | |
| * It should setup and trigger the workload of the job. It should not d
o any | | * It should setup and trigger the workload of the job. It should not d
o any | |
| * work itself. This includes all signals and terminating the job, e.g.
by | | * work itself. This includes all signals and terminating the job, e.g.
by | |
| * emitResult(). The workload, which could be another method of the | | * emitResult(). The workload, which could be another method of the | |
| * subclass, is to be triggered using the event loop, e.g. by code like
: | | * subclass, is to be triggered using the event loop, e.g. by code like
: | |
| | | | |
| skipping to change at line 167 | | skipping to change at line 173 | |
| * } | | * } | |
| * \endcode | | * \endcode | |
| */ | | */ | |
| virtual void start() = 0; | | virtual void start() = 0; | |
| | | | |
| enum KillVerbosity { Quietly, EmitResult }; | | enum KillVerbosity { Quietly, EmitResult }; | |
| | | | |
| public Q_SLOTS: | | public Q_SLOTS: | |
| /** | | /** | |
| * Aborts this job. | | * Aborts this job. | |
|
| | | * | |
| * This kills and deletes the job. | | * This kills and deletes the job. | |
| * | | * | |
| * @param verbosity if equals to EmitResult, Job will emit signal resul
t | | * @param verbosity if equals to EmitResult, Job will emit signal resul
t | |
| * and ask uiserver to close the progress window. | | * and ask uiserver to close the progress window. | |
| * @p verbosity is set to EmitResult for subjobs. Whether applications | | * @p verbosity is set to EmitResult for subjobs. Whether applications | |
| * should call with Quietly or EmitResult depends on whether they rely | | * should call with Quietly or EmitResult depends on whether they rely | |
| * on result being emitted or not. Please notice that if @p verbosity i
s | | * on result being emitted or not. Please notice that if @p verbosity i
s | |
| * set to Quietly, signal result will NOT be emitted. | | * set to Quietly, signal result will NOT be emitted. | |
| * @return true if the operation is supported and succeeded, false othe
rwise | | * @return true if the operation is supported and succeeded, false othe
rwise | |
| */ | | */ | |
| | | | |
| skipping to change at line 197 | | skipping to change at line 204 | |
| /** | | /** | |
| * Resumes this job. | | * Resumes this job. | |
| * | | * | |
| * @return true if the operation is supported and succeeded, false othe
rwise | | * @return true if the operation is supported and succeeded, false othe
rwise | |
| */ | | */ | |
| bool resume(); | | bool resume(); | |
| | | | |
| protected: | | protected: | |
| /** | | /** | |
| * Aborts this job quietly. | | * Aborts this job quietly. | |
|
| | | * | |
| * This simply kills the job, no error reporting or job deletion should
be involved. | | * This simply kills the job, no error reporting or job deletion should
be involved. | |
| * | | * | |
| * @return true if the operation is supported and succeeded, false othe
rwise | | * @return true if the operation is supported and succeeded, false othe
rwise | |
| */ | | */ | |
| virtual bool doKill(); | | virtual bool doKill(); | |
| | | | |
| /** | | /** | |
| * Suspends this job. | | * Suspends this job. | |
| * | | * | |
| * @return true if the operation is supported and succeeded, false othe
rwise | | * @return true if the operation is supported and succeeded, false othe
rwise | |
| | | | |
| skipping to change at line 248 | | skipping to change at line 256 | |
| * your user interface will effectivly be blocked. Other events like pa
int or network events are | | * your user interface will effectivly be blocked. Other events like pa
int or network events are | |
| * still being processed. The advantage of not processing user input ev
ents is that the chance of | | * still being processed. The advantage of not processing user input ev
ents is that the chance of | |
| * accidental reentrancy is greatly reduced. Still you should avoid cal
ling this function. | | * accidental reentrancy is greatly reduced. Still you should avoid cal
ling this function. | |
| * | | * | |
| * @return true if the job has been executed without error, false other
wise | | * @return true if the job has been executed without error, false other
wise | |
| */ | | */ | |
| bool exec(); | | bool exec(); | |
| | | | |
| enum | | enum | |
| { | | { | |
|
| | | /*** Indicates there is no error */ | |
| NoError = 0, | | NoError = 0, | |
|
| | | /*** Indicates the job was killed */ | |
| KilledJobError = 1, | | KilledJobError = 1, | |
|
| | | /*** Subclasses should define error codes starting at this value */ | |
| UserDefinedError = 100 | | UserDefinedError = 100 | |
| }; | | }; | |
| | | | |
| /** | | /** | |
| * Returns the error code, if there has been an error. | | * Returns the error code, if there has been an error. | |
|
| | | * | |
| * Only call this method from the slot connected to result(). | | * Only call this method from the slot connected to result(). | |
| * | | * | |
| * @return the error code for this job, 0 if no error. | | * @return the error code for this job, 0 if no error. | |
| */ | | */ | |
| int error() const; | | int error() const; | |
| | | | |
| /** | | /** | |
| * Returns the error text if there has been an error. | | * Returns the error text if there has been an error. | |
|
| | | * | |
| * Only call if error is not 0. | | * Only call if error is not 0. | |
|
| * This is really internal, better use errorString. | | | |
| * | | * | |
|
| * @return a string to help understand the error, usually the url | | * This is usually some extra data associated with the error, | |
| * related to the error. Only valid if error() is not 0. | | * such as a URL. Use errorString() to get a human-readable, | |
| | | * translated message. | |
| | | * | |
| | | * @return a string to help understand the error | |
| */ | | */ | |
| QString errorText() const; | | QString errorText() const; | |
| | | | |
| /** | | /** | |
|
| * Converts an error code and a non-i18n error message into an | | * A human-readable error message. | |
| * error message in the current language. The low level (non-i18n) | | | |
| * error message (usually a url) is put into the translated error | | | |
| * message using %1. | | | |
| * | | * | |
|
| * Example for errid == ERR_CANNOT_OPEN_FOR_READING: | | * This provides a translated, human-readable description of the | |
| | | * error. Only call if error is not 0. | |
| | | * | |
| | | * Subclasses should implement this to create a translated | |
| | | * error message from the error code and error text. | |
| | | * For example: | |
| * \code | | * \code | |
|
| * i18n( "Could not read\n%1" , errorText() ); | | * if (error() == ReadFailed) | |
| | | * i18n( "Could not read \"%1\"", errorText() ); | |
| * \endcode | | * \endcode | |
|
| * Only call if error is not 0. | | | |
| * | | * | |
|
| * @return the error message and if there is no error, a message | | * @return a translated error message, providing error() is 0 | |
| * telling the user that the app is broken, so check with | | | |
| * error() whether there is an error | | | |
| */ | | */ | |
| virtual QString errorString() const; | | virtual QString errorString() const; | |
| | | | |
| /** | | /** | |
| * Returns the processed amount of a given unit for this job. | | * Returns the processed amount of a given unit for this job. | |
| * | | * | |
| * @param unit the unit of the requested amount | | * @param unit the unit of the requested amount | |
| * @return the processed size | | * @return the processed size | |
| */ | | */ | |
| qulonglong processedAmount(Unit unit) const; | | qulonglong processedAmount(Unit unit) const; | |
| | | | |
| skipping to change at line 513 | | skipping to change at line 528 | |
| * This is a private signal, it can't be emitted directly by subclasses
of | | * This is a private signal, it can't be emitted directly by subclasses
of | |
| * KJob, use emitSpeed() instead. | | * KJob, use emitSpeed() instead. | |
| * | | * | |
| * @param job the job that emitted this signal | | * @param job the job that emitted this signal | |
| * @param speed the speed in bytes/s | | * @param speed the speed in bytes/s | |
| */ | | */ | |
| void speed(KJob *job, unsigned long speed); | | void speed(KJob *job, unsigned long speed); | |
| | | | |
| protected: | | protected: | |
| /** | | /** | |
|
| * Sets the error code. It should be called when an error | | * Sets the error code. | |
| | | * | |
| | | * It should be called when an error | |
| * is encountered in the job, just before calling emitResult(). | | * is encountered in the job, just before calling emitResult(). | |
| * | | * | |
|
| | | * You should define an (anonymous) enum of error codes, | |
| | | * with values starting at KJob::UserDefinedError, and use | |
| | | * those. For example, | |
| | | * @code | |
| | | * enum { | |
| | | * InvalidFoo = UserDefinedError, | |
| | | * BarNotFound | |
| | | * }; | |
| | | * @endcode | |
| | | * | |
| * @param errorCode the error code | | * @param errorCode the error code | |
| * @see emitResult() | | * @see emitResult() | |
| */ | | */ | |
| void setError( int errorCode ); | | void setError( int errorCode ); | |
| | | | |
| /** | | /** | |
|
| * Sets the error text. It should be called when an error | | * Sets the error text. | |
| | | * | |
| | | * It should be called when an error | |
| * is encountered in the job, just before calling emitResult(). | | * is encountered in the job, just before calling emitResult(). | |
| * | | * | |
|
| | | * Provides extra information about the error that cannot be | |
| | | * determined directly from the error code. For example, a | |
| | | * URL or filename. This string is not normally translatable. | |
| | | * | |
| * @param errorText the error text | | * @param errorText the error text | |
|
| * @see emitResult() | | * @see emitResult(), errorString(), setError() | |
| */ | | */ | |
| void setErrorText( const QString &errorText ); | | void setErrorText( const QString &errorText ); | |
| | | | |
| /** | | /** | |
| * Sets the processed size. The processedAmount() and percent() signals | | * Sets the processed size. The processedAmount() and percent() signals | |
| * are emitted if the values changed. The percent() signal is emitted | | * are emitted if the values changed. The percent() signal is emitted | |
| * only for the progress unit. | | * only for the progress unit. | |
| * | | * | |
| * @param unit the unit of the new processed amount | | * @param unit the unit of the new processed amount | |
| * @param amount the new processed amount | | * @param amount the new processed amount | |
| | | | |
End of changes. 25 change blocks. |
| 25 lines changed or deleted | | 58 lines changed or added | |
|
| kservice.h | | kservice.h | |
| | | | |
| skipping to change at line 94 | | skipping to change at line 94 | |
| | | | |
| /** | | /** | |
| * @internal | | * @internal | |
| * Construct a service from a stream. | | * Construct a service from a stream. | |
| * The stream must already be positionned at the correct offset. | | * The stream must already be positionned at the correct offset. | |
| */ | | */ | |
| KService( QDataStream& str, int offset ); | | KService( QDataStream& str, int offset ); | |
| | | | |
| virtual ~KService(); | | virtual ~KService(); | |
| | | | |
|
| // TODO KDE5: add mimeTypes() accessor | | | |
| | | | |
| /** | | /** | |
| * Services are either applications (executables) or dlopened libraries
(plugins). | | * Services are either applications (executables) or dlopened libraries
(plugins). | |
| * @return true if this service is an application, i.e. it has Type=App
lication in its | | * @return true if this service is an application, i.e. it has Type=App
lication in its | |
| * .desktop file and exec() will not be empty. | | * .desktop file and exec() will not be empty. | |
| */ | | */ | |
| bool isApplication() const; | | bool isApplication() const; | |
| | | | |
| /** | | /** | |
| * Returns the type of the service. | | * Returns the type of the service. | |
| * @return the type of the service ("Application" or "Service") | | * @return the type of the service ("Application" or "Service") | |
| | | | |
| skipping to change at line 266 | | skipping to change at line 264 | |
| */ | | */ | |
| QStringList keywords() const; | | QStringList keywords() const; | |
| | | | |
| /** | | /** | |
| * Returns a list of VFolder categories. | | * Returns a list of VFolder categories. | |
| * @return the list of VFolder categories | | * @return the list of VFolder categories | |
| */ | | */ | |
| QStringList categories() const; | | QStringList categories() const; | |
| | | | |
| /** | | /** | |
|
| | | * Returns the list of mime types that this service supports. | |
| | | * Note that this doesn't include inherited mimetypes, | |
| | | * only the mimetypes types listed in the .desktop file. | |
| | | * @since 4.8.3 | |
| | | */ | |
| | | QStringList mimeTypes() const; | |
| | | | |
| | | /** | |
| * Returns the service types that this service supports. | | * Returns the service types that this service supports. | |
| * @return the list of service types that are supported | | * @return the list of service types that are supported | |
| * Note that this doesn't include inherited servicetypes or mimetypes, | | * Note that this doesn't include inherited servicetypes or mimetypes, | |
| * only the service types listed in the .desktop file. | | * only the service types listed in the .desktop file. | |
| */ | | */ | |
| QStringList serviceTypes() const; | | QStringList serviceTypes() const; | |
| | | | |
| /** | | /** | |
| * Checks whether the service supports this service type | | * Checks whether the service supports this service type | |
| * @param serviceTypePtr The name of the service type you are | | * @param serviceTypePtr The name of the service type you are | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 8 lines changed or added | |
|
| ksystemtimezone.h | | ksystemtimezone.h | |
| /* | | /* | |
| This file is part of the KDE libraries | | This file is part of the KDE libraries | |
|
| Copyright (c) 2005-2007,2009-2010 David Jarvie <djarvie@kde.org> | | Copyright (c) 2005-2007,2009-2012 David Jarvie <djarvie@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 Library General Public | | modify it under the terms of the GNU Library General Public | |
| License as published by the Free Software Foundation; either | | License as published by the Free Software Foundation; either | |
| version 2 of the License, or (at your option) any later version. | | version 2 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 | |
| Library General Public License for more details. | | Library General Public License for more details. | |
| | | | |
| skipping to change at line 48 | | skipping to change at line 48 | |
| | | | |
| class KSystemTimeZoneSource; | | class KSystemTimeZoneSource; | |
| class KSystemTimeZonePrivate; | | class KSystemTimeZonePrivate; | |
| class KSystemTimeZonesPrivate; | | class KSystemTimeZonesPrivate; | |
| class KSystemTimeZoneSourcePrivate; | | class KSystemTimeZoneSourcePrivate; | |
| class KSystemTimeZoneDataPrivate; | | class KSystemTimeZoneDataPrivate; | |
| | | | |
| /** | | /** | |
| * The KSystemTimeZones class represents the system time zone database, con
sisting | | * The KSystemTimeZones class represents the system time zone database, con
sisting | |
| * of a collection of individual system time zone definitions, indexed by n
ame. | | * of a collection of individual system time zone definitions, indexed by n
ame. | |
|
| * Each individual time zone is defined in a KSystemTimeZone instance. Addi | | * Each individual time zone is defined in a KSystemTimeZone or KTzfileTime | |
| tional | | Zone | |
| * time zones (of any class derived from KTimeZone) may be added if desired | | * instance. Additional time zones (of any class derived from KTimeZone) ma | |
| . | | y be | |
| | | * added if desired. | |
| * | | * | |
| * At initialisation, KSystemTimeZones on UNIX systems reads the zone.tab f
ile | | * At initialisation, KSystemTimeZones on UNIX systems reads the zone.tab f
ile | |
|
| * to obtain the list of system time zones, and creates a KSystemTimeZone | | * to obtain the list of system time zones, and creates a KTzfileTimeZone | |
| * instance for each one. | | * instance for each one. | |
| * | | * | |
| * @note KSystemTimeZones gets the system's time zone configuration, includ
ing | | * @note KSystemTimeZones gets the system's time zone configuration, includ
ing | |
| * the current local system time zone and the location of zone.tab, from th
e KDE | | * the current local system time zone and the location of zone.tab, from th
e KDE | |
| * time zone daemon, ktimezoned. If ktimezoned cannot be started, KSystemTi
meZones | | * time zone daemon, ktimezoned. If ktimezoned cannot be started, KSystemTi
meZones | |
| * will only know about the UTC time zone. | | * will only know about the UTC time zone. | |
| * | | * | |
| * Note that KSystemTimeZones is not derived from KTimeZones, but instead c
ontains | | * Note that KSystemTimeZones is not derived from KTimeZones, but instead c
ontains | |
| * a KTimeZones instance which holds the system time zone database. Conveni
ence | | * a KTimeZones instance which holds the system time zone database. Conveni
ence | |
| * static methods are defined to access its data, or alternatively you can
access | | * static methods are defined to access its data, or alternatively you can
access | |
| | | | |
| skipping to change at line 74 | | skipping to change at line 75 | |
| * | | * | |
| * As an example, find the local time in Oman corresponding to the local sy
stem | | * As an example, find the local time in Oman corresponding to the local sy
stem | |
| * time of 12:15:00 on 13th November 1999: | | * time of 12:15:00 on 13th November 1999: | |
| * \code | | * \code | |
| * QDateTime sampleTime(QDate(1999,11,13), QTime(12,15,0), Qt::LocalTime); | | * QDateTime sampleTime(QDate(1999,11,13), QTime(12,15,0), Qt::LocalTime); | |
| * KTimeZone local = KSystemTimeZones::local(); | | * KTimeZone local = KSystemTimeZones::local(); | |
| * KTimeZone oman = KSystemTimeZones::zone("Asia/Muscat"); | | * KTimeZone oman = KSystemTimeZones::zone("Asia/Muscat"); | |
| * QDateTime omaniTime = local.convert(oman, sampleTime); | | * QDateTime omaniTime = local.convert(oman, sampleTime); | |
| * \endcode | | * \endcode | |
| * | | * | |
|
| * @warning The time zones in the KSystemTimeZones collection are by defaul | | * @note KTzfileTimeZone is used in preference to KSystemTimeZone on UNIX | |
| t | | * systems since use of the standard system libraries by KSystemTimeZone | |
| * instances of the KSystemTimeZone class, which uses the standard system | | * requires the use of tzset() in several methods. That function reads and | |
| * libraries to access time zone data, and whose functionality is limited t | | * parses the local system time zone definition file every time it is calle | |
| o | | d, | |
| * what these libraries provide. For guaranteed accuracy for past time chan | | * and this has been observed to make applications hang for many seconds wh | |
| ge | | en | |
| * dates and time zone abbreviations, you should use KSystemTimeZones::read | | * a large number of KSystemTimeZone calls are made in succession. | |
| Zone() | | | |
| * or the KTzfileTimeZone class instead, which provide accurate information | | | |
| from | | | |
| * the time zone definition files (but are likely to incur more overhead). | | | |
| * | | * | |
| * @note This class provides a facility to simulate the local system time | | * @note This class provides a facility to simulate the local system time | |
| * zone. This facility is provided for testing purposes only, and is only | | * zone. This facility is provided for testing purposes only, and is only | |
| * available if the library is compiled with debug enabled. In release mode
, | | * available if the library is compiled with debug enabled. In release mode
, | |
| * simulation is inoperative and the real local system time zone is used at
all | | * simulation is inoperative and the real local system time zone is used at
all | |
| * times. | | * times. | |
| * | | * | |
| * @short System time zone access | | * @short System time zone access | |
| * @see KTimeZones, KSystemTimeZone, KSystemTimeZoneSource, KTzfileTimeZone | | * @see KTimeZones, KSystemTimeZone, KSystemTimeZoneSource, KTzfileTimeZone | |
| * @ingroup timezones | | * @ingroup timezones | |
| | | | |
End of changes. 4 change blocks. |
| 18 lines changed or deleted | | 15 lines changed or added | |
|
| ktcpsocket.h | | ktcpsocket.h | |
| | | | |
| skipping to change at line 160 | | skipping to change at line 160 | |
| ListeningState, | | ListeningState, | |
| ClosingState | | ClosingState | |
| //hmmm, do we need an SslNegotiatingState? | | //hmmm, do we need an SslNegotiatingState? | |
| }; | | }; | |
| enum SslVersion { | | enum SslVersion { | |
| UnknownSslVersion = 0x01, | | UnknownSslVersion = 0x01, | |
| SslV2 = 0x02, | | SslV2 = 0x02, | |
| SslV3 = 0x04, | | SslV3 = 0x04, | |
| TlsV1 = 0x08, | | TlsV1 = 0x08, | |
| SslV3_1 = 0x08, | | SslV3_1 = 0x08, | |
|
| | | TlsV1SslV3 = 0x10, | |
| | | SecureProtocols = 0x20, | |
| AnySslVersion = SslV2 | SslV3 | TlsV1 | | AnySslVersion = SslV2 | SslV3 | TlsV1 | |
| }; | | }; | |
| Q_DECLARE_FLAGS(SslVersions, SslVersion) | | Q_DECLARE_FLAGS(SslVersions, SslVersion) | |
| enum Error { | | enum Error { | |
| UnknownError = 0, | | UnknownError = 0, | |
| ConnectionRefusedError, | | ConnectionRefusedError, | |
| RemoteHostClosedError, | | RemoteHostClosedError, | |
| HostNotFoundError, | | HostNotFoundError, | |
| SocketAccessError, | | SocketAccessError, | |
| SocketResourceError, | | SocketResourceError, | |
| | | | |
| skipping to change at line 303 | | skipping to change at line 305 | |
| // bool isEncrypted() const { return encryptionMode() != UnencryptedMod
e } | | // bool isEncrypted() const { return encryptionMode() != UnencryptedMod
e } | |
| QSslCertificate localCertificate() const; | | QSslCertificate localCertificate() const; | |
| QList<QSslCertificate> peerCertificateChain() const; | | QList<QSslCertificate> peerCertificateChain() const; | |
| KSslKey privateKey() const; | | KSslKey privateKey() const; | |
| KSslCipher sessionCipher() const; | | KSslCipher sessionCipher() const; | |
| void setCaCertificates(const QList<QSslCertificate> &certificates); | | void setCaCertificates(const QList<QSslCertificate> &certificates); | |
| void setCiphers(const QList<KSslCipher> &ciphers); | | void setCiphers(const QList<KSslCipher> &ciphers); | |
| //### void setCiphers(const QString &ciphers); //what about i18n? | | //### void setCiphers(const QString &ciphers); //what about i18n? | |
| void setLocalCertificate(const QSslCertificate &certificate); | | void setLocalCertificate(const QSslCertificate &certificate); | |
| void setLocalCertificate(const QString &fileName, QSsl::EncodingFormat
format = QSsl::Pem); | | void setLocalCertificate(const QString &fileName, QSsl::EncodingFormat
format = QSsl::Pem); | |
|
| void setPrivateKey(const KSslKey &key); //implement | | void setPrivateKey(const KSslKey &key); | |
| void setPrivateKey(const QString &fileName, KSslKey::Algorithm algorith
m = KSslKey::Rsa, | | void setPrivateKey(const QString &fileName, KSslKey::Algorithm algorith
m = KSslKey::Rsa, | |
| QSsl::EncodingFormat format = QSsl::Pem, | | QSsl::EncodingFormat format = QSsl::Pem, | |
|
| const QByteArray &passPhrase = QByteArray()); //TODO | | const QByteArray &passPhrase = QByteArray()); | |
| void setAdvertisedSslVersion(SslVersion version); | | void setAdvertisedSslVersion(SslVersion version); | |
| SslVersion advertisedSslVersion() const; //always equal to last setS
slAdvertisedVersion | | SslVersion advertisedSslVersion() const; //always equal to last setS
slAdvertisedVersion | |
| SslVersion negotiatedSslVersion() const; //negotiated version; down
grades are possible. | | SslVersion negotiatedSslVersion() const; //negotiated version; down
grades are possible. | |
| QString negotiatedSslVersionName() const; | | QString negotiatedSslVersionName() const; | |
| bool waitForEncrypted(int msecs = 30000); | | bool waitForEncrypted(int msecs = 30000); | |
| | | | |
| EncryptionMode encryptionMode() const; | | EncryptionMode encryptionMode() const; | |
| | | | |
| /** | | /** | |
| * Returns the state of the socket @p option. | | * Returns the state of the socket @p option. | |
| | | | |
End of changes. 3 change blocks. |
| 2 lines changed or deleted | | 4 lines changed or added | |
|
| ktimezone.h | | ktimezone.h | |
| | | | |
| skipping to change at line 431 | | skipping to change at line 431 | |
| * | | * | |
| * A phase can be daylight savings time or standard time. It holds the | | * A phase can be daylight savings time or standard time. It holds the | |
| * UTC offset and time zone abbreviation (e.g. EST, GMT). | | * UTC offset and time zone abbreviation (e.g. EST, GMT). | |
| * | | * | |
| * @short Time zone phase | | * @short Time zone phase | |
| * @author David Jarvie <djarvie@kde.org>. | | * @author David Jarvie <djarvie@kde.org>. | |
| */ | | */ | |
| class KDECORE_EXPORT Phase | | class KDECORE_EXPORT Phase | |
| { | | { | |
| public: | | public: | |
|
| | | /** | |
| | | * Default constructor. | |
| | | * Creates a standard-time time zone phase with UTC offset 0. | |
| | | */ | |
| Phase(); | | Phase(); | |
| | | | |
| /** | | /** | |
| * Constructor. | | * Constructor. | |
| * | | * | |
| * @param utcOffset number of seconds to add to UTC to get local ti
me in this phase | | * @param utcOffset number of seconds to add to UTC to get local ti
me in this phase | |
| * @param abbreviations time zone abbreviation for this phase. If t
ranslations exist, | | * @param abbreviations time zone abbreviation for this phase. If t
ranslations exist, | |
| * concatenate all abbreviations as null-termi
nated strings. | | * concatenate all abbreviations as null-termi
nated strings. | |
| * @param dst true if daylight savings time, false if standard time | | * @param dst true if daylight savings time, false if standard time | |
| * @param comment optional comment | | * @param comment optional comment | |
| | | | |
| skipping to change at line 1482 | | skipping to change at line 1486 | |
| * @param utc UTC date/time. An error occurs if @p utc.timeSpec() is no
t Qt::UTC. | | * @param utc UTC date/time. An error occurs if @p utc.timeSpec() is no
t Qt::UTC. | |
| * @return leap second adjustment, or invalid if @p utc is earlier than
the | | * @return leap second adjustment, or invalid if @p utc is earlier than
the | |
| * first leap second adjustment or @p utc is a local time | | * first leap second adjustment or @p utc is a local time | |
| */ | | */ | |
| KTimeZone::LeapSeconds leapSecondChange(const QDateTime &utc) const; | | KTimeZone::LeapSeconds leapSecondChange(const QDateTime &utc) const; | |
| | | | |
| protected: | | protected: | |
| /** | | /** | |
| * Initialise the daylight savings time phase list. | | * Initialise the daylight savings time phase list. | |
| * | | * | |
|
| | | * @param phases list of phases | |
| | | * @param previousPhase phase to use before the first daylight savings | |
| | | time | |
| | | * transition | |
| | | * @see phases() | |
| | | * @since 4.8.3 | |
| | | */ | |
| | | void setPhases(const QList<KTimeZone::Phase> &phases, const KTimeZone:: | |
| | | Phase& previousPhase); | |
| | | | |
| | | /** | |
| | | * Initialise the daylight savings time phase list. | |
| | | * This setPhases() variant should be used when the time zone abbreviat | |
| | | ion | |
| | | * used before the start of the first phase is not known. | |
| | | * | |
| * @param phases list of phases | | * @param phases list of phases | |
| * @param previousUtcOffset UTC offset to use before the start of the f
irst | | * @param previousUtcOffset UTC offset to use before the start of the f
irst | |
| * phase | | * phase | |
| * @see phases() | | * @see phases() | |
| */ | | */ | |
| void setPhases(const QList<KTimeZone::Phase> &phases, int previousUtcOf
fset); | | void setPhases(const QList<KTimeZone::Phase> &phases, int previousUtcOf
fset); | |
| | | | |
| /** | | /** | |
| * Initialise the daylight savings time transition list. | | * Initialise the daylight savings time transition list. | |
| * | | * | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 20 lines changed or added | |
|
| kwebpluginfactory.h | | kwebpluginfactory.h | |
| | | | |
| skipping to change at line 30 | | skipping to change at line 30 | |
| * Boston, MA 02110-1301, USA. | | * Boston, MA 02110-1301, USA. | |
| * | | * | |
| */ | | */ | |
| #ifndef KWEBPLUGINFACTORY_H | | #ifndef KWEBPLUGINFACTORY_H | |
| #define KWEBPLUGINFACTORY_H | | #define KWEBPLUGINFACTORY_H | |
| | | | |
| #include <kdewebkit_export.h> | | #include <kdewebkit_export.h> | |
| | | | |
| #include <QtWebKit/QWebPluginFactory> | | #include <QtWebKit/QWebPluginFactory> | |
| | | | |
|
| | | namespace KParts { | |
| | | class ReadOnlyPart; | |
| | | } | |
| | | | |
| /** | | /** | |
| * @short A QWebPluginFactory with integration into the KDE environment. | | * @short A QWebPluginFactory with integration into the KDE environment. | |
| * | | * | |
| * This class will attempt to find a KPart to satisfy a plugin request. | | * This class will attempt to find a KPart to satisfy a plugin request. | |
| * | | * | |
| * @author Michael Howell <mhowell123@gmail.com> | | * @author Michael Howell <mhowell123@gmail.com> | |
| * @author Dawit Alemayehu <adawit@kde.org> | | * @author Dawit Alemayehu <adawit@kde.org> | |
| * | | * | |
| * @see QWebPluginFactory | | * @see QWebPluginFactory | |
| * @since 4.4 | | * @since 4.4 | |
| | | | |
| skipping to change at line 78 | | skipping to change at line 82 | |
| /** | | /** | |
| * @reimp | | * @reimp | |
| * | | * | |
| * Reimplemented for internal reasons, the API is not affected. | | * Reimplemented for internal reasons, the API is not affected. | |
| * | | * | |
| * @see QWebPluginFactory::plugins | | * @see QWebPluginFactory::plugins | |
| * @internal | | * @internal | |
| */ | | */ | |
| virtual QList<Plugin> plugins() const; | | virtual QList<Plugin> plugins() const; | |
| | | | |
|
| | | protected: | |
| | | /** | |
| | | * Sets @p mimeType to the content type guessed from @p url. | |
| | | * | |
| | | * Note that attempting to guess mime-type will not always produce the | |
| | | * correct content-type. This is especially true for the HTTP protocol | |
| | | * since the URL present might be for a cgi script URL instead of a sta | |
| | | tic | |
| | | * URL that directly points to the content. | |
| | | * | |
| | | * If @p mimeType is not NULL, this function will set it to the content | |
| | | * type determined from @p url. | |
| | | * | |
| | | * @since 4.8.3 | |
| | | */ | |
| | | void extractGuessedMimeType(const QUrl& url, QString* mimeType) const; | |
| | | | |
| | | /** | |
| | | * Returns true if the given mime-type is excluded from being used to c | |
| | | reate | |
| | | * a web plugin using KDE's trader. | |
| | | * | |
| | | * Currently this function only returns true for mimetypes 'x-java', | |
| | | * 'x-shockwave-flash', and 'futuresplash' in the 'application' categor | |
| | | y | |
| | | * and everything under the 'inode' category. | |
| | | * | |
| | | * @since 4.8.3 | |
| | | */ | |
| | | bool excludedMimeType(const QString& mimeType) const; | |
| | | | |
| | | /** | |
| | | * Returns an instance of the service associated with @p mimeType. | |
| | | * | |
| | | * This function uses KDE's trader to create an instance of the service | |
| | | * associated with the given parameters. The parameters are the <param> | |
| | | * tags of the HTML object. The name and the value attributes of these | |
| | | * tags are specified by the @p argumentNames and @p argumentValues | |
| | | * respectively. | |
| | | * | |
| | | * The @p parentWidget and @p parent parameters specify the widget to u | |
| | | se | |
| | | * as the parent of the newly created part and the parent for the part | |
| | | * itself respectively. | |
| | | * | |
| | | * The parameters for this function mirror that of @ref QWebPluginFacto | |
| | | ry::create. | |
| | | * | |
| | | * @see QWebPluginFactory::create | |
| | | * @since 4.8.3 | |
| | | */ | |
| | | KParts::ReadOnlyPart* createPartInstanceFrom(const QString& mimeType, | |
| | | const QStringList &argumen | |
| | | tNames, | |
| | | const QStringList &argumen | |
| | | tValues, | |
| | | QWidget* parentWidget = 0, | |
| | | QObject* parent = 0) const | |
| | | ; | |
| private: | | private: | |
| class KWebPluginFactoryPrivate; | | class KWebPluginFactoryPrivate; | |
| KWebPluginFactoryPrivate* const d; | | KWebPluginFactoryPrivate* const d; | |
| }; | | }; | |
| | | | |
| #endif // KWEBPLUGINFACTORY_H | | #endif // KWEBPLUGINFACTORY_H | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 63 lines changed or added | |
|