From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:47 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- dcoprss/feedbrowser.cpp | 2 +- dcoprss/feedbrowser.h | 2 +- .../advanced/kcm_sambaconf/hiddenfileview.cpp | 4 +-- .../advanced/kcm_sambaconf/hiddenfileview.h | 2 +- .../advanced/kcm_sambaconf/kcminterface.ui | 8 ++--- .../advanced/kcm_sambaconf/kcmsambaconf.cpp | 2 +- filesharing/advanced/kcm_sambaconf/share.ui | 2 +- .../advanced/kcm_sambaconf/sharedlgimpl.cpp | 4 +-- .../advanced/kcm_sambaconf/usertabimpl.cpp | 2 +- filesharing/advanced/nfs/nfsdialog.cpp | 4 +-- filesharing/simple/controlcenter.ui | 2 +- filesharing/simple/fileshare.cpp | 2 +- filesharing/simple/groupconfigdlg.cpp | 2 +- kdict/actions.cpp | 2 +- kdict/actions.h | 2 +- kdict/matchview.cpp | 2 +- kdict/options.cpp | 2 +- kdict/queryview.cpp | 2 +- kdict/toplevel.cpp | 2 +- kdict/toplevel.h | 2 +- kget/CMakeLists.txt | 2 +- kget/Makefile.am | 4 +-- kget/dlgAdvanced.cpp | 4 +-- kget/dlgAutomation.cpp | 12 +++---- kget/dlgConnection.cpp | 4 +-- kget/dlgIndividual.cpp | 4 +-- kget/dlgLimits.cpp | 4 +-- kget/dlgPreferences.cpp | 4 +-- kget/dlgSystem.cpp | 8 ++--- kget/dlgsystembase.ui | 2 +- kget/dockindividual.cpp | 2 +- kget/docking.cpp | 4 +-- kget/droptarget.cpp | 28 ++++++++-------- kget/kget_plug_in/kget_linkview.cpp | 6 ++-- kget/kget_plug_in/kget_linkview.h | 4 +-- kget/kget_plug_in/kget_plug_in.cpp | 4 +-- kget/logwindow.cpp | 8 ++--- kget/main.cpp | 32 +++++++++---------- kget/settings.cpp | 8 ++--- kget/tdemainwidget.cpp | 10 +++--- kget/tdemainwidget.h | 8 ++--- kget/transfer.cpp | 12 +++---- kget/transfer.h | 2 +- kget/transferlist.h | 2 +- knewsticker/knewsticker.h | 2 +- knewsticker/knewstickerconfig.cpp | 6 ++-- knewsticker/knewstickerconfigwidget.ui | 6 ++-- .../kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp | 2 +- .../kntsrcfilepropsdlgwidget.ui | 4 +-- kopete/KABC_INTEG_NOTES | 2 +- .../addaccountwizard/addaccountwizard.cpp | 2 +- .../addaccountwizard/addaccountwizardpage1.ui | 2 +- .../addcontactwizard/addcontactwizard.cpp | 4 +-- .../addcontactwizard/addcontactwizard_base.ui | 4 +-- .../addcontactwizard/fastaddcontactwizard.h | 4 +-- .../fastaddcontactwizard_base.ui | 2 +- .../chatwindow/chatmemberslistwidget.cpp | 2 +- .../kopete/chatwindow/chatmemberslistwidget.h | 2 +- kopete/kopete/chatwindow/chatmessagepart.cpp | 2 +- kopete/kopete/chatwindow/chatview.cpp | 2 +- kopete/kopete/chatwindow/kopetechatwindow.cpp | 6 ++-- .../kopete/chatwindow/kopeteemailwindow.cpp | 6 ++-- kopete/kopete/chatwindow/kopeteemailwindow.h | 2 +- .../chatwindow/kopeteemoticonaction.cpp | 6 ++-- .../kopete/chatwindow/kopeteemoticonaction.h | 2 +- .../kopete/chatwindow/krichtexteditpart.cpp | 4 +-- .../config/accounts/kopeteaccountconfig.cpp | 2 +- .../accounts/kopeteaccountconfigbase.ui | 2 +- .../config/appearance/appearanceconfig.cpp | 2 +- .../appearance/appearanceconfig_chatwindow.ui | 2 +- .../appearance/appearanceconfig_colors.ui | 8 ++--- .../appearance/appearanceconfig_emoticons.ui | 2 +- .../config/appearance/emoticonseditdialog.cpp | 2 +- .../config/appearance/emoticonseditwidget.ui | 2 +- .../config/appearance/tooltipeditdialog.cpp | 2 +- .../config/appearance/tooltipeditwidget.ui | 4 +-- .../config/identity/kopeteidentityconfig.cpp | 2 +- .../contactlist/kopeteaddrbookexport.cpp | 2 +- .../contactlist/kopetecontactlistview.cpp | 6 ++-- .../contactlist/kopetegrouplistaction.cpp | 2 +- .../contactlist/kopetegrouplistaction.h | 2 +- kopete/kopete/contactlist/kopetelviprops.cpp | 2 +- .../contactlist/kopetemetacontactlvi.cpp | 2 +- .../kopete/contactlist/kopetemetacontactlvi.h | 2 +- .../contactlist/kopetestatusgroupviewitem.h | 2 +- .../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 +-- ...lactdelister.cpp => kopeteblacklister.cpp} | 0 ...eteblactdelister.h => kopeteblacklister.h} | 0 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 +-- .../ui/addressbootdeselectordialog.cpp | 6 ++-- .../ui/addressbootdeselectorwidget.cpp | 8 ++--- .../ui/addressbootdeselectorwidget.h | 2 +- .../ui/addressbootdeselectorwidget_base.ui | 6 ++-- kopete/libkopete/ui/addresseeitem.h | 2 +- .../libkopete/ui/contactaddednotifydialog.cpp | 2 +- kopete/libkopete/ui/kopetecontactaction.h | 2 +- kopete/libkopete/ui/kopetelistview.h | 2 +- kopete/libkopete/ui/kopetelistviewitem.h | 2 +- .../libkopete/ui/kopetelistviewsearchline.h | 2 +- kopete/libkopete/ui/kopetestdaction.h | 2 +- .../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 +- .../contactnotes/contactnotesplugin.cpp | 2 +- .../cryptography/cryptographyguiclient.cpp | 2 +- .../cryptography/cryptographyplugin.cpp | 2 +- kopete/plugins/cryptography/kgpgselkey.cpp | 2 +- kopete/plugins/cryptography/popuppublic.cpp | 10 +++--- kopete/plugins/cryptography/popuppublic.h | 2 +- .../highlight/highlightpreferences.cpp | 2 +- .../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 +- .../netmeeting/netmeetingguiclient.cpp | 2 +- .../plugins/netmeeting/netmeetingplugin.cpp | 2 +- .../netmeeting/netmeetingpreferences.cpp | 2 +- .../nowlistening/nowlisteningguiclient.cpp | 2 +- .../nowlistening/nowlisteningplugin.cpp | 2 +- .../nowlistening/nowlisteningpreferences.cpp | 2 +- .../plugins/nowlistening/nowlisteningprefs.ui | 2 +- .../plugins/smpppdcs/smpppdcspreferences.cpp | 2 +- kopete/plugins/smpppdcs/smpppdcsprefs.ui | 2 +- kopete/plugins/statistics/statisticsdb.cpp | 2 +- .../plugins/statistics/statisticsdialog.cpp | 2 +- .../plugins/statistics/statisticsplugin.cpp | 2 +- kopete/plugins/texteffect/texteffectprefs.ui | 2 +- .../translator/translatorguiclient.cpp | 2 +- .../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 +- .../protocols/groupwise/gwmessagemanager.cpp | 6 ++-- .../groupwise/ui/gwchatpropswidget.ui | 2 +- .../groupwise/ui/gwchatsearchdialog.cpp | 4 +-- .../groupwise/ui/gwchatsearchwidget.ui | 2 +- .../groupwise/ui/gwcontactproperties.cpp | 4 +-- .../groupwise/ui/gwcontactpropswidget.ui | 2 +- .../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 +- .../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 +- .../protocols/meanwhile/meanwhileaccount.cpp | 4 +-- .../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 +-- .../oscar/icq/ui/icqaddcontactpage.cpp | 2 +- .../protocols/oscar/icq/ui/icqsearchbase.ui | 2 +- .../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 +-- kpf/src/ActiveMonitorWindow.cpp | 2 +- kpf/src/ActiveMonitorWindow.h | 2 +- kpf/src/AppletItem.cpp | 2 +- kpf/src/DirSelectWidget.h | 2 +- kppp/docking.cpp | 2 +- kppp/logview/main.h | 2 +- kppp/logview/monthly.cpp | 2 +- kppp/miniterm.cpp | 2 +- kppp/miniterm.h | 2 +- krdc/hostprofiles.ui | 2 +- krdc/keycapturedialog.cpp | 6 ++-- krdc/keycapturedialog.h | 2 +- krdc/krdc.cpp | 6 ++-- krdc/maindialogwidget.cpp | 2 +- krdc/preferencesdialog.cpp | 2 +- krfb/krfb/invitation.h | 2 +- krfb/krfb/main.cpp | 2 +- krfb/krfb/manageinvitations.ui | 4 +-- krfb/krfb/trayicon.cpp | 2 +- krfb/krfb/trayicon.h | 2 +- ksirc/KSPrefs/page_autoconnect.cpp | 2 +- ksirc/KSPrefs/page_autoconnectbase.ui | 2 +- ksirc/KSPrefs/page_font.h | 2 +- ksirc/KSTicker/ksticker.cpp | 2 +- ksirc/ahistlineedit.cpp | 4 +-- ksirc/chanButtons.cpp | 2 +- ksirc/dccManager.h | 2 +- ksirc/dccManagerbase.ui | 2 +- ksirc/dccToplevel.cpp | 2 +- ksirc/dccToplevel.h | 2 +- ksirc/default.pl | 6 ++-- ksirc/displayMgrMDI.cpp | 4 +-- ksirc/dockservercontroller.cpp | 4 +-- ksirc/ksview.cpp | 2 +- ksirc/mditoplevel.cpp | 4 +-- ksirc/mditoplevel.h | 2 +- ksirc/servercontroller.cpp | 8 ++--- ksirc/servercontroller.h | 4 +-- ksirc/test/{nictdelist.pl => nicklist.pl} | 0 ksirc/topic.cpp | 2 +- ksirc/toplevel.cpp | 6 ++-- ksirc/toplevel.h | 2 +- wifi/kwifimanager.cpp | 4 +-- wifi/kwifimanager.h | 2 +- 245 files changed, 401 insertions(+), 401 deletions(-) rename kopete/libkopete/{kopeteblactdelister.cpp => kopeteblacklister.cpp} (100%) rename kopete/libkopete/{kopeteblactdelister.h => kopeteblacklister.h} (100%) rename ksirc/test/{nictdelist.pl => nicklist.pl} (100%) diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp index 00c49838..d2feee28 100644 --- a/dcoprss/feedbrowser.cpp +++ b/dcoprss/feedbrowser.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/dcoprss/feedbrowser.h b/dcoprss/feedbrowser.h index 00745006..9b36aa04 100644 --- a/dcoprss/feedbrowser.h +++ b/dcoprss/feedbrowser.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include class DCOPRSSIface : public TQObject, public DCOPObject { diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 0eb74f54..c66f9c9b 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -36,8 +36,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index f7e09e19..662889dd 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -30,7 +30,7 @@ #define _HIDDENFILEVIEW_H_ #include -#include +#include #include "qmultichecklistitem.h" diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index 045c552e..1bc3e393 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -8417,10 +8417,10 @@ This is only available if the SSL libraries have been compiled on your system an klineedit.h klineedit.h kurllabel.h - klistview.h - klistview.h - klistview.h - klistview.h + tdelistview.h + tdelistview.h + tdelistview.h + tdelistview.h kurlrequester.h klineedit.h kpushbutton.h diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index f22fbfba..879983d9 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include "sambashare.h" diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index 91673c1a..c89bbe20 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -3282,7 +3282,7 @@ Only change something if you know what you are doing. kpushbutton.h klineedit.h klineedit.h - klistview.h + tdelistview.h krestrictedline.h krestrictedline.h krestrictedline.h diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 099bc0bf..b8fa97b4 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -61,8 +61,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp index c07da925..9d0eb7ce 100644 --- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp index c580c1c3..245402f0 100644 --- a/filesharing/advanced/nfs/nfsdialog.cpp +++ b/filesharing/advanced/nfs/nfsdialog.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include "nfsdialog.h" #include "nfsentry.h" diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui index 9aab272f..750c3f6e 100644 --- a/filesharing/simple/controlcenter.ui +++ b/filesharing/simple/controlcenter.ui @@ -480,7 +480,7 @@ krichtextlabel.h - klistview.h + tdelistview.h kpushbutton.h diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 9a0cf6a9..e1d466da 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index 86173f2b..f771fa6c 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdict/actions.cpp b/kdict/actions.cpp index 9587d9cc..b2ad29e4 100644 --- a/kdict/actions.cpp +++ b/kdict/actions.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name, diff --git a/kdict/actions.h b/kdict/actions.h index 6963acdd..a5dd9201 100644 --- a/kdict/actions.h +++ b/kdict/actions.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include class KComboBox; diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index 1502c8fe..56553af6 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kdict/options.cpp b/kdict/options.cpp index 05b9e0fd..e3ea91cc 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "options.h" diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 0aa6f1b8..5b85a034 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 6c67fd7c..eb317a4a 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include #include diff --git a/kdict/toplevel.h b/kdict/toplevel.h index f6ecb6a9..82db7591 100644 --- a/kdict/toplevel.h +++ b/kdict/toplevel.h @@ -18,7 +18,7 @@ #define _TOPLEVEL_H_ #include -#include +#include #include "dcopinterface.h" class TQSplitter; diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt index de86db18..2eceeaec 100644 --- a/kget/CMakeLists.txt +++ b/kget/CMakeLists.txt @@ -39,7 +39,7 @@ install( FILES kgetui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/kget ) tde_add_executable( kget AUTOMOC SOURCES getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp - transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp tdefileio.cpp + transfer.cpp settings.cpp logwindow.cpp tdemainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp diff --git a/kget/Makefile.am b/kget/Makefile.am index 959334b9..15c83ce7 100644 --- a/kget/Makefile.am +++ b/kget/Makefile.am @@ -8,7 +8,7 @@ kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT) kget_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET) kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \ transfer.cpp settings.cpp logwindow.cpp \ - kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \ + tdemainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \ dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \ dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \ dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \ @@ -20,7 +20,7 @@ noinst_HEADERS = common.h \ dlgAdvanced.h dlgAutomation.h dlgConnection.h \ dlgDirectories.h dlgIndividual.h dlgLimits.h \ dlgPreferences.h dlgSystem.h docking.h droptarget.h \ - tdefileio.h kmainwidget.h logwindow.h settings.h \ + tdefileio.h tdemainwidget.h logwindow.h settings.h \ transfer.h transferlist.h version.h slave.h \ slaveevent.h http_defaults.h getfilejob.h dockindividual.h diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp index 45cbe5c5..dc479fc2 100644 --- a/kget/dlgAdvanced.cpp +++ b/kget/dlgAdvanced.cpp @@ -33,7 +33,7 @@ #include #include "settings.h" -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "dlgAdvanced.h" @@ -74,7 +74,7 @@ void DlgAdvanced::applyData() ksettings.b_showMain=cb_ShowMain->isChecked(); if (ksettings.b_expertMode != cb_expertmode->isChecked()) { - kmain->slotToggleExpertMode(); + tdemain->slotToggleExpertMode(); } bool bIsKonquiEnable=cb_konqiIntegration->isChecked(); diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp index 779cacf3..97a299eb 100644 --- a/kget/dlgAutomation.cpp +++ b/kget/dlgAutomation.cpp @@ -38,7 +38,7 @@ #include #include "settings.h" -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "dlgAutomation.h" @@ -106,12 +106,12 @@ void DlgAutomation::applyData() if (cb_autoSave->isChecked() != ksettings.b_autoSave || (uint) le_autoSave->value() != ksettings.autoSaveInterval) { ksettings.b_autoSave = cb_autoSave->isChecked(); ksettings.autoSaveInterval = le_autoSave->value(); - kmain->setAutoSave(); + tdemain->setAutoSave(); } if (cb_autoDisconnect->isChecked() != ksettings.b_autoDisconnect) { - kmain->slotToggleAutoDisconnect(); - kmain->setAutoDisconnect(); + tdemain->slotToggleAutoDisconnect(); + tdemain->setAutoDisconnect(); } ksettings.disconnectCommand = le_autoDisconnect->text(); @@ -120,11 +120,11 @@ void DlgAutomation::applyData() ksettings.disconnectTime = spins->dateTime().time(); if (cb_autoShutdown->isChecked() != ksettings.b_autoShutdown) { - kmain->slotToggleAutoShutdown(); + tdemain->slotToggleAutoShutdown(); } if (cb_autoPaste->isChecked() != ksettings.b_autoPaste) { - kmain->slotToggleAutoPaste(); + tdemain->slotToggleAutoPaste(); } } diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp index 5530953b..2908eda5 100644 --- a/kget/dlgConnection.cpp +++ b/kget/dlgConnection.cpp @@ -37,7 +37,7 @@ #include -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "settings.h" #include "dlgConnection.h" @@ -125,7 +125,7 @@ void DlgConnection::applyData() ksettings.linkNumber = le_linknum->value(); if (cb_offlinemode->isChecked() != ksettings.b_offlineMode) { - kmain->slotToggleOfflineMode(); + tdemain->slotToggleOfflineMode(); } } diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp index 9c70962b..d4e04297 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -39,9 +39,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include "common.h" diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp index 8c6ded6d..6f1f08f0 100644 --- a/kget/dlgLimits.cpp +++ b/kget/dlgLimits.cpp @@ -33,7 +33,7 @@ #include #include "settings.h" -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "dlgLimits.h" @@ -61,7 +61,7 @@ void DlgLimits::applyData() ksettings.maxSimultaneousConnections = le_maxnum->value(); ksettings.minimumBandwidth = le_minband->value(); ksettings.maximumBandwidth = le_maxband->value(); - kmain->checkQueue(); + tdemain->checkQueue(); } void DlgLimits::slotChanged() diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp index cc5ebb43..4a6758e2 100644 --- a/kget/dlgPreferences.cpp +++ b/kget/dlgPreferences.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "dlgConnection.h" @@ -45,7 +45,7 @@ #undef index #endif -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "dlgPreferences.h" diff --git a/kget/dlgSystem.cpp b/kget/dlgSystem.cpp index af33f966..fc3c49e7 100644 --- a/kget/dlgSystem.cpp +++ b/kget/dlgSystem.cpp @@ -32,10 +32,10 @@ #undef index #endif -#include +#include #include "settings.h" -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "dlgSystem.h" #include @@ -62,11 +62,11 @@ void DlgSystem::applyData() { if (cb_useAnimation->isChecked() != ksettings.b_useAnimation) { - kmain->slotToggleAnimation(); + tdemain->slotToggleAnimation(); } ksettings.listViewFont = le_font->font(); - kmain->setListFont(); + tdemain->setListFont(); } void DlgSystem::slotChanged() diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui index a64575f7..2c51556d 100644 --- a/kget/dlgsystembase.ui +++ b/kget/dlgsystembase.ui @@ -164,6 +164,6 @@ - kfontrequester.h + tdefontrequester.h diff --git a/kget/dockindividual.cpp b/kget/dockindividual.cpp index 76ed5753..9b668ea5 100644 --- a/kget/dockindividual.cpp +++ b/kget/dockindividual.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include "dockindividual.h" DockIndividual::DockIndividual(TQWidget *parent, const char *name ) : KSystemTray(parent,name) diff --git a/kget/docking.cpp b/kget/docking.cpp index e0e70f86..cb68c5b4 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -30,10 +30,10 @@ #include #include #include -#include +#include #include -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "settings.h" #include "docking.h" diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index 44bb1ef1..7e8de183 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -26,18 +26,18 @@ #include -#include +#include #include #include #include #include -#include +#include #include #include -#include +#include #include -#include "kmainwidget.h" +#include "tdemainwidget.h" #include #ifdef TQ_WS_X11 #include @@ -98,9 +98,9 @@ DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget() popupMenu->insertSeparator(); popupMenu->setItemChecked(pop_sticky, b_sticky); - kmain->m_paPreferences->plug(popupMenu); + tdemain->m_paPreferences->plug(popupMenu); popupMenu->insertSeparator(); - kmain->m_paQuit->plug(popupMenu); + tdemain->m_paQuit->plug(popupMenu); isdragging = false; @@ -129,14 +129,14 @@ DropTarget::mousePressEvent(TQMouseEvent * e) } else if (e->button() == Qt::RightButton) { - popupMenu->setItemEnabled(pop_Min, kmain->isVisible()); - popupMenu->setItemEnabled(pop_Max, kmain->isHidden()); + popupMenu->setItemEnabled(pop_Min, tdemain->isVisible()); + popupMenu->setItemEnabled(pop_Max, tdemain->isHidden()); popupMenu->popup(TQCursor::pos()); } else if (e->button() == Qt::MidButton) { - kmain->slotPasteTransfer(); + tdemain->slotPasteTransfer(); } } @@ -163,11 +163,11 @@ void DropTarget::dropEvent(TQDropEvent * event) if (KURLDrag::decode(event, list)) { - kmain->addTransfers(list); + tdemain->addTransfers(list); } else if (TQTextDrag::decode(event, str)) { - kmain->addTransfer(str); + tdemain->addTransfer(str); } } @@ -193,10 +193,10 @@ void DropTarget::updateStickyState() void DropTarget::toggleMinimizeRestore() { - if (kmain->isVisible()) - kmain->hide(); + if (tdemain->isVisible()) + tdemain->hide(); else - kmain->show(); + tdemain->show(); } /** No descriptions */ diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index 8a5f69cc..4195573d 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -3,15 +3,15 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include #include -#include +#include #define COL_NAME 0 #define COL_DESC 1 diff --git a/kget/kget_plug_in/kget_linkview.h b/kget/kget_plug_in/kget_linkview.h index ab39541f..e5dc78ad 100644 --- a/kget/kget_plug_in/kget_linkview.h +++ b/kget/kget_plug_in/kget_linkview.h @@ -10,8 +10,8 @@ #include -#include -#include +#include +#include #include #include "links.h" diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index b40f50dd..869fb513 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -26,11 +26,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index 09490134..f8148fdf 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -30,10 +30,10 @@ #include #include -#include +#include #include "transfer.h" -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "logwindow.h" #include @@ -182,8 +182,8 @@ LogWindow::LogWindow():KDialogBase(Tabbed, i18n("Log Window"), Close, Close, 0, void LogWindow::closeEvent(TQCloseEvent *e) { - kmain->m_paShowLog->setChecked(false); - kmain->b_viewLogWindow = false; + tdemain->m_paShowLog->setChecked(false); + tdemain->b_viewLogWindow = false; KDialogBase::closeEvent( e ); } diff --git a/kget/main.cpp b/kget/main.cpp index ea6ab350..824bd9e6 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -37,7 +37,7 @@ #include #include #include -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "version.h" @@ -64,9 +64,9 @@ static void signalHandler(int sigId) { fprintf(stderr, "*** KGet got signal %d\n", sigId); - if (sigId != SIGSEGV && kmain) { + if (sigId != SIGSEGV && tdemain) { fprintf(stderr, "*** KGet saving data\n"); - delete kmain; + delete tdemain; } // If Kget crashes again below this line we consider the data lost :-| // Otherwise Kget will end in an infinite loop. @@ -101,7 +101,7 @@ static void cleanup(void) class KGetApp : public KUniqueApplication { private: - TDEMainWidget *kmainwidget; + TDEMainWidget *tdemainwidget; public: KGetApp() : KUniqueApplication() @@ -110,7 +110,7 @@ public: sDebugIn << endl; #endif - kmainwidget=0; + tdemainwidget=0; #ifdef _DEBUG sDebugOut << endl; @@ -122,7 +122,7 @@ public: #ifdef _DEBUG sDebugIn << endl; #endif - delete kmainwidget; + delete tdemainwidget; #ifdef _DEBUG sDebugOut << endl; #endif @@ -132,26 +132,26 @@ public: int newInstance() { #ifdef _DEBUG - sDebugIn <<"kmainwidget="<activateDropTarget(); + tdemain->activateDropTarget(); if (args->count()==1) { @@ -160,9 +160,9 @@ public: #endif TQString txt(args->arg(0)); if ( txt.endsWith( ".kgt" ) ) - kmain->readTransfersEx(KURL::fromPathOrURL( txt )); + tdemain->readTransfersEx(KURL::fromPathOrURL( txt )); else - kmain->addTransferEx( KURL::fromPathOrURL( txt ), + tdemain->addTransferEx( KURL::fromPathOrURL( txt ), KURL()); } else if(args->count()>=2) @@ -175,11 +175,11 @@ public: // Sometimes valid filenames are not recognised by KURL::isLocalFile(), they are marked as invalid then if ( args->count()==2 && ( urls.last().isLocalFile() || !urls.last().isValid())) { - kmain->addTransferEx( urls.first(), urls.last() ); + tdemain->addTransferEx( urls.first(), urls.last() ); } else { - kmain->addTransfers( urls, TQString() ); + tdemain->addTransfers( urls, TQString() ); } } args->clear(); diff --git a/kget/settings.cpp b/kget/settings.cpp index 35451760..3489c9b4 100644 --- a/kget/settings.cpp +++ b/kget/settings.cpp @@ -35,7 +35,7 @@ #include -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "transferlist.h" #include "droptarget.h" #include "settings.h" @@ -271,9 +271,9 @@ void Settings::save() // write main window geometry properties config->setGroup("MainGeometry"); - config->writeEntry("Position", kmain->pos()); - config->writeEntry("Size", kmain->size()); - config->writeEntry("State", KWin::windowInfo(kmain->winId()).state()); + config->writeEntry("Position", tdemain->pos()); + config->writeEntry("Size", tdemain->size()); + config->writeEntry("State", KWin::windowInfo(tdemain->winId()).state()); // write drop target geometry properties config->setGroup("DropGeometry"); diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp index 4e852c66..3306680a 100644 --- a/kget/tdemainwidget.cpp +++ b/kget/tdemainwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** -* kmainwidget.cpp +* tdemainwidget.cpp * ------------------- * * begin : Tue Jan 29 2002 @@ -75,7 +75,7 @@ #include "settings.h" #include "transfer.h" #include "transferlist.h" -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "tdefileio.h" #include "dlgPreferences.h" #include "logwindow.h" @@ -99,7 +99,7 @@ struct KURLPair KURL src; }; -TDEMainWidget *kmain = 0L; +TDEMainWidget *tdemain = 0L; #define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar) @@ -139,7 +139,7 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked) b_viewPreferences = FALSE; myTransferList = 0L; - kmain = this; + tdemain = this; // Set log time, needed for the name of log file TQDate date = TQDateTime::currentDateTime().date(); @@ -2545,4 +2545,4 @@ void TDEMainWidget::slotShowMenubar() menuBar()->hide(); } -#include "kmainwidget.moc" +#include "tdemainwidget.moc" diff --git a/kget/tdemainwidget.h b/kget/tdemainwidget.h index cd2ce92d..cd8703d6 100644 --- a/kget/tdemainwidget.h +++ b/kget/tdemainwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** -* kmainwidget.h +* tdemainwidget.h * ------------------- * * Revision : $Id$ @@ -28,8 +28,8 @@ #ifndef _KMAINWIDGET_H_ #define _KMAINWIDGET_H_ -#include -#include +#include +#include #include #include "common.h" @@ -227,7 +227,7 @@ private: }; -extern TDEMainWidget *kmain; +extern TDEMainWidget *tdemain; extern DropTarget *kdrop; #endif // _KMAINWIDGET_H_ diff --git a/kget/transfer.cpp b/kget/transfer.cpp index e9631091..43bc6939 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ #include "safedelete.h" #include "settings.h" #include "logwindow.h" -#include "kmainwidget.h" +#include "tdemainwidget.h" #include "dlgIndividual.h" #include "transferlist.h" #include "transfer.h" @@ -118,10 +118,10 @@ Transfer::init(const uint _id) status = ST_STOPPED; - connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), kmain, TQT_SLOT(slotStatusChanged(Transfer *, int))); + connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), tdemain, TQT_SLOT(slotStatusChanged(Transfer *, int))); connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), this, TQT_SLOT(slotUpdateActions())); - connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), kmain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &))); + connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), tdemain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &))); // setup actions m_paResume = new TDEAction(i18n("&Resume"), "tool_resume", 0, this, TQT_SLOT(slotResume()), this, "resume"); @@ -782,7 +782,7 @@ bool Transfer::read(KSimpleConfig * config, int id) } if (!src.isValid() && !ksettings.b_expertMode) { - KMessageBox::error(kmain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error")); + KMessageBox::error(tdemain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error")); return false; } @@ -840,7 +840,7 @@ void Transfer::slotExecPause() m_paResume->setEnabled(true); slotUpdateActions(); //TODO WE NEED TO UPDATE ACTIONS.. - kmain->slotUpdateActions(); + tdemain->slotUpdateActions(); emit statusChanged(this, OP_PAUSED); sDebugOut << endl; } diff --git a/kget/transfer.h b/kget/transfer.h index 2673faf7..17dd24be 100644 --- a/kget/transfer.h +++ b/kget/transfer.h @@ -28,7 +28,7 @@ #ifndef _Transfer_h #define _Transfer_h -#include +#include #include #include #include diff --git a/kget/transferlist.h b/kget/transferlist.h index 3ffa22ac..b22b9994 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -27,7 +27,7 @@ #ifndef _TransferList_h #define _TransferList_h -#include +#include #include #include diff --git a/knewsticker/knewsticker.h b/knewsticker/knewsticker.h index c70f568b..057cec9b 100644 --- a/knewsticker/knewsticker.h +++ b/knewsticker/knewsticker.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include "configiface.h" #include "configaccess.h" diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index 6bb6407c..8ec90bd8 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -18,13 +18,13 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui index 200144c7..dd28ddaf 100644 --- a/knewsticker/knewstickerconfigwidget.ui +++ b/knewsticker/knewstickerconfigwidget.ui @@ -1157,15 +1157,15 @@ Note that the filters are processed from the top to the bottom so that of two fi kcolorbutton.h kcombobox.h klineedit.h - klistview.h + tdelistview.h knuminput.h knuminput.h knuminput.h - klistview.h - klistview.h + tdelistview.h + tdelistview.h kcombobox.h kcombobox.h klineedit.h diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index a6927527..6f5f8532 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui index beb57001..177b751c 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui @@ -202,7 +202,7 @@ - klistbox.h + tdelistbox.h kurllabel.h kseparator.h @@ -210,6 +210,6 @@ kurllabel.h kseparator.h - klistbox.h + tdelistbox.h 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/kopeteblactdelister.cpp b/kopete/libkopete/kopeteblacklister.cpp similarity index 100% rename from kopete/libkopete/kopeteblactdelister.cpp rename to kopete/libkopete/kopeteblacklister.cpp diff --git a/kopete/libkopete/kopeteblactdelister.h b/kopete/libkopete/kopeteblacklister.h similarity index 100% rename from kopete/libkopete/kopeteblactdelister.h rename to 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 #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 diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp index 22545816..e2a3e782 100644 --- a/kpf/src/ActiveMonitorWindow.cpp +++ b/kpf/src/ActiveMonitorWindow.cpp @@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include #include #include "ActiveMonitor.h" diff --git a/kpf/src/ActiveMonitorWindow.h b/kpf/src/ActiveMonitorWindow.h index 63c502b9..26545c03 100644 --- a/kpf/src/ActiveMonitorWindow.h +++ b/kpf/src/ActiveMonitorWindow.h @@ -24,7 +24,7 @@ #ifndef KPF_ACTIVE_MONITOR_WINDOW_H #define KPF_ACTIVE_MONITOR_WINDOW_H -#include +#include class TDEAction; diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index 6741eb19..e47e0ee2 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/kpf/src/DirSelectWidget.h b/kpf/src/DirSelectWidget.h index e542b5a2..07bf23a6 100644 --- a/kpf/src/DirSelectWidget.h +++ b/kpf/src/DirSelectWidget.h @@ -24,7 +24,7 @@ #ifndef KPF_DIR_SELECT_WIDGET_H #define KPF_DIR_SELECT_WIDGET_H -#include +#include namespace KPF { diff --git a/kppp/docking.cpp b/kppp/docking.cpp index d67b6683..b569b3c1 100644 --- a/kppp/docking.cpp +++ b/kppp/docking.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "docking.h" #include "main.h" diff --git a/kppp/logview/main.h b/kppp/logview/main.h index 8b90481e..dcbf2cb8 100644 --- a/kppp/logview/main.h +++ b/kppp/logview/main.h @@ -21,7 +21,7 @@ #ifndef __MAIN__H__ #define __MAIN__H__ -#include +#include #include #include #include "monthly.h" diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 35937219..0fd6e83e 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 51d1b9d2..ff9bfcff 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -33,7 +33,7 @@ #include "modem.h" #include "miniterm.h" #include -#include +#include #include #include #include diff --git a/kppp/miniterm.h b/kppp/miniterm.h index e58e5603..984083a8 100644 --- a/kppp/miniterm.h +++ b/kppp/miniterm.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include class KHelpMenu; diff --git a/krdc/hostprofiles.ui b/krdc/hostprofiles.ui index f32ef2e5..5a2f42d9 100644 --- a/krdc/hostprofiles.ui +++ b/krdc/hostprofiles.ui @@ -166,6 +166,6 @@ - klistview.h + tdelistview.h diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp index 2d9f502b..9949471e 100644 --- a/krdc/keycapturedialog.cpp +++ b/krdc/keycapturedialog.cpp @@ -3,7 +3,7 @@ ------------------- begin : Wed Dec 25 01:20:22 CET 2002 copyright : (C) 2002-2003 by Tim Jansen - (C) unknown (whoever wrote kshortcutdialog.cpp) + (C) unknown (whoever wrote tdeshortcutdialog.cpp) (C) 2004 Nadeem Hasan email : tim@tjansen.de ***************************************************************************/ @@ -18,7 +18,7 @@ ***************************************************************************/ // -// based on key capture code from tdelibs/tdeui/kshortcutdialog.cpp +// based on key capture code from tdelibs/tdeui/tdeshortcutdialog.cpp // #include "keycapturedialog.h" @@ -91,7 +91,7 @@ bool KeyCaptureDialog::x11Event(XEvent *pEvent) void KeyCaptureDialog::x11EventKeyPress( XEvent *pEvent ) { - // taken from kshortcutdialog.h + // taken from tdeshortcutdialog.h KKeyNative keyNative( pEvent ); uint keyModX = keyNative.mod(), keySymX = keyNative.sym(); if ((keySymX == XK_Escape) && !keyModX) { diff --git a/krdc/keycapturedialog.h b/krdc/keycapturedialog.h index 42a0f19d..94e81699 100644 --- a/krdc/keycapturedialog.h +++ b/krdc/keycapturedialog.h @@ -23,7 +23,7 @@ class KeyCaptureWidget; #include "keycapturedialog.h" -#include +#include #include #include diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index b052f6b3..b8bdc69f 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index befd8656..a9ae12ce 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index b244c6ff..cffbfc26 100644 --- a/krdc/preferencesdialog.cpp +++ b/krdc/preferencesdialog.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include PreferencesDialog::PreferencesDialog( TQWidget *parent, const char *name ) diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h index fd72f0fd..8456f0db 100644 --- a/krfb/krfb/invitation.h +++ b/krfb/krfb/invitation.h @@ -19,7 +19,7 @@ #define INVITATION_H #include -#include +#include #include #include #include diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp index 8991be48..36df4b2f 100644 --- a/krfb/krfb/main.cpp +++ b/krfb/krfb/main.cpp @@ -21,7 +21,7 @@ #include "rfbcontroller.h" #include -#include +#include #include #include #include diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui index b6c5f888..34f6590c 100644 --- a/krfb/krfb/manageinvitations.ui +++ b/krfb/krfb/manageinvitations.ui @@ -202,7 +202,7 @@ - klistview.h + tdelistview.h manageinvitations.ui.h @@ -211,6 +211,6 @@ - klistview.h + tdelistview.h diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index 98824109..849c42f8 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include KPassivePopup2::KPassivePopup2(TQWidget *parent) : KPassivePopup(parent){ diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h index 66799e6e..134f883d 100644 --- a/krfb/krfb/trayicon.h +++ b/krfb/krfb/trayicon.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp index 964a4acd..86a78c6d 100644 --- a/ksirc/KSPrefs/page_autoconnect.cpp +++ b/ksirc/KSPrefs/page_autoconnect.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui index 664bf30f..ff220588 100644 --- a/ksirc/KSPrefs/page_autoconnectbase.ui +++ b/ksirc/KSPrefs/page_autoconnectbase.ui @@ -387,7 +387,7 @@ - klistview.h + tdelistview.h knuminput.h knuminput.h diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h index 154ff014..ae910a2d 100644 --- a/ksirc/KSPrefs/page_font.h +++ b/ksirc/KSPrefs/page_font.h @@ -1,6 +1,6 @@ #ifndef _PAGE_FONT #define _PAGE_FONT -#include // For the font selection widget +#include // For the font selection widget #include // For the tqlayout #include "ksopts.h" // For storing the info. diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index 60e137bf..4e9891cb 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include "ksticker.h" diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index f741646f..1eb0df88 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -51,8 +51,8 @@ #include #include #include -#include -#include +#include +#include aHistLineEdit::aHistLineEdit(TQWidget *parent, const char *name) diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index ad56d000..7f841450 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -4,7 +4,7 @@ #include "chanButtons.moc" #include -#include +#include #include #include #include diff --git a/ksirc/dccManager.h b/ksirc/dccManager.h index 519c0dca..151152f5 100644 --- a/ksirc/dccManager.h +++ b/ksirc/dccManager.h @@ -15,7 +15,7 @@ #include #include "dccManagerbase.h" -#include "klistview.h" +#include "tdelistview.h" class dccManager; diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index 7c768f47..70d21bb5 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -192,7 +192,7 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h kpushbutton.h diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp index e5288290..d03543c0 100644 --- a/ksirc/dccToplevel.cpp +++ b/ksirc/dccToplevel.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/ksirc/dccToplevel.h b/ksirc/dccToplevel.h index d7a64341..fe4f6992 100644 --- a/ksirc/dccToplevel.h +++ b/ksirc/dccToplevel.h @@ -2,7 +2,7 @@ #ifndef _DCCTOPLEVEL_H_ #define _DCCTOPLEVEL_H_ -#include +#include class dccManager; diff --git a/ksirc/default.pl b/ksirc/default.pl index 7b42dd18..e253f1e9 100644 --- a/ksirc/default.pl +++ b/ksirc/default.pl @@ -428,12 +428,12 @@ sub cmd_fk { $n0thing_kickpat=$newarg; &slashify($n0thing_kickpat); $n0thing_kickmsg=$args || "though names may change each face retains the mask it wore"; - &addhook("352", "dofklist"); + &addhook("352", "doftdelist"); &addhook("315", "donefk"); &sl("WHO $talkchannel"); } &addcmd("fk"); -sub hook_dofklist { +sub hook_doftdelist { local($a)=@_; local($c, $c, $u, $h, $s, $n)=split(/ +/, $a); (($n."!".$u."\@".$h) =~ /${n0thing_kickpat}/i) && $n ne $nick && @@ -441,7 +441,7 @@ sub hook_dofklist { $silent=1; } sub hook_donefk { - &remhook("352", "dofklist"); + &remhook("352", "doftdelist"); &remhook("315", "donefk"); } sub cmd_setaway { diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index ec488275..89e05ad8 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index a433c99b..bc7ddc75 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -16,9 +16,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index e093450f..07a06b60 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index 55992ccb..334f4ff5 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -7,9 +7,9 @@ #include #include #include -#include +#include #include -#include +#include #include "mditoplevel.h" #include "toplevel.h" diff --git a/ksirc/mditoplevel.h b/ksirc/mditoplevel.h index 78350561..851834ae 100644 --- a/ksirc/mditoplevel.h +++ b/ksirc/mditoplevel.h @@ -4,7 +4,7 @@ #include #include -#include +#include class KSTabWidget : public TQTabWidget { diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 58d46517..baf92e43 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -83,15 +83,15 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -110,7 +110,7 @@ #endif #include #include -#include +#include DisplayMgr *displayMgr; diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 7111a458..0eb92375 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -24,8 +24,8 @@ class ProcCommand; #include #include -#include -#include +#include +#include #include "ksircprocess.h" #include "ksircchannel.h" diff --git a/ksirc/test/nictdelist.pl b/ksirc/test/nicklist.pl similarity index 100% rename from ksirc/test/nictdelist.pl rename to ksirc/test/nicklist.pl diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index 92066916..7238d62f 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index a6b7518d..e2530cc9 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include #include @@ -1286,7 +1286,7 @@ void KSircTopLevel::control_message(int command, TQString str) } setName(m_channelInfo.server().utf8() + "_" + m_channelInfo.channel().utf8() + "_" + "toplevel"); pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + TQSPLITTER_OBJECT_NAME_STRING); - kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_ktoolframe"); + kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_tdetoolframe"); linee->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "LineEnter"); kmenu->show(); setCaption(m_channelInfo.channel()); diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h index de5e2a27..a50fc835 100644 --- a/ksirc/toplevel.h +++ b/ksirc/toplevel.h @@ -2,7 +2,7 @@ #define KSIRCTOPLEVEL_H #include -#include +#include #include "ahistlineedit.h" #include "messageReceiver.h" diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 71d7bf29..2b2a1fc3 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index 5222cd4b..4387c354 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -30,7 +30,7 @@ class TQPushButton; class TQStringList; // include files for KDE -#include +#include class KSystemTray; class TDEToggleAction; class TDEProcess;