document.h   document.h 
skipping to change at line 775 skipping to change at line 775
*/ */
void setSuppressOpeningErrorDialogs(bool suppress); void setSuppressOpeningErrorDialogs(bool suppress);
bool suppressOpeningErrorDialogs() const; bool suppressOpeningErrorDialogs() const;
/** /**
* True, eg if the file for opening could not be read * True, eg if the file for opening could not be read
* This doesn't have to handle the KPart job cancled cases * This doesn't have to handle the KPart job cancled cases
*/ */
bool openingError() const; bool openingError() const;
QString openingErrorMessage() const; QString openingErrorMessage() const;
/**
* since in kate part opening an non existend local file, doesn't cause
an error anymore, a new
* field for storing if the local document is an orphan is needed. In t
he remote case the opening error is still used
*/
bool isOrphaned() const;
void setOrphaned(bool value);
protected: protected:
void setOpeningError(bool errors); void setOpeningError(bool errors);
void setOpeningErrorMessage(const QString& message); void setOpeningErrorMessage(const QString& message);
}; };
} }
Q_DECLARE_METATYPE(KTextEditor::Document*) Q_DECLARE_METATYPE(KTextEditor::Document*)
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 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.10.2" #define KDE_VERSION_STRING "4.10.3"
/** /**
* @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 10 #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 2 #define KDE_VERSION_RELEASE 3
/** /**
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Make a number from the major, minor and release number of a KDE v ersion * @brief Make a number from the major, minor and release number of a KDE v ersion
* *
* This function can be used for preprocessing when KDE_IS_VERSION is not * This function can be used for preprocessing when KDE_IS_VERSION is not
* appropriate. * appropriate.
*/ */
#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ksavefile.h   ksavefile.h 
skipping to change at line 179 skipping to change at line 179
void abort(); void abort();
/** /**
* @brief Finalize changes to the file. * @brief Finalize changes to the file.
* This will commit all the changes that have been made to the file. * This will commit all the changes that have been made to the file.
* @return true if successful, or false if an error has occurred. * @return true if successful, or false if an error has occurred.
**/ **/
bool finalize(); bool finalize();
/** /**
* Allows writing over the existing file if necessary.
*
* QSaveFile creates a temporary file in the same directory as the fina
l
* file and atomically renames it. However this is not possible if the
* directory permissions do not allow creating new files.
* In order to preserve atomicity guarantees, open() fails when it
* cannot create the temporary file.
*
* In order to allow users to edit files with write permissions in a
* directory with restricted permissions, call setDirectWriteFallback()
with
* \a enabled set to true, and the following calls to open() will fallb
ack to
* opening the existing file directly and writing into it, without the
use of
* a temporary file.
* This does not have atomicity guarantees, i.e. an application crash o
r
* for instance a power failure could lead to a partially-written file
on disk.
* It also means cancelWriting() has no effect, in such a case.
*
* Typically, to save documents edited by the user, call setDirectWrite
Fallback(true),
* and to save application internal files (configuration files, data fi
les, ...), keep
* the default setting which ensures atomicity.
*
* @since 4.10.3
*/
void setDirectWriteFallback(bool enabled);
/**
* Returns true if the fallback solution for saving files in read-only
* directories is enabled.
*
* @since 4.10.3
*/
bool directWriteFallback() const;
/**
* @brief Static method to create a backup file before saving. * @brief Static method to create a backup file before saving.
* *
* If empty (the default), the backup will be in the same directory as @p filename. * If empty (the default), the backup will be in the same directory as @p filename.
* The backup type (simple, rcs, or numbered), extension string, and ma ximum * The backup type (simple, rcs, or numbered), extension string, and ma ximum
* number of backup files are read from the user's global configuration . * number of backup files are read from the user's global configuration .
* Use simpleBackupFile() or numberedBackupFile() to force one of these * Use simpleBackupFile() or numberedBackupFile() to force one of these
* specific backup styles. * specific backup styles.
* You can use this method even if you don't use KSaveFile. * You can use this method even if you don't use KSaveFile.
* @param filename the file to backup * @param filename the file to backup
* @param backupDir optional directory where to save the backup file in . * @param backupDir optional directory where to save the backup file in .
 End of changes. 1 change blocks. 
0 lines changed or deleted 42 lines changed or added

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