diff options
Diffstat (limited to 'kmail')
67 files changed, 138 insertions, 138 deletions
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index ebd61ef8..e13c5dfa 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 066b3489..a4578baf 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 1f398140..4fc68085 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 4f2dfc55..6090f41e 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 cf63c110..bf79f096 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 dc76ac7d..664b95e3 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 92f6e7f1..19d543b3 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 8f28ea5c..7248b9e5 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 e01fb4ab..881f8b28 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 e83463a4..ca5fe114 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 1e1f48b0..03ae5069 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 bf8c82fa..c89f58b9 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 1f7d6f58..596e8c6b 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 00d14cc8..30b3dcf9 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 9b8da994..1af43734 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 6f367fd1..516634ba 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 a09c1953..9764e240 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 c15e9247..df91b8dc 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 5679c8c9..def8002a 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 7dd3a643..afebb880 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 d626b966..dba0135b 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 71fb86c2..f159c69f 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 7d4ebbf6..abe12127 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 d5374fe4..2129490b 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 0b029cdc..34c99400 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 ba8d1615..3b35854f 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 83ed78d5..cfe3ff5e 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 87c59528..35fdecda 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 83342d43..304219b9 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 33118ca4..6083ea9e 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 da406e3b..dd04d9f2 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 ad13ac2e..f2a32f6e 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 f30ab4b3..8aefbc58 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 9d18e4c0..067568a1 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 740dde83..99091856 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 7312189f..423ec3dc 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 9d07a9c6..c8bb2894 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 94d0e674..155e00be 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 67290cf3..f790ff0f 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 ae930b55..2de06c26 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 182f2689..395694fe 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 1bb3c946..bb545305 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 8cef9ce3..37534cbd 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 31f7356b..f75137ee 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 6251a484..d89d184b 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 f75b53a0..1eb9f467 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 2e1aac7f..0b8c3cad 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 da10d442..574c0838 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 ea728f8b..0e515b83 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 8c185ddb..4b420013 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 e20b1f13..ceea3a52 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 8b320d72..3ae2ad81 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 ede82ba8..96401e17 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 fa37523a..560b707d 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 308ef4b9..f8102d8b 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 1c3e40c8..f6af1272 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 dc62333c..3e10cd90 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 395b62cb..2111664e 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 601174cf..c5ccdd9e 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 8471f055..90ee8895 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 eaa627bb..89fd0093 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 b8895ff0..64a2a220 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 abd6e817..6f109892 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 41a0cb0e..2bfabd93 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 bda40c12..df941516 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 ff0e68d6..23b2bd3d 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 65c18d73..1627cec6 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() ; |