TDE
/
tdevelop
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename kioslaves

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 7bb265743a
commit 595a6e60c6
52 changed files with 233 additions and 233 deletions
Show Stats Download Patch File Download Diff File

2
buildtools/lib/base/Makefile.am
Unescape View File

@ -9,7 +9,7 @@ libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp
tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base
tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library
DOXYGEN_DOCDIRPREFIX = kdevbt
include ../../../Doxyfile.am

2
buildtools/lib/parsers/autotools/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ parser:
EXTRA_DIST = autotools.yy autotools.ll
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser
DOXYGEN_DOCDIRPREFIX = kdevparser
include ../../../../Doxyfile.am

2
buildtools/lib/parsers/qmake/Makefile.am
Unescape View File

@ -23,7 +23,7 @@ parser:
EXTRA_DIST = qmake.yy qmake.ll
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = KDevelop QMake parser
DOXYGEN_DOCDIRPREFIX = kdevparser
include ../../../../Doxyfile.am

2
buildtools/lib/widgets/Makefile.am
Unescape View File

@ -23,7 +23,7 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \
makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \
runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil
DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library
DOXYGEN_DOCDIRPREFIX = kdevbt
include ../../../Doxyfile.am

6
kdevprj2tdevelop
Unescape View File

@ -100,7 +100,7 @@ if ($project_type eq "normal_c"
# Choose project management
$projectmanagement = "KDevCustomProject";
if ($project_type =~ /normal_kde|mini_kde|normalogl_kde|normal_kde2|mini_kde2|mdi_kde2/
|| $project_type =~ /kde2_normal|kicker_app|kio_slave|kc_module|kpart_plugin|ktheme/) {
|| $project_type =~ /kde2_normal|kicker_app|tdeio_slave|kc_module|kpart_plugin|ktheme/) {
$projectmanagement = "KDevTDEAutoProject";
}
if ($project_type =~ /normal_cpp/) {
@ -109,11 +109,11 @@ if ($project_type =~ /normal_cpp/) {
# Keywords
if ($project_type =~ /normal_kde|mini_kde|normalogl_kde|normal_kde2|mini_kde2|mdi_kde2/
|| $project_type =~ /kde2_normal|kicker_app|kio_slave|kc_module|kpart_plugin|ktheme/) {
|| $project_type =~ /kde2_normal|kicker_app|tdeio_slave|kc_module|kpart_plugin|ktheme/) {
$keywords = $keywords . ",KDE";
}
if ($project_type =~ /normal_kde|mini_kde|normalogl_kde|normal_kde2|mini_kde2|mdi_kde2/
|| $project_type =~ /kde2_normal|kicker_app|kio_slave|kc_module|kpart_plugin|ktheme/
|| $project_type =~ /kde2_normal|kicker_app|tdeio_slave|kc_module|kpart_plugin|ktheme/
|| $project_type =~ /normal_qt|normal_qt2|mdi_qt2|mdi_qextmdi/) {
$keywords = $keywords . ",Qt";
}

2
languages/cpp/app_templates/kscons_kxt/SConscript-src
Unescape View File

@ -37,7 +37,7 @@ myenv.TDEprogram( "%{APPNAMELC}", %{APPNAMELC}_sources )
myenv.TDEaddpaths_includes( "./ ../" )
## Necessary libraries to link against
myenv.TDEaddlibs( "qt-mt kio tdecore tdeprint" )
myenv.TDEaddlibs( "tqt-mt tqtinterface tdeio tdecore tdeprint" )
## This shows how to add other link flags to the program
# myenv.TDEaddflags_link('-export-dynamic')

4
languages/cpp/app_templates/kscons_tdemdi/SConscript-src
Unescape View File

@ -22,7 +22,7 @@ prefs.ui
# Now that we have our list of sources we can build the program
myenv.TDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program
myenv.TDEaddpaths_includes( './ ../' ) # additional paths
myenv.TDEaddlibs( 'qt-mt tdecore kio tdeparts tdemdi' ) # additional libraries
myenv.TDEaddlibs( 'tqt-mt tqtinterface tdecore tdeio tdeparts tdemdi' ) # additional libraries
## Next, the kpart library
## using TDEshlib, the .so and .la are installed automatically when needed
@ -31,7 +31,7 @@ myenv2=env.Copy()
%{APPNAMELC}part_sources = '%{APPNAMELC}_part.cpp'
myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources)
myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory
myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint tdeparts' )
myenv2.TDEaddlibs( 'tqt-mt tqtinterface tdeio tdecore tdeprint tdeparts' )
# myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' )
#############################

28
languages/cpp/app_templates/tdeioslave/slave.cpp
Unescape View File

@ -26,22 +26,22 @@
using namespace TDEIO;
kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("kio_%{APPNAMELC}", pool_socket, app_socket)
tdeio_%{APPNAMELC}Protocol::tdeio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("tdeio_%{APPNAMELC}", pool_socket, app_socket)
{
kdDebug() << "kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol()" << endl;
kdDebug() << "tdeio_%{APPNAMELC}Protocol::tdeio_%{APPNAMELC}Protocol()" << endl;
}
kio_%{APPNAMELC}Protocol::~kio_%{APPNAMELC}Protocol()
tdeio_%{APPNAMELC}Protocol::~tdeio_%{APPNAMELC}Protocol()
{
kdDebug() << "kio_%{APPNAMELC}Protocol::~kio_%{APPNAMELC}Protocol()" << endl;
kdDebug() << "tdeio_%{APPNAMELC}Protocol::~tdeio_%{APPNAMELC}Protocol()" << endl;
}
void kio_%{APPNAMELC}Protocol::get(const KURL& url )
void tdeio_%{APPNAMELC}Protocol::get(const KURL& url )
{
kdDebug() << "kio_%{APPNAMELC}::get(const KURL& url)" << endl ;
kdDebug() << "tdeio_%{APPNAMELC}::get(const KURL& url)" << endl ;
kdDebug() << "Seconds: " << url.query() << endl;
TQString remoteServer = url.host();
@ -52,14 +52,14 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url )
// Send the mimeType as soon as it is known
mimeType("text/plain");
// Send the data
TQString theData = "This is a test of kio_%{APPNAMELC}";
TQString theData = "This is a test of tdeio_%{APPNAMELC}";
data(TQCString(theData.local8Bit()));
data(TQByteArray()); // empty array means we're done sending the data
finished();
}
void kio_%{APPNAMELC}Protocol::mimetype(const KURL & /*url*/)
void tdeio_%{APPNAMELC}Protocol::mimetype(const KURL & /*url*/)
{
mimeType("text/plain");
finished();
@ -70,19 +70,19 @@ extern "C"
{
int kdemain(int argc, char **argv)
{
TDEInstance instance( "kio_%{APPNAMELC}" );
TDEInstance instance( "tdeio_%{APPNAMELC}" );
kdDebug(7101) << "*** Starting kio_%{APPNAMELC} " << endl;
kdDebug(7101) << "*** Starting tdeio_%{APPNAMELC} " << endl;
if (argc != 4) {
kdDebug(7101) << "Usage: kio_%{APPNAMELC} protocol domain-socket1 domain-socket2" << endl;
kdDebug(7101) << "Usage: tdeio_%{APPNAMELC} protocol domain-socket1 domain-socket2" << endl;
exit(-1);
}
kio_%{APPNAMELC}Protocol slave(argv[2], argv[3]);
tdeio_%{APPNAMELC}Protocol slave(argv[2], argv[3]);
slave.dispatchLoop();
kdDebug(7101) << "*** kio_%{APPNAMELC} Done" << endl;
kdDebug(7101) << "*** tdeio_%{APPNAMELC} Done" << endl;
return 0;
}
}

6
languages/cpp/app_templates/tdeioslave/slave.h
Unescape View File

@ -11,11 +11,11 @@
class TQCString;
class kio_%{APPNAMELC}Protocol : public TDEIO::SlaveBase
class tdeio_%{APPNAMELC}Protocol : public TDEIO::SlaveBase
{
public:
kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~kio_%{APPNAMELC}Protocol();
tdeio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~tdeio_%{APPNAMELC}Protocol();
virtual void mimetype(const KURL& url);
virtual void get(const KURL& url);
};

2
languages/cpp/app_templates/tdeioslave/slave.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_%{APPNAMELC}
exec=tdeio_%{APPNAMELC}
protocol=%{APPNAMELC}
input=none
output=stream

8
languages/cpp/app_templates/tdeioslave/src-Makefile.am
Unescape View File

@ -1,10 +1,10 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kio_%{APPNAMELC}.la
kde_module_LTLIBRARIES = tdeio_%{APPNAMELC}.la
kio_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
kio_%{APPNAMELC}_la_LIBADD = -lkio
kio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
tdeio_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
tdeio_%{APPNAMELC}_la_LIBADD = -ltdeio
tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
protocol_DATA = %{APPNAMELC}.protocol
protocoldir = $(kde_servicesdir)

4
languages/csharp/CMakeLists.txt
Unescape View File

@ -50,9 +50,9 @@ tde_add_kpart( libkdevcsharpsupport AUTOMOC
)
##### kio_csharpdoc (module) ####################
##### tdeio_csharpdoc (module) ####################
tde_add_kpart( kio_csharpdoc AUTOMOC
tde_add_kpart( tdeio_csharpdoc AUTOMOC
SOURCES csharpdoc.cpp
LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

8
languages/csharp/Makefile.am
Unescape View File

@ -6,15 +6,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
SUBDIRS = app_templates file_templates doc
kde_module_LTLIBRARIES = libkdevcsharpsupport.la kio_csharpdoc.la
kde_module_LTLIBRARIES = libkdevcsharpsupport.la tdeio_csharpdoc.la
libkdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
libkdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui
kio_csharpdoc_la_SOURCES = csharpdoc.cpp
kio_csharpdoc_la_LIBADD = $(LIB_KIO)
kio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
tdeio_csharpdoc_la_SOURCES = csharpdoc.cpp
tdeio_csharpdoc_la_LIBADD = $(LIB_KIO)
tdeio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO

4
languages/csharp/csharpdoc.cpp
Unescape View File

@ -116,11 +116,11 @@ extern "C" {
int kdemain(int argc, char **argv)
{
TDEInstance instance( "kio_csharpdoc" );
TDEInstance instance( "tdeio_csharpdoc" );
TDEGlobal::locale()->setMainCatalogue("tdevelop");
if (argc != 4) {
fprintf(stderr, "Usage: kio_csharpdoc protocol domain-socket1 domain-socket2\n");
fprintf(stderr, "Usage: tdeio_csharpdoc protocol domain-socket1 domain-socket2\n");
exit(-1);
}

2
languages/csharp/csharpdoc.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_csharpdoc
exec=tdeio_csharpdoc
protocol=csharpdoc
input=none
output=filesystem

2
languages/lib/debugger/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp
langincludedirdir = $(includedir)/tdevelop/languages/debugger
langincludedir_HEADERS = debugger.h kdevdebugger.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil
DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library
DOXYGEN_DOCDIRPREFIX = kdevlang
include ../../../Doxyfile.am

2
languages/lib/designer_integration/Makefile.am
Unescape View File

@ -11,6 +11,6 @@ libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \
langincludedirdir = $(includedir)/tdevelop/languages/designer_integration
langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil
DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library
include ../../../Doxyfile.am

2
languages/lib/interfaces/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
servicetypedir = $(kde_servicetypesdir)
servicetype_DATA = tdeveloppcsimporter.desktop
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil
DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdevlang
include ../../../Doxyfile.am

4
languages/perl/CMakeLists.txt
Unescape View File

@ -45,9 +45,9 @@ tde_add_kpart( libkdevperlsupport AUTOMOC
)
##### kio_perldoc (module) ######################
##### tdeio_perldoc (module) ######################
tde_add_kpart( kio_perldoc
tde_add_kpart( tdeio_perldoc
SOURCES
perldoc.cpp
LINK tdeio-shared

8
languages/perl/Makefile.am
Unescape View File

@ -6,15 +6,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
SUBDIRS = app_templates file_templates doc
kde_module_LTLIBRARIES = libkdevperlsupport.la kio_perldoc.la
kde_module_LTLIBRARIES = libkdevperlsupport.la tdeio_perldoc.la
libkdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
libkdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui
kio_perldoc_la_SOURCES = perldoc.cpp
kio_perldoc_la_LIBADD = $(LIB_KIO)
kio_perldoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
tdeio_perldoc_la_SOURCES = perldoc.cpp
tdeio_perldoc_la_LIBADD = $(LIB_KIO)
tdeio_perldoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO

4
languages/perl/perldoc.cpp
Unescape View File

@ -116,11 +116,11 @@ extern "C" {
int kdemain(int argc, char **argv)
{
TDEInstance instance( "kio_perldoc" );
TDEInstance instance( "tdeio_perldoc" );
TDEGlobal::locale()->setMainCatalogue("tdevelop");
if (argc != 4) {
fprintf(stderr, "Usage: kio_perldoc protocol domain-socket1 domain-socket2\n");
fprintf(stderr, "Usage: tdeio_perldoc protocol domain-socket1 domain-socket2\n");
exit(-1);
}

2
languages/perl/perldoc.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_perldoc
exec=tdeio_perldoc
protocol=perldoc
input=none
output=filesystem

4
languages/python/CMakeLists.txt
Unescape View File

@ -49,9 +49,9 @@ tde_add_kpart( libkdevpythonsupport AUTOMOC
)
##### kio_pydoc (module) ########################
##### tdeio_pydoc (module) ########################
tde_add_kpart( kio_pydoc
tde_add_kpart( tdeio_pydoc
SOURCES pydoc.cpp
LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

8
languages/python/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/languages/lib/designer
SUBDIRS = app_templates file_templates doc
kde_module_LTLIBRARIES = libkdevpythonsupport.la kio_pydoc.la
kde_module_LTLIBRARIES = libkdevpythonsupport.la tdeio_pydoc.la
libkdevpythonsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
@ -15,9 +15,9 @@ libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
libkdevpythonsupport_la_SOURCES = pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui \
pythonimplementationwidget.cpp qtdesignerpythonintegration.cpp
kio_pydoc_la_SOURCES = pydoc.cpp
kio_pydoc_la_LIBADD = $(LIB_KIO)
kio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
tdeio_pydoc_la_SOURCES = pydoc.cpp
tdeio_pydoc_la_LIBADD = $(LIB_KIO)
tdeio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
METASOURCES = AUTO

6
languages/python/pydoc.cpp
Unescape View File

@ -20,7 +20,7 @@ PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app)
: SlaveBase("pydoc", pool, app), key()
{
python = TDEGlobal::dirs()->findExe("python");
script = locate("data", "kio_pydoc/kde_pydoc.py");
script = locate("data", "tdeio_pydoc/kde_pydoc.py");
}
@ -96,11 +96,11 @@ extern "C" {
int kdemain(int argc, char **argv)
{
TDEInstance instance( "kio_pydoc" );
TDEInstance instance( "tdeio_pydoc" );
TDEGlobal::locale()->setMainCatalogue("tdevelop");
if (argc != 4) {
fprintf(stderr, "Usage: kio_pydoc protocol domain-socket1 domain-socket2\n");
fprintf(stderr, "Usage: tdeio_pydoc protocol domain-socket1 domain-socket2\n");
exit(-1);
}

2
languages/python/pydoc.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_pydoc
exec=tdeio_pydoc
protocol=pydoc
input=none
output=filesystem

2
lib/catalog/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT)
kdevcatalogincludedir = $(includedir)/tdevelop/catalog
kdevcataloginclude_HEADERS = catalog.h tag.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = TDevelop Catalog Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am

2
lib/interfaces/Makefile.am
Unescape View File

@ -33,7 +33,7 @@ METASOURCES = AUTO
SUBDIRS = extensions external extras
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
DOXYGEN_PROJECTNAME = TDevelop Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am

2
lib/interfaces/extensions/Makefile.am
Unescape View File

@ -16,7 +16,7 @@ libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp
INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
METASOURCES = AUTO
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../../Doxyfile.am

2
lib/interfaces/external/Mainpage.dox vendored
Unescape View File

@ -45,7 +45,7 @@ KDevelop version >= 3.1 comes with a customized version (fork ;)) of %Qt Designe
- KDevDesigner uses %KDE icons and dialogs and thus provides better integration with a system.
.
It is safe to preview forms with some %KDE widgets from tdeui and kio libraries - KDevDesigner part is linked to those libraries so it will not crash under some circumstances.
It is safe to preview forms with some %KDE widgets from tdeui and tdeio libraries - KDevDesigner part is linked to those libraries so it will not crash under some circumstances.
KDevDesigner will not create .ui.h files - this feature is completely disabled. Integrated KDevDesigner will use subclassing approach, standalone does not allow to enter code.

2
lib/interfaces/external/Makefile.am vendored
Unescape View File

@ -10,6 +10,6 @@ libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDEUI)
libkinterfacedesigner_la_LDFLAGS = $(all_libraries)
libkinterfacedesigner_la_SOURCES = designer.cpp
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = KInterfaceDesigner Library
include ../../../Doxyfile.am

2
lib/interfaces/extras/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp
servicetype_DATA = tdevelopcompileroptions.desktop \
tdevelopvcsintegrator.desktop
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces
DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../../Doxyfile.am

2
lib/util/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ tdevelopincludedir = $(includedir)/tdevelop/util
tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \
configwidgetproxy.h rurl.h tdescriptactionmanager.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevextensions kdevinterfaces
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevextensions kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Utility Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am

2
lib/widgets/Makefile.am
Unescape View File

@ -24,7 +24,7 @@ rcdir = $(kde_datadir)/tdevelop
rc_DATA = kdevhtml_partui.rc
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Widgets Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am

2
lib/widgets/propeditor/Makefile.am
Unescape View File

@ -13,6 +13,6 @@ pcolorcombo.cpp pdoublenuminput.cpp ppixmapedit.cpp propertylist.cpp ps
kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor
kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = KDevelop Property Editing Library
include ../../../Doxyfile.am

2
parts/documentation/interfaces/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ partincludedir_HEADERS = kdevdocumentationplugin.h
servicetypedir = $(kde_servicetypesdir)
servicetype_DATA = tdevelopdocumentationplugins.desktop
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdevdoc
include ../../../Doxyfile.am

4
parts/documentation/protocols/chm/CMakeLists.txt
Unescape View File

@ -30,9 +30,9 @@ install( FILES
DESTINATION ${SERVICES_INSTALL_DIR} )
##### kio_chm (module) ##########################
##### tdeio_chm (module) ##########################
tde_add_kpart( kio_chm
tde_add_kpart( tdeio_chm
SOURCES decompress.cpp chmfile.cpp chm.cpp
LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

8
parts/documentation/protocols/chm/Makefile.am
Unescape View File

@ -2,11 +2,11 @@
INCLUDES = -I$(top_srcdir)/lib/widgets $(all_includes)
kde_module_LTLIBRARIES = kio_chm.la libkchmpart.la
kde_module_LTLIBRARIES = tdeio_chm.la libkchmpart.la
kio_chm_la_SOURCES = decompress.cpp chmfile.cpp chm.cpp
kio_chm_la_LIBADD = $(LIB_KIO)
kio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
tdeio_chm_la_SOURCES = decompress.cpp chmfile.cpp chm.cpp
tdeio_chm_la_LIBADD = $(LIB_KIO)
tdeio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
libkchmpart_la_SOURCES = kchmpart.cpp
libkchmpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la

12
parts/documentation/protocols/chm/chm.cpp
Unescape View File

@ -41,25 +41,25 @@ extern "C"
{
int kdemain( int argc, char **argv )
{
TDEInstance instance( "kio_chm" );
TDEInstance instance( "tdeio_chm" );
kdDebug() << "*** Starting kio_chm " << endl;
kdDebug() << "*** Starting tdeio_chm " << endl;
if (argc != 4) {
kdDebug() << "Usage: kio_chm protocol domain-socket1 domain-socket2" << endl;
kdDebug() << "Usage: tdeio_chm protocol domain-socket1 domain-socket2" << endl;
exit(-1);
}
ChmProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
kdDebug() << "*** kio_chm Done" << endl;
kdDebug() << "*** tdeio_chm Done" << endl;
return 0;
}
}
ChmProtocol::ChmProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("kio_chm", pool_socket, app_socket)
: SlaveBase("tdeio_chm", pool_socket, app_socket)
{
kdDebug() << "ChmProtocol::ChmProtocol()" << endl;
}
@ -80,7 +80,7 @@ void ChmProtocol::get( const KURL& url )
* of the node, an integer representing a node's ID, the Title of the Node, and it's hyperlink.
* When :contents is appended, all contained htm- and html-files will be printed, each in a line.
*/
kdDebug() << "kio_chm::get(const KURL& url) " << url.path() << endl;
kdDebug() << "tdeio_chm::get(const KURL& url) " << url.path() << endl;
bool catalog = false;
bool contents = false;

2
parts/documentation/protocols/chm/chm.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_chm
exec=tdeio_chm
protocol=ms-its
input=none
output=filesystem

4
parts/outputviews/makeactionfilter.cpp
Unescape View File

@ -234,7 +234,7 @@ void MakeActionFilter::test()
"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libtdefilereplacepart.la.closure libtdefilereplacepart_la_closure.lo "
"-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 tdefilereplacepart.lo tdefilereplacedoc.lo "
"tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo tdefilereplacepref.lo "
"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
"linking", "libtool", "libtdefilereplacepart.la.closure")
<< TestItem( //libtool, linking 3
"/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
@ -242,7 +242,7 @@ void MakeActionFilter::test()
"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libtdefilereplacepart.la -rpath /opt/trinity/lib/trinity "
"-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 tdefilereplacepart.lo "
"tdefilereplacedoc.lo tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo "
"tdefilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
"tdefilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
"linking", "libtool", "libtdefilereplacepart.la")
<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "

2
src/Makefile.am
Unescape View File

@ -48,7 +48,7 @@ shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \
statusbar.h toplevel.h generalinfowidgetbase.h mimewarningdialog.h settingswidget.h \
simplemainwindow.h multibuffer.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
DOXYGEN_PROJECTNAME = KDevelop Generic Shell
DOXYGEN_DOCDIRPREFIX = kdevshell
include ../Doxyfile.am

2
src/profileengine/lib/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ libprofileengine_la_SOURCES = profileengine.cpp profile.cpp
profileincludedir = $(includedir)/tdevelop/shell/profileengine
profileinclude_HEADERS = profileengine.h profile.h
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Shell Profiles Library
DOXYGEN_DOCDIRPREFIX = kdevprofiles
include ../../../Doxyfile.am

6
vcs/subversion/CMakeLists.txt
Unescape View File

@ -59,11 +59,11 @@ tde_add_kpart( libkdevsubversion AUTOMOC
)
##### kio_kdevsvn (module) ######################
##### tdeio_kdevsvn (module) ######################
tde_add_kpart( kio_kdevsvn AUTOMOC
tde_add_kpart( tdeio_kdevsvn AUTOMOC
SOURCES
svn_kio.cpp
svn_tdeio.cpp
LINK tdeio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)

8
vcs/subversion/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util -I$(top_srcdi
METASOURCES = AUTO
kde_module_LTLIBRARIES = libkdevsubversion.la kio_kdevsvn.la kded_kdevsvnd.la
kde_module_LTLIBRARIES = libkdevsubversion.la tdeio_kdevsvn.la kded_kdevsvnd.la
libkdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \
subversion_fileinfo.skel subversion_part.cpp subversion_widget.cpp subversiondiff.ui \
@ -14,9 +14,9 @@ libkdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)
libkdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kio_kdevsvn_la_SOURCES = svn_kio.cpp
kio_kdevsvn_la_LIBADD = $(LIB_KIO)
kio_kdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB)
tdeio_kdevsvn_la_SOURCES = svn_tdeio.cpp
tdeio_kdevsvn_la_LIBADD = $(LIB_KIO)
tdeio_kdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB)
kded_kdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp \
kdevsvnd.skel kdevsvnd_widgets.cpp svnssltrustpromptbase.ui

2
vcs/subversion/kdevsvn+file.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_kdevsvn
exec=tdeio_kdevsvn
protocol=kdevsvn+file
input=none
output=filesystem

2
vcs/subversion/kdevsvn+http.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_kdevsvn
exec=tdeio_kdevsvn
protocol=kdevsvn+http
input=none
output=filesystem

2
vcs/subversion/kdevsvn+https.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_kdevsvn
exec=tdeio_kdevsvn
protocol=kdevsvn+https
input=none
output=filesystem

2
vcs/subversion/kdevsvn+ssh.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_kdevsvn
exec=tdeio_kdevsvn
protocol=kdevsvn+ssh
input=none
output=filesystem

2
vcs/subversion/kdevsvn+svn.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_kdevsvn
exec=tdeio_kdevsvn
protocol=kdevsvn+svn
input=none
output=filesystem

248
vcs/subversion/svn_kio.cpp → vcs/subversion/svn_tdeio.cpp
Unescape View File

@ -51,7 +51,7 @@
#include <kmimetype.h>
#include <tqfile.h>
#include "svn_kio.h"
#include "svn_tdeio.h"
#include <apr_portable.h>
// #include "commitdlg.h"
#include <ktextedit.h>
@ -115,9 +115,9 @@ compare_items_as_paths (const svn_sort__item_t*a, const svn_sort__item_t*b) {
return svn_path_compare_paths ((const char *)a->key, (const char *)b->key);
}
kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("kio_svn", pool_socket, app_socket) {
kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol()" << endl;
tdeio_svnProtocol::tdeio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("tdeio_svn", pool_socket, app_socket) {
kdDebug(9036) << "tdeio_svnProtocol::tdeio_svnProtocol()" << endl;
m_counter = 0;
@ -131,25 +131,25 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &
svn_error_t *err = svn_client_create_context(&ctx, pool);
if ( err ) {
kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol() create_context ERROR" << endl;
kdDebug(9036) << "tdeio_svnProtocol::tdeio_svnProtocol() create_context ERROR" << endl;
error( TDEIO::ERR_SLAVE_DEFINED, err->message );
return;
}
err = svn_config_ensure (NULL,pool);
if ( err ) {
kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol() configensure ERROR" << endl;
kdDebug(9036) << "tdeio_svnProtocol::tdeio_svnProtocol() configensure ERROR" << endl;
error( TDEIO::ERR_SLAVE_DEFINED, err->message );
return;
}
svn_config_get_config (&ctx->config, NULL, pool);
ctx->log_msg_func = kio_svnProtocol::commitLogPrompt;
ctx->log_msg_func = tdeio_svnProtocol::commitLogPrompt;
ctx->log_msg_baton = this; //pass this so that we can get a dcopClient from it
//TODO
ctx->cancel_func = NULL;
// progress notifications
ctx->progress_func = kio_svnProtocol::progressCallback;
ctx->progress_func = tdeio_svnProtocol::progressCallback;
ctx->progress_baton = this;
apr_array_header_t *providers = apr_array_make(pool, 15, sizeof(svn_auth_provider_object_t *));
@ -163,11 +163,11 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t*) = provider;
//interactive prompt
svn_client_get_simple_prompt_provider (&provider,kio_svnProtocol::checkAuth,this,2,pool);
svn_client_get_simple_prompt_provider (&provider,tdeio_svnProtocol::checkAuth,this,2,pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t*) = provider;
//we always ask user+pass, no need for a user only question
/* svn_client_get_username_prompt_provider
* (&provider,kio_svnProtocol::checkAuth,this,2,pool);
* (&provider,tdeio_svnProtocol::checkAuth,this,2,pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t*) = provider;*/
//SSL disk cache, keep that one, because it does nothing bad :)
@ -179,25 +179,25 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &
APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
//SSL interactive prompt, where things get hard
svn_client_get_ssl_server_trust_prompt_provider (&provider, kio_svnProtocol::trustSSLPrompt, (void*)this, pool);
svn_client_get_ssl_server_trust_prompt_provider (&provider, tdeio_svnProtocol::trustSSLPrompt, (void*)this, pool);
APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
svn_client_get_ssl_client_cert_prompt_provider (&provider, kio_svnProtocol::clientCertSSLPrompt, (void*)this, 2, pool);
svn_client_get_ssl_client_cert_prompt_provider (&provider, tdeio_svnProtocol::clientCertSSLPrompt, (void*)this, 2, pool);
APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
svn_client_get_ssl_client_cert_pw_prompt_provider (&provider, kio_svnProtocol::clientCertPasswdPrompt, (void*)this, 2, pool);
svn_client_get_ssl_client_cert_pw_prompt_provider (&provider, tdeio_svnProtocol::clientCertPasswdPrompt, (void*)this, 2, pool);
APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
svn_auth_open(&ctx->auth_baton, providers, pool);
}
kio_svnProtocol::~kio_svnProtocol(){
kdDebug(9036) << "kio_svnProtocol::~kio_svnProtocol()" << endl;
tdeio_svnProtocol::~tdeio_svnProtocol(){
kdDebug(9036) << "tdeio_svnProtocol::~tdeio_svnProtocol()" << endl;
svn_pool_destroy(pool);
apr_terminate();
}
void kio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool) {
void tdeio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool) {
m_counter=0;//reset counter
ctx->notify_func = kio_svnProtocol::notify;
ctx->notify_func = tdeio_svnProtocol::notify;
struct notify_baton *nb = ( struct notify_baton* )apr_palloc(spool, sizeof( struct notify_baton ) );
nb->master = this;
nb->received_some_change = FALSE;
@ -212,9 +212,9 @@ void kio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool suppre
ctx->notify_baton = nb;
}
svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *baton, const char *realm, const char *username, svn_boolean_t may_save, apr_pool_t *pool) {
kdDebug(9036) << "kio_svnProtocol::checkAuth() " << endl;
kio_svnProtocol *p = ( kio_svnProtocol* )baton;
svn_error_t* tdeio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *baton, const char *realm, const char *username, svn_boolean_t may_save, apr_pool_t *pool) {
kdDebug(9036) << "tdeio_svnProtocol::checkAuth() " << endl;
tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton;
svn_auth_cred_simple_t *ret = (svn_auth_cred_simple_t*)apr_pcalloc (pool, sizeof (*ret));
p->info.keepPassword = true;
@ -236,14 +236,14 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat
return SVN_NO_ERROR;
}
void kio_svnProtocol::recordCurrentURL(const KURL& url) {
void tdeio_svnProtocol::recordCurrentURL(const KURL& url) {
myURL = url;
}
//don't implement mimeType() until we don't need to download the whole file
void kio_svnProtocol::get(const KURL& url ){
kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ;
void tdeio_svnProtocol::get(const KURL& url ){
kdDebug(9036) << "tdeio_svn::get(const KURL& url)" << endl ;
TQString remoteServer = url.host();
infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
@ -308,8 +308,8 @@ void kio_svnProtocol::get(const KURL& url ){
svn_pool_destroy (subpool);
}
void kio_svnProtocol::stat(const KURL & url){
kdDebug(9036) << "kio_svn::stat(const KURL& url) : " << url.url() << endl ;
void tdeio_svnProtocol::stat(const KURL & url){
kdDebug(9036) << "tdeio_svn::stat(const KURL& url) : " << url.url() << endl ;
void *ra_baton, *session;
svn_ra_plugin_t *ra_lib;
@ -361,7 +361,7 @@ void kio_svnProtocol::stat(const KURL & url){
//start session
svn_ra_callbacks_t *cbtable = (svn_ra_callbacks_t*)apr_pcalloc(subpool, sizeof(*cbtable));
kio_svn_callback_baton_t *callbackbt = (kio_svn_callback_baton_t*)apr_pcalloc(subpool, sizeof( *callbackbt ));
tdeio_svn_callback_baton_t *callbackbt = (tdeio_svn_callback_baton_t*)apr_pcalloc(subpool, sizeof( *callbackbt ));
cbtable->open_tmp_file = open_tmp_file;
cbtable->get_wc_prop = NULL;
@ -415,8 +415,8 @@ void kio_svnProtocol::stat(const KURL & url){
svn_pool_destroy( subpool );
}
void kio_svnProtocol::listDir(const KURL& url){
kdDebug(9036) << "kio_svn::listDir(const KURL& url) : " << url.url() << endl ;
void tdeio_svnProtocol::listDir(const KURL& url){
kdDebug(9036) << "tdeio_svn::listDir(const KURL& url) : " << url.url() << endl ;
apr_pool_t *subpool = svn_pool_create (pool);
apr_hash_t *dirents;
@ -500,7 +500,7 @@ void kio_svnProtocol::listDir(const KURL& url){
svn_pool_destroy (subpool);
}
bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) {
bool tdeio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) {
kdDebug(9036) << "MTime : " << ( long )mtime << endl;
kdDebug(9036) << "UDS filename : " << filename << endl;
UDSAtom atom;
@ -528,8 +528,8 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
}
// not used, at least for KDevelop
// void kio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions*/, bool /*overwrite*/) {
// kdDebug(9036) << "kio_svnProtocol::copy() Source : " << src.url() << " Dest : " << dest.url() << endl;
// void tdeio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions*/, bool /*overwrite*/) {
// kdDebug(9036) << "tdeio_svnProtocol::copy() Source : " << src.url() << " Dest : " << dest.url() << endl;
//
// apr_pool_t *subpool = svn_pool_create (pool);
// svn_client_commit_info_t *commit_info = NULL;
@ -575,8 +575,8 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
// svn_pool_destroy (subpool);
// }
void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
kdDebug(9036) << "kio_svnProtocol::mkdir(LIST) : " << list << endl;
void tdeio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
kdDebug(9036) << "tdeio_svnProtocol::mkdir(LIST) : " << list << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
@ -588,7 +588,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
KURL::List::const_iterator it = list.begin(), end = list.end();
for ( ; it != end; ++it ) {
TQString cur = makeSvnURL( *it );
kdDebug( 9036 ) << "kio_svnProtocol::mkdir raw url for subversion : " << cur << endl;
kdDebug( 9036 ) << "tdeio_svnProtocol::mkdir raw url for subversion : " << cur << endl;
const char *_target = apr_pstrdup( subpool, svn_path_canonicalize( apr_pstrdup( subpool, cur.utf8() ), subpool ) );
(*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) ) = _target;
}
@ -605,8 +605,8 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
svn_pool_destroy (subpool);
}
void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) {
kdDebug(9036) << "kio_svnProtocol::mkdir() : " << url.url() << endl;
void tdeio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) {
kdDebug(9036) << "tdeio_svnProtocol::mkdir() : " << url.url() << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
@ -630,8 +630,8 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) {
svn_pool_destroy (subpool);
}
void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) {
kdDebug(9036) << "kio_svnProtocol::del() : " << url.url() << endl;
void tdeio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) {
kdDebug(9036) << "tdeio_svnProtocol::del() : " << url.url() << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
@ -655,8 +655,8 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) {
svn_pool_destroy (subpool);
}
void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite*/) {
kdDebug(9036) << "kio_svnProtocol::rename() Source : " << src.url() << " Dest : " << dest.url() << endl;
void tdeio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite*/) {
kdDebug(9036) << "tdeio_svnProtocol::rename() Source : " << src.url() << " Dest : " << dest.url() << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
@ -703,14 +703,14 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
svn_pool_destroy (subpool);
}
void kio_svnProtocol::special( const TQByteArray& data ) {
// kdDebug(9036) << "kio_svnProtocol::special" << endl;
void tdeio_svnProtocol::special( const TQByteArray& data ) {
// kdDebug(9036) << "tdeio_svnProtocol::special" << endl;
TQDataStream stream(data, IO_ReadOnly);
int tmp;
stream >> tmp;
kdDebug(9036) << "kio_svnProtocol::special " << tmp << endl;
kdDebug(9036) << "tdeio_svnProtocol::special " << tmp << endl;
switch ( tmp ) {
case SVN_CHECKOUT:
@ -722,7 +722,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
stream >> wc;
stream >> revnumber;
stream >> revkind;
kdDebug(9036) << "kio_svnProtocol CHECKOUT from " << repository.url() << " to " << wc.url() << " at " << revnumber << " or " << revkind << endl;
kdDebug(9036) << "tdeio_svnProtocol CHECKOUT from " << repository.url() << " to " << wc.url() << " at " << revnumber << " or " << revkind << endl;
checkout( repository, wc, revnumber, revkind );
break;
}
@ -734,7 +734,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
stream >> list;
stream >> revnumber;
stream >> revkind;
kdDebug(9036) << "kio_svnProtocol UPDATE " << endl;
kdDebug(9036) << "tdeio_svnProtocol UPDATE " << endl;
update( list, revnumber, revkind );
break;
}
@ -746,7 +746,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
stream >> tmp;
wclist << tmp;
}
kdDebug(9036) << "kio_svnProtocol COMMIT" << endl;
kdDebug(9036) << "tdeio_svnProtocol COMMIT" << endl;
commit( wclist );
break;
}
@ -761,13 +761,13 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
stream >> tmp;
wclist << tmp;
}
kdDebug(9036) << "kio_svnProtocol COMMIT2" << endl;
kdDebug(9036) << "tdeio_svnProtocol COMMIT2" << endl;
commit2( recurse, keeplocks, wclist );
break;
}
case SVN_LOG:
{
kdDebug(9036) << "kio_svnProtocol LOG" << endl;
kdDebug(9036) << "tdeio_svnProtocol LOG" << endl;
int revstart, revend;
TQString revkindstart, revkindend;
bool discorverChangedPath, strictNodeHistory;
@ -793,7 +793,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
KURL wc,repos;
stream >> repos;
stream >> wc;
kdDebug(9036) << "kio_svnProtocol IMPORT" << endl;
kdDebug(9036) << "tdeio_svnProtocol IMPORT" << endl;
import(repos,wc);
break;
}
@ -801,7 +801,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
{
KURL::List wcList;
stream >> wcList;
kdDebug(9036) << "kio_svnProtocol ADD" << endl;
kdDebug(9036) << "tdeio_svnProtocol ADD" << endl;
add(wcList);
break;
}
@ -809,7 +809,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
{
KURL::List wclist;
stream >> wclist;
kdDebug(9036) << "kio_svnProtocol DEL" << endl;
kdDebug(9036) << "tdeio_svnProtocol DEL" << endl;
wc_delete(wclist);
break;
}
@ -817,7 +817,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
{
KURL::List wclist;
stream >> wclist;
kdDebug(9036) << "kio_svnProtocol REVERT" << endl;
kdDebug(9036) << "tdeio_svnProtocol REVERT" << endl;
wc_revert(wclist);
break;
}
@ -852,7 +852,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
{
KURL::List list;
stream >> list;
kdDebug(9036) << "kio_svnProtocol MKDIR" << endl;
kdDebug(9036) << "tdeio_svnProtocol MKDIR" << endl;
mkdir(list,0);
break;
}
@ -862,7 +862,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
bool recurse;
stream >> url;
stream >> recurse;
kdDebug(9036) << "kio_svnProtocol RESOLVE" << endl;
kdDebug(9036) << "tdeio_svnProtocol RESOLVE" << endl;
wc_resolve(url,recurse);
break;
}
@ -877,7 +877,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
stream >> recurse;
stream >> revnumber;
stream >> revkind;
kdDebug(9036) << "kio_svnProtocol SWITCH" << endl;
kdDebug(9036) << "tdeio_svnProtocol SWITCH" << endl;
svn_switch(wc,url,revnumber,revkind,recurse);
break;
}
@ -905,7 +905,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
stream >> rev2;
stream >> revkind2;
stream >> recurse >> pegdiff;
kdDebug(9036) << "kio_svnProtocol DIFF" << endl;
kdDebug(9036) << "tdeio_svnProtocol DIFF" << endl;
svn_diff(url1,url2,rev1,rev2,revkind1,revkind2,recurse,pegdiff);
break;
}
@ -970,7 +970,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
}
default:
{
kdDebug(9036) << "kio_svnProtocol DEFAULT" << endl;
kdDebug(9036) << "tdeio_svnProtocol DEFAULT" << endl;
break;
}
}
@ -978,7 +978,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) {
/**
* not used anywhere, anymore
*/
void kio_svnProtocol::popupMessage( const TQString& message ) {
void tdeio_svnProtocol::popupMessage( const TQString& message ) {
// TQByteArray params;
// TQDataStream stream(params, IO_WriteOnly);
// stream << message;
@ -987,7 +987,7 @@ void kio_svnProtocol::popupMessage( const TQString& message ) {
// kdWarning() << "Communication with KDED:KSvnd failed" << endl;
}
void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind )
void tdeio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind )
{
kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
// kdDebug(9036) << " PegRev " << pegRev << pegRevKind << endl;
@ -1002,7 +1002,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString
// svn_opt_revision_t revPeg = createRevision( pegRev, pegRevKind, subpool );
//initNotifier(false, false, false, subpool);
svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver;
svn_client_blame_receiver_t receiver = tdeio_svnProtocol::blameReceiver;
svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool );
if ( err )
error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
@ -1011,9 +1011,9 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString
}
svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool )
svn_error_t* tdeio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool )
{
kio_svnProtocol *p = (kio_svnProtocol*)baton;
tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton;
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", TQString::number(line_no) );
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number(rev) );
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author );
@ -1029,7 +1029,7 @@ svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, s
Thus retreiving URL from WC should be done here, using subversion native API.
Thus, svn_log should get another flag (bool repositHistory )specifying between file:/// or URL
*/
void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend,
void tdeio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend,
bool discorverChangedPaths, bool strictNodeHistory,
const KURL::List& urls )
{
@ -1056,7 +1056,7 @@ void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int r
incCounter();
}
svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage;
svn_log_message_receiver_t receiver = tdeio_svnProtocol::receiveLogMessage;
svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool);
if ( err ){
error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
@ -1069,10 +1069,10 @@ void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int r
}
// save for one revision
svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision,
svn_error_t* tdeio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision,
const char *author, const char *date, const char *message, apr_pool_t *pool )
{
kio_svnProtocol *p = (kio_svnProtocol*)baton;
tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton;
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number(revision) );
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author );
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date );
@ -1099,7 +1099,7 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed
return SVN_NO_ERROR;
}
svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) {
svn_opt_revision_t tdeio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) {
svn_opt_revision_t result;//,endrev;
// TODO support svn_opt_revision_date
if ( revision != -1 ) {
@ -1127,9 +1127,9 @@ svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString
return result;
}
void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff )
void tdeio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff )
{
kdDebug(9036) << "kio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with "
kdDebug(9036) << "tdeio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with "
<< url2.path() << " at revision " << rev2 << " or " << revkind2
<< endl ;
@ -1211,8 +1211,8 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
svn_pool_destroy (subpool);
}
void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) {
kdDebug(9036) << "kio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
void tdeio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) {
kdDebug(9036) << "tdeio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
apr_pool_t *subpool = svn_pool_create (pool);
@ -1242,7 +1242,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb
svn_pool_destroy (subpool);
}
void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl,
void tdeio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl,
bool recurse )
{
apr_pool_t *subpool = svn_pool_create( pool );
@ -1266,8 +1266,8 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
svn_pool_destroy( subpool );
}
void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) {
kdDebug(9036) << "kio_svn::update : __TIME__" << __TIME__ << endl;
void tdeio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) {
kdDebug(9036) << "tdeio_svn::update : __TIME__" << __TIME__ << endl;
apr_pool_t *subpool = svn_pool_create (pool);
@ -1293,8 +1293,8 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQStr
svn_pool_destroy (subpool);
}
void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
kdDebug(9036) << "kio_svnProtocol::import() : " << wc.url() << " into " << repos.url() << endl;
void tdeio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
kdDebug(9036) << "tdeio_svnProtocol::import() : " << wc.url() << " into " << repos.url() << endl;
apr_pool_t *subpool = svn_pool_create (pool);
// svn_client_commit_info_t *commit_info =
@ -1319,8 +1319,8 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
finished();
}
void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) {
kdDebug(9036) << "kio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
void tdeio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) {
kdDebug(9036) << "tdeio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ;
apr_pool_t *subpool = svn_pool_create (pool);
KURL nurl = repos;
@ -1346,13 +1346,13 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber
svn_pool_destroy (subpool);
}
void kio_svnProtocol::commit(const KURL::List& wc)
void tdeio_svnProtocol::commit(const KURL::List& wc)
{
commit2(true, true, wc);
}
void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc) {
kdDebug(9036) << "kio_svnProtocol::commit2() : " << wc << endl;
void tdeio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc) {
kdDebug(9036) << "tdeio_svnProtocol::commit2() : " << wc << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
@ -1401,8 +1401,8 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
svn_pool_destroy (subpool);
}
void kio_svnProtocol::add(const KURL::List& list) {
kdDebug(9036) << "kio_svnProtocol::add() __TIME__" << __TIME__ << endl;
void tdeio_svnProtocol::add(const KURL::List& list) {
kdDebug(9036) << "tdeio_svnProtocol::add() __TIME__" << __TIME__ << endl;
apr_pool_t *subpool = svn_pool_create (pool);
bool nonrecursive = false;
@ -1429,8 +1429,8 @@ void kio_svnProtocol::add(const KURL::List& list) {
svn_pool_destroy (subpool);
}
void kio_svnProtocol::wc_delete(const KURL::List& wc) {
kdDebug(9036) << "kio_svnProtocol::wc_delete() : " << wc << endl;
void tdeio_svnProtocol::wc_delete(const KURL::List& wc) {
kdDebug(9036) << "tdeio_svnProtocol::wc_delete() : " << wc << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_client_commit_info_t *commit_info = NULL;
@ -1455,8 +1455,8 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
svn_pool_destroy (subpool);
}
void kio_svnProtocol::wc_revert(const KURL::List& wc) {
kdDebug(9036) << "kio_svnProtocol::revert() : " << wc << endl;
void tdeio_svnProtocol::wc_revert(const KURL::List& wc) {
kdDebug(9036) << "tdeio_svnProtocol::revert() : " << wc << endl;
apr_pool_t *subpool = svn_pool_create (pool);
bool nonrecursive = false;
@ -1482,14 +1482,14 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
svn_pool_destroy (subpool);
}
void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) {
kdDebug(9036) << "kio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl;
void tdeio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) {
kdDebug(9036) << "tdeio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl;
wc_status2( wc, checkRepos, fullRecurse, getAll, false, revnumber, revkind );
}
void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) {
kdDebug(9036) << "kio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl;
void tdeio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) {
kdDebug(9036) << "tdeio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl;
kdDebug(9036) << " __TIME__ " << __TIME__ << endl;
apr_pool_t *subpool = svn_pool_create (pool);
@ -1503,7 +1503,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool);
svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, tdeio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool);
if ( err ){
error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
@ -1515,9 +1515,9 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur
svn_pool_destroy (subpool);
}
void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse )
void tdeio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse )
{
kdDebug(9036) << " kio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl;
kdDebug(9036) << " tdeio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_opt_revision_t peg_rev = createRevision( pegRev, pegRevKind, subpool );
@ -1525,7 +1525,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind,
svn_error_t *err = svn_client_info( pathOrUrl.pathOrURL().utf8(),
&peg_rev, &revision,
kio_svnProtocol::infoReceiver,
tdeio_svnProtocol::infoReceiver,
this,
recurse,
ctx, pool );
@ -1539,10 +1539,10 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind,
finished();
}
svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path,
svn_error_t* tdeio_svnProtocol::infoReceiver( void *baton, const char *path,
const svn_info_t *info, apr_pool_t *pool)
{
kio_svnProtocol *p= (kio_svnProtocol*)baton ;
tdeio_svnProtocol *p= (tdeio_svnProtocol*)baton ;
if( !p )
return SVN_NO_ERROR;
@ -1557,10 +1557,10 @@ svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path,
return SVN_NO_ERROR;
}
void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind,
void tdeio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind,
const KURL &destUrl )
{
kdDebug(9036) << " kio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl;
kdDebug(9036) << " tdeio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl;
apr_pool_t *subpool = svn_pool_create (pool);
svn_commit_info_t *commit_info = svn_create_commit_info( subpool );
@ -1594,7 +1594,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &
svn_pool_destroy (subpool);
}
void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1,
void tdeio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1,
const KURL &src2, int revNum2, TQString revKind2,
const KURL &target_wc,
bool recurse, bool ignore_ancestry, bool force, bool dry_run )
@ -1627,7 +1627,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1
//change the proto and remove trailing /
//remove double / also
TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
TQString tdeio_svnProtocol::makeSvnURL ( const KURL& url ) const {
TQString kproto = url.protocol();
KURL tpURL = url;
tpURL.cleanPath( true );
@ -1668,7 +1668,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
return tpURL.url(-1);
}
TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const {
TQString tdeio_svnProtocol::chooseProtocol ( const TQString& kproto ) const {
if ( kproto == "svn+http" ) return TQString( "http" );
else if ( kproto == "svn+https" ) return TQString( "https" );
else if ( kproto == "svn+ssh" ) return TQString( "svn+ssh" );
@ -1687,9 +1687,9 @@ TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const {
/** @brief Other failure. This can happen if neon has introduced a new
* failure bit that we do not handle yet. */
#define SVN_AUTH_SSL_OTHER 0x40000000
svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **cred_p, void *baton, const char *realm, apr_uint32_t failures, const svn_auth_ssl_server_cert_info_t *ci, svn_boolean_t may_save, apr_pool_t *pool)
svn_error_t *tdeio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **cred_p, void *baton, const char *realm, apr_uint32_t failures, const svn_auth_ssl_server_cert_info_t *ci, svn_boolean_t may_save, apr_pool_t *pool)
{
kio_svnProtocol *p = (kio_svnProtocol*)baton;
tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton;
// prepare params.
TQByteArray params, replyData;
TQCString replyType;
@ -1737,11 +1737,11 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **
return SVN_NO_ERROR;
}
/** TODO fully implemented, but there is no way to test this yet.*/
svn_error_t *kio_svnProtocol::clientCertSSLPrompt(
svn_error_t *tdeio_svnProtocol::clientCertSSLPrompt(
svn_auth_cred_ssl_client_cert_t **cred_p, void *baton, const char *realm, svn_boolean_t may_save, apr_pool_t *pool)
{
kdDebug(9036) << " clientCertSSLPrompt " << endl;
// kio_svnProtocol *p = (kio_svnProtocol*)baton;
// tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton;
// TQByteArray reply;
// TQByteArray params;
// TQCString replyType;
@ -1766,12 +1766,12 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt(
}
/** TODO fully implemented, but there is no way to test this yet.*/
svn_error_t *kio_svnProtocol::clientCertPasswdPrompt(
svn_error_t *tdeio_svnProtocol::clientCertPasswdPrompt(
svn_auth_cred_ssl_client_cert_pw_t **cred_p, void *baton, const char *realm, svn_boolean_t may_save, apr_pool_t *pool)
{
kdDebug(9036) << " Password Prompt Callback " << endl;
kdDebug(9036) << " realm " << realm << " <--realm " << endl;
// kio_svnProtocol *p = ( kio_svnProtocol* )baton;
// tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton;
// // prepare dcop
// TQByteArray reply;
// TQByteArray params;
@ -1809,7 +1809,7 @@ svn_error_t *kio_svnProtocol::clientCertPasswdPrompt(
}
svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char **file,
svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const char **file,
apr_array_header_t *commit_items, void *baton, apr_pool_t *pool )
{
*file = NULL; // if omitting this, it will segfault at import operation.
@ -1818,7 +1818,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
TQByteArray reply;
TQString result;// slist;
TQStringList slist;
kio_svnProtocol *p = ( kio_svnProtocol* )baton;
tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton;
svn_stringbuf_t *message = NULL;
for (int i = 0; i < commit_items->nelts; i++) {
@ -1890,7 +1890,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char
return SVN_NO_ERROR;
}
void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) {
void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) {
kdDebug(9036) << "NOTIFY : " << path << " updated at revision " << revision << " action : " << action << ", kind : " << kind << " , content_state : " << content_state << ", prop_state : " << prop_state << endl;
TQString userstring;
@ -2068,7 +2068,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
break;
}
//// End convert
kio_svnProtocol *p = ( kio_svnProtocol* )nb->master;
tdeio_svnProtocol *p = ( tdeio_svnProtocol* )nb->master;
if (!p) kdDebug(9036) << " Null Pointer at Line " << __LINE__ << endl;
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path ));
@ -2079,11 +2079,11 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( prop_state ));
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( revision ));
p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring );
kdDebug(9036) << " kio_svnProtocol::notify() userstring " << userstring << endl;
kdDebug(9036) << " tdeio_svnProtocol::notify() userstring " << userstring << endl;
p->incCounter();
}
void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *status) {
void tdeio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *status) {
kdDebug(9036) << "STATUS : " << path << ", wc text status : " << status->text_status
<< ", wc prop status : " << status->prop_status
<< ", repos text status : " << status->repos_text_status
@ -2091,7 +2091,7 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta
<< endl;
TQByteArray params;
kio_svnProtocol *p = ( kio_svnProtocol* )baton;
tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton;
TQDataStream stream(params, IO_WriteOnly);
long int rev = status->entry ? status->entry->revision : 0;
@ -2106,17 +2106,17 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta
p->incCounter();
}
void kio_svnProtocol::progressCallback( apr_off_t processed, apr_off_t total, void *baton, apr_pool_t *pool)
void tdeio_svnProtocol::progressCallback( apr_off_t processed, apr_off_t total, void *baton, apr_pool_t *pool)
{
kio_svnProtocol *p = (kio_svnProtocol*)baton;
tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton;
if( total > -1 )
p->totalSize( total );
if( processed > -1 )
p->processedSize( processed );
}
void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) {
kdDebug(9036) << "kio_svnProtocol::wc_resolve() : " << wc.url() << endl;
void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) {
kdDebug(9036) << "tdeio_svnProtocol::wc_resolve() : " << wc.url() << endl;
apr_pool_t *subpool = svn_pool_create (pool);
@ -2136,19 +2136,19 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) {
extern "C"
{
KDE_EXPORT int kdemain(int argc, char **argv) {
TDEInstance instance( "kio_kdevsvn" );
TDEInstance instance( "tdeio_kdevsvn" );
kdDebug(9036) << "*** Starting kio_kdevsvn " << endl;
kdDebug(9036) << "*** Starting tdeio_kdevsvn " << endl;
if (argc != 4) {
kdDebug(9036) << "Usage: kio_kdevsvn protocol domain-socket1 domain-socket2" << endl;
kdDebug(9036) << "Usage: tdeio_kdevsvn protocol domain-socket1 domain-socket2" << endl;
exit(-1);
}
kio_svnProtocol slave(argv[2], argv[3]);
tdeio_svnProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
kdDebug(9036) << "*** kio_kdevsvn Done" << endl;
kdDebug(9036) << "*** tdeio_kdevsvn Done" << endl;
return 0;
}
}

14
vcs/subversion/svn_kio.h → vcs/subversion/svn_tdeio.h
Unescape View File

@ -36,7 +36,7 @@
#include "subversion_global.h"
class TQCString;
class kio_svnProtocol;
class tdeio_svnProtocol;
typedef struct kbaton {
svn_stream_t *target_stream;
@ -44,11 +44,11 @@ typedef struct kbaton {
svn_stream_t *string_stream;
} kbaton;
typedef struct kio_svn_callback_baton_t {
typedef struct tdeio_svn_callback_baton_t {
const char* base_dir;
apr_hash_t *config;
apr_pool_t *pool;
} kio_svn_callback_baton_t;
} tdeio_svn_callback_baton_t;
typedef struct notify_baton {
svn_boolean_t received_some_change;
@ -61,15 +61,15 @@ typedef struct notify_baton {
when we've already had one print error. */
apr_pool_t *pool; /* this pool is cleared after every notification,
so don't keep anything here! */
kio_svnProtocol *master;
tdeio_svnProtocol *master;
} notify_baton;
class kio_svnProtocol : public TDEIO::SlaveBase
class tdeio_svnProtocol : public TDEIO::SlaveBase
{
public:
kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~kio_svnProtocol();
tdeio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~tdeio_svnProtocol();
virtual void special( const TQByteArray& data );
virtual void get(const KURL& url);
virtual void listDir(const KURL& url);
Write Preview
Loading…
Cancel
Save