diff options
Diffstat (limited to 'kopete/protocols')
52 files changed, 71 insertions, 71 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 542211f5..5ca54870 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -40,7 +40,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <knotifyclient.h> #include <ktempfile.h> diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index 37e53a7b..b57ad015 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -36,7 +36,7 @@ #include <tqmap.h> #include <tqstring.h> #include <tqptrlist.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdefiledialog.h> class GaduAccountPrivate; diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index e797ea40..bedb3f55 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -21,7 +21,7 @@ // 02110-1301, USA. #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index fc496aaa..92f53b48 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -37,7 +37,7 @@ #include <kcombobox.h> #include <krestrictedline.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name ) diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui index 5fe042ad..4c40ae13 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -687,6 +687,6 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>krestrictedline.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index abce33be..91caa1ab 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -21,7 +21,7 @@ #ifndef GW_ACCOUNT_H #define GW_ACCOUNT_H -#include <kaction.h> +#include <tdeaction.h> #include <kopetechatsessionmanager.h> diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index b225162a..3bc505d7 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -27,7 +27,7 @@ #include <tqmap.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index eef88a7b..583c525f 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -17,10 +17,10 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> -#include <kpopupmenu.h> -#include <kshortcut.h> +#include <tdepopupmenu.h> +#include <tdeshortcut.h> #include <kopetecontact.h> #include <kopetecontactaction.h> diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index 7977ce04..23388b30 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -386,7 +386,7 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index b9021b1f..8d61cda1 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -18,8 +18,8 @@ #include <tqmap.h> -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> #include <kpushbutton.h> #include <kdebug.h> diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index 86fdd734..0d69e76d 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -110,7 +110,7 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> </UI> diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 27fe81fb..53ec8224 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -20,7 +20,7 @@ #include <tqheader.h> #include <tqlabel.h> #include <tqlineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqmap.h> #include <tqpopupmenu.h> @@ -32,7 +32,7 @@ #include <kopeteonlinestatus.h> #include <kopetemetacontact.h> #include <kopeteuiglobal.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include "gwcontact.h" diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index 8113c238..305924b0 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -206,6 +206,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 9164d68d..4a685311 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -107,6 +107,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 3c8c5b85..9a316854 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -40,7 +40,7 @@ #include "kopeteview.h" #include "kopetepassword.h" -#include <kaction.h> +#include <tdeaction.h> #include <kaboutdata.h> #include <kapplication.h> #include <tdeconfig.h> @@ -52,7 +52,7 @@ #include <klineeditdlg.h> #include <kmessagebox.h> #include <knotifyclient.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqlayout.h> #include <tqtimer.h> diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp index 702aafa9..3724781d 100644 --- a/kopete/protocols/irc/ircguiclient.cpp +++ b/kopete/protocols/irc/ircguiclient.cpp @@ -18,13 +18,13 @@ #include <tdeversion.h> #if KDE_IS_VERSION( 3, 1, 90 ) - #include <kactioncollection.h> + #include <tdeactioncollection.h> #else // ------------------------------------------------------------ // TODO: UGLY HACK, remove when we drop KDE 3.1 compatibility #ifdef KDE_NO_COMPAT #undef KDE_NO_COMPAT -#include <kaction.h> +#include <tdeaction.h> #define KDE_NO_COMPAT 1 #endif // ------------------------------------------------------------ diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 2f39a329..9c6b9df4 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -41,7 +41,7 @@ #include "kopeteuiglobal.h" #undef KDE_NO_COMPAT -#include <kaction.h> +#include <tdeaction.h> #include <kcharsets.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 5be40dff..e5018ccd 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -24,7 +24,7 @@ #include "kopetechatsessionmanager.h" #include "kopeteview.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 03806208..07515c75 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -26,7 +26,7 @@ #include "kopetemetacontact.h" #include "kopeteview.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> #include <klocale.h> diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h index e581e713..769ce324 100644 --- a/kopete/protocols/irc/kcodecaction.h +++ b/kopete/protocols/irc/kcodecaction.h @@ -21,9 +21,9 @@ #include <tqintdict.h> #if KDE_IS_VERSION( 3, 1, 90 ) - #include <kactionclasses.h> + #include <tdeactionclasses.h> #else - #include <kaction.h> + #include <tdeaction.h> #endif class KCodecAction : public TDESelectAction diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 2d4e357b..6f26b0e4 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -31,7 +31,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqheader.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqlayout.h> #include <tqtooltip.h> #include <tqtimer.h> diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index 4b308655..8bdb552a 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -1017,6 +1017,6 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 12784ae5..0b357726 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -29,7 +29,7 @@ #include <kmessagebox.h> #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> #include <kextsock.h> #include <tdeconfig.h> diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 54a17943..8167a1c7 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include "xmpp_tasks.h" diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 708d9f16..54dc25d9 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <tdefiledialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index 9e9cdc9a..4de868a7 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <kmessagebox.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <klineeditdlg.h> diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 117b683c..8fdec271 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -24,8 +24,8 @@ #include <tqmap.h> #include <tqpixmap.h> #include <tqmovie.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include "kopetecontact.h" #include "kopetecontactproperty.h" diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 6b658b2c..94bbb5b2 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -31,7 +31,7 @@ #include <tqpixmap.h> #include <tqtimer.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> #include <tdeconfig.h> diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 91635c91..7350b425 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -25,8 +25,8 @@ #include "kopetecontactlist.h" #include "kopetepassword.h" -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tdeconfigbase.h> #include "kopeteaway.h" diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index e77d470a..e594dd57 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -15,7 +15,7 @@ ************************************************************************* */ -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> diff --git a/kopete/protocols/meanwhile/meanwhileplugin.h b/kopete/protocols/meanwhile/meanwhileplugin.h index c11a2b2f..15959124 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.h +++ b/kopete/protocols/meanwhile/meanwhileplugin.h @@ -18,7 +18,7 @@ #define __MEANWHILE_PLUGIN_H__ #include "tqstring.h" -#include <kaction.h> +#include <tdeaction.h> class TQLineEdit; diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 30f8d477..6c7dbb41 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -21,12 +21,12 @@ #include <config.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <kdebug.h> #include <kinputdialog.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kmdcodec.h> #include <klocale.h> diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index e4ee3c06..6137e17b 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -29,10 +29,10 @@ #include <kinputdialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <ktempfile.h> -#include <kmainwindow.h> -#include <ktoolbar.h> +#include <tdemainwindow.h> +#include <tdetoolbar.h> #include <krun.h> #include "kopetecontactaction.h" diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index dcfc8ce7..25041d72 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #undef KDE_NO_COMPAT -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> #include <klineedit.h> diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index cd9e30a3..37bfb1dc 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <kdialogbase.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <kmdcodec.h> diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index 2a8b0320..29cd585a 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -22,7 +22,7 @@ #include <tqtextcodec.h> #include <kapplication.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 7627648c..53ca409a 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmdcodec.h> #include <kmessagebox.h> diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 19d2ee7f..5acd5859 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -21,8 +21,8 @@ #include <tqimage.h> #include <tqfile.h> -#include <kaction.h> -#include <kactionclasses.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 935b9853..a5071753 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kpushbutton.h> #include <kmessagebox.h> diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index a027985f..e2fb2c6b 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -486,7 +486,7 @@ <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index f8b16198..59cf7e92 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -26,7 +26,7 @@ #include <tqtabwidget.h> #include <kdebug.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kpushbutton.h> #include <kmessagebox.h> diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index c145b467..f9bf5fae 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -21,7 +21,7 @@ #include <tqapplication.h> #include <tqtextcodec.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 6e09bd11..4cfd4788 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -17,8 +17,8 @@ #undef KDE_NO_COMPAT #include <tdeconfigbase.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index 5e4c9cb4..e15861ee 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -16,7 +16,7 @@ #undef KDE_NO_COMPAT #include <tdeconfigbase.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index eb601ffc..bf33a02f 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -16,10 +16,10 @@ #include "testbedaccount.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "kopetemetacontact.h" #include "kopetecontactlist.h" diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp index d383c04c..56513f14 100644 --- a/kopete/protocols/testbed/testbedcontact.cpp +++ b/kopete/protocols/testbed/testbedcontact.cpp @@ -16,7 +16,7 @@ #include "testbedcontact.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 5d9d2a99..5d212fdd 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -23,7 +23,7 @@ // KDE Includes #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tdeconfig.h> diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h index f478c3ff..d37dd420 100644 --- a/kopete/protocols/winpopup/wpcontact.h +++ b/kopete/protocols/winpopup/wpcontact.h @@ -19,7 +19,7 @@ #define WPCONTACT_H // KDE Includes -#include <kaction.h> +#include <tdeaction.h> // TQt Includes //#include <tqvaluestack.h> diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 4edc14e6..81fa7514 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -35,8 +35,8 @@ #include <klocale.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index c8eaf102..e59c5062 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -26,10 +26,10 @@ #include <kinputdialog.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <ktempfile.h> -#include <kmainwindow.h> -#include <ktoolbar.h> +#include <tdemainwindow.h> +#include <tdetoolbar.h> #include <krun.h> #include <kiconloader.h> diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 64656e75..c96d52da 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -20,7 +20,7 @@ #include <klineeditdlg.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeconfig.h> #include <kopetecontactaction.h> diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index fbc1718d..1ca1a3db 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -45,11 +45,11 @@ // KDE Includes #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <klocale.h> #include <krun.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kmessagebox.h> #include <ktempfile.h> #include <tdeio/global.h> |