diff options
299 files changed, 473 insertions, 473 deletions
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 1de44c31c..84695ce22 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -23,11 +23,11 @@ */ #include <tqwidget.h> -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <klocale.h> -#include <kpopupmenu.h> -#include <kshortcut.h> +#include <tdepopupmenu.h> +#include <tdeshortcut.h> #include <kxmlguifactory.h> #include <tqmap.h> @@ -55,7 +55,7 @@ #include "treenode.h" #include "treenodevisitor.h" #include "tabwidget.h" -#include "kstdaccel.h" +#include "tdestdaccel.h" diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 9fb07f79a..fdfbf447a 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -24,9 +24,9 @@ */ #include <dcopclient.h> #include <kaboutdata.h> -#include <kaction.h> -#include <kactionclasses.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <tdeconfig.h> #include <tdeconfigdialog.h> @@ -34,11 +34,11 @@ #include <kglobalsettings.h> #include <tdehtmldefaults.h> #include <kinstance.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kservice.h> #include <kstandarddirs.h> #include <kstdaction.h> diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 5e0809f62..07507383f 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -58,7 +58,7 @@ #include "treenodevisitor.h" #include "notificationmanager.h" -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcharsets.h> #include <kcombobox.h> @@ -72,7 +72,7 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kpassdlg.h> diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h index 4e2ad4ff6..caf1258bd 100644 --- a/akregator/src/articlelistview.h +++ b/akregator/src/articlelistview.h @@ -24,7 +24,7 @@ #ifndef AKREGATORARTICLELISTVIEW_H #define AKREGATORARTICLELISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> class TQKeyEvent; class TQDragObject; diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 757e56eb3..1b89d87ae 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -27,7 +27,7 @@ #include <tqscrollview.h> #include <tqvaluelist.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp index da53ca16f..6571977e6 100644 --- a/akregator/src/feeditem.cpp +++ b/akregator/src/feeditem.cpp @@ -27,7 +27,7 @@ #include "feeditem.h" #include <tqpopupmenu.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kiconloader.h> #include <tqstring.h> diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index 4451c00fe..28d79d090 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -24,7 +24,7 @@ #ifndef AKREGATORFEEDLISTVIEW_H #define AKREGATORFEEDLISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> #include <kurl.h> namespace Akregator diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp index ed33312ea..166811853 100644 --- a/akregator/src/folderitem.cpp +++ b/akregator/src/folderitem.cpp @@ -28,7 +28,7 @@ #include "treenode.h" #include <tqpopupmenu.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> namespace Akregator { diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 988549e97..351d35125 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -25,7 +25,7 @@ #include <tqregexp.h> #include <tqstylesheet.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kdebug.h> #include <klocale.h> #include <tdeparts/browserextension.h> diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index afe2ecbab..b4276c6d1 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -30,7 +30,7 @@ #include <dcopclient.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 6fb91780b..8e316d7d8 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -29,7 +29,7 @@ #include "pageviewer.h" #include "viewer.h" -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kbookmark.h> #include <kbookmarkmanager.h> @@ -39,9 +39,9 @@ #include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <tdeparts/browserinterface.h> #include <tqclipboard.h> diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui index e2a6998c5..93897cc09 100644 --- a/akregator/src/settings_appearance.ui +++ b/akregator/src/settings_appearance.ui @@ -238,13 +238,13 @@ <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> - <includehint>kfontcombo.h</includehint> + <includehint>tdefontcombo.h</includehint> <includehint>klineedit.h</includehint> - <includehint>kfontcombo.h</includehint> + <includehint>tdefontcombo.h</includehint> <includehint>klineedit.h</includehint> - <includehint>kfontcombo.h</includehint> + <includehint>tdefontcombo.h</includehint> <includehint>klineedit.h</includehint> - <includehint>kfontcombo.h</includehint> + <includehint>tdefontcombo.h</includehint> <includehint>klineedit.h</includehint> </includehints> </UI> diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index d0d69e456..66ce00aea 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -28,7 +28,7 @@ #include "treenode.h" #include "treenodevisitor.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <tqlayout.h> diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index 492e440ac..6940acee1 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <ktabwidget.h> #include <ktabbar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krun.h> #include <klocale.h> #include <tdehtmlview.h> diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index d3bcce299..d517f740b 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqmap.h> #include <tqpopupmenu.h> diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h index b869f9ecd..26abb636d 100644 --- a/akregator/src/tagaction.h +++ b/akregator/src/tagaction.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_TAGACTION_H #define AKREGATOR_TAGACTION_H -#include <kactionclasses.h> +#include <tdeactionclasses.h> class TQString; class TQWidget; diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp index 68bab5a5d..de0b441d0 100644 --- a/akregator/src/tagfolderitem.cpp +++ b/akregator/src/tagfolderitem.cpp @@ -28,7 +28,7 @@ #include "treenode.h" #include <tqpopupmenu.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> namespace Akregator { diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp index 8697a3419..1152935c4 100644 --- a/akregator/src/tagnodeitem.cpp +++ b/akregator/src/tagnodeitem.cpp @@ -27,7 +27,7 @@ #include "tagnodeitem.h" #include "treenode.h" -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <tqpoint.h> diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 441f1baf8..093306f61 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -33,7 +33,7 @@ #include <kglobalsettings.h> #include <dcopclient.h> #include <dcopref.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <tqbitmap.h> diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h index ca1583471..296b47812 100644 --- a/akregator/src/treenodeitem.h +++ b/akregator/src/treenodeitem.h @@ -25,7 +25,7 @@ #ifndef AKREGATORTREENODEITEM_H #define AKREGATORTREENODEITEM_H -#include <klistview.h> +#include <tdelistview.h> class TQPoint; class TQString; diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 57afb3ec2..70a2d5cf4 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -23,14 +23,14 @@ without including the source code for TQt in the source distribution. */ -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdefiledialog.h> #include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <krun.h> #include <kshell.h> diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 170f64268..9e01cc6d0 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -73,12 +73,12 @@ // KDE #include <tdefiledialog.h> #include <kprocess.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <klocale.h> #include <kmessagebox.h> #include <dcopclient.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kstatusbar.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -87,7 +87,7 @@ #include <ktempfile.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> // TQt #include <tqfontmetrics.h> diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 5ed440bd5..c61ce7dba 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -35,7 +35,7 @@ //#include <gpgme.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdepimmacros.h> #include <kurl.h> #include <tqcstring.h> diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 432f2ce99..19224cf9f 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -40,13 +40,13 @@ #include <kleo/cryptobackendfactory.h> #include <kleo/keyfiltermanager.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeconfig.h> #include <kdialog.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kcolordialog.h> #include <tqpushbutton.h> diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp index 268b85eec..e8ea4312f 100644 --- a/certmanager/customactions.cpp +++ b/certmanager/customactions.cpp @@ -32,7 +32,7 @@ #include "customactions.h" -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kapplication.h> #include <tqlineedit.h> diff --git a/certmanager/customactions.h b/certmanager/customactions.h index c07157bd1..67a429f95 100644 --- a/certmanager/customactions.h +++ b/certmanager/customactions.h @@ -33,7 +33,7 @@ #ifndef __CUSTOMACTIONS_H__ #define __CUSTOMACTIONS_H__ -#include <kaction.h> +#include <tdeaction.h> #include <tqstringlist.h> diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 729492547..738f01b1e 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -41,7 +41,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kprocio.h> #include <tdeconfig.h> diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h index 9b6b4cd5f..7df540514 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h @@ -33,7 +33,7 @@ #ifndef KWATCHGNUPGMAINWIN_H #define KWATCHGNUPGMAINWIN_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class KWatchGnuPGTray; class KWatchGnuPGConfig; diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index d2312c725..cc9f0c257 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -41,7 +41,7 @@ #include "kleo/cryptobackendfactory.h" #include "ui/keylistview.h" // for lvi_cast<> -#include <klistview.h> +#include <tdelistview.h> #include <kdialog.h> #include <klocale.h> #include <kdebug.h> @@ -108,7 +108,7 @@ private: }; -// Checklist item under a BackendListViewItem +// Chectdelist item under a BackendListViewItem // (e.g. "GpgME supports protocol OpenPGP") class Kleo::ProtocolCheckListItem : public TQCheckListItem { diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index d6dc823e7..410f4348c 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -32,7 +32,7 @@ #include "cryptoconfigdialog.h" #include "cryptoconfigmodule.h" #include <klocale.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name ) : KDialogBase( Swallow, diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 2f383cc53..4149cb41e 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -33,7 +33,7 @@ #ifndef __KLEO_KEYLISTVIEW_H__ #define __KLEO_KEYLISTVIEW_H__ -#include <klistview.h> +#include <tdelistview.h> #include <gpgmepp/key.h> #include <tdepimmacros.h> diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt index 1cea8dd87..fad0df465 100644 --- a/kaddressbook/CMakeLists.txt +++ b/kaddressbook/CMakeLists.txt @@ -75,7 +75,7 @@ tde_add_kpart( libkaddressbookpart AUTOMOC ##### kaddressbook (executable) ################# tde_add_executable( kaddressbook AUTOMOC - SOURCES main.cpp kaddressbookmain.cpp + SOURCES main.cpp kaddressbootdemain.cpp LINK kaddressbook-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index b411e6189..51d92dd25 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -16,7 +16,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \ bin_PROGRAMS = kaddressbook -kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp +kaddressbook_SOURCES = main.cpp kaddressbootdemain.cpp kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kaddressbook_LDADD = libkaddressbook.la diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index bb4938b89..5cf3b791b 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -36,7 +36,7 @@ #include <tqtoolbutton.h> #include <tqtooltip.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kactivelabel.h> #include <kapplication.h> #include <kbuttonbox.h> @@ -47,7 +47,7 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kseparator.h> diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index a53d6c345..8cffb0c32 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -34,7 +34,7 @@ #include <kabc/resource.h> #include <kabc/stdaddressbook.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kapplication.h> #include <tdeconfig.h> #include <kcombobox.h> diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 13536148a..867ccddb6 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -30,7 +30,7 @@ #include <tqvalidator.h> #include <tqspinbox.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kcombobox.h> #include <kinputdialog.h> #include <klineedit.h> diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 354a24a20..2dce6b05d 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -31,7 +31,7 @@ #include <kapplication.h> #include <kinputdialog.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index de9fff558..aca1c105f 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -158,7 +158,7 @@ <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kactivelabel.h</includehint> </includehints> </UI> diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 62fb36dfc..517e26498 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -26,7 +26,7 @@ #define IMEDITORWIDGET_H #include <tqvaluelist.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdialogbase.h> #include "contacteditorwidget.h" diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 7b5fe4c98..a1df16c3b 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -31,7 +31,7 @@ #include <tqtoolbutton.h> #include <tqtooltip.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index c184adf07..4ec33675d 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 6dda79de6..471769616 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -31,9 +31,9 @@ #include <kdialog.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqevent.h> #include <tqguardedptr.h> diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h index dc4b036d2..fdeb83864 100644 --- a/kaddressbook/features/distributionlistngwidget.h +++ b/kaddressbook/features/distributionlistngwidget.h @@ -27,7 +27,7 @@ #include <kabc/addressee.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <tqstringlist.h> diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index e77e3fc3b..73afa2ea5 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -30,7 +30,7 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h index 59a5d88bd..1429aa7bc 100644 --- a/kaddressbook/features/distributionlistwidget.h +++ b/kaddressbook/features/distributionlistwidget.h @@ -26,7 +26,7 @@ #include <config.h> // for TDEPIM_NEW_DISTRLISTS #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include "extensionwidget.h" diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h index c986c5fca..4c1a6df61 100644 --- a/kaddressbook/features/resourceselection.h +++ b/kaddressbook/features/resourceselection.h @@ -24,7 +24,7 @@ #ifndef RESOURCESELECTION_H #define RESOURCESELECTION_H -#include <klistview.h> +#include <tdelistview.h> #include "extensionwidget.h" diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 3b3e37df1..3845f59fc 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -38,8 +38,8 @@ #include <kdebug.h> #include <kiconloader.h> #include <klineedit.h> -#include <klistbox.h> -#include <klistview.h> +#include <tdelistbox.h> +#include <tdelistview.h> #include <klocale.h> #include "kabprefs.h" diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 55714b368..27333bf99 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -22,7 +22,7 @@ */ #include <kabc/geo.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kcombobox.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index 9f7271201..d11a588ae 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -30,7 +30,7 @@ #include <tqtoolbutton.h> #include <tqtooltip.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index a934bb976..e32a71b28 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -24,7 +24,7 @@ #include <tqmap.h> #include <tqsignalmapper.h> -#include <kaction.h> +#include <tdeaction.h> #include <kinstance.h> #include <kmessagebox.h> #include <kapplication.h> diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index a6f8a20b8..924aa083e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -44,10 +44,10 @@ #include <kabc/vcardconverter.h> #include <kabc/resourcefile.h> #include <kaboutdata.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kapplication.h> #include <dcopclient.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kcmdlineargs.h> #include <kcmultidialog.h> #include <kdebug.h> @@ -63,7 +63,7 @@ #include <kstatusbar.h> #include <kstdguiitem.h> #include <kxmlguiclient.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <libtdepim/addresseeview.h> #include <libtdepim/categoryeditdialog.h> #include <libtdepim/categoryselectdialog.h> diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index cd1c15c7f..07e778df9 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kaddressbook/kaddressbootdemain.cpp b/kaddressbook/kaddressbootdemain.cpp index 4e5cf8ff3..60013be1f 100644 --- a/kaddressbook/kaddressbootdemain.cpp +++ b/kaddressbook/kaddressbootdemain.cpp @@ -32,7 +32,7 @@ #include "kabcore.h" -#include "kaddressbookmain.h" +#include "kaddressbootdemain.h" KAddressBookMain::KAddressBookMain( const TQString &file ) : DCOPObject( "KAddressBookIface" ), TDEMainWindow( 0 ) @@ -189,4 +189,4 @@ void KAddressBookMain::newToolbarConfig() applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); } -#include "kaddressbookmain.moc" +#include "kaddressbootdemain.moc" diff --git a/kaddressbook/kaddressbootdemain.h b/kaddressbook/kaddressbootdemain.h index a8ac77e2d..49e4a8a65 100644 --- a/kaddressbook/kaddressbootdemain.h +++ b/kaddressbook/kaddressbootdemain.h @@ -26,9 +26,9 @@ #include <tqptrlist.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kaddressbookiface.h" diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 21a24780c..0c2484404 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -27,7 +27,7 @@ #include <tqspinbox.h> #include <tqtooltip.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kbuttonbox.h> #include <klineedit.h> #include <klocale.h> diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index d63247a48..6e2c4f68b 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -35,7 +35,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <ktrader.h> diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 981b33cc8..edd805cae 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -32,7 +32,7 @@ #include <kapplication.h> #include <kbuttonbox.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include "addhostdialog.h" diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index fd5a3149d..d08b9ad4d 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -36,7 +36,7 @@ #include <kuniqueapplication.h> #include <twin.h> -#include "kaddressbookmain.h" +#include "kaddressbootdemain.h" #include "kaddressbook_options.h" #include "kabcore.h" diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index aa76fdefb..765d62deb 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -31,12 +31,12 @@ #include <tqstring.h> #include <tqwhatsthis.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kapplication.h> #include <kbuttonbox.h> #include <tdeconfig.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kcombobox.h> #include <klocale.h> #include <kdebug.h> diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 6d3ef0b96..bb1c72451 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -39,7 +39,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kabc/phonenumber.h> diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 949c1783c..adcbe5ec3 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kfontcombo.h> +#include <tdefontcombo.h> #include <kglobalsettings.h> #include <tqlayout.h> #include <klocale.h> diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 4ac23786f..51ed14d87 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -28,7 +28,7 @@ #include <libtdepim/kvcarddrag.h> #include <kabc/addressbook.h> #include <kabc/vcardconverter.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <tdeconfig.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h index 18c307aca..62b7e5a8f 100644 --- a/kaddressbook/views/colorlistbox.h +++ b/kaddressbook/views/colorlistbox.h @@ -21,7 +21,7 @@ #ifndef _COLOR_LISTBOX_H_ #define _COLOR_LISTBOX_H_ -#include <klistbox.h> +#include <tdelistbox.h> class ColorListBox : public TDEListBox { diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 4cfbf9586..2c520ce74 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -37,7 +37,7 @@ #include <klocale.h> #include <kiconloader.h> #include <tdeconfig.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kpushbutton.h> #include "colorlistbox.h" diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index adfbc2dc8..0ca029f64 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -29,7 +29,7 @@ #include <tqtooltip.h> #include <tqstring.h> -#include <klistview.h> +#include <tdelistview.h> #include <kabc/field.h> diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 6928cc601..165e5aba7 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -31,7 +31,7 @@ #include <kglobal.h> #include <tdeconfig.h> #include <kmessagebox.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kabc/addressbook.h> #include <kabc/stdaddressbook.h> #include <kdebug.h> diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h index e680880e8..ccddbd656 100644 --- a/kalarm/birthdaydlg.h +++ b/kalarm/birthdaydlg.h @@ -21,7 +21,7 @@ #define BIRTHDAYDLG_H #include <tqlineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdialogbase.h> #include "alarmevent.h" diff --git a/kalarm/daemon.h b/kalarm/daemon.h index 80afd2739..4feba1bbf 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqdatetime.h> -#include <kaction.h> +#include <tdeaction.h> #include <kalarmd/kalarmd.h> #include <kalarmd/alarmguiiface.h> diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h index d733e19b2..9f043f770 100644 --- a/kalarm/eventlistviewbase.h +++ b/kalarm/eventlistviewbase.h @@ -24,7 +24,7 @@ #include "kalarm.h" #include <tqvaluelist.h> -#include <klistview.h> +#include <tdelistview.h> #include "alarmevent.h" diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index 188324d6b..e550831e0 100644 --- a/kalarm/fontcolour.h +++ b/kalarm/fontcolour.h @@ -24,7 +24,7 @@ #include <tdeversion.h> #include <tqwidget.h> #include <tqstringlist.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include "colourlist.h" class ColourCombo; diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 1177d23c5..9808f06ea 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -39,11 +39,11 @@ #include <tqregexp.h> #include <tdeconfig.h> -#include <kaction.h> +#include <tdeaction.h> #include <kglobal.h> #include <klocale.h> #include <kstdguiitem.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kmessagebox.h> #include <tdefiledialog.h> #include <dcopclient.h> diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 95a988ad9..2db16ff1e 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -25,11 +25,11 @@ #include <tqheader.h> #include <kmenubar.h> -#include <ktoolbar.h> -#include <kpopupmenu.h> -#include <kaccel.h> -#include <kaction.h> -#include <kactionclasses.h> +#include <tdetoolbar.h> +#include <tdepopupmenu.h> +#include <tdeaccel.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <kstdaction.h> #include <kiconloader.h> #include <kmessagebox.h> diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h index 17f55ff8d..8ecdffe24 100644 --- a/kalarm/mainwindowbase.h +++ b/kalarm/mainwindowbase.h @@ -21,7 +21,7 @@ #ifndef MAINWINDOWBASE_H #define MAINWINDOWBASE_H -#include <kmainwindow.h> +#include <tdemainwindow.h> /** diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 7c17edd02..bbc6303ba 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -35,7 +35,7 @@ #include <tqtimer.h> #include <kstandarddirs.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdguiitem.h> #include <kaboutdata.h> #include <klocale.h> diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index fab155e34..c555ce6a0 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <kguiitem.h> #include <kmessagebox.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kdebug.h> #include "editdlg.h" diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h index 2127bce3b..530a073a0 100644 --- a/kalarm/templatelistview.h +++ b/kalarm/templatelistview.h @@ -24,7 +24,7 @@ #include "kalarm.h" #include <tqmap.h> -#include <klistview.h> +#include <tdelistview.h> #include "eventlistviewbase.h" diff --git a/kalarm/templatemenuaction.cpp b/kalarm/templatemenuaction.cpp index 7500b4764..5da72a6d5 100644 --- a/kalarm/templatemenuaction.cpp +++ b/kalarm/templatemenuaction.cpp @@ -20,8 +20,8 @@ #include "kalarm.h" -#include <kactionclasses.h> -#include <kpopupmenu.h> +#include <tdeactionclasses.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include "alarmcalendar.h" diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h index a5d7f1728..abcbf92cd 100644 --- a/kalarm/templatemenuaction.h +++ b/kalarm/templatemenuaction.h @@ -21,7 +21,7 @@ #ifndef TEMPLATEMENUACTION_H #define TEMPLATEMENUACTION_H -#include <kactionclasses.h> +#include <tdeactionclasses.h> class KAEvent; diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 3916ebdd2..5fc29fd72 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -27,12 +27,12 @@ #include <kapplication.h> #include <klocale.h> #include <kaboutdata.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <kstandarddirs.h> #include <kstdaction.h> #include <kstdguiitem.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index c46f96874..7877cd9f8 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <kmenubar.h> #include <kkeydialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <tdeconfig.h> @@ -43,8 +43,8 @@ #include <kmessagebox.h> #include <kstandarddirs.h> #include <kedittoolbar.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kurldrag.h> diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h index 10147d772..54e3dc2a4 100644 --- a/kandy/src/kandy.h +++ b/kandy/src/kandy.h @@ -29,7 +29,7 @@ #endif #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kandyview.h" diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 3be5ed72d..76dfb8008 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <klocale.h> #include <kglobal.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kcolordialog.h> diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index e66909394..788fdc9bd 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <kmenubar.h> #include <kkeydialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> @@ -35,8 +35,8 @@ #include <kedittoolbar.h> #include <kurldrag.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tqpushbutton.h> diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h index b27124c66..1b7a7f427 100644 --- a/kandy/src/mobilemain.h +++ b/kandy/src/mobilemain.h @@ -29,7 +29,7 @@ #endif #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kandyprefs.h" diff --git a/karm/CMakeLists.txt b/karm/CMakeLists.txt index 996a58838..8c785b2f6 100644 --- a/karm/CMakeLists.txt +++ b/karm/CMakeLists.txt @@ -48,7 +48,7 @@ install( FILES karmui.rc DESTINATION ${DATA_INSTALL_DIR}/karmpart ) tde_add_library( karm SHARED AUTOMOC SOURCES - kaccelmenuwatch.cpp desktoptracker.cpp edittaskdialog.cpp + tdeaccelmenuwatch.cpp desktoptracker.cpp edittaskdialog.cpp idletimedetector.cpp printdialog.cpp timekard.cpp karmutility.cpp ktimewidget.cpp karmstorage.cpp mainwindow.cpp preferences.cpp print.cpp task.cpp taskview.cpp tray.cpp csvexportdialog_base.ui diff --git a/karm/Makefile.am b/karm/Makefile.am index cb7760f07..76ae9acf2 100644 --- a/karm/Makefile.am +++ b/karm/Makefile.am @@ -11,7 +11,7 @@ COMPILE_BEFORE_karm = libtdepim tderesources noinst_LTLIBRARIES = libkarm_shared.la -libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \ +libkarm_shared_la_SOURCES = tdeaccelmenuwatch.cpp desktoptracker.cpp \ edittaskdialog.cpp idletimedetector.cpp \ printdialog.cpp timekard.cpp karmutility.cpp ktimewidget.cpp \ karmstorage.cpp mainwindow.cpp preferences.cpp print.cpp \ @@ -25,7 +25,7 @@ karm_SOURCES = main.cpp karm_LDADD = libkarm_shared.la karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \ - idletimedetector.h kaccelmenuwatch.h timekard.h \ + idletimedetector.h tdeaccelmenuwatch.h timekard.h \ karmutility.h ktimewidget.h karmstorage.h mainwindow.h \ preferences.h print.h task.h taskview.h toolicons.h \ tray.h version.h csvexportdialog.h plannerparser.h taskviewwhatsthis.h diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index f56e02c17..d0c86e21b 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -1,15 +1,15 @@ -#include "kaccelmenuwatch.h" +#include "tdeaccelmenuwatch.h" #include "karm_part.h" #include "karmerrors.h" #include "task.h" #include "preferences.h" #include "tray.h" #include "version.h" -#include <kaccel.h> +#include <tdeaccel.h> #include <kinstance.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> #include <kglobal.h> diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 6bfbcc32c..1eebca1e7 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -5,10 +5,10 @@ #include <numeric> -#include "kaccelmenuwatch.h" +#include "tdeaccelmenuwatch.h" #include <dcopclient.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <kapplication.h> // kapp #include <tdeconfig.h> #include <kdebug.h> diff --git a/karm/taskview.h b/karm/taskview.h index db00f5b16..cbb5def75 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -5,7 +5,7 @@ #include <tqptrlist.h> #include <tqptrstack.h> -#include <klistview.h> +#include <tdelistview.h> #include "desktoplist.h" #include "resourcecalendar.h" diff --git a/karm/taskviewwhatsthis.cpp b/karm/taskviewwhatsthis.cpp index 4cc9f7513..1598a8519 100644 --- a/karm/taskviewwhatsthis.cpp +++ b/karm/taskviewwhatsthis.cpp @@ -11,7 +11,7 @@ // #include "taskviewwhatsthis.h" #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> TaskViewWhatsThis::TaskViewWhatsThis( TQWidget* qw ) diff --git a/karm/taskviewwhatsthis.h b/karm/taskviewwhatsthis.h index 1bea3497c..cd2f0dffc 100644 --- a/karm/taskviewwhatsthis.h +++ b/karm/taskviewwhatsthis.h @@ -11,7 +11,7 @@ #define TASKVIEWWHATSTHIS_H #include <tqwhatsthis.h> -#include <klistview.h> +#include <tdelistview.h> /** this is the karm-taskview-specific implementation of qwhatsthis diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp index 4b5952848..5cb223664 100644 --- a/karm/tdeaccelmenuwatch.cpp +++ b/karm/tdeaccelmenuwatch.cpp @@ -1,5 +1,5 @@ /* -* kaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch. +* tdeaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch. * Author: Sirtaj Singh Kang * Generated: Thu Jan 7 15:05:26 EST 1999 */ @@ -7,7 +7,7 @@ #include <assert.h> #include <tqpopupmenu.h> -#include "kaccelmenuwatch.h" +#include "tdeaccelmenuwatch.h" TDEAccelMenuWatch::TDEAccelMenuWatch( TDEAccel *accel, TQObject *parent ) : TQObject( parent ), @@ -110,4 +110,4 @@ TDEAccelMenuWatch::AccelItem *TDEAccelMenuWatch::newAccelItem( TQPopupMenu *, return item; } -#include "kaccelmenuwatch.moc" +#include "tdeaccelmenuwatch.moc" diff --git a/karm/tdeaccelmenuwatch.h b/karm/tdeaccelmenuwatch.h index 388cd06f5..6e432f340 100644 --- a/karm/tdeaccelmenuwatch.h +++ b/karm/tdeaccelmenuwatch.h @@ -1,5 +1,5 @@ /* -* kaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch. +* tdeaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch. * Generated by newclass on Thu Jan 7 15:05:26 EST 1999. */ #ifndef KARM_K_ACCEL_MENU_WATCH_H @@ -8,7 +8,7 @@ #include <tqobject.h> #include <tqptrlist.h> -#include <kaccel.h> +#include <tdeaccel.h> class TQPopupMenu; @@ -19,8 +19,8 @@ class TQPopupMenu; * is connected, we normally have to manually call * TDEAccel::changeMenuAccel() again for each update of the TDEAccel object. * - * With TDEAccelMenuWatch you provide the kaccel object and the menu - * items to which it connects, and if you update the kaccel you just have + * With TDEAccelMenuWatch you provide the tdeaccel object and the menu + * items to which it connects, and if you update the tdeaccel you just have * to call TDEAccelMenuWatch::updateMenus() and the menu items will be updated. * * It is safe to delete menus that have connections handled by this class. @@ -99,7 +99,7 @@ class TDEAccelMenuWatch : public TQObject public slots: /** * Updates all menu accelerators. Call this after all accelerators - * have been connected or the kaccel object has been updated. + * have been connected or the tdeaccel object has been updated. */ void updateMenus(); diff --git a/karm/tray.cpp b/karm/tray.cpp index 2933b8ae8..06d08af26 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -16,12 +16,12 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kaction.h> // actionPreferences() +#include <tdeaction.h> // actionPreferences() #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> // UserIcon #include <klocale.h> // i18n -#include <kpopupmenu.h> // plug() +#include <tdepopupmenu.h> // plug() #include <ksystemtray.h> #include "mainwindow.h" diff --git a/karm/tray.h b/karm/tray.h index 134e34fa6..45b3b7024 100644 --- a/karm/tray.h +++ b/karm/tray.h @@ -5,7 +5,7 @@ #include <tqpixmap.h> #include <tqptrlist.h> // experiement -// #include <kpopupmenu.h> +// #include <tdepopupmenu.h> #include <ksystemtray.h> #include "task.h" diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index 950bd7c7e..887acfaf8 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -37,7 +37,7 @@ #include <tqwidget.h> #include <tqsplitter.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdepimmacros.h> #include "KGanttItem.h" diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index e27140c0e..1abf46d70 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -15,7 +15,7 @@ #include "open.xpm" #include "close.xpm" -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include <kiconloader.h> #include <klocale.h> diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index ec6beeffa..66f44be98 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -36,8 +36,8 @@ #include <tqtimer.h> #include <tqlabel.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> #include <tqptrdict.h> #include <tqaction.h> diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 40a80e62f..f400de142 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -29,10 +29,10 @@ #include <libqopensync/environment.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kstdaction.h> diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp index e67261277..5df9fe219 100644 --- a/kitchensync/src/mainwindow.cpp +++ b/kitchensync/src/mainwindow.cpp @@ -18,10 +18,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kstdaction.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include "mainwidget.h" diff --git a/kitchensync/src/mainwindow.h b/kitchensync/src/mainwindow.h index 4453878b5..d3a0bb6e8 100644 --- a/kitchensync/src/mainwindow.h +++ b/kitchensync/src/mainwindow.h @@ -21,7 +21,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class MainWidget; diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index 0c015e107..dfe7327f6 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqvbox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index ebd61ef89..e13c5dfab 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -134,11 +134,11 @@ set( target kmailprivate ) set( ${target}_SRCS kmmessage.cpp kmmainwin.cpp configuredialog.cpp configuredialog_p.cpp - klistviewindexedsearchline.cpp simplestringlisteditor.cpp index.cpp headeritem.cpp + tdelistviewindexedsearchline.cpp simplestringlisteditor.cpp index.cpp headeritem.cpp identitydrag.cpp identitylistview.cpp identitydialog.cpp kmfolderdia.cpp kmmsgdict.cpp kmfoldertree.cpp kmtransport.cpp kmfoldercombobox.cpp kmaccount.cpp kmheaders.cpp kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp - kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp klistboxdialog.cpp + kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp tdelistboxdialog.cpp kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 066b3489b..a4578baf6 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -347,7 +347,7 @@ please visit http://webcvs.kde.org 1998-11-15 Alex Zepeda <garbanzo@hooked.net> - * kfontutils.cpp (kfontToStr): Cast two const char *'s to char *'s as + * tdefontutils.cpp (tdefontToStr): Cast two const char *'s to char *'s as egcs seems to barf without the casts. 1998-11-10 Harri Porten <porten@kde.org> @@ -636,7 +636,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org> * Fonts: improved font settings. The HTML widget unfortunately only honors the font family. Added new - functions (kfontutils.h) for easy font to/from string + functions (tdefontutils.h) for easy font to/from string conversion. 1998-06-12 Mario Weilguni <mweilguni@kde.org> (KMail-0.7.1) diff --git a/kmail/Makefile.am b/kmail/Makefile.am index 1f398140e..4fc680853 100644 --- a/kmail/Makefile.am +++ b/kmail/Makefile.am @@ -53,7 +53,7 @@ kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdepim -ltdep kmail_LDADD = libkmailprivate.la libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ - configuredialog_p.cpp klistviewindexedsearchline.cpp \ + configuredialog_p.cpp tdelistviewindexedsearchline.cpp \ simplestringlisteditor.cpp index.cpp \ identitydrag.cpp identitylistview.cpp identitydialog.cpp \ kmfolderdia.cpp kmfoldertree.cpp kmtransport.cpp \ @@ -62,7 +62,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp \ kmreaderwin.cpp htmlstatusbar.cpp kmmsgdict.cpp \ kmgroupware.cpp folderstorage.cpp \ - csshelper.cpp klistboxdialog.cpp \ + csshelper.cpp tdelistboxdialog.cpp \ actionscheduler.cpp messageproperty.cpp \ kmmsgpart.cpp kmmsginfo.cpp \ accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \ diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 4f2dfc558..6090f41ee 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -46,7 +46,7 @@ #include <kmessagebox.h> #include <kprotocolinfo.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <netdb.h> #include <netinet/in.h> diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h index cf63c110d..bf79f0968 100644 --- a/kmail/accountdialog.h +++ b/kmail/accountdialog.h @@ -24,7 +24,7 @@ #define _ACCOUNT_DIALOG_H_ #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> #include <tqguardedptr.h> #include "imapaccountbase.h" diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index dc76ac7d2..664b95e3d 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -29,7 +29,7 @@ #include <kdialog.h> #include <tdefiledialog.h> #include <klineedit.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <tqcheckbox.h> diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 92f6e7f13..19d543b3b 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -39,7 +39,7 @@ #include "networkaccount.h" #include "folderrequester.h" -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index 8f28ea5c8..7248b9e51 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -32,7 +32,7 @@ #include "simplefoldertree.h" #include <tdeconfig.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kwizard.h> #include <tqcheckbox.h> diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h index e01fb4ab8..881f8b286 100644 --- a/kmail/attachmentlistview.h +++ b/kmail/attachmentlistview.h @@ -16,7 +16,7 @@ #ifndef _KMAIL_ATTACHMENTLISTVIEW_H_ #define _KMAIL_ATTACHMENTLISTVIEW_H_ -#include <klistview.h> +#include <tdelistview.h> class TQDragEnterEvent; class TQDragMoveEvent; diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index e83463a43..ca5fe114b 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -1,7 +1,7 @@ #include "chiasmuskeyselector.h" #include <klineedit.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <tqlayout.h> diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h index 1e1f48b0f..03ae50690 100644 --- a/kmail/colorlistbox.h +++ b/kmail/colorlistbox.h @@ -21,7 +21,7 @@ #ifndef _COLOR_LISTBOX_H_ #define _COLOR_LISTBOX_H_ -#include <klistbox.h> +#include <tdelistbox.h> class ColorListBox : public TDEListBox { diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index bf8c82fae..c89f58b9e 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -88,7 +88,7 @@ using KMime::DateFormatter; #include <kasciistringtools.h> #include <kdebug.h> #include <knuminput.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kmessagebox.h> #include <kurlrequester.h> #include <kseparator.h> diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 1f7d6f58f..596e8c6bd 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -15,7 +15,7 @@ #include <dcopobject.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdecmodule.h> #include <klocale.h> #include <tdepimmacros.h> diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 00d14cc8b..30b3dcf92 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -35,10 +35,10 @@ #include <kglobal.h> #include <kiconloader.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> #include <tqcombobox.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kmessagebox.h> #include <kkeybutton.h> #include <kactivelabel.h> diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h index 9b8da9943..1af437346 100644 --- a/kmail/customtemplates.h +++ b/kmail/customtemplates.h @@ -26,7 +26,7 @@ #include "customtemplates_base.h" #include "templatesinsertcommand.h" -#include <kshortcut.h> +#include <tdeshortcut.h> struct CustomTemplateItem; typedef TQDict<CustomTemplateItem> CustomTemplateItemList; diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 6f367fd1a..516634ba6 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -33,7 +33,7 @@ #endif #include <libtdepim/kaddrbook.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index a09c19533..9764e2401 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -39,7 +39,7 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeio/global.h> #include <tqheader.h> diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index c15e9247d..df91b8dc6 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <kpushbutton.h> #include <tqregexp.h> diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 5679c8c9e..def8002a0 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -33,7 +33,7 @@ using KPIM::MailListDrag; #include <tdeconfig.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqcursor.h> diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 7dd3a6434..afebb8804 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -31,7 +31,7 @@ #include <stdlib.h> -#include <klistview.h> // include for the base class +#include <tdelistview.h> // include for the base class class KMMsgBase; class KPaintInfo; diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index d626b966b..dba0135be 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -35,11 +35,11 @@ #include <tqvaluevector.h> #include <tqtimer.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include "kmheaders.h" #include "kmsearchpattern.h" diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index 71fb86c2e..f159c69f6 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -33,7 +33,7 @@ #include "kmmsgbase.h" // for KMMsgStatus #include "kmsearchpattern.h" -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <tqvaluevector.h> class TQComboBox; class TQLabel; diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h index 7d4ebbf6c..abe12127a 100644 --- a/kmail/identitylistview.h +++ b/kmail/identitylistview.h @@ -32,7 +32,7 @@ #ifndef __KMAIL_IDENTITYLIST_H__ #define __KMAIL_IDENTITYLIST_H__ -#include <klistview.h> +#include <tdelistview.h> namespace KPIM { class Identity; } class TQDropEvent; diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp index d5374fe42..2129490b0 100644 --- a/kmail/jobscheduler.cpp +++ b/kmail/jobscheduler.cpp @@ -46,7 +46,7 @@ JobScheduler::JobScheduler( TQObject* parent, const char* name ) JobScheduler::~JobScheduler() { - // delete tasks in tasklist (no autodelete for TQValueList) + // delete tasks in tastdelist (no autodelete for TQValueList) for( TaskList::Iterator it = mTaskList.begin(); it != mTaskList.end(); ++it ) { delete (*it); } diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 0b029cdcc..34c994009 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -1238,14 +1238,14 @@ KMCommand::Result KMForwardInlineCommand::execute() if (msgList.count() >= 2) { // Multiple forward uint id = 0; - TQPtrList<KMMessage> linklist; + TQPtrList<KMMessage> lintdelist; for ( KMMessage *msg = msgList.first(); msg; msg = msgList.next() ) { // set the identity if (id == 0) id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt(); // msgText += msg->createForwardBody(); - linklist.append( msg ); + lintdelist.append( msg ); } if ( id == 0 ) id = mIdentity; // use folder identity if no message had an id set @@ -1255,7 +1255,7 @@ KMCommand::Result KMForwardInlineCommand::execute() fwdMsg->setCharset( "utf-8" ); // fwdMsg->setBody( msgText ); - for ( KMMessage *msg = linklist.first(); msg; msg = linklist.next() ) { + for ( KMMessage *msg = lintdelist.first(); msg; msg = lintdelist.next() ) { TemplateParser parser( fwdMsg, TemplateParser::Forward ); parser.setSelection( msg->body() ); // FIXME: Why is this needed? parser.process( msg, 0, true ); @@ -1541,14 +1541,14 @@ KMCommand::Result KMCustomForwardCommand::execute() if (msgList.count() >= 2) { // Multiple forward uint id = 0; - TQPtrList<KMMessage> linklist; + TQPtrList<KMMessage> lintdelist; for ( KMMessage *msg = msgList.first(); msg; msg = msgList.next() ) { // set the identity if (id == 0) id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt(); // msgText += msg->createForwardBody(); - linklist.append( msg ); + lintdelist.append( msg ); } if ( id == 0 ) id = mIdentity; // use folder identity if no message had an id set @@ -1558,7 +1558,7 @@ KMCommand::Result KMCustomForwardCommand::execute() fwdMsg->setCharset( "utf-8" ); // fwdMsg->setBody( msgText ); - for ( KMMessage *msg = linklist.first(); msg; msg = linklist.next() ) { + for ( KMMessage *msg = lintdelist.first(); msg; msg = lintdelist.next() ) { TemplateParser parser( fwdMsg, TemplateParser::Forward ); parser.setSelection( msg->body() ); // FIXME: Why is this needed? parser.process( msg, 0, true ); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index ba8d1615b..3b35854f1 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -71,7 +71,7 @@ using TDERecentAddress::RecentAddresses; #include <tdeio/netaccess.h> -#include "klistboxdialog.h" +#include "tdelistboxdialog.h" #include "messagecomposer.h" #include "chiasmuskeyselector.h" @@ -80,8 +80,8 @@ using TDERecentAddress::RecentAddresses; #include <kcompletionbox.h> #include <kcursor.h> #include <kcombobox.h> -#include <kstdaccel.h> -#include <kpopupmenu.h> +#include <tdestdaccel.h> +#include <tdepopupmenu.h> #include <kedittoolbar.h> #include <kkeydialog.h> #include <kdebug.h> @@ -95,7 +95,7 @@ using TDERecentAddress::RecentAddresses; #include <klocale.h> #include <kapplication.h> #include <kstatusbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kdirwatch.h> #include <kstdguiitem.h> diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 83ed78d56..cfe3ff5e0 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -24,7 +24,7 @@ using KPIM::MailListDrag; #include <kcursor.h> #include <kprocess.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <kmessagebox.h> #include <kurldrag.h> diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h index 87c59528f..35fdecdac 100644 --- a/kmail/kmfilter.h +++ b/kmail/kmfilter.h @@ -23,7 +23,7 @@ #include "kmsearchpattern.h" #include "kmpopheaders.h" -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tqptrlist.h> diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 83342d43d..304219b91 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -29,7 +29,7 @@ using KMail::FilterImporterExporter; #include <tdeconfig.h> #include <kicondialog.h> #include <kkeybutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <kpushbutton.h> // other TQt headers: diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 33118ca4b..6083ea9e7 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -39,7 +39,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kmessagebox.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index da406e3bf..dd04d9f24 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -39,7 +39,7 @@ using KMail::MailingList; #include <tqptrvector.h> #include <sys/types.h> #include <stdio.h> -#include <kshortcut.h> +#include <tdeshortcut.h> class KMMessage; class KMFolderDir; diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index ad13ac2ee..f2a32f6ea 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -57,7 +57,7 @@ #include <kicondialog.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <kpushbutton.h> #include <tqcheckbox.h> diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index f30ab4b3d..8aefbc585 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -8,7 +8,7 @@ #include <kdebug.h> #include <klineedit.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <tqlayout.h> diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 9d18e4c02..067568a1c 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -35,7 +35,7 @@ using namespace KPIM; #include <kiconloader.h> #include <kmessagebox.h> #include <tdeconfig.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <tqpainter.h> diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 740dde839..990918564 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -32,11 +32,11 @@ using namespace KPIM; #include "messageactions.h" #include <kapplication.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kglobalsettings.h> #include <kmessagebox.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kimageio.h> #include <tdeconfig.h> #include <klocale.h> @@ -2301,7 +2301,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) } } - // let klistview do it's thing, expanding/collapsing, selection/deselection + // let tdelistview do it's thing, expanding/collapsing, selection/deselection TDEListView::contentsMousePressEvent(e); /* TQListView's shift-select selects also invisible items. Until that is fixed, we have to deselect hidden items here manually, so the quick diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index 7312189fe..423ec3dcf 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -8,7 +8,7 @@ using KMail::SortCacheItem; using KMail::HeaderItem; -#include <klistview.h> +#include <tdelistview.h> #include <kfoldertree.h> // for KPaintInfo #include <kmmsgbase.h> // for KMMsgStatus diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 9d07a9c6b..c8bb28947 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -16,7 +16,7 @@ #include <kabc/vcardconverter.h> #include <tdeio/netaccess.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kurl.h> #include <kurldrag.h> #include <kmessagebox.h> @@ -69,7 +69,7 @@ void KMLineEdit::insertEmails( const TQStringList & emails ) TQString contents = text(); if ( !contents.isEmpty() ) contents += ','; - // only one address, don't need kpopup to choose + // only one address, don't need tdepopup to choose if ( emails.size() == 1 ) { setText( contents + emails.front() ); return; diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 94d0e6741..155e00be6 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -25,10 +25,10 @@ #include <kopenwith.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <kaccelmanager.h> +#include <tdepopupmenu.h> +#include <tdeaccelmanager.h> #include <kglobalsettings.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kkeydialog.h> #include <kcharsets.h> #include <knotifyclient.h> @@ -40,7 +40,7 @@ #include <kstandarddirs.h> #include <dcopclient.h> #include <kaddrbook.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kstringhandler.h> #include "globalsettings.h" @@ -94,7 +94,7 @@ using KMail::AntiSpamWizard; #include "filterlogdlg.h" using KMail::FilterLogDialog; #include <headerlistquicksearch.h> -#include "klistviewindexedsearchline.h" +#include "tdelistviewindexedsearchline.h" using KMail::HeaderListQuickSearch; #include "kmheaders.h" #include "mailinglistpropertiesdialog.h" @@ -114,7 +114,7 @@ using KMail::HeaderListQuickSearch; #include <assert.h> #include <kstatusbar.h> #include <kstaticdeleter.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmime_mdn.h> #include <kmime_header_parsing.h> @@ -625,7 +625,7 @@ void KMMainWidget::createWidgets(void) this, TQT_SLOT(slotMsgActivated(KMMessage*))); connect( mHeaders, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( startUpdateMessageActionsTimer() ) ); - TQAccel *accel = actionCollection()->kaccel(); + TQAccel *accel = actionCollection()->tdeaccel(); accel->connectItem(accel->insertItem(SHIFT+Key_Left), mHeaders, TQT_SLOT(selectPrevMessage())); accel->connectItem(accel->insertItem(SHIFT+Key_Right), @@ -664,17 +664,17 @@ void KMMainWidget::createWidgets(void) mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMoveMsg()), actionCollection(), "move_message_to_folder" ); - mMoveMsgToFolderAction->plugAccel( actionCollection()->kaccel() ); + mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsg()), actionCollection(), "copy_message_to_folder" ); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToFolder()), actionCollection(), "jump_to_folder" ); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); // create list of folders mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent ); @@ -716,42 +716,42 @@ void KMMainWidget::createWidgets(void) mRemoveDuplicatesAction = new TDEAction( i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this), TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(), TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" ); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree), TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree), TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree), TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders), TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders), TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders), TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); - action->plugAccel( actionCollection()->kaccel() ); + action->plugAccel( actionCollection()->tdeaccel() ); connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgRemoved(int, TQString) ), TQT_SLOT( startUpdateMessageActionsTimer() ) ); @@ -2756,7 +2756,7 @@ void KMMainWidget::setupActions() * as a part, though. */ mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); - mDeleteAction->plugAccel( actionCollection()->kaccel() ); + mDeleteAction->plugAccel( actionCollection()->tdeaccel() ); mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", i18n("Move thread to trashcan") ), @@ -2858,7 +2858,7 @@ void KMMainWidget::setupActions() TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to", CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotPostToML()), actionCollection(), "post_message" ); - newToML->plugAccel( actionCollection()->kaccel() ); + newToML->plugAccel( actionCollection()->tdeaccel() ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), "mail_forward", actionCollection(), @@ -2927,7 +2927,7 @@ void KMMainWidget::setupActions() mUseAction = new TDEAction( i18n("New Message From &Template"), "filenew", Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ), actionCollection(), "use_template" ); - mUseAction->plugAccel( actionCollection()->kaccel() ); + mUseAction->plugAccel( actionCollection()->tdeaccel() ); //----- "Mark Thread" submenu mThreadStatusMenu = new TDEActionMenu ( i18n( "Mark &Thread" ), @@ -3060,7 +3060,7 @@ void KMMainWidget::setupActions() TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(), "display_message" ); - dukeOfMonmoth->plugAccel( actionCollection()->kaccel() ); + dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() ); //----- Go Menu new TDEAction( KGuiItem( i18n("&Next Message"), TQString(), @@ -3938,7 +3938,7 @@ void KMMainWidget::updateFileMenu() //----------------------------------------------------------------------------- void KMMainWidget::setAccelsEnabled( bool enabled ) { - actionCollection()->kaccel()->setEnabled( enabled ); + actionCollection()->tdeaccel()->setEnabled( enabled ); } diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 67290cf36..f790ff0f4 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -31,7 +31,7 @@ #include "kmreaderwin.h" //for inline actions #include "kmkernel.h" // for access to config #include "messageactions.h" -#include <kaction.h> +#include <tdeaction.h> class TQVBoxLayout; class TQSplitter; diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index ae930b55f..2de06c269 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -20,7 +20,7 @@ #ifndef __KMMAINWIN #define __KMMAINWIN -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "tdeversion.h" #include "tqstring.h" diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index 182f2689a..395694fe6 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -35,7 +35,7 @@ #ifndef KMMIMEPARTTREE_H #define KMMIMEPARTTREE_H -#include <klistview.h> +#include <tdelistview.h> #include <tdeio/global.h> #include <tqstring.h> diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h index 1bb3c9466..bb5453052 100644 --- a/kmail/kmpopfiltercnfrmdlg.h +++ b/kmail/kmpopfiltercnfrmdlg.h @@ -21,7 +21,7 @@ #include "kmpopheaders.h" #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqptrlist.h> #include <tqmap.h> diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 8cef9ce36..37534cbd3 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -30,14 +30,14 @@ #include <kapplication.h> #include <kedittoolbar.h> #include <klocale.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <twin.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kdebug.h> #include "kmcommands.h" #include "kmenubar.h" -#include "kpopupmenu.h" +#include "tdepopupmenu.h" #include "kmreaderwin.h" #include "kmfolder.h" #include "kmmainwidget.h" diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 31f7356b6..f75137ee7 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -93,7 +93,7 @@ using KMail::TeeHtmlWriter; // for the click on attachment stuff (dnaber): #include <kuserprofile.h> #include <kcharsets.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> // Sven's : for access and getpid #include <kcursor.h> #include <kdebug.h> @@ -105,7 +105,7 @@ using KMail::TeeHtmlWriter; #include <ktempfile.h> #include <kprocess.h> #include <kdialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kmdcodec.h> #include <kasciistricmp.h> @@ -440,7 +440,7 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, mSavedRelativePosition( 0 ), mDecrytMessageOverwrite( false ), mShowSignatureDetails( false ), - mShowAttachmentQuicklist( true ), + mShowAttachmentQuictdelist( true ), mShowRawToltecMail( false ) { mExternalWindow = (aParent == mainWindow ); @@ -2872,12 +2872,12 @@ void KMReaderWin::injectAttachments() TQString visibility; TQString urlHandle; TQString imgSrc; - if( !showAttachmentQuicklist() ) { - urlHandle.append( "kmail:showAttachmentQuicklist" ); - imgSrc.append( "attachmentQuicklistClosed.png" ); + if( !showAttachmentQuictdelist() ) { + urlHandle.append( "kmail:showAttachmentQuictdelist" ); + imgSrc.append( "attachmentQuictdelistClosed.png" ); } else { - urlHandle.append( "kmail:hideAttachmentQuicklist" ); - imgSrc.append( "attachmentQuicklistOpened.png" ); + urlHandle.append( "kmail:hideAttachmentQuictdelist" ); + imgSrc.append( "attachmentQuictdelistOpened.png" ); } TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() ); @@ -2919,7 +2919,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor if ( !subHtml.isEmpty() ) { TQString visibility; - if ( !showAttachmentQuicklist() ) { + if ( !showAttachmentQuictdelist() ) { visibility.append( "display:none;" ); } diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index 6251a4849..d89d184b6 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -319,10 +319,10 @@ public: void setShowSignatureDetails( bool showDetails = true ) { mShowSignatureDetails = showDetails; } /* show or hide the list that points to the attachments */ - bool showAttachmentQuicklist() const { return mShowAttachmentQuicklist; } + bool showAttachmentQuictdelist() const { return mShowAttachmentQuictdelist; } /* show or hide the list that points to the attachments */ - void setShowAttachmentQuicklist( bool showAttachmentQuicklist = true ) { mShowAttachmentQuicklist = showAttachmentQuicklist; } + void setShowAttachmentQuictdelist( bool showAttachmentQuictdelist = true ) { mShowAttachmentQuictdelist = showAttachmentQuictdelist; } // This controls whether a Toltec invitation is shown in its raw form or as a replacement text. // This can be toggled with the "kmail:showRawToltecMail" link. @@ -609,7 +609,7 @@ private: int mLevelQuote; bool mDecrytMessageOverwrite; bool mShowSignatureDetails; - bool mShowAttachmentQuicklist; + bool mShowAttachmentQuictdelist; bool mShowRawToltecMail; bool mExternalWindow; }; diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index f75b53a07..1eb9f467f 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -29,13 +29,13 @@ using KMail::AccountManager; #include "globalsettings.h" #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kglobalsettings.h> #include <kiconloader.h> #include <kiconeffect.h> #include <twin.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqpainter.h> #include <tqbitmap.h> diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index 2e1aac7f6..0b8c3cad6 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -23,8 +23,8 @@ #include "kmmessage.h" #include "kmreaderwin.h" -#include <kaction.h> -#include <kactioncollection.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> #include <kdebug.h> #include <klocale.h> @@ -109,7 +109,7 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mEditAction = new TDEAction( i18n("&Edit Message"), "edit", Key_T, this, TQT_SLOT(editCurrentMessage()), mActionCollection, "edit" ); - mEditAction->plugAccel( mActionCollection->kaccel() ); + mEditAction->plugAccel( mActionCollection->tdeaccel() ); updateActions(); } diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index da10d4428..574c0838f 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -37,7 +37,7 @@ #define REALLY_WANT_KMCOMPOSEWIN_H #include "kmcomposewin.h" #undef REALLY_WANT_KMCOMPOSEWIN_H -#include "klistboxdialog.h" +#include "tdelistboxdialog.h" #include "kcursorsaver.h" #include "messagesender.h" #include "kmfolder.h" @@ -73,7 +73,7 @@ #include <klocale.h> #include <kinputdialog.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqfile.h> #include <tqtextcodec.h> #include <tqtextedit.h> diff --git a/kmail/pics/CMakeLists.txt b/kmail/pics/CMakeLists.txt index ea728f8b7..0e515b834 100644 --- a/kmail/pics/CMakeLists.txt +++ b/kmail/pics/CMakeLists.txt @@ -25,6 +25,6 @@ install( FILES enterprise_left.png enterprise_right.png enterprise_s_left.png enterprise_sbar.png enterprise_s_right.png enterprise_sp_right.png enterprise_top_left.png enterprise_top.png enterprise_top_right.png - enterprise_sw.png enterprise_w.png attachmentQuicklistClosed.png - attachmentQuicklistOpened.png + enterprise_sw.png enterprise_w.png attachmentQuictdelistClosed.png + attachmentQuictdelistOpened.png DESTINATION ${DATA_INSTALL_DIR}/kmail/pics ) diff --git a/kmail/pics/Makefile.am b/kmail/pics/Makefile.am index 8c185ddb9..4b420013c 100644 --- a/kmail/pics/Makefile.am +++ b/kmail/pics/Makefile.am @@ -27,8 +27,8 @@ pics_DATA = kmmsgdel.png kmmsgnew.png kmmsgunseen.png kmmsgread.png \ enterprise_top_right.png \ enterprise_sw.png \ enterprise_w.png \ - attachmentQuicklistClosed.png \ - attachmentQuicklistOpened.png + attachmentQuictdelistClosed.png \ + attachmentQuictdelistOpened.png picsdir = $(kde_datadir)/kmail/pics diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index e20b1f136..ceea3a527 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -41,7 +41,7 @@ using KPIM::BroadcastStatus; #include <kstandarddirs.h> #include <klocale.h> #include <kmessagebox.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeio/scheduler.h> #include <tdeio/passdlg.h> #include <tdeconfig.h> diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 8b320d720..3ae2ad81d 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -32,7 +32,7 @@ #include <kabc/distributionlist.h> #endif -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kabc/resource.h> #include <kiconloader.h> diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index ede82ba85..96401e17a 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -25,8 +25,8 @@ #include "recipientseditor.h" -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> #include <kabc/addressee.h> #include <kabc/stdaddressbook.h> diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h index fa37523a1..560b707de 100644 --- a/kmail/secondarywindow.h +++ b/kmail/secondarywindow.h @@ -31,7 +31,7 @@ #ifndef __KMAIL_SECONDARYWINDOW_H__ #define __KMAIL_SECONDARYWINDOW_H__ -#include <kmainwindow.h> +#include <tdemainwindow.h> class TQCloseEvent; diff --git a/kmail/simplefoldertree.h b/kmail/simplefoldertree.h index 308ef4b98..f8102d8b5 100644 --- a/kmail/simplefoldertree.h +++ b/kmail/simplefoldertree.h @@ -26,8 +26,8 @@ #include "treebase.h" #include <kdebug.h> -#include <klistview.h> -#include <kpopupmenu.h> +#include <tdelistview.h> +#include <tdepopupmenu.h> #include <kiconloader.h> class KMFolder; diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 1c3e40c87..f6af12728 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -22,7 +22,7 @@ #include <kpushbutton.h> #include <ktextedit.h> #include "kkeybutton.h" -#include "kactioncollection.h" +#include "tdeactioncollection.h" #include "kmessagebox.h" /* diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp index dc62333cb..3e10cd90e 100644 --- a/kmail/snippetitem.cpp +++ b/kmail/snippetitem.cpp @@ -13,7 +13,7 @@ #include "snippetitem.h" -#include <kaction.h> +#include <tdeaction.h> #include <tqstring.h> diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index 395b62cb4..2111664eb 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -14,7 +14,7 @@ #ifndef SNIPPETITEM_H #define SNIPPETITEM_H -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <tqobject.h> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 601174cfd..c5ccdd9e6 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -16,14 +16,14 @@ #include <klocale.h> #include <tqlayout.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqheader.h> #include <klineedit.h> #include <ktextedit.h> #include <kmessagebox.h> #include <tdeconfig.h> #include <tqtooltip.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqregexp.h> #include <tqinputdialog.h> #include <tqlabel.h> @@ -34,8 +34,8 @@ #include <kcombobox.h> #include <kmedit.h> #include <kiconloader.h> -#include <kshortcut.h> -#include <kaction.h> +#include <tdeshortcut.h> +#include <tdeaction.h> #include <kkeybutton.h> #include "snippetdlg.h" diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index 8471f0556..90ee88954 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -15,7 +15,7 @@ #include <tqwidget.h> #include <tqstring.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqtooltip.h> #include <tqrect.h> diff --git a/kmail/tdelistboxdialog.cpp b/kmail/tdelistboxdialog.cpp index eaa627bb7..89fd00936 100644 --- a/kmail/tdelistboxdialog.cpp +++ b/kmail/tdelistboxdialog.cpp @@ -3,7 +3,7 @@ #include <config.h> #endif -#include "klistboxdialog.h" +#include "tdelistboxdialog.h" #include <tqlabel.h> #include <tqlayout.h> @@ -80,4 +80,4 @@ void TDEListBoxDialog::highlighted( const TQString& txt ) selectedString = txt; } -#include "klistboxdialog.moc" +#include "tdelistboxdialog.moc" diff --git a/kmail/tdelistviewindexedsearchline.cpp b/kmail/tdelistviewindexedsearchline.cpp index b8895ff08..64a2a220c 100644 --- a/kmail/tdelistviewindexedsearchline.cpp +++ b/kmail/tdelistviewindexedsearchline.cpp @@ -27,7 +27,7 @@ * your version. */ -#include "klistviewindexedsearchline.h" +#include "tdelistviewindexedsearchline.h" #include <kdebug.h> #include <sys/types.h> #include <sys/stat.h> @@ -70,5 +70,5 @@ bool TDEListViewIndexedSearchLine::itemMatches( const TQListViewItem* item, cons return KMail::HeaderListQuickSearch::itemMatches( item, s ); } -#include "klistviewindexedsearchline.moc" +#include "tdelistviewindexedsearchline.moc" diff --git a/kmail/tdelistviewindexedsearchline.h b/kmail/tdelistviewindexedsearchline.h index abd6e817f..6f1098925 100644 --- a/kmail/tdelistviewindexedsearchline.h +++ b/kmail/tdelistviewindexedsearchline.h @@ -31,7 +31,7 @@ #include <klineedit.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include "headerlistquicksearch.h" #include <tqhbox.h> diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index 41a0cb0eb..2bfabd933 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -21,9 +21,9 @@ #include <config.h> #include <tqpushbutton.h> -#include <kaction.h> -#include <kactionclasses.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tqsignalmapper.h> #include <kdebug.h> diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index bda40c121..df941516c 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -23,7 +23,7 @@ #include "simplefoldertree.h" #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> using namespace KMail; diff --git a/kmail/treebase.h b/kmail/treebase.h index ff0e68d66..23b2bd3d0 100644 --- a/kmail/treebase.h +++ b/kmail/treebase.h @@ -24,7 +24,7 @@ #include "kmfoldertree.h" #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> namespace KMail { diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 65c18d731..1627cec62 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -444,16 +444,16 @@ namespace { return true; } - if ( url.path() == "showAttachmentQuicklist" ) { + if ( url.path() == "showAttachmentQuictdelist" ) { w->saveRelativePosition(); - w->setShowAttachmentQuicklist( true ); + w->setShowAttachmentQuictdelist( true ); w->update( true ); return true; } - if ( url.path() == "hideAttachmentQuicklist" ) { + if ( url.path() == "hideAttachmentQuictdelist" ) { w->saveRelativePosition(); - w->setShowAttachmentQuicklist( false ); + w->setShowAttachmentQuictdelist( false ); w->update( true ); return true; } @@ -490,9 +490,9 @@ namespace { return i18n("Show signature details."); if ( url.path() == "hideSignatureDetails" ) return i18n("Hide signature details."); - if ( url.path() == "hideAttachmentQuicklist" ) + if ( url.path() == "hideAttachmentQuictdelist" ) return i18n( "Hide attachment list" ); - if ( url.path() == "showAttachmentQuicklist" ) + if ( url.path() == "showAttachmentQuictdelist" ) return i18n( "Show attachment list" ); } return TQString() ; diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 3d867b3d7..5e8ac37c1 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -28,7 +28,7 @@ #include <kmenubar.h> #include <kstatusbar.h> #include <kkeydialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> #include <kmessagebox.h> @@ -36,8 +36,8 @@ #include <kedittoolbar.h> -#include <kstdaccel.h> -#include <kaction.h> +#include <tdestdaccel.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kpushbutton.h> diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h index a91c4cce3..f2d6d613f 100644 --- a/kmobile/kmobile.h +++ b/kmobile/kmobile.h @@ -6,7 +6,7 @@ #define _KMOBILE_H_ #include <kapplication.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <ktrader.h> #include "kmobileview.h" diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index b18faa976..a7cef5b8e 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -17,10 +17,10 @@ */ #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpassivepopup.h> -#include <kaction.h> -#include <kmainwindow.h> +#include <tdeaction.h> +#include <tdemainwindow.h> #include <kiconeffect.h> #include <kdebug.h> diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 6e7c4f613..dfe1a7cc5 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -27,7 +27,7 @@ #include <tqtextcodec.h> #include <tqtimer.h> -#include <kaction.h> +#include <tdeaction.h> #include <kaddrbook.h> #include <kapplication.h> #include <kbookmarkmanager.h> diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 6bfea7042..1952f8136 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kdebug.h> #include <tdeversion.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "knglobals.h" #include "knconfigmanager.h" diff --git a/knode/headerview.h b/knode/headerview.h index 4a297c817..1b74d3639 100644 --- a/knode/headerview.h +++ b/knode/headerview.h @@ -17,7 +17,7 @@ #include <tqtooltip.h> -#include <klistview.h> +#include <tdelistview.h> #include <kfoldertree.h> #include <kmime_util.h> diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index 22e37171d..90cf0e7de 100644 --- a/knode/knarticlewindow.cpp +++ b/knode/knarticlewindow.cpp @@ -17,8 +17,8 @@ #include <kstdaction.h> #include <tdeconfig.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include "knarticle.h" #include "articlewidget.h" diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h index 5feafa033..b8171da57 100644 --- a/knode/knarticlewindow.h +++ b/knode/knarticlewindow.h @@ -15,7 +15,7 @@ #ifndef KNARTICLEWINDOW_H #define KNARTICLEWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class KNArticle; class KNArticleCollection; diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 2f45a30ad..a8e9088ce 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -15,9 +15,9 @@ #include <tqheader.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "knglobals.h" #include "knconfig.h" diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 555d224aa..d6617fd9c 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -22,15 +22,15 @@ using KPIM::AddressesDialog; #include "recentaddresses.h" using TDERecentAddress::RecentAddresses; -#include <kaccel.h> +#include <tdeaccel.h> #include <kcharsets.h> #include <kmessagebox.h> #include <kabc/addresseedialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kkeydialog.h> #include <kedittoolbar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdefiledialog.h> #include <kdebug.h> #include <klineedit.h> diff --git a/knode/kncomposer.h b/knode/kncomposer.h index 2f136f11c..d12a05139 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -15,9 +15,9 @@ #ifndef KNCOMPOSER_H #define KNCOMPOSER_H -#include <klistview.h> +#include <tdelistview.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kdialogbase.h> #include <keditcl.h> #include <tqlineedit.h> diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 48447cbc1..c8f849eaf 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -22,7 +22,7 @@ #include <knumvalidator.h> #include <kmessagebox.h> #include <kcolordialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <tdefiledialog.h> #include <kuserprofile.h> #include <kopenwith.h> diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index b7401f1ac..9efc23dce 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -16,7 +16,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h index 3172ce788..fec9a9f72 100644 --- a/knode/knfiltermanager.h +++ b/knode/knfiltermanager.h @@ -18,7 +18,7 @@ #include <tqglobal.h> #include <tqvaluelist.h> -#include <kaction.h> +#include <tdeaction.h> namespace KNConfig { class FilterListWidget; diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h index 5b69e947e..a39140ac4 100644 --- a/knode/knhdrviewitem.h +++ b/knode/knhdrviewitem.h @@ -17,7 +17,7 @@ #ifndef KNHDRVIEWITEM_H #define KNHDRVIEWITEM_H -#include <klistview.h> +#include <tdelistview.h> #include "headerview.h" class KNArticle; diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index d4ae80256..ec2176347 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -15,10 +15,10 @@ #include <tqhbox.h> #include <tqlayout.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kinputdialog.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kxmlguiclient.h> #include <tdeconfig.h> #include <kmessagebox.h> @@ -64,7 +64,7 @@ using TDERecentAddress::RecentAddresses; #include "knmemorymanager.h" #include <kcmdlineargs.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> using namespace KNode; diff --git a/knode/knode.h b/knode/knode.h index 5d89532b7..f4bbf19fa 100644 --- a/knode/knode.h +++ b/knode/knode.h @@ -21,7 +21,7 @@ #include <config.h> #endif -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kdialogbase.h> #include "resource.h" diff --git a/knotes/knote.cpp b/knotes/knote.cpp index ea96d4c80..c19b1ec10 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -34,11 +34,11 @@ #include <kapplication.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kcombobox.h> -#include <ktoolbar.h> -#include <kpopupmenu.h> +#include <tdetoolbar.h> +#include <tdepopupmenu.h> #include <kxmlguibuilder.h> #include <kxmlguifactory.h> #include <kcolordrag.h> diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index 17ede6699..752061a60 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -32,7 +32,7 @@ #include <kcolorbutton.h> #include <knuminput.h> #include <klineedit.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <twin.h> #include "knote.h" diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 62fe2a4be..7ebb44354 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kurldrag.h> #include <kstdaction.h> #include <kcolordialog.h> diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 069bf9da8..c31be4803 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -23,14 +23,14 @@ #include <tqtooltip.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kxmlguifactory.h> #include <kxmlguibuilder.h> #include <ksystemtray.h> #include <klocale.h> #include <kiconeffect.h> #include <kstandarddirs.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <khelpmenu.h> #include <kfind.h> #include <kfinddialog.h> diff --git a/kontact/Thoughts b/kontact/Thoughts index 2fd493fcd..f34164844 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -155,7 +155,7 @@ Don: available (and parts too like the todo list) Don: Don: But are you sure Kparts is limited in this way? KOrganizer can load Don: multiple plugins simultaneously. And all of these plugins are tdeparts -Don: (eg. birthday import), and kactions for all loaded plugins are +Don: (eg. birthday import), and tdeactions for all loaded plugins are Don: created and made available simultaneously. Don: Don: Yeah, I'm quite positive you can load multiple parts simultaneously. diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index 81740c7b7..b977cfd34 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -27,7 +27,7 @@ #include <dcopclient.h> #include <dcopref.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <kdebug.h> diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 929bd1b83..0e9f43451 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <tqdragobject.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp index dfea5944d..7ebac4fb2 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp +++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 3ca4c9036..ba05ddd09 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -27,12 +27,12 @@ #include <dcopref.h> #include <kaboutdata.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include "kcmkmailsummary.h" diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 051d69b95..6db41f4cb 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -23,7 +23,7 @@ #include <tqwidget.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index eded07cbd..bbe5d9551 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -30,7 +30,7 @@ #include <tdeparts/componentfactory.h> #include <kgenericfactory.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index d73bd1fbe..9cdb854e9 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -24,7 +24,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmessagebox.h> #include <libtdepim/infoextension.h> diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 648c94c2d..8e11e4f15 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -35,15 +35,15 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <klocale.h> #include <kiconview.h> #include <kglobal.h> #include <kiconloader.h> #include <kiconeffect.h> #include <klineedit.h> -#include <ktoolbar.h> -#include <kpopupmenu.h> +#include <tdetoolbar.h> +#include <tdepopupmenu.h> #include <kdialogbase.h> #include <kxmlguiclient.h> #include <kxmlguifactory.h> diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index adf704b1d..d6414cbc1 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -20,7 +20,7 @@ #include <dcopref.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index d75bfe76d..0c0af4a3c 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index acc95d0f2..ab574346d 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -29,7 +29,7 @@ #include <kaboutdata.h> #include <kapplication.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 00ed1e532..7f04a0c7f 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -29,7 +29,7 @@ #include <kapplication.h> #include <kabc/vcardconverter.h> -#include <kaction.h> +#include <tdeaction.h> #include <dcopref.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 416b0a5ad..02e3eb106 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klocale.h> #include <tdeparts/part.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> #include <libkcal/event.h> diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 5c6ce7e9d..7fbc2a9c3 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <kabc/vcardconverter.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 996ea070f..3089c9876 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klocale.h> #include <tdeparts/part.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> #include <libkcal/resourcecalendar.h> diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index ce433d053..72132b997 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -33,11 +33,11 @@ #include <kaboutdata.h> #include <kapplication.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kpushbutton.h> diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index e88911bad..08131e57b 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -31,7 +31,7 @@ #include <kaboutdata.h> #include <kapplication.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 32aab8d0a..e55f19359 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -38,7 +38,7 @@ #include <kiconloader.h> #include <klocale.h> #include <tdeparts/part.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> #include <libkcal/event.h> diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h index 75cd79821..3f1cdd69e 100644 --- a/kontact/plugins/summary/kcmkontactsummary.h +++ b/kontact/plugins/summary/kcmkontactsummary.h @@ -26,7 +26,7 @@ #define KCMKONTACTSUMMARY_H #include <tdecmodule.h> -#include <klistview.h> +#include <tdelistview.h> class KPluginInfo; diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 335651cbd..41ef1eec8 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -27,7 +27,7 @@ #include <tqtimer.h> #include <dcopclient.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kdcopservicestarter.h> diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 21c3a24c5..23e2ff8a2 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -25,7 +25,7 @@ #include <kgenericfactory.h> #include <tdeparts/componentfactory.h> #include <kaboutdata.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqpopupmenu.h> diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 846717ee8..c360ba523 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -32,7 +32,7 @@ #include <kmessagebox.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <dcopclient.h> diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index b5ca0462f..db375d278 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kgenericfactory.h> #include <kstatusbar.h> diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index de16ee72d..6c490880c 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -36,7 +36,7 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kapplication.h> #include <kdialog.h> #include <klocale.h> diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index f7887b83e..4cfbd5556 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -23,7 +23,7 @@ #include <tqtooltip.h> -#include <klistbox.h> +#include <tdelistbox.h> #include "sidepanebase.h" #include "prefs.h" diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 2d9daffd9..d2f9d0a23 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -28,7 +28,7 @@ #include <kaboutdata.h> #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <ktrader.h> diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index c7976bd42..8c82fa5f9 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -43,15 +43,15 @@ #include <kiconloader.h> #include <kkeydialog.h> #include <klibloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include <kmessagebox.h> #include <tdeparts/componentfactory.h> #include <kplugininfo.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <ksettings/dialog.h> #include <ksettings/dispatcher.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> @@ -67,7 +67,7 @@ #include <krun.h> #include <kaboutdata.h> #include <kmenubar.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kcmultidialog.h> #include <kipc.h> diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index 6d1372deb..328848401 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -26,7 +26,7 @@ #include "profilemanager.h" #include <tdefiledialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 7eef7539c..30f2c262f 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -55,12 +55,12 @@ #include <libkmime/kmime_message.h> #include <dcopclient.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdefiledialog.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <kkeydialog.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <ktip.h> #include <ktempfile.h> @@ -69,7 +69,7 @@ #include <knotifyclient.h> #include <kstdguiitem.h> #include <tdeversion.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kcmdlineargs.h> #include <tqapplication.h> diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h index 64d3dbfb8..c3e2b1862 100644 --- a/korganizer/customlistviewitem.h +++ b/korganizer/customlistviewitem.h @@ -26,7 +26,7 @@ #include <tqmap.h> #include <tqstring.h> -#include <klistview.h> +#include <tdelistview.h> template<class T> class CustomListViewItem : public TDEListViewItem diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index a8a8095ea..13de8f7ea 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -52,7 +52,7 @@ #ifndef NODND #include <tqcursor.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <X11/Xlib.h> #undef FocusIn #undef KeyPress diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index ae8e15af1..f25b9c115 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -47,8 +47,8 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <kstdaction.h> -#include <kactioncollection.h> -#include <kpopupmenu.h> +#include <tdeactioncollection.h> +#include <tdepopupmenu.h> #include <kprotocolinfo.h> #include <klineedit.h> #include <kseparator.h> diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index bb4f7b109..97fac51cc 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -24,7 +24,7 @@ #ifndef _KOEDITORDETAILS_H #define _KOEDITORDETAILS_H -#include <klistview.h> +#include <tdelistview.h> #include "customlistviewitem.h" #include "koattendeeeditor.h" diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 3562bc16b..3d331ed07 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -24,7 +24,7 @@ #include <tqcursor.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <klocale.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 89b4851e2..124c38fbe 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqcursor.h> #include <tqregexp.h> diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 55de923ac..8b6881260 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -47,7 +47,7 @@ #include <kmessagebox.h> #include <knotifyclient.h> #include <kcombobox.h> -#include <klistview.h> +#include <tdelistview.h> #include <twin.h> #include <klockfile.h> diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index d20d30f9c..6c3e22564 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -34,9 +34,9 @@ #include <kurl.h> #include <kstandarddirs.h> #include <dcopclient.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <tqtooltip.h> diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index 89014c46b..6bbcdaeea 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -58,9 +58,9 @@ #include <kdebug.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <tdefiledialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kedittoolbar.h> #include <ktempfile.h> diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 22a6e3ec3..cce2c88d1 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -40,11 +40,11 @@ #include <libkcal/calendarresources.h> #include <libkcal/resourcecalendar.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kinstance.h> #include <klocale.h> #include <kiconloader.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kstandarddirs.h> #include <tdeconfig.h> diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 48a3da844..662f6b136 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -28,7 +28,7 @@ #include <tqmap.h> #include <tqtooltip.h> -#include <klistview.h> +#include <tdelistview.h> #include <libkcal/todo.h> #include <korganizer/baseview.h> diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 5d277ac8d..ec53ba360 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -27,7 +27,7 @@ #include <tqtabwidget.h> #include <libkcal/calendarresources.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <tdeconfig.h> #include <kglobal.h> diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index dc4dfe4ca..bacb04760 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -28,7 +28,7 @@ #include <kmessagebox.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kglobal.h> #include "korganizer/korganizer.h" diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 8177e797a..636309a93 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -24,7 +24,7 @@ #include <kstandarddirs.h> #include <klocale.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kglobal.h> #include "koprojectview.h" diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 21b073b38..9853ac871 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -24,7 +24,7 @@ #include <kstandarddirs.h> #include <klocale.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kglobal.h> #include "kotimespanview.h" diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index bdeb116d4..2dd4953bb 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -30,7 +30,7 @@ #include <dcopref.h> #include <kcolordialog.h> #include <kdialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kdebug.h> #include <kglobal.h> diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 1732a775a..3bc983433 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -88,6 +88,6 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index ad4c40bd1..f59fa7b5e 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -21,7 +21,7 @@ #include "mailsubject.h" #include <kaboutapplication.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <kbugreport.h> #include <tdeconfig.h> @@ -31,9 +31,9 @@ #include <kiconloader.h> #include <klocale.h> #include <kpassivepopup.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprocess.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tqbitmap.h> #include <tqcolor.h> diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 7e2b53a89..fb24c821b 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -26,7 +26,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <kpassivepopup.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tqbitmap.h> diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index fef3dbefa..2cee96650 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -20,11 +20,11 @@ #include "label.h" -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <kdebug.h> #include <kpassivepopup.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> #include <tqcursor.h> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index 785b94fb7..92f81be8f 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -27,7 +27,7 @@ class TDEConfig; #include <kcolorbutton.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <klocale.h> #include <kicondialog.h> #include <kurlrequester.h> diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h index 189f1a70d..cdf7bccfa 100644 --- a/korn/subjectsdlg.h +++ b/korn/subjectsdlg.h @@ -2,7 +2,7 @@ #define KornSubjectsDlg_h #include<kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include<tqvaluevector.h> #include <kpushbutton.h> diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index 222c3f1b3..a6ffe4d94 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -23,7 +23,7 @@ #include "qwmf.h" #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmimetype.h> #include <kdebug.h> #include <klocale.h> diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index ce443f36d..919b85480 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -276,6 +276,6 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index ecd17bd22..735085331 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -26,19 +26,19 @@ #include "messagepropertydialog.h" #include <tqpopupmenu.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kapplication.h> #include <kiconloader.h> #include <tqpixmap.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <tqmessagebox.h> #include <tdefiledialog.h> #include <tqdir.h> #include <kprocess.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kdialogbase.h> #include <ktempfile.h> diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h index 3d7901b0e..491d6aa77 100644 --- a/ktnef/gui/ktnefmain.h +++ b/ktnef/gui/ktnefmain.h @@ -18,7 +18,7 @@ #ifndef KTNEFMAIN_H #define KTNEFMAIN_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqstring.h> #include <tqlistview.h> diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index f6ffc6f81..0ddec104f 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -18,7 +18,7 @@ #ifndef KTNEFWIDGET_H #define KTNEFWIDGET_H -#include <klistview.h> +#include <tdelistview.h> #include <tqptrlist.h> #include <tdepimmacros.h> diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp index 73aba4ff9..ba4dad91f 100644 --- a/ktnef/gui/messagepropertydialog.cpp +++ b/ktnef/gui/messagepropertydialog.cpp @@ -19,7 +19,7 @@ #include "attachpropertydialog.h" #include "ktnef/ktnefmessage.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> MessagePropertyDialog::MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg ) diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 88111073c..6ac64e611 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -20,7 +20,7 @@ #include "confirmsavedialog.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <tqlayout.h> diff --git a/libkcal/tests/runtestcase.pl b/libkcal/tests/runtestcase.pl index ce8254792..4cad27cc6 100755 --- a/libkcal/tests/runtestcase.pl +++ b/libkcal/tests/runtestcase.pl @@ -61,11 +61,11 @@ if ( system( $cmd ) != 0 ) { exit 1; } -chectdefile( $file, $outfile ); +checkfile( $file, $outfile ); exit 0; -sub chectdefile() +sub checkfile() { my $file = shift; my $outfile = shift; diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index e8bc83f22..4062d1e4f 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -37,7 +37,7 @@ #include <kcharsets.h> #include <kseparator.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeconfigbase.h> #include <tdeconfig.h> #include <kprogress.h> diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 4fafacf9b..89bc53ff8 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kmessagebox.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kurl.h> #include <kdebug.h> #include <krfcdate.h> diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 68e79b2b2..ebcd0800c 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -46,7 +46,7 @@ #include <kdebug.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kurldrag.h> #include <klocale.h> diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 4549d3768..a5221c647 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -31,7 +31,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include "addresseeselector.h" diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index dfe955403..20c06c94d 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -28,7 +28,7 @@ #include <kabc/addressee.h> #include <kabc/phonenumber.h> #include <kabc/resource.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kapplication.h> #include <tdeconfig.h> #include <kglobal.h> diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h index 44b4f50e2..ba9eaf1f5 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -27,7 +27,7 @@ #include <kabc/addressee.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqstringlist.h> #include <tqptrlist.h> #include <tqptrdict.h> diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index 75d70011d..e03932b76 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -317,11 +317,11 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 4a1ee29ca..6c31a31e2 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -39,7 +39,7 @@ #include <kdebug.h> #include <klocale.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <kpushbutton.h> #include <tqhbox.h> diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 00b2f0bb3..f3e8597de 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kglobal.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h index d8c6841ca..bec5e030c 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -26,7 +26,7 @@ #include <tqbitarray.h> #include <tqdragobject.h> #include <tqcolor.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdepimmacros.h> class KFolderTree; diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 87da5c00e..79485f89c 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -33,18 +33,18 @@ #include <ktrader.h> #include <klibloader.h> #include <kstdaction.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <klocale.h> #include <kstatusbar.h> #include <kguiitem.h> -#include <kpopupmenu.h> -#include <kshortcut.h> +#include <tdepopupmenu.h> +#include <tdeshortcut.h> #include <kcmultidialog.h> -#include <kaction.h> -#include <kstdaccel.h> +#include <tdeaction.h> +#include <tdestdaccel.h> #include <kdebug.h> #include <tqwidgetstack.h> diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h index 5259710ae..92235a18f 100644 --- a/libtdepim/komposer/core/core.h +++ b/libtdepim/komposer/core/core.h @@ -24,7 +24,7 @@ #include "komposerIface.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqptrlist.h> namespace KSettings { diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index 88c4fb1ea..accd10505 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -23,11 +23,11 @@ #include <kgenericfactory.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcolordialog.h> #include <tdefiledialog.h> #include <kinstance.h> diff --git a/libtdepim/kpimurlrequesterdlg.cpp b/libtdepim/kpimurlrequesterdlg.cpp index d733eab28..311d1d007 100644 --- a/libtdepim/kpimurlrequesterdlg.cpp +++ b/libtdepim/kpimurlrequesterdlg.cpp @@ -19,7 +19,7 @@ #include <kpimurlrequesterdlg.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <kurlrequesterdlg.h> #include <klocale.h> diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index 21a1fc6f2..e82168826 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -33,8 +33,8 @@ #include <kimageeffect.h> #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <stdlib.h> #include <tqcursor.h> #include <tqapplication.h> diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index fbfa21a6d..b4aea5589 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -38,7 +38,7 @@ #include <kcolorbutton.h> #include <kdebug.h> #include <klocale.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kmessagebox.h> #include <tdeconfigskeleton.h> #include <kurlrequester.h> diff --git a/mimelib/doc/protocol.html b/mimelib/doc/protocol.html index 75830673d..d34854404 100644 --- a/mimelib/doc/protocol.html +++ b/mimelib/doc/protocol.html @@ -71,7 +71,7 @@ protected: krecv, kclose, // UNIX kclosesocket, // Win32 - kselect + tdeselect }; DwBool mIsDllOpen; DwBool mIsOpen; diff --git a/mimelib/mimelib/protocol.h b/mimelib/mimelib/protocol.h index 768022310..29c6515a5 100644 --- a/mimelib/mimelib/protocol.h +++ b/mimelib/mimelib/protocol.h @@ -223,7 +223,7 @@ protected: krecv, kclose, // UNIX kclosesocket, // Win32 - kselect + tdeselect }; // Enumerated values that indicate the system call that detected // an error diff --git a/mimelib/protocol.cpp b/mimelib/protocol.cpp index 695b61380..4ce5ca1b5 100644 --- a/mimelib/protocol.cpp +++ b/mimelib/protocol.cpp @@ -321,7 +321,7 @@ int DwProtocolClient::PReceive(char* aBuf, int aBufSize) if (numFds == -1) { int err = errno; - HandleError(err, kselect); + HandleError(err, tdeselect); numReceived = 0; } @@ -345,7 +345,7 @@ int DwProtocolClient::PReceive(char* aBuf, int aBufSize) else if (numFds == 0) { DBG_PROTO_STMT(cout << "Receive timed out" << endl;) int err = ETIMEDOUT; - HandleError(err, kselect); + HandleError(err, tdeselect); numReceived = 0; } @@ -447,7 +447,7 @@ void DwProtocolClient::HandleError(int aErrorCode, int aSystemCall) break; } break; - case kselect: + case tdeselect: switch (aErrorCode) { case ETIMEDOUT: mFailureCode = kFailTimedOut; diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 435f30836..17659a38d 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -72,7 +72,7 @@ #include <ktempfile.h> #include <kmdcodec.h> #include <kmimetype.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krun.h> #include <tdeio/netaccess.h> diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index fcc3a7076..959a7d2eb 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -53,7 +53,7 @@ using KMail::Interface::BodyPart; #include "interfaces/bodyparturlhandler.h" #include "tdehtmlparthtmlwriter.h" #include <tdeimproxy.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kabc/vcardconverter.h> #include <kabc/addressee.h> diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui index f719618ad..295812401 100644 --- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui +++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui @@ -82,7 +82,7 @@ <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>libtdepim/addresseelineedit.h</includehint> </includehints> </UI> diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcekabcconfig.h index 4016c727c..41cf1b88a 100644 --- a/tderesources/birthdays/resourcekabcconfig.h +++ b/tderesources/birthdays/resourcekabcconfig.h @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <krestrictedline.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index 0a07aafc9..5aeb2ddf6 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -23,7 +23,7 @@ #include <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp index 9b01eb5d4..ecfff25e0 100644 --- a/tderesources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp @@ -22,7 +22,7 @@ #include <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 4634495e9..317c82b6f 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp @@ -28,7 +28,7 @@ #include <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp index ec1bc178d..48de81433 100644 --- a/tderesources/groupwise/groupwisesettingswidget.cpp +++ b/tderesources/groupwise/groupwisesettingswidget.cpp @@ -20,7 +20,7 @@ */ #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include "groupwisesettingswidget.h" diff --git a/tderesources/groupwise/groupwisesettingswidgetbase.ui b/tderesources/groupwise/groupwisesettingswidgetbase.ui index 8ad33ea3b..b4b220521 100644 --- a/tderesources/groupwise/groupwisesettingswidgetbase.ui +++ b/tderesources/groupwise/groupwisesettingswidgetbase.ui @@ -75,6 +75,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp index 9f00dab9e..0f35e5b4c 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -28,7 +28,7 @@ #include <kdialog.h> #include <klocale.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequester.h> #include <tqlabel.h> diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index 747b33547..5f0152a21 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -25,7 +25,7 @@ #include <tqcheckbox.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <kdialogbase.h> #include <kstandarddirs.h> diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index cedcde6aa..780708347 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -1317,7 +1317,7 @@ bool GroupwiseServer::readCalendarSynchronous( KCal::Calendar *cal ) ReadCalendarJob *job = new ReadCalendarJob( this, mSoap, mUrl, mSession ); job->setCalendarFolder( &mCalendarFolder ); - job->setChecklistFolder( &mCheckListFolder ); + job->setChectdelistFolder( &mCheckListFolder ); job->setCalendar( cal ); job->run(); diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp index 4e4d1b28f..343a4a208 100644 --- a/tderesources/groupwise/soap/gwjobs.cpp +++ b/tderesources/groupwise/soap/gwjobs.cpp @@ -335,9 +335,9 @@ void ReadCalendarJob::setCalendarFolder( std::string *calendarFolder ) mCalendarFolder = calendarFolder; } -void ReadCalendarJob::setChecklistFolder( std::string *checklistFolder ) +void ReadCalendarJob::setChectdelistFolder( std::string *checklistFolder ) { - mChecklistFolder = checklistFolder; + mChectdelistFolder = checklistFolder; } void ReadCalendarJob::setCalendar( KCal::Calendar *calendar ) @@ -402,17 +402,17 @@ void ReadCalendarJob::run() haveReadFolder = true; *mCalendarFolder = *((*it)->id); } - else if ( *(fld->folderType) == Checklist ) { - kdDebug() << "Reading folder " << (*(*it)->id).c_str() << ", of type Checklist, physically containing " << count << " items." << endl; + else if ( *(fld->folderType) == Chectdelist ) { + kdDebug() << "Reading folder " << (*(*it)->id).c_str() << ", of type Chectdelist, physically containing " << count << " items." << endl; readCalendarFolder( *(*it)->id, itemCounts ); haveReadFolder = true; - *mChecklistFolder = *((*it)->id); + *mChectdelistFolder = *((*it)->id); } /* else if ( fld->folderType == SentItems ) { kdDebug() << "Reading folder " << (*(*it)->id).c_str() << ", of type SentItems, physically containing " << count << " items." << endl; readCalendarFolder( *(*it)->id, itemCounts ); haveReadFolder = true; - *mChecklistFolder = *((*it)->id); + *mChectdelistFolder = *((*it)->id); }*/ /* else if ( fld->folderType == Mailbox ) { kdDebug() << "Reading folder " << (*(*it)->id).c_str() << ", of type Mailbox (not yet accepted items), containing " << count << " items." << endl; diff --git a/tderesources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h index 815e6261e..bf60ecbd9 100644 --- a/tderesources/groupwise/soap/gwjobs.h +++ b/tderesources/groupwise/soap/gwjobs.h @@ -82,7 +82,7 @@ class ReadCalendarJob : public GWJob const std::string &session ); void setCalendarFolder( std::string* ); - void setChecklistFolder( std::string* ); + void setChectdelistFolder( std::string* ); void setCalendar( KCal::Calendar * ); @@ -93,7 +93,7 @@ class ReadCalendarJob : public GWJob private: std::string *mCalendarFolder; - std::string *mChecklistFolder; + std::string *mChectdelistFolder; KCal::Calendar *mCalendar; }; diff --git a/tderesources/groupwise/soap/soapC.cpp b/tderesources/groupwise/soap/soapC.cpp index 6decf59f2..f36c24637 100644 --- a/tderesources/groupwise/soap/soapC.cpp +++ b/tderesources/groupwise/soap/soapC.cpp @@ -12804,7 +12804,7 @@ static const struct soap_code_map soap_codes_ngwt__FolderType[] = { (long)Calendar, "Calendar" }, { (long)Contacts, "Contacts" }, { (long)Documents, "Documents" }, - { (long)Checklist, "Checklist" }, + { (long)Chectdelist, "Chectdelist" }, { (long)Cabinet, "Cabinet" }, { (long)Normal_, "Normal" }, { (long)NNTPServer, "NNTPServer" }, diff --git a/tderesources/groupwise/soap/soapStub.h b/tderesources/groupwise/soap/soapStub.h index 5566ba0ba..4f42a3372 100644 --- a/tderesources/groupwise/soap/soapStub.h +++ b/tderesources/groupwise/soap/soapStub.h @@ -127,7 +127,7 @@ enum ngwt__FolderACLStatus {pending = 0, accepted = 1, deleted = 2, opened = 3, #ifndef SOAP_TYPE_ngwt__FolderType #define SOAP_TYPE_ngwt__FolderType (359) /* ngwt:FolderType */ -enum ngwt__FolderType {Mailbox = 0, SentItems = 1, Draft = 2, Trash = 3, Calendar = 4, Contacts = 5, Documents = 6, Checklist = 7, Cabinet = 8, Normal_ = 9, NNTPServer = 10, NNTPNewsGroup = 11, IMAP = 12, Query = 13, Root = 14, JunkMail = 15, Notes = 16}; +enum ngwt__FolderType {Mailbox = 0, SentItems = 1, Draft = 2, Trash = 3, Calendar = 4, Contacts = 5, Documents = 6, Chectdelist = 7, Cabinet = 8, Normal_ = 9, NNTPServer = 10, NNTPNewsGroup = 11, IMAP = 12, Query = 13, Root = 14, JunkMail = 15, Notes = 16}; #endif #ifndef SOAP_TYPE_ngwt__Frequency diff --git a/tderesources/groupwise/soap/types.xsd b/tderesources/groupwise/soap/types.xsd index d0416f8e1..096e7a9e6 100644 --- a/tderesources/groupwise/soap/types.xsd +++ b/tderesources/groupwise/soap/types.xsd @@ -687,7 +687,7 @@ file by physical or electronic mail, you may find current contact information at <xs:enumeration value="Calendar"/>
<xs:enumeration value="Contacts"/>
<xs:enumeration value="Documents"/>
- <xs:enumeration value="Checklist"/>
+ <xs:enumeration value="Chectdelist"/>
<xs:enumeration value="Cabinet"/>
<xs:enumeration value="Normal"/>
<xs:enumeration value="NNTPServer"/>
diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index 51c3a4b42..889c4811b 100644 --- a/tderesources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp @@ -41,7 +41,7 @@ #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> #include <kabc/vcardconverter.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kapplication.h> #include <dcopclient.h> diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 50f8b5b82..bfcb3c89f 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -43,7 +43,7 @@ #include <dcopclient.h> #include <libtdepim/kincidencechooser.h> #include <kabc/locknull.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kinputdialog.h> #include <ktempfile.h> diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index 20fa6fa1b..81c65af48 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -27,7 +27,7 @@ #include "groupwaredataadaptor.h" #include "folderlistview.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index 68995aef2..be719d95a 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -24,10 +24,10 @@ #include "folderlistview.h" #include "folderlister.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <tqlistview.h> diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index f4837ecf6..ce6243df0 100644 --- a/tderesources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h @@ -24,7 +24,7 @@ #ifndef FOLDERLISTVIEW_H #define FOLDERLISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> #include "folderlister.h" class FolderListItem; diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp index 13ee99ec8..6fd4f9761 100644 --- a/tderesources/scalix/kabc/resourcescalix.cpp +++ b/tderesources/scalix/kabc/resourcescalix.cpp @@ -40,7 +40,7 @@ #include <ktempfile.h> #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kapplication.h> #include <dcopclient.h> diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index 672a7bfbf..ab9cc0408 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -40,7 +40,7 @@ #include <libkcal/icalformat.h> #include <libtdepim/kincidencechooser.h> #include <kabc/locknull.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <tqobject.h> diff --git a/tderesources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h index aef034059..0416b8a01 100644 --- a/tderesources/scalix/scalixadmin/delegateview.h +++ b/tderesources/scalix/scalixadmin/delegateview.h @@ -21,7 +21,7 @@ #ifndef DELEGATEVIEW_H #define DELEGATEVIEW_H -#include <klistview.h> +#include <tdelistview.h> namespace Scalix { class Delegate; diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h index cd71a17f6..3cb635e8b 100644 --- a/tderesources/scalix/scalixadmin/ldapview.h +++ b/tderesources/scalix/scalixadmin/ldapview.h @@ -20,7 +20,7 @@ #ifndef LDAPVIEW_H #define LDAPVIEW_H -#include <klistview.h> +#include <tdelistview.h> namespace KABC { class LdapClient; diff --git a/tderesources/scalix/scalixadmin/mainwindow.h b/tderesources/scalix/scalixadmin/mainwindow.h index a682ec065..bd682954c 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.h +++ b/tderesources/scalix/scalixadmin/mainwindow.h @@ -21,7 +21,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <kmainwindow.h> +#include <tdemainwindow.h> class MainWindow : public TDEMainWindow { diff --git a/tderesources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h index 89dbd8c0e..832b09b8a 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.h +++ b/tderesources/scalix/scalixadmin/otheruserview.h @@ -21,7 +21,7 @@ #ifndef OTHERUSERVIEW_H #define OTHERUSERVIEW_H -#include <klistview.h> +#include <tdelistview.h> class OtherUserManager; diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 0d6a756bb..f7d19697d 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -19,7 +19,7 @@ #include <kiconloader.h> #include <kguiitem.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include "sloxfolderdialog.h" diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 64e883175..22be7663a 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqradiobutton.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <kdialog.h> #include <kglobal.h> #include <kiconloader.h> |