← Back to branch summary

~ubuntu-branches/debian/sid/kdesvn/sid

~ubuntu-branches/debian/sid/kdesvn/sid

« back to all changes in this revision

Viewing changes to src/svnfrontend/ccontextlistener.h

Committer: Bazaar Package Importer
Author(s): Michael Biebl
Date: 2006-10-27 12:52:15 UTC
mfrom: (1.2.1 upstream) (5.1.4 edgy)
Revision ID: james.westby@ubuntu.com-20061027125215-aifcjirifidnegx5

Tags: 0.11.0-1

* New upstream release.
* debian/patches/01-kompare_diff.patch
  + Removed. Fixed upstream.
* debian/control
  + Add a "Suggests: kdiff3" to kdesvn. kdiff3 can be used as an external
    merge program.

files added:
CMakeLists.txt

Doxyfile.in

Doxyfile.svnqt.in

INSTALL-cmake

cmakemodules

cmakemodules/FindKdeLibs.cmake

cmakemodules/FindSqlite.cmake

cmakemodules/KDE3Macros.cmake

cmakemodules/MacroEnsureVersion.cmake

cmakemodules/SetupCompiler.cmake

cmakemodules/TestSetenv.cxx

cmakemodules/cmake_uninstall.cmake.in

cmakemodules/generatelibtoolfile.cmake

cmakemodules/kde3uic.cmake

cmakemodules/kdesvnMacros.cmake

cmakemodules/makedist.sh.in

cmakemodules/package_messages.sh.in

debian/cdbs

debian/cdbs/cmake.mk

debian/libsvnqt-dev.install

debian/libsvnqt3.install

doc/CMakeLists.txt

doc/en/hi128-filesys-kdesvnconflicted.png

doc/en/hi128-filesys-kdesvnneedlock.png

doc/makecommon.sh

doc/makelink.cmake

doc/man

doc/man/CMakeLists.txt

doc/man/kdesvn.1

doc/man/kdesvnaskpass.1

kdesvn-config.h.in

kdesvn.spec.in

po/CMakeLists.txt

po/ca.po

po/cs.po

po/es.po

po/fr.po

po/pa.po

po/ru.po

src/CMakeLists.txt

src/askpass

src/askpass/kdesvn-askpass.cpp

src/helpers/CMakeLists.txt

src/helpers/stringhelper.h

src/icons/CMakeLists.txt

src/kdesvnd/CMakeLists.txt

src/kdesvnd/kdesvn_subversion.desktop.in

src/kiosvn/CMakeLists.txt

src/kiosvn/kiobytestream.cpp

src/kiosvn/kiobytestream.h

src/ksvnwidgets

src/ksvnwidgets/CMakeLists.txt

src/ksvnwidgets/authdialogimpl.cpp

src/ksvnwidgets/authdialogimpl.h

src/ksvnwidgets/authdlg.ui

src/ksvnwidgets/logmessage.ui

src/ksvnwidgets/logmsg_impl.cpp

src/ksvnwidgets/logmsg_impl.h

src/ksvnwidgets/ssltrustprompt.ui

src/ksvnwidgets/ssltrustprompt_impl.cpp

src/ksvnwidgets/ssltrustprompt_impl.h

src/pics/CMakeLists.txt

src/pics/hi128-filesys-kdesvnconflicted.png

src/pics/hi128-filesys-kdesvnneedlock.png

src/pics/hi16-filesys-kdesvnconflicted.png

src/pics/hi16-filesys-kdesvnneedlock.png

src/pics/hi22-filesys-kdesvnconflicted.png

src/pics/hi22-filesys-kdesvnneedlock.png

src/pics/hi32-filesys-kdesvnconflicted.png

src/pics/hi32-filesys-kdesvnneedlock.png

src/pics/hi48-filesys-kdesvnconflicted.png

src/pics/hi48-filesys-kdesvnneedlock.png

src/pics/hi64-filesys-kdesvnconflicted.png

src/pics/hi64-filesys-kdesvnneedlock.png

src/pics/hisc-filesys-kdesvnconflicted.svgz

src/pics/hisc-filesys-kdesvnneedlock.svgz

src/pics/to_png.py

src/settings

src/settings/CMakeLists.txt

src/settings/cmdexecsettings.ui

src/settings/cmdexecsettings_impl.cpp

src/settings/cmdexecsettings_impl.h

src/settings/diffmergesettings.ui

src/settings/diffmergesettings_impl.cpp

src/settings/diffmergesettings_impl.h

src/settings/dispcolor_settings.ui

src/settings/dispcolorsettings_impl.cpp

src/settings/dispcolorsettings_impl.h

src/settings/display_settings.ui

src/settings/displaysettings_impl.cpp

src/settings/displaysettings_impl.h

src/settings/kdesvn_part.kcfg

src/settings/kdesvnsettings.kcfgc

src/settings/revisiontree_settings.ui

src/settings/revisiontreesettingsdlg_impl.cpp

src/settings/revisiontreesettingsdlg_impl.h

src/settings/subversion_settings.ui

src/settings/subversionsettings_impl.cpp

src/settings/subversionsettings_impl.h

src/svnfrontend/CMakeLists.txt

src/svnfrontend/blamedisplay.ui

src/svnfrontend/blamedisplay_impl.cpp

src/svnfrontend/blamedisplay_impl.h

src/svnfrontend/cacheentry.cpp

src/svnfrontend/cacheentry.h

src/svnfrontend/createrepo_dlg.ui

src/svnfrontend/createrepo_impl.cpp

src/svnfrontend/createrepo_impl.h

src/svnfrontend/dumprepo_dlg.ui

src/svnfrontend/dumprepo_impl.cpp

src/svnfrontend/dumprepo_impl.h

src/svnfrontend/graphtree

src/svnfrontend/graphtree/drawparams.cpp

src/svnfrontend/graphtree/drawparams.h

src/svnfrontend/graphtree/elogentry.cpp

src/svnfrontend/graphtree/elogentry.h

src/svnfrontend/graphtree/graphtree_defines.h

src/svnfrontend/graphtree/graphtreelabel.cpp

src/svnfrontend/graphtree/graphtreelabel.h

src/svnfrontend/graphtree/pannerview.cpp

src/svnfrontend/graphtree/pannerview.h

src/svnfrontend/graphtree/revgraphview.cpp

src/svnfrontend/graphtree/revgraphview.h

src/svnfrontend/graphtree/revisiontree.cpp

src/svnfrontend/graphtree/revisiontree.h

src/svnfrontend/graphtree/revtreewidget.cpp

src/svnfrontend/graphtree/revtreewidget.h

src/svnfrontend/hotcopydlg.ui

src/svnfrontend/hotcopydlg_impl.cpp

src/svnfrontend/hotcopydlg_impl.h

src/svnfrontend/loaddmpdlg.ui

src/svnfrontend/loaddmpdlg_impl.cpp

src/svnfrontend/loaddmpdlg_impl.h

src/svnfrontend/opencontextmenu.cpp

src/svnfrontend/opencontextmenu.h

src/svnfrontend/simple_logcb.h

src/svnqt

src/svnqt/CMakeLists.txt

src/svnqt/annotate_line.hpp

src/svnqt/apr.cpp

src/svnqt/apr.hpp

src/svnqt/buildqt4

src/svnqt/buildqt4/CMakeLists.txt

src/svnqt/check.hpp

src/svnqt/client.cpp

src/svnqt/client.hpp

src/svnqt/client_annotate.cpp

src/svnqt/client_cat.cpp

src/svnqt/client_diff.cpp

src/svnqt/client_impl.cpp

src/svnqt/client_impl.hpp

src/svnqt/client_lock.cpp

src/svnqt/client_ls.cpp

src/svnqt/client_modify.cpp

src/svnqt/client_property.cpp

src/svnqt/client_status.cpp

src/svnqt/cmakemodules

src/svnqt/cmakemodules/FindSubversion.cmake

src/svnqt/commititem.cpp

src/svnqt/commititem.hpp

src/svnqt/context.cpp

src/svnqt/context.hpp

src/svnqt/context_listener.hpp

src/svnqt/contextdata.cpp

src/svnqt/contextdata.hpp

src/svnqt/datetime.cpp

src/svnqt/datetime.hpp

src/svnqt/dirent.cpp

src/svnqt/dirent.hpp

src/svnqt/entry.cpp

src/svnqt/entry.hpp

src/svnqt/exception.cpp

src/svnqt/exception.hpp

src/svnqt/info_entry.cpp

src/svnqt/info_entry.hpp

src/svnqt/lock_entry.cpp

src/svnqt/lock_entry.hpp

src/svnqt/log_entry.cpp

src/svnqt/log_entry.hpp

src/svnqt/path.cpp

src/svnqt/path.hpp

src/svnqt/pool.cpp

src/svnqt/pool.hpp

src/svnqt/repository.cpp

src/svnqt/repository.hpp

src/svnqt/repositorydata.cpp

src/svnqt/repositorydata.hpp

src/svnqt/repositorylistener.cpp

src/svnqt/repositorylistener.hpp

src/svnqt/revision.cpp

src/svnqt/revision.hpp

src/svnqt/shared_pointer.hpp

src/svnqt/smart_pointer.hpp

src/svnqt/status.cpp

src/svnqt/status.hpp

src/svnqt/svnfilestream.cpp

src/svnqt/svnfilestream.hpp

src/svnqt/svnqt_defines.hpp.in

src/svnqt/svnstream.cpp

src/svnqt/svnstream.hpp

src/svnqt/targets.cpp

src/svnqt/targets.hpp

src/svnqt/testmain.cpp

src/svnqt/url.cpp

src/svnqt/url.hpp

src/svnqt/version_check.cpp

src/svnqt/version_check.hpp

src/svnqt/wc.cpp

src/svnqt/wc.hpp

templates

templates/cpp

templates/h

files removed:
Doxyfile

INSTALL

Makefile.am

Makefile.cvs

Makefile.in

acinclude.m4

aclocal.m4

admin

admin/ChangeLog

admin/Doxyfile.am

admin/Doxyfile.global

admin/Makefile.common

admin/acinclude.m4.in

admin/am_edit

admin/bcheck.pl

admin/compile

admin/conf.change.pl

admin/config.guess

admin/config.pl

admin/config.sub

admin/configure.in.bot.end

admin/configure.in.min

admin/cvs-clean.pl

admin/cvs.sh

admin/debianrules

admin/depcomp

admin/detect-autoconf.sh

admin/install-sh

admin/libtool.m4.in

admin/ltmain.sh

admin/missing

admin/mkinstalldirs

admin/nmcheck

admin/ylwrap

config.h.in

configure

configure.files

configure.in

configure.in.in

debian/patches

debian/patches/makefile_am.diff

debian/patches/settings_icons.diff

debian/patches/store_passwords_config.diff

doc/Makefile.am

doc/Makefile.in

doc/en/Makefile.am

doc/en/Makefile.in

kdesvn.kdevelop

po/Makefile.am

po/Makefile.in

po/de.gmo

po/it.gmo

po/nl.gmo

po/sv.gmo

src/Makefile.am

src/Makefile.in

src/helpers/Makefile.am

src/helpers/Makefile.in

src/helpers/smart_pointer.h

src/icons/Makefile.am

src/icons/Makefile.in

src/kdesvn-askpass.cpp

src/kdesvnd/Makefile.am

src/kdesvnd/Makefile.in

src/kdesvnd/kdesvn_subversion.desktop.template

src/kdesvnd/kdesvn_subversion_toplevel.desktop.template

src/kdesvnd/kdesvnd_dcop_skel.cpp

src/kdesvnd/test.kde.sh

src/kiosvn/Makefile.am

src/kiosvn/Makefile.in

src/pics/Makefile.am

src/pics/Makefile.in

src/svncpp

src/svncpp/Makefile.am

src/svncpp/Makefile.in

src/svncpp/annotate_line.hpp

src/svncpp/apr.cpp

src/svncpp/apr.hpp

src/svncpp/check.hpp

src/svncpp/client.cpp

src/svncpp/client.hpp

src/svncpp/client_annotate.cpp

src/svncpp/client_cat.cpp

src/svncpp/client_diff.cpp

src/svncpp/client_lock.cpp

src/svncpp/client_ls.cpp

src/svncpp/client_modify.cpp

src/svncpp/client_property.cpp

src/svncpp/client_status.cpp

src/svncpp/context.cpp

src/svncpp/context.hpp

src/svncpp/context_listener.hpp

src/svncpp/datetime.cpp

src/svncpp/datetime.hpp

src/svncpp/dirent.cpp

src/svncpp/dirent.hpp

src/svncpp/entry.cpp

src/svncpp/entry.hpp

src/svncpp/exception.cpp

src/svncpp/exception.hpp

src/svncpp/info_entry.cpp

src/svncpp/info_entry.hpp

src/svncpp/lock_entry.cpp

src/svncpp/lock_entry.hpp

src/svncpp/log_entry.cpp

src/svncpp/log_entry.hpp

src/svncpp/path.cpp

src/svncpp/path.hpp

src/svncpp/pool.cpp

src/svncpp/pool.hpp

src/svncpp/property.cpp

src/svncpp/property.hpp

src/svncpp/revision.cpp

src/svncpp/revision.hpp

src/svncpp/status.cpp

src/svncpp/status.hpp

src/svncpp/svncpp_defines.hpp

src/svncpp/targets.cpp

src/svncpp/targets.hpp

src/svncpp/url.cpp

src/svncpp/url.hpp

src/svncpp/version_check.cpp

src/svncpp/version_check.hpp

src/svncpp/wc.cpp

src/svncpp/wc.hpp

src/svnfrontend/Makefile.am

src/svnfrontend/Makefile.in

src/svnfrontend/copymoveview.cpp

src/svnfrontend/dispcolor_settings.cpp

src/svnfrontend/dispcolor_settings.ui

src/svnfrontend/dispcolorsettings_impl.cpp

src/svnfrontend/dispcolorsettings_impl.h

src/svnfrontend/display_settings.cpp

src/svnfrontend/display_settings.ui

src/svnfrontend/displaysettings_impl.cpp

src/svnfrontend/displaysettings_impl.h

src/svnfrontend/editpropsdlg.cpp

src/svnfrontend/fronthelpers/Makefile.am

src/svnfrontend/fronthelpers/Makefile.in

src/svnfrontend/fronthelpers/authdialogimpl.cpp

src/svnfrontend/fronthelpers/authdialogimpl.h

src/svnfrontend/fronthelpers/authdlg.cpp

src/svnfrontend/fronthelpers/authdlg.ui

src/svnfrontend/fronthelpers/checkoutinfo.cpp

src/svnfrontend/fronthelpers/kdesvn_part.kcfg

src/svnfrontend/fronthelpers/logmessage.cpp

src/svnfrontend/fronthelpers/logmessage.ui

src/svnfrontend/fronthelpers/logmsg_impl.cpp

src/svnfrontend/fronthelpers/logmsg_impl.h

src/svnfrontend/fronthelpers/oimagescrollview.cpp

src/svnfrontend/fronthelpers/oimagescrollview.h

src/svnfrontend/fronthelpers/oimagezoomer.cpp

src/svnfrontend/fronthelpers/oimagezoomer.h

src/svnfrontend/fronthelpers/rangeinput.cpp

src/svnfrontend/fronthelpers/settings.cpp

src/svnfrontend/fronthelpers/settings.kcfgc

src/svnfrontend/fronthelpers/ssltrustprompt.cpp

src/svnfrontend/fronthelpers/ssltrustprompt.ui

src/svnfrontend/fronthelpers/ssltrustprompt_impl.cpp

src/svnfrontend/fronthelpers/ssltrustprompt_impl.h

src/svnfrontend/merge_dlg.cpp

src/svnfrontend/subversion_settings.cpp

src/svnfrontend/subversion_settings.ui

src/svnfrontend/subversionsettings_impl.cpp

src/svnfrontend/subversionsettings_impl.h

src/svnfrontend/svnlogdlg.cpp

subdirs

files modified:
AUTHORS

ChangeLog

TODO

debian/changelog

debian/compat

debian/control

debian/copyright

debian/kdesvn.install

debian/rules

debian/watch

doc/en/hi128-filesys-kdesvnadded.png

doc/en/hi128-filesys-kdesvndeleted.png

doc/en/hi128-filesys-kdesvnlocked.png

doc/en/hi128-filesys-kdesvnmodified.png

doc/en/hi128-filesys-kdesvnupdates.png

doc/en/index.docbook

kdesvn.spec

po/de.po

po/it.po

po/kdesvn.pot

po/nl.po

po/sv.po

src/helpers/ktranslateurl.cpp

src/helpers/ktranslateurl.h

src/helpers/sshagent.cpp

src/helpers/sshagent.h

src/helpers/sub2qt.cpp

src/helpers/sub2qt.h

src/kdesvn.cpp

src/kdesvn.desktop

src/kdesvn.h

src/kdesvn_part.cpp

src/kdesvn_part.h

src/kdesvn_part.rc

src/kdesvnd/kdesvnd_dcop.cpp

src/kdesvnd/kdesvnd_dcop.h

src/kdesvnui.rc

src/kdesvnview.cpp

src/kdesvnview.h

src/kiosvn/kiolistener.cpp

src/kiosvn/kiolistener.h

src/kiosvn/kiosvn.cpp

src/kiosvn/kiosvn.h

src/main.cpp

src/svnfrontend/ccontextlistener.cpp

src/svnfrontend/ccontextlistener.h

src/svnfrontend/commandexec.cpp

src/svnfrontend/commandexec.h

src/svnfrontend/copymoveview_impl.cpp

src/svnfrontend/editproperty_impl.cpp

src/svnfrontend/editpropsdlg.ui

src/svnfrontend/filelistviewitem.cpp

src/svnfrontend/filelistviewitem.h

src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp

src/svnfrontend/fronthelpers/checkoutinfo_impl.h

src/svnfrontend/fronthelpers/rangeinput_impl.cpp

src/svnfrontend/fronthelpers/rangeinput_impl.h

src/svnfrontend/importdir_logmsg.h

src/svnfrontend/kdesvnfilelist.cpp

src/svnfrontend/kdesvnfilelist.h

src/svnfrontend/merge_dlg.ui

src/svnfrontend/mergedlg_impl.cpp

src/svnfrontend/mergedlg_impl.h

src/svnfrontend/modifiedthread.cpp

src/svnfrontend/modifiedthread.h

src/svnfrontend/propertiesdlg.cpp

src/svnfrontend/propertiesdlg.h

src/svnfrontend/stopdlg.cpp

src/svnfrontend/stopdlg.h

src/svnfrontend/svnactions.cpp

src/svnfrontend/svnactions.h

src/svnfrontend/svnfiletip.cpp

src/svnfrontend/svnitem.cpp

src/svnfrontend/svnitem.h

src/svnfrontend/svnlogdlg.ui

src/svnfrontend/svnlogdlgimp.cpp

src/svnfrontend/svnlogdlgimp.h

src/svnfrontend/tcontextlistener.cpp

src/svnfrontend/tcontextlistener.h

src/svnfrontend/threadcontextlistenerdata.h

src/urldlg.cpp

Show diffs side-by-side

added added

removed removed

src/svnfrontend/ccontextlistener.h

20

20

#ifndef CCONTEXTLISTENER_H

21

21

#define CCONTEXTLISTENER_H

22

22

23

#include "svncpp/context_listener.hpp"

24

#include "helpers/smart_pointer.h"

23

#include "src/svnqt/context_listener.hpp"

24

#include "src/svnqt/smart_pointer.hpp"

25

25

26

26

#include <qobject.h>

27

27

#include <qstring.h>

31

31

/**

32

32

@author Rajko Albrecht

33

33

*/

34

class CContextListener : public QObject, public svn::ContextListener,public ref_count

34

class CContextListener : public QObject, public svn::ContextListener,public svn::ref_count

35

35

{

36

36

Q_OBJECT

37

37

public:

58

58

/*!

59

59

* Get logmessage for checkin and so on...

60

60

*/

61

virtual bool contextGetLogMessage (QString & msg);

61

virtual bool contextGetLogMessage (QString & msg,const svn::CommitItemList&);

62

62

virtual SslServerTrustAnswer contextSslServerTrustPrompt (const SslServerTrustData & data,

63

63

apr_uint32_t & acceptedFailures);

64

64

virtual bool contextSslClientCertPrompt (QString & certFile);

65

65

virtual bool contextSslClientCertPwPrompt (QString & password,

66

66

const QString & realm, bool & maySave);

67

virtual QString translate(const QString&what);

68

67

69

static QString NotifyAction(svn_wc_notify_action_t action);

68

70

static QString NotifyState(svn_wc_notify_state_t);

69

71

70

void setCanceled(bool how);

71

72

72

static QStringList failure2Strings(apr_uint32_t acceptedFailures);

73

virtual void contextProgress(long long int current, long long int max);

74

75

public slots:

76

virtual void setCanceled(bool);

73

77

74

78

signals:

75

79

void sendNotify(const QString&);

76

80

void tickProgress();

77

81

void waitShow(bool);

82

void netProgress(long long int, long long int);

78

83

79

84

protected:

80

85

static const int smax_actionstring;

Older »