From b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:58 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kopete/INSTALL | 4 +- kopete/kopete/CMakeLists.txt | 2 +- kopete/kopete/Makefile.am | 2 +- .../kopete/addcontactwizard/addcontactwizard.cpp | 2 +- kopete/kopete/chatwindow/chatmessagepart.cpp | 6 +- kopete/kopete/chatwindow/chatview.cpp | 2 +- kopete/kopete/chatwindow/kopetechatwindow.cpp | 2 +- .../chatwindow/kopetechatwindowstylemanager.cpp | 4 +- .../chatwindow/kopetechatwindowstylemanager.h | 2 +- kopete/kopete/chatwindow/kopeteemailwindow.cpp | 2 +- kopete/kopete/chatwindow/krichtexteditpart.cpp | 2 +- .../kopete/config/appearance/appearanceconfig.cpp | 10 +- .../config/appearance/emoticonseditdialog.cpp | 4 +- kopete/kopete/config/avdevice/avdeviceconfig.cpp | 2 +- kopete/kopete/config/behavior/behaviorconfig.cpp | 2 +- .../config/identity/kopeteidentityconfig.cpp | 4 +- .../kopete/config/identity/kopeteidentityconfig.h | 2 +- .../identity/kopeteidentityconfigpreferences.kcfgc | 2 +- .../kopete/contactlist/customnotificationprops.cpp | 2 +- kopete/kopete/contactlist/kopetelviprops.cpp | 4 +- kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 2 +- kopete/kopete/kconf_update/CMakeLists.txt | 64 ---- kopete/kopete/kconf_update/Makefile.am | 32 -- kopete/kopete/kconf_update/kopete-account-0.10.pl | 26 -- .../kconf_update/kopete-account-kconf_update.cpp | 247 ------------- .../kconf_update/kopete-account-kconf_update.sh | 10 - .../kconf_update/kopete-account-kconf_update.upd | 9 - .../kopete-jabberpriorityaddition-kconf_update.sh | 2 - .../kopete-jabberpriorityaddition-kconf_update.upd | 4 - .../kopete-jabberproxytype-kconf_update.sh | 2 - .../kopete-jabberproxytype-kconf_update.upd | 4 - kopete/kopete/kconf_update/kopete-nameTracking.cpp | 135 ------- kopete/kopete/kconf_update/kopete-nameTracking.upd | 3 - kopete/kopete/kconf_update/kopete-pluginloader.pl | 28 -- kopete/kopete/kconf_update/kopete-pluginloader.upd | 4 - .../kopete/kconf_update/kopete-pluginloader2.cpp | 89 ----- kopete/kopete/kconf_update/kopete-pluginloader2.sh | 10 - .../kopete/kconf_update/kopete-pluginloader2.upd | 4 - kopete/kopete/kopeteapplication.cpp | 2 +- kopete/kopete/kopeteeditglobalidentitywidget.cpp | 4 +- kopete/kopete/kopeteiface.cpp | 2 +- kopete/kopete/kopetewindow.cpp | 2 +- kopete/kopete/tdeconf_update/CMakeLists.txt | 64 ++++ kopete/kopete/tdeconf_update/Makefile.am | 32 ++ .../kopete/tdeconf_update/kopete-account-0.10.pl | 26 ++ .../kopete-account-tdeconf_update.cpp | 247 +++++++++++++ .../kopete-account-tdeconf_update.sh | 10 + .../kopete-account-tdeconf_update.upd | 9 + ...kopete-jabberpriorityaddition-tdeconf_update.sh | 2 + ...opete-jabberpriorityaddition-tdeconf_update.upd | 4 + .../kopete-jabberproxytype-tdeconf_update.sh | 2 + .../kopete-jabberproxytype-tdeconf_update.upd | 4 + .../kopete/tdeconf_update/kopete-nameTracking.cpp | 135 +++++++ .../kopete/tdeconf_update/kopete-nameTracking.upd | 3 + .../kopete/tdeconf_update/kopete-pluginloader.pl | 28 ++ .../kopete/tdeconf_update/kopete-pluginloader.upd | 4 + .../kopete/tdeconf_update/kopete-pluginloader2.cpp | 89 +++++ .../kopete/tdeconf_update/kopete-pluginloader2.sh | 10 + .../kopete/tdeconf_update/kopete-pluginloader2.upd | 4 + kopete/libkopete/avdevice/videodevicepool.h | 2 +- kopete/libkopete/kautoconfig.cpp | 6 +- kopete/libkopete/kautoconfig.h | 4 +- kopete/libkopete/knotification.cpp | 2 +- kopete/libkopete/kopeteaccount.cpp | 2 +- kopete/libkopete/kopeteaccountmanager.cpp | 2 +- kopete/libkopete/kopeteaway.cpp | 2 +- kopete/libkopete/kopeteblacklister.cpp | 2 +- kopete/libkopete/kopetecontactlistelement.cpp | 2 +- kopete/libkopete/kopeteglobal.cpp | 2 +- kopete/libkopete/kopetemimetypehandler.cpp | 2 +- kopete/libkopete/kopetepassword.cpp | 2 +- kopete/libkopete/kopetepluginmanager.cpp | 2 +- kopete/libkopete/kopeteprefs.cpp | 2 +- kopete/libkopete/kopetetransfermanager.cpp | 6 +- kopete/libkopete/kopetetransfermanager.h | 2 +- kopete/libkopete/kopeteutils.cpp | 2 +- kopete/libkopete/private/kopeteviewmanager.cpp | 2 +- kopete/libkopete/ui/addressbookselectorwidget.cpp | 2 +- kopete/libkopete/ui/kopetefileconfirmdialog.cpp | 4 +- kopete/libkopete/ui/kopetelistview.cpp | 2 +- kopete/libkopete/ui/metacontactselectorwidget.cpp | 2 +- kopete/plugins/addbookmarks/CMakeLists.txt | 2 +- kopete/plugins/addbookmarks/Makefile.am | 2 +- kopete/plugins/addbookmarks/addbookmarksplugin.h | 2 +- .../addbookmarks/addbookmarksprefssettings.cpp | 2 +- kopete/plugins/alias/CMakeLists.txt | 2 +- kopete/plugins/alias/Makefile.am | 2 +- kopete/plugins/alias/aliaspreferences.cpp | 2 +- kopete/plugins/autoreplace/CMakeLists.txt | 2 +- kopete/plugins/autoreplace/Makefile.am | 2 +- kopete/plugins/autoreplace/autoreplaceconfig.cpp | 2 +- kopete/plugins/cryptography/CMakeLists.txt | 2 +- kopete/plugins/cryptography/Makefile.am | 2 +- .../plugins/cryptography/cryptographyguiclient.cpp | 2 +- kopete/plugins/cryptography/cryptographyplugin.cpp | 2 +- kopete/plugins/cryptography/popuppublic.cpp | 2 +- kopete/plugins/highlight/CMakeLists.txt | 2 +- kopete/plugins/highlight/Makefile.am | 2 +- kopete/plugins/history/CMakeLists.txt | 2 +- kopete/plugins/history/Makefile.am | 2 +- kopete/plugins/history/converter.cpp | 2 +- kopete/plugins/history/historyconfig.kcfgc | 2 +- kopete/plugins/history/historyplugin.cpp | 2 +- kopete/plugins/latex/CMakeLists.txt | 2 +- kopete/plugins/latex/Makefile.am | 2 +- kopete/plugins/latex/latexconfig.kcfgc | 2 +- kopete/plugins/latex/latexguiclient.h | 2 +- kopete/plugins/motionautoaway/CMakeLists.txt | 2 +- kopete/plugins/motionautoaway/Makefile.am | 2 +- kopete/plugins/motionautoaway/motionawayplugin.cpp | 12 +- kopete/plugins/netmeeting/CMakeLists.txt | 2 +- kopete/plugins/netmeeting/Makefile.am | 2 +- kopete/plugins/netmeeting/netmeetinginvitation.cpp | 2 +- .../plugins/netmeeting/netmeetingpreferences.cpp | 2 +- kopete/plugins/nowlistening/CMakeLists.txt | 2 +- kopete/plugins/nowlistening/Makefile.am | 2 +- .../plugins/nowlistening/nowlisteningconfig.kcfgc | 2 +- kopete/plugins/smpppdcs/CMakeLists.txt | 2 +- kopete/plugins/smpppdcs/Makefile.am | 2 +- kopete/plugins/smpppdcs/detectorsmpppd.cpp | 2 +- kopete/plugins/texteffect/CMakeLists.txt | 2 +- kopete/plugins/texteffect/Makefile.am | 2 +- kopete/plugins/texteffect/texteffectconfig.cpp | 2 +- kopete/plugins/translator/CMakeLists.txt | 2 +- kopete/plugins/translator/Makefile.am | 2 +- kopete/plugins/translator/translatorguiclient.h | 2 +- kopete/plugins/translator/translatorplugin.cpp | 2 +- kopete/plugins/translator/translatorplugin.h | 2 +- kopete/plugins/webpresence/CMakeLists.txt | 2 +- kopete/plugins/webpresence/Makefile.am | 2 +- kopete/plugins/webpresence/webpresenceplugin.cpp | 28 +- kopete/plugins/webpresence/webpresenceplugin.h | 2 +- kopete/protocols/gadu/gaduaccount.cpp | 4 +- kopete/protocols/gadu/gaduaccount.h | 2 +- kopete/protocols/gadu/gaducontact.cpp | 2 +- kopete/protocols/gadu/gaduprotocol.cpp | 2 +- kopete/protocols/groupwise/gwaccount.cpp | 2 +- .../protocols/groupwise/ui/gweditaccountwidget.cpp | 2 +- .../groupwise/ui/gwreceiveinvitationdialog.cpp | 2 +- kopete/protocols/irc/ircaccount.cpp | 2 +- kopete/protocols/irc/irccontactmanager.cpp | 4 +- kopete/protocols/irc/ircprotocol.cpp | 2 +- kopete/protocols/irc/ircusercontact.cpp | 2 +- kopete/protocols/irc/libkirc/kircengine.cpp | 2 +- kopete/protocols/irc/libkirc/ksslsocket.cpp | 12 +- kopete/protocols/irc/libkirc/ksslsocket.h | 2 +- kopete/protocols/irc/ui/CMakeLists.txt | 2 +- kopete/protocols/irc/ui/Makefile.am | 2 +- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 2 +- kopete/protocols/irc/ui/networkconfig.ui | 382 -------------------- kopete/protocols/irc/ui/networkconfig.ui.h | 26 -- kopete/protocols/irc/ui/networtdeconfig.ui | 382 ++++++++++++++++++++ kopete/protocols/irc/ui/networtdeconfig.ui.h | 26 ++ kopete/protocols/jabber/CMakeLists.txt | 2 +- kopete/protocols/jabber/Makefile.am | 2 +- kopete/protocols/jabber/jabberaccount.cpp | 2 +- kopete/protocols/jabber/jabberbasecontact.cpp | 2 +- kopete/protocols/jabber/jabberchatsession.cpp | 4 +- kopete/protocols/jabber/jabbercontact.cpp | 4 +- kopete/protocols/jabber/jabberfiletransfer.cpp | 2 +- kopete/protocols/jabber/jabbergroupcontact.cpp | 2 +- .../protocols/jabber/jabbergroupmembercontact.cpp | 2 +- kopete/protocols/jabber/jabberprotocol.cpp | 2 +- kopete/protocols/jabber/jabbertransport.cpp | 2 +- kopete/protocols/jabber/kioslave/CMakeLists.txt | 42 --- kopete/protocols/jabber/kioslave/Makefile.am | 25 -- kopete/protocols/jabber/kioslave/jabberdisco.cpp | 399 --------------------- kopete/protocols/jabber/kioslave/jabberdisco.h | 83 ----- .../protocols/jabber/kioslave/jabberdisco.protocol | 53 --- kopete/protocols/jabber/tdeioslave/CMakeLists.txt | 42 +++ kopete/protocols/jabber/tdeioslave/Makefile.am | 25 ++ kopete/protocols/jabber/tdeioslave/jabberdisco.cpp | 399 +++++++++++++++++++++ kopete/protocols/jabber/tdeioslave/jabberdisco.h | 83 +++++ .../jabber/tdeioslave/jabberdisco.protocol | 53 +++ kopete/protocols/jabber/ui/dlgjabbervcard.cpp | 4 +- kopete/protocols/jabber/ui/jabberchooseserver.cpp | 6 +- .../jabber/ui/jabbereditaccountwidget.cpp | 2 +- kopete/protocols/meanwhile/meanwhileaccount.cpp | 2 +- kopete/protocols/msn/config/CMakeLists.txt | 2 +- kopete/protocols/msn/config/Makefile.am | 2 +- kopete/protocols/msn/msnaccount.cpp | 2 +- kopete/protocols/msn/msnchatsession.cpp | 2 +- kopete/protocols/msn/msncontact.cpp | 6 +- kopete/protocols/msn/msnfiletransfersocket.cpp | 2 +- kopete/protocols/msn/msnnotifysocket.cpp | 4 +- kopete/protocols/msn/msnprotocol.cpp | 2 +- kopete/protocols/msn/msnsecureloginhandler.cpp | 2 +- kopete/protocols/msn/msnsocket.cpp | 2 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 2 +- kopete/protocols/msn/ui/msneditaccountwidget.cpp | 6 +- kopete/protocols/msn/webcam.cpp | 2 +- kopete/protocols/oscar/aim/aimaccount.cpp | 2 +- .../oscar/aim/ui/aimeditaccountwidget.cpp | 2 +- kopete/protocols/oscar/icq/icqaccount.cpp | 2 +- .../oscar/icq/ui/icqeditaccountwidget.cpp | 2 +- kopete/protocols/oscar/oscaraccount.cpp | 2 +- kopete/protocols/oscar/oscarversionupdater.cpp | 4 +- kopete/protocols/sms/services/gsmlib.cpp | 2 +- kopete/protocols/sms/services/smsclient.cpp | 2 +- kopete/protocols/sms/services/smssend.cpp | 2 +- kopete/protocols/sms/services/smssendprovider.cpp | 2 +- kopete/protocols/sms/smsaccount.cpp | 2 +- kopete/protocols/sms/smscontact.cpp | 2 +- kopete/protocols/sms/smseditaccountwidget.cpp | 2 +- kopete/protocols/sms/smsprotocol.cpp | 2 +- .../protocols/winpopup/libwinpopup/libwinpopup.h | 2 +- kopete/protocols/winpopup/wpaccount.cpp | 2 +- kopete/protocols/winpopup/wpeditaccount.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/logintask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp | 6 +- .../protocols/yahoo/libkyahoo/receivefiletask.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp | 2 +- .../protocols/yahoo/libkyahoo/sendpicturetask.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/yabtask.cpp | 6 +- .../yahoo/libkyahoo/yahoobuddyiconloader.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp | 6 +- kopete/protocols/yahoo/yahooaccount.cpp | 2 +- kopete/protocols/yahoo/yahoochatsession.cpp | 2 +- .../yahoo/yahooconferencemessagemanager.cpp | 2 +- kopete/protocols/yahoo/yahoocontact.cpp | 8 +- kopete/protocols/yahoo/yahooeditaccount.cpp | 4 +- kopete/protocols/yahoo/yahooverifyaccount.cpp | 6 +- 222 files changed, 1929 insertions(+), 1929 deletions(-) delete mode 100644 kopete/kopete/kconf_update/CMakeLists.txt delete mode 100644 kopete/kopete/kconf_update/Makefile.am delete mode 100755 kopete/kopete/kconf_update/kopete-account-0.10.pl delete mode 100644 kopete/kopete/kconf_update/kopete-account-kconf_update.cpp delete mode 100644 kopete/kopete/kconf_update/kopete-account-kconf_update.sh delete mode 100644 kopete/kopete/kconf_update/kopete-account-kconf_update.upd delete mode 100644 kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh delete mode 100644 kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd delete mode 100644 kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.sh delete mode 100644 kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd delete mode 100644 kopete/kopete/kconf_update/kopete-nameTracking.cpp delete mode 100644 kopete/kopete/kconf_update/kopete-nameTracking.upd delete mode 100755 kopete/kopete/kconf_update/kopete-pluginloader.pl delete mode 100644 kopete/kopete/kconf_update/kopete-pluginloader.upd delete mode 100644 kopete/kopete/kconf_update/kopete-pluginloader2.cpp delete mode 100644 kopete/kopete/kconf_update/kopete-pluginloader2.sh delete mode 100644 kopete/kopete/kconf_update/kopete-pluginloader2.upd create mode 100644 kopete/kopete/tdeconf_update/CMakeLists.txt create mode 100644 kopete/kopete/tdeconf_update/Makefile.am create mode 100755 kopete/kopete/tdeconf_update/kopete-account-0.10.pl create mode 100644 kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp create mode 100644 kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.sh create mode 100644 kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.upd create mode 100644 kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh create mode 100644 kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd create mode 100644 kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh create mode 100644 kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd create mode 100644 kopete/kopete/tdeconf_update/kopete-nameTracking.cpp create mode 100644 kopete/kopete/tdeconf_update/kopete-nameTracking.upd create mode 100755 kopete/kopete/tdeconf_update/kopete-pluginloader.pl create mode 100644 kopete/kopete/tdeconf_update/kopete-pluginloader.upd create mode 100644 kopete/kopete/tdeconf_update/kopete-pluginloader2.cpp create mode 100644 kopete/kopete/tdeconf_update/kopete-pluginloader2.sh create mode 100644 kopete/kopete/tdeconf_update/kopete-pluginloader2.upd delete mode 100644 kopete/protocols/irc/ui/networkconfig.ui delete mode 100644 kopete/protocols/irc/ui/networkconfig.ui.h create mode 100644 kopete/protocols/irc/ui/networtdeconfig.ui create mode 100644 kopete/protocols/irc/ui/networtdeconfig.ui.h delete mode 100644 kopete/protocols/jabber/kioslave/CMakeLists.txt delete mode 100644 kopete/protocols/jabber/kioslave/Makefile.am delete mode 100644 kopete/protocols/jabber/kioslave/jabberdisco.cpp delete mode 100644 kopete/protocols/jabber/kioslave/jabberdisco.h delete mode 100644 kopete/protocols/jabber/kioslave/jabberdisco.protocol create mode 100644 kopete/protocols/jabber/tdeioslave/CMakeLists.txt create mode 100644 kopete/protocols/jabber/tdeioslave/Makefile.am create mode 100644 kopete/protocols/jabber/tdeioslave/jabberdisco.cpp create mode 100644 kopete/protocols/jabber/tdeioslave/jabberdisco.h create mode 100644 kopete/protocols/jabber/tdeioslave/jabberdisco.protocol (limited to 'kopete') diff --git a/kopete/INSTALL b/kopete/INSTALL index 8c75ea29..1523effd 100644 --- a/kopete/INSTALL +++ b/kopete/INSTALL @@ -193,9 +193,9 @@ directory where TDE doesn't look for additional resources like plugins. It's also possible that you've just been too impatient :) Kopete installs several .desktop files that have to be processed by a -TDE application called 'kbuildsycoca'. If you run Kopete directly +TDE application called 'tdebuildsycoca'. If you run Kopete directly after installing it this process might still be running and Kopete -doesn't see the new plugins yet. Try running 'kbuildsycoca' from a +doesn't see the new plugins yet. Try running 'tdebuildsycoca' from a console and restart Kopete when it finishes. If that doesn't help, please read on. diff --git a/kopete/kopete/CMakeLists.txt b/kopete/kopete/CMakeLists.txt index b88714c2..8f7f6b98 100644 --- a/kopete/kopete/CMakeLists.txt +++ b/kopete/kopete/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory( addcontactwizard ) add_subdirectory( contactlist ) add_subdirectory( chatwindow ) add_subdirectory( config ) -add_subdirectory( kconf_update ) +add_subdirectory( tdeconf_update ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am index ed4305c6..0dbf8f13 100644 --- a/kopete/kopete/Makefile.am +++ b/kopete/kopete/Makefile.am @@ -23,7 +23,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \ KDE_ICON = AUTO METASOURCES = AUTO -SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . kconf_update +SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . tdeconf_update bin_PROGRAMS = kopete kopete_SOURCES = main.cpp kopeteapplication.cpp kopeteiface.cpp \ diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 1c011f99..02523865 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 01361872..7a6235f1 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,8 +60,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 34324b45..136a9b4e 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -32,7 +32,7 @@ #include "kopetecontactlist.h" #include "kopeteviewmanager.h" -#include +#include #include #include #include diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index e205fb5a..a330dc43 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index 7ed0e931..6a5b4534 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -30,9 +30,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "kopetechatwindowstyle.h" diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h index 3cf5d6e9..7c9a181f 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include class ChatWindowStyle; diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index 7cb9a03f..b70313b9 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 6f3bdf25..152570a8 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 63c51b89..0aff7691 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -43,11 +43,11 @@ #include #include #include -#include // for KNewStuff emoticon fetching +#include // for KNewStuff emoticon fetching #include #include #include -#include +#include #include #include #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include // knewstuff emoticon and chatwindow fetching #include // " @@ -696,7 +696,7 @@ void AppearanceConfig::slotGetChatStyles() // you have to do this by hand when providing your own Engine KNS::ProviderLoader *provider = new KNS::ProviderLoader( this ); TQObject::connect( provider, TQT_SIGNAL( providersLoaded(Provider::List*) ), downloadDialog, TQT_SLOT( slotProviders (Provider::List *) ) ); - provider->load( "kopete/chatstyle", "http://download.kde.org/khotnewstuff/kopetestyles12-providers.xml" ); + provider->load( "kopete/chatstyle", "http://download.kde.org/tdehotnewstuff/kopetestyles12-providers.xml" ); downloadDialog->exec(); } @@ -856,7 +856,7 @@ void AppearanceConfig::slotGetEmoticonThemes() TDEConfig* config = TDEGlobal::config(); config->setGroup( "KNewStuff" ); config->writeEntry( "ProvidersUrl", - "http://download.kde.org/khotnewstuff/emoticons-providers.xml" ); + "http://download.kde.org/tdehotnewstuff/emoticons-providers.xml" ); config->writeEntry( "StandardResource", "emoticons" ); config->writeEntry( "Uncompress", "application/x-gzip" ); config->sync(); diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index d432d22e..f0510a5f 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp index cf619fd7..cf5f98ed 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp +++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp index bae2d832..f3d61b44 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.cpp +++ b/kopete/kopete/config/behavior/behaviorconfig.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "kopeteprefs.h" diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index da13d3cc..1d513964 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -30,7 +30,7 @@ // KDE includes #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ #include // KDE KIO includes -#include +#include // KDE KABC(AddressBook) includes #include diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.h b/kopete/kopete/config/identity/kopeteidentityconfig.h index d0795412..37f4e7df 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.h +++ b/kopete/kopete/config/identity/kopeteidentityconfig.h @@ -19,7 +19,7 @@ #define _IDENTITYCONFIG_H #include -#include +#include #include "kopetemetacontact.h" diff --git a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc index 6f93d40f..ffa89670 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc +++ b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kopeteidentityconfigpreferences.kcfg ClassName=KopeteIdentityConfigPreferences Singleton=true diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp index bc5ed895..82851eb4 100644 --- a/kopete/kopete/contactlist/customnotificationprops.cpp +++ b/kopete/kopete/contactlist/customnotificationprops.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include "customnotifications.h" diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index a731b504..f64af84d 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -521,7 +521,7 @@ void KopeteMetaLVIProps::slotFromKABCClicked() void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester ) { - // taken from tdelibs/kio/kfile/knotifydialog.cpp + // taken from tdelibs/tdeio/tdefile/knotifydialog.cpp // only need to init this once requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * ))); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 7daabb61..3f2165c4 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/kopete/kconf_update/CMakeLists.txt b/kopete/kopete/kconf_update/CMakeLists.txt deleted file mode 100644 index 000654da..00000000 --- a/kopete/kopete/kconf_update/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_definitions( -DKDE_NO_COMPAT ) - -include_directories( - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( FILES - kopete-pluginloader.upd kopete-account-kconf_update.upd - kopete-pluginloader2.upd kopete-jabberproxytype-kconf_update.upd - kopete-jabberpriorityaddition-kconf_update.upd - kopete-nameTracking.upd - DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) - -install( PROGRAMS - kopete-pluginloader.pl kopete-jabberpriorityaddition-kconf_update.sh - kopete-pluginloader2.sh kopete-jabberproxytype-kconf_update.sh - kopete-account-0.10.pl kopete-account-kconf_update.sh - DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) - - -##### kopete_account_kconf_update (executable) ## - -tde_add_executable( "kopete-account-kconf_update" - SOURCES kopete-account-kconf_update.cpp - LINK ${TQT_LIBRARIES} - DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin -) - - -##### kopete_pluginloader2_kconf_update (executable) - -tde_add_executable( "kopete-pluginloader2-kconf_update" - SOURCES kopete-pluginloader2.cpp - LINK ${TQT_LIBRARIES} - DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin -) - - -##### kopete_nameTracking_kconf_update (executable) - -tde_add_executable( "kopete-nameTracking-kconf_update" - SOURCES kopete-nameTracking.cpp - LINK tdecore-shared - DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin -) diff --git a/kopete/kopete/kconf_update/Makefile.am b/kopete/kopete/kconf_update/Makefile.am deleted file mode 100644 index 7ae291dd..00000000 --- a/kopete/kopete/kconf_update/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes) - -update_DATA = kopete-pluginloader.upd kopete-account-kconf_update.upd \ - kopete-pluginloader2.upd kopete-jabberproxytype-kconf_update.upd \ - kopete-jabberpriorityaddition-kconf_update.upd kopete-nameTracking.upd -update_SCRIPTS = kopete-pluginloader.pl kopete-account-kconf_update.sh \ - kopete-pluginloader2.sh kopete-jabberproxytype-kconf_update.sh \ - kopete-jabberpriorityaddition-kconf_update.sh kopete-account-0.10.pl -updatedir = $(kde_datadir)/kconf_update - -# The Qt app cannot go into kde_datadir, that is not portable. -# install to kde_bindir/kconf_update_bin instead. -# KDE 3.2 will allow kconf_update scripts to run directly from there, -# but for us that's too late. Use the .sh script as a workaround. -kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \ - kopete-nameTracking-kconf_update -kconfdir = $(libdir)/kconf_update_bin - -kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp -kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kopete_account_kconf_update_LDADD = $(LIB_QT) - -kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp -kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT) - -kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp -kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE) - -# vim: set noet: - diff --git a/kopete/kopete/kconf_update/kopete-account-0.10.pl b/kopete/kopete/kconf_update/kopete-account-0.10.pl deleted file mode 100755 index 3925a52f..00000000 --- a/kopete/kopete/kconf_update/kopete-account-0.10.pl +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/perl -w -# Olivier Goffart -# License: GPL - -use strict; - -# This script rename old plugin datas key. -# It remove the PlguinData_PLUGINID_ prefix from keys. - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; # eat the trailing '\n' - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup =~ /^\[Account_/ and /^PluginData\_.+_(.+)=(.+)$/ ) - { - print "$currentGroup\n$1=$2\n"; - my ($key,$value) = split /=/; - print "# DELETE $currentGroup$key\n"; - } -} diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp deleted file mode 100644 index 4e0daa55..00000000 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp +++ /dev/null @@ -1,247 +0,0 @@ -/* - kconf_update app for migrating kopete 0.6.x accounts to 0.7. Code is - not up to my normal standards, but it does the job, and since it's - supposed to run exactly once on each system that's good enough for me :) - - Copyright (c) 2003 by Martijn Klingens - - Kopete (c) 2002-2003 by the Kopete developers - - ************************************************************************* - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - ************************************************************************* -*/ - -#include -#include -#include - -static TQTextStream qcin ( stdin, IO_ReadOnly ); -static TQTextStream qcout( stdout, IO_WriteOnly ); -static TQTextStream qcerr( stderr, IO_WriteOnly ); - -// Group cache. Yes, I know global vars are ugly :) -bool needFlush = false; -TQString accountId; -TQString password; -TQString autoConnect; -TQString protocol; -TQMap pluginData; - -// Global vars to hold separate IRC vars until we have read all of them -TQString ircNick; -TQString ircServer; -TQString ircPort; - -/* - * Function for (en/de)crypting strings for config file, taken from KMail - * Author: Stefan Taferner - */ -TQString cryptStr(const TQString &aStr) -{ - TQString result; - for (unsigned int i = 0; i < aStr.length(); i++) - result += (aStr[i].unicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].unicode()); - return result; -} - -void parseGroup( const TQString &group, const TQString &rawLine ) -{ - // Groups that are converted can almost certainly be removed entirely - - if ( group == "MSN" || group == "ICQ" || group == "Oscar" || group == "Gadu" || group == "Jabber" || group == "IRC" ) - { - accountId = "EMPTY"; - autoConnect = "true"; - - if ( group == "Oscar" ) - protocol = "AIMProtocol"; - else - protocol = group + "Protocol"; - - password = TQString(); - pluginData.clear(); - - needFlush = true; - - qcout << "# DELETEGROUP [" << group << "]" << endl; - } - else - { - // Groups we don't convert. Output the raw line instead. - qcout << rawLine << endl; - } -} - -void parseKey( const TQString &group, const TQString &key, const TQString &value, const TQString &rawLine ) -{ - //qcerr << "*** group='" << group << "'" << endl; - if ( group == "MSN" ) - { - if ( key == "UserID" ) - accountId = value; - else if ( key == "Password" ) - password = value; - else if ( key == "AutoConnect" ) - autoConnect = value; - else if ( key == "Nick" ) - pluginData[ "displayName" ] = value; - - // All other keys are ignored for MSN, as these apply to stuff that's - // now in libkopete (and the main app) instead. - } - else if ( group == "ICQ" ) - { - if ( key == "UIN" ) - accountId = value; - else if ( key == "Password" ) - password = value; - else if ( key == "AutoConnect" ) - autoConnect = value; - else if ( key == "Nick" ) - pluginData[ "NickName" ] = value; - else if ( key == "Server" ) - pluginData[ key ] = value; - else if ( key == "Port" ) - pluginData[ key ] = value; - } - else if ( group == "Oscar" ) - { - if ( key == "ScreenName" ) - accountId = value; - else if ( key == "Password" ) - password = value; - else if ( key == "Server" ) - pluginData[ key ] = value; - else if ( key == "Port" ) - pluginData[ key ] = value; - } - else if ( group == "Jabber" ) - { - if ( key == "UserID" ) - accountId = value; - else if ( key == "Password" ) - password = value; - if ( key == "Server" || - key == "Port" || key == "UseSSL" || key == "Resource" ) - pluginData[ key ] = value; - } - else if ( group == "Gadu" ) - { - if ( key == "UIN" ) - accountId = value; - else if ( key == "Password" ) - password = value; - else if ( key == "Nick" ) - pluginData[ "displayName" ] = value; - } - else if ( group == "IRC" ) - { - if ( key == "Nickname" ) - ircNick = value; - if ( key == "Server" ) - ircServer = value; - if ( key == "Port" ) - ircPort = value; - if ( accountId == "EMPTY" && - !ircNick.isEmpty( ) && !ircServer.isEmpty() && - !ircPort.isEmpty() ) - { - accountId = TQString::fromLatin1( "%1@%2:%3" ).arg( ircNick, ircServer, ircPort ); - } - } - /* - fixme: insert all other plugins here - martijn - */ - else if ( key == "Modules" ) - { - TQString newValue = value; - newValue.replace ( ".plugin", ".desktop" ); - qcout << "Plugins=" << newValue; - } - else - { - // groups we don't convert. output the raw line instead. - qcout << rawLine << endl; - } -} - -void flushData( const TQString &group ) -{ - - qcout << "[Account_" << protocol << "_" << accountId << "]" << endl; - qcout << "Protocol=" << protocol << endl; - - if( group == "Jabber" ) - qcout << "AccountId=" << accountId << "@" << pluginData["Server"] << endl; - else - qcout << "AccountId=" << accountId << endl; - - qcout << "Password=" << cryptStr( password ) << endl; - qcout << "AutoConnect=" << autoConnect << endl; - - TQMap::ConstIterator it; - for ( it = pluginData.begin(); it != pluginData.end(); ++it ) - qcout << "PluginData_" << protocol << "_" << it.key() << "=" << it.data() << endl; - -} - -int main() -{ - qcin.setEncoding( TQTextStream::UnicodeUTF8 ); - qcout.setEncoding( TQTextStream::UnicodeUTF8 ); - - TQString curGroup; - - TQRegExp groupRegExp( "^\\[(.*)\\]" ); - TQRegExp keyRegExp( "^([a-zA-Z0-9:, _-]*)\\s*=\\s*(.*)\\s*" ); - TQRegExp commentRegExp( "^(#.*)?$" ); - - while ( !qcin.atEnd() ) - { - TQString line = qcin.readLine(); - - if ( commentRegExp.exactMatch( line ) ) - { - // We found a comment, leave unchanged - qcout << line << endl; - } - else if ( groupRegExp.exactMatch( line ) ) - { - // We found the start of a group, parse it - if ( needFlush ) - { - // ... but we were already working on a group, so finish what - // we were doing - flush existing group first - flushData ( curGroup ); - needFlush = false; - } - - curGroup = groupRegExp.capturedTexts()[ 1 ]; - parseGroup( curGroup, line ); - } - else if ( keyRegExp.exactMatch( line ) ) - { - // We found the a key line - parseKey( curGroup, keyRegExp.capturedTexts()[ 1 ], keyRegExp.capturedTexts()[ 2 ], line ); - } - else - { - qcerr << "** Unknown input line: " << line << endl; - } - } - - if ( needFlush ) - flushData ( curGroup ); - - return 0; -} - -// vim: set noet ts=4 sts=4 sw=4: - diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.sh b/kopete/kopete/kconf_update/kopete-account-kconf_update.sh deleted file mode 100644 index e47477b8..00000000 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -IFS=: -SUFF=kconf_update_bin/kopete-account-kconf_update -for path in `tde-config --path lib`; do - if test -x "$path/$SUFF"; then - exec "$path/$SUFF" - fi -done - diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.upd b/kopete/kopete/kconf_update/kopete-account-kconf_update.upd deleted file mode 100644 index ed1f3ac7..00000000 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.upd +++ /dev/null @@ -1,9 +0,0 @@ -Id=kopete0.7/r1 -File=kopeterc -Script=kopete-account-kconf_update.sh,sh - -#remove the PluginData_ProtocolID_ prefix from config keys -Id=kopete0.10/r1 -File=kopeterc -Script=kopete-account-0.10.pl,perl - diff --git a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh b/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh deleted file mode 100644 index 2ba47416..00000000 --- a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sed -e 's/^\(PluginData_JabberProtocol_Resource=.*\)$/\1\nPluginData_JabberProtocol_Priority=5/' diff --git a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd b/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd deleted file mode 100644 index 8e761e6f..00000000 --- a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd +++ /dev/null @@ -1,4 +0,0 @@ -Id=kopete0.9/r1 -File=kopeterc -Script=kopete-jabberpriorityaddition-kconf_update.sh,sh - diff --git a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.sh b/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.sh deleted file mode 100644 index 3cbf8a55..00000000 --- a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sed "s/PluginData_JabberProtocol_ProxyType=SOCKS4/PluginData_JabberProtocol_ProxyType=SOCKS/" | sed "s/PluginData_JabberProtocol_ProxyType=SOCKS5/PluginData_JabberProtocol_ProxyType=SOCKS/" diff --git a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd b/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd deleted file mode 100644 index c39ce69b..00000000 --- a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd +++ /dev/null @@ -1,4 +0,0 @@ -Id=kopete0.9/r1 -File=kopeterc -Script=kopete-jabberproxytype-kconf_update.sh,sh - diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.cpp b/kopete/kopete/kconf_update/kopete-nameTracking.cpp deleted file mode 100644 index d56dfc76..00000000 --- a/kopete/kopete/kconf_update/kopete-nameTracking.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/* - kconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to - track the name of a subcontact. - - Kopete (c) 2002-2004 by the Kopete developers - - ************************************************************************* - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - ************************************************************************* -*/ - -#include -#include -#include - -#include - -static TQTextStream qcerr( stderr, IO_WriteOnly ); - -int main() -{ - TDEInstance* inst = new TDEInstance( "Update script" ); - TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) ); - - // Load contact list & save backup. - TQFile contactListFile( filename ); - contactListFile.open( IO_ReadOnly ); - TQDomDocument contactList; - contactList.setContent( &contactListFile ); - contactListFile.close(); - TQDir().rename( filename, filename + TQString::fromLatin1( ".bak" ) ); - - // parse the XML file - TQDomElement list = contactList.documentElement(); - TQDomElement mcElement = list.firstChild().toElement(); - - while( !mcElement.isNull() ) - { - - // update all the MetaContacts - if( mcElement.tagName() == TQString::fromLatin1("meta-contact") ) - { - TQDomElement displayName; - TQDomElement subcontact; - - TQDomElement elem = mcElement.firstChild().toElement(); - while( !elem.isNull() ) - { - if( elem.tagName() == TQString::fromLatin1( "display-name" ) ) - displayName = elem; - if( elem.tagName() == TQString::fromLatin1( "plugin-data" ) ) - { - // check if it's a contact by checking for "protocol" substring in the tag, - // and the presence of a contactId child element. - TQString pluginId = elem.attribute( TQString::fromLatin1( "plugin-id" ) ); - bool isProtocol = ( pluginId.contains( "protocol", false ) > 0 ); // case-insensitive search - bool hasContactId = false; - TQDomNode field = elem.firstChild(); - while( !field.isNull() ) - { - TQDomElement fieldElem = field.toElement(); - - if( !fieldElem.isNull() && - fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) && - fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) - { - hasContactId = true; - break; - } - field = field.nextSibling(); - } - - if( isProtocol && hasContactId ) - subcontact = elem; - } - - elem = elem.nextSibling().toElement(); - } // end while - - // check if we're even tracking the subcontact's name - // if displayName.isNull(), it simply won't find the attribute; no harm done - bool tracking = - ( displayName.attribute( TQString::fromLatin1( "trackChildNameChanges" ), - TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); - if( !displayName.isNull() && !subcontact.isNull() && tracking ) - { - // collect info - TQString nsCID; - TQString nsPID; - TQString nsAID; - - nsPID = subcontact.attribute( TQString::fromLatin1( "plugin-id" ) ); - TQDomNode field = subcontact.firstChild(); - while( !field.isNull() ) - { - TQDomElement fieldElem = field.toElement(); - - if( !fieldElem.isNull() && fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) ) - { - if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) - nsCID = fieldElem.text(); - if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "accountId" ) ) - nsAID = fieldElem.text(); - } - field = field.nextSibling(); - } - - // create the tracking info - displayName.setAttribute( TQString::fromLatin1( "nameSourceContactId" ), nsCID ); - displayName.setAttribute( TQString::fromLatin1( "nameSourcePluginId" ), nsPID ); - displayName.setAttribute( TQString::fromLatin1( "nameSourceAccountId" ), nsAID ); - } - } - - mcElement = mcElement.nextSibling().toElement(); - } - - // Save converted contactlist - contactListFile.open( IO_WriteOnly ); - TQTextStream stream( &contactListFile ); - stream.setEncoding( TQTextStream::UnicodeUTF8 ); - stream << contactList.toString( 4 ); - contactListFile.flush(); - contactListFile.close(); - - return 0; -} - -// vim: set noet ts=4 sts=4 sw=4: - diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.upd b/kopete/kopete/kconf_update/kopete-nameTracking.upd deleted file mode 100644 index da0a0e2d..00000000 --- a/kopete/kopete/kconf_update/kopete-nameTracking.upd +++ /dev/null @@ -1,3 +0,0 @@ -Id=kopete0.9/r1 -File=kopeterc -Script=kopete-nameTracking-kconf_update diff --git a/kopete/kopete/kconf_update/kopete-pluginloader.pl b/kopete/kopete/kconf_update/kopete-pluginloader.pl deleted file mode 100755 index 19709d3a..00000000 --- a/kopete/kopete/kconf_update/kopete-pluginloader.pl +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/perl -my $logging = "false"; -my $moduleLine; - -while( my $line = <> ) -{ - if( $line =~ /LogAll/ ) - { - $logging = "true"; - } - if( $line =~ /^Modules=/ ) - { - $moduleLine = $line; - } -} - -$moduleLine =~ s/^Modules/Plugins/; -$moduleLine =~ s/\.plugin/\.desktop/g; -$moduleLine =~ s/oscar/aim/; -if ( $logging == "true" ) -{ - chomp $moduleLine; - $moduleLine = $moduleLine . ",history.desktop\n"; -} -print $moduleLine; - -print "# DELETE Modules\n"; - diff --git a/kopete/kopete/kconf_update/kopete-pluginloader.upd b/kopete/kopete/kconf_update/kopete-pluginloader.upd deleted file mode 100644 index cc739414..00000000 --- a/kopete/kopete/kconf_update/kopete-pluginloader.upd +++ /dev/null @@ -1,4 +0,0 @@ -Id=kopete0.7/r1 -File=kopeterc -Script=kopete-pluginloader.pl,perl - diff --git a/kopete/kopete/kconf_update/kopete-pluginloader2.cpp b/kopete/kopete/kconf_update/kopete-pluginloader2.cpp deleted file mode 100644 index d9b0fb39..00000000 --- a/kopete/kopete/kconf_update/kopete-pluginloader2.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - kconf_update app for migrating the list of loaded plugins in - kopete 0.7.x to the new KPluginSelector format. - - Copyright (c) 2003 by Martijn Klingens - - Kopete (c) 2002-2003 by the Kopete developers - - ************************************************************************* - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - ************************************************************************* -*/ - -#include -#include - -static TQTextStream qcin ( stdin, IO_ReadOnly ); -static TQTextStream qcout( stdout, IO_WriteOnly ); -static TQTextStream qcerr( stderr, IO_WriteOnly ); - -void parseKey( const TQString &group, const TQString &key, const TQString &value, const TQString &rawLine ) -{ - //qcerr << "*** group='" << group << "'" << endl; - if ( group.isEmpty() && key == "Plugins" ) - { - TQStringList plugins = TQStringList::split( ',', value ); - if ( !plugins.isEmpty() ) - { - qcout << "[Plugins]" << endl; - for ( TQStringList::Iterator it = plugins.begin(); it != plugins.end(); ++it ) - qcout << "kopete_" << ( *it ).remove( ".desktop" ) << "Enabled=true" << endl; - } - qcout << "# DELETE []Plugins" << endl; - } - else - { - // groups we don't convert. output the raw line instead. - qcout << rawLine << endl; - } -} - -int main() -{ - qcin.setEncoding( TQTextStream::UnicodeUTF8 ); - qcout.setEncoding( TQTextStream::UnicodeUTF8 ); - - TQString curGroup; - - TQRegExp groupRegExp( "^\\[(.*)\\]" ); - TQRegExp keyRegExp( "^([a-zA-Z0-9:, _-]*)\\s*=\\s*(.*)\\s*" ); - TQRegExp commentRegExp( "^(#.*)?$" ); - - while ( !qcin.atEnd() ) - { - TQString line = qcin.readLine(); - - if ( commentRegExp.exactMatch( line ) ) - { - // We found a comment, leave unchanged - qcout << line << endl; - } - else if ( groupRegExp.exactMatch( line ) ) - { - // We found the start of a group, leave unchanged - qcout << line << endl; - - curGroup = groupRegExp.capturedTexts()[ 1 ]; - } - else if ( keyRegExp.exactMatch( line ) ) - { - // We found the a key line - parseKey( curGroup, keyRegExp.capturedTexts()[ 1 ], keyRegExp.capturedTexts()[ 2 ], line ); - } - else - { - qcerr << "** Unknown input line: " << line << endl; - } - } - - return 0; -} - -// vim: set noet ts=4 sts=4 sw=4: - diff --git a/kopete/kopete/kconf_update/kopete-pluginloader2.sh b/kopete/kopete/kconf_update/kopete-pluginloader2.sh deleted file mode 100644 index a6144152..00000000 --- a/kopete/kopete/kconf_update/kopete-pluginloader2.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -IFS=: -SUFF=kconf_update_bin/kopete-pluginloader2-kconf_update -for path in `tde-config --path lib`; do - if test -x "$path/$SUFF"; then - exec "$path/$SUFF" - fi -done - diff --git a/kopete/kopete/kconf_update/kopete-pluginloader2.upd b/kopete/kopete/kconf_update/kopete-pluginloader2.upd deleted file mode 100644 index 3461c7a7..00000000 --- a/kopete/kopete/kconf_update/kopete-pluginloader2.upd +++ /dev/null @@ -1,4 +0,0 @@ -Id=kopete0.8/r1 -File=kopeterc -Script=kopete-pluginloader2.sh,sh - diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index 8a41bc49..2e469bf5 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp index 4e752fa8..c1f181be 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp +++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp @@ -31,9 +31,9 @@ #include #include #include -#include +#include #include -#include +#include #include // Kopete include diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp index d532dacd..7995c64e 100644 --- a/kopete/kopete/kopeteiface.cpp +++ b/kopete/kopete/kopeteiface.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "kopeteiface.h" diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 5215d588..5e4c7bd0 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/kopete/tdeconf_update/CMakeLists.txt b/kopete/kopete/tdeconf_update/CMakeLists.txt new file mode 100644 index 00000000..342178f1 --- /dev/null +++ b/kopete/kopete/tdeconf_update/CMakeLists.txt @@ -0,0 +1,64 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_definitions( -DKDE_NO_COMPAT ) + +include_directories( + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES + kopete-pluginloader.upd kopete-account-tdeconf_update.upd + kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd + kopete-jabberpriorityaddition-tdeconf_update.upd + kopete-nameTracking.upd + DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) + +install( PROGRAMS + kopete-pluginloader.pl kopete-jabberpriorityaddition-tdeconf_update.sh + kopete-pluginloader2.sh kopete-jabberproxytype-tdeconf_update.sh + kopete-account-0.10.pl kopete-account-tdeconf_update.sh + DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) + + +##### kopete_account_tdeconf_update (executable) ## + +tde_add_executable( "kopete-account-tdeconf_update" + SOURCES kopete-account-tdeconf_update.cpp + LINK ${TQT_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin +) + + +##### kopete_pluginloader2_tdeconf_update (executable) + +tde_add_executable( "kopete-pluginloader2-tdeconf_update" + SOURCES kopete-pluginloader2.cpp + LINK ${TQT_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin +) + + +##### kopete_nameTracking_tdeconf_update (executable) + +tde_add_executable( "kopete-nameTracking-tdeconf_update" + SOURCES kopete-nameTracking.cpp + LINK tdecore-shared + DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin +) diff --git a/kopete/kopete/tdeconf_update/Makefile.am b/kopete/kopete/tdeconf_update/Makefile.am new file mode 100644 index 00000000..8c4b949e --- /dev/null +++ b/kopete/kopete/tdeconf_update/Makefile.am @@ -0,0 +1,32 @@ +AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes) + +update_DATA = kopete-pluginloader.upd kopete-account-tdeconf_update.upd \ + kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd \ + kopete-jabberpriorityaddition-tdeconf_update.upd kopete-nameTracking.upd +update_SCRIPTS = kopete-pluginloader.pl kopete-account-tdeconf_update.sh \ + kopete-pluginloader2.sh kopete-jabberproxytype-tdeconf_update.sh \ + kopete-jabberpriorityaddition-tdeconf_update.sh kopete-account-0.10.pl +updatedir = $(kde_datadir)/tdeconf_update + +# The Qt app cannot go into kde_datadir, that is not portable. +# install to kde_bindir/tdeconf_update_bin instead. +# KDE 3.2 will allow tdeconf_update scripts to run directly from there, +# but for us that's too late. Use the .sh script as a workaround. +tdeconf_PROGRAMS = kopete-account-tdeconf_update kopete-pluginloader2-tdeconf_update \ + kopete-nameTracking-tdeconf_update +tdeconfdir = $(libdir)/tdeconf_update_bin + +kopete_account_tdeconf_update_SOURCES = kopete-account-tdeconf_update.cpp +kopete_account_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_account_tdeconf_update_LDADD = $(LIB_QT) + +kopete_pluginloader2_tdeconf_update_SOURCES = kopete-pluginloader2.cpp +kopete_pluginloader2_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_pluginloader2_tdeconf_update_LDADD = $(LIB_QT) + +kopete_nameTracking_tdeconf_update_SOURCES = kopete-nameTracking.cpp +kopete_nameTracking_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_nameTracking_tdeconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE) + +# vim: set noet: + diff --git a/kopete/kopete/tdeconf_update/kopete-account-0.10.pl b/kopete/kopete/tdeconf_update/kopete-account-0.10.pl new file mode 100755 index 00000000..3925a52f --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-account-0.10.pl @@ -0,0 +1,26 @@ +#!/usr/bin/perl -w +# Olivier Goffart +# License: GPL + +use strict; + +# This script rename old plugin datas key. +# It remove the PlguinData_PLUGINID_ prefix from keys. + +# read the whole config file +my $currentGroup = ""; +my %configFile; +while ( <> ) { + chomp; # eat the trailing '\n' + next if ( /^$/ ); # skip empty lines + next if ( /^\#/ ); # skip comments + if ( /^\[/ ) { # group begin + $currentGroup = $_; + next; + } elsif ( $currentGroup =~ /^\[Account_/ and /^PluginData\_.+_(.+)=(.+)$/ ) + { + print "$currentGroup\n$1=$2\n"; + my ($key,$value) = split /=/; + print "# DELETE $currentGroup$key\n"; + } +} diff --git a/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp new file mode 100644 index 00000000..42ba47f1 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp @@ -0,0 +1,247 @@ +/* + tdeconf_update app for migrating kopete 0.6.x accounts to 0.7. Code is + not up to my normal standards, but it does the job, and since it's + supposed to run exactly once on each system that's good enough for me :) + + Copyright (c) 2003 by Martijn Klingens + + Kopete (c) 2002-2003 by the Kopete developers + + ************************************************************************* + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + ************************************************************************* +*/ + +#include +#include +#include + +static TQTextStream qcin ( stdin, IO_ReadOnly ); +static TQTextStream qcout( stdout, IO_WriteOnly ); +static TQTextStream qcerr( stderr, IO_WriteOnly ); + +// Group cache. Yes, I know global vars are ugly :) +bool needFlush = false; +TQString accountId; +TQString password; +TQString autoConnect; +TQString protocol; +TQMap pluginData; + +// Global vars to hold separate IRC vars until we have read all of them +TQString ircNick; +TQString ircServer; +TQString ircPort; + +/* + * Function for (en/de)crypting strings for config file, taken from KMail + * Author: Stefan Taferner + */ +TQString cryptStr(const TQString &aStr) +{ + TQString result; + for (unsigned int i = 0; i < aStr.length(); i++) + result += (aStr[i].unicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].unicode()); + return result; +} + +void parseGroup( const TQString &group, const TQString &rawLine ) +{ + // Groups that are converted can almost certainly be removed entirely + + if ( group == "MSN" || group == "ICQ" || group == "Oscar" || group == "Gadu" || group == "Jabber" || group == "IRC" ) + { + accountId = "EMPTY"; + autoConnect = "true"; + + if ( group == "Oscar" ) + protocol = "AIMProtocol"; + else + protocol = group + "Protocol"; + + password = TQString(); + pluginData.clear(); + + needFlush = true; + + qcout << "# DELETEGROUP [" << group << "]" << endl; + } + else + { + // Groups we don't convert. Output the raw line instead. + qcout << rawLine << endl; + } +} + +void parseKey( const TQString &group, const TQString &key, const TQString &value, const TQString &rawLine ) +{ + //qcerr << "*** group='" << group << "'" << endl; + if ( group == "MSN" ) + { + if ( key == "UserID" ) + accountId = value; + else if ( key == "Password" ) + password = value; + else if ( key == "AutoConnect" ) + autoConnect = value; + else if ( key == "Nick" ) + pluginData[ "displayName" ] = value; + + // All other keys are ignored for MSN, as these apply to stuff that's + // now in libkopete (and the main app) instead. + } + else if ( group == "ICQ" ) + { + if ( key == "UIN" ) + accountId = value; + else if ( key == "Password" ) + password = value; + else if ( key == "AutoConnect" ) + autoConnect = value; + else if ( key == "Nick" ) + pluginData[ "NickName" ] = value; + else if ( key == "Server" ) + pluginData[ key ] = value; + else if ( key == "Port" ) + pluginData[ key ] = value; + } + else if ( group == "Oscar" ) + { + if ( key == "ScreenName" ) + accountId = value; + else if ( key == "Password" ) + password = value; + else if ( key == "Server" ) + pluginData[ key ] = value; + else if ( key == "Port" ) + pluginData[ key ] = value; + } + else if ( group == "Jabber" ) + { + if ( key == "UserID" ) + accountId = value; + else if ( key == "Password" ) + password = value; + if ( key == "Server" || + key == "Port" || key == "UseSSL" || key == "Resource" ) + pluginData[ key ] = value; + } + else if ( group == "Gadu" ) + { + if ( key == "UIN" ) + accountId = value; + else if ( key == "Password" ) + password = value; + else if ( key == "Nick" ) + pluginData[ "displayName" ] = value; + } + else if ( group == "IRC" ) + { + if ( key == "Nickname" ) + ircNick = value; + if ( key == "Server" ) + ircServer = value; + if ( key == "Port" ) + ircPort = value; + if ( accountId == "EMPTY" && + !ircNick.isEmpty( ) && !ircServer.isEmpty() && + !ircPort.isEmpty() ) + { + accountId = TQString::fromLatin1( "%1@%2:%3" ).arg( ircNick, ircServer, ircPort ); + } + } + /* + fixme: insert all other plugins here - martijn + */ + else if ( key == "Modules" ) + { + TQString newValue = value; + newValue.replace ( ".plugin", ".desktop" ); + qcout << "Plugins=" << newValue; + } + else + { + // groups we don't convert. output the raw line instead. + qcout << rawLine << endl; + } +} + +void flushData( const TQString &group ) +{ + + qcout << "[Account_" << protocol << "_" << accountId << "]" << endl; + qcout << "Protocol=" << protocol << endl; + + if( group == "Jabber" ) + qcout << "AccountId=" << accountId << "@" << pluginData["Server"] << endl; + else + qcout << "AccountId=" << accountId << endl; + + qcout << "Password=" << cryptStr( password ) << endl; + qcout << "AutoConnect=" << autoConnect << endl; + + TQMap::ConstIterator it; + for ( it = pluginData.begin(); it != pluginData.end(); ++it ) + qcout << "PluginData_" << protocol << "_" << it.key() << "=" << it.data() << endl; + +} + +int main() +{ + qcin.setEncoding( TQTextStream::UnicodeUTF8 ); + qcout.setEncoding( TQTextStream::UnicodeUTF8 ); + + TQString curGroup; + + TQRegExp groupRegExp( "^\\[(.*)\\]" ); + TQRegExp keyRegExp( "^([a-zA-Z0-9:, _-]*)\\s*=\\s*(.*)\\s*" ); + TQRegExp commentRegExp( "^(#.*)?$" ); + + while ( !qcin.atEnd() ) + { + TQString line = qcin.readLine(); + + if ( commentRegExp.exactMatch( line ) ) + { + // We found a comment, leave unchanged + qcout << line << endl; + } + else if ( groupRegExp.exactMatch( line ) ) + { + // We found the start of a group, parse it + if ( needFlush ) + { + // ... but we were already working on a group, so finish what + // we were doing - flush existing group first + flushData ( curGroup ); + needFlush = false; + } + + curGroup = groupRegExp.capturedTexts()[ 1 ]; + parseGroup( curGroup, line ); + } + else if ( keyRegExp.exactMatch( line ) ) + { + // We found the a key line + parseKey( curGroup, keyRegExp.capturedTexts()[ 1 ], keyRegExp.capturedTexts()[ 2 ], line ); + } + else + { + qcerr << "** Unknown input line: " << line << endl; + } + } + + if ( needFlush ) + flushData ( curGroup ); + + return 0; +} + +// vim: set noet ts=4 sts=4 sw=4: + diff --git a/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.sh b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.sh new file mode 100644 index 00000000..c9a1bcfc --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +IFS=: +SUFF=tdeconf_update_bin/kopete-account-tdeconf_update +for path in `tde-config --path lib`; do + if test -x "$path/$SUFF"; then + exec "$path/$SUFF" + fi +done + diff --git a/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.upd b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.upd new file mode 100644 index 00000000..d48aeed1 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.upd @@ -0,0 +1,9 @@ +Id=kopete0.7/r1 +File=kopeterc +Script=kopete-account-tdeconf_update.sh,sh + +#remove the PluginData_ProtocolID_ prefix from config keys +Id=kopete0.10/r1 +File=kopeterc +Script=kopete-account-0.10.pl,perl + diff --git a/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh new file mode 100644 index 00000000..2ba47416 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +sed -e 's/^\(PluginData_JabberProtocol_Resource=.*\)$/\1\nPluginData_JabberProtocol_Priority=5/' diff --git a/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd new file mode 100644 index 00000000..7fd7d586 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd @@ -0,0 +1,4 @@ +Id=kopete0.9/r1 +File=kopeterc +Script=kopete-jabberpriorityaddition-tdeconf_update.sh,sh + diff --git a/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh new file mode 100644 index 00000000..3cbf8a55 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +sed "s/PluginData_JabberProtocol_ProxyType=SOCKS4/PluginData_JabberProtocol_ProxyType=SOCKS/" | sed "s/PluginData_JabberProtocol_ProxyType=SOCKS5/PluginData_JabberProtocol_ProxyType=SOCKS/" diff --git a/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd new file mode 100644 index 00000000..efc15155 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd @@ -0,0 +1,4 @@ +Id=kopete0.9/r1 +File=kopeterc +Script=kopete-jabberproxytype-tdeconf_update.sh,sh + diff --git a/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp b/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp new file mode 100644 index 00000000..ee1f3f93 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp @@ -0,0 +1,135 @@ +/* + tdeconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to + track the name of a subcontact. + + Kopete (c) 2002-2004 by the Kopete developers + + ************************************************************************* + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + ************************************************************************* +*/ + +#include +#include +#include + +#include + +static TQTextStream qcerr( stderr, IO_WriteOnly ); + +int main() +{ + TDEInstance* inst = new TDEInstance( "Update script" ); + TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) ); + + // Load contact list & save backup. + TQFile contactListFile( filename ); + contactListFile.open( IO_ReadOnly ); + TQDomDocument contactList; + contactList.setContent( &contactListFile ); + contactListFile.close(); + TQDir().rename( filename, filename + TQString::fromLatin1( ".bak" ) ); + + // parse the XML file + TQDomElement list = contactList.documentElement(); + TQDomElement mcElement = list.firstChild().toElement(); + + while( !mcElement.isNull() ) + { + + // update all the MetaContacts + if( mcElement.tagName() == TQString::fromLatin1("meta-contact") ) + { + TQDomElement displayName; + TQDomElement subcontact; + + TQDomElement elem = mcElement.firstChild().toElement(); + while( !elem.isNull() ) + { + if( elem.tagName() == TQString::fromLatin1( "display-name" ) ) + displayName = elem; + if( elem.tagName() == TQString::fromLatin1( "plugin-data" ) ) + { + // check if it's a contact by checking for "protocol" substring in the tag, + // and the presence of a contactId child element. + TQString pluginId = elem.attribute( TQString::fromLatin1( "plugin-id" ) ); + bool isProtocol = ( pluginId.contains( "protocol", false ) > 0 ); // case-insensitive search + bool hasContactId = false; + TQDomNode field = elem.firstChild(); + while( !field.isNull() ) + { + TQDomElement fieldElem = field.toElement(); + + if( !fieldElem.isNull() && + fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) && + fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) + { + hasContactId = true; + break; + } + field = field.nextSibling(); + } + + if( isProtocol && hasContactId ) + subcontact = elem; + } + + elem = elem.nextSibling().toElement(); + } // end while + + // check if we're even tracking the subcontact's name + // if displayName.isNull(), it simply won't find the attribute; no harm done + bool tracking = + ( displayName.attribute( TQString::fromLatin1( "trackChildNameChanges" ), + TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + if( !displayName.isNull() && !subcontact.isNull() && tracking ) + { + // collect info + TQString nsCID; + TQString nsPID; + TQString nsAID; + + nsPID = subcontact.attribute( TQString::fromLatin1( "plugin-id" ) ); + TQDomNode field = subcontact.firstChild(); + while( !field.isNull() ) + { + TQDomElement fieldElem = field.toElement(); + + if( !fieldElem.isNull() && fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) ) + { + if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) + nsCID = fieldElem.text(); + if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "accountId" ) ) + nsAID = fieldElem.text(); + } + field = field.nextSibling(); + } + + // create the tracking info + displayName.setAttribute( TQString::fromLatin1( "nameSourceContactId" ), nsCID ); + displayName.setAttribute( TQString::fromLatin1( "nameSourcePluginId" ), nsPID ); + displayName.setAttribute( TQString::fromLatin1( "nameSourceAccountId" ), nsAID ); + } + } + + mcElement = mcElement.nextSibling().toElement(); + } + + // Save converted contactlist + contactListFile.open( IO_WriteOnly ); + TQTextStream stream( &contactListFile ); + stream.setEncoding( TQTextStream::UnicodeUTF8 ); + stream << contactList.toString( 4 ); + contactListFile.flush(); + contactListFile.close(); + + return 0; +} + +// vim: set noet ts=4 sts=4 sw=4: + diff --git a/kopete/kopete/tdeconf_update/kopete-nameTracking.upd b/kopete/kopete/tdeconf_update/kopete-nameTracking.upd new file mode 100644 index 00000000..62dd9538 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-nameTracking.upd @@ -0,0 +1,3 @@ +Id=kopete0.9/r1 +File=kopeterc +Script=kopete-nameTracking-tdeconf_update diff --git a/kopete/kopete/tdeconf_update/kopete-pluginloader.pl b/kopete/kopete/tdeconf_update/kopete-pluginloader.pl new file mode 100755 index 00000000..19709d3a --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-pluginloader.pl @@ -0,0 +1,28 @@ +#!/usr/bin/perl +my $logging = "false"; +my $moduleLine; + +while( my $line = <> ) +{ + if( $line =~ /LogAll/ ) + { + $logging = "true"; + } + if( $line =~ /^Modules=/ ) + { + $moduleLine = $line; + } +} + +$moduleLine =~ s/^Modules/Plugins/; +$moduleLine =~ s/\.plugin/\.desktop/g; +$moduleLine =~ s/oscar/aim/; +if ( $logging == "true" ) +{ + chomp $moduleLine; + $moduleLine = $moduleLine . ",history.desktop\n"; +} +print $moduleLine; + +print "# DELETE Modules\n"; + diff --git a/kopete/kopete/tdeconf_update/kopete-pluginloader.upd b/kopete/kopete/tdeconf_update/kopete-pluginloader.upd new file mode 100644 index 00000000..cc739414 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-pluginloader.upd @@ -0,0 +1,4 @@ +Id=kopete0.7/r1 +File=kopeterc +Script=kopete-pluginloader.pl,perl + diff --git a/kopete/kopete/tdeconf_update/kopete-pluginloader2.cpp b/kopete/kopete/tdeconf_update/kopete-pluginloader2.cpp new file mode 100644 index 00000000..cf96144b --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-pluginloader2.cpp @@ -0,0 +1,89 @@ +/* + tdeconf_update app for migrating the list of loaded plugins in + kopete 0.7.x to the new KPluginSelector format. + + Copyright (c) 2003 by Martijn Klingens + + Kopete (c) 2002-2003 by the Kopete developers + + ************************************************************************* + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + ************************************************************************* +*/ + +#include +#include + +static TQTextStream qcin ( stdin, IO_ReadOnly ); +static TQTextStream qcout( stdout, IO_WriteOnly ); +static TQTextStream qcerr( stderr, IO_WriteOnly ); + +void parseKey( const TQString &group, const TQString &key, const TQString &value, const TQString &rawLine ) +{ + //qcerr << "*** group='" << group << "'" << endl; + if ( group.isEmpty() && key == "Plugins" ) + { + TQStringList plugins = TQStringList::split( ',', value ); + if ( !plugins.isEmpty() ) + { + qcout << "[Plugins]" << endl; + for ( TQStringList::Iterator it = plugins.begin(); it != plugins.end(); ++it ) + qcout << "kopete_" << ( *it ).remove( ".desktop" ) << "Enabled=true" << endl; + } + qcout << "# DELETE []Plugins" << endl; + } + else + { + // groups we don't convert. output the raw line instead. + qcout << rawLine << endl; + } +} + +int main() +{ + qcin.setEncoding( TQTextStream::UnicodeUTF8 ); + qcout.setEncoding( TQTextStream::UnicodeUTF8 ); + + TQString curGroup; + + TQRegExp groupRegExp( "^\\[(.*)\\]" ); + TQRegExp keyRegExp( "^([a-zA-Z0-9:, _-]*)\\s*=\\s*(.*)\\s*" ); + TQRegExp commentRegExp( "^(#.*)?$" ); + + while ( !qcin.atEnd() ) + { + TQString line = qcin.readLine(); + + if ( commentRegExp.exactMatch( line ) ) + { + // We found a comment, leave unchanged + qcout << line << endl; + } + else if ( groupRegExp.exactMatch( line ) ) + { + // We found the start of a group, leave unchanged + qcout << line << endl; + + curGroup = groupRegExp.capturedTexts()[ 1 ]; + } + else if ( keyRegExp.exactMatch( line ) ) + { + // We found the a key line + parseKey( curGroup, keyRegExp.capturedTexts()[ 1 ], keyRegExp.capturedTexts()[ 2 ], line ); + } + else + { + qcerr << "** Unknown input line: " << line << endl; + } + } + + return 0; +} + +// vim: set noet ts=4 sts=4 sw=4: + diff --git a/kopete/kopete/tdeconf_update/kopete-pluginloader2.sh b/kopete/kopete/tdeconf_update/kopete-pluginloader2.sh new file mode 100644 index 00000000..f858a72e --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-pluginloader2.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +IFS=: +SUFF=tdeconf_update_bin/kopete-pluginloader2-tdeconf_update +for path in `tde-config --path lib`; do + if test -x "$path/$SUFF"; then + exec "$path/$SUFF" + fi +done + diff --git a/kopete/kopete/tdeconf_update/kopete-pluginloader2.upd b/kopete/kopete/tdeconf_update/kopete-pluginloader2.upd new file mode 100644 index 00000000..3461c7a7 --- /dev/null +++ b/kopete/kopete/tdeconf_update/kopete-pluginloader2.upd @@ -0,0 +1,4 @@ +Id=kopete0.8/r1 +File=kopeterc +Script=kopete-pluginloader2.sh,sh + diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h index 75ed9ed4..2a42f97f 100644 --- a/kopete/libkopete/avdevice/videodevicepool.h +++ b/kopete/libkopete/avdevice/videodevicepool.h @@ -32,7 +32,7 @@ #include "videodevice.h" #include "kopete_export.h" #include -#include +#include #include namespace Kopete { diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index 14c5efaf..e1fcf210 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -101,8 +101,8 @@ public: } }; -KAutoConfig::KAutoConfig(TDEConfig *kconfig, TQObject *parent, - const char *name) : TQObject(parent, name), config(kconfig) { +KAutoConfig::KAutoConfig(TDEConfig *tdeconfig, TQObject *parent, + const char *name) : TQObject(parent, name), config(tdeconfig) { d = new KAutoConfigPrivate(); } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index b582e85a..1779f174 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -119,12 +119,12 @@ signals: public: /** * Constructor. - * @param kconfig - TDEConfig to use when retrieving/saving the widgets + * @param tdeconfig - TDEConfig to use when retrieving/saving the widgets * that KAutoConfig knows about. * @param parent - Parent object. * @param name - Object name. */ - KAutoConfig( TDEConfig *kconfig, TQObject *parent=0, const char *name=0 ); + KAutoConfig( TDEConfig *tdeconfig, TQObject *parent=0, const char *name=0 ); /** * Constructor. diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index e8f69779..e0f49646 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 69efb623..ccca93be 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index 21f0d688..df844211 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 94e07ddd..e0bf1553 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -29,7 +29,7 @@ #include "kopetecontact.h" #include "kopeteprefs.h" -#include +#include #include #include #include diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index e31a5d1a..e249d736 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -17,7 +17,7 @@ #include "kopetecontact.h" -#include +#include #include #include diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index 89e9ea29..86fc19c1 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -18,7 +18,7 @@ #include "kopetecontactlistelement.h" -#include +#include #include #include diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index 1c889fc5..4b77444d 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp index b05b2f4e..90da909b 100644 --- a/kopete/libkopete/kopetemimetypehandler.cpp +++ b/kopete/libkopete/kopetemimetypehandler.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index e56e0f5d..8ee74036 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index a98b0fc3..5648e0cc 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -505,7 +505,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /* TDEConfig *config = TDEGlobal::config(); config->setGroup( "Plugins" ); - // FIXME: What is this for? This sort of thing is kconf_update's job - Richard + // FIXME: What is this for? This sort of thing is tdeconf_update's job - Richard if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) ) pluginId.prepend( TQString::fromLatin1( "kopete_" ) ); diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index 353ea46d..77e8381a 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 27952b9a..43e57573 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -18,10 +18,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include "kopetemetacontact.h" #include "kopetecontact.h" diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h index bd18c3f3..0333fc5a 100644 --- a/kopete/libkopete/kopetetransfermanager.h +++ b/kopete/libkopete/kopetetransfermanager.h @@ -24,7 +24,7 @@ #include #include "kopete_export.h" -#include +#include namespace Kopete { diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp index 07e56734..0681b4c7 100644 --- a/kopete/libkopete/kopeteutils.cpp +++ b/kopete/libkopete/kopeteutils.cpp @@ -2,7 +2,7 @@ Kopete Utils. Copyright (c) 2005 Duncan Mac-Vicar Prett - isHostReachable function code derived from KDE's HTTP kioslave + isHostReachable function code derived from KDE's HTTP tdeioslave Copyright (c) 2005 Waldo Bastian Kopete (c) 2002-2003 by the Kopete developers diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 37f04e02..9fbc19c7 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include #include diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index 7b6fc27f..5a75bbf9 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index 7291feb9..524d6bed 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -18,9 +18,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index 7e783024..b0f7e787 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 0fa64a4e..26b075a3 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/plugins/addbookmarks/CMakeLists.txt b/kopete/plugins/addbookmarks/CMakeLists.txt index 4d1df111..d7a3b1c8 100644 --- a/kopete/plugins/addbookmarks/CMakeLists.txt +++ b/kopete/plugins/addbookmarks/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ install( FILES kopete_addbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kopete_addbookmarks (module) ############## diff --git a/kopete/plugins/addbookmarks/Makefile.am b/kopete/plugins/addbookmarks/Makefile.am index 1a6d19df..006ed524 100644 --- a/kopete/plugins/addbookmarks/Makefile.am +++ b/kopete/plugins/addbookmarks/Makefile.am @@ -19,4 +19,4 @@ service_DATA = kopete_addbookmarks.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_addbookmarks_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h index 32143ff9..4bf10668 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.h +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp index 31f12978..8fe0fed1 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp @@ -10,7 +10,7 @@ // // #include -#include +#include #include #include "addbookmarksprefssettings.h" diff --git a/kopete/plugins/alias/CMakeLists.txt b/kopete/plugins/alias/CMakeLists.txt index d8ca2088..dfbc7c1b 100644 --- a/kopete/plugins/alias/CMakeLists.txt +++ b/kopete/plugins/alias/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kopete_alias.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kopete_alias (module) ##################### diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am index 2172da71..ee84eb0c 100644 --- a/kopete/plugins/alias/Makefile.am +++ b/kopete/plugins/alias/Makefile.am @@ -15,5 +15,5 @@ service_DATA = kopete_alias.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_alias_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 4ffa9d27..f81da475 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/autoreplace/CMakeLists.txt b/kopete/plugins/autoreplace/CMakeLists.txt index 9a39da64..671835b0 100644 --- a/kopete/plugins/autoreplace/CMakeLists.txt +++ b/kopete/plugins/autoreplace/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kopete_autoreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_autoreplace_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_autoreplace_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kopete_autoreplace (module) ############### diff --git a/kopete/plugins/autoreplace/Makefile.am b/kopete/plugins/autoreplace/Makefile.am index e6363ae3..3a0d6440 100644 --- a/kopete/plugins/autoreplace/Makefile.am +++ b/kopete/plugins/autoreplace/Makefile.am @@ -17,5 +17,5 @@ service_DATA = kopete_autoreplace.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_autoreplace_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp index 0ce547cb..ce0ca264 100644 --- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp +++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp @@ -18,7 +18,7 @@ #include "autoreplaceconfig.h" -#include +#include #include #include diff --git a/kopete/plugins/cryptography/CMakeLists.txt b/kopete/plugins/cryptography/CMakeLists.txt index 4952d8e2..27e36787 100644 --- a/kopete/plugins/cryptography/CMakeLists.txt +++ b/kopete/plugins/cryptography/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kopete_cryptography.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_cryptography_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_cryptography_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES cryptographyui.rc cryptographychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_cryptography ) diff --git a/kopete/plugins/cryptography/Makefile.am b/kopete/plugins/cryptography/Makefile.am index 90c4c586..8e90bbfc 100644 --- a/kopete/plugins/cryptography/Makefile.am +++ b/kopete/plugins/cryptography/Makefile.am @@ -18,7 +18,7 @@ service_DATA = kopete_cryptography.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_cryptography_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog mydatadir = $(kde_datadir)/kopete_cryptography mydata_DATA = cryptographyui.rc cryptographychatui.rc diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp index 898e7f1a..4892afb1 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.cpp +++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp @@ -21,7 +21,7 @@ #include "kopetechatsession.h" #include -#include +#include #include #include diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 7e7d7761..06412936 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 65cfb3bc..e3d2e630 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "popuppublic.h" diff --git a/kopete/plugins/highlight/CMakeLists.txt b/kopete/plugins/highlight/CMakeLists.txt index 78da77b7..0b92404a 100644 --- a/kopete/plugins/highlight/CMakeLists.txt +++ b/kopete/plugins/highlight/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( ##### other data ################################ install( FILES kopete_highlight.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_highlight_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_highlight_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kopete_highlight (module) ################# diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am index 489f911c..0340c2f5 100644 --- a/kopete/plugins/highlight/Makefile.am +++ b/kopete/plugins/highlight/Makefile.am @@ -18,4 +18,4 @@ service_DATA = kopete_highlight.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_highlight_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/plugins/history/CMakeLists.txt b/kopete/plugins/history/CMakeLists.txt index aed227fc..8f44c108 100644 --- a/kopete/plugins/history/CMakeLists.txt +++ b/kopete/plugins/history/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( install( FILES kopete_history.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES historyui.rc historychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_history ) -install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES historyconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/kopete/plugins/history/Makefile.am b/kopete/plugins/history/Makefile.am index c5139402..b43b8ed4 100644 --- a/kopete/plugins/history/Makefile.am +++ b/kopete/plugins/history/Makefile.am @@ -21,6 +21,6 @@ mydatadir = $(kde_datadir)/kopete_history mydata_DATA = historyui.rc historychatui.rc kcm_DATA = kopete_history_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kde_kcfg_DATA = historyconfig.kcfg diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index 1c5c573d..34d2a426 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -20,7 +20,7 @@ #include "kopeteprotocol.h" #include "kopeteuiglobal.h" -#include +#include #include #include #include diff --git a/kopete/plugins/history/historyconfig.kcfgc b/kopete/plugins/history/historyconfig.kcfgc index 1e985622..8439dc23 100644 --- a/kopete/plugins/history/historyconfig.kcfgc +++ b/kopete/plugins/history/historyconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=historyconfig.kcfg ClassName=HistoryConfig Singleton=true diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index ce579ea8..c9dc5fd6 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -19,7 +19,7 @@ #include #include #include -//#include +//#include #include #include diff --git a/kopete/plugins/latex/CMakeLists.txt b/kopete/plugins/latex/CMakeLists.txt index d71dc85d..e8215b92 100644 --- a/kopete/plugins/latex/CMakeLists.txt +++ b/kopete/plugins/latex/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( ##### other data ################################ install( FILES kopete_latex.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_latex_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_latex_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( PROGRAMS kopete_latexconvert.sh DESTINATION ${BIN_INSTALL_DIR} ) install( FILES latexconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES latexchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_latex ) diff --git a/kopete/plugins/latex/Makefile.am b/kopete/plugins/latex/Makefile.am index 7d71f9f1..74b977df 100644 --- a/kopete/plugins/latex/Makefile.am +++ b/kopete/plugins/latex/Makefile.am @@ -18,7 +18,7 @@ service_DATA = kopete_latex.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_latex_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog bin_SCRIPTS = kopete_latexconvert.sh kde_kcfg_DATA = latexconfig.kcfg diff --git a/kopete/plugins/latex/latexconfig.kcfgc b/kopete/plugins/latex/latexconfig.kcfgc index 9e4e4fec..984349fd 100644 --- a/kopete/plugins/latex/latexconfig.kcfgc +++ b/kopete/plugins/latex/latexconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=latexconfig.kcfg ClassName=LatexConfig Singleton=true diff --git a/kopete/plugins/latex/latexguiclient.h b/kopete/plugins/latex/latexguiclient.h index 2534e9a5..b8e5efc5 100644 --- a/kopete/plugins/latex/latexguiclient.h +++ b/kopete/plugins/latex/latexguiclient.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kopetemessage.h" #include "kopeteplugin.h" diff --git a/kopete/plugins/motionautoaway/CMakeLists.txt b/kopete/plugins/motionautoaway/CMakeLists.txt index 650766ef..a484ec5e 100644 --- a/kopete/plugins/motionautoaway/CMakeLists.txt +++ b/kopete/plugins/motionautoaway/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kopete_motionaway.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES motionawayconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/kopete/plugins/motionautoaway/Makefile.am b/kopete/plugins/motionautoaway/Makefile.am index ff2c5bd8..8f8bbaa3 100644 --- a/kopete/plugins/motionautoaway/Makefile.am +++ b/kopete/plugins/motionautoaway/Makefile.am @@ -18,7 +18,7 @@ service_DATA = kopete_motionaway.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_motionaway_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kde_kcfg_DATA = motionawayconfig.kcfg diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index ea4bf2bc..56aed0ff 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -38,7 +38,7 @@ #include -#include +#include #include #include @@ -159,12 +159,12 @@ MotionAwayPlugin::~MotionAwayPlugin() } void MotionAwayPlugin::loadSettings(){ - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("MotionAway Plugin"); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("MotionAway Plugin"); - awayTimeout = kconfig->readNumEntry("AwayTimeout", 1); - becomeAvailableWithActivity = kconfig->readBoolEntry("BecomeAvailableWithActivity", true); - videoDevice = kconfig->readEntry("VideoDevice", "/dev/video0"); + awayTimeout = tdeconfig->readNumEntry("AwayTimeout", 1); + becomeAvailableWithActivity = tdeconfig->readBoolEntry("BecomeAvailableWithActivity", true); + videoDevice = tdeconfig->readEntry("VideoDevice", "/dev/video0"); m_awayTimer->changeInterval(awayTimeout * 60 * 1000); } diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt index a53e1ff2..dfda84e3 100644 --- a/kopete/plugins/netmeeting/CMakeLists.txt +++ b/kopete/plugins/netmeeting/CMakeLists.txt @@ -31,7 +31,7 @@ link_directories( ##### other data ################################ install( FILES kopete_netmeeting.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES netmeetingchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_netmeeting ) diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am index 1710f136..27c5b0cb 100644 --- a/kopete/plugins/netmeeting/Makefile.am +++ b/kopete/plugins/netmeeting/Makefile.am @@ -20,4 +20,4 @@ kcm_kopete_netmeeting_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) kcm_DATA = kopete_netmeeting_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 7581ac62..4373cb05 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index 9981351d..3c63bc7e 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/nowlistening/CMakeLists.txt b/kopete/plugins/nowlistening/CMakeLists.txt index 55e1a5ca..29c1e03e 100644 --- a/kopete/plugins/nowlistening/CMakeLists.txt +++ b/kopete/plugins/nowlistening/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( ##### other data ################################ install( FILES kopete_nowlistening.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_nowlistening_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_nowlistening_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES nowlisteningconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES nowlisteningui.rc nowlisteningchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete ) diff --git a/kopete/plugins/nowlistening/Makefile.am b/kopete/plugins/nowlistening/Makefile.am index 8d991f3a..69dbb38e 100644 --- a/kopete/plugins/nowlistening/Makefile.am +++ b/kopete/plugins/nowlistening/Makefile.am @@ -16,7 +16,7 @@ service_DATA = kopete_nowlistening.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_nowlistening_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kde_kcfg_DATA = nowlisteningconfig.kcfg diff --git a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc index 87c53b77..d562e0cb 100644 --- a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc +++ b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=nowlisteningconfig.kcfg ClassName=NowListeningConfig Singleton=true diff --git a/kopete/plugins/smpppdcs/CMakeLists.txt b/kopete/plugins/smpppdcs/CMakeLists.txt index cac131f9..ac985dd2 100644 --- a/kopete/plugins/smpppdcs/CMakeLists.txt +++ b/kopete/plugins/smpppdcs/CMakeLists.txt @@ -31,7 +31,7 @@ link_directories( ##### other data ################################ install( FILES kopete_smpppdcs.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES smpppdcs.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/kopete/plugins/smpppdcs/Makefile.am b/kopete/plugins/smpppdcs/Makefile.am index 11173ac6..fe8792fc 100644 --- a/kopete/plugins/smpppdcs/Makefile.am +++ b/kopete/plugins/smpppdcs/Makefile.am @@ -26,7 +26,7 @@ service_DATA = kopete_smpppdcs.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_smpppdcs_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kde_kcfg_DATA = smpppdcs.kcfg diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp index 772090d9..b6f6fc30 100644 --- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp +++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "iconnector.h" diff --git a/kopete/plugins/texteffect/CMakeLists.txt b/kopete/plugins/texteffect/CMakeLists.txt index e88a0e34..c56f73ad 100644 --- a/kopete/plugins/texteffect/CMakeLists.txt +++ b/kopete/plugins/texteffect/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( ##### other data ################################ install( FILES kopete_texteffect.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kopete_texteffect (module) ################ diff --git a/kopete/plugins/texteffect/Makefile.am b/kopete/plugins/texteffect/Makefile.am index ee008e27..7f721dee 100644 --- a/kopete/plugins/texteffect/Makefile.am +++ b/kopete/plugins/texteffect/Makefile.am @@ -17,4 +17,4 @@ service_DATA = kopete_texteffect.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_texteffect_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp index b1e2417c..a411b363 100644 --- a/kopete/plugins/texteffect/texteffectconfig.cpp +++ b/kopete/plugins/texteffect/texteffectconfig.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "texteffectconfig.h" diff --git a/kopete/plugins/translator/CMakeLists.txt b/kopete/plugins/translator/CMakeLists.txt index 5dd274db..4c4e4756 100644 --- a/kopete/plugins/translator/CMakeLists.txt +++ b/kopete/plugins/translator/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ install( FILES kopete_translator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES translatorui.rc translatorchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_translator ) diff --git a/kopete/plugins/translator/Makefile.am b/kopete/plugins/translator/Makefile.am index 679c1ed8..fd58d26f 100644 --- a/kopete/plugins/translator/Makefile.am +++ b/kopete/plugins/translator/Makefile.am @@ -17,7 +17,7 @@ service_DATA = kopete_translator.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_translator_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog mydatadir = $(kde_datadir)/kopete_translator mydata_DATA = translatorui.rc translatorchatui.rc diff --git a/kopete/plugins/translator/translatorguiclient.h b/kopete/plugins/translator/translatorguiclient.h index 21675216..2f7a9f0f 100644 --- a/kopete/plugins/translator/translatorguiclient.h +++ b/kopete/plugins/translator/translatorguiclient.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kopetemessage.h" #include "kopeteplugin.h" diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index a2614640..066f93a9 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h index 762b6018..d7700d8e 100644 --- a/kopete/plugins/translator/translatorplugin.h +++ b/kopete/plugins/translator/translatorplugin.h @@ -27,7 +27,7 @@ #include -#include +#include #include "kopetemessage.h" #include "kopeteplugin.h" diff --git a/kopete/plugins/webpresence/CMakeLists.txt b/kopete/plugins/webpresence/CMakeLists.txt index bcba1176..a2b07be0 100644 --- a/kopete/plugins/webpresence/CMakeLists.txt +++ b/kopete/plugins/webpresence/CMakeLists.txt @@ -31,7 +31,7 @@ install( FILES install( FILES kopete_webpresence_config.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) + DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES webpresence_html.xsl webpresence_html_images.xsl diff --git a/kopete/plugins/webpresence/Makefile.am b/kopete/plugins/webpresence/Makefile.am index 6785efca..eb91a345 100644 --- a/kopete/plugins/webpresence/Makefile.am +++ b/kopete/plugins/webpresence/Makefile.am @@ -17,7 +17,7 @@ service_DATA = kopete_webpresence.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_webpresence_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog mydata_DATA = webpresence_html.xsl\ webpresence_html_images.xsl\ diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp index 82525619..48271559 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.cpp +++ b/kopete/plugins/webpresence/webpresenceplugin.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -73,33 +73,33 @@ WebPresencePlugin::~WebPresencePlugin() void WebPresencePlugin::loadSettings() { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup( "Web Presence Plugin" ); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup( "Web Presence Plugin" ); - frequency = kconfig->readNumEntry("UploadFrequency", 15); - resultURL = kconfig->readPathEntry("uploadURL"); + frequency = tdeconfig->readNumEntry("UploadFrequency", 15); + resultURL = tdeconfig->readPathEntry("uploadURL"); resultFormatting = WEB_UNDEFINED; - if ( kconfig->readBoolEntry( "formatHTML", false ) ) { + if ( tdeconfig->readBoolEntry( "formatHTML", false ) ) { resultFormatting = WEB_HTML; - } else if ( kconfig->readBoolEntry( "formatXHTML", false ) ) { + } else if ( tdeconfig->readBoolEntry( "formatXHTML", false ) ) { resultFormatting = WEB_XHTML; - } else if ( kconfig->readBoolEntry( "formatXML", false ) ) { + } else if ( tdeconfig->readBoolEntry( "formatXML", false ) ) { resultFormatting = WEB_XML; - } else if ( kconfig->readBoolEntry( "formatStylesheet", false ) ) { + } else if ( tdeconfig->readBoolEntry( "formatStylesheet", false ) ) { resultFormatting = WEB_CUSTOM; - userStyleSheet = kconfig->readEntry("formatStylesheetURL"); + userStyleSheet = tdeconfig->readEntry("formatStylesheetURL"); } // Default to HTML if we dont get anything useful from config file. if ( resultFormatting == WEB_UNDEFINED ) resultFormatting = WEB_HTML; - useImagesInHTML = kconfig->readBoolEntry( "useImagesHTML", false ); - useImName = kconfig->readBoolEntry("showName", true); - userName = kconfig->readEntry("showThisName"); - showAddresses = kconfig->readBoolEntry("includeIMAddress", false); + useImagesInHTML = tdeconfig->readBoolEntry( "useImagesHTML", false ); + useImName = tdeconfig->readBoolEntry("showName", true); + userName = tdeconfig->readEntry("showThisName"); + showAddresses = tdeconfig->readBoolEntry("includeIMAddress", false); // Update file when settings are changed. slotWriteFile(); diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h index d5324a40..c739d10e 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.h +++ b/kopete/plugins/webpresence/webpresenceplugin.h @@ -22,7 +22,7 @@ #include -#include +#include #include "kopetecontact.h" #include "kopeteonlinestatus.h" diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index c60f4051..f9a725ee 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -37,14 +37,14 @@ #include "kopeteglobal.h" #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index 1ba9a5c2..dd3f6c68 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include class GaduAccountPrivate; diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index c9a68f25..9aea8fe5 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "gaduaccount.h" diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp index 3ec773f0..4f77017a 100644 --- a/kopete/protocols/gadu/gaduprotocol.cpp +++ b/kopete/protocols/gadu/gaduprotocol.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index 40d04a3e..51be07e1 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index de50ba19..910c99f4 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index d4c65412..4c51487f 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 46e325ac..7daf2f8d 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index 84c88f39..10ae8a69 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include @@ -67,7 +67,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* ))); socketTimeout = 15000; - TQString timeoutPath = locate( "config", "kioslaverc" ); + TQString timeoutPath = locate( "config", "tdeioslaverc" ); if( !timeoutPath.isEmpty() ) { TDEConfig config( timeoutPath ); diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 96d905c0..e2d359dd 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -23,7 +23,7 @@ #include "ircchannelcontact.h" #include "irccontactmanager.h" -#include "networkconfig.h" +#include "networtdeconfig.h" #include "channellist.h" #include "ircguiclient.h" #include "ircusercontact.h" diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 54c40132..fa2ae7b5 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 0fddaab7..79bc56df 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -24,7 +24,7 @@ #include "kircengine.h" #include "ksslsocket.h" -#include +#include #include #include #include diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index 5db30998..d3615fc5 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -184,16 +184,16 @@ void KSSLSocket::showInfoDialog() { if( socketStatus() == connected ) { - if (!d->dcc->isApplicationRegistered("kio_uiserver")) + if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) { - TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList()); + TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList()); } TQByteArray data, ignore; TQCString ignoretype; TQDataStream arg(data, IO_WriteOnly); arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData; - d->dcc->call("kio_uiserver", "UIServer", + d->dcc->call("tdeio_uiserver", "UIServer", "showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore); } } @@ -233,12 +233,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin TQDataStream arg(data, IO_WriteOnly); arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo; - if (!d->dcc->isApplicationRegistered("kio_uiserver")) + if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) { - TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList()); + TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList()); } - d->dcc->call("kio_uiserver", "UIServer", + d->dcc->call("tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result); if( returnType == "int" ) diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h index a036a71d..f0b8e76c 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.h +++ b/kopete/protocols/irc/libkirc/ksslsocket.h @@ -22,7 +22,7 @@ #include #include -#include +#include class KSSLSocketPrivate; diff --git a/kopete/protocols/irc/ui/CMakeLists.txt b/kopete/protocols/irc/ui/CMakeLists.txt index 7d77d5b8..d90cdd65 100644 --- a/kopete/protocols/irc/ui/CMakeLists.txt +++ b/kopete/protocols/irc/ui/CMakeLists.txt @@ -26,5 +26,5 @@ include_directories( tde_add_library( kopeteircui STATIC_PIC AUTOMOC SOURCES ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui - channellist.cpp channellistdialog.cpp networkconfig.ui + channellist.cpp channellistdialog.cpp networtdeconfig.ui ) diff --git a/kopete/protocols/irc/ui/Makefile.am b/kopete/protocols/irc/ui/Makefile.am index 854a7398..b31b75ea 100644 --- a/kopete/protocols/irc/ui/Makefile.am +++ b/kopete/protocols/irc/ui/Makefile.am @@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \ libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \ - irceditaccount.ui channellist.cpp channellistdialog.cpp networkconfig.ui + irceditaccount.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index f09ea21e..430282fb 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui deleted file mode 100644 index 09121e54..00000000 --- a/kopete/protocols/irc/ui/networkconfig.ui +++ /dev/null @@ -1,382 +0,0 @@ - -NetworkConfig - - - NetworkConfig - - - - 0 - 0 - 670 - 468 - - - - Network Configuration - - - - unnamed - - - - description - - - - - textLabel10 - - - - 1 - 5 - 0 - 0 - - - - &Description: - - - description - - - - - groupBox2 - - - - 3 - 3 - 0 - 0 - - - - 4 - - - Host Con&figuration - - - - unnamed - - - - hostList - - - - 3 - 3 - 0 - 0 - - - - The IRC servers associated with this network - - - The IRC servers associated with this network. Use the up and down buttons to alter the order in which connections are attempted. - - - - - password - - - Password - - - Most IRC servers do not require a password - - - - - textLabel6 - - - Por&t: - - - port - - - - - port - - - 65536 - - - 1 - - - 6667 - - - - - textLabel4 - - - &Password: - - - password - - - - - textLabel5 - - - &Host: - - - host - - - - - host - - - true - - - - - - - - useSSL - - - Use SS&L - - - Check this to enable SSL for this connection - - - - - removeHost - - - - 1 - 0 - 0 - 0 - - - - &Remove - - - - - newHost - - - - 1 - 0 - 0 - 0 - - - - &New... - - - - - spacer3 - - - Horizontal - - - Expanding - - - - 210 - 20 - - - - - - downButton - - - false - - - Down - - - Move this server down - - - Move this server down in connection attempt priority - - - - - spacer4 - - - Vertical - - - Expanding - - - - 20 - 151 - - - - - - upButton - - - false - - - Up - - - Move this server up - - - Move this server up in connection attempt priority - - - - - - - cancelButton - - - &Cancel - - - - - saveButton - - - &Save - - - - - newNetwork - - - Ne&w - - - - - networkList - - - - 3 - 7 - 0 - 0 - - - - - - spacer5 - - - Horizontal - - - Expanding - - - - 260 - 20 - - - - - - renameNetwork - - - Rena&me... - - - - - removeNetwork - - - Remo&ve - - - - - - - cancelButton - clicked() - NetworkConfig - reject() - - - saveButton - clicked() - NetworkConfig - accept() - - - - networkList - newNetwork - renameNetwork - removeNetwork - description - hostList - upButton - downButton - host - port - password - useSSL - newHost - removeHost - saveButton - cancelButton - - - accepted() - rejected() - - - accept() - reject() - - - diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networkconfig.ui.h deleted file mode 100644 index 183ba57f..00000000 --- a/kopete/protocols/irc/ui/networkconfig.ui.h +++ /dev/null @@ -1,26 +0,0 @@ -/**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you wish to add, delete or rename functions or slots use -** TQt Designer which will update this file, preserving your code. Create an -** init() function in place of a constructor, and a destroy() function in -** place of a destructor. -*****************************************************************************/ - - - - - - -void NetworkConfig::accept() -{ - emit accepted(); - TQDialog::accept(); -} - - -void NetworkConfig::reject() -{ - emit rejected(); - TQDialog::reject(); -} diff --git a/kopete/protocols/irc/ui/networtdeconfig.ui b/kopete/protocols/irc/ui/networtdeconfig.ui new file mode 100644 index 00000000..09121e54 --- /dev/null +++ b/kopete/protocols/irc/ui/networtdeconfig.ui @@ -0,0 +1,382 @@ + +NetworkConfig + + + NetworkConfig + + + + 0 + 0 + 670 + 468 + + + + Network Configuration + + + + unnamed + + + + description + + + + + textLabel10 + + + + 1 + 5 + 0 + 0 + + + + &Description: + + + description + + + + + groupBox2 + + + + 3 + 3 + 0 + 0 + + + + 4 + + + Host Con&figuration + + + + unnamed + + + + hostList + + + + 3 + 3 + 0 + 0 + + + + The IRC servers associated with this network + + + The IRC servers associated with this network. Use the up and down buttons to alter the order in which connections are attempted. + + + + + password + + + Password + + + Most IRC servers do not require a password + + + + + textLabel6 + + + Por&t: + + + port + + + + + port + + + 65536 + + + 1 + + + 6667 + + + + + textLabel4 + + + &Password: + + + password + + + + + textLabel5 + + + &Host: + + + host + + + + + host + + + true + + + + + + + + useSSL + + + Use SS&L + + + Check this to enable SSL for this connection + + + + + removeHost + + + + 1 + 0 + 0 + 0 + + + + &Remove + + + + + newHost + + + + 1 + 0 + 0 + 0 + + + + &New... + + + + + spacer3 + + + Horizontal + + + Expanding + + + + 210 + 20 + + + + + + downButton + + + false + + + Down + + + Move this server down + + + Move this server down in connection attempt priority + + + + + spacer4 + + + Vertical + + + Expanding + + + + 20 + 151 + + + + + + upButton + + + false + + + Up + + + Move this server up + + + Move this server up in connection attempt priority + + + + + + + cancelButton + + + &Cancel + + + + + saveButton + + + &Save + + + + + newNetwork + + + Ne&w + + + + + networkList + + + + 3 + 7 + 0 + 0 + + + + + + spacer5 + + + Horizontal + + + Expanding + + + + 260 + 20 + + + + + + renameNetwork + + + Rena&me... + + + + + removeNetwork + + + Remo&ve + + + + + + + cancelButton + clicked() + NetworkConfig + reject() + + + saveButton + clicked() + NetworkConfig + accept() + + + + networkList + newNetwork + renameNetwork + removeNetwork + description + hostList + upButton + downButton + host + port + password + useSSL + newHost + removeHost + saveButton + cancelButton + + + accepted() + rejected() + + + accept() + reject() + + + diff --git a/kopete/protocols/irc/ui/networtdeconfig.ui.h b/kopete/protocols/irc/ui/networtdeconfig.ui.h new file mode 100644 index 00000000..183ba57f --- /dev/null +++ b/kopete/protocols/irc/ui/networtdeconfig.ui.h @@ -0,0 +1,26 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. +** +** If you wish to add, delete or rename functions or slots use +** TQt Designer which will update this file, preserving your code. Create an +** init() function in place of a constructor, and a destroy() function in +** place of a destructor. +*****************************************************************************/ + + + + + + +void NetworkConfig::accept() +{ + emit accepted(); + TQDialog::accept(); +} + + +void NetworkConfig::reject() +{ + emit rejected(); + TQDialog::reject(); +} diff --git a/kopete/protocols/jabber/CMakeLists.txt b/kopete/protocols/jabber/CMakeLists.txt index a5e53af2..61202e95 100644 --- a/kopete/protocols/jabber/CMakeLists.txt +++ b/kopete/protocols/jabber/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( ui ) add_subdirectory( icons ) add_subdirectory( libiris ) -add_subdirectory( kioslave ) +add_subdirectory( tdeioslave ) if( WITH_JINGLE ) add_subdirectory( jingle ) diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am index f1706949..34337e63 100644 --- a/kopete/protocols/jabber/Makefile.am +++ b/kopete/protocols/jabber/Makefile.am @@ -5,7 +5,7 @@ JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jin endif METASOURCES = AUTO -SUBDIRS = ui icons libiris $(JINGLE) . kioslave +SUBDIRS = ui icons libiris $(JINGLE) . tdeioslave AM_CPPFLAGS = $(KOPETE_INCLUDES) \ -I$(srcdir)/libiris/iris/include \ -I$(srcdir)/libiris/iris/xmpp-im \ diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 0a803927..23f947fc 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index d994487f..ec4b869f 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 75bcdd03..cbfc0eab 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include "kopetechatsessionmanager.h" @@ -38,7 +38,7 @@ #include "jabbercontact.h" #include "jabberresource.h" #include "jabberresourcepool.h" -#include "kioslave/jabberdisco.h" +#include "tdeioslave/jabberdisco.h" JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 58ca2409..1d7d2e3f 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -31,11 +31,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index 00ecd535..e60116e5 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -21,7 +21,7 @@ #include "jabberfiletransfer.h" #include #include -#include +#include #include "kopeteuiglobal.h" #include "kopetemetacontact.h" #include "kopetecontactlist.h" diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 1fa6d884..96ab9bcd 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "jabberprotocol.h" #include "jabberaccount.h" diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index e9bae4c1..e1bbd04a 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "jabberprotocol.h" #include "jabberaccount.h" #include "jabberfiletransfer.h" diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index a7cf3a78..9e9cdc9a 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 26d16b28..adc53b01 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "xmpp_tasks.h" diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt deleted file mode 100644 index 24b4ce81..00000000 --- a/kopete/protocols/jabber/kioslave/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/include - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/jabber - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/cutestuff/util - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) - - -##### kio_jabberdisco (module) ################## - -tde_add_kpart( kio_jabberdisco AUTOMOC - SOURCES jabberdisco.cpp - LINK - jabberclient-static - iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static - qca-static cutestuff_network-static cutestuff_util-static kio-shared idn - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/kopete/protocols/jabber/kioslave/Makefile.am b/kopete/protocols/jabber/kioslave/Makefile.am deleted file mode 100644 index be3b2112..00000000 --- a/kopete/protocols/jabber/kioslave/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -METASOURCES = AUTO - -INCLUDES = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../libiris/iris/include \ - -I$(srcdir)/../libiris/iris/xmpp-im \ - -I$(srcdir)/../libiris/iris/jabber \ - -I$(srcdir)/../libiris/qca/src \ - -I$(srcdir)/../libiris/cutestuff/util \ - -I$(srcdir)/../libiris/cutestuff/network \ - $(all_includes) - -kde_module_LTLIBRARIES = kio_jabberdisco.la - -kio_jabberdisco_la_SOURCES = jabberdisco.cpp -kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) -kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor - -noinst_HEADERS = jabberdisco.h - -protocol_DATA = jabberdisco.protocol -protocoldir = $(kde_servicesdir) - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_jabberdisco.pot diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp deleted file mode 100644 index 311cfafd..00000000 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ /dev/null @@ -1,399 +0,0 @@ - -/*************************************************************************** - Jabber Service Discovery KIO Slave - ------------------- - begin : Wed June 1 2005 - copyright : (C) 2005 by Till Gerken - - Kopete (C) 2001-2005 Kopete developers - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include - -#include "jabberdisco.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include "jabberclient.h" - -JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ) - : TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl; - - m_jabberClient = 0l; - m_connected = false; - -} - - -JabberDiscoProtocol::~JabberDiscoProtocol () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave is shutting down." << endl; - - delete m_jabberClient; - -} - -void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << " Host " << host << ", port " << port << ", user " << user << endl; - - m_host = host; - m_port = !port ? 5222 : port; - m_user = TQString(user).replace ( "%", "@" ); - m_password = pass; - -} - -void JabberDiscoProtocol::openConnection () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - if ( m_connected ) - { - return; - } - - // instantiate new client backend or clean up old one - if ( !m_jabberClient ) - { - m_jabberClient = new JabberClient; - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), - this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); - } - else - { - m_jabberClient->disconnect (); - } - - // we need to use the old protocol for now - m_jabberClient->setUseXMPP09 ( true ); - - // set SSL flag (this should be converted to forceTLS when using the new protocol) - m_jabberClient->setUseSSL ( false ); - - // override server and port (this should be dropped when using the new protocol and no direct SSL) - m_jabberClient->setOverrideHost ( true, m_host, m_port ); - - // allow plaintext password authentication or not? - m_jabberClient->setAllowPlainTextPassword ( false ); - - switch ( m_jabberClient->connect ( XMPP::Jid ( m_user + TQString("/") + "JabberBrowser" ), m_password ) ) - { - case JabberClient::NoTLS: - // no SSL support, at the connecting stage this means the problem is client-side - error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); - break; - - case JabberClient::Ok: - default: - // everything alright! - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Waiting for socket to open..." << endl; - break; - } - - connected (); - -} - -void JabberDiscoProtocol::closeConnection () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - if ( m_jabberClient ) - { - m_jabberClient->disconnect (); - } - -} - -void JabberDiscoProtocol::slave_status () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - slaveStatus ( m_host, m_connected ); - -} - -void JabberDiscoProtocol::get ( const KURL &url ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - m_command = Get; - m_url = url; - - mimeType ( "inode/directory" ); - - finished (); - -} - -void JabberDiscoProtocol::listDir ( const KURL &url ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - m_command = ListDir; - m_url = url; - - openConnection (); - -} - -void JabberDiscoProtocol::mimetype ( const KURL &/*url*/ ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; - - mimeType("inode/directory"); - - finished (); - -} - -void JabberDiscoProtocol::slotClientDebugMessage ( const TQString &msg ) -{ - - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << msg << endl; - -} - -void JabberDiscoProtocol::slotHandleTLSWarning ( int validityResult ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling TLS warning..." << endl; - - if ( messageBox ( TDEIO::SlaveBase::WarningContinueCancel, - i18n ( "The server certificate is invalid. Do you want to continue? " ), - i18n ( "Certificate Warning" ) ) == KMessageBox::Continue ) - { - // resume stream - m_jabberClient->continueAfterTLSWarning (); - } - else - { - // disconnect stream - closeConnection (); - } - -} - -void JabberDiscoProtocol::slotClientError ( JabberClient::ErrorCode errorCode ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling client error..." << endl; - - switch ( errorCode ) - { - case JabberClient::NoTLS: - default: - error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); - closeConnection (); - break; - } - -} - -void JabberDiscoProtocol::slotConnected () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Connected to Jabber server." << endl; - - XMPP::JT_DiscoItems *discoTask; - - m_connected = true; - - // now execute command - switch ( m_command ) - { - case ListDir: // list a directory - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl; - discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () ); - connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) ); - discoTask->get ( m_host ); - discoTask->go ( true ); - break; - - case Get: // retrieve an item - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Retrieving item..." << endl; - break; - - default: // do nothing by default - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Unknown command " << m_command << endl; - break; - } - -} - -void JabberDiscoProtocol::slotQueryFinished () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << "Query task finished" << endl; - - XMPP::JT_DiscoItems * task = (XMPP::JT_DiscoItems *) sender (); - - if (!task->success ()) - { - error ( TDEIO::ERR_COULD_NOT_READ, "" ); - return; - } - - XMPP::DiscoList::const_iterator itemsEnd = task->items().end (); - for (XMPP::DiscoList::const_iterator it = task->items().begin (); it != itemsEnd; ++it) - { - TDEIO::UDSAtom atom; - TDEIO::UDSEntry entry; - - atom.m_uds = TDEIO::UDS_NAME; - atom.m_str = (*it).jid().userHost (); - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_SIZE; - atom.m_long = 0; - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_LINK_DEST; - atom.m_str = (*it).name (); - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_MIME_TYPE; - atom.m_str = "inode/directory"; - entry.prepend ( atom ); - - atom.m_uds = TDEIO::UDS_SIZE; - atom.m_long = 0; - entry.prepend ( atom ); - - listEntry ( entry, false ); - - } - - listEntry ( TDEIO::UDSEntry(), true ); - - finished (); - -} - -void JabberDiscoProtocol::slotCSDisconnected () -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Disconnected from Jabber server." << endl; - - /* - * We should delete the JabberClient instance here, - * but timers etc prevent us from doing so. Iris does - * not like to be deleted from a slot. - */ - m_connected = false; - -} - -void JabberDiscoProtocol::slotCSError ( int errorCode ) -{ - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Error in stream signalled." << endl; - - if ( ( errorCode == XMPP::ClientStream::ErrAuth ) - && ( m_jabberClient->clientStream()->errorCondition () == XMPP::ClientStream::NotAuthorized ) ) - { - kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Incorrect password, retrying." << endl; - - TDEIO::AuthInfo authInfo; - authInfo.username = m_user; - authInfo.password = m_password; - if ( openPassDlg ( authInfo, i18n ( "The login details are incorrect. Do you want to try again?" ) ) ) - { - m_user = authInfo.username; - m_password = authInfo.password; - closeConnection (); - openConnection (); - } - else - { - closeConnection (); - error ( TDEIO::ERR_COULD_NOT_AUTHENTICATE, "" ); - } - } - else - { - closeConnection (); - error ( TDEIO::ERR_CONNECTION_BROKEN, "" ); - } - -} - -bool breakEventLoop = false; - -class EventLoopThread : public TQThread -{ -public: - void run (); -}; - -void EventLoopThread::run () -{ - - while ( true ) - { - tqApp->processEvents (); - msleep ( 100 ); - - if ( breakEventLoop ) - break; - } - -} - -void JabberDiscoProtocol::dispatchLoop () -{ - - EventLoopThread eventLoopThread; - - eventLoopThread.start (); - SlaveBase::dispatchLoop (); - breakEventLoop = true; - eventLoopThread.wait (); - -} - -extern "C" -{ - KDE_EXPORT int kdemain(int argc, char **argv); -} - - -int kdemain ( int argc, char **argv ) -{ - TDEApplication app(argc, argv, "kio_jabberdisco", false, true); - - kdDebug(JABBER_DISCO_DEBUG) << k_funcinfo << endl; - - if ( argc != 4 ) - { - kdDebug(JABBER_DISCO_DEBUG) << "Usage: kio_jabberdisco protocol domain-socket1 domain-socket2" << endl; - exit(-1); - } - - JabberDiscoProtocol slave ( argv[2], argv[3] ); - slave.dispatchLoop (); - - return 0; -} - -#include "jabberdisco.moc" diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h deleted file mode 100644 index 660ba269..00000000 --- a/kopete/protocols/jabber/kioslave/jabberdisco.h +++ /dev/null @@ -1,83 +0,0 @@ - -/*************************************************************************** - Jabber Service Discovery KIO Slave - ------------------- - begin : Wed June 1 2005 - copyright : (C) 2005 by Till Gerken - - Kopete (C) 2001-2005 Kopete developers - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef _JABBERDISCO_H_ -#define _JABBERDISCO_H_ - -#include -#include -#include - -#include -#include -#include -#include - -#define JABBER_DISCO_DEBUG 0 - -class JabberClient; - -class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase -{ - -Q_OBJECT - - -public: - JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); - virtual ~JabberDiscoProtocol (); - - void setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ); - - void openConnection (); - void closeConnection (); - - void slave_status (); - - void get ( const KURL &url ); - void listDir ( const KURL &url ); - void mimetype ( const KURL &url ); - - void dispatchLoop (); - -private slots: - void slotClientDebugMessage ( const TQString &msg ); - void slotHandleTLSWarning ( int validityResult ); - void slotClientError ( JabberClient::ErrorCode errorCode ); - void slotConnected (); - void slotCSDisconnected (); - void slotCSError ( int error ); - - void slotQueryFinished (); - -private: - enum CommandType { Get, ListDir }; - - TQString m_host, m_user, m_password; - int m_port; - KURL m_url; - bool m_connected; - - CommandType m_command; - - JabberClient *m_jabberClient; - -}; - -#endif diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.protocol b/kopete/protocols/jabber/kioslave/jabberdisco.protocol deleted file mode 100644 index 01237e73..00000000 --- a/kopete/protocols/jabber/kioslave/jabberdisco.protocol +++ /dev/null @@ -1,53 +0,0 @@ -[Protocol] -exec=kio_jabberdisco -protocol=jabber -input=none -output=filesystem -reading=true -writing=false -makedir=false -linking=false -moving=false -Icon=remote -Description=A KIO slave for Jabber Service Discovery -Description[be]=Модуль kioslave для пошуку сервісаў Jabber -Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ -Description[bs]=KIO slave za otkrivanje Jabber servisa -Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber -Description[cs]=Pomocný protokol pro zjišťování služeb Jabber -Description[da]=En kioslave til at opdage jabber service -Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten -Description[el]=Ένα kioslave για την ανίχνευση υπηρεσίας Jabber -Description[es]=Un «kioslave» para el servicio de descubrimiento jabber -Description[et]=Jabberi teenuste tuvastamise KIO-moodul -Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat -Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber -Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber -Description[gl]=Un KIO slave para Jabber Service Discovery -Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához -Description[is]=kioslave fyrir Jabber þjónustu uppgötvun -Description[it]=Un KIO slave per il servizio di discovery per Jabber -Description[ja]=Jabber Service Discovery の KIO スレーブ -Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის -Description[kk]=Jabber қызметін байқау KIO slave қызметі -Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber -Description[lt]=Priedas (kioslave) FISH protokolui -Description[nb]=En kioslave for Jabber tjenestesøk -Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten -Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ -Description[nl]=Een kioslave voor Jabber Service Discovery -Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging -Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery) -Description[pt]=Um 'kioslave' para a Descoberta de Serviços do Jabber -Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber -Description[ru]=Обработчик KIO для обнаружения служб Jabber -Description[sk]=KIO otrok pre Jabber Service Discovery -Description[sl]=KIO slave za odkrivanje storitev za Jabber -Description[sr]=KIO слуга за Jabber Service Discovery -Description[sr@Latn]=KIO sluga za Jabber Service Discovery -Description[sv]=En I/O-slav för Jabber tjänstupptäckt -Description[tr]=Jabber Servis Bulucu için KIOSlave -Description[uk]=Підлеглий В/В для виявлення служби Jabber -Description[zh_CN]=Jabber 服务发现的 KIO slave -Description[zh_HK]=用於發現 Jabber 服務的 KIO slave -Description[zh_TW]=Jabber 服務的 kioslave diff --git a/kopete/protocols/jabber/tdeioslave/CMakeLists.txt b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt new file mode 100644 index 00000000..aaf788bd --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt @@ -0,0 +1,42 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/include + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/jabber + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im + ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/cutestuff/util + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) + + +##### kio_jabberdisco (module) ################## + +tde_add_kpart( kio_jabberdisco AUTOMOC + SOURCES jabberdisco.cpp + LINK + jabberclient-static + iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static + qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kopete/protocols/jabber/tdeioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am new file mode 100644 index 00000000..f8b9c651 --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/Makefile.am @@ -0,0 +1,25 @@ +METASOURCES = AUTO + +INCLUDES = \ + -I$(srcdir)/.. \ + -I$(srcdir)/../libiris/iris/include \ + -I$(srcdir)/../libiris/iris/xmpp-im \ + -I$(srcdir)/../libiris/iris/jabber \ + -I$(srcdir)/../libiris/qca/src \ + -I$(srcdir)/../libiris/cutestuff/util \ + -I$(srcdir)/../libiris/cutestuff/network \ + $(all_includes) + +kde_module_LTLIBRARIES = kio_jabberdisco.la + +kio_jabberdisco_la_SOURCES = jabberdisco.cpp +kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) +kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor + +noinst_HEADERS = jabberdisco.h + +protocol_DATA = jabberdisco.protocol +protocoldir = $(kde_servicesdir) + +messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/tdeio_jabberdisco.pot diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp new file mode 100644 index 00000000..311cfafd --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp @@ -0,0 +1,399 @@ + +/*************************************************************************** + Jabber Service Discovery KIO Slave + ------------------- + begin : Wed June 1 2005 + copyright : (C) 2005 by Till Gerken + + Kopete (C) 2001-2005 Kopete developers + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#include + +#include "jabberdisco.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include "jabberclient.h" + +JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ) + : TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl; + + m_jabberClient = 0l; + m_connected = false; + +} + + +JabberDiscoProtocol::~JabberDiscoProtocol () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave is shutting down." << endl; + + delete m_jabberClient; + +} + +void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << " Host " << host << ", port " << port << ", user " << user << endl; + + m_host = host; + m_port = !port ? 5222 : port; + m_user = TQString(user).replace ( "%", "@" ); + m_password = pass; + +} + +void JabberDiscoProtocol::openConnection () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + if ( m_connected ) + { + return; + } + + // instantiate new client backend or clean up old one + if ( !m_jabberClient ) + { + m_jabberClient = new JabberClient; + + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); + + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), + this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); + } + else + { + m_jabberClient->disconnect (); + } + + // we need to use the old protocol for now + m_jabberClient->setUseXMPP09 ( true ); + + // set SSL flag (this should be converted to forceTLS when using the new protocol) + m_jabberClient->setUseSSL ( false ); + + // override server and port (this should be dropped when using the new protocol and no direct SSL) + m_jabberClient->setOverrideHost ( true, m_host, m_port ); + + // allow plaintext password authentication or not? + m_jabberClient->setAllowPlainTextPassword ( false ); + + switch ( m_jabberClient->connect ( XMPP::Jid ( m_user + TQString("/") + "JabberBrowser" ), m_password ) ) + { + case JabberClient::NoTLS: + // no SSL support, at the connecting stage this means the problem is client-side + error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); + break; + + case JabberClient::Ok: + default: + // everything alright! + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Waiting for socket to open..." << endl; + break; + } + + connected (); + +} + +void JabberDiscoProtocol::closeConnection () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + if ( m_jabberClient ) + { + m_jabberClient->disconnect (); + } + +} + +void JabberDiscoProtocol::slave_status () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + slaveStatus ( m_host, m_connected ); + +} + +void JabberDiscoProtocol::get ( const KURL &url ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + m_command = Get; + m_url = url; + + mimeType ( "inode/directory" ); + + finished (); + +} + +void JabberDiscoProtocol::listDir ( const KURL &url ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + m_command = ListDir; + m_url = url; + + openConnection (); + +} + +void JabberDiscoProtocol::mimetype ( const KURL &/*url*/ ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << endl; + + mimeType("inode/directory"); + + finished (); + +} + +void JabberDiscoProtocol::slotClientDebugMessage ( const TQString &msg ) +{ + + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << msg << endl; + +} + +void JabberDiscoProtocol::slotHandleTLSWarning ( int validityResult ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling TLS warning..." << endl; + + if ( messageBox ( TDEIO::SlaveBase::WarningContinueCancel, + i18n ( "The server certificate is invalid. Do you want to continue? " ), + i18n ( "Certificate Warning" ) ) == KMessageBox::Continue ) + { + // resume stream + m_jabberClient->continueAfterTLSWarning (); + } + else + { + // disconnect stream + closeConnection (); + } + +} + +void JabberDiscoProtocol::slotClientError ( JabberClient::ErrorCode errorCode ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling client error..." << endl; + + switch ( errorCode ) + { + case JabberClient::NoTLS: + default: + error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) ); + closeConnection (); + break; + } + +} + +void JabberDiscoProtocol::slotConnected () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Connected to Jabber server." << endl; + + XMPP::JT_DiscoItems *discoTask; + + m_connected = true; + + // now execute command + switch ( m_command ) + { + case ListDir: // list a directory + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl; + discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () ); + connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) ); + discoTask->get ( m_host ); + discoTask->go ( true ); + break; + + case Get: // retrieve an item + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Retrieving item..." << endl; + break; + + default: // do nothing by default + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Unknown command " << m_command << endl; + break; + } + +} + +void JabberDiscoProtocol::slotQueryFinished () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << "Query task finished" << endl; + + XMPP::JT_DiscoItems * task = (XMPP::JT_DiscoItems *) sender (); + + if (!task->success ()) + { + error ( TDEIO::ERR_COULD_NOT_READ, "" ); + return; + } + + XMPP::DiscoList::const_iterator itemsEnd = task->items().end (); + for (XMPP::DiscoList::const_iterator it = task->items().begin (); it != itemsEnd; ++it) + { + TDEIO::UDSAtom atom; + TDEIO::UDSEntry entry; + + atom.m_uds = TDEIO::UDS_NAME; + atom.m_str = (*it).jid().userHost (); + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_SIZE; + atom.m_long = 0; + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_LINK_DEST; + atom.m_str = (*it).name (); + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_MIME_TYPE; + atom.m_str = "inode/directory"; + entry.prepend ( atom ); + + atom.m_uds = TDEIO::UDS_SIZE; + atom.m_long = 0; + entry.prepend ( atom ); + + listEntry ( entry, false ); + + } + + listEntry ( TDEIO::UDSEntry(), true ); + + finished (); + +} + +void JabberDiscoProtocol::slotCSDisconnected () +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Disconnected from Jabber server." << endl; + + /* + * We should delete the JabberClient instance here, + * but timers etc prevent us from doing so. Iris does + * not like to be deleted from a slot. + */ + m_connected = false; + +} + +void JabberDiscoProtocol::slotCSError ( int errorCode ) +{ + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Error in stream signalled." << endl; + + if ( ( errorCode == XMPP::ClientStream::ErrAuth ) + && ( m_jabberClient->clientStream()->errorCondition () == XMPP::ClientStream::NotAuthorized ) ) + { + kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Incorrect password, retrying." << endl; + + TDEIO::AuthInfo authInfo; + authInfo.username = m_user; + authInfo.password = m_password; + if ( openPassDlg ( authInfo, i18n ( "The login details are incorrect. Do you want to try again?" ) ) ) + { + m_user = authInfo.username; + m_password = authInfo.password; + closeConnection (); + openConnection (); + } + else + { + closeConnection (); + error ( TDEIO::ERR_COULD_NOT_AUTHENTICATE, "" ); + } + } + else + { + closeConnection (); + error ( TDEIO::ERR_CONNECTION_BROKEN, "" ); + } + +} + +bool breakEventLoop = false; + +class EventLoopThread : public TQThread +{ +public: + void run (); +}; + +void EventLoopThread::run () +{ + + while ( true ) + { + tqApp->processEvents (); + msleep ( 100 ); + + if ( breakEventLoop ) + break; + } + +} + +void JabberDiscoProtocol::dispatchLoop () +{ + + EventLoopThread eventLoopThread; + + eventLoopThread.start (); + SlaveBase::dispatchLoop (); + breakEventLoop = true; + eventLoopThread.wait (); + +} + +extern "C" +{ + KDE_EXPORT int kdemain(int argc, char **argv); +} + + +int kdemain ( int argc, char **argv ) +{ + TDEApplication app(argc, argv, "kio_jabberdisco", false, true); + + kdDebug(JABBER_DISCO_DEBUG) << k_funcinfo << endl; + + if ( argc != 4 ) + { + kdDebug(JABBER_DISCO_DEBUG) << "Usage: kio_jabberdisco protocol domain-socket1 domain-socket2" << endl; + exit(-1); + } + + JabberDiscoProtocol slave ( argv[2], argv[3] ); + slave.dispatchLoop (); + + return 0; +} + +#include "jabberdisco.moc" diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.h b/kopete/protocols/jabber/tdeioslave/jabberdisco.h new file mode 100644 index 00000000..a2bc92a4 --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.h @@ -0,0 +1,83 @@ + +/*************************************************************************** + Jabber Service Discovery KIO Slave + ------------------- + begin : Wed June 1 2005 + copyright : (C) 2005 by Till Gerken + + Kopete (C) 2001-2005 Kopete developers + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef _JABBERDISCO_H_ +#define _JABBERDISCO_H_ + +#include +#include +#include + +#include +#include +#include +#include + +#define JABBER_DISCO_DEBUG 0 + +class JabberClient; + +class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase +{ + +Q_OBJECT + + +public: + JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); + virtual ~JabberDiscoProtocol (); + + void setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ); + + void openConnection (); + void closeConnection (); + + void slave_status (); + + void get ( const KURL &url ); + void listDir ( const KURL &url ); + void mimetype ( const KURL &url ); + + void dispatchLoop (); + +private slots: + void slotClientDebugMessage ( const TQString &msg ); + void slotHandleTLSWarning ( int validityResult ); + void slotClientError ( JabberClient::ErrorCode errorCode ); + void slotConnected (); + void slotCSDisconnected (); + void slotCSError ( int error ); + + void slotQueryFinished (); + +private: + enum CommandType { Get, ListDir }; + + TQString m_host, m_user, m_password; + int m_port; + KURL m_url; + bool m_connected; + + CommandType m_command; + + JabberClient *m_jabberClient; + +}; + +#endif diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol new file mode 100644 index 00000000..fcc0161b --- /dev/null +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol @@ -0,0 +1,53 @@ +[Protocol] +exec=kio_jabberdisco +protocol=jabber +input=none +output=filesystem +reading=true +writing=false +makedir=false +linking=false +moving=false +Icon=remote +Description=A KIO slave for Jabber Service Discovery +Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber +Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ +Description[bs]=KIO slave za otkrivanje Jabber servisa +Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber +Description[cs]=Pomocný protokol pro zjišťování služeb Jabber +Description[da]=En tdeioslave til at opdage jabber service +Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten +Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber +Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber +Description[et]=Jabberi teenuste tuvastamise KIO-moodul +Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat +Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber +Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber +Description[gl]=Un KIO slave para Jabber Service Discovery +Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához +Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun +Description[it]=Un KIO slave per il servizio di discovery per Jabber +Description[ja]=Jabber Service Discovery の KIO スレーブ +Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის +Description[kk]=Jabber қызметін байқау KIO slave қызметі +Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber +Description[lt]=Priedas (tdeioslave) FISH protokolui +Description[nb]=En tdeioslave for Jabber tjenestesøk +Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten +Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ +Description[nl]=Een tdeioslave voor Jabber Service Discovery +Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging +Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery) +Description[pt]=Um 'tdeioslave' para a Descoberta de Serviços do Jabber +Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber +Description[ru]=Обработчик KIO для обнаружения служб Jabber +Description[sk]=KIO otrok pre Jabber Service Discovery +Description[sl]=KIO slave za odkrivanje storitev za Jabber +Description[sr]=KIO слуга за Jabber Service Discovery +Description[sr@Latn]=KIO sluga za Jabber Service Discovery +Description[sv]=En I/O-slav för Jabber tjänstupptäckt +Description[tr]=Jabber Servis Bulucu için KIOSlave +Description[uk]=Підлеглий В/В для виявлення служби Jabber +Description[zh_CN]=Jabber 服务发现的 KIO slave +Description[zh_HK]=用於發現 Jabber 服務的 KIO slave +Description[zh_TW]=Jabber 服務的 tdeioslave diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 2da7740e..34a2eb35 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index a9a00689..77356c55 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include "jabberprotocol.h" diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 71ad871f..a07c8f1d 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 03f8e008..dc66a0cf 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "kopeteaway.h" #include #include diff --git a/kopete/protocols/msn/config/CMakeLists.txt b/kopete/protocols/msn/config/CMakeLists.txt index 7e0d1337..d9fd401b 100644 --- a/kopete/protocols/msn/config/CMakeLists.txt +++ b/kopete/protocols/msn/config/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( install( FILES kopete_msn_config.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) + DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kcm_kopete_msn (module) ################### diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am index b5e2026a..f01cb0f1 100644 --- a/kopete/protocols/msn/config/Makefile.am +++ b/kopete/protocols/msn/config/Makefile.am @@ -8,5 +8,5 @@ kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_msn_config.desktop -servicedir = $(kde_servicesdir)/kconfiguredialog +servicedir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 58072441..39033752 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index df621d65..487f4aaa 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -24,7 +24,7 @@ #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 84333bcf..c487f1df 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -26,17 +26,17 @@ #undef KDE_NO_COMPAT #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include -#include +#include #include "kopetecontactlist.h" #include "kopetechatsessionmanager.h" diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index cfe74905..3c480092 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "kopetetransfermanager.h" diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 1093370a..5f20d9ca 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -40,9 +40,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "kopeteuiglobal.h" diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 9ef32e04..cab1407d 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp index 58f4f66f..f8431f9f 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.cpp +++ b/kopete/protocols/msn/msnsecureloginhandler.cpp @@ -20,7 +20,7 @@ #include // KDE includes -#include +#include #include #include diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 2496006b..32b3d17a 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 7239e54f..9dc475ab 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 57764d14..57022e6d 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -31,15 +31,15 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include -#include +#include #include #include "kopeteuiglobal.h" diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index fde51060..b7f991cd 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "dispatcher.h" diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index ee9c0c4a..ba8d94b1 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 2e0100ab..e3c1f62b 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "kopetepassword.h" #include "kopetepasswordwidget.h" diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index f2a9bce9..9ca3baae 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index 04a312a4..edcf03ce 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 719e9122..76c46be2 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index bcaf454e..e7cb0a7a 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 45ade4c1..e8a83d69 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 6b303104..c459bdd0 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "kopeteaccount.h" #include "kopeteuiglobal.h" diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 0c7c6cad..93e7e033 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index e2095d25..40a60baa 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 10e09ae8..f3b8c35b 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -16,7 +16,7 @@ #undef KDE_NO_COMPAT -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index f47a0b46..d5980050 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -15,7 +15,7 @@ */ #undef KDE_NO_COMPAT -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index c2a1fb1e..f1872a21 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp index cd32d959..f232edc3 100644 --- a/kopete/protocols/sms/smsprotocol.cpp +++ b/kopete/protocols/sms/smsprotocol.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "kopeteaccountmanager.h" diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index 1213b3cf..39a098eb 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -27,7 +27,7 @@ // KDE Includes #include -#include +#include const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup"); diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index d7439628..994735cc 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include // Kopete Includes diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 0e0b6f43..414a1af6 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index b3c3f297..7e853fec 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include extern "C" diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index cd77498e..668e29c3 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -25,9 +25,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include using namespace KNetwork; diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index 4528612b..532e21bf 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent) { diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index e435f568..9cfe6763 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace KNetwork; diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index a5f8f821..95193241 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -22,9 +22,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 4eb82cc4..98df4ef0 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -22,9 +22,9 @@ #include "client.h" #include #include -#include -#include -#include +#include +#include +#include #include YABTask::YABTask(Task* parent) : Task(parent) diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index b9a270f8..96f96389 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -21,9 +21,9 @@ // KDE Includes #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 3f8650f5..96cc20c5 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -22,9 +22,9 @@ #include "client.h" #include #include -#include -#include -#include +#include +#include +#include #include YahooChatTask::YahooChatTask(Task* parent) : Task(parent) diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 53f7c2b4..7e36d04e 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -33,7 +33,7 @@ // KDE #include -#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 5402919c..3bb8e717 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 8d34689b..8e6132b6 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 3bd55b85..f827bba3 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -52,13 +52,13 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include -#include +#include YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact ) : Kopete::Contact( account, userId, metaContact ) diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index e047e849..8913eba3 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -32,9 +32,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index 14912167..62dde427 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include // Kopete Includes -- cgit v1.2.1