summaryrefslogtreecommitdiffstats
path: root/konq-plugins/rsync/rsyncplugin.h
diff options
context:
space:
mode:
Diffstat (limited to 'konq-plugins/rsync/rsyncplugin.h')
-rw-r--r--konq-plugins/rsync/rsyncplugin.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h
index 4deb2b3..86aa17f 100644
--- a/konq-plugins/rsync/rsyncplugin.h
+++ b/konq-plugins/rsync/rsyncplugin.h
@@ -65,11 +65,13 @@ protected:
int addLocalFolderByName(QString folderurl, QString remoteurl, QString syncmethod, QString excludelist);
QString findSyncMethodByName(QString folderurl);
/** manages initial communication setup including password queries */
- int establishConnection(char *buffer, KIO::fileoffset_t len);
+ int establishConnectionRsync(char *buffer, KIO::fileoffset_t len);
+ /** manages initial communication setup including password queries */
+ int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, QString localfolder, QString remotepath);
/** creates the unidirectional sync subprocess */
bool syncUnidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath);
/** creates the bidirectional sync subprocess */
- bool syncBidirectional(QString localfolder, QString remotepath);
+ bool syncBidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath);
/** writes one chunk of data to stdin of child process */
void writeChild(const char *buf, KIO::fileoffset_t len);
/** AuthInfo object used for logging in */
@@ -89,6 +91,7 @@ private slots:
void slotSetupOK();
void slotSetupCancelled();
void slotRsyncCancelled();
+ void slotUnisonCancelled();
private:
KURL m_pURL;