diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-16 13:53:18 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-16 13:53:18 -0600 |
commit | 2ecab1a194b0dc551b478820e1aaa3b8713354cc (patch) | |
tree | ae4df71ed26f3dc2dd605970d8d455165a1c8ab3 /vcs | |
parent | 549fec618f0b15c9316fc0a5ebe93c2829bc0b1b (diff) | |
download | tdevelop-2ecab1a194b0dc551b478820e1aaa3b8713354cc.tar.gz tdevelop-2ecab1a194b0dc551b478820e1aaa3b8713354cc.zip |
Additional renaming of kde to tde
Diffstat (limited to 'vcs')
70 files changed, 89 insertions, 89 deletions
diff --git a/vcs/Makefile.am b/vcs/Makefile.am index d1fcb5b0..0bc8db05 100644 --- a/vcs/Makefile.am +++ b/vcs/Makefile.am @@ -1,36 +1,36 @@ ## -## Do NOT remove the comments that start with "kdevelop:" -## They are actually directives to the kdevelop plugin system +## Do NOT remove the comments that start with "tdevelop:" +## They are actually directives to the tdevelop plugin system ## ## The include_xxxx variables are controlled by configure.in.in ## -#kdevelop: CERVISIA_SUBDIR = cervisia +#tdevelop: CERVISIA_SUBDIR = cervisia #if include_cervisia #CERVISIA_SUBDIR = cervisia #endif -#kdevelop: CLEARCASE_SUBDIR = clearcase +#tdevelop: CLEARCASE_SUBDIR = clearcase if include_clearcase CLEARCASE_SUBDIR = clearcase endif -#kdevelop: CVSCLIENT_SUBDIR = cvsclient +#tdevelop: CVSCLIENT_SUBDIR = cvsclient #if include_cvsclient #CVSCLIENT_SUBDIR = cvsclient #endif -#kdevelop: CVSSERVICE_SUBDIR = cvsservice +#tdevelop: CVSSERVICE_SUBDIR = cvsservice if include_cvsservice CVSSERVICE_SUBDIR = cvsservice endif -#kdevelop: PERFORCE_SUBDIR = perforce +#tdevelop: PERFORCE_SUBDIR = perforce if include_perforce PERFORCE_SUBDIR = perforce endif -#kdevelop: SUBVERSION_SUBDIR = subversion +#tdevelop: SUBVERSION_SUBDIR = subversion if include_subversion SUBVERSION_SUBDIR = subversion endif diff --git a/vcs/clearcase/CMakeLists.txt b/vcs/clearcase/CMakeLists.txt index 8b6ae246..4dbed390 100644 --- a/vcs/clearcase/CMakeLists.txt +++ b/vcs/clearcase/CMakeLists.txt @@ -36,6 +36,6 @@ tde_add_kpart( libkdevclearcase AUTOMOC SOURCES clearcasepart.cpp commentdlg.cpp clearcasefileinfoprovider.cpp clearcasemanipulator.cpp - LINK kdevextensions-static kdevelop-shared + LINK kdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/clearcase/Makefile.am b/vcs/clearcase/Makefile.am index 64b70392..630a1346 100644 --- a/vcs/clearcase/Makefile.am +++ b/vcs/clearcase/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ kde_module_LTLIBRARIES = libkdevclearcase.la libkdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la libkdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \ clearcasefileinfoprovider.cpp clearcasemanipulator.cpp diff --git a/vcs/clearcase/README b/vcs/clearcase/README index 731741e1..7df3c4b5 100644 --- a/vcs/clearcase/README +++ b/vcs/clearcase/README @@ -1,3 +1,3 @@ Please read the on-line, automaticaly updated KDevelop API documentation at: -http://www.kdevelop.org +http://www.tdevelop.org or read the README.dox file. diff --git a/vcs/clearcase/README.dox b/vcs/clearcase/README.dox index 74f2678b..37faca4c 100644 --- a/vcs/clearcase/README.dox +++ b/vcs/clearcase/README.dox @@ -1,6 +1,6 @@ /** \class ClearcasePart Integrates Clearcase configuration management system into KDevelop. -Based on Perforce (PerforcePart) implementation by Harald Fernengel <harry AT kdevelop.org> +Based on Perforce (PerforcePart) implementation by Harald Fernengel <harry AT tdevelop.org> To use clearcase functions, you need to: -# Create a view in which you will keep your project files diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index d4733285..33fb5302 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: KDevelop Authors <kdevelop-devel@kdevelop.org>, (C) 2005 +// Author: KDevelop Authors <tdevelop-devel@tdevelop.org>, (C) 2005 // // Copyright: See COPYING file that comes with this distribution // diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index dcb1d26f..292ada0f 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -4,7 +4,7 @@ // Description: // // -// Author: KDevelop Authors <kdevelop-devel@kdevelop.org>, (C) 2005 +// Author: KDevelop Authors <tdevelop-devel@tdevelop.org>, (C) 2005 // // Copyright: See COPYING file that comes with this distribution // diff --git a/vcs/clearcase/clearcasemanipulator.cpp b/vcs/clearcase/clearcasemanipulator.cpp index 5c9563f9..bedd2b84 100644 --- a/vcs/clearcase/clearcasemanipulator.cpp +++ b/vcs/clearcase/clearcasemanipulator.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: KDevelop Authors <kdevelop-devel@kdevelop.org>, (C) 2005 +// Author: KDevelop Authors <tdevelop-devel@tdevelop.org>, (C) 2005 // // Copyright: See COPYING file that comes with this distribution // diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h index 0cb795e3..dab79975 100644 --- a/vcs/clearcase/clearcasemanipulator.h +++ b/vcs/clearcase/clearcasemanipulator.h @@ -4,7 +4,7 @@ // Description: // // -// Author: KDevelop Authors <kdevelop-devel@kdevelop.org>, (C) 2005 +// Author: KDevelop Authors <tdevelop-devel@tdevelop.org>, (C) 2005 // // Copyright: See COPYING file that comes with this distribution // diff --git a/vcs/clearcase/integrator/CMakeLists.txt b/vcs/clearcase/integrator/CMakeLists.txt index bff7ebb3..ccc3348f 100644 --- a/vcs/clearcase/integrator/CMakeLists.txt +++ b/vcs/clearcase/integrator/CMakeLists.txt @@ -35,6 +35,6 @@ tde_add_kpart( libclearcaseintegrator AUTOMOC SOURCES clearcaseintegrator.cpp ccintegratordlgbase.ui ccintegratordlg.cpp - LINK kdevextras-shared kdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/clearcase/integrator/Makefile.am b/vcs/clearcase/integrator/Makefile.am index cd998856..a9d50a98 100644 --- a/vcs/clearcase/integrator/Makefile.am +++ b/vcs/clearcase/integrator/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libclearcaseintegrator.la libclearcaseintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libclearcaseintegrator_la_LIBADD =\ $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ - $(top_builddir)/lib/libkdevelop.la + $(top_builddir)/lib/libtdevelop.la kde_services_DATA = kdevclearcaseintegrator.desktop noinst_HEADERS = clearcaseintegrator.h ccintegratordlg.h libclearcaseintegrator_la_SOURCES = clearcaseintegrator.cpp \ diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp index 8e89cf94..99510ef5 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.cpp +++ b/vcs/clearcase/integrator/ccintegratordlg.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index 674e7815..31bcee34 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp index 4e8c1a0b..ed2176eb 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.cpp +++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 9dc67e47..e368b00c 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index 8e6e986f..f39636dc 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -53,7 +53,7 @@ tde_add_kpart( libkdevcvsservice AUTOMOC editorsdialogbase.ui editorsdialog.cpp annotatedialog.cpp annotatepage.cpp annotateview.cpp LINK - kdevextensions-static kdevwidgets-shared kdevelop-shared + kdevextensions-static kdevwidgets-shared tdevelop-shared cvsservice-shared khtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/Makefile.am b/vcs/cvsservice/Makefile.am index a97444c2..5e58f573 100644 --- a/vcs/cvsservice/Makefile.am +++ b/vcs/cvsservice/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ kde_module_LTLIBRARIES = libkdevcvsservice.la libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \ +libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_KHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la libkdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \ diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index 3a102ce7..d334e326 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -1,5 +1,5 @@ /** \class CvsServicePart -This plugin integrates Cervisia (version >= 2.1) cvsservice DCOP service into kdevelop (read FAQ at the bottom +This plugin integrates Cervisia (version >= 2.1) cvsservice DCOP service into tdevelop (read FAQ at the bottom of this document): so, this part _does_ require cvsservice installed on your system: the configure script in the main source directory should automagically detect the presence of Cervisia and build this plugin. If Cervisia wasn't installed in $KDEDIR than you need to specify paths for lib and include @@ -9,7 +9,7 @@ files, for example: </code> (where $HOME/kde is where I install my own kde stuff so I don't mess with working kde installation) -<b>WARNING:</b> So, if you have already compiled kdevelop *without* cvsservice and have now +<b>WARNING:</b> So, if you have already compiled tdevelop *without* cvsservice and have now installed cervisia to try this nice piece of software, you need to re-run configure so it can detect cervisia installation and enable compilation for vcs/cvsservice. @@ -21,7 +21,7 @@ mailing list. Contributions are always welcome :-) <b>WARNING2:</b> If it doesn't compile try to update your cervisia installation. Implementation of this component is done by: - - class CvsServicePart, which does provide integration within kdevelop, set-up GUI + - class CvsServicePart, which does provide integration within tdevelop, set-up GUI integration, forward cvs commands to the implementation (m_impl). It does also intercepts Q_SIGNALS like "new files added to project" and "... removed from ...". - class CvsServicePartImpl implements the actual feature: more general speaking @@ -66,10 +66,10 @@ Implementation of this component is done by: \feature can revert and diff between specific releases \feature can do multiple diff from a common cvs log output text -\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=cvs%20part&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cvs part component at Bugzilla database</a> +\bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=cvs%20part&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">cvs part component at Bugzilla database</a> \requirement <a href="http://www.cvshome.org">CVS</a> >= 1.10.6 -\requirement Cervisia >= 2.1 (from kdesdk package included in <a href="http://www.kde.org">KDE</a> >= 3.2) +\requirement Cervisia >= 2.1 (from tdesdk package included in <a href="http://www.kde.org">KDE</a> >= 3.2) \todo Test with SSH repositories! \todo Share a common outputview between VCS: CvsProcessWidget should be reworked :-/ diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index a3988c06..18850643 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 1999, 2000 by Bernd Gehrmann * - * bernd@kdevelop.org * + * bernd@tdevelop.org * * Copyright (C) 2003 by Mario Scalas * * mario.scalas@libero.it * * * diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h index e3406340..c9146147 100644 --- a/vcs/cvsservice/commitdlg.h +++ b/vcs/cvsservice/commitdlg.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 1999, 2000 by Bernd Gehrmann * - * bernd@kdevelop.org * + * bernd@tdevelop.org * * Copyright (C) 2003 by Mario Scalas * * mario.scalas@libero.it * * * diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp index 7777760a..04a37607 100644 --- a/vcs/cvsservice/cvsdiffpage.cpp +++ b/vcs/cvsservice/cvsdiffpage.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 200?-2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h index 17444ad2..3b310faa 100644 --- a/vcs/cvsservice/cvsdiffpage.h +++ b/vcs/cvsservice/cvsdiffpage.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp index bd06767b..c9e9ab51 100644 --- a/vcs/cvsservice/cvsdir.cpp +++ b/vcs/cvsservice/cvsdir.cpp @@ -105,7 +105,7 @@ TQString CVSDir::repository() const { // The content of CVS/Repository is a single line with the path into the // repository of the modules checked out in this directory (just like - // "kdevelop/parts/cvsservice"): so we can read a single line of the file + // "tdevelop/parts/cvsservice"): so we can read a single line of the file // and we are done! TQString content; diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 86ad3cbe..df00d8a5 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 200?-2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h index 694e610c..0344d9d8 100644 --- a/vcs/cvsservice/cvslogdialog.h +++ b/vcs/cvsservice/cvslogdialog.h @@ -4,7 +4,7 @@ // Description: // // -// Author: KDevelop Authors <kdevelop-devel@kdevelop.org>, (C) 2003 +// Author: KDevelop Authors <tdevelop-devel@tdevelop.org>, (C) 2003 // // Copyright: See COPYING file that comes with this distribution // diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index f50afdc5..c9659e0c 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 200?-2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h index d7e7ede2..1e21a18a 100644 --- a/vcs/cvsservice/cvslogpage.h +++ b/vcs/cvsservice/cvslogpage.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 200?-2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/cvsoptionswidget.cpp b/vcs/cvsservice/cvsoptionswidget.cpp index 32044dd3..a376281f 100644 --- a/vcs/cvsservice/cvsoptionswidget.cpp +++ b/vcs/cvsservice/cvsoptionswidget.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by KDevelop Authors * - * kdevelop-devel@kde.org * + * tdevelop-devel@kde.org * * Copyright (C) 2003 by Mario Scalas * * mario.scalas@libero.it * * * diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h index 0384597c..6b4d94f9 100644 --- a/vcs/cvsservice/cvsoptionswidget.h +++ b/vcs/cvsservice/cvsoptionswidget.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by KDevelop Authors * - * kdevelop-devel@kde.org * + * tdevelop-devel@kde.org * * Copyright (C) 2003 by Mario Scalas * * mario.scalas@libero.it * * * diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 17eb8998..bca0d2f2 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -1,6 +1,6 @@ /************************************************************************** * Copyright (C) 1999-2001 by Bernd Gehrmann * - * bernd@kdevelop.org * + * bernd@tdevelop.org * * Copyright (C) 2003 by Mario Scalas * * mario.scalas@libero.it * * * diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index c6c4e2dd..d87e1846 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 1999-2001 by Bernd Gehrmann * - * bernd@kdevelop.org * + * bernd@tdevelop.org * * Copyright (C) 2003 by Mario Scalas * * mario.scalas@libero.it * * * diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index f038ac56..b8b1685d 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -17,7 +17,7 @@ #include <kapplication.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index 0eeba29e..ed7f3da2 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index 62f73668..ad2ec45a 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/cvsservicedcopIface.h b/vcs/cvsservice/cvsservicedcopIface.h index 2f62964b..050ad6c4 100644 --- a/vcs/cvsservice/cvsservicedcopIface.h +++ b/vcs/cvsservice/cvsservicedcopIface.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by KDevelop Authors * - * www.kdevelop.org * + * www.tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 972d90d6..b0f60a20 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2001 by Harald Fernengel * - * harry@kdevelop.org * + * harry@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index fe8c49a0..c220e4f0 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2001 by Harald Fernengel * - * harry@kdevelop.org * + * harry@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt index ff0b8ec5..cc6e59eb 100644 --- a/vcs/cvsservice/integrator/CMakeLists.txt +++ b/vcs/cvsservice/integrator/CMakeLists.txt @@ -34,6 +34,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC cvsserviceintegrator.cpp integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui LINK - kdevextras-shared kdevelop-shared cvsservice-shared + kdevextras-shared tdevelop-shared cvsservice-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/integrator/Makefile.am b/vcs/cvsservice/integrator/Makefile.am index fd1d6922..6509e9ce 100644 --- a/vcs/cvsservice/integrator/Makefile.am +++ b/vcs/cvsservice/integrator/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libcvsserviceintegrator.la libcvsserviceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libcvsserviceintegrator_la_LIBADD = \ - $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libkdevelop.la -lcvsservice + $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice noinst_HEADERS = cvsserviceintegrator.h integratordlg.h libcvsserviceintegrator_la_SOURCES = cvsserviceintegrator.cpp \ integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp index 1bbc3b11..68158ccb 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index ea45a8a2..69c5d068 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index 4f833220..961094fc 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h index 711c972f..526c9b3e 100644 --- a/vcs/cvsservice/integrator/integratordlg.h +++ b/vcs/cvsservice/integrator/integratordlg.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index f9bea3e9..dbc59f7e 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -85,7 +85,7 @@ <string>Type your release name here (leave empty for HEAD)</string> </property> <property name="whatsThis" stdset="0"> - <string>Fill the field with the release or branch name (e.g. <i>make_it_cool, kdevelop_alpha5, ...</i>)</string> + <string>Fill the field with the release or branch name (e.g. <i>make_it_cool, tdevelop_alpha5, ...</i>)</string> </property> </widget> </hbox> diff --git a/vcs/perforce/CMakeLists.txt b/vcs/perforce/CMakeLists.txt index d7b514a0..549eadb8 100644 --- a/vcs/perforce/CMakeLists.txt +++ b/vcs/perforce/CMakeLists.txt @@ -34,6 +34,6 @@ install( FILES kdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( libkdevperforce AUTOMOC SOURCES perforcepart.cpp commitdlg.cpp - LINK kdevextensions-static kdevelop-shared + LINK kdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/perforce/Makefile.am b/vcs/perforce/Makefile.am index e684e2f0..36e19325 100644 --- a/vcs/perforce/Makefile.am +++ b/vcs/perforce/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ kde_module_LTLIBRARIES = libkdevperforce.la libkdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevperforce_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la libkdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp diff --git a/vcs/perforce/README b/vcs/perforce/README index 731741e1..7df3c4b5 100644 --- a/vcs/perforce/README +++ b/vcs/perforce/README @@ -1,3 +1,3 @@ Please read the on-line, automaticaly updated KDevelop API documentation at: -http://www.kdevelop.org +http://www.tdevelop.org or read the README.dox file. diff --git a/vcs/perforce/README.dox b/vcs/perforce/README.dox index 6a0ae647..2c3fc3d8 100644 --- a/vcs/perforce/README.dox +++ b/vcs/perforce/README.dox @@ -1,10 +1,10 @@ /** \class PerforcePart Integrates the perforce version managment system into KDevelop. -\authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a> Copyright (C) 1999-2001 -\authors <a href="mailto:harry AT kdevelop.org">Harald Fernengel</a> Copyright (C) 2002-2003 +\authors <a href="mailto:bernd AT tdevelop.org">Bernd Gehrmann</a> Copyright (C) 1999-2001 +\authors <a href="mailto:harry AT tdevelop.org">Harald Fernengel</a> Copyright (C) 2002-2003 -\maintainer <a href="mailto:harry AT kdevelop.org">Harald Fernengel</a> +\maintainer <a href="mailto:harry AT tdevelop.org">Harald Fernengel</a> \feature edit, revert and submit \feature use the diff frontend (also removes the crappy perforce diff headers) diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 44ff0875..1f1f8290 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 1999, 2000 by Bernd Gehrmann * - * bernd@kdevelop.org * - * Modified for perforce 2002 by Harald Fernengel <harry@kdevelop.org> * + * bernd@tdevelop.org * + * Modified for perforce 2002 by Harald Fernengel <harry@tdevelop.org> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index a1642fd2..83766914 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 1999, 2000 by Bernd Gehrmann * - * bernd@kdevelop.org * - * Modified for perforce 2002 by Harald Fernengel <harry@kdevelop.org> * + * bernd@tdevelop.org * + * Modified for perforce 2002 by Harald Fernengel <harry@tdevelop.org> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/perforce/integrator/CMakeLists.txt b/vcs/perforce/integrator/CMakeLists.txt index cd8fd0ee..e939e3ba 100644 --- a/vcs/perforce/integrator/CMakeLists.txt +++ b/vcs/perforce/integrator/CMakeLists.txt @@ -35,6 +35,6 @@ tde_add_kpart( libperforceintegrator AUTOMOC SOURCES perforceintegrator.cpp pfintegratordlgbase.ui pfintegratordlg.cpp - LINK kdevextras-shared kdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/perforce/integrator/Makefile.am b/vcs/perforce/integrator/Makefile.am index 0df84d8e..38e80bcd 100644 --- a/vcs/perforce/integrator/Makefile.am +++ b/vcs/perforce/integrator/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libperforceintegrator.la libperforceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libperforceintegrator_la_LIBADD =\ $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ - $(top_builddir)/lib/libkdevelop.la + $(top_builddir)/lib/libtdevelop.la kde_services_DATA = kdevperforceintegrator.desktop noinst_HEADERS = perforceintegrator.h pfintegratordlg.h libperforceintegrator_la_SOURCES = perforceintegrator.cpp \ diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp index bc7c0988..b881f94b 100644 --- a/vcs/perforce/integrator/perforceintegrator.cpp +++ b/vcs/perforce/integrator/perforceintegrator.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index 875d9a73..20026d82 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/perforce/integrator/pfintegratordlg.cpp b/vcs/perforce/integrator/pfintegratordlg.cpp index 8685b2f4..3a0ab9a5 100644 --- a/vcs/perforce/integrator/pfintegratordlg.cpp +++ b/vcs/perforce/integrator/pfintegratordlg.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index d20bd74c..7cb7b946 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index dd950121..ca81a8d4 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 1999-2001 by Bernd Gehrmann * - * bernd@kdevelop.org * - * Extended 2002 by Harald Fernengel <harry@kdevelop.org> * + * bernd@tdevelop.org * + * Extended 2002 by Harald Fernengel <harry@tdevelop.org> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index f7991438..3043a1a2 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (C) 1999-2001 by Bernd Gehrmann * - * bernd@kdevelop.org * - * Extended to use perforce 2002 by Harald Fernengel <harry@kdevelop.org>* + * bernd@tdevelop.org * + * Extended to use perforce 2002 by Harald Fernengel <harry@tdevelop.org>* * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt index db26df04..294537a2 100644 --- a/vcs/subversion/CMakeLists.txt +++ b/vcs/subversion/CMakeLists.txt @@ -54,7 +54,7 @@ tde_add_kpart( libkdevsubversion AUTOMOC svn_logviewoptiondlgbase.ui svn_logviewwidget.cpp svn_mergeoptiondlgbase.ui svn_mergewidget.cpp svn_switchdlgbase.ui svn_switchwidget.cpp - LINK kdevextensions-static kdevelop-shared + LINK kdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/Makefile.am b/vcs/subversion/Makefile.am index 6437caf1..ce853943 100644 --- a/vcs/subversion/Makefile.am +++ b/vcs/subversion/Makefile.am @@ -10,7 +10,7 @@ libkdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \ svn_copywidget.cpp svn_fileselectdlg_commit.cpp svn_logviewoptiondlgbase.ui \ svn_logviewwidget.cpp svn_mergeoptiondlgbase.ui svn_mergewidget.cpp svn_switchdlgbase.ui \ svn_switchwidget.cpp -libkdevsubversion_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la libkdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) diff --git a/vcs/subversion/README.dox b/vcs/subversion/README.dox index df3badcc..d784bd30 100644 --- a/vcs/subversion/README.dox +++ b/vcs/subversion/README.dox @@ -7,7 +7,7 @@ Integrates the SVN (Subversion) version management system into KDevelop. \feature Integrates the SVN (Subversion) version management system into KDevelop. -\requirement You need to compile and install kdesdk/kioslave/svn +\requirement You need to compile and install tdesdk/kioslave/svn */ diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index be54cabb..9f604bca 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * This file is part of KDevelop * - * Copyright (C) 2007 The KDevelop Authors <kdevelop-devel@kdevelop.org> * + * Copyright (C) 2007 The KDevelop Authors <tdevelop-devel@tdevelop.org> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU Library General Public License as * diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index a0070770..1755eead 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -1,6 +1,6 @@ /*************************************************************************** * This file is part of KDevelop * - * Copyright (C) 2007 The KDevelop Authors <kdevelop-devel@kdevelop.org> * + * Copyright (C) 2007 The KDevelop Authors <tdevelop-devel@tdevelop.org> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU Library General Public License as * diff --git a/vcs/subversion/integrator/CMakeLists.txt b/vcs/subversion/integrator/CMakeLists.txt index 4d1ab517..2256b8e3 100644 --- a/vcs/subversion/integrator/CMakeLists.txt +++ b/vcs/subversion/integrator/CMakeLists.txt @@ -35,6 +35,6 @@ tde_add_kpart( libsubversionintegrator AUTOMOC SOURCES subversionintegrator.cpp svnintegratordlgbase.ui svnintegratordlg.cpp - LINK kdevextras-shared kdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/integrator/Makefile.am b/vcs/subversion/integrator/Makefile.am index a0fe82cd..231dc3c7 100644 --- a/vcs/subversion/integrator/Makefile.am +++ b/vcs/subversion/integrator/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libsubversionintegrator.la libsubversionintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libsubversionintegrator_la_LIBADD =\ $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ - $(top_builddir)/lib/libkdevelop.la + $(top_builddir)/lib/libtdevelop.la kde_services_DATA = kdevsubversionintegrator.desktop noinst_HEADERS = subversionintegrator.h svnintegratordlg.h libsubversionintegrator_la_SOURCES = subversionintegrator.cpp \ diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index 32d28d27..5972ec28 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index 1113c18e..fd6383b7 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 05572278..b197355b 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * Copyright (C) 2004 * * Mickael Marchand <marchand@kde.org> * * * @@ -29,7 +29,7 @@ #include <tqradiobutton.h> #include <kio/scheduler.h> #include <kprocess.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kmessagebox.h> #include <klocale.h> #include <kdebug.h> diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index 404ac6de..18ea8bc6 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2004 by Alexander Dymo * - * adymo@kdevelop.org * + * adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui index 1d03d651..52ce91a5 100644 --- a/vcs/subversion/integrator/svnintegratordlgbase.ui +++ b/vcs/subversion/integrator/svnintegratordlgbase.ui @@ -61,14 +61,14 @@ <string>Adds subversion menus to project. NOTE: Unless you import the project -out of kdevelop, you will not be able +out of tdevelop, you will not be able to perform any subversion operations.</string> </property> <property name="whatsThis" stdset="0"> <string>Adds subversion menus to project. NOTE: Unless you import the project -out of kdevelop, you will not be able +out of tdevelop, you will not be able to perform any subversion operations.</string> </property> </widget> |