From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:47 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kopete/KABC_INTEG_NOTES | 2 +- .../kopete/addaccountwizard/addaccountwizard.cpp | 2 +- .../addaccountwizard/addaccountwizardpage1.ui | 2 +- .../kopete/addcontactwizard/addcontactwizard.cpp | 4 +- .../addcontactwizard/addcontactwizard_base.ui | 4 +- .../kopete/addcontactwizard/fastaddcontactwizard.h | 4 +- .../addcontactwizard/fastaddcontactwizard_base.ui | 2 +- kopete/kopete/chatwindow/chatmemberslistwidget.cpp | 2 +- kopete/kopete/chatwindow/chatmemberslistwidget.h | 2 +- kopete/kopete/chatwindow/chatmessagepart.cpp | 2 +- kopete/kopete/chatwindow/chatview.cpp | 2 +- kopete/kopete/chatwindow/kopetechatwindow.cpp | 6 +- kopete/kopete/chatwindow/kopeteemailwindow.cpp | 6 +- kopete/kopete/chatwindow/kopeteemailwindow.h | 2 +- kopete/kopete/chatwindow/kopeteemoticonaction.cpp | 6 +- kopete/kopete/chatwindow/kopeteemoticonaction.h | 2 +- kopete/kopete/chatwindow/krichtexteditpart.cpp | 4 +- .../kopete/config/accounts/kopeteaccountconfig.cpp | 2 +- .../config/accounts/kopeteaccountconfigbase.ui | 2 +- .../kopete/config/appearance/appearanceconfig.cpp | 2 +- .../appearance/appearanceconfig_chatwindow.ui | 2 +- .../config/appearance/appearanceconfig_colors.ui | 8 +- .../appearance/appearanceconfig_emoticons.ui | 2 +- .../config/appearance/emoticonseditdialog.cpp | 2 +- .../config/appearance/emoticonseditwidget.ui | 2 +- .../kopete/config/appearance/tooltipeditdialog.cpp | 2 +- .../kopete/config/appearance/tooltipeditwidget.ui | 4 +- .../config/identity/kopeteidentityconfig.cpp | 2 +- kopete/kopete/contactlist/kopeteaddrbookexport.cpp | 2 +- .../kopete/contactlist/kopetecontactlistview.cpp | 6 +- .../kopete/contactlist/kopetegrouplistaction.cpp | 2 +- kopete/kopete/contactlist/kopetegrouplistaction.h | 2 +- kopete/kopete/contactlist/kopetelviprops.cpp | 2 +- kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 2 +- kopete/kopete/contactlist/kopetemetacontactlvi.h | 2 +- .../kopete/contactlist/kopetestatusgroupviewitem.h | 2 +- kopete/kopete/kopeteeditglobalidentitywidget.cpp | 2 +- kopete/kopete/kopetewindow.cpp | 8 +- kopete/kopete/kopetewindow.h | 2 +- kopete/kopete/systemtray.cpp | 2 +- .../compat/kpixmapregionselectorwidget.cpp | 4 +- kopete/libkopete/kopeteaccount.cpp | 4 +- kopete/libkopete/kopeteawayaction.h | 4 +- kopete/libkopete/kopeteblacklister.cpp | 109 ++++++++++++++++++ kopete/libkopete/kopeteblacklister.h | 125 +++++++++++++++++++++ kopete/libkopete/kopeteblactdelister.cpp | 109 ------------------ kopete/libkopete/kopeteblactdelister.h | 125 --------------------- kopete/libkopete/kopetecommandhandler.cpp | 2 +- kopete/libkopete/kopetecommandhandler.h | 2 +- kopete/libkopete/kopetecontact.cpp | 6 +- kopete/libkopete/kopeteonlinestatusmanager.h | 2 +- kopete/libkopete/kopeteprotocol.cpp | 2 +- kopete/libkopete/private/kopetecommand.h | 2 +- kopete/libkopete/ui/CMakeLists.txt | 8 +- kopete/libkopete/ui/Makefile.am | 6 +- kopete/libkopete/ui/accountselector.cpp | 2 +- kopete/libkopete/ui/addressbooklinkwidget.cpp | 4 +- .../libkopete/ui/addressbootdeselectordialog.cpp | 6 +- .../libkopete/ui/addressbootdeselectorwidget.cpp | 8 +- kopete/libkopete/ui/addressbootdeselectorwidget.h | 2 +- .../ui/addressbootdeselectorwidget_base.ui | 6 +- kopete/libkopete/ui/addresseeitem.h | 2 +- kopete/libkopete/ui/contactaddednotifydialog.cpp | 2 +- kopete/libkopete/ui/kopetecontactaction.h | 2 +- kopete/libkopete/ui/kopetelistview.h | 2 +- kopete/libkopete/ui/kopetelistviewitem.h | 2 +- kopete/libkopete/ui/kopetelistviewsearchline.h | 2 +- kopete/libkopete/ui/kopetestdaction.h | 2 +- kopete/libkopete/ui/metacontactselectorwidget.cpp | 4 +- kopete/plugins/alias/aliasdialog.ui | 2 +- kopete/plugins/alias/aliasdialogbase.ui | 2 +- kopete/plugins/alias/aliaspreferences.cpp | 2 +- kopete/plugins/alias/editaliasdialog.cpp | 2 +- kopete/plugins/contactnotes/contactnotesplugin.cpp | 2 +- .../plugins/cryptography/cryptographyguiclient.cpp | 2 +- kopete/plugins/cryptography/cryptographyplugin.cpp | 2 +- kopete/plugins/cryptography/kgpgselkey.cpp | 2 +- kopete/plugins/cryptography/popuppublic.cpp | 10 +- kopete/plugins/cryptography/popuppublic.h | 2 +- kopete/plugins/highlight/highlightpreferences.cpp | 2 +- kopete/plugins/highlight/highlightprefsbase.ui | 2 +- kopete/plugins/history/historydialog.cpp | 8 +- kopete/plugins/history/historydialog.h | 2 +- kopete/plugins/history/historyguiclient.cpp | 2 +- kopete/plugins/history/historyplugin.cpp | 2 +- kopete/plugins/history/historyviewer.ui | 4 +- kopete/plugins/latex/latexguiclient.cpp | 2 +- kopete/plugins/netmeeting/netmeetingguiclient.cpp | 2 +- kopete/plugins/netmeeting/netmeetingplugin.cpp | 2 +- .../plugins/netmeeting/netmeetingpreferences.cpp | 2 +- .../plugins/nowlistening/nowlisteningguiclient.cpp | 2 +- kopete/plugins/nowlistening/nowlisteningplugin.cpp | 2 +- .../nowlistening/nowlisteningpreferences.cpp | 2 +- kopete/plugins/nowlistening/nowlisteningprefs.ui | 2 +- kopete/plugins/smpppdcs/smpppdcspreferences.cpp | 2 +- kopete/plugins/smpppdcs/smpppdcsprefs.ui | 2 +- kopete/plugins/statistics/statisticsdb.cpp | 2 +- kopete/plugins/statistics/statisticsdialog.cpp | 2 +- kopete/plugins/statistics/statisticsplugin.cpp | 2 +- kopete/plugins/texteffect/texteffectprefs.ui | 2 +- kopete/plugins/translator/translatorguiclient.cpp | 2 +- kopete/plugins/translator/translatorplugin.cpp | 2 +- kopete/protocols/gadu/gaduaccount.cpp | 2 +- kopete/protocols/gadu/gaduaccount.h | 2 +- kopete/protocols/gadu/gaducontact.cpp | 2 +- kopete/protocols/gadu/gadupubdir.cpp | 2 +- kopete/protocols/gadu/ui/gadusearch.ui | 2 +- kopete/protocols/groupwise/gwaccount.h | 2 +- kopete/protocols/groupwise/gwcontact.cpp | 2 +- kopete/protocols/groupwise/gwmessagemanager.cpp | 6 +- kopete/protocols/groupwise/ui/gwchatpropswidget.ui | 2 +- .../protocols/groupwise/ui/gwchatsearchdialog.cpp | 4 +- .../protocols/groupwise/ui/gwchatsearchwidget.ui | 2 +- .../protocols/groupwise/ui/gwcontactproperties.cpp | 4 +- .../protocols/groupwise/ui/gwcontactpropswidget.ui | 2 +- .../protocols/groupwise/ui/gwcustomstatuswidget.ui | 2 +- kopete/protocols/irc/ircaccount.cpp | 4 +- kopete/protocols/irc/ircguiclient.cpp | 4 +- kopete/protocols/irc/ircprotocol.cpp | 2 +- kopete/protocols/irc/ircservercontact.cpp | 2 +- kopete/protocols/irc/ircusercontact.cpp | 2 +- kopete/protocols/irc/kcodecaction.h | 4 +- kopete/protocols/irc/ui/channellist.cpp | 2 +- kopete/protocols/irc/ui/irceditaccount.ui | 2 +- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 2 +- kopete/protocols/jabber/jabberbookmarks.cpp | 2 +- kopete/protocols/jabber/jabbercontact.cpp | 2 +- kopete/protocols/jabber/jabberprotocol.cpp | 2 +- kopete/protocols/jabber/jabberprotocol.h | 4 +- kopete/protocols/jabber/jabbertransport.cpp | 2 +- kopete/protocols/meanwhile/meanwhileaccount.cpp | 4 +- kopete/protocols/meanwhile/meanwhilecontact.cpp | 2 +- kopete/protocols/meanwhile/meanwhileplugin.h | 2 +- kopete/protocols/msn/msnaccount.cpp | 4 +- kopete/protocols/msn/msnchatsession.cpp | 6 +- kopete/protocols/msn/msncontact.cpp | 2 +- kopete/protocols/oscar/aim/aimaccount.cpp | 2 +- kopete/protocols/oscar/aim/aimcontact.cpp | 2 +- kopete/protocols/oscar/icq/icqaccount.cpp | 2 +- kopete/protocols/oscar/icq/icqcontact.cpp | 4 +- .../protocols/oscar/icq/ui/icqaddcontactpage.cpp | 2 +- kopete/protocols/oscar/icq/ui/icqsearchbase.ui | 2 +- kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp | 2 +- kopete/protocols/oscar/oscarcontact.cpp | 2 +- kopete/protocols/sms/smsaccount.cpp | 4 +- kopete/protocols/sms/smscontact.cpp | 2 +- kopete/protocols/testbed/testbedaccount.cpp | 4 +- kopete/protocols/testbed/testbedcontact.cpp | 2 +- kopete/protocols/winpopup/wpaccount.cpp | 2 +- kopete/protocols/winpopup/wpcontact.h | 2 +- kopete/protocols/yahoo/yahooaccount.cpp | 4 +- kopete/protocols/yahoo/yahoochatsession.cpp | 6 +- .../yahoo/yahooconferencemessagemanager.cpp | 2 +- kopete/protocols/yahoo/yahoocontact.cpp | 4 +- 154 files changed, 449 insertions(+), 449 deletions(-) create mode 100644 kopete/libkopete/kopeteblacklister.cpp create mode 100644 kopete/libkopete/kopeteblacklister.h delete mode 100644 kopete/libkopete/kopeteblactdelister.cpp delete mode 100644 kopete/libkopete/kopeteblactdelister.h (limited to 'kopete') diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES index 2cf33e8e..561b27ec 100644 --- a/kopete/KABC_INTEG_NOTES +++ b/kopete/KABC_INTEG_NOTES @@ -57,7 +57,7 @@ Policy: One way kopete->kabc contacts , achieve bidi later what about the sync policy between IM contacts contained in kabc and in kopete - mETz: alt-enter doesn't work? report a bug to klistview/qlistview, that sucks :( + mETz: alt-enter doesn't work? report a bug to tdelistview/qlistview, that sucks :( hyhy Bille: implied i'd say for example - in Addressee A I already have 3 IM id's added with another client - if i associate him with a Kopete MC 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 #include #include -#include +#include #include #include #include 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 @@ - klistview.h + tdelistview.h 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 #include -#include +#include // used for its AddresseeItem class #include #include #include #include -#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 @@ - klistview.h + tdelistview.h kpushbutton.h - klistview.h + tdelistview.h 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 -#include +#include #include #include #include #include -#include +#include #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 @@ - klistview.h + tdelistview.h 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 #include #include -#include +#include #include #include 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 +#include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include "chatmessagepart.h" @@ -64,7 +64,7 @@ #include "kopeteviewmanager.h" #include -#include +#include typedef TQMap AccountMap; typedef TQMap 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 +#include #include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include 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 +#include #include 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 #include #include -#include -#include -#include +#include +#include +#include #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 +#include 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 -#include +#include #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include 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 - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h 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 #include // for KNewStuff emoticon fetching #include -#include +#include #include #include #include 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 @@ - klistbox.h + tdelistbox.h kpushbutton.h kpushbutton.h kpushbutton.h 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 @@ kcolorbutton.h kcolorbutton.h kcolorbutton.h - kfontrequester.h - kfontrequester.h - kfontrequester.h - kfontrequester.h + tdefontrequester.h + tdefontrequester.h + tdefontrequester.h + tdefontrequester.h kcolorbutton.h kcolorbutton.h 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 @@ - klistbox.h + tdelistbox.h ktextedit.h 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 -#include +#include #include #include #include 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 @@ kpushbutton.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h 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 #include -#include +#include #include 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 @@ - klistview.h - klistview.h + tdelistview.h + tdelistview.h 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 #include -#include +#include #include #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 #include -#include +#include #include #include #include #include -#include +#include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include 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 +#include /** 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 #include #include -#include +#include #include #include #include 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 #include -#include +#include 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 +#include #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 #include #include -#include +#include #include #include #include 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 #include -#include -#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include 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 -#include +#include #include 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 #include -#include +#include #include #include #include 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 #include #include -#include -#include +#include +#include #include #include #include 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 #include #include -#include -#include +#include +#include #include #include 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 -#include -#include +#include +#include #include "kopete_export.h" diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp new file mode 100644 index 00000000..e249d736 --- /dev/null +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -0,0 +1,109 @@ +/* + kopeteblacklister.cpp - Kopete BlackLister + + Copyright (c) 2004 by Roie Kerstein + + ************************************************************************* + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + ************************************************************************* +*/ + +#include "kopeteblacklister.h" + +#include "kopetecontact.h" + +#include +#include + +#include + +namespace Kopete +{ + +class BlackLister::Private +{ +public: + TQStringList blacklist; + TQString owner; + TQString protocol; +}; + + +BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) + : TQObject(parent, name), d( new Private ) +{ + TDEConfig *config = TDEGlobal::config(); + + d->owner = accountId; + d->protocol = protocolId; + config->setGroup("BlackLister"); + d->blacklist = config->readListEntry( d->protocol + TQString::fromLatin1("_") + d->owner ); +} + +BlackLister::~BlackLister() +{ + delete d; +} + + +bool BlackLister::isBlocked(const TQString &contactId) +{ + return (d->blacklist.find( contactId ) != d->blacklist.end() ); +} + +bool BlackLister::isBlocked(Contact *contact) +{ + return isBlocked(contact->contactId()); +} + +void BlackLister::addContact(const TQString &contactId) +{ + if( !isBlocked(contactId) ) + { + d->blacklist += contactId; + saveToDisk(); + emit contactAdded( contactId ); + } +} + +void BlackLister::addContact(Contact *contact) +{ + TQString temp = contact->contactId(); + + addContact( temp ); +} + +void BlackLister::removeContact(Contact *contact) +{ + TQString temp = contact->contactId(); + + removeContact( temp ); +} + +void BlackLister::saveToDisk() +{ + TDEConfig *config = TDEGlobal::config(); + + config->setGroup("BlackLister"); + config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); + config->sync(); +} + +void BlackLister::removeContact(const TQString &contactId) +{ + if( isBlocked(contactId) ) + { + d->blacklist.remove( contactId ); + saveToDisk(); + emit contactRemoved( contactId ); + } +} + +} + +#include "kopeteblacklister.moc" diff --git a/kopete/libkopete/kopeteblacklister.h b/kopete/libkopete/kopeteblacklister.h new file mode 100644 index 00000000..29bf9d79 --- /dev/null +++ b/kopete/libkopete/kopeteblacklister.h @@ -0,0 +1,125 @@ +/* + kopeteblacklister.h - Kopete BlackLister + + Copyright (c) 2004 by Roie Kerstein + + ************************************************************************* + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + ************************************************************************* +*/ + +#ifndef KOPETEBLACKLISTER_H +#define KOPETEBLACKLISTER_H + +#include + +namespace Kopete +{ + +class Contact; + +/** + * @brief Manages the list of blacklisted contacts for an account + * + * This class manages the list of contacts the user wishes + * to ignore permanently. In order to use the this class, there is no need to + * create an instance. Use the @ref Kopete::Account::blackLister() instead. + * + * Keep in mind that this class does not discard messages from blocked + * users - It only manages the list. It is the up to the protocol to + * check whether a user is blocked, and act accordingly. A protocol may + * re-implement @ref Kopete::Account::block() and @ref Kopete::Account::unblock() + * and use @ref Kopete::Account::blackLister() as a persistent list manager + * only, or connect the signals @ref contactAdded() and @ref contactRemoved() + * to its slots. + * + * @sa Kopete::Account::block() Kopete::Account::unblock() + * + * @author Roie Kerstein + */ +class BlackLister : public TQObject +{ + Q_OBJECT + + +public: + /** + * Create an instance, and read the blacklist from disk if it exists. + * @param protocolId is the ID of the protocol owning accountId + * @param accountId is the ID of the owning Account. + * @param parent The TQObject parent for this class. + * @param name The TQObject name for this class. + */ + BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *parent = 0, const char *name = 0 ); + ~BlackLister(); + + /** + * \return @c true if @p contact is blocked, @c false otherwise. + */ + bool isBlocked( Contact *contact ); + + /** + * \return @c true if the contact with ID @p contactId is blocked, @c false otherwise. + */ + bool isBlocked( const TQString &contactId ); + +public slots: + /** + * Add a contact to the blacklist. + * + * This function emits the @ref contactAdded() signal. + * @param contactId is the ID of the contact to be added to the list. + */ + void addContact( const TQString &contactId ); + + /** + * @overload + */ + void addContact( Contact *contact ); + + /** + * \brief Remove a contact from the blacklist. + * + * Removes the contact from the blacklist. + * This function emits the @ref contactRemoved() signal. + * @param contact is the contact to be removed from the list. + */ + void removeContact( Contact *contact ); + + /** + * @overload + */ + void removeContact( const TQString &contactId ); + +signals: + /** + * \brief A new contact has been added to the list + * + * Connect to this signal if you want to perform additional actions, + * and you prefer not to derive from this class. + */ + void contactAdded( const TQString &contactId ); + + /** + * \brief A contact has been removed from the list + * + * Connect to this signal if you want to perform additional actions, + * and you prefer not to derive from this class. + */ + void contactRemoved( const TQString &contactId ); + +private: + void saveToDisk(); + + class Private; + Private *d; +}; + +} + +#endif diff --git a/kopete/libkopete/kopeteblactdelister.cpp b/kopete/libkopete/kopeteblactdelister.cpp deleted file mode 100644 index e249d736..00000000 --- a/kopete/libkopete/kopeteblactdelister.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* - kopeteblacklister.cpp - Kopete BlackLister - - Copyright (c) 2004 by Roie Kerstein - - ************************************************************************* - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - ************************************************************************* -*/ - -#include "kopeteblacklister.h" - -#include "kopetecontact.h" - -#include -#include - -#include - -namespace Kopete -{ - -class BlackLister::Private -{ -public: - TQStringList blacklist; - TQString owner; - TQString protocol; -}; - - -BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) - : TQObject(parent, name), d( new Private ) -{ - TDEConfig *config = TDEGlobal::config(); - - d->owner = accountId; - d->protocol = protocolId; - config->setGroup("BlackLister"); - d->blacklist = config->readListEntry( d->protocol + TQString::fromLatin1("_") + d->owner ); -} - -BlackLister::~BlackLister() -{ - delete d; -} - - -bool BlackLister::isBlocked(const TQString &contactId) -{ - return (d->blacklist.find( contactId ) != d->blacklist.end() ); -} - -bool BlackLister::isBlocked(Contact *contact) -{ - return isBlocked(contact->contactId()); -} - -void BlackLister::addContact(const TQString &contactId) -{ - if( !isBlocked(contactId) ) - { - d->blacklist += contactId; - saveToDisk(); - emit contactAdded( contactId ); - } -} - -void BlackLister::addContact(Contact *contact) -{ - TQString temp = contact->contactId(); - - addContact( temp ); -} - -void BlackLister::removeContact(Contact *contact) -{ - TQString temp = contact->contactId(); - - removeContact( temp ); -} - -void BlackLister::saveToDisk() -{ - TDEConfig *config = TDEGlobal::config(); - - config->setGroup("BlackLister"); - config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); - config->sync(); -} - -void BlackLister::removeContact(const TQString &contactId) -{ - if( isBlocked(contactId) ) - { - d->blacklist.remove( contactId ); - saveToDisk(); - emit contactRemoved( contactId ); - } -} - -} - -#include "kopeteblacklister.moc" diff --git a/kopete/libkopete/kopeteblactdelister.h b/kopete/libkopete/kopeteblactdelister.h deleted file mode 100644 index 29bf9d79..00000000 --- a/kopete/libkopete/kopeteblactdelister.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - kopeteblacklister.h - Kopete BlackLister - - Copyright (c) 2004 by Roie Kerstein - - ************************************************************************* - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - ************************************************************************* -*/ - -#ifndef KOPETEBLACKLISTER_H -#define KOPETEBLACKLISTER_H - -#include - -namespace Kopete -{ - -class Contact; - -/** - * @brief Manages the list of blacklisted contacts for an account - * - * This class manages the list of contacts the user wishes - * to ignore permanently. In order to use the this class, there is no need to - * create an instance. Use the @ref Kopete::Account::blackLister() instead. - * - * Keep in mind that this class does not discard messages from blocked - * users - It only manages the list. It is the up to the protocol to - * check whether a user is blocked, and act accordingly. A protocol may - * re-implement @ref Kopete::Account::block() and @ref Kopete::Account::unblock() - * and use @ref Kopete::Account::blackLister() as a persistent list manager - * only, or connect the signals @ref contactAdded() and @ref contactRemoved() - * to its slots. - * - * @sa Kopete::Account::block() Kopete::Account::unblock() - * - * @author Roie Kerstein - */ -class BlackLister : public TQObject -{ - Q_OBJECT - - -public: - /** - * Create an instance, and read the blacklist from disk if it exists. - * @param protocolId is the ID of the protocol owning accountId - * @param accountId is the ID of the owning Account. - * @param parent The TQObject parent for this class. - * @param name The TQObject name for this class. - */ - BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *parent = 0, const char *name = 0 ); - ~BlackLister(); - - /** - * \return @c true if @p contact is blocked, @c false otherwise. - */ - bool isBlocked( Contact *contact ); - - /** - * \return @c true if the contact with ID @p contactId is blocked, @c false otherwise. - */ - bool isBlocked( const TQString &contactId ); - -public slots: - /** - * Add a contact to the blacklist. - * - * This function emits the @ref contactAdded() signal. - * @param contactId is the ID of the contact to be added to the list. - */ - void addContact( const TQString &contactId ); - - /** - * @overload - */ - void addContact( Contact *contact ); - - /** - * \brief Remove a contact from the blacklist. - * - * Removes the contact from the blacklist. - * This function emits the @ref contactRemoved() signal. - * @param contact is the contact to be removed from the list. - */ - void removeContact( Contact *contact ); - - /** - * @overload - */ - void removeContact( const TQString &contactId ); - -signals: - /** - * \brief A new contact has been added to the list - * - * Connect to this signal if you want to perform additional actions, - * and you prefer not to derive from this class. - */ - void contactAdded( const TQString &contactId ); - - /** - * \brief A contact has been removed from the list - * - * Connect to this signal if you want to perform additional actions, - * and you prefer not to derive from this class. - */ - void contactRemoved( const TQString &contactId ); - -private: - void saveToDisk(); - - class Private; - Private *d; -}; - -} - -#endif 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 #include #include -#include +#include #include #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 -#include +#include #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 #include #include -#include +#include #include -#include +#include #include "kopetecontactlist.h" #include "kopeteglobal.h" @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include 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 #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 -#include +#include #include #include 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 -#include +#include #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 #include -#include +#include 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 #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 #include #include @@ -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 #include #include -#include -#include +#include +#include #include #include #include -#include "addressbookselectorwidget.h" +#include "addressbootdeselectorwidget.h" #include #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 #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 @@ - klistviewsearchline.h + tdelistviewsearchline.h kactivelabel.h - klistview.h - klistviewsearchline.h + tdelistview.h + tdelistviewsearchline.h 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 #include -#include +#include #include 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 +#include #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 +#include 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 +#include #include #include 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 +#include 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 +#include #include #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 #include #include -#include -#include +#include +#include #include "kopetelistview.h" #include "kopetelistviewsearchline.h" diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui index 6e52c0ce..47e7e9b6 100644 --- a/kopete/plugins/alias/aliasdialog.ui +++ b/kopete/plugins/alias/aliasdialog.ui @@ -188,6 +188,6 @@ Do not include the '/' in the command (if you do it will be stripped off anyway) klineedit.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h diff --git a/kopete/plugins/alias/aliasdialogbase.ui b/kopete/plugins/alias/aliasdialogbase.ui index 2bdc2e77..0297c6ff 100644 --- a/kopete/plugins/alias/aliasdialogbase.ui +++ b/kopete/plugins/alias/aliasdialogbase.ui @@ -99,7 +99,7 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h kpushbutton.h diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index f81da475..6b91418d 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp index 6acdf153..2408c6d3 100644 --- a/kopete/plugins/alias/editaliasdialog.cpp +++ b/kopete/plugins/alias/editaliasdialog.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include EditAliasDialog::EditAliasDialog( TQWidget* parent, const char* name ) diff --git a/kopete/plugins/contactnotes/contactnotesplugin.cpp b/kopete/plugins/contactnotes/contactnotesplugin.cpp index db3d1302..51977e4e 100644 --- a/kopete/plugins/contactnotes/contactnotesplugin.cpp +++ b/kopete/plugins/contactnotes/contactnotesplugin.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include #include diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp index df66c608..d8cafd85 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.cpp +++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp @@ -20,7 +20,7 @@ #include "kopetecontact.h" #include "kopetechatsession.h" -#include +#include #include #include #include diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 1085da9c..e402567c 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 63d26510..e0a03cf8 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 7764d3b3..76151f57 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -32,14 +32,14 @@ #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ //#include "kgpg.h" #include "kgpginterface.h" -///////////////// klistviewitem special +///////////////// tdelistviewitem special class UpdateViewItem2 : public TDEListViewItem { diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h index 83ac5102..547f8483 100644 --- a/kopete/plugins/cryptography/popuppublic.h +++ b/kopete/plugins/cryptography/popuppublic.h @@ -22,7 +22,7 @@ #include //#include -#include +#include class TQPushButton; diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp index 875a0dee..34a7a1cc 100644 --- a/kopete/plugins/highlight/highlightpreferences.cpp +++ b/kopete/plugins/highlight/highlightpreferences.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index b820151d..fa7cc9e1 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -454,7 +454,7 @@ - klistview.h + tdelistview.h klineedit.h kcombobox.h kcolorbutton.h diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 992d586f..b5b65b80 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -48,14 +48,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include -#include +#include class TDEListViewDateItem : public TDEListViewItem { diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h index daa45362..7efea5fa 100644 --- a/kopete/plugins/history/historydialog.h +++ b/kopete/plugins/history/historydialog.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kopetemessage.h" diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index 21bde3b5..eeda505c 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -21,7 +21,7 @@ #include "kopetecontact.h" #include "kopeteview.h" -#include +#include #include #include diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index d4791952..83405ee2 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include //#include #include diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui index 6711dd31..be64272d 100644 --- a/kopete/plugins/history/historyviewer.ui +++ b/kopete/plugins/history/historyviewer.ui @@ -340,8 +340,8 @@ kprogress.h klineedit.h - klistviewsearchline.h - klistview.h + tdelistviewsearchline.h + tdelistview.h kcombobox.h diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp index 7b67f119..d62be944 100644 --- a/kopete/plugins/latex/latexguiclient.cpp +++ b/kopete/plugins/latex/latexguiclient.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp index d01d0df0..e47386a2 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp +++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 2f76b09a..eaf777dd 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index 3c63bc7e..207fd6cd 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp index 29f03175..702bdeca 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp @@ -25,7 +25,7 @@ #include "kopeteview.h" #include -#include +#include #include #include diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp index 1f1fed51..3ab8539b 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp +++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "config.h" #include "kopetechatsessionmanager.h" diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp index d7117852..47eb51b4 100644 --- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp +++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui index ff3307e9..3fb6a340 100644 --- a/kopete/plugins/nowlistening/nowlisteningprefs.ui +++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui @@ -371,6 +371,6 @@ in place of your status message. - klistbox.h + tdelistbox.h diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp index 1815fe9e..e91a6cc4 100644 --- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp +++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index 747398d4..3aa91695 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -279,6 +279,6 @@ kpushbutton.h smpppdlocationwidget.h - klistview.h + tdelistview.h diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp index 0862d22b..6082158c 100644 --- a/kopete/plugins/statistics/statisticsdb.cpp +++ b/kopete/plugins/statistics/statisticsdb.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 27c8b565..fb7ac6d8 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -25,7 +25,7 @@ #include "kdialogbase.h" #include "klocale.h" -#include "klistview.h" +#include "tdelistview.h" #include "tdehtml_part.h" #include "kstandarddirs.h" #include "kdatepicker.h" diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 14490e30..c5da24bb 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui index 2278c2a5..e93ae0fd 100644 --- a/kopete/plugins/texteffect/texteffectprefs.ui +++ b/kopete/plugins/texteffect/texteffectprefs.ui @@ -226,6 +226,6 @@ - klistbox.h + tdelistbox.h diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp index 1d1eaec8..0a2e8ed2 100644 --- a/kopete/plugins/translator/translatorguiclient.cpp +++ b/kopete/plugins/translator/translatorguiclient.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "kopetechatsession.h" diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 5113e358..6b8cb61d 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include 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 -#include +#include #include #include #include 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 #include #include -#include +#include #include 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 @@ krestrictedline.h - klistview.h + tdelistview.h 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 +#include #include 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 -#include +#include #include #include 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 #include #include -#include +#include #include -#include -#include +#include +#include #include #include 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 @@ - klistbox.h + tdelistbox.h kpushbutton.h kpushbutton.h kpushbutton.h 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 -#include -#include +#include +#include #include #include 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 @@ - klistview.h + tdelistview.h kpushbutton.h 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 #include #include -#include +#include #include #include @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #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 @@ - klistview.h + tdelistview.h 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 @@ - klistview.h + tdelistview.h 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 +#include #include #include #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include 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 #if KDE_IS_VERSION( 3, 1, 90 ) - #include + #include #else // ------------------------------------------------------------ // TODO: UGLY HACK, remove when we drop KDE 3.1 compatibility #ifdef KDE_NO_COMPAT #undef KDE_NO_COMPAT -#include +#include #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 +#include #include #include #include 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 +#include #include #include 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 +#include #include #include #include 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 #if KDE_IS_VERSION( 3, 1, 90 ) - #include + #include #else - #include + #include #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 #include #include -#include +#include #include #include #include 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 @@ - klistview.h + tdelistview.h 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 #include -#include +#include #include #include #include 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 -#include +#include #include #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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include 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 #include #include -#include -#include +#include +#include #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 #include -#include +#include #include #include #include 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 -#include +#include +#include #include #include #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 +#include #include #include 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 +#include 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 -#include +#include #include #include #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include -#include -#include +#include +#include #include #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 #undef KDE_NO_COMPAT -#include +#include #include #include #include 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 #include #include -#include +#include #include #include 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 #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include 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 #include -#include -#include +#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 @@ kpushbutton.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h 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 #include #include -#include +#include #include #include #include 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 #include -#include +#include #include #include #include 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 -#include -#include +#include +#include #include #include #include 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 -#include +#include #include #include #include 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 +#include #include #include -#include +#include #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 +#include #include #include 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 -#include +#include #include #include 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 +#include // TQt Includes //#include 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 #include #include -#include -#include +#include +#include #include #include #include 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 #include #include -#include +#include #include -#include -#include +#include +#include #include #include 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 #include #include -#include +#include #include #include 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 -#include +#include #include #include #include -#include +#include #include #include #include -- cgit v1.2.1