[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/smb4k/core
From:       Alexander Reinholdt <alexander.reinholdt () kdemail ! net>
Date:       2011-02-12 14:03:20
Message-ID: 20110212140320.2D7AAAC8BE () svn ! kde ! org
[Download RAW message or body]

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 <smb4kworkgroup.h>
 #include <smb4khost.h>
 #include <smb4kprintinfo.h>
-#include <smb4ksynchronizationinfo.h>
 
 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( "<p>Synchronizing <b>%1</b> with <b>%2</b> \
failed:</p><p><tt>%3</tt></p>", info->destinationPath(), info->sourcePath(), err_msg \
); +    text = i18n( "<p>Synchronizing <b>%1</b> with <b>%2</b> \
failed:</p><p><tt>%3</tt></p>", dest.path(), src.path(), err_msg );  }
   else
   {
-    text = i18n( "<p>Synchronizing <b>%1</b> with <b>%2</b> failed.</p>", \
info->destinationPath(), info->sourcePath() ); +    text = i18n( "<p>Synchronizing \
<b>%1</b> with <b>%2</b> failed.</p>", 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<Smb4KHost *>( 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 <QDir>
 #include <QProcess>
 
+// KDE includes
+#include <kurl.h>
+
 // application specific includes
 #include <smb4kshare.h>
 
@@ -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


[prev in list] [next in list] [prev in thread] [next in thread]