diff options
Diffstat (limited to 'lib')
39 files changed, 60 insertions, 60 deletions
diff --git a/lib/kformula/contextstyle.h b/lib/kformula/contextstyle.h index edf9cefa..1359f896 100644 --- a/lib/kformula/contextstyle.h +++ b/lib/kformula/contextstyle.h @@ -29,7 +29,7 @@ #include <tqvaluestack.h> //KDE Include -#include <kconfig.h> +#include <tdeconfig.h> #include <KoTextZoomHandler.h> //Formula include diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc index 94f3c241..8136965c 100644 --- a/lib/kformula/fontstyle.cc +++ b/lib/kformula/fontstyle.cc @@ -26,8 +26,8 @@ #include <kstaticdeleter.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <kmessagebox.h> #include "fontstyle.h" diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index a803dbc2..3152c26b 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -34,7 +34,7 @@ //#include <algorithm> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <kfontdialog.h> diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 3cee9f0c..d541a4c5 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -29,7 +29,7 @@ #include <kaction.h> #include <kcommand.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <KoCommandHistory.h> //#include "KoCommandHistory.h" #include "kformuladefs.h" diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc index 19b534a0..ed5bb108 100644 --- a/lib/kformula/main.cc +++ b/lib/kformula/main.cc @@ -19,7 +19,7 @@ #include <kcmdlineargs.h> #include <kcommand.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "elementtype.h" #include "kformulacommand.h" diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc index 83de81c9..a9ca0641 100644 --- a/lib/kformula/symboltable.cc +++ b/lib/kformula/symboltable.cc @@ -26,7 +26,7 @@ #include <tqtextstream.h> #include <tqfontmetrics.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 8fb84589..91cdb4ad 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -34,10 +34,10 @@ #include <klocale.h> #include <klistview.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> -#include <kfileitem.h> -#include <kio/previewjob.h> +#include <tdefileitem.h> +#include <tdeio/previewjob.h> #include <kdebug.h> #include <ktextbrowser.h> #include <kapplication.h> diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index b3e9a7b6..c657ee32 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -38,10 +38,10 @@ #include <kapplication.h> #include <kdebug.h> #include <tdeversion.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kiconloader.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <kmimetype.h> diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index eafda4b5..7bdc34e3 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -27,7 +27,7 @@ #include <KoStoreDevice.h> #include <KoXmlWriter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h index b113e75e..f6467768 100644 --- a/lib/kofficecore/KoDocumentInfo.h +++ b/lib/kofficecore/KoDocumentInfo.h @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqmap.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <koffice_export.h> class TQString; diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 9656aa84..1b1c98a8 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -20,7 +20,7 @@ #include "KoFileDialog.h" #include "KoDocument.h" -#include <kfilefiltercombo.h> +#include <tdefilefiltercombo.h> #include <klocale.h> #include <kdiroperator.h> #include <kdebug.h> diff --git a/lib/kofficecore/KoFileDialog.h b/lib/kofficecore/KoFileDialog.h index f419320c..c48169a3 100644 --- a/lib/kofficecore/KoFileDialog.h +++ b/lib/kofficecore/KoFileDialog.h @@ -21,7 +21,7 @@ #ifndef KOFILEDIALOG_H #define KOFILEDIALOG_H -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqvaluevector.h> /** diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index ccb25828..483ff683 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -39,7 +39,7 @@ #include <kapplication.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kkeydialog.h> #include <kedittoolbar.h> #include <kprogress.h> diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h index d7727025..6310deda 100644 --- a/lib/kofficecore/KoMainWindow.h +++ b/lib/kofficecore/KoMainWindow.h @@ -22,7 +22,7 @@ #define __ko_main_window_h__ #include <tdeparts/mainwindow.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <koffice_export.h> #include "KoDocument.h" diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index a8fa0f93..5d23b113 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -30,7 +30,7 @@ #include <tqpen.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinstance.h> #include <kpushbutton.h> #include <kiconloader.h> diff --git a/lib/kofficecore/KoPicture.cpp b/lib/kofficecore/KoPicture.cpp index 2dd6f730..58ef2fbf 100644 --- a/lib/kofficecore/KoPicture.cpp +++ b/lib/kofficecore/KoPicture.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "KoPictureKey.h" #include "KoPictureBase.h" diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp index 1d476f74..ff30802e 100644 --- a/lib/kofficecore/KoPictureBase.cpp +++ b/lib/kofficecore/KoPictureBase.cpp @@ -23,7 +23,7 @@ #include <KoXmlWriter.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kmdcodec.h> diff --git a/lib/kofficecore/KoPictureShared.cpp b/lib/kofficecore/KoPictureShared.cpp index 6bc69345..57d95f65 100644 --- a/lib/kofficecore/KoPictureShared.cpp +++ b/lib/kofficecore/KoPictureShared.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kurl.h> #include <kfilterdev.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "KoPictureKey.h" #include "KoPictureBase.h" diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index d81cffec..4599927b 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -47,7 +47,7 @@ #include <klocale.h> #include <kglobal.h> #include <dcopclient.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktrader.h> #include <kdebug.h> diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 5acc72a7..2d65368e 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -31,7 +31,7 @@ #include <ksavefile.h> #include <kstandarddirs.h> #include <kiconloader.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <stdlib.h> diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 51afb24b..1a2b2668 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -24,7 +24,7 @@ #include <tqlistbox.h> #include "KoEditPath.h" #include <keditlistbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlrequester.h> #include <tqhbox.h> #include <klineedit.h> diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 991ffff8..7fa49228 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <tdeversion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinstance.h> #include <KoFilterManager.h> #include <KoTemplates.h> @@ -40,8 +40,8 @@ #include <kjanuswidget.h> #include <kglobalsettings.h> #include <ktextedit.h> -#include <kfileiconview.h> -#include <kfileitem.h> +#include <tdefileiconview.h> +#include <tdefileitem.h> #include <kmessagebox.h> #include <kapplication.h> #include <kaboutdata.h> diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index d39bc7ee..ba6f17e1 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -85,7 +85,7 @@ class KoTCDIconViewItem : public KIconViewItem }; -#include <kfileiconview.h> +#include <tdefileiconview.h> #include <tqlabel.h> /** * Our reimplementation of KFileIconView used as the "recent files" view diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 3b4975f0..2e939954 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -43,11 +43,11 @@ #include <kimageio.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kiconloader.h> #include <kaboutdata.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <stdlib.h> #include <kinstance.h> diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 8084068c..c84d6b5e 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -33,7 +33,7 @@ #include <klocale.h> #include <kglobalsettings.h> #include <kaccelmanager.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <KoView.h> diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 265ee16d..30fd5dbd 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -44,9 +44,9 @@ #endif #ifndef PURE_QT -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #endif using namespace KoProperty; diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index 32efad60..95bc2553 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -43,7 +43,7 @@ #include <kapplication.h> #include <kcharsets.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> #include <kglobalsettings.h> diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index 84ec27d5..b46973b3 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <klocale.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kglobal.h> #include <kcommand.h> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 8464bf4d..031a8122 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -23,7 +23,7 @@ #include <kmessagebox.h> #include <kinputdialog.h> #include <kcompletion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqlayout.h> #include <tqvbox.h> diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 770c1da2..8ee25c19 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kinstance.h> #include <kcalendarsystem.h> diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index a90c3d9d..eaf31101 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -27,13 +27,13 @@ #include <kstandarddirs.h> #include <kmimetype.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kurl.h> #include <ktar.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> using namespace Kross::Api; diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 99b2d058..c63b7603 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <tdeversion.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klistview.h> #include <klocale.h> @@ -336,7 +336,7 @@ void WdgScriptsManager::slotGetNewScript() TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)), d, TQT_SLOT(slotProviders(Provider::List*))); - p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").arg(appname)); + p->load(type, TQString("http://download.kde.org/tdehotnewstuff/%1scripts-providers.xml").arg(appname)); d->exec(); #endif } diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index 9b8e0f8c..eda671cc 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -289,10 +289,10 @@ class QtDialog: filename = None try: - print "QtDialog.FileChooser.browseButtonClicked() kfile.KFileDialog" - # try to use the kfile module included in pytde - import kfile - filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file") + print "QtDialog.FileChooser.browseButtonClicked() tdefile.KFileDialog" + # try to use the tdefile module included in pytde + import tdefile + filename = tdefile.KFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file") except: print "QtDialog.FileChooser.browseButtonClicked() qt.QFileDialog" # fallback to Qt filedialog diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index 22b6f04b..b6f6a28e 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -75,9 +75,9 @@ class QtTest: def browseButtonClicked(self): filename = None try: - # try to use the kfile module included in pytde - import kfile - filename = kfile.KFileDialog.getOpenFileName(self.defaultfilename, "*.html", self, "Save to file") + # try to use the tdefile module included in pytde + import tdefile + filename = tdefile.KFileDialog.getOpenFileName(self.defaultfilename, "*.html", self, "Save to file") except: # fallback to Qt filedialog filename = qt.QFileDialog.getOpenFileName(self.defaultfilename, "*.html", self, "Save to file") diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index f87dfef7..64b01a44 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -37,7 +37,7 @@ #include <tdeversion.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> //#define DefaultFormat KoStore::Tar #define DefaultFormat KoStore::Zip diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp index 5d131a90..d4e6667a 100644 --- a/lib/store/KoTarStore.cpp +++ b/lib/store/KoTarStore.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <kurl.h> #include <tdeversion.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> KoTarStore::KoTarStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ) { diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp index 635ad248..b58829c0 100644 --- a/lib/store/KoZipStore.cpp +++ b/lib/store/KoZipStore.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeversion.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #if ! KDE_IS_VERSION( 3, 4, 1 ) #include <tqdir.h> #include <tqfileinfo.h> diff --git a/lib/store/SPEC b/lib/store/SPEC index 4010e33f..9cbec599 100644 --- a/lib/store/SPEC +++ b/lib/store/SPEC @@ -21,7 +21,7 @@ The purpose of this document is to define a common KOffice Storage Structure. Torben, Reggie, and all the others agreed on storing embedded KOffice Parts and binary data (e.g. pictures, movies, sounds) via a simple tar.gz-structure. -The support class for the tar format is tdelibs/kio/ktar.*, written by Torben +The support class for the tar format is tdelibs/tdeio/ktar.*, written by Torben and finished by David. The obvious benefits of this type of storage are: diff --git a/lib/store/update_kzip.sh b/lib/store/update_kzip.sh index 3c63626a..ecf7dad3 100644 --- a/lib/store/update_kzip.sh +++ b/lib/store/update_kzip.sh @@ -1,15 +1,15 @@ #!/bin/sh header="// GENERATED FILE. Do not edit! Generated from kzip.cpp by $0" echo "$header" > kozip.cpp -cat ../../../tdelibs/kio/kio/kzip.cpp >> kozip.cpp || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kzip.cpp >> kozip.cpp || exit 1 echo "$header" > kozip.h -cat ../../../tdelibs/kio/kio/kzip.h >> kozip.h || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kzip.h >> kozip.h || exit 1 echo "$header" > kofilterdev.cpp -cat ../../../tdelibs/kio/kio/kfilterdev.cpp >> kofilterdev.cpp || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kfilterdev.cpp >> kofilterdev.cpp || exit 1 echo "$header" > kofilterdev.h -cat ../../../tdelibs/kio/kio/kfilterdev.h >> kofilterdev.h || exit 1 +cat ../../../tdelibs/tdeio/tdeio/kfilterdev.h >> kofilterdev.h || exit 1 echo "$header" > kolimitediodevice.h -cat ../../../tdelibs/kio/kio/klimitediodevice.h >> kolimitediodevice.h || exit 1 +cat ../../../tdelibs/tdeio/tdeio/klimitediodevice.h >> kolimitediodevice.h || exit 1 perl -pi -e 's/KZip/KoZip/g' kozip.cpp kozip.h perl -pi -e 's/kzip\.h/kozip\.h/' kozip.cpp |