SVN commit 1220012 by areinholdt: - Modified synchronizationFailed() function. - Updated copyright statement. M +4 -5 smb4knotification.cpp M +11 -5 smb4knotification.h --- trunk/playground/network/smb4k/core/smb4knotification.cpp #1220011:1220012 @@ -2,7 +2,7 @@ smb4knotification - This class provides notifications for Smb4K. ------------------- begin : Son Jun 27 2010 - copyright : (C) 2010 by Alexander Reinholdt + copyright : (C) 2010-2011 by Alexander Reinholdt email : alexander.reinholdt@kdemail.org ***************************************************************************/ @@ -44,7 +44,6 @@ #include #include #include -#include using namespace KAuth; @@ -410,17 +409,17 @@ } -void Smb4KNotification::synchronizationFailed( Smb4KSynchronizationInfo *info, const QString &err_msg ) +void Smb4KNotification::synchronizationFailed( const KUrl &src, const KUrl &dest, const QString &err_msg ) { QString text; if ( !err_msg.isEmpty() ) { - text = i18n( "

Synchronizing %1 with %2 failed:

%3

", info->destinationPath(), info->sourcePath(), err_msg ); + text = i18n( "

Synchronizing %1 with %2 failed:

%3

", dest.path(), src.path(), err_msg ); } else { - text = i18n( "

Synchronizing %1 with %2 failed.

", info->destinationPath(), info->sourcePath() ); + text = i18n( "

Synchronizing %1 with %2 failed.

", dest.path(), src.path() ); } KNotification *notification = KNotification::event( "synchronizationFailed", --- trunk/playground/network/smb4k/core/smb4knotification.h #1220011:1220012 @@ -1,8 +1,8 @@ /*************************************************************************** - smb4knotification - This class provides notifications for Smb4K.static_cast( m_item ) + smb4knotification - This class provides notifications for Smb4K. ------------------- begin : Son Jun 27 2010 - copyright : (C) 2010 by Alexander Reinholdt + copyright : (C) 2010-2011 by Alexander Reinholdt email : alexander.reinholdt@kdemail.org ***************************************************************************/ @@ -36,6 +36,9 @@ #include #include +// KDE includes +#include + // application specific includes #include @@ -44,7 +47,6 @@ class Smb4KWorkgroup; class Smb4KHost; class Smb4KPrintInfo; -class Smb4KSynchronizationInfo; /** * This class provides notifications used thoughout Smb4K. @@ -223,11 +225,15 @@ /** * This error message is shown if the synchronization failed. * - * @param info The synchronization info object + * @param src The source URL * + * @param dest The destination URL + * * @param err_msg The error message */ - void synchronizationFailed( Smb4KSynchronizationInfo *info, const QString &err_msg ); + void synchronizationFailed( const KUrl &src, + const KUrl &dest, + const QString &err_msg ); /** * This error message is shown if the searching of the network