diff options
Diffstat (limited to 'kopete/libkopete')
27 files changed, 44 insertions, 44 deletions
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index ccecf81a..8b658e03 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -31,8 +31,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/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 08f7a95e..70b88819 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <kiconloader.h> #include <kiconeffect.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <knotifyclient.h> diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h index 805d6c89..a5a9def4 100644 --- a/kopete/libkopete/kopeteawayaction.h +++ b/kopete/libkopete/kopeteawayaction.h @@ -19,8 +19,8 @@ #define KOPETEAWAYACTION_H #include <tdeversion.h> -#include <kactionclasses.h> -#include <kaction.h> +#include <tdeactionclasses.h> +#include <tdeaction.h> #include "kopete_export.h" diff --git a/kopete/libkopete/kopeteblactdelister.cpp b/kopete/libkopete/kopeteblacklister.cpp index e249d736..e249d736 100644 --- a/kopete/libkopete/kopeteblactdelister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp diff --git a/kopete/libkopete/kopeteblactdelister.h b/kopete/libkopete/kopeteblacklister.h index 29bf9d79..29bf9d79 100644 --- a/kopete/libkopete/kopeteblactdelister.h +++ b/kopete/libkopete/kopeteblacklister.h diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index 63269c4b..cb96ee5c 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -21,7 +21,7 @@ #include <kprocess.h> #include <tdeversion.h> #include <kxmlguiclient.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqdom.h> #include "kopetechatsessionmanager.h" diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h index ebaae2c1..80f95872 100644 --- a/kopete/libkopete/kopetecommandhandler.h +++ b/kopete/libkopete/kopetecommandhandler.h @@ -18,7 +18,7 @@ #define _KOPETECOMMANDHANDLER_H_ #include <tqdict.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include "kopetemessage.h" #include "kopete_export.h" diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 28266e28..2c9e856c 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -29,9 +29,9 @@ #include <kabcpersistence.h> #include <kdialogbase.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include "kopetecontactlist.h" #include "kopeteglobal.h" @@ -51,7 +51,7 @@ #include <tqimage.h> #include <tqmime.h> #include <tqvbox.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqcheckbox.h> #include <tqwhatsthis.h> #include <tqstylesheet.h> diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h index 0ddd0745..d5011d51 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.h +++ b/kopete/libkopete/kopeteonlinestatusmanager.h @@ -21,7 +21,7 @@ #include <tqobject.h> #include "kopeteonlinestatus.h" -#include "kaction.h" +#include "tdeaction.h" class TQString; class TQPixmap; diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index 1543b8d8..52d033bf 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -20,7 +20,7 @@ #include "kopeteprotocol.h" #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <tqdict.h> diff --git a/kopete/libkopete/private/kopetecommand.h b/kopete/libkopete/private/kopetecommand.h index 177f3b80..5fc967a2 100644 --- a/kopete/libkopete/private/kopetecommand.h +++ b/kopete/libkopete/private/kopetecommand.h @@ -19,7 +19,7 @@ #define __KOPETECOMMAND_H__ #include <tqobject.h> -#include <kaction.h> +#include <tdeaction.h> #include "kopetecommandhandler.h" namespace Kopete diff --git a/kopete/libkopete/ui/CMakeLists.txt b/kopete/libkopete/ui/CMakeLists.txt index cb224847..d3016386 100644 --- a/kopete/libkopete/ui/CMakeLists.txt +++ b/kopete/libkopete/ui/CMakeLists.txt @@ -28,8 +28,8 @@ install( FILES addressbooklinkwidget.h kopetefileconfirmdialog.h kopetepasswordwidget.h kopeteview.h addcontactpage.h kopeteviewplugin.h editaccountwidget.h kopetecontactaction.h - kopetestdaction.h userinfodialog.h addressbookselectordialog.h - addressbookselectorwidget.h kopetelistview.h accountselector.h + kopetestdaction.h userinfodialog.h addressbootdeselectordialog.h + addressbootdeselectorwidget.h kopetelistview.h accountselector.h kopetelistviewitem.h kopetelistviewsearchline.h ${CMAKE_CURRENT_BINARY_DIR}/fileconfirmbase.h ${CMAKE_CURRENT_BINARY_DIR}/kopeteawaydialogbase.h @@ -47,8 +47,8 @@ tde_add_library( kopeteui STATIC_PIC AUTOMOC kopetefileconfirmdialog.cpp fileconfirmbase.ui userinfodialog.cpp kopeteview.cpp kopetepasswordwidgetbase.ui kopetepasswordwidget.cpp accountselector.cpp kopeteviewplugin.cpp - addresseeitem.cpp addressbookselectorwidget_base.ui - addressbookselectordialog.cpp addressbookselectorwidget.cpp + addresseeitem.cpp addressbootdeselectorwidget_base.ui + addressbootdeselectordialog.cpp addressbootdeselectorwidget.cpp metacontactselectorwidget_base.ui metacontactselectorwidget.cpp kopetelistview.cpp kopetelistviewitem.cpp kopetelistviewsearchline.cpp contactaddednotifywidget.ui contactaddednotifydialog.cpp diff --git a/kopete/libkopete/ui/Makefile.am b/kopete/libkopete/ui/Makefile.am index 3e88846d..8bb377bb 100644 --- a/kopete/libkopete/ui/Makefile.am +++ b/kopete/libkopete/ui/Makefile.am @@ -8,8 +8,8 @@ libkopeteui_la_SOURCES = kopetecontactaction.cpp addcontactpage.cpp \ editaccountwidget.cpp kopetepassworddialog.ui kopetestdaction.cpp kopeteawaydialogbase.ui \ kopetefileconfirmdialog.cpp fileconfirmbase.ui userinfodialog.cpp kopeteview.cpp \ kopetepasswordwidgetbase.ui kopetepasswordwidget.cpp accountselector.cpp kopeteviewplugin.cpp \ - addresseeitem.cpp addressbookselectorwidget_base.ui addressbookselectordialog.cpp \ - addressbookselectorwidget.cpp metacontactselectorwidget_base.ui metacontactselectorwidget.cpp \ + addresseeitem.cpp addressbootdeselectorwidget_base.ui addressbootdeselectordialog.cpp \ + addressbootdeselectorwidget.cpp metacontactselectorwidget_base.ui metacontactselectorwidget.cpp \ kopetelistview.cpp kopetelistviewitem.cpp kopetelistviewsearchline.cpp \ contactaddednotifywidget.ui contactaddednotifydialog.cpp addressbooklinkwidget_base.ui \ addressbooklinkwidget.cpp @@ -22,7 +22,7 @@ kopeteinclude_HEADERS = accountselector.h fileconfirmbase.h \ kopetefileconfirmdialog.h kopetepasswordwidget.h kopeteview.h addcontactpage.h \ kopeteawaydialogbase.h kopetepasswordwidgetbase.h kopeteviewplugin.h editaccountwidget.h \ kopetecontactaction.h kopetepassworddialog.h kopetestdaction.h userinfodialog.h \ - addressbookselectordialog.h addressbookselectorwidget.h kopetelistview.h kopetelistviewitem.h \ + addressbootdeselectordialog.h addressbootdeselectorwidget.h kopetelistview.h kopetelistviewitem.h \ kopetelistviewsearchline.h addressbooklinkwidget.h noinst_HEADERS = addresseeitem.h contactaddednotifywidget.h diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp index f6cd3855..71b133e3 100644 --- a/kopete/libkopete/ui/accountselector.cpp +++ b/kopete/libkopete/ui/accountselector.cpp @@ -24,7 +24,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <klistview.h> +#include <tdelistview.h> class AccountListViewItem : public TDEListViewItem { diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp index 31e04a52..877cfb4e 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -31,8 +31,8 @@ #include <kopetemetacontact.h> #include "addressbooklinkwidget.h" -#include "addressbookselectordialog.h" -#include "addressbookselectorwidget.h" +#include "addressbootdeselectordialog.h" +#include "addressbootdeselectorwidget.h" namespace Kopete { namespace UI { diff --git a/kopete/libkopete/ui/addressbootdeselectordialog.cpp b/kopete/libkopete/ui/addressbootdeselectordialog.cpp index 44f42e2a..27560ef1 100644 --- a/kopete/libkopete/ui/addressbootdeselectordialog.cpp +++ b/kopete/libkopete/ui/addressbootdeselectordialog.cpp @@ -16,8 +16,8 @@ ************************************************************************* */ -#include "addressbookselectordialog.h" -#include "addressbookselectorwidget.h" +#include "addressbootdeselectordialog.h" +#include "addressbootdeselectorwidget.h" #include <kdialogbase.h> #include <tqdialog.h> #include <tqlistview.h> @@ -83,7 +83,7 @@ void AddressBookSelectorDialog::reject() } // namespace UI } // namespace Kopete -#include "addressbookselectordialog.moc" +#include "addressbootdeselectordialog.moc" // vim: set noet ts=4 sts=4 sw=4: diff --git a/kopete/libkopete/ui/addressbootdeselectorwidget.cpp b/kopete/libkopete/ui/addressbootdeselectorwidget.cpp index 16009ee5..d218fe1c 100644 --- a/kopete/libkopete/ui/addressbootdeselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbootdeselectorwidget.cpp @@ -37,13 +37,13 @@ #include <kpushbutton.h> #include <kactivelabel.h> #include <kdebug.h> -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> #include <tqlabel.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include "addressbookselectorwidget.h" +#include "addressbootdeselectorwidget.h" #include <addresseeitem.h> #include "kabcpersistence.h" @@ -165,7 +165,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked() } // namespace UI } // namespace Kopete -#include "addressbookselectorwidget.moc" +#include "addressbootdeselectorwidget.moc" // vim: set noet ts=4 sts=4 sw=4: diff --git a/kopete/libkopete/ui/addressbootdeselectorwidget.h b/kopete/libkopete/ui/addressbootdeselectorwidget.h index af4b1834..2a549e1c 100644 --- a/kopete/libkopete/ui/addressbootdeselectorwidget.h +++ b/kopete/libkopete/ui/addressbootdeselectorwidget.h @@ -33,7 +33,7 @@ #include <kdemacros.h> #include "kopete_export.h" -#include "addressbookselectorwidget_base.h" +#include "addressbootdeselectorwidget_base.h" namespace KABC { class AddressBook; diff --git a/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui b/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui index ee4c2016..fd046bf8 100644 --- a/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui @@ -163,13 +163,13 @@ </grid> </widget> <includes> - <include location="global" impldecl="in declaration">klistviewsearchline.h</include> + <include location="global" impldecl="in declaration">tdelistviewsearchline.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> - <includehint>klistview.h</includehint> - <includehint>klistviewsearchline.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistviewsearchline.h</includehint> </includehints> </UI> diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h index 29546ebc..e0d8de53 100644 --- a/kopete/libkopete/ui/addresseeitem.h +++ b/kopete/libkopete/ui/addresseeitem.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kabc/addressbook.h> diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp index 5b5e1e55..7a230e2c 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.cpp +++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp @@ -38,7 +38,7 @@ #include "kopetecontactlist.h" #include "kopetemetacontact.h" #include "addressbooklinkwidget.h" -#include "addressbookselectordialog.h" +#include "addressbootdeselectordialog.h" #include "contactaddednotifywidget.h" diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h index 3b370916..ef5ba1b4 100644 --- a/kopete/libkopete/ui/kopetecontactaction.h +++ b/kopete/libkopete/ui/kopetecontactaction.h @@ -18,7 +18,7 @@ #ifndef __kopetecontactaction_h__ #define __kopetecontactaction_h__ -#include <kaction.h> +#include <tdeaction.h> #include "kopete_export.h" namespace Kopete diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h index 98ae4b19..89671870 100644 --- a/kopete/libkopete/ui/kopetelistview.h +++ b/kopete/libkopete/ui/kopetelistview.h @@ -19,7 +19,7 @@ #ifndef KOPETE_LISTVIEW_H #define KOPETE_LISTVIEW_H -#include <klistview.h> +#include <tdelistview.h> namespace Kopete { namespace UI { diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h index 871f1a6d..1e73e09f 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.h +++ b/kopete/libkopete/ui/kopetelistviewitem.h @@ -19,7 +19,7 @@ #ifndef KOPETE_LISTVIEWITEM_H #define KOPETE_LISTVIEWITEM_H -#include <klistview.h> +#include <tdelistview.h> #include <kopetecontact.h> #include <utility> diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h index 70b419d5..0ad5637a 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.h +++ b/kopete/libkopete/ui/kopetelistviewsearchline.h @@ -18,7 +18,7 @@ #ifndef KOPETELISTVIEWSEARCHLINE_H #define KOPETELISTVIEWSEARCHLINE_H -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> namespace Kopete { namespace UI { diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h index 376548b9..9040afae 100644 --- a/kopete/libkopete/ui/kopetestdaction.h +++ b/kopete/libkopete/ui/kopetestdaction.h @@ -20,7 +20,7 @@ #define KOPETESTDACTION_H #undef KDE_NO_COMPAT -#include <kaction.h> +#include <tdeaction.h> #include <tqobject.h> #include "kopete_export.h" diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 26b075a3..18580b7a 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -36,8 +36,8 @@ #include <kpushbutton.h> #include <kactivelabel.h> #include <kdebug.h> -#include <klistview.h> -#include <klistviewsearchline.h> +#include <tdelistview.h> +#include <tdelistviewsearchline.h> #include "kopetelistview.h" #include "kopetelistviewsearchline.h" |