copyjob.h   copyjob.h 
skipping to change at line 262 skipping to change at line 262
protected Q_SLOTS: protected Q_SLOTS:
virtual void slotResult( KJob *job ); virtual void slotResult( KJob *job );
protected: protected:
CopyJob(CopyJobPrivate &dd); CopyJob(CopyJobPrivate &dd);
void emitResult(); void emitResult();
private: private:
Q_PRIVATE_SLOT(d_func(), void slotStart()) Q_PRIVATE_SLOT(d_func(), void slotStart())
Q_PRIVATE_SLOT(d_func(), void slotEntries( KIO::Job*, const KIO::UD SEntryList& list )) Q_PRIVATE_SLOT(d_func(), void slotEntries( KIO::Job*, const KIO::UD SEntryList& list ))
Q_PRIVATE_SLOT(d_func(), void slotSubError( KIO::ListJob*, KIO::List Job* )) Q_PRIVATE_SLOT(d_func(), void slotSubError(KIO::ListJob*, KIO::List Job*))
Q_PRIVATE_SLOT(d_func(), void slotProcessedSize( KJob*, qulonglong data_size )) Q_PRIVATE_SLOT(d_func(), void slotProcessedSize( KJob*, qulonglong data_size ))
Q_PRIVATE_SLOT(d_func(), void slotTotalSize( KJob*, qulonglong size )) Q_PRIVATE_SLOT(d_func(), void slotTotalSize( KJob*, qulonglong size ))
Q_PRIVATE_SLOT(d_func(), void slotReport()) Q_PRIVATE_SLOT(d_func(), void slotReport())
Q_PRIVATE_SLOT(d_func(), void sourceStated(const KIO::UDSEntry& ent ry, const KUrl& sourceUrl))
Q_DECLARE_PRIVATE(CopyJob) Q_DECLARE_PRIVATE(CopyJob)
}; };
/** /**
* Copy a file or directory @p src into the destination @p dest, * Copy a file or directory @p src into the destination @p dest,
* which can be a file (including the final filename) or a directory * which can be a file (including the final filename) or a directory
* (into which @p src will be copied). * (into which @p src will be copied).
* *
* This emulates the cp command completely. * This emulates the cp command completely.
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 kdeversion.h   kdeversion.h 
skipping to change at line 47 skipping to change at line 47
* This macro contains the KDE version in string form. As it is a macro, * This macro contains the KDE version in string form. As it is a macro,
* it contains the version at compile time. See versionString() if you need * it contains the version at compile time. See versionString() if you need
* the KDE version used at runtime. * the KDE version used at runtime.
* *
* @note The version string might contain a section in parentheses, * @note The version string might contain a section in parentheses,
* especially for development versions of KDE. * especially for development versions of KDE.
* If you use that macro directly for a file format (e.g. OASIS Open Docume nt) * If you use that macro directly for a file format (e.g. OASIS Open Docume nt)
* or for a protocol (e.g. http) be careful that it is appropriate. * or for a protocol (e.g. http) be careful that it is appropriate.
* (Fictional) example: "4.0.90 (>=20070101)" * (Fictional) example: "4.0.90 (>=20070101)"
*/ */
#define KDE_VERSION_STRING "4.10.3" #define KDE_VERSION_STRING "4.10.4"
/** /**
* @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 3 #define KDE_VERSION_RELEASE 4
/** /**
* @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


 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

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