diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
commit | da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch) | |
tree | b42ba87fcdfa425a31e243a62d71e1de248b6ee8 /kopete/kopete | |
parent | 4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff) | |
download | tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/kopete')
39 files changed, 58 insertions, 58 deletions
diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/kopete/addaccountwizard/addaccountwizard.cpp index 1c42acf2..4ec11657 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizard.cpp +++ b/kopete/kopete/addaccountwizard/addaccountwizard.cpp @@ -24,7 +24,7 @@ #include <kcolorbutton.h> #include <kdebug.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kplugininfo.h> diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui index 5c722a0e..e9df15e7 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui @@ -139,6 +139,6 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 02523865..5e461f53 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -56,14 +56,14 @@ #include <kpushbutton.h> #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> // used for its AddresseeItem class #include <kabc/addresseedialog.h> #include <kabc/addressbook.h> #include <kabc/stdaddressbook.h> #include <addcontactpage.h> -#include "addressbookselectorwidget.h" +#include "addressbootdeselectorwidget.h" #include "addcontactwizard.h" #include "kopetecontactlist.h" #include "kopetemetacontact.h" diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui index ff9ec4dc..02266016 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui @@ -480,8 +480,8 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h index 1313e04f..5a424d1a 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h @@ -21,14 +21,14 @@ #ifndef FASTADDCONTACTWIZARD_H #define FASTADDCONTACTWIZARD_H #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqptrlist.h> #include <tqvaluelist.h> #include <tqmap.h> #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> #include "fastaddcontactwizard_base.h" diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui index 5bd2f3a8..88e7ecba 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui @@ -214,6 +214,6 @@ </images> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp index 15b9fb56..e0817490 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp @@ -30,7 +30,7 @@ #include <kabc/vcardconverter.h> #include <kdebug.h> #include <tdemultipledrag.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqheader.h> #include <tqtooltip.h> diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.h b/kopete/kopete/chatwindow/chatmemberslistwidget.h index 5108ae5c..5480de0d 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.h +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.h @@ -18,7 +18,7 @@ #ifndef CHATMEMBERSLISTWIDGET_H #define CHATMEMBERSLISTWIDGET_H -#include <klistview.h> +#include <tdelistview.h> #include <tqmap.h> diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 52d5e99e..c894cb9a 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -55,7 +55,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <tdemultipledrag.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krun.h> #include <kstringhandler.h> #include <ktempfile.h> diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index bf40970a..3c58cb50 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstringhandler.h> #include <twin.h> #include <kurldrag.h> diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index 5d1d2d11..105cf912 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kmenubar.h> #include <tdeconfig.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <kdebug.h> #include <twin.h> @@ -45,7 +45,7 @@ #include <kdialog.h> #include <kstringhandler.h> #include <ksqueezedtextlabel.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kglobalsettings.h> #include "chatmessagepart.h" @@ -64,7 +64,7 @@ #include "kopeteviewmanager.h" #include <tqtoolbutton.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> typedef TQMap<Kopete::Account*,KopeteChatWindow*> AccountMap; typedef TQMap<Kopete::Group*,KopeteChatWindow*> GroupMap; diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index cc4e6fa9..4af0ec95 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -31,7 +31,7 @@ #include "kopetestdaction.h" #include "kopeteviewmanager.h" -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcolordialog.h> #include <tdeconfig.h> @@ -39,7 +39,7 @@ #include <kdebug.h> #include <tdeversion.h> #include <kedittoolbar.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kglobalsettings.h> #include <tdehtmlview.h> #include <kiconloader.h> @@ -48,7 +48,7 @@ #include <klocale.h> #include <kmenubar.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpushbutton.h> #include <ktextedit.h> #include <twin.h> diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.h b/kopete/kopete/chatwindow/kopeteemailwindow.h index 7d7991ca..e3c18d5e 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.h +++ b/kopete/kopete/chatwindow/kopeteemailwindow.h @@ -22,7 +22,7 @@ #include "kopeteview.h" #include "kopeteviewplugin.h" -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tdeparts/mainwindow.h> namespace KParts { struct URLArgs; } diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index 8c2811c9..a5aaed41 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -28,9 +28,9 @@ #include <kdebug.h> #include <klocale.h> #include <kmenubar.h> -#include <kpopupmenu.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdepopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include "emoticonselector.h" #include "kopeteemoticons.h" diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.h b/kopete/kopete/chatwindow/kopeteemoticonaction.h index bc1a9859..034c0737 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.h +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.h @@ -21,7 +21,7 @@ #ifndef _KOPETEEMOTICONACTION_H_ #define _KOPETEEMOTICONACTION_H_ -#include <kaction.h> +#include <tdeaction.h> class KopeteEmoticonAction : public TDEAction { diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 4d8a0f8d..df9f2c76 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -1,8 +1,8 @@ #include <ktextedit.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcolordialog.h> #include <kglobalsettings.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdeversion.h> diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp index d779eac0..71691706 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp @@ -28,7 +28,7 @@ #include <kdialogbase.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui index 8162208c..1c93e6dc 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui +++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui @@ -261,7 +261,7 @@ The priority is used to determine which contact to use when you click on a metac </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 869641e9..89f7655e 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -45,7 +45,7 @@ #include <kcolorbutton.h> #include <tdeconfig.h> // for KNewStuff emoticon fetching #include <kdebug.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <kgenericfactory.h> #include <tdeio/netaccess.h> #include <tdehtmlview.h> diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui index ed7d5cf9..3e31cc2d 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui @@ -187,7 +187,7 @@ </tabstops> <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/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui index a4adb253..6babf4ed 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui @@ -447,10 +447,10 @@ <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> - <includehint>kfontrequester.h</includehint> - <includehint>kfontrequester.h</includehint> - <includehint>kfontrequester.h</includehint> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui index 1cc3153d..0c9078b7 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui @@ -230,7 +230,7 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>ktextedit.h</includehint> </includehints> </UI> diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index ce252a8f..11bc5ae4 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -21,7 +21,7 @@ #include "kopeteemoticons.h" #include <klocale.h> -#include <klistview.h> +#include <tdelistview.h> #include <kstandarddirs.h> #include <tdefiledialog.h> #include <tdeio/job.h> diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui index a90031d2..a9a78175 100644 --- a/kopete/kopete/config/appearance/emoticonseditwidget.ui +++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui @@ -82,6 +82,6 @@ <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/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp index e5fb0b16..c83fd1c8 100644 --- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp +++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> class TooltipItem : public TDEListViewItem diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui index ec250cea..d7f863cd 100644 --- a/kopete/kopete/config/appearance/tooltipeditwidget.ui +++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui @@ -209,7 +209,7 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index 1d513964..0f28e403 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -60,7 +60,7 @@ #include "kopeteaccount.h" #include "kopetecontact.h" #include "kopetecontactlist.h" -#include "addressbookselectordialog.h" +#include "addressbootdeselectordialog.h" #include "kopeteconfig.h" // Local includes diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp index fd2b5c18..dc283e1b 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp @@ -24,7 +24,7 @@ #include <kdialogbase.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> #include "kopeteaccount.h" diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 54f52528..bafc62c5 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -33,14 +33,14 @@ #include <tqtooltip.h> #include <tqguardedptr.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kurldrag.h> #include <tdemultipledrag.h> #include <kabc/stdaddressbook.h> diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp index a2606ab9..212381fc 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp +++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kguiitem.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <twin.h> #include <kcmultidialog.h> diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.h b/kopete/kopete/contactlist/kopetegrouplistaction.h index a9c1a502..8230e030 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.h +++ b/kopete/kopete/contactlist/kopetegrouplistaction.h @@ -20,7 +20,7 @@ #define KOPETEGRLISTACT_H -#include <kaction.h> +#include <tdeaction.h> /** diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index f64af84d..6a3f0ba1 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -54,7 +54,7 @@ #include "kopeteaccount.h" #include "kopeteprotocol.h" #include "addressbooklinkwidget.h" -#include "addressbookselectordialog.h" +#include "addressbootdeselectordialog.h" #include "customnotificationprops.h" #include "customnotifications.h" diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 19529351..374c92bc 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kpassivepopup.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kglobal.h> #include <tdeconfig.h> #include <kapplication.h> diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h index 1b766b44..22466102 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.h +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h @@ -27,7 +27,7 @@ #include <tqpixmap.h> #include <tqptrdict.h> -#include <klistview.h> +#include <tdelistview.h> class TQVariant; diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h index 3d71375e..d38fdb03 100644 --- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h +++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h @@ -20,7 +20,7 @@ #ifndef KOPETESTATUSGROUPVIEWITEM_H #define KOPETESTATUSGROUPVIEWITEM_H -#include <klistview.h> +#include <tdelistview.h> #include "kopetemetacontact.h" /** diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp index 97bd1732..74f740d8 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp +++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp @@ -28,7 +28,7 @@ #include <klineedit.h> #include <kdebug.h> #include <klocale.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kstandarddirs.h> #include <kurl.h> #include <tdefiledialog.h> diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index a631f304..6e9d9ae7 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -30,16 +30,16 @@ #include <tqevent.h> #include <tqsignalmapper.h> -#include <kaction.h> -#include <kactionclasses.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> #include <knotifydialog.h> -#include <kpopupmenu.h> -#include <kaccel.h> +#include <tdepopupmenu.h> +#include <tdeaccel.h> #include <kkeydialog.h> #include <kedittoolbar.h> #include <kmenubar.h> diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h index 881382c0..aad7155c 100644 --- a/kopete/kopete/kopetewindow.h +++ b/kopete/kopete/kopetewindow.h @@ -22,7 +22,7 @@ #include <tqptrdict.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqlabel.h> class TQHBox; diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 009ac09d..782a3a55 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -25,7 +25,7 @@ #include <twin.h> #include <kaboutdata.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> |