diff options
313 files changed, 534 insertions, 542 deletions
@@ -237,7 +237,7 @@ 2004-11-22 Alexander Dymo <[email protected]> * Implemented simple VCS integrators for Clearcase, Perforce and Subversion. * Reenabled subversion support plugin. - * Imported svn kioslave from tdesdk HEAD into a compat library therefore svn + * Imported svn tdeioslave from tdesdk HEAD into a compat library therefore svn will work on KDE<3.3.90 too. 2004-11-21 Alexander Dymo <[email protected]> @@ -576,7 +576,7 @@ 2003-10-17 Dominik Haumann <[email protected]> * new Application templates in cpp: kateplugin2, noatunvisual, - noatunui, kbearimportfilter, kbearplugin, kfileplugin + noatunui, kbearimportfilter, kbearplugin, tdefileplugin * fixed 53943, 64028 * parts/appwizard: Now you can add "ShowFilesAfterGeneration=file1,file2" to the app_tamplate's information-file (example: khello/khello) so that @@ -1797,7 +1797,7 @@ * continued the import existing dialog -> ONLY adding existing files works at the moment! * add Bjrn Sahlstrm's drag 'n drop support to the FileSelector - -> see kfilednd*view.* for details + -> see tdefilednd*view.* for details * added new bullets to the make outputview * everything needs a little bit code clean-up, so don't worry :-) @@ -2706,7 +2706,7 @@ * Added cast methods to the editor interfaces, so you don't have to pass strings around any longer 2001-05-19 Bernd Gehrmann <[email protected]> - * Added kicker, kioslave and tdecmodule templates + * Added kicker, tdeioslave and tdecmodule templates * Each template can define an icon which is shown in the app wizard * The Big TDEInstance Cleanup @@ -236,7 +236,7 @@ TAGFILES = $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/dcop/dc $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/tdefx.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/tdeui.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdehtml/tdehtml.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdehtml/html/ \ - $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/kio.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/html/ \ + $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeio/tdeio.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeio/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/kjs.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/tdeparts.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/tdemdi.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/html/ \ diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index 33e432cf..a39c9c3f 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -13,7 +13,7 @@ #include <kurlrequester.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kdevcompileroptions.h" diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 96b01a51..e402d9a1 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -25,7 +25,7 @@ #include <klibloader.h> #include <kprocess.h> #include <kservice.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "domutil.h" #include "kdevcore.h" diff --git a/buildtools/autotools/CMakeLists.txt b/buildtools/autotools/CMakeLists.txt index d4e68654..f7af5bc6 100644 --- a/buildtools/autotools/CMakeLists.txt +++ b/buildtools/autotools/CMakeLists.txt @@ -50,7 +50,7 @@ tde_add_kpart( libkdevautoproject AUTOMOC addfiledlgbase.ui addfiledlg.cpp removefiledlgbase.ui removefiledlg.cpp addicondlgbase.ui addicondlg.cpp addtranslationdlg.cpp addprefixdlg.cpp - kfilednddetailview.cpp kfiledndiconview.cpp + tdefilednddetailview.cpp tdefiledndiconview.cpp fileselectorwidget.cpp misc.cpp addsubprojectdlgbase.ui removetargetdlg.cpp removetargetdlgbase.ui choosetargetdialog.cpp choosetargetdlgbase.ui diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am index 8a21dc09..76bbffec 100644 --- a/buildtools/autotools/Makefile.am +++ b/buildtools/autotools/Makefile.am @@ -20,7 +20,7 @@ libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \ addservicedlgbase.ui addapplicationdlg.cpp addapplicationdlgbase.ui addtargetdlg.cpp \ addtargetdlgbase.ui addsubprojectdlg.cpp addfiledlgbase.ui addfiledlg.cpp \ removefiledlgbase.ui removefiledlg.cpp addicondlgbase.ui addicondlg.cpp \ - addtranslationdlg.cpp addprefixdlg.cpp kfilednddetailview.cpp kfiledndiconview.cpp \ + addtranslationdlg.cpp addprefixdlg.cpp tdefilednddetailview.cpp tdefiledndiconview.cpp \ fileselectorwidget.cpp misc.cpp addsubprojectdlgbase.ui removetargetdlg.cpp \ removetargetdlgbase.ui choosetargetdialog.cpp choosetargetdlgbase.ui addexistingdlgbase.ui \ addexistingfilesdlg.cpp addexistingdirectoriesdlg.cpp kimporticonview.cpp \ diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 181f7c5b..d9168924 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -19,7 +19,7 @@ #include <kprogress.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kprocess.h> #include "autolistviewitems.h" diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index d09d53db..7b1d9c8e 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -20,7 +20,7 @@ #include "addexistingdlgbase.h" #include <tqdialog.h> -#include <kfile.h> +#include <tdefile.h> #include "misc.h" #include "fileselectorwidget.h" diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index b17eb118..0c3796d9 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -27,7 +27,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <kfileview.h> +#include <tdefileview.h> #include <kguiitem.h> #include <kprogress.h> #include <kprocess.h> diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index ea556226..2b44bba1 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -21,7 +21,7 @@ #define ADDEXISTINGFILESDLG_H #include <tqdialog.h> -#include <kfile.h> +#include <tdefile.h> #include "addexistingdlgbase.h" #include "fileselectorwidget.h" diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp index 06aab18b..f37b6626 100644 --- a/buildtools/autotools/addprefixdlg.cpp +++ b/buildtools/autotools/addprefixdlg.cpp @@ -15,7 +15,7 @@ #include <tqlayout.h> #include <tqpushbutton.h> #include <kbuttonbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kstdguiitem.h> #include <tdeversion.h> diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index ea3d2b7a..373a3861 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -18,7 +18,7 @@ #include <tqtextstream.h> #include <kbuttonbox.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klineedit.h> #include <kmessagebox.h> diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 0e665eb7..801d5234 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -32,7 +32,7 @@ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 7ffa0ef0..6ac797b9 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -33,12 +33,12 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klistview.h> #include <kmessagebox.h> #include <kregexp.h> #include <kurl.h> -#include <kfile.h> +#include <tdefile.h> #include <kxmlguiclient.h> #include <kaction.h> diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 5ff3e67e..e65d4a35 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -22,7 +22,7 @@ #include <tqvalidator.h> #include <klineedit.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klibloader.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index 2235f357..842358e4 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -27,7 +27,7 @@ #include <kurlcombobox.h> #include <kurlcompletion.h> #include <kprotocolinfo.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcombobox.h> @@ -36,17 +36,17 @@ #include "fileselectorwidget.h" #include <kdiroperator.h> #include <kcombiview.h> -#include <kfilepreview.h> -#include <kfileview.h> -#include <kfileitem.h> +#include <tdefilepreview.h> +#include <tdefileview.h> +#include <tdefileitem.h> #include <kimagefilepreview.h> #include "autoprojectwidget.h" #include "autoprojectpart.h" #include "kdevlanguagesupport.h" -#include "kfilednddetailview.h" -#include "kfiledndiconview.h" +#include "tdefilednddetailview.h" +#include "tdefiledndiconview.h" KDnDDirOperator::KDnDDirOperator ( const KURL &urlName, TQWidget* parent, const char* name ) : KDirOperator ( urlName, parent, name ) { diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index 09d589de..a9b7abd7 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -22,14 +22,14 @@ #include <klistview.h> #include <tqvbox.h> #include <tqwidget.h> -#include <kfile.h> +#include <tdefile.h> #include <kurlcombobox.h> #include <kurlcompletion.h> #include <kcombobox.h> #include <kprotocolinfo.h> -#include <kfileview.h> -#include <kfileitem.h> +#include <tdefileview.h> +#include <tdefileitem.h> #include <kdiroperator.h> diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index 430f430c..d66c74ba 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -19,7 +19,7 @@ #include <tqwidget.h> -#include "kfiledndiconview.h" +#include "tdefiledndiconview.h" class KImportIconView : public KFileDnDIconView { diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp index aabb4b5e..f25a3958 100644 --- a/buildtools/autotools/subprojectoptionsdlg.cpp +++ b/buildtools/autotools/subprojectoptionsdlg.cpp @@ -30,7 +30,7 @@ #include <kurlrequesterdlg.h> #include <kurlrequester.h> #include <kurlcompletion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "domutil.h" #include "misc.h" #include "addprefixdlg.h" diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index f462ee60..bc81ef30 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -25,7 +25,7 @@ #include <kurlcompletion.h> #include <klocale.h> #include <knotifyclient.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "autolistviewitems.h" #include "misc.h" diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/tdefilednddetailview.cpp index 405ff249..74492577 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/tdefilednddetailview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** -* kfilednddetailview.cpp - description +* tdefilednddetailview.cpp - description * ------------------- * begin : Wed Nov 1 2000 * copyright : (C) 2000 by Bj�n Sahlstr� @@ -21,12 +21,12 @@ #include <tqapplication.h> ////////////////////////////////////////////////////// // KDE specific includes -#include <kfileitem.h> +#include <tdefileitem.h> #include <kiconloader.h> #include <kdebug.h> ////////////////////////////////////////////////////// // Application specific includes -#include "kfilednddetailview.h" +#include "tdefilednddetailview.h" #ifndef AUTO_OPEN_TIME #define AUTO_OPEN_TIME @@ -208,5 +208,5 @@ void KFileDnDDetailView::setDnDEnabled( bool useDnD ){ } //----------------------------------------------- #ifndef NO_INCLUDE_MOCFILES -#include "kfilednddetailview.moc" +#include "tdefilednddetailview.moc" #endif diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/tdefilednddetailview.h index a6dd87c0..95f7d663 100644 --- a/buildtools/autotools/kfilednddetailview.h +++ b/buildtools/autotools/tdefilednddetailview.h @@ -1,5 +1,5 @@ /*************************************************************************** -* kfilednddetailview.h - description +* tdefilednddetailview.h - description * ------------------- * begin : Wed Nov 1 2000 * copyright : (C) 2000 by Bj�rn Sahlstr�m @@ -24,7 +24,7 @@ #include <tqtimer.h> ////////////////////////////////////////////////////////////////////// // KDE specific include files -#include <kfiledetailview.h> +#include <tdefiledetailview.h> #include <kurldrag.h> diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/tdefiledndiconview.cpp index e7b727e5..d192b3b0 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/tdefiledndiconview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** -* kfiledndiconview.cpp - description +* tdefiledndiconview.cpp - description * ------------------- * begin : Wed Nov 1 2000 * copyright : (C) 2000 by Bj�rn Sahlstr�m @@ -21,12 +21,12 @@ #include <tqapplication.h> ////////////////////////////////////////////////////// // KDE specific includes -#include <kfileitem.h> +#include <tdefileitem.h> #include <kiconloader.h> #include <kdebug.h> ////////////////////////////////////////////////////// // Application specific includes -#include "kfiledndiconview.h" +#include "tdefiledndiconview.h" #ifndef AUTO_OPEN_TIME #define AUTO_OPEN_TIME @@ -190,5 +190,5 @@ bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const { } //----------------------------------------------- #ifndef NO_INCLUDE_MOCFILES -#include "kfiledndiconview.moc" +#include "tdefiledndiconview.moc" #endif diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/tdefiledndiconview.h index 0e45d174..84148362 100644 --- a/buildtools/autotools/kfiledndiconview.h +++ b/buildtools/autotools/tdefiledndiconview.h @@ -1,5 +1,5 @@ /************************************************************************** -* kfiledndiconview.h - description +* tdefiledndiconview.h - description * ------------------- * begin : Wed Nov 1 2000 * copyright : (C) 2000 by Bj�rn Sahlstr�m @@ -20,7 +20,7 @@ #include <tqwidget.h> #include <tqtimer.h> -#include <kfileiconview.h> +#include <tdefileiconview.h> #include <kurldrag.h> /** diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 920a0908..31f3161f 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -15,7 +15,7 @@ #include <klineedit.h> #include <kurlrequester.h> #include <kurlcompletion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqradiobutton.h> #include <tqtabwidget.h> #include "domutil.h" diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 7062ab18..6c09541b 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -20,7 +20,7 @@ #include <ktextedit.h> #include <kurlrequester.h> #include <kurlcompletion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <keditlistbox.h> #include <klocale.h> #include <kdebug.h> diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index b39dc00f..6e5bc476 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -27,7 +27,7 @@ #include <tqdom.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> #include <keditlistbox.h> diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp index a9620598..c31a5574 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp @@ -25,7 +25,7 @@ #include <stdio.h> #include <tqvaluestack.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> extern FILE *yyin, *yyout; extern int yyparse(); diff --git a/buildtools/lib/parsers/qmake/CMakeLists.txt b/buildtools/lib/parsers/qmake/CMakeLists.txt index 73296c7b..b8328a84 100644 --- a/buildtools/lib/parsers/qmake/CMakeLists.txt +++ b/buildtools/lib/parsers/qmake/CMakeLists.txt @@ -34,6 +34,6 @@ tde_add_library( kdevqmakeparser SHARED qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp qmakeastvisitor.cpp qmakedriver.cpp VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index e5a8f994..8b73814d 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -21,7 +21,7 @@ #include "qmakeast.h" #include <tqvaluestack.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <iostream> #include <fstream> diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index edc5c7be..8a7ed5c9 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -20,7 +20,7 @@ #define ADDFILESDIALOG_H #include <tdeversion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> class TQComboBox; diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 0985e037..079f436e 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -20,7 +20,7 @@ #include "runoptionswidget.h" #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlrequester.h> #include <kurlcompletion.h> #include <klineedit.h> diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index 62facc8d..cf9e42cf 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -15,7 +15,7 @@ #include <kurlrequester.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kdevcompileroptions.h" diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index a2cb5723..4dd34709 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -27,7 +27,7 @@ #include <kmessagebox.h> #include <klibloader.h> #include <kservice.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kprocess.h> diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index 4f65dd17..267bd471 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -14,11 +14,11 @@ #include <klineedit.h> #include <kurlrequester.h> #include <tqcheckbox.h> -#include <kfile.h> +#include <tdefile.h> #include <kcombobox.h> #include <kmessagebox.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlcompletion.h> #include "urlutil.h" diff --git a/buildtools/qmake/newwidgetdlg.cpp b/buildtools/qmake/newwidgetdlg.cpp index ab3e72f7..99d39a93 100644 --- a/buildtools/qmake/newwidgetdlg.cpp +++ b/buildtools/qmake/newwidgetdlg.cpp @@ -14,7 +14,7 @@ #include <tqstringlist.h> #include <tqcheckbox.h> #include <tqmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <kpushbutton.h> #include <domutil.h> diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index e5e80b2e..8f4ffc70 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -20,7 +20,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <knotifyclient.h> #include <klineedit.h> #include <kinputdialog.h> diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 58c4ba22..69c030b7 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -31,12 +31,12 @@ #include <kaction.h> #include <tdeparts/part.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kurlrequesterdlg.h> #include <kurlrequester.h> #include <kurlcompletion.h> -#include <kfile.h> +#include <tdefile.h> #include <makeoptionswidget.h> diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 5b1f528b..77301f95 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -39,7 +39,7 @@ #include <tqinputdialog.h> #include <tqwhatsthis.h> #include <tqvaluestack.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqtooltip.h> #include <kdebug.h> #include <klistview.h> @@ -57,7 +57,7 @@ #include <kdirwatch.h> #include <kurlrequesterdlg.h> #include <kurlrequester.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurlcompletion.h> #include "kdevcore.h" diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index a73c681a..374e0e37 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -531,7 +531,7 @@ the tdecore library, containing all classes that are non-visible elements to pro the tdeui library, containing user interface elements like menubars, toolbars, etc. </para></listitem> <listitem><para> -the kfile library, containing the file selection dialogs +the tdefile library, containing the file selection dialogs </para></listitem> </itemizedlist> </para> diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 7bccb9fa..6e4cc884 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -71,7 +71,7 @@ respecting user preferences. </varlistentry> <varlistentry> -<term><ulink url="kdeapi:kio/index.html">kio</ulink></term> +<term><ulink url="kdeapi:tdeio/index.html">kio</ulink></term> <listitem><para> The <literal>kio</literal> library contains facilities for asynchronous, network transparent I/O and access to mimetype handling. It also provides the @@ -381,13 +381,13 @@ Generic auto-completion of strings. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kio/KURLCompletion">KURLCompletion</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeio/KURLCompletion">KURLCompletion</ulink></title> <para> Auto-completion of URLs. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kio/KShellCompletion">KShellCompletion</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeio/KShellCompletion">KShellCompletion</ulink></title> <para> Auto-completion of executables. </para> @@ -455,7 +455,7 @@ A combo box for selecting file names and URLs. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kfile/KURLRequester">KURLRequester</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdefile/KURLRequester">KURLRequester</ulink></title> <para> A line edit for selecting file names and URLs. </para> @@ -494,7 +494,7 @@ Dialogs - full-featured dialogs for file, color and font selection. <itemizedlist> -<listitem><formalpara><title><ulink url="kdeapi:kfile/KFileDialog">KFileDialog</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdefile/KFileDialog">KFileDialog</ulink></title> <para> A file selection dialog. </para> @@ -512,7 +512,7 @@ A font selection dialog. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kfile/KIconDialog">KIconDialog</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdefile/KIconDialog">KIconDialog</ulink></title> <para> An icon selection dialog. </para> @@ -548,7 +548,7 @@ A simple dialog for entering text. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kfile/KURLRequesterDlg">KURLRequesterDlg</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdefile/KURLRequesterDlg">KURLRequesterDlg</ulink></title> <para> A simple dialog for entering URLs. </para> @@ -624,31 +624,31 @@ Object factory in plugins. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kio/KServiceType">KServiceType</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeio/KServiceType">KServiceType</ulink></title> <para> Represents a service type. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kio/KService">KService</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeio/KService">KService</ulink></title> <para> Represents a service. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kio/KMimeType">KMimeType</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeio/KMimeType">KMimeType</ulink></title> <para> Represents a MIME type. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kio/KServiceTypeProfile">KServiceTypeProfile</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeio/KServiceTypeProfile">KServiceTypeProfile</ulink></title> <para> User preferences for MIME type mappings. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:kio/KServiceTypeProfile">KTrader</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeio/KServiceTypeProfile">KTrader</ulink></title> <para> Querying for services. </para> @@ -2019,7 +2019,7 @@ objects or in most cases the generic <para> In order to use a shared library service in an application, you need to obtain a -<ulink url="kdeapi:kio/KService.html">KService</ulink> object +<ulink url="kdeapi:tdeio/KService.html">KService</ulink> object representing it. This is discussed in the <ulink url="mime.html">section about MIME types</ulink> (and in a section about the trader to be written :-) @@ -2073,7 +2073,7 @@ A DCOP service is usually implemented as a program that is started up when it is needed. It then goes into a loop and listens for DCOP connections. The program may be an interactive one, but it may also run completely or for a part of its lifetime as a daemon in the background without the user noticing it. An example -for such a daemon is <literal>kio_uiserver</literal>, which implements user interaction +for such a daemon is <literal>tdeio_uiserver</literal>, which implements user interaction such as progress dialog for the KIO library. The advantage of such a centralized daemon in this context is that e.g. the download progress for several different files can be shown in one window, even if those downloads were initiated from @@ -2115,14 +2115,14 @@ on the user's settings, the cursor will be changed. </para> <para> -Here is the definition of <literal>kio_uiserver</literal>: +Here is the definition of <literal>tdeio_uiserver</literal>: </para> <programlisting> [Desktop Entry] Type=Service -Name=kio_uiserver -Exec=kio_uiserver +Name=tdeio_uiserver +Exec=tdeio_uiserver X-DCOP-ServiceType=Unique X-TDE-StartupNotify=false </programlisting> @@ -2141,9 +2141,9 @@ class: <programlisting> DCOPClient *client = kapp->dcopClient(); client->attach(); -if (!client->isApplicationRegistered("kio_uiserver")) { +if (!client->isApplicationRegistered("tdeio_uiserver")) { QString error; - if (TDEApplication::startServiceByName("kio_uiserver", QStringList(), &error)) + if (TDEApplication::startServiceByName("tdeio_uiserver", QStringList(), &error)) cout << "Starting kioserver failed with message " << error << endl; } ... @@ -2151,9 +2151,9 @@ QByteArray data, replyData; QCString replyType; QDataStream arg(data, IO_WriteOnly); arg << true; -if (!client->call("kio_uiserver", "UIServer", "setListMode(bool)", +if (!client->call("tdeio_uiserver", "UIServer", "setListMode(bool)", data, replyType, replyData)) - cout << "Call to kio_uiserver failed" << endl; + cout << "Call to tdeio_uiserver failed" << endl; ... </programlisting> @@ -2170,7 +2170,7 @@ the name is appearing in the <literal>Name</literal> line of the desktop file. An alternative is to use <function>TDEApplication::startServiceByDesktopName()</function>, which takes the file name of its desktop file as argument, i.e. in this case -<literal>"kio_uiserver.desktop"</literal>. +<literal>"tdeio_uiserver.desktop"</literal>. </para> <para> @@ -2297,7 +2297,7 @@ an icon <filename>fooicon.png</filename>, which represents the file e.g. in <para> In the KDE libraries, such a type definition is mapped to an instance of the -class <ulink url="kdeapi:kio/KMimeType.html">KMimeType</ulink>. +class <ulink url="kdeapi:tdeio/KMimeType.html">KMimeType</ulink>. Use this like in the following example: </para> @@ -2350,7 +2350,7 @@ forget about them.) You may want to find out a MIME from the contents of file instead of the file name. This is more reliable, but also slower, as it requires reading a part of the file. This is done with the -<ulink url="kdeapi:kio/KMimeMagic.html">KMimeMagic</ulink> +<ulink url="kdeapi:tdeio/KMimeMagic.html">KMimeMagic</ulink> class, which has different error handling: </para> @@ -2481,12 +2481,12 @@ else <para> For even more complex queries, there is a full-blown CORBA-like -<ulink url="kdeapi:kio/KTrader.html">trader</ulink>. +<ulink url="kdeapi:tdeio/KTrader.html">trader</ulink>. </para> <para> In order to run an application service with some URLs, use -<ulink url="kdeapi:kio/KRun.html">KRun</ulink>: +<ulink url="kdeapi:tdeio/KRun.html">KRun</ulink>: </para> <programlisting> @@ -2602,7 +2602,7 @@ deletes itself. Thus, a typical use case will look like this: <programlisting> void FooClass::makeDirectory() { - SimpleJob *job = TDEIO::mkdir(KURL("file:/home/bernd/kiodir")); + SimpleJob *job = TDEIO::mkdir(KURL("file:/home/bernd/tdeiodir")); connect( job, SIGNAL(result(TDEIO::Job*)), this, SLOT(mkdirResult(TDEIO::Job*)) ); } diff --git a/doc/tdevelop/tdevelop-install.docbook b/doc/tdevelop/tdevelop-install.docbook index 5e07b0b6..14f7236b 100644 --- a/doc/tdevelop/tdevelop-install.docbook +++ b/doc/tdevelop/tdevelop-install.docbook @@ -608,7 +608,7 @@ That's all. If you installed &tdevelop; in the default &kde; directory you may n <indexterm zone="compile-and-install-options-dir"> <primary>TDEDIRS</primary></indexterm> <indexterm zone="compile-and-install-options-dir"> - <primary>kbuildsycoca</primary></indexterm> + <primary>tdebuildsycoca</primary></indexterm> <para> By default <command>configure</command> prepares the IDE to be installed in the default &kde; directory. This is necessary because &tdevelop; assumes direct access to some tools and parts which reside there. If want to use your own installation directory, you must tell <command>configure</command> this by the <option>--prefix</option> option: @@ -635,7 +635,7 @@ Call up a shell and have the following commands executed before you start &tdeve </member> <member> <prompt>~> </prompt> - <userinput>kbuildsycoca</userinput> + <userinput>tdebuildsycoca</userinput> </member> <member> (Now start &tdevelop;:) @@ -661,14 +661,14 @@ In a tcsh shell you must set the environment variables using: <userinput>setenv TDEDIRS /usr/local/kde:/opt/trinity</userinput> </member></simplelist></informalexample> <para> -The <command>kbuildsycoca</command> command (<quote>build system control cache</quote>) looks around for libraries and caches their location and version, so that &tdevelop; can find them. The caveat is that it takes noticeable time—and it has to be run any time you call up the shell to start &tdevelop; from a non-default directory. You may want to put the above commands into a shell script to reduce the typing effort. +The <command>tdebuildsycoca</command> command (<quote>build system control cache</quote>) looks around for libraries and caches their location and version, so that &tdevelop; can find them. The caveat is that it takes noticeable time—and it has to be run any time you call up the shell to start &tdevelop; from a non-default directory. You may want to put the above commands into a shell script to reduce the typing effort. </para> <para> -(You could as well put the lines in your <filename>.bashrc</filename> or <filename>.cshrc</filename> file, but this is not advisable as <command>kbuildsycoca</command> will then be run any time you call up the shell.) +(You could as well put the lines in your <filename>.bashrc</filename> or <filename>.cshrc</filename> file, but this is not advisable as <command>tdebuildsycoca</command> will then be run any time you call up the shell.) </para> <note><para> -The <command>kbuildsycoca</command> command does not run from within the root. You must call it from a non-root user. (But is <emphasis>not a very good idea</emphasis> after all to do software development from within the root!) +The <command>tdebuildsycoca</command> command does not run from within the root. You must call it from a non-root user. (But is <emphasis>not a very good idea</emphasis> after all to do software development from within the root!) </para></note> </sect3> <!-- compile-and-install-options-dir --> diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp index fc3a041a..012d1a15 100644 --- a/editors/editor-chooser/editorchooser_widget.cpp +++ b/editors/editor-chooser/editorchooser_widget.cpp @@ -6,7 +6,7 @@ #include <tdeversion.h> #include <kservice.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "editorchooser_widget.h" diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp index 7f95a901..d790e3cd 100644 --- a/embedded/visualboyadvance/vbaconfigwidget.cpp +++ b/embedded/visualboyadvance/vbaconfigwidget.cpp @@ -23,7 +23,7 @@ #include <tqradiobutton.h> #include <tqtoolbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "domutil.h" diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt index 298fb20d..c0370f26 100644 --- a/kdevdesigner/designer/CMakeLists.txt +++ b/kdevdesigner/designer/CMakeLists.txt @@ -102,6 +102,6 @@ tde_add_kpart( libkdevdesignerpart AUTOMOC SOURCES ${SRCS} LINK kdevqui-static shared-static kinterfacedesigner-shared - kio-shared tdeparts-shared qassistantclient + tdeio-shared tdeparts-shared qassistantclient DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index 5759de20..f923f604 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -33,7 +33,7 @@ #include "widgetfactory.h" #include "widgetdatabase.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <tqlistbox.h> diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp index 9c2bb751..0f4c426e 100644 --- a/kdevdesigner/designer/filechooser.cpp +++ b/kdevdesigner/designer/filechooser.cpp @@ -30,7 +30,7 @@ #include <tqfiledialog.h> #include <tqlayout.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> FileChooser::FileChooser( TQWidget *parent, const char *name ) : TQWidget( parent, name ), md( File ) diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index 4c60eaab..c893b42f 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -43,7 +43,7 @@ #include "designerappiface.h" #include <tqapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include "kdevdesigner_part.h" diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 798b8b6c..2e84b2ad 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -24,7 +24,7 @@ #include <kaction.h> #include <kactionclasses.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <klocale.h> #include <kiconloader.h> diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index 0aa0275e..17583ecf 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -27,7 +27,7 @@ #include "mainwindow.h" #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <klineedit.h> diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index a050f4da..92d68ac1 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -28,7 +28,7 @@ #include <kiconloader.h> #include <kimageio.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimagefilepreview.h> #include <klineedit.h> diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp index 5cea9192..ca6c34ea 100644 --- a/kdevdesigner/designer/projectsettingsimpl.cpp +++ b/kdevdesigner/designer/projectsettingsimpl.cpp @@ -34,7 +34,7 @@ #include "sourcefile.h" #include "workspace.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <klineedit.h> diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 4f1e9a37..02b50684 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -82,7 +82,7 @@ #include <tqucom_p.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include "kdevdesigner_part.h" diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp index b0061f24..9713fed9 100644 --- a/kdevdesigner/designer/sourcefile.cpp +++ b/kdevdesigner/designer/sourcefile.cpp @@ -37,7 +37,7 @@ #include "workspace.h" #include <stdlib.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> SourceFile::SourceFile( const TQString &fn, bool temp, Project *p ) diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index 6d1d5270..e184fe01 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -22,8 +22,8 @@ #include <kxmlguiclient.h> #include <kkeydialog.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kdebug.h> diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h index 9c586fa4..546c160f 100644 --- a/languages/ada/configproblemreporter.ui.h +++ b/languages/ada/configproblemreporter.ui.h @@ -6,7 +6,7 @@ ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> void ConfigureProblemReporter::init() diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index cf816ca1..5e672c41 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -41,7 +41,7 @@ #include <kapplication.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtimer.h> #include <tqregexp.h> diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 885aad6d..78c9dc84 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -27,7 +27,7 @@ #include <codemodel.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeparts/part.h> #include <tdetexteditor/editinterface.h> #include <klineedit.h> diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index ae4b5a61..3faf0e97 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -28,7 +28,7 @@ #include <kdevcreatefile.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeparts/part.h> #include <tdetexteditor/editinterface.h> #include <kdebug.h> diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt index 94a914ac..52229fc6 100644 --- a/languages/cpp/app_templates/CMakeLists.txt +++ b/languages/cpp/app_templates/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory( kpartapp ) add_subdirectory( kpartplugin ) add_subdirectory( tdecmodule ) add_subdirectory( kicker ) -add_subdirectory( kioslave ) +add_subdirectory( tdeioslave ) add_subdirectory( kdevpart ) add_subdirectory( kdevpart2 ) add_subdirectory( chello ) @@ -35,12 +35,12 @@ add_subdirectory( qtopiaapp ) add_subdirectory( kdedcop ) add_subdirectory( wxhello ) add_subdirectory( cppsdlhello ) -add_subdirectory( kconfig35 ) +add_subdirectory( tdeconfig35 ) add_subdirectory( kdevlang ) add_subdirectory( noatunvisual ) add_subdirectory( noatunui ) add_subdirectory( kmod ) -add_subdirectory( kfileplugin ) +add_subdirectory( tdefileplugin ) add_subdirectory( clanlib ) add_subdirectory( opieapp ) add_subdirectory( opieapplet ) diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am index 09e63e1a..8350118d 100644 --- a/languages/cpp/app_templates/Makefile.am +++ b/languages/cpp/app_templates/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker kioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app +SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE profilesc_DATA = c.appwizard diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop index ab65a7a0..59569583 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop +++ b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> <keyword>Qt</keyword> <keyword>TDE</keyword> - <keyword>kioslave</keyword> + <keyword>tdeioslave</keyword> </keywords> </general> <kdevcppsupport> diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README index 1ddb40a1..7720e6b4 100644 --- a/languages/cpp/app_templates/kapp/README +++ b/languages/cpp/app_templates/kapp/README @@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html them more maintainable. For more details, consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index cc77371d..cefcc605 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -14,9 +14,9 @@ #include <tdeversion.h> #include <kstatusbar.h> #include <kaccel.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdeio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kurldrag.h> #include <kurlrequesterdlg.h> diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index c74deda0..008db5a8 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -5,7 +5,7 @@ #include <kaction.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index d2e09025..5320898d 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -7,7 +7,7 @@ #include <TQtGui/TQDropEvent> #include <TQtGui/TQPainter> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kstatusbar.h> #include <kaction.h> diff --git a/languages/cpp/app_templates/kde4app/settings.kcfgc b/languages/cpp/app_templates/kde4app/settings.kcfgc index 384510cd..402fad09 100644 --- a/languages/cpp/app_templates/kde4app/settings.kcfgc +++ b/languages/cpp/app_templates/kde4app/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=%{APPNAMELC}.kcfg ClassName=Settings Singleton=true diff --git a/languages/cpp/app_templates/kdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard index 1823e891..14bcbeaa 100644 --- a/languages/cpp/app_templates/kdecpp.appwizard +++ b/languages/cpp/app_templates/kdecpp.appwizard @@ -1,2 +1,2 @@ [General] -List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi +List=kdedcop,tdeioslave,kxt,kdevlang,kmake,kapp,tdeconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am deleted file mode 100644 index 6d6bb859..00000000 --- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for folder file meta info plugin - -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_%{APPNAMELC}.h - -kde_module_LTLIBRARIES = kfile_%{APPNAMELC}.la - -kfile_%{APPNAMELC}_la_SOURCES = kfile_%{APPNAMELC}.cpp -kfile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO) -kfile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files ((moc)) -METASOURCES = AUTO - -services_DATA = kfile_%{APPNAMELC}.desktop -servicesdir = $(kde_servicesdir) - -messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kfile_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index 8db1939e..78558f78 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -3,7 +3,7 @@ #include <tqlcdnumber.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kmessagebox.h> diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index ba7157a3..7d272743 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -9,7 +9,7 @@ #include <kpanelapplet.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> class %{APPNAME} : public KPanelApplet diff --git a/languages/cpp/app_templates/kioslave/slave.protocol b/languages/cpp/app_templates/kioslave/slave.protocol deleted file mode 100644 index 2e2cc076..00000000 --- a/languages/cpp/app_templates/kioslave/slave.protocol +++ /dev/null @@ -1,39 +0,0 @@ -[Protocol] -exec=kio_%{APPNAMELC} -protocol=%{APPNAMELC} -input=none -output=stream -reading=true -defaultMimetype=text/plain -Icon=remote -Description=A kioslave for %{APPNAMELC} -Description[br]=Ur c'hioslave evit %{APPNAMELC} -Description[ca]=Un kioslave per a %{APPNAMELC} -Description[da]=En kioslave til %{APPNAMELC} -Description[de]=Ein Ein-/Ausgabemodul für %{APPNAMELC} -Description[el]=Ένα υπηρέτης kio για %{APPNAMELC} -Description[es]=Un kioslave para %{APPNAMELC} -Description[et]=%{APPNAMELC} IO-moodul -Description[eu]=kioslave bat honentzat: %{APPNAMELC} -Description[fa]=یک kioslave برای %{APPNAMELC} -Description[fr]=Un esclave d'E/S (kioslave) pour %{APPNAMELC} -Description[ga]=kioslave le haghaidh %{APPNAMELC} -Description[gl]=Un kioslave para %{APPNAMELC} -Description[hu]=%{APPNAMELC}-támogató KIOslave -Description[it]=Un kioslave per %{APPNAMELC} -Description[ja]=%{APPNAMELC} のための kioslave -Description[nds]=En In-/Utgaavmoduul för %{APPNAMELC} -Description[ne]= %{APPNAMELC} का लागि किवस्लेभ -Description[nl]=Kioslave voor %{APPNAMELC} -Description[pl]=kioslave dla %{APPNAMELC} -Description[pt]=Um 'kioslave' para %{APPNAMELC} -Description[pt_BR]=Um kioslave para %{APPNAMELC} -Description[ru]=Канал kioslave для %{APPNAMELC} -Description[sk]=kioslave pre %{APPNAMELC} -Description[sl]=kioslave za %{APPNAMELC} -Description[sr]=KIOSlave за %{APPNAMELC} -Description[sr@Latn]=KIOSlave za %{APPNAMELC} -Description[sv]=En I/O-slav för %{APPNAMELC} -Description[tr]=%{APPNAMELC} için bir kioslave -Description[zh_CN]=%{APPNAMELC} 的 kioslave -Description[zh_TW]=%{APPNAMELC} 的 kioslave diff --git a/languages/cpp/app_templates/kofficepart/kopart.tdevelop b/languages/cpp/app_templates/kofficepart/kopart.tdevelop index e3b6cc3f..194157d7 100644 --- a/languages/cpp/app_templates/kofficepart/kopart.tdevelop +++ b/languages/cpp/app_templates/kofficepart/kopart.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> <keyword>Qt</keyword> <keyword>TDE</keyword> - <keyword>kioslave</keyword> + <keyword>tdeioslave</keyword> </keywords> </general> <kdevcppsupport> diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index c54c096a..527be77e 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -8,7 +8,7 @@ #include <konqsidebarplugin.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> class %{APPNAME} : public KonqSidebarPlugin diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index c5d30f14..7e7dc64d 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -2,8 +2,8 @@ #include "%{APPNAMELC}.h" #include <kkeydialog.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kedittoolbar.h> diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index e46d21ca..518d4514 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -4,7 +4,7 @@ #include <kinstance.h> #include <kaction.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <klocale.h> diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README index e7aa2647..10859289 100644 --- a/languages/cpp/app_templates/kscons_kxt/README +++ b/languages/cpp/app_templates/kscons_kxt/README @@ -76,7 +76,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0 into #MIN_CONFIG(3.2.0) Take an example on the many apps found in the tdegames source package and consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index bbf648ea..2895fb0a 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -9,7 +9,7 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kglobal.h> #include <klocale.h> #include <kiconloader.h> diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh index a0ce678a..5c497f99 100755 --- a/languages/cpp/app_templates/kscons_kxt/messages.sh +++ b/languages/cpp/app_templates/kscons_kxt/messages.sh @@ -14,7 +14,7 @@ # for yourself and help me to improve this script, thanks # (tnagyemail-mail tat yahoo d0tt fr) -SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code +SRCDIR=../test1-tdeconfigxt # srcdir is the directory containing the source code TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips TDEDIR=`tde-config --prefix` diff --git a/languages/cpp/app_templates/kscons_kxt/settings.kcfgc b/languages/cpp/app_templates/kscons_kxt/settings.kcfgc index 384510cd..402fad09 100644 --- a/languages/cpp/app_templates/kscons_kxt/settings.kcfgc +++ b/languages/cpp/app_templates/kscons_kxt/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=%{APPNAMELC}.kcfg ClassName=Settings Singleton=true diff --git a/languages/cpp/app_templates/kscons_tdemdi/README b/languages/cpp/app_templates/kscons_tdemdi/README index e7aa2647..10859289 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/README +++ b/languages/cpp/app_templates/kscons_tdemdi/README @@ -76,7 +76,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0 into #MIN_CONFIG(3.2.0) Take an example on the many apps found in the tdegames source package and consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index 2bdb725d..5ea5d069 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -6,7 +6,7 @@ #include <kinstance.h> #include <kaction.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <klocale.h> diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp index 0ef16672..7ea17587 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp @@ -13,15 +13,15 @@ #include <tdeparts/part.h> #include <tdeparts/partmanager.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <kurldrag.h> #include <kurlrequesterdlg.h> -#include <kconfig.h> -#include <kconfigdialog.h> +#include <tdeconfig.h> +#include <tdeconfigdialog.h> #include <klibloader.h> #include <kaboutdata.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kactionclasses.h> #include <kglobal.h> #include <klocale.h> diff --git a/languages/cpp/app_templates/kscons_tdemdi/messages.sh b/languages/cpp/app_templates/kscons_tdemdi/messages.sh index a0ce678a..5c497f99 100755 --- a/languages/cpp/app_templates/kscons_tdemdi/messages.sh +++ b/languages/cpp/app_templates/kscons_tdemdi/messages.sh @@ -14,7 +14,7 @@ # for yourself and help me to improve this script, thanks # (tnagyemail-mail tat yahoo d0tt fr) -SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code +SRCDIR=../test1-tdeconfigxt # srcdir is the directory containing the source code TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips TDEDIR=`tde-config --prefix` diff --git a/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc index 384510cd..402fad09 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc +++ b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=%{APPNAMELC}.kcfg ClassName=Settings Singleton=true diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README index a24ad60a..d8bc639b 100644 --- a/languages/cpp/app_templates/kxt/README +++ b/languages/cpp/app_templates/kxt/README @@ -51,7 +51,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0 into #MIN_CONFIG(3.2.0) Take an example on the many apps found in the tdegames source package and consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index ef50718c..6f3e19fb 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -9,7 +9,7 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kglobal.h> #include <klocale.h> #include <kiconloader.h> diff --git a/languages/cpp/app_templates/kxt/settings.kcfgc b/languages/cpp/app_templates/kxt/settings.kcfgc index 384510cd..402fad09 100644 --- a/languages/cpp/app_templates/kxt/settings.kcfgc +++ b/languages/cpp/app_templates/kxt/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=%{APPNAMELC}.kcfg ClassName=Settings Singleton=true diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 8608ba88..849f332a 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -22,8 +22,8 @@ #include <klocale.h> #include <kiconloader.h> #include <kurldrag.h> -//#include <kfiledialog.h> -//#include <kconfig.h> +//#include <tdefiledialog.h> +//#include <tdeconfig.h> %{APPNAME}UI::%{APPNAME}UI() : TQWidget(0,"%{APPNAME}UI"), UserInterface() { diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro index f4111696..541721e6 100644 --- a/languages/cpp/app_templates/opieapp/app.pro +++ b/languages/cpp/app_templates/opieapp/app.pro @@ -13,7 +13,7 @@ contains( TEMPLATE, quick-template ){ contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) - system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) + system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET) DEFINES += OPIE_APP_INTERFACE TEMPLATE = lib CONFIG += dll diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro index e1cc1e3b..7794dfc4 100644 --- a/languages/cpp/app_templates/opieapplet/app.pro +++ b/languages/cpp/app_templates/opieapplet/app.pro @@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){ contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) - system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) + system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET) DEFINES += OPIE_APP_INTERFACE TEMPLATE = lib CONFIG += dll diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro index 1711c78f..4419e74e 100644 --- a/languages/cpp/app_templates/opieinput/app.pro +++ b/languages/cpp/app_templates/opieinput/app.pro @@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){ contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) - system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) + system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET) DEFINES += OPIE_APP_INTERFACE TEMPLATE = lib CONFIG += dll diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro index 71bc208c..9488b244 100644 --- a/languages/cpp/app_templates/opiemenu/app.pro +++ b/languages/cpp/app_templates/opiemenu/app.pro @@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){ contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) - system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) + system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET) DEFINES += OPIE_APP_INTERFACE TEMPLATE = lib CONFIG += dll diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro index 53fb6eea..30b811fe 100644 --- a/languages/cpp/app_templates/opienet/app.pro +++ b/languages/cpp/app_templates/opienet/app.pro @@ -11,7 +11,7 @@ contains( TEMPLATE, quick-template ){ contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) - system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) + system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET) DEFINES += OPIE_APP_INTERFACE TEMPLATE = lib CONFIG += dll diff --git a/languages/cpp/app_templates/opienet/opienet.kdevtemplate b/languages/cpp/app_templates/opienet/opienet.kdevtemplate index 23223d28..c5b22cd4 100644 --- a/languages/cpp/app_templates/opienet/opienet.kdevtemplate +++ b/languages/cpp/app_templates/opienet/opienet.kdevtemplate @@ -48,7 +48,7 @@ Comment[it]=Genera un plugin di configurazione di rete Opie. Comment[ja]=Opie ネットワーク設定プラグインを作成 Comment[nds]=Stellt en Moduul för Opie-Nettwarkinstellen op. Comment[ne]=ओपिइ सञ्जाल कन्फिग प्लगइन उत्पन्न गर्नुहोस् -Comment[nl]=Genereert een Opie netwerkconfiguratieplugin. +Comment[nl]=Genereert een Opie netwertdeconfiguratieplugin. Comment[pl]=Generuje wtyczkę do ustawień sieciowych Opie Comment[pt]=Gera um 'plugin' de configuração da rede do Opie. Comment[pt_BR]=Gera um 'plugin' de configuração da rede do Opie. @@ -127,7 +127,7 @@ Comment[it]=È stato creato un plugin per le impostazioni di rete di Opie in %{d Comment[ja]=Opie ネットワーク設定プラグインを %{dest} に作成しました Comment[nds]=In %{dest} wöör en Nettwarkinstellenmoduul för Opie opstellt Comment[ne]=ओपिइ सञ्जाल सेटिङ प्लगइन %{dest} मा सिर्जना गरियो -Comment[nl]=Een Opie netwerkconfiguratieplugin is aangemaakt in %{dest} +Comment[nl]=Een Opie netwertdeconfiguratieplugin is aangemaakt in %{dest} Comment[pl]=Wtyczka ustawień sieciowych Opie została utworzona w %{dest} Comment[pt]=Foi criado um 'plugin' de configuração da rede do Opie em %{dest} Comment[pt_BR]=Foi criado um 'plugin' de configuração da rede do Opie em %{dest} diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro index 152dc6f6..c8009e24 100644 --- a/languages/cpp/app_templates/opietoday/app.pro +++ b/languages/cpp/app_templates/opietoday/app.pro @@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){ contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) - system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) + system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET) DEFINES += OPIE_APP_INTERFACE TEMPLATE = lib CONFIG += dll diff --git a/languages/cpp/app_templates/tdecmodule/module.desktop b/languages/cpp/app_templates/tdecmodule/module.desktop index 3a316965..447e8df1 100644 --- a/languages/cpp/app_templates/tdecmodule/module.desktop +++ b/languages/cpp/app_templates/tdecmodule/module.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell %{APPNAMELC} +Exec=tdecmshell %{APPNAMELC} Icon=misc Type=Application diff --git a/languages/cpp/app_templates/kconfig35/CMakeLists.txt b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt index 412cabdf..32dd830c 100644 --- a/languages/cpp/app_templates/kconfig35/CMakeLists.txt +++ b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt @@ -9,8 +9,8 @@ # ################################################# -add_custom_target( kconfig35.tar.gz ALL - COMMAND tar zcf kconfig35.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_target( tdeconfig35.tar.gz ALL + COMMAND tar zcf tdeconfig35.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop subdirs app.desktop kxt35.png appview.h appview.cpp appview_base.ui prefs-base.ui prefs.cpp prefs.h @@ -19,10 +19,10 @@ add_custom_target( kconfig35.tar.gz ALL install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/kconfig35.tar.gz kconfig35.png + ${CMAKE_CURRENT_BINARY_DIR}/tdeconfig35.tar.gz tdeconfig35.png DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kconfig35.kdevtemplate + tdeconfig35.kdevtemplate DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kconfig35/Makefile.am b/languages/cpp/app_templates/tdeconfig35/Makefile.am index e6695775..a172f05f 100644 --- a/languages/cpp/app_templates/kconfig35/Makefile.am +++ b/languages/cpp/app_templates/tdeconfig35/Makefile.am @@ -2,7 +2,7 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ subdirs app.desktop kxt35.png appview.h appview.cpp appview_base.ui \ prefs-base.ui prefs.cpp prefs.h app.kcfg settings.kcfgc README \ src-configure.in.in -templateName= kconfig35 +templateName= tdeconfig35 ### no need to change below: template_DATA = $(templateName).kdevtemplate diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/tdeconfig35/README index a27cdb29..e35da710 100644 --- a/languages/cpp/app_templates/kconfig35/README +++ b/languages/cpp/app_templates/tdeconfig35/README @@ -55,7 +55,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0 into #MIN_CONFIG(3.2.0) Take an example on the many apps found in the tdegames source package and consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/languages/cpp/app_templates/kconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index 0fb99ee1..d158e45f 100644 --- a/languages/cpp/app_templates/kconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -7,7 +7,7 @@ #include <tqdragobject.h> #include <kaction.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kglobal.h> #include <klocale.h> #include <kprinter.h> diff --git a/languages/cpp/app_templates/kconfig35/app.desktop b/languages/cpp/app_templates/tdeconfig35/app.desktop index 5beccc5d..5beccc5d 100644 --- a/languages/cpp/app_templates/kconfig35/app.desktop +++ b/languages/cpp/app_templates/tdeconfig35/app.desktop diff --git a/languages/cpp/app_templates/kconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h index c1aac7e4..c1aac7e4 100644 --- a/languages/cpp/app_templates/kconfig35/app.h +++ b/languages/cpp/app_templates/tdeconfig35/app.h diff --git a/languages/cpp/app_templates/kconfig35/app.kcfg b/languages/cpp/app_templates/tdeconfig35/app.kcfg index 686f25f2..686f25f2 100644 --- a/languages/cpp/app_templates/kconfig35/app.kcfg +++ b/languages/cpp/app_templates/tdeconfig35/app.kcfg diff --git a/languages/cpp/app_templates/kconfig35/app.tdevelop b/languages/cpp/app_templates/tdeconfig35/app.tdevelop index 6a53f237..6a53f237 100644 --- a/languages/cpp/app_templates/kconfig35/app.tdevelop +++ b/languages/cpp/app_templates/tdeconfig35/app.tdevelop diff --git a/languages/cpp/app_templates/kconfig35/appui.rc b/languages/cpp/app_templates/tdeconfig35/appui.rc index 06549878..06549878 100644 --- a/languages/cpp/app_templates/kconfig35/appui.rc +++ b/languages/cpp/app_templates/tdeconfig35/appui.rc diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/tdeconfig35/appview.cpp index 30d627fe..30d627fe 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/tdeconfig35/appview.cpp diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/tdeconfig35/appview.h index a486ec43..a486ec43 100644 --- a/languages/cpp/app_templates/kconfig35/appview.h +++ b/languages/cpp/app_templates/tdeconfig35/appview.h diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/tdeconfig35/appview_base.ui index 3ee8d513..3ee8d513 100644 --- a/languages/cpp/app_templates/kconfig35/appview_base.ui +++ b/languages/cpp/app_templates/tdeconfig35/appview_base.ui diff --git a/languages/cpp/app_templates/kconfig35/kxt35.png b/languages/cpp/app_templates/tdeconfig35/kxt35.png Binary files differindex a3866883..a3866883 100644 --- a/languages/cpp/app_templates/kconfig35/kxt35.png +++ b/languages/cpp/app_templates/tdeconfig35/kxt35.png diff --git a/languages/cpp/app_templates/kconfig35/main.cpp b/languages/cpp/app_templates/tdeconfig35/main.cpp index 3c912936..3c912936 100644 --- a/languages/cpp/app_templates/kconfig35/main.cpp +++ b/languages/cpp/app_templates/tdeconfig35/main.cpp diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/tdeconfig35/prefs-base.ui index 03af967a..03af967a 100644 --- a/languages/cpp/app_templates/kconfig35/prefs-base.ui +++ b/languages/cpp/app_templates/tdeconfig35/prefs-base.ui diff --git a/languages/cpp/app_templates/kconfig35/prefs.cpp b/languages/cpp/app_templates/tdeconfig35/prefs.cpp index e7a46ddf..e7a46ddf 100644 --- a/languages/cpp/app_templates/kconfig35/prefs.cpp +++ b/languages/cpp/app_templates/tdeconfig35/prefs.cpp diff --git a/languages/cpp/app_templates/kconfig35/prefs.h b/languages/cpp/app_templates/tdeconfig35/prefs.h index 9106fe59..9106fe59 100644 --- a/languages/cpp/app_templates/kconfig35/prefs.h +++ b/languages/cpp/app_templates/tdeconfig35/prefs.h diff --git a/languages/cpp/app_templates/kconfig35/settings.kcfgc b/languages/cpp/app_templates/tdeconfig35/settings.kcfgc index 384510cd..402fad09 100644 --- a/languages/cpp/app_templates/kconfig35/settings.kcfgc +++ b/languages/cpp/app_templates/tdeconfig35/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=%{APPNAMELC}.kcfg ClassName=Settings Singleton=true diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/tdeconfig35/src-Makefile.am index 53cf2c75..53cf2c75 100644 --- a/languages/cpp/app_templates/kconfig35/src-Makefile.am +++ b/languages/cpp/app_templates/tdeconfig35/src-Makefile.am diff --git a/languages/cpp/app_templates/kconfig35/src-configure.in.in b/languages/cpp/app_templates/tdeconfig35/src-configure.in.in index 1f29bc08..1f29bc08 100644 --- a/languages/cpp/app_templates/kconfig35/src-configure.in.in +++ b/languages/cpp/app_templates/tdeconfig35/src-configure.in.in diff --git a/languages/cpp/app_templates/kconfig35/subdirs b/languages/cpp/app_templates/tdeconfig35/subdirs index 0e678106..0e678106 100644 --- a/languages/cpp/app_templates/kconfig35/subdirs +++ b/languages/cpp/app_templates/tdeconfig35/subdirs diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate index 3f5a2a81..60cb5238 100644 --- a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate +++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate @@ -48,7 +48,7 @@ Comment[sv]=Skapar ett enkelt TDE-program med en grafisk komponent och en instä Comment[zh_TW]=產生一個簡單的 TDE 3.5 上的應用程式，內含一個元件與一個設定對話框。 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp,%{dest}/README -Archive=kconfig35.tar.gz +Archive=tdeconfig35.tar.gz [ADMIN] Type=include diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.png b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.png Binary files differindex a3866883..a3866883 100644 --- a/languages/cpp/app_templates/kconfig35/kconfig35.png +++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.png diff --git a/languages/cpp/app_templates/kfileplugin/.kdev_ignore b/languages/cpp/app_templates/tdefileplugin/.kdev_ignore index e69de29b..e69de29b 100644 --- a/languages/cpp/app_templates/kfileplugin/.kdev_ignore +++ b/languages/cpp/app_templates/tdefileplugin/.kdev_ignore diff --git a/languages/cpp/app_templates/kfileplugin/CMakeLists.txt b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt index fb3aab6b..5462742c 100644 --- a/languages/cpp/app_templates/kfileplugin/CMakeLists.txt +++ b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt @@ -9,19 +9,19 @@ # ################################################# -add_custom_target( kfileplugin.tar.gz ALL - COMMAND tar zcf kfileplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - README.devel kfile_plugin.cpp kfile_plugin.desktop - kfile_plugin.h plugin.tdevelop kfileplugin kfileplugin.png +add_custom_target( tdefileplugin.tar.gz ALL + COMMAND tar zcf tdefileplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + README.devel tdefile_plugin.cpp tdefile_plugin.desktop + tdefile_plugin.h plugin.tdevelop tdefileplugin tdefileplugin.png src-Makefile.am subdirs ) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/kfileplugin.tar.gz kfileplugin.png + ${CMAKE_CURRENT_BINARY_DIR}/tdefileplugin.tar.gz tdefileplugin.png DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kfileplugin.kdevtemplate + tdefileplugin.kdevtemplate DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kfileplugin/Makefile.am b/languages/cpp/app_templates/tdefileplugin/Makefile.am index 97f8a748..019d2d7c 100644 --- a/languages/cpp/app_templates/kfileplugin/Makefile.am +++ b/languages/cpp/app_templates/tdefileplugin/Makefile.am @@ -1,7 +1,7 @@ -dataFiles = README.devel kfile_plugin.cpp kfile_plugin.desktop \ - kfile_plugin.h plugin.tdevelop kfileplugin kfileplugin.png \ +dataFiles = README.devel tdefile_plugin.cpp tdefile_plugin.desktop \ + tdefile_plugin.h plugin.tdevelop tdefileplugin tdefileplugin.png \ src-Makefile.am subdirs -templateName = kfileplugin +templateName = tdefileplugin ### no need to change below: template_DATA = $(templateName).kdevtemplate diff --git a/languages/cpp/app_templates/kfileplugin/README.devel b/languages/cpp/app_templates/tdefileplugin/README.devel index 21ee67c7..4417fa74 100644 --- a/languages/cpp/app_templates/kfileplugin/README.devel +++ b/languages/cpp/app_templates/tdefileplugin/README.devel @@ -1,6 +1,6 @@ @todo: -1. add information to src/kfile_%{APPNAMELC}.desktop +1. add information to src/tdefile_%{APPNAMELC}.desktop MimeType= PreferredGroups= PreferredItems= diff --git a/languages/cpp/app_templates/kfileplugin/plugin.tdevelop b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop index 2414a429..f09030c1 100644 --- a/languages/cpp/app_templates/kfileplugin/plugin.tdevelop +++ b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop @@ -24,7 +24,7 @@ <kdevautoproject> <general> - <activetarget>src/kfile_%{APPNAMELC}.la</activetarget> + <activetarget>src/tdefile_%{APPNAMELC}.la</activetarget> <useconfiguration>debug</useconfiguration> </general> <configurations> diff --git a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am new file mode 100644 index 00000000..c96817d5 --- /dev/null +++ b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for folder file meta info plugin + +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_%{APPNAMELC}.h + +kde_module_LTLIBRARIES = tdefile_%{APPNAMELC}.la + +tdefile_%{APPNAMELC}_la_SOURCES = tdefile_%{APPNAMELC}.cpp +tdefile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO) +tdefile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files ((moc)) +METASOURCES = AUTO + +services_DATA = tdefile_%{APPNAMELC}.desktop +servicesdir = $(kde_servicesdir) + +messages: rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/tdefile_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kfileplugin/subdirs b/languages/cpp/app_templates/tdefileplugin/subdirs index 0e678106..0e678106 100644 --- a/languages/cpp/app_templates/kfileplugin/subdirs +++ b/languages/cpp/app_templates/tdefileplugin/subdirs diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp index db259cb3..1d590f97 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp +++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp @@ -1,17 +1,17 @@ %{CPP_TEMPLATE} #include <config.h> -#include "kfile_%{APPNAMELC}.h" +#include "tdefile_%{APPNAMELC}.h" #include <kgenericfactory.h> -//#include <kio/global.h> +//#include <tdeio/global.h> //#include <tqfileinfo.h> //#include <tqdir.h> typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory; -K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_%{APPNAME}, %{APPNAME}Factory( "tdefile_%{APPNAMELC}" )) %{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name, const TQStringList &args) @@ -51,5 +51,5 @@ bool %{APPNAME}Plugin::readInfo( KFileMetaInfo& info, uint /*what*/) return true; } -#include "kfile_%{APPNAMELC}.moc" +#include "tdefile_%{APPNAMELC}.moc" diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.desktop b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop index 8a2f40ee..42f19e60 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.desktop +++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop @@ -30,7 +30,7 @@ Name[tg]=Маълумот дар бораи %{APPNAME} Name[zh_CN]=%{APPNAME}的信息 Name[zh_TW]=%{APPNAME} 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_%{APPNAMELC} +X-TDE-Library=tdefile_%{APPNAMELC} # change MimeType here! (example: inode/directory) MimeType= # change PreferredGroups here! (example: FolderInfo) diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h index 50db1252..96fcaf0d 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h @@ -4,9 +4,9 @@ #define __KFILE_%{APPNAMEUC}_H__ /** - * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h> + * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> */ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin b/languages/cpp/app_templates/tdefileplugin/tdefileplugin index a17a7af0..b902179d 100644 --- a/languages/cpp/app_templates/kfileplugin/kfileplugin +++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin @@ -1,8 +1,8 @@ # TDE Config File [General] Name=KFile plugin -Icon=kfileplugin.png +Icon=tdefileplugin.png Category=C++/TDE Comment=Generates a KFile plugin for konqueror to display meta information. FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=README.devel,src/kfile_APPNAMELC.cpp +ShowFilesAfterGeneration=README.devel,src/tdefile_APPNAMELC.cpp diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate index 762ca3b8..52afe804 100644 --- a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate +++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate @@ -30,7 +30,7 @@ Name[sv]=KFile-insticksprogram Name[tr]=KFile Eklentisi Name[zh_CN]=KFile 插件 Name[zh_TW]=KFile 外掛程式 -Icon=kfileplugin.png +Icon=tdefileplugin.png Category=C++/TDE Comment=Generates a KFile plugin for konqueror to display meta information. Comment[ca]=Genera un connector KFile per al konqueror per a mostrar meta informació. @@ -60,8 +60,8 @@ Comment[tr]=Meta bilgisini göstermesi için Konqueror'a bir KFile eklentisi yar Comment[zh_CN]=生成一个可显示元信息的 Konqueror KFile 插件。 Comment[zh_TW]=產生一個 Konqueror 的 KFile 外掛程式，顯示中繼資訊 FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=${dest}/README.devel,%{dest}/src/kfile_%{APPNAMELC}.cpp -Archive=kfileplugin.tar.gz +ShowFilesAfterGeneration=${dest}/README.devel,%{dest}/src/tdefile_%{APPNAMELC}.cpp +Archive=tdefileplugin.tar.gz [ADMIN] Type=include @@ -146,18 +146,18 @@ Dest=%{dest}/src/Makefile.am [FILE12] Type=install -Source=%{src}/kfile_plugin.desktop -Dest=%{dest}/src/kfile_%{APPNAMELC}.desktop +Source=%{src}/tdefile_plugin.desktop +Dest=%{dest}/src/tdefile_%{APPNAMELC}.desktop [FILE13] Type=install -Source=%{src}/kfile_plugin.cpp -Dest=%{dest}/src/kfile_%{APPNAMELC}.cpp +Source=%{src}/tdefile_plugin.cpp +Dest=%{dest}/src/tdefile_%{APPNAMELC}.cpp [FILE14] Type=install -Source=%{src}/kfile_plugin.h -Dest=%{dest}/src/kfile_%{APPNAMELC}.h +Source=%{src}/tdefile_plugin.h +Dest=%{dest}/src/tdefile_%{APPNAMELC}.h [FILE15] Type=install diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin.png b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.png Binary files differindex d2a56245..d2a56245 100644 --- a/languages/cpp/app_templates/kfileplugin/kfileplugin.png +++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.png diff --git a/languages/cpp/app_templates/kioslave/.kdev_ignore b/languages/cpp/app_templates/tdeioslave/.kdev_ignore index e69de29b..e69de29b 100644 --- a/languages/cpp/app_templates/kioslave/.kdev_ignore +++ b/languages/cpp/app_templates/tdeioslave/.kdev_ignore diff --git a/languages/cpp/app_templates/kioslave/CMakeLists.txt b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt index c0f70115..584bdc19 100644 --- a/languages/cpp/app_templates/kioslave/CMakeLists.txt +++ b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt @@ -9,18 +9,18 @@ # ################################################# -add_custom_target( kioslave.tar.gz ALL - COMMAND tar zcf kioslave.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_target( tdeioslave.tar.gz ALL + COMMAND tar zcf tdeioslave.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} slave.cpp slave.h slave.protocol slave.tdevelop - src-Makefile.am kioslave.png subdirs + src-Makefile.am tdeioslave.png subdirs ) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/kioslave.tar.gz kioslave.png + ${CMAKE_CURRENT_BINARY_DIR}/tdeioslave.tar.gz tdeioslave.png DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kioslave.kdevtemplate + tdeioslave.kdevtemplate DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kioslave/Makefile.am b/languages/cpp/app_templates/tdeioslave/Makefile.am index 1d9a8224..bee7ddb6 100644 --- a/languages/cpp/app_templates/kioslave/Makefile.am +++ b/languages/cpp/app_templates/tdeioslave/Makefile.am @@ -1,6 +1,6 @@ dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \ - src-Makefile.am kioslave.png subdirs -templateName = kioslave + src-Makefile.am tdeioslave.png subdirs +templateName = tdeioslave ### no need to change below: template_DATA = $(templateName).kdevtemplate diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp index 3c780e7f..3c780e7f 100644 --- a/languages/cpp/app_templates/kioslave/slave.cpp +++ b/languages/cpp/app_templates/tdeioslave/slave.cpp diff --git a/languages/cpp/app_templates/kioslave/slave.h b/languages/cpp/app_templates/tdeioslave/slave.h index 07bf9c6e..672e6121 100644 --- a/languages/cpp/app_templates/kioslave/slave.h +++ b/languages/cpp/app_templates/tdeioslave/slave.h @@ -6,8 +6,8 @@ #include <tqcstring.h> #include <kurl.h> -#include <kio/global.h> -#include <kio/slavebase.h> +#include <tdeio/global.h> +#include <tdeio/slavebase.h> class TQCString; diff --git a/languages/cpp/app_templates/tdeioslave/slave.protocol b/languages/cpp/app_templates/tdeioslave/slave.protocol new file mode 100644 index 00000000..5a1f6445 --- /dev/null +++ b/languages/cpp/app_templates/tdeioslave/slave.protocol @@ -0,0 +1,39 @@ +[Protocol] +exec=kio_%{APPNAMELC} +protocol=%{APPNAMELC} +input=none +output=stream +reading=true +defaultMimetype=text/plain +Icon=remote +Description=A tdeioslave for %{APPNAMELC} +Description[br]=Ur c'hioslave evit %{APPNAMELC} +Description[ca]=Un tdeioslave per a %{APPNAMELC} +Description[da]=En tdeioslave til %{APPNAMELC} +Description[de]=Ein Ein-/Ausgabemodul für %{APPNAMELC} +Description[el]=Ένα υπηρέτης kio για %{APPNAMELC} +Description[es]=Un tdeioslave para %{APPNAMELC} +Description[et]=%{APPNAMELC} IO-moodul +Description[eu]=tdeioslave bat honentzat: %{APPNAMELC} +Description[fa]=یک tdeioslave برای %{APPNAMELC} +Description[fr]=Un esclave d'E/S (tdeioslave) pour %{APPNAMELC} +Description[ga]=tdeioslave le haghaidh %{APPNAMELC} +Description[gl]=Un tdeioslave para %{APPNAMELC} +Description[hu]=%{APPNAMELC}-támogató KIOslave +Description[it]=Un tdeioslave per %{APPNAMELC} +Description[ja]=%{APPNAMELC} のための tdeioslave +Description[nds]=En In-/Utgaavmoduul för %{APPNAMELC} +Description[ne]= %{APPNAMELC} का लागि किवस्लेभ +Description[nl]=Kioslave voor %{APPNAMELC} +Description[pl]=tdeioslave dla %{APPNAMELC} +Description[pt]=Um 'tdeioslave' para %{APPNAMELC} +Description[pt_BR]=Um tdeioslave para %{APPNAMELC} +Description[ru]=Канал tdeioslave для %{APPNAMELC} +Description[sk]=tdeioslave pre %{APPNAMELC} +Description[sl]=tdeioslave za %{APPNAMELC} +Description[sr]=KIOSlave за %{APPNAMELC} +Description[sr@Latn]=KIOSlave za %{APPNAMELC} +Description[sv]=En I/O-slav för %{APPNAMELC} +Description[tr]=%{APPNAMELC} için bir tdeioslave +Description[zh_CN]=%{APPNAMELC} 的 tdeioslave +Description[zh_TW]=%{APPNAMELC} 的 tdeioslave diff --git a/languages/cpp/app_templates/kioslave/slave.tdevelop b/languages/cpp/app_templates/tdeioslave/slave.tdevelop index 4c7c2d2e..cb257385 100644 --- a/languages/cpp/app_templates/kioslave/slave.tdevelop +++ b/languages/cpp/app_templates/tdeioslave/slave.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> <keyword>Qt</keyword> <keyword>TDE</keyword> - <keyword>kioslave</keyword> + <keyword>tdeioslave</keyword> </keywords> </general> <kdevcppsupport> diff --git a/languages/cpp/app_templates/kioslave/src-Makefile.am b/languages/cpp/app_templates/tdeioslave/src-Makefile.am index 7aedfa33..b160d973 100644 --- a/languages/cpp/app_templates/kioslave/src-Makefile.am +++ b/languages/cpp/app_templates/tdeioslave/src-Makefile.am @@ -11,4 +11,4 @@ protocoldir = $(kde_servicesdir) messages: rc.cpp $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_%{APPNAMELC}.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kioslave/subdirs b/languages/cpp/app_templates/tdeioslave/subdirs index 0e678106..0e678106 100644 --- a/languages/cpp/app_templates/kioslave/subdirs +++ b/languages/cpp/app_templates/tdeioslave/subdirs diff --git a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate index a49c36f8..27279fd2 100644 --- a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate +++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate @@ -20,7 +20,7 @@ Name[nl]=KIO-slave Name[pt]=KIO Slave Name[sk]=KIO otrok Name[sv]=I/O-slav -Icon=kioslave.png +Icon=tdeioslave.png Category=C++/TDE Comment=Generates a framework for an IO slave Comment[ca]=Genera una infraestructura per a un esclau IO @@ -52,7 +52,7 @@ Comment[zh_CN]=生成一个 IO slave 的框架 Comment[zh_TW]=產生一個 IO slave 的框架 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp -Archive=kioslave.tar.gz +Archive=tdeioslave.tar.gz [ADMIN] Type=include diff --git a/languages/cpp/app_templates/kioslave/kioslave.png b/languages/cpp/app_templates/tdeioslave/tdeioslave.png Binary files differindex f0cd89a8..f0cd89a8 100644 --- a/languages/cpp/app_templates/kioslave/kioslave.png +++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.png diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp index f8e88db8..21d6db32 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -6,7 +6,7 @@ #include <kapplication.h> #include <klocale.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include "%{APPNAMELC}.h" #include "%{APPNAMELC}ui.h" diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop index 38429f89..28e0a678 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> <keyword>Qt</keyword> <keyword>TDE</keyword> - <keyword>kioslave</keyword> + <keyword>tdeioslave</keyword> </keywords> </general> <kdevcppsupport> diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 140bb46b..e1d2940a 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -26,12 +26,12 @@ // kde includes #include <kdevproject.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kurlrequester.h> #include <keditlistbox.h> #include <klistview.h> diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index 2ed3ba0a..f3dba7fb 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -16,7 +16,7 @@ #include <tqfileinfo.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "cppsupportfactory.h" #include "classgeneratorconfig.h" diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index 9b9b59fb..c9e23652 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -10,7 +10,7 @@ #include <kdevproject.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <klocale.h> #include <kdebug.h> diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index 85148c30..c8ffb1de 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -1,7 +1,7 @@ #include <tqdir.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <codemodel.h> diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index f0ec6fa9..8f66283d 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -80,7 +80,7 @@ #include <kmessagebox.h> #include <kmainwindow.h> #include <kstatusbar.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 9c2ade95..c18d581d 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -22,7 +22,7 @@ #include <kaction.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdevgenericfactory.h> #include <kiconloader.h> #include <klocale.h> diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index a46b6d6a..e5081fbd 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -25,7 +25,7 @@ #include "mi/miparser.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc index 74d0872f..2295f820 100644 --- a/languages/cpp/doc/gnome1.toc +++ b/languages/cpp/doc/gnome1.toc @@ -158,7 +158,7 @@ <tocsect3 name="GtkEditable" url="gtk/gtkeditable.html"/> <tocsect3 name="GtkEntry" url="gtk/gtkentry.html"/> <tocsect3 name="GtkEventBox" url="gtk/gtkeventbox.html"/> - <tocsect3 name="GtkFileSelection" url="gtk/gtkfileselection.html"/> + <tocsect3 name="GtkFileSelection" url="gtk/gttdefileselection.html"/> <tocsect3 name="GtkFixed" url="gtk/gtkfixed.html"/> <tocsect3 name="GtkFontSelection" url="gtk/gtkfontselection.html"/> <tocsect3 name="GtkFontSelectionDialog" url="gtk/gtkfontselectiondialog.html"/> diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index 1156df06..ec22d851 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -1284,10 +1284,10 @@ <entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/> <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/> -<entry name="kconfigdemo.cpp file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/> -<entry name="kconfigdemo.h file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/> -<entry name="TDEConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/> -<entry name="TDEConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/> +<entry name="tdeconfigdemo.cpp file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/> +<entry name="tdeconfigdemo.h file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/> +<entry name="TDEConfigDemo widget, tdeconfigdemo.cpp class definition" url="ch07lev1sec2.html"/> +<entry name="TDEConfigDemo widget, tdeconfigdemo.h class declaration" url="ch07lev1sec2.html"/> <entry name="TDEConfigDemo widget, main() function" url="ch07lev1sec2.html"/> <entry name="kcustomactions.cpp file (KCustomActions widget)" url="ch05.html"/> <entry name="kcustomactions.h file (KCustomActions widget)" url="ch05.html"/> @@ -1675,8 +1675,8 @@ <entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/> <entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/> <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/> -<entry name="listings, TDEConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/> -<entry name="listings, TDEConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/> +<entry name="listings, TDEConfigDemo widget, tdeconfigdemo.cpp class definition" url="ch07lev1sec2.html"/> +<entry name="listings, TDEConfigDemo widget, tdeconfigdemo.h class declaration" url="ch07lev1sec2.html"/> <entry name="listings, TDEConfigDemo widget, main() function" url="ch07lev1sec2.html"/> <entry name="listings, KCustomActions widget, kcustomactions.cpp class definition" url="ch05.html"/> <entry name="listings, KCustomActions widget, kcustomactions.h class declaration" url="ch05.html"/> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp index 174219a3..0dc82191 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp @@ -60,7 +60,7 @@ TQStringList KDevKDELibsImporter::fileList() files += fileList( m_settings->kdeDir() + "/kabc" ); files += fileList( m_settings->kdeDir() + "/tdeprint" ); files += fileList( m_settings->kdeDir() + "/tdesu" ); - files += fileList( m_settings->kdeDir() + "/kio" ); + files += fileList( m_settings->kdeDir() + "/tdeio" ); files += fileList( m_settings->kdeDir() + "/kjs" ); files += fileList( m_settings->kdeDir() + "/tdeparts" ); files += fileList( m_settings->kdeDir() + "/tdetexteditor" ); diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 6f87771f..baea54d7 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -42,7 +42,7 @@ #include <kiconloader.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtimer.h> #include <tqregexp.h> diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 0db80fa8..5d3ed2be 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -26,7 +26,7 @@ #include <tqstringlist.h> #include <tqcheckbox.h> #include <tqmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <tqpushbutton.h> #include <domutil.h> @@ -36,7 +36,7 @@ #include <klocale.h> #include <tqfile.h> #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #define WIDGET_CAPTION_NAME "widget/property|name=caption/string" diff --git a/languages/csharp/CMakeLists.txt b/languages/csharp/CMakeLists.txt index b509fd03..362a22fe 100644 --- a/languages/csharp/CMakeLists.txt +++ b/languages/csharp/CMakeLists.txt @@ -54,6 +54,6 @@ tde_add_kpart( libkdevcsharpsupport AUTOMOC tde_add_kpart( kio_csharpdoc AUTOMOC SOURCES csharpdoc.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/csharp/csharpdoc.h b/languages/csharp/csharpdoc.h index 7abaac1e..81329e52 100644 --- a/languages/csharp/csharpdoc.h +++ b/languages/csharp/csharpdoc.h @@ -2,7 +2,7 @@ #define _CSHARPDOC_H_ #include <tqobject.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> class CSharpdocProtocol : public TDEIO::SlaveBase diff --git a/languages/fortran/CMakeLists.txt b/languages/fortran/CMakeLists.txt index 507795aa..3b2dd46a 100644 --- a/languages/fortran/CMakeLists.txt +++ b/languages/fortran/CMakeLists.txt @@ -40,7 +40,7 @@ install( FILES kdevfortransupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfortran tde_add_kpart( libkdevfortransupport AUTOMOC SOURCES fortransupportpart.cpp fixedformparser.cpp - ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui + ftnchetdeconfigwidget.cpp ftnchetdeconfigwidgetbase.ui LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/fortran/Makefile.am b/languages/fortran/Makefile.am index 73f4582c..148c4228 100644 --- a/languages/fortran/Makefile.am +++ b/languages/fortran/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkdevfortransupport.la libkdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libkdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui +libkdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchetdeconfigwidget.cpp ftnchetdeconfigwidgetbase.ui METASOURCES = AUTO diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 44068db8..4eeae482 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "fortransupportpart.h" -#include "ftnchekconfigwidget.h" +#include "ftnchetdeconfigwidget.h" #include "fixedformparser.h" #include <tqdir.h> diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchetdeconfigwidget.cpp index 8acc9985..6fa68605 100644 --- a/languages/fortran/ftnchekconfigwidget.cpp +++ b/languages/fortran/ftnchetdeconfigwidget.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include "ftnchekconfigwidget.h" +#include "ftnchetdeconfigwidget.h" #include <tqcheckbox.h> #include <tqbuttongroup.h> @@ -287,4 +287,4 @@ void FtnchekConfigWidget::storeConfig() DomUtil::writeEntry(dom, "/kdevfortransupport/ftnchek/portabilityonly", list.join(",")); } -#include "ftnchekconfigwidget.moc" +#include "ftnchetdeconfigwidget.moc" diff --git a/languages/fortran/ftnchekconfigwidget.h b/languages/fortran/ftnchetdeconfigwidget.h index 786701ce..0636aff9 100644 --- a/languages/fortran/ftnchekconfigwidget.h +++ b/languages/fortran/ftnchetdeconfigwidget.h @@ -13,7 +13,7 @@ #define _FTNCHEKCONFIGWIDGET_H_ #include <tqdom.h> -#include "ftnchekconfigwidgetbase.h" +#include "ftnchetdeconfigwidgetbase.h" class TQButtonGroup; diff --git a/languages/fortran/ftnchekconfigwidgetbase.ui b/languages/fortran/ftnchetdeconfigwidgetbase.ui index f01271af..f01271af 100644 --- a/languages/fortran/ftnchekconfigwidgetbase.ui +++ b/languages/fortran/ftnchetdeconfigwidgetbase.ui diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h index 9534cc2f..b03bb05e 100644 --- a/languages/java/configproblemreporter.ui.h +++ b/languages/java/configproblemreporter.ui.h @@ -5,7 +5,7 @@ ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <klocale.h> diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 4ab43d38..d5aaeda0 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -49,7 +49,7 @@ #include <klocale.h> #include <kmainwindow.h> #include <kstatusbar.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index 5dffdecd..a451abf3 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -41,7 +41,7 @@ #include <kiconloader.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtimer.h> #include <tqregexp.h> diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index 33568735..12ec0179 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tqcheckbox.h> #include <tqmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klineedit.h> #include <tqpushbutton.h> #include <domutil.h> @@ -35,7 +35,7 @@ #include <klocale.h> #include <tqfile.h> #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #define WIDGET_CAPTION_NAME "widget/property|name=caption/string" diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index 3b2ffbc4..5ddc8dc4 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -38,7 +38,7 @@ #include <kapplication.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtimer.h> #include <tqregexp.h> diff --git a/languages/perl/CMakeLists.txt b/languages/perl/CMakeLists.txt index d8c68f75..f67ec9c0 100644 --- a/languages/perl/CMakeLists.txt +++ b/languages/perl/CMakeLists.txt @@ -50,6 +50,6 @@ tde_add_kpart( libkdevperlsupport AUTOMOC tde_add_kpart( kio_perldoc SOURCES perldoc.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/perl/perldoc.h b/languages/perl/perldoc.h index 0ea1bf3a..dab66b60 100644 --- a/languages/perl/perldoc.h +++ b/languages/perl/perldoc.h @@ -2,7 +2,7 @@ #define _PERLDOC_H_ #include <tqobject.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> class PerldocProtocol : public TDEIO::SlaveBase diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 01cd950c..27ef1baf 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -7,7 +7,7 @@ #include <iostream> #include <tqradiobutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstandarddirs.h> #include "phpinfodlg.h" diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 47d869b7..d3134a89 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -41,7 +41,7 @@ #include <kiconloader.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtimer.h> #include <tqregexp.h> diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index ddc3b507..3ed6d952 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -18,7 +18,7 @@ #include "phpnewclassdlg.h" #include <klineedit.h> #include <kcompletion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqtoolbutton.h> #include <iostream> #include <tqregexp.h> diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 572be8c8..ac4ca8dc 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -26,7 +26,7 @@ #include <kdialogbase.h> #include "kdevlanguagesupport.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <kdevgenericfactory.h> #include <tdetexteditor/editinterface.h> diff --git a/languages/python/CMakeLists.txt b/languages/python/CMakeLists.txt index f2e63076..93ba69c2 100644 --- a/languages/python/CMakeLists.txt +++ b/languages/python/CMakeLists.txt @@ -33,7 +33,7 @@ link_directories( ##### other data ################################ install( FILES kdevpythonsupport.desktop pydoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/kio_pydoc ) +install( FILES kde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/tdeio_pydoc ) install( FILES kdevpythonsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpythonsupport ) @@ -53,6 +53,6 @@ tde_add_kpart( libkdevpythonsupport AUTOMOC tde_add_kpart( kio_pydoc SOURCES pydoc.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/python/Makefile.am b/languages/python/Makefile.am index bd2e8813..3474eceb 100644 --- a/languages/python/Makefile.am +++ b/languages/python/Makefile.am @@ -21,7 +21,7 @@ kio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO -slavedir = $(kde_datadir)/kio_pydoc +slavedir = $(kde_datadir)/tdeio_pydoc slave_DATA = kde_pydoc.py servicedir = $(kde_servicesdir) diff --git a/languages/python/pydoc.h b/languages/python/pydoc.h index f5e639d7..b4354ca5 100644 --- a/languages/python/pydoc.h +++ b/languages/python/pydoc.h @@ -2,7 +2,7 @@ #define _PYDOC_H_ #include <tqobject.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> class PydocProtocol : public TDEIO::SlaveBase diff --git a/languages/ruby/app_templates/kapp/README b/languages/ruby/app_templates/kapp/README index f7d35069..39de8b2f 100644 --- a/languages/ruby/app_templates/kapp/README +++ b/languages/ruby/app_templates/kapp/README @@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html them more maintainable. For more details, consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/languages/ruby/app_templates/kxt/settings.kcfgc b/languages/ruby/app_templates/kxt/settings.kcfgc index 384510cd..402fad09 100644 --- a/languages/ruby/app_templates/kxt/settings.kcfgc +++ b/languages/ruby/app_templates/kxt/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=%{APPNAMELC}.kcfg ClassName=Settings Singleton=true diff --git a/languages/ruby/app_templates/kxt/src-Makefile.am b/languages/ruby/app_templates/kxt/src-Makefile.am index 6351533d..1e51351e 100644 --- a/languages/ruby/app_templates/kxt/src-Makefile.am +++ b/languages/ruby/app_templates/kxt/src-Makefile.am @@ -41,7 +41,7 @@ rubyuidir = $(kde_datadir)/%{APPNAMELC} %.rb: %.ui $(RBUIC) -tr ${UIC_TR} -kde $< -o $@ -RBKCONFIG_COMPILER = rbkconfig_compiler +RBKCONFIG_COMPILER = rbtdeconfig_compiler settings.rb: %{APPNAMELC}.kcfg settings.kcfgc $(RBKCONFIG_COMPILER) ./%{APPNAMELC}.kcfg ./settings.kcfgc diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 091649e1..3daefeff 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -25,7 +25,7 @@ #include <kaction.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdevgenericfactory.h> #include <kiconloader.h> #include <klocale.h> diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 278d0ff2..5f1aacfe 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -38,7 +38,7 @@ #include "settings.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/lib/cppparser/CMakeLists.txt b/lib/cppparser/CMakeLists.txt index e9da8af2..3b53e900 100644 --- a/lib/cppparser/CMakeLists.txt +++ b/lib/cppparser/CMakeLists.txt @@ -38,6 +38,6 @@ tde_add_library( kdevcppparser SHARED AUTOMOC ast.cpp cachemanager.cpp driver.cpp errors.cpp lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp VERSION 0.0.0 - LINK kdevinterfaces-static kio-shared + LINK kdevinterfaces-static tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/interfaces/external/CMakeLists.txt b/lib/interfaces/external/CMakeLists.txt index 46e2bfa7..353721fd 100644 --- a/lib/interfaces/external/CMakeLists.txt +++ b/lib/interfaces/external/CMakeLists.txt @@ -15,10 +15,6 @@ include_directories( ${TQT_INCLUDE_DIRS} ) -link_directories( - ${TQT_LIBRARY_DIRS} -) - ##### headers ################################### diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index f7895145..0b05d445 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kstandarddirs.h> diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt index d7e92092..d9003dbd 100644 --- a/lib/widgets/CMakeLists.txt +++ b/lib/widgets/CMakeLists.txt @@ -47,6 +47,6 @@ tde_add_library( kdevwidgets SHARED AUTOMOC processlinemaker.cpp processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp VERSION 0.0.0 - LINK kio-shared tdehtml-shared + LINK tdeio-shared tdehtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h index ce5c6205..60b9d850 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -21,7 +21,7 @@ #ifndef _FLAGBOXES_H_ #define _FLAGBOXES_H_ -#include <kfile.h> +#include <tdefile.h> /** @file flagboxes.h diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 85990989..49ac87d2 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -12,7 +12,7 @@ #include <kmainwindow.h> #include <tdehtmlview.h> #include <tdehtml_settings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdevmainwindow.h> @@ -169,7 +169,7 @@ TQString KDevHTMLPart::context() const } -// Note: this function is a copy of code in tdecore/kconfigbase.cpp ;) +// Note: this function is a copy of code in tdecore/tdeconfigbase.cpp ;) static bool isUtf8(const char *buf) { int i, n; register unsigned char c; @@ -256,7 +256,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) TQString path = url; int nDollarPos = path.find( '$' ); - // Note: the while loop below is a copy of code in tdecore/kconfigbase.cpp ;) + // Note: the while loop below is a copy of code in tdecore/tdeconfigbase.cpp ;) while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) { // there is at least one $ if( (path)[nDollarPos+1] == '(' ) { diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index b4110375..631ad9d1 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -23,7 +23,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> KListViewAction::~KListViewAction() diff --git a/lib/widgets/propeditor/CMakeLists.txt b/lib/widgets/propeditor/CMakeLists.txt index 08a1b665..2620aaa0 100644 --- a/lib/widgets/propeditor/CMakeLists.txt +++ b/lib/widgets/propeditor/CMakeLists.txt @@ -54,6 +54,6 @@ tde_add_library( kdevpropertyeditor SHARED AUTOMOC pspinbox.cpp propertywidgetproxy.cpp plinestyleedit.cpp qeditlistbox.cpp VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index bd8af048..e7980d66 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -33,7 +33,7 @@ #endif #ifndef PURE_QT -#include <kfiledialog.h> +#include <tdefiledialog.h> #else #include <tqfiledialog.h> #endif diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h index 88435a40..bed86853 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -23,7 +23,7 @@ #include "propertywidget.h" #ifndef PURE_QT -#include <kfile.h> +#include <tdefile.h> class KURLRequester; #else #include <klineedit.h> diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp index c21857f8..0d22005b 100644 --- a/parts/abbrev/abbrevconfigwidget.cpp +++ b/parts/abbrev/abbrevconfigwidget.cpp @@ -15,7 +15,7 @@ #include "abbrevconfigwidget.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <tqlistview.h> diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 3abe3b09..86dfe96f 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -26,8 +26,8 @@ #include <kstandarddirs.h> #include <kdevgenericfactory.h> #include <kaction.h> -#include <kconfig.h> -#include <kio/netaccess.h> +#include <tdeconfig.h> +#include <tdeio/netaccess.h> #include <kiconloader.h> #include <kdevplugininfo.h> diff --git a/parts/appwizard/README.dox b/parts/appwizard/README.dox index 5baf78d0..05333af3 100644 --- a/parts/appwizard/README.dox +++ b/parts/appwizard/README.dox @@ -59,7 +59,7 @@ GBA Game Boy Advance KDE KDE application/applet Qt Qt based Kicker Kicker applet -kioslave KDE ioslave +tdeioslave KDE ioslave KOffice KOffice application KDevelop TDevelop plugin GNOME GNOME application diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 11552b27..176bf9cc 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -35,7 +35,7 @@ #include <tqtimer.h> #include <klistview.h> #include <kiconview.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <kglobalsettings.h> @@ -45,21 +45,21 @@ #include <kstandarddirs.h> #include <ktempfile.h> #include <kiconloader.h> -#include <kfiledialog.h> -#include <kfile.h> +#include <tdefiledialog.h> +#include <tdefile.h> #include <kapplication.h> #include <kpopupmenu.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfile.h> #include <kmacroexpander.h> #include <karchive.h> #include <ktar.h> #include <ktempdir.h> -#include <kfileitem.h> -#include <kio/chmodjob.h> +#include <tdefileitem.h> +#include <tdeio/chmodjob.h> #include <tqlayout.h> diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 34b5422c..c66cb6fa 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -25,13 +25,13 @@ #include <kbuttonbox.h> #include <kdebug.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinstance.h> #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> #include <kcursor.h> -#include <kfile.h> +#include <tdefile.h> #include <kurlrequester.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp index 50399aef..5546b404 100644 --- a/parts/appwizard/misc.cpp +++ b/parts/appwizard/misc.cpp @@ -19,7 +19,7 @@ #include <unistd.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> void AppWizardUtil::guessAuthorAndEmail(TQString *author, TQString *email) { diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index 3d5fcff2..2c48d6f2 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -22,7 +22,7 @@ #include <tqfileinfo.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdevplugincontroller.h> diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp index 6d6d44b6..1f8c3ff7 100644 --- a/parts/astyle/astyle_adaptor.cpp +++ b/parts/astyle/astyle_adaptor.cpp @@ -9,7 +9,7 @@ #include <tqcheckbox.h> #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 18675ad5..ed0720a4 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -23,8 +23,8 @@ #include <kdevplugininfo.h> #include <configwidgetproxy.h> #include <kapplication.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <tqlineedit.h> diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp index f2164fd8..5fe6a4aa 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include "bookmarks_config.h" diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp index 251ff556..41020bd0 100644 --- a/parts/classview/classtoolwidget.cpp +++ b/parts/classview/classtoolwidget.cpp @@ -13,7 +13,7 @@ #include "classtoolwidget.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kglobal.h> #include <kpopupmenu.h> diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index a541251b..6aefc1fa 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -17,7 +17,7 @@ #include <tqheader.h> #include <tqregexp.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpopupmenu.h> #include <klocale.h> #include <kiconloader.h> diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 1f047168..cba88bf5 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -28,7 +28,7 @@ #include <kaction.h> #include <kactionclasses.h> #include <kpopupmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <urlutil.h> #include <kdevcore.h> diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index 2d55199c..bda529d5 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -15,8 +15,8 @@ #include <klocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <kfile.h> -#include <kfiledialog.h> +#include <tdefile.h> +#include <tdefiledialog.h> #include <kurlrequesterdlg.h> #include <kurlrequester.h> #include <kmessagebox.h> diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index b24917df..f5959d73 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -23,7 +23,7 @@ #include <tqtimer.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index fef1372e..0f4f7b5c 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -28,7 +28,7 @@ #include <kstringhandler.h> #include <kdialogbase.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include "kdevappfrontend.h" diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index 1cdbc187..49503cdc 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -19,7 +19,7 @@ #include <kapplication.h> #include <kurlcompletion.h> #include <kurlrequester.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> #include <kdevplugin.h> #include <domutil.h> diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 2f899828..4d36bd17 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -18,10 +18,10 @@ #include <klocale.h> #include <kdevgenericfactory.h> #include <kaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kprocess.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <tdeparts/part.h> #include <tdetexteditor/editinterface.h> #include <kmessagebox.h> diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 539108e1..298e2083 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -15,21 +15,21 @@ #include <tqcursor.h> #include <tqfile.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <klocale.h> #include <kservice.h> #include <ktempfile.h> #include <kpopupmenu.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <tdeparts/componentfactory.h> #include <tdeparts/part.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kdevmainwindow.h> diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 40d482b5..b29b4d6c 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -24,8 +24,8 @@ #include <kurl.h> #include <kdebug.h> #include <kprocess.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include "kdevproject.h" #include "domutil.h" diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index 153c0c3d..a942d69e 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -24,7 +24,7 @@ #include "distpart_widget.h" #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kprocess.h> #include <tqfile.h> diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 21fc1b5b..fa6bafd0 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -29,7 +29,7 @@ #include <tqwidgetstack.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kprocess.h> #include <kstandarddirs.h> #include <kapplication.h> diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 77b4e6b2..b436520f 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -44,7 +44,7 @@ #include <kbookmarkmenu.h> #include <kinputdialog.h> #include <kstringhandler.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <twin.h> #include <tdetexteditor/document.h> @@ -636,7 +636,7 @@ TQCString DocumentationPart::startAssistant() TQDataStream arg(data, IO_WriteOnly); arg << app << URLs; - if (!TDEApplication::dcopClient()->call("klauncher", "klauncher", function, data, replyType, replyData)) + if (!TDEApplication::dcopClient()->call("tdelauncher", "tdelauncher", function, data, replyType, replyData)) { kdDebug() << "call failed" << endl; lastAssistant = ""; diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index 567237e2..e7bbc6c3 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdevcore.h> #include <kdevdocumentationplugin.h> diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp index df04ca81..54aac7ac 100644 --- a/parts/documentation/find_documentation_options.cpp +++ b/parts/documentation/find_documentation_options.cpp @@ -25,7 +25,7 @@ #include <klistview.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal) diff --git a/parts/documentation/interfaces/CMakeLists.txt b/parts/documentation/interfaces/CMakeLists.txt index 2809877a..f4a2ff08 100644 --- a/parts/documentation/interfaces/CMakeLists.txt +++ b/parts/documentation/interfaces/CMakeLists.txt @@ -39,6 +39,6 @@ install( FILES tde_add_library( documentation_interfaces SHARED AUTOMOC SOURCES kdevdocumentationplugin.cpp VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 5c261c4c..6c6805e1 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -26,7 +26,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdirwatch.h> #include <klocale.h> diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index aa329ac5..9c61e208 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -26,7 +26,7 @@ #include <klistbox.h> #include <klistview.h> #include <kurl.h> -#include <kfile.h> +#include <tdefile.h> #define CACHE_VERSION "3" diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index 7293d985..e17ec86b 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -21,10 +21,10 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <klistview.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <iostream> #include <fstream> #include <tqvaluevector.h> @@ -101,7 +101,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) { } -///this currently is useless, because htdig cannot use kioslaves +///this currently is useless, because htdig cannot use tdeioslaves TQStringList DocCHMPlugin::fullTextSearchLocations() { //return TQStringList::split( '\n', getSpecialData("contents", m_url)); diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index fb1a028b..cbf966a6 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -21,7 +21,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <klistview.h> diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 33a1fc77..d794f2a3 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -28,7 +28,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index fca1b3b8..c156a085 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -21,7 +21,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <klistview.h> diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index a0df440a..13cee5d0 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -30,7 +30,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index 50a5fd35..681fdbba 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -28,7 +28,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <klistview.h> #include <kstandarddirs.h> diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index f252c03e..06692f6c 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -21,7 +21,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <klistview.h> diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index c6dcb8ee..9bc4285a 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -21,7 +21,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <klistview.h> diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index b3e43388..19017d96 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -27,7 +27,7 @@ #include <kurl.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <klistview.h> diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt index 49745057..3a7ae935 100644 --- a/parts/documentation/protocols/chm/CMakeLists.txt +++ b/parts/documentation/protocols/chm/CMakeLists.txt @@ -34,7 +34,7 @@ install( FILES tde_add_kpart( kio_chm SOURCES decompress.cpp chmfile.cpp chm.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am index d68f20bd..933f4685 100644 --- a/parts/documentation/protocols/chm/Makefile.am +++ b/parts/documentation/protocols/chm/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of tdebase/kioslave/chm +## Makefile.am of tdebase/tdeioslave/chm INCLUDES = -I$(top_srcdir)/lib/widgets $(all_includes) diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h index 333b5ca3..23d9f232 100644 --- a/parts/documentation/protocols/chm/chm.h +++ b/parts/documentation/protocols/chm/chm.h @@ -20,8 +20,8 @@ #include <tqstring.h> #include <tqcstring.h> #include <kurl.h> -#include <kio/global.h> -#include <kio/slavebase.h> +#include <tdeio/global.h> +#include <tdeio/slavebase.h> #include "chmfile.h" class TQCString; diff --git a/parts/documentation/protocols/chm/chm.protocol b/parts/documentation/protocols/chm/chm.protocol index 90daa4c5..492524e0 100644 --- a/parts/documentation/protocols/chm/chm.protocol +++ b/parts/documentation/protocols/chm/chm.protocol @@ -5,32 +5,32 @@ input=none output=filesystem reading=true defaultMimetype=text/html -Description=A kioslave for displaying WinHelp files -Description[ca]=Un kioslave per a mostrar fitxers WinHelp -Description[da]=En kioslave til visning af Windows hjælpefiler +Description=A tdeioslave for displaying WinHelp files +Description[ca]=Un tdeioslave per a mostrar fitxers WinHelp +Description[da]=En tdeioslave til visning af Windows hjælpefiler Description[de]=Ein Ein-/Ausgabemodul zur Anzeige von WinHelp-Dateien Description[el]=Ένας υπηρέτης kio για εμφάνιση αρχείων WinHelp -Description[es]=Un kioslave para mostrar archivos WinHelp +Description[es]=Un tdeioslave para mostrar archivos WinHelp Description[et]=WinHelp-failide kuvamise IO-moodul -Description[eu]=WinHelp fitxategiak bistaratzeko kioslave bat -Description[fa]=یک kioslave برای نمایش پروندههای WinHelp -Description[fr]=Un esclave d'E/S (kioslave) pour l'affichage des fichiers WinHelp -Description[gl]=Un kioslave para mostrar ficheiros WinHelp +Description[eu]=WinHelp fitxategiak bistaratzeko tdeioslave bat +Description[fa]=یک tdeioslave برای نمایش پروندههای WinHelp +Description[fr]=Un esclave d'E/S (tdeioslave) pour l'affichage des fichiers WinHelp +Description[gl]=Un tdeioslave para mostrar ficheiros WinHelp Description[hu]=KDE-protokoll WinHelp-fájlok megjelenítéséhez -Description[it]=Un kioslave per mostrare i file WinHelp -Description[ja]=WinHelp を表示するための kioslave +Description[it]=Un tdeioslave per mostrare i file WinHelp +Description[ja]=WinHelp を表示するための tdeioslave Description[nds]=En In-/Utgaavmoduul för't Wiesen vun "WinHelp"-Dateien Description[ne]=WinHelp फाइलहरूका लागि किवस्लेभ -Description[nl]=Een kioslave voor het weergeven van WinHelp-bestanden -Description[pl]=kioslave do pokazywania plików WinHelp -Description[pt]=A 'kioslave' para mostrar ficheiros WinHelp -Description[pt_BR]=Um kioslave para exibir arquivos WinHelp +Description[nl]=Een tdeioslave voor het weergeven van WinHelp-bestanden +Description[pl]=tdeioslave do pokazywania plików WinHelp +Description[pt]=A 'tdeioslave' para mostrar ficheiros WinHelp +Description[pt_BR]=Um tdeioslave para exibir arquivos WinHelp Description[ru]=Обработчик ввода-вывода для файлов WinHelp -Description[sk]=kioslave pre zobrazenie WinHelp súborov +Description[sk]=tdeioslave pre zobrazenie WinHelp súborov Description[sr]=KIOSlave за приказ WinHelp фајлова Description[sr@Latn]=KIOSlave za prikaz WinHelp fajlova Description[sv]=En I/O-slav för att visa WinHelp-filer -Description[tr]=WinHelp dosyalarını görüntülemek için bir kioslave -Description[zh_CN]=显示 WinHelp 文件的 kioslave -Description[zh_TW]=顯示 WinHelp 檔案的 kioslave +Description[tr]=WinHelp dosyalarını görüntülemek için bir tdeioslave +Description[zh_CN]=显示 WinHelp 文件的 tdeioslave +Description[zh_TW]=顯示 WinHelp 檔案的 tdeioslave Icon=help diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index f8779d75..9d1812b1 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -21,8 +21,8 @@ #include <tdeparts/part.h> #include <tdeparts/browserextension.h> #include <tdehtml_part.h> -#include <kio/job.h> -#include <kio/jobclasses.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> #include <kdevhtmlpart.h> #include <tqcstring.h> diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 16f71171..28e3a2eb 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -39,7 +39,7 @@ #include <kprocess.h> #include <kapplication.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/parts/documentation/tools/htdig/CMakeLists.txt b/parts/documentation/tools/htdig/CMakeLists.txt index b3a627ac..35080ec6 100644 --- a/parts/documentation/tools/htdig/CMakeLists.txt +++ b/parts/documentation/tools/htdig/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_executable( tdevelop-htdig AUTOMOC SOURCES htdigindex.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index b7b56304..57dde9ee 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -27,7 +27,7 @@ #include <kaboutdata.h> #include <kapplication.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index 29cd1ec6..f9ec69a8 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -19,7 +19,7 @@ #include <tqspinbox.h> #include <tqtooltip.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index 45721e17..dc818db1 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurlrequester.h> #include <kicondialog.h> #include <klocale.h> diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h index 023f3277..54365717 100644 --- a/parts/filecreate/filecreate_filedialog.h +++ b/parts/filecreate/filecreate_filedialog.h @@ -13,7 +13,7 @@ #ifndef __KDEVPART_FILECREATE_FILEDIALOG_H__ #define __KDEVPART_FILECREATE_FILEDIALOG_H__ -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "filecreate_typechooser.h" diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 2a598f36..0c907db1 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -20,7 +20,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kdevgenericfactory.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kstdaction.h> diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp index 9fd8fe31..9e6b1fdd 100644 --- a/parts/filelist/filelist_item.cpp +++ b/parts/filelist/filelist_item.cpp @@ -16,7 +16,7 @@ #include "filelist_item.h" #include <kiconloader.h> -#include <kfileitem.h> +#include <tdefileitem.h> FileListItem * FileListItem::s_activeItem = 0; diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp index 0aeac511..90475668 100644 --- a/parts/filelist/projectviewconfig.cpp +++ b/parts/filelist/projectviewconfig.cpp @@ -21,7 +21,7 @@ #include <tqcheckbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 62cae2b0..e963ac9f 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -48,7 +48,7 @@ #include <tdeparts/part.h> #include <kxmlguibuilder.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdevplugininfo.h> diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index cbe1cd06..82587ac0 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -11,8 +11,8 @@ #include <kapplication.h> #include <kstandarddirs.h> #include <ktextbrowser.h> -#include <kconfig.h> -#include <kfileitem.h> +#include <tdeconfig.h> +#include <tdefileitem.h> #include <kdevgenericfactory.h> #include <kdiroperator.h> #include <kdialogbase.h> diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index 29e535dc..c4cae6e1 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -4,7 +4,7 @@ #include <kdevplugin.h> #include <kdialogbase.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqguardedptr.h> diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index cfa72b6c..284b24da 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -56,7 +56,7 @@ #include <kurlcombobox.h> #include <kurlcompletion.h> #include <kprotocolinfo.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcombobox.h> #include <kaction.h> @@ -65,13 +65,13 @@ #include <tqtoolbar.h> #include <kpopupmenu.h> #include <kdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kdebug.h> //END Includes -// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) +// from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) static void silenceTQToolBar(TQtMsgType, const char *) {} diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index 17c533ee..7c80a6de 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -23,7 +23,7 @@ #define FILESELECTOR_WIDGET_H #include <tqwidget.h> -#include <kfile.h> +#include <tdefile.h> #include <kurl.h> #include <ktoolbar.h> #include <tqframe.h> diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h index 065591d7..9a9ebb98 100644 --- a/parts/fileview/fileitemfactory.h +++ b/parts/fileview/fileitemfactory.h @@ -12,7 +12,7 @@ #ifndef FILEITEMFACTORY_H #define FILEITEMFACTORY_H -#include <kfiletreeview.h> +#include <tdefiletreeview.h> class FileTreeWidget; diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index eaffa71f..6cee53f8 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -14,7 +14,7 @@ #include <tqobject.h> #include <tqvaluelist.h> -#include <kfiletreeview.h> +#include <tdefiletreeview.h> #include <tqdom.h> #include "fileitemfactory.h" diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index fb4560fc..904f3710 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <klocale.h> #include <kpopupmenu.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kurl.h> #include <kaction.h> diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index dfdff858..5d844aa5 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -15,7 +15,7 @@ #define _FILETREEWIDGET_H_ #include <tqguardedptr.h> -#include <kfiletreeview.h> +#include <tdefiletreeview.h> #include <kdevversioncontrol.h> diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index 59b598e1..a381098e 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -15,7 +15,7 @@ #include <tqlayout.h> #include <tqpushbutton.h> #include <kbuttonbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index fd8752e4..7b46ff7d 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -14,7 +14,7 @@ #include <tqcombobox.h> #include <tqlayout.h> #include <tqpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kbuttonbox.h> #include <kdebug.h> #include <klocale.h> diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index e792b04b..74e6bf03 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -18,13 +18,13 @@ #include <tqwhatsthis.h> #include <tqtooltip.h> #include <tqstringlist.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kbuttonbox.h> #include <kpushbutton.h> #include <kapplication.h> #include <kiconloader.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index a9f84bb6..4a326343 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -18,7 +18,7 @@ #include <kurl.h> #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kdevcore.h" #include "kdevproject.h" diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 6020b1d6..6c7f525a 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -26,10 +26,10 @@ #include <kdebug.h> #include <kstatusbar.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpopupmenu.h> #include <klineedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "appoutputviewpart.h" #include "filterdlg.h" diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index a1b1cb70..1f0d6cd5 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -231,19 +231,19 @@ void MakeActionFilter::test() << TestItem( //libtool, linking 2 "/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " - "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo " - "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo " - "kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " + "-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", - "linking", "libtool", "libkfilereplacepart.la.closure") + "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 " "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " - "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.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 kfilereplacepart.lo " - "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " - "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml", - "linking", "libtool", "libkfilereplacepart.la") + "-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", + "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 " "-I../.. -I/home/andris/cvs-developement/head/quanta/quanta/dialogs -I/opt/trinity/include -I/usr/lib/qt3/include -I/usr/X11R6/include " diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 07204c8c..54e13fb8 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -31,7 +31,7 @@ #include <kinstance.h> #include <kstatusbar.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqmessagebox.h> #include <tqapplication.h> diff --git a/parts/partexplorer/README.dox b/parts/partexplorer/README.dox index 0b95d89c..8a28ad5e 100644 --- a/parts/partexplorer/README.dox +++ b/parts/partexplorer/README.dox @@ -1,7 +1,7 @@ /** \class PartExplorerPlugin A Graphical tool for performing KTrader-like queries about registered services -PartExplorer is a frontend to KTrader class (http://developer.kde.org/documentation/library/3.1-api/kio/html/classKTrader.html) +PartExplorer is a frontend to KTrader class (http://developer.kde.org/documentation/library/3.1-api/tdeio/html/classKTrader.html) and uses its syntax, no more no less: so before saying "it really sucks", give a look at http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html. diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp index 45d005a3..e1bbf414 100644 --- a/parts/scripting/scriptingglobalconfig.cpp +++ b/parts/scripting/scriptingglobalconfig.cpp @@ -23,11 +23,11 @@ #include "scriptingpart.h" #include <keditlistbox.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name) : scriptingGlobalConfigBase(parent, name), m_part(part) { - // read kconfig and post list to the m_dirs + // read tdeconfig and post list to the m_dirs TDEConfig *cfg = kapp->config(); TQStringList searchDirs = cfg->readListEntry("SearchDirs"); m_dirs->clear(); @@ -36,7 +36,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare void scriptingGlobalConfig::accept() { - // read mdirs and save to kconfig + // read mdirs and save to tdeconfig TDEConfig *cfg = kapp->config(); if( !m_dirs->isEnabled() ) cfg->writeEntry("SearchDirs", TQStringList() ); diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 35b0f9b0..8f799242 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -36,7 +36,7 @@ #include <kdevmainwindow.h> #include <configwidgetproxy.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "scriptingglobalconfig.h" #include "tdescriptactionmanager.h" diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 8e54fd75..447193f4 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -23,7 +23,7 @@ #include <tdetexteditor/editor.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/document.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtooltip.h> #include <kpopupmenu.h> #include <tqregexp.h> diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 5efd3870..774df47c 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -7,7 +7,7 @@ #include <kaboutdata.h> #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdevgenericfactory.h> #include <kdevplugininfo.h> #include <kiconloader.h> diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index b35ac551..28af7745 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -9,7 +9,7 @@ #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdesktopfile.h> #include <kdialogbase.h> diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index ef34eb97..f6cec15a 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -16,7 +16,7 @@ #include <tqtimer.h> #include <klineedit.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kdebug.h> #include <kdesktopfile.h> diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index 25df2d5a..c2d88499 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -19,7 +19,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 287dd7ec..aa530e95 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -10,7 +10,7 @@ #include <kaction.h> #include <kprocess.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include "kdevcore.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca02daae..558caeb4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( profiles ) add_subdirectory( profileengine ) add_subdirectory( newui ) -add_subdirectory( kconf_update ) +add_subdirectory( tdeconf_update ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/Makefile.am b/src/Makefile.am index 4cf58098..d2d434da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,7 +34,7 @@ rc_DATA = tdevelopui.rc eventsrc tdevelopdatadir = $(kde_confdir) tdevelopdata_DATA = tdeveloprc kdevassistantrc -SUBDIRS = profiles profileengine newui kconf_update +SUBDIRS = profiles profileengine newui tdeconf_update kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner diff --git a/src/core.cpp b/src/core.cpp index d08a826e..7d937d16 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -5,7 +5,7 @@ #include <kdebug.h> #include <kstatusbar.h> #include <kmainwindow.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kstandarddirs.h> #include <kglobal.h> diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 55861014..c9d34e29 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -4,7 +4,7 @@ #include <tdeversion.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <tdeparts/part.h> diff --git a/src/kconf_update/Makefile.am b/src/kconf_update/Makefile.am deleted file mode 100644 index e7317f2b..00000000 --- a/src/kconf_update/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes) - -update_DATA = kdev-gen-settings.upd -updatedir = $(kde_datadir)/kconf_update - -# The Qt app cannot go into kde_datadir, that is not portable. -# install to kde_bindir/kconf_update_bin instead. -# KDE 3.2 will allow kconf_update scripts to run directly from there, -# but for us that's too late. Use the .sh script as a workaround. -kconf_PROGRAMS = kdev-gen-settings-kconf_update -kconfdir = $(libdir)/kconf_update_bin - -kdev_gen_settings_kconf_update_SOURCES = kdev-gen-settings-kconf_update.cpp -kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kdev_gen_settings_kconf_update_LDADD = $(LIB_QT) - -# vim: set noet: - diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index a034cc52..f56294a3 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -27,7 +27,7 @@ #include <klineedit.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <kiconloader.h> #include <kurlrequester.h> diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index 51cb3901..25f2514d 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -19,7 +19,7 @@ #include <tqhbox.h> #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index d03fffed..1b9f492f 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -31,7 +31,7 @@ #include <kstatusbar.h> #include <tdeparts/mainwindow.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kkeydialog.h> #include <kmenubar.h> #include <kedittoolbar.h> diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt index e6f6b124..b1f89a56 100644 --- a/src/newui/CMakeLists.txt +++ b/src/newui/CMakeLists.txt @@ -15,10 +15,6 @@ include_directories( ${TQT_INCLUDE_DIRS} ) -link_directories( - ${TQT_LIBRARY_DIRS} -) - ##### d (shared) ################################ diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 4381ee2d..fc6720f9 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -33,7 +33,7 @@ #include <kinputdialog.h> #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "buttonbar.h" diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp index f64e0695..13afb6c0 100644 --- a/src/newui/buttonbar.cpp +++ b/src/newui/buttonbar.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstringhandler.h> #include <klocale.h> diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index d8abfde7..091ad1c0 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <klocale.h> #include <kiconloader.h> diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index d8b79f22..1cdd0551 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <tqtoolbutton.h> diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index 92148207..e56a83f8 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -22,7 +22,7 @@ #include <tqtoolbutton.h> #include <tqtabbar.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index ab13eff5..d3e3faa5 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -23,14 +23,14 @@ #include <tdeparts/factory.h> #include <tdeparts/partmanager.h> #include <tdeparts/browserextension.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmainwindow.h> #include <kaction.h> #include <kmessagebox.h> #include <kstatusbar.h> #include <tdehtml_part.h> #include <kpopupmenu.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kdialogbase.h> #include <klineedit.h> #include <kshortcut.h> diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 18440daa..91abe5e7 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -7,7 +7,7 @@ #include <kservice.h> #include <ktrader.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kmainwindow.h> #include <tdeparts/componentfactory.h> diff --git a/src/profileengine/editor/CMakeLists.txt b/src/profileengine/editor/CMakeLists.txt index ddc82809..cfd7c59c 100644 --- a/src/profileengine/editor/CMakeLists.txt +++ b/src/profileengine/editor/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( tde_add_executable( kdevprofileeditor SOURCES main.cpp - LINK profileeditor-static profileengine-shared kio-shared + LINK profileeditor-static profileengine-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/src/profileengine/lib/CMakeLists.txt b/src/profileengine/lib/CMakeLists.txt index cd36b2da..286a0e04 100644 --- a/src/profileengine/lib/CMakeLists.txt +++ b/src/profileengine/lib/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES tde_add_library( profileengine SHARED SOURCES profileengine.cpp profile.cpp VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index e568313f..db6cb3fc 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <kio/netaccess.h> +#include <tdeconfig.h> +#include <tdeio/netaccess.h> Profile::Profile(Profile *parent, const TQString &name) :m_parent(parent), m_name(name) diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index dffe9b92..80b3670f 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -15,7 +15,7 @@ class TQDomDocument; #include <klocale.h> #include <kservice.h> #include <ktrader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmainwindow.h> #include <tdeparts/componentfactory.h> #include <kaction.h> @@ -24,7 +24,7 @@ class TQDomDocument; #include <kprocess.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <ktempfile.h> #include <kmenubar.h> #include <kstatusbar.h> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 3f685c3c..d51bc31e 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -34,7 +34,7 @@ #include <tdetexteditor/document.h> #include <kapplication.h> #include <kurldrag.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ddockwindow.h> #include <dtabwidget.h> @@ -99,9 +99,9 @@ void SimpleMainWindow::init() " properly.\nPlease make sure " "that TDevelop is installed in your TDE directory; otherwise, you have " "to add TDevelop's installation " - "path to the environment variable TDEDIRS and run kbuildsycoca. Restart " + "path to the environment variable TDEDIRS and run tdebuildsycoca. Restart " "TDevelop afterwards.\n" - "Example for BASH users:\nexport TDEDIRS=/path/to/tdevelop:$TDEDIRS && kbuildsycoca"), + "Example for BASH users:\nexport TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"), i18n("Could Not Find Plugins") ); } diff --git a/src/kconf_update/CMakeLists.txt b/src/tdeconf_update/CMakeLists.txt index a374f34a..4b605615 100644 --- a/src/kconf_update/CMakeLists.txt +++ b/src/tdeconf_update/CMakeLists.txt @@ -23,10 +23,10 @@ link_directories( install( FILES kdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -##### kdev-gen-settings-kconf_update (executable) +##### kdev-gen-settings-tdeconf_update (executable) -tde_add_executable( kdev-gen-settings-kconf_update - SOURCES kdev-gen-settings-kconf_update.cpp +tde_add_executable( kdev-gen-settings-tdeconf_update + SOURCES kdev-gen-settings-tdeconf_update.cpp LINK ${TQT_LIBRARIES} - DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin + DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin ) diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am new file mode 100644 index 00000000..d256951b --- /dev/null +++ b/src/tdeconf_update/Makefile.am @@ -0,0 +1,18 @@ +AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes) + +update_DATA = kdev-gen-settings.upd +updatedir = $(kde_datadir)/tdeconf_update + +# The Qt app cannot go into kde_datadir, that is not portable. +# install to kde_bindir/tdeconf_update_bin instead. +# KDE 3.2 will allow tdeconf_update scripts to run directly from there, +# but for us that's too late. Use the .sh script as a workaround. +tdeconf_PROGRAMS = kdev-gen-settings-tdeconf_update +tdeconfdir = $(libdir)/tdeconf_update_bin + +kdev_gen_settings_tdeconf_update_SOURCES = kdev-gen-settings-tdeconf_update.cpp +kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kdev_gen_settings_tdeconf_update_LDADD = $(LIB_QT) + +# vim: set noet: + diff --git a/src/kconf_update/kdev-gen-settings-kconf_update.cpp b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp index 64c0b791..63e4a834 100644 --- a/src/kconf_update/kdev-gen-settings-kconf_update.cpp +++ b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp @@ -1,5 +1,5 @@ /* - kconf_update app for migrating tdevelop's ui settings to the new + tdeconf_update app for migrating tdevelop's ui settings to the new code that will be in 3.3. Copyright (c) 2005 by Matt Rogers <[email protected]> diff --git a/src/kconf_update/kdev-gen-settings.upd b/src/tdeconf_update/kdev-gen-settings.upd index 85f2235d..1fd3803f 100644 --- a/src/kconf_update/kdev-gen-settings.upd +++ b/src/tdeconf_update/kdev-gen-settings.upd @@ -2,7 +2,7 @@ #new UI file created on 20050406 Id=kdev-gen-settings-update/5 File=tdeveloprc -Script=kdev-gen-settings-kconf_update +Script=kdev-gen-settings-tdeconf_update Options=overwrite AllKeys diff --git a/src/toplevel.cpp b/src/toplevel.cpp index 048b325c..2e41e1dc 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -1,6 +1,6 @@ #include <kxmlguiclient.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "toplevel.h" diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index 07745c5c..17260ab4 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -19,7 +19,7 @@ #include <kurlrequester.h> #include <klocale.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcursor.h> #include <kdebug.h> #include <kapplication.h> diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp index 723ad9d5..f1b45c30 100644 --- a/vcs/cvsservice/cvsoptions.cpp +++ b/vcs/cvsservice/cvsoptions.cpp @@ -13,7 +13,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "domutil.h" diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index fae85d9d..2261e2be 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -15,21 +15,21 @@ #include <tqcursor.h> #include <tqfile.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <klocale.h> #include <kservice.h> #include <ktempfile.h> #include <kpopupmenu.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <tdeparts/componentfactory.h> #include <tdeparts/part.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include "diffwidget.h" diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt index 294537a2..0e902488 100644 --- a/vcs/subversion/CMakeLists.txt +++ b/vcs/subversion/CMakeLists.txt @@ -64,7 +64,7 @@ tde_add_kpart( libkdevsubversion AUTOMOC tde_add_kpart( kio_kdevsvn AUTOMOC SOURCES svn_kio.cpp - LINK kio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES} + LINK tdeio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -75,6 +75,6 @@ tde_add_kpart( kded_kdevsvnd AUTOMOC SOURCES commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp kdevsvnd.skel kdevsvnd_widgets.cpp svnssltrustpromptbase.ui - LINK kio-shared tdeinit_kded-shared + LINK tdeio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/README.dox b/vcs/subversion/README.dox index d784bd30..c463a997 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 tdesdk/kioslave/svn +\requirement You need to compile and install tdesdk/tdeioslave/svn */ diff --git a/vcs/subversion/configure.in.bot b/vcs/subversion/configure.in.bot index ccab94db..d89532c2 100644 --- a/vcs/subversion/configure.in.bot +++ b/vcs/subversion/configure.in.bot @@ -3,7 +3,7 @@ if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then echo "You're missing Subversion libraries (1.x)" echo "KDE will not be able to browse Subversion repositories without it," echo "consider installing it." - echo "Look at kioslave/svn/README for more information" + echo "Look at tdeioslave/svn/README for more information" echo "" all_tests=bad fi diff --git a/vcs/subversion/configure.in.in b/vcs/subversion/configure.in.in index 6c132ae3..7a1bb3c2 100644 --- a/vcs/subversion/configure.in.in +++ b/vcs/subversion/configure.in.in @@ -132,4 +132,4 @@ AM_CONDITIONAL(include_subversion, test -n "$SVN_SUBDIR") AC_SUBST(SVN_INCLUDE) AC_SUBST(SVN_LIB) AC_SUBST(SVN_CPPFLAGS) -AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR") +AM_CONDITIONAL(include_tdeioslave_svn, test -n "$SVN_SUBDIR") diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 94ceca77..bdba679f 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -22,19 +22,19 @@ #include "svnintegratordlg.h" #include "blockingkprocess.h" #include <kurl.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kurlrequester.h> #include <kdebug.h> #include <tqradiobutton.h> -#include <kio/scheduler.h> +#include <tdeio/scheduler.h> #include <kprocess.h> #include <tdeversion.h> #include <kmessagebox.h> #include <klocale.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> using namespace TDEIO; diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 5e2ec8d9..112990bf 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ktextedit.h> #include <kpassdlg.h> #include <tqdir.h> diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 9f517c07..6dc79169 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -30,9 +30,9 @@ #include "svn_co.h" #include <kurlrequester.h> #include <klineedit.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> #include <kdebug.h> #include <kmainwindow.h> #include <kapplication.h> diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index 28d98d3c..f2f3f6da 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqwidget.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurl.h> #include <ktempdir.h> #include "subversion_fileinfo.h" diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 6f960e0a..d9d3d6e1 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -29,7 +29,7 @@ #include <kmainwindow.h> #include <tqregexp.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name) diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 7a1c9bf7..9b322463 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -24,7 +24,7 @@ #include <tqmap.h> #include <kdevversioncontrol.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <dcopclient.h> #include <dcopobject.h> #include <subversion_part.h> diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index a74f7182..d59f8394 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -27,7 +27,7 @@ class subversionPart; #include <ktabwidget.h> -#include <kio/defaultprogress.h> +#include <tdeio/defaultprogress.h> #include <tqguardedptr.h> class KTextEdit; class SvnLogHolder; diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 0c014a9d..a37577bd 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -115,7 +115,7 @@ SVNFileSelectDlgCommit::~SVNFileSelectDlgCommit() int SVNFileSelectDlgCommit::exec() { if (listView()->childCount() <= 0){ - //TODO if klauncher fails, this spot is also reached. We should show correct error message to user + //TODO if tdelauncher fails, this spot is also reached. We should show correct error message to user KMessageBox::information( (TQWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") ); return TQDialog::Rejected; } diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h index 0a6d56b2..b00cddb8 100644 --- a/vcs/subversion/svn_kio.h +++ b/vcs/subversion/svn_kio.h @@ -24,8 +24,8 @@ #include <tqcstring.h> #include <kurl.h> -#include <kio/global.h> -#include <kio/slavebase.h> +#include <tdeio/global.h> +#include <tdeio/slavebase.h> #include <subversion-1/svn_pools.h> #include <subversion-1/svn_auth.h> #include <subversion-1/svn_client.h> |
