Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 64c3be47ff
commit b10a61b1fd

@ -112,7 +112,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} )
option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} ) option( BUILD_FILESHARING "Build filesharing" ${BUILD_ALL} )
option( BUILD_KDICT "Build kdict" ${BUILD_ALL} ) option( BUILD_KDICT "Build kdict" ${BUILD_ALL} )
option( BUILD_KDNSSD "Build tdednssd" ${BUILD_ALL} ) option( BUILD_KDNSSD "Build tdednssd" ${BUILD_ALL} )
option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} ) option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
option( BUILD_KGET "Build kget" ${BUILD_ALL} ) option( BUILD_KGET "Build kget" ${BUILD_ALL} )
option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} ) option( BUILD_KNEWSTICKER "Build knewsticker" ${BUILD_ALL} )
option( BUILD_KOPETE "Build kopete" ${BUILD_ALL} ) option( BUILD_KOPETE "Build kopete" ${BUILD_ALL} )
@ -150,7 +150,7 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing ) tde_conditional_add_subdirectory( BUILD_FILESHARING filesharing )
tde_conditional_add_subdirectory( BUILD_KDICT kdict ) tde_conditional_add_subdirectory( BUILD_KDICT kdict )
tde_conditional_add_subdirectory( BUILD_KDNSSD tdednssd ) tde_conditional_add_subdirectory( BUILD_KDNSSD tdednssd )
tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins ) tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
tde_conditional_add_subdirectory( BUILD_KGET kget ) tde_conditional_add_subdirectory( BUILD_KGET kget )
tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker ) tde_conditional_add_subdirectory( BUILD_KNEWSTICKER knewsticker )
tde_conditional_add_subdirectory( BUILD_KOPETE kopete ) tde_conditional_add_subdirectory( BUILD_KOPETE kopete )

@ -17,7 +17,7 @@
***************************************************************************/ ***************************************************************************/
#include <kdebug.h> #include <kdebug.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "service.h" #include "service.h"
#include "cache.h" #include "cache.h"

@ -25,7 +25,7 @@
#include "xmlrpciface.h" #include "xmlrpciface.h"
#include <kdebug.h> #include <kdebug.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <klocale.h> #include <klocale.h>
#include <kmdcodec.h> #include <kmdcodec.h>

@ -873,7 +873,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
<title>Web Presence</title> <title>Web Presence</title>
<para>Web Presence allows you to publicize your &im; presence on the Web. Give it the path to a file on an FTP server (for example), and it will upload a short piece of HTML to that file, which you can include in your homepage. &kde;'s network transparency makes this simple. Useful for bloggers to make friends with, or you could use it to use &im; in your business.</para> <para>Web Presence allows you to publicize your &im; presence on the Web. Give it the path to a file on an FTP server (for example), and it will upload a short piece of HTML to that file, which you can include in your homepage. &kde;'s network transparency makes this simple. Useful for bloggers to make friends with, or you could use it to use &im; in your business.</para>
<para>Example: <userinput>sftp://username@somehost.org/path/to/homes/user/im.html</userinput> uses the <acronym>SFTP</acronym> protocol to upload your presence directly onto the webserver.</para> <para>Example: <userinput>sftp://username@somehost.org/path/to/homes/user/im.html</userinput> uses the <acronym>SFTP</acronym> protocol to upload your presence directly onto the webserver.</para>
<para>See <ulink url="help:/kioslave/index.html">the KIO manuals</ulink> for tips on specific network protocols.</para> <para>See <ulink url="help:/tdeioslave/index.html">the KIO manuals</ulink> for tips on specific network protocols.</para>
</sect2> </sect2>
</sect1> </sect1>
<sect1 id="plugins-contributing"> <sect1 id="plugins-contributing">

@ -2,4 +2,4 @@ SUBDIRS = advanced simple
messages: rc.cpp messages: rc.cpp
$(EXTRACTRC) `find . -name '*.ui'` > rc.cpp $(EXTRACTRC) `find . -name '*.ui'` > rc.cpp
$(XGETTEXT) rc.cpp `find . -name '*.cpp' -or -name '*.h'` -o $(podir)/kfileshare.pot $(XGETTEXT) rc.cpp `find . -name '*.cpp' -or -name '*.h'` -o $(podir)/tdefileshare.pot

@ -40,7 +40,7 @@
#include <kaction.h> #include <kaction.h>
#include <krestrictedline.h> #include <krestrictedline.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledetailview.h> #include <tdefiledetailview.h>
#include <kdirlister.h> #include <kdirlister.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -29,7 +29,7 @@
#ifndef _HIDDENFILEVIEW_H_ #ifndef _HIDDENFILEVIEW_H_
#define _HIDDENFILEVIEW_H_ #define _HIDDENFILEVIEW_H_
#include <kfileitem.h> #include <tdefileitem.h>
#include <klistview.h> #include <klistview.h>
#include "qmultichecklistitem.h" #include "qmultichecklistitem.h"

@ -1434,7 +1434,7 @@ extern "C"
{ {
KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name) KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name)
{ {
TDEGlobal::locale()->insertCatalogue("kfileshare"); TDEGlobal::locale()->insertCatalogue("tdefileshare");
return new KcmSambaConf(parent, name); return new KcmSambaConf(parent, name);
} }
} }

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kcmsambaconf Exec=tdecmshell kcmsambaconf
Icon=samba Icon=samba
Type=Application Type=Application

@ -24,7 +24,7 @@
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kprocess.h> #include <kprocess.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>

@ -24,7 +24,7 @@
#include <tqdict.h> #include <tqdict.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqobject.h> #include <tqobject.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "sambashare.h" #include "sambashare.h"

@ -58,7 +58,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledetailview.h> #include <tdefiledetailview.h>
#include <kdirlister.h> #include <kdirlister.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

@ -32,7 +32,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <kapplication.h> #include <kapplication.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -27,7 +27,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <klistview.h> #include <klistview.h>
#include <kaccel.h> #include <kaccel.h>

@ -43,6 +43,6 @@ tde_add_kpart( fileshare_propsdlgplugin AUTOMOC
SOURCES propsdlgshareplugin.cpp SOURCES propsdlgshareplugin.cpp
LINK LINK
propsdlgplugin_common-static filesharenfs-static propsdlgplugin_common-static filesharenfs-static
filesharesamba-static kio-shared filesharesamba-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -25,13 +25,13 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kfileshare.h> #include <tdefileshare.h>
#include <knfsshare.h> #include <knfsshare.h>
#include <ksambashare.h> #include <ksambashare.h>
#include <klocale.h> #include <klocale.h>
#include <kurl.h> #include <kurl.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfile.h> #include <tdefile.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klineedit.h> #include <klineedit.h>

@ -20,7 +20,7 @@
#ifndef PROPERTIESPAGE_H #ifndef PROPERTIESPAGE_H
#define PROPERTIESPAGE_H #define PROPERTIESPAGE_H
#include <kfileitem.h> #include <tdefileitem.h>
#include "propertiespagegui.h" #include "propertiespagegui.h"
class NFSFile; class NFSFile;

@ -24,7 +24,7 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kfileshare.h> #include <tdefileshare.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -49,7 +49,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
const char *, const TQStringList & ) const char *, const TQStringList & )
: KPropsDlgPlugin(dlg), d(0) : KPropsDlgPlugin(dlg), d(0)
{ {
TDEGlobal::locale()->insertCatalogue("kfileshare"); TDEGlobal::locale()->insertCatalogue("tdefileshare");
if (KFileShare::shareMode() == KFileShare::Simple) { if (KFileShare::shareMode() == KFileShare::Simple) {
kdDebug(5009) << "PropsDlgSharePlugin: Sharing mode is simple. Aborting." << endl; kdDebug(5009) << "PropsDlgSharePlugin: Sharing mode is simple. Aborting." << endl;
@ -101,7 +101,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
void PropsDlgSharePlugin::slotConfigureFileSharing() void PropsDlgSharePlugin::slotConfigureFileSharing()
{ {
TDEProcess proc; TDEProcess proc;
proc << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; proc << KStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
proc.start( TDEProcess::DontCare ); proc.start( TDEProcess::DontCare );
} }

@ -36,6 +36,6 @@ tde_add_kpart( kcm_fileshare AUTOMOC
krichtextlabel.cpp krichtextlabel.cpp
LINK LINK
propsdlgplugin_common-static filesharenfs-static filesharesamba-static propsdlgplugin_common-static filesharenfs-static filesharesamba-static
kio-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -35,7 +35,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <knfsshare.h> #include <knfsshare.h>
#include <ksambashare.h> #include <ksambashare.h>
#include <kfileshare.h> #include <tdefileshare.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") )
KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &): KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &):
TDECModule(ShareFactory::instance(), parent, name) TDECModule(ShareFactory::instance(), parent, name)
{ {
TDEGlobal::locale()->insertCatalogue("kfileshare"); TDEGlobal::locale()->insertCatalogue("tdefileshare");
TQBoxLayout* layout = new TQVBoxLayout(this,0, TQBoxLayout* layout = new TQVBoxLayout(this,0,
KDialog::spacingHint()); KDialog::spacingHint());

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell fileshare Exec=tdecmshell fileshare
Icon=share Icon=share
Type=Application Type=Application

@ -19,7 +19,7 @@
#ifndef __fileshare_h__ #ifndef __fileshare_h__
#define __fileshare_h__ #define __fileshare_h__
#include <kfileitem.h> #include <tdefileitem.h>
#include "tdecmodule.h" #include "tdecmodule.h"
class TQRadioButton; class TQRadioButton;

@ -23,7 +23,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>

@ -27,7 +27,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <kcolordialog.h> #include <kcolordialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <knumvalidator.h> #include <knumvalidator.h>
#include <knuminput.h> #include <knuminput.h>

@ -18,9 +18,9 @@
#include <tqclipboard.h> #include <tqclipboard.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kcursor.h> #include <kcursor.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -1,22 +0,0 @@
## Makefile.am for folder file meta info plugin
INCLUDES = $(all_includes)
# these are the headers for your project
noinst_HEADERS = kfile_torrent.h bbase.h bdict.h bytetape.h \
bstring.h bint.h blist.h
kde_module_LTLIBRARIES = kfile_torrent.la
kfile_torrent_la_SOURCES = bytetape.cpp bint.cpp bstring.cpp blist.cpp bdict.cpp kfile_torrent.cpp
kfile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kfile_torrent_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
services_DATA = kfile_torrent.desktop
servicesdir = $(kde_servicesdir)
messages:
$(XGETTEXT) *.cpp -o $(podir)/kfile_torrent.pot

@ -39,13 +39,13 @@ install( FILES kgetui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/kget )
tde_add_executable( kget AUTOMOC tde_add_executable( kget AUTOMOC
SOURCES SOURCES
getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp
transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp kfileio.cpp transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp tdefileio.cpp
droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui
dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui
dlgsystembase.ui dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp dlgsystembase.ui dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp
dlgIndividual.cpp dlgDirectories.cpp dlgConnection.cpp dlgIndividual.cpp dlgDirectories.cpp dlgConnection.cpp
dlgAutomation.cpp dlgAdvanced.cpp main.cpp dockindividual.cpp dlgAutomation.cpp dlgAdvanced.cpp main.cpp dockindividual.cpp
kget_iface.skel safedelete.cpp kget_iface.skel safedelete.cpp
LINK kio-shared Xext LINK tdeio-shared Xext
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -8,7 +8,7 @@ kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
kget_LDADD = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET) kget_LDADD = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \ kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
transfer.cpp settings.cpp logwindow.cpp \ transfer.cpp settings.cpp logwindow.cpp \
kmainwidget.cpp kfileio.cpp droptarget.cpp docking.cpp \ kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \ dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \
dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \ dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \
dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \ dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \
@ -20,7 +20,7 @@ noinst_HEADERS = common.h \
dlgAdvanced.h dlgAutomation.h dlgConnection.h \ dlgAdvanced.h dlgAutomation.h dlgConnection.h \
dlgDirectories.h dlgIndividual.h dlgLimits.h \ dlgDirectories.h dlgIndividual.h dlgLimits.h \
dlgPreferences.h dlgSystem.h docking.h droptarget.h \ dlgPreferences.h dlgSystem.h docking.h droptarget.h \
kfileio.h kmainwidget.h logwindow.h settings.h \ tdefileio.h kmainwidget.h logwindow.h settings.h \
transfer.h transferlist.h version.h slave.h \ transfer.h transferlist.h version.h slave.h \
slaveevent.h http_defaults.h getfilejob.h dockindividual.h slaveevent.h http_defaults.h getfilejob.h dockindividual.h

@ -30,7 +30,7 @@
#include <kprotocolmanager.h> #include <kprotocolmanager.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "settings.h" #include "settings.h"
#include "kmainwidget.h" #include "kmainwidget.h"

@ -31,7 +31,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klineedit.h> #include <klineedit.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

@ -43,7 +43,7 @@
#include <klocale.h> #include <klocale.h>
#include <ktoolbar.h> #include <ktoolbar.h>
#include <krun.h> #include <krun.h>
#include <kio/global.h> #include <tdeio/global.h>
#include "common.h" #include "common.h"
#include "transfer.h" #include "transfer.h"

@ -31,7 +31,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <kio/global.h> #include <tdeio/global.h>
class Transfer; class Transfer;

@ -28,7 +28,7 @@
#include <kaction.h> #include <kaction.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kmainwindow.h> #include <kmainwindow.h>

@ -18,7 +18,7 @@
#ifndef GETFILEJOB_H #ifndef GETFILEJOB_H
#define GETFILEJOB_H #define GETFILEJOB_H
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
namespace TDEIO namespace TDEIO

@ -50,7 +50,7 @@
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -64,19 +64,19 @@
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <knotifydialog.h> #include <knotifydialog.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <kio/renamedlg.h> #include <tdeio/renamedlg.h>
#include "safedelete.h" #include "safedelete.h"
#include "settings.h" #include "settings.h"
#include "transfer.h" #include "transfer.h"
#include "transferlist.h" #include "transferlist.h"
#include "kmainwidget.h" #include "kmainwidget.h"
#include "kfileio.h" #include "tdefileio.h"
#include "dlgPreferences.h" #include "dlgPreferences.h"
#include "logwindow.h" #include "logwindow.h"
#include "docking.h" #include "docking.h"
@ -85,8 +85,8 @@
#include <kio/authinfo.h> #include <tdeio/authinfo.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <tqiconset.h> #include <tqiconset.h>
#include "version.h" #include "version.h"
@ -128,7 +128,7 @@ KMainWidget::KMainWidget(bool bStartDocked)
#endif #endif
{ {
TDEConfig cfg( "kioslaverc", false, false); TDEConfig cfg( "tdeioslaverc", false, false);
cfg.setGroup(TQString()); cfg.setGroup(TQString());
cfg.writeEntry("AutoResume", true); cfg.writeEntry("AutoResume", true);
cfg.sync(); cfg.sync();

@ -1,7 +1,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>

@ -26,7 +26,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <twin.h> #include <twin.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -26,7 +26,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kio/scheduler.h> #include <tdeio/scheduler.h>
#include "getfilejob.h" #include "getfilejob.h"
#include "slave.h" #include "slave.h"

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* kfileio.cpp * tdefileio.cpp
* ------------------- * -------------------
* *
* Revision : $Id$ * Revision : $Id$
@ -24,7 +24,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include "kfileio.h" #include "tdefileio.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose) TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose)

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* kfileio.h * tdefileio.h
* ------------------- * -------------------
* *
* Revision : $Id$ * Revision : $Id$
@ -17,8 +17,8 @@
* Author: Stefan Taferner <taferner@kde.org> * Author: Stefan Taferner <taferner@kde.org>
* This code is under GPL. * This code is under GPL.
*/ */
#ifndef kfileio_h #ifndef tdefileio_h
#define kfileio_h #define tdefileio_h
/** Load a file. Returns a pointer to the memory-block that contains /** Load a file. Returns a pointer to the memory-block that contains
* the loaded file. Returns a NULL string if the file could not be loaded. * the loaded file. Returns a NULL string if the file could not be loaded.
@ -41,4 +41,4 @@ bool kCStringToFile(const TQCString & buffer, const TQString & fileName, bool as
bool kByteArrayToFile(const TQByteArray & buffer, const TQString & fileName, bool askIfExists = FALSE, bool createBackup = TRUE, bool withDialogs = TRUE); bool kByteArrayToFile(const TQByteArray & buffer, const TQString & fileName, bool askIfExists = FALSE, bool createBackup = TRUE, bool withDialogs = TRUE);
#endif /* kfileio_h */ #endif /* tdefileio_h */

@ -12,7 +12,7 @@
/*************************************************************************** /***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public Lkio/global.h:icense as published by * it under the terms of the GNU General Public Ltdeio/global.h:icense as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
@ -45,9 +45,9 @@
#include "transfer.h" #include "transfer.h"
#include <kapplication.h> #include <kapplication.h>
#include <kio/passdlg.h> #include <tdeio/passdlg.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
extern Settings ksettings; extern Settings ksettings;

@ -34,7 +34,7 @@
#include <tqmap.h> #include <tqmap.h>
#include <kurl.h> #include <kurl.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include "slave.h" #include "slave.h"

@ -29,10 +29,10 @@
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "transfer.h" #include "transfer.h"
#include "transferlist.h" #include "transferlist.h"

@ -43,6 +43,6 @@ tde_add_kpart( knewsticker_panelapplet AUTOMOC
newsscroller.cpp knewsticker.cpp knewsticker.skel newsscroller.cpp knewsticker.cpp knewsticker.skel
knewstickerconfig.cpp knewstickerconfigwidget.ui knewstickerconfig.cpp knewstickerconfigwidget.ui
newssourcedlgimpl.cpp newssourcedlg.ui newssourcedlgimpl.cpp newssourcedlg.ui
LINK knewstickercommon-static kio-shared LINK knewstickercommon-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -18,7 +18,7 @@ knewsticker_panelapplet_la_LIBADD = common/libknewstickercommon.la \
appdatadir = $(kde_datadir)/knewsticker appdatadir = $(kde_datadir)/knewsticker
appdata_DATA = eventsrc appdata_DATA = eventsrc
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
update_DATA = knewsticker.upd update_DATA = knewsticker.upd
update_SCRIPTS = knt-0.1-0.2.pl update_SCRIPTS = knt-0.1-0.2.pl

@ -14,8 +14,8 @@
#include "configiface.h" #include "configiface.h"
#include "newsengine.h" #include "newsengine.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <klocale.h> #include <klocale.h>
#include <tqpixmap.h> #include <tqpixmap.h>

@ -22,7 +22,7 @@
#include <tqmap.h> #include <tqmap.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <klocale.h> #include <klocale.h>
#include <ksharedptr.h> #include <ksharedptr.h>

@ -15,7 +15,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <dcopobject.h> #include <dcopobject.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kurl.h> #include <kurl.h>
class DCOPClient; class DCOPClient;

@ -18,7 +18,7 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqobject.h> #include <tqobject.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kurl.h> #include <kurl.h>
class TQBuffer; class TQBuffer;

@ -33,6 +33,6 @@ install( FILES
tde_add_executable( knewstickerstub AUTOMOC tde_add_executable( knewstickerstub AUTOMOC
SOURCES knewstickerstub.cpp SOURCES knewstickerstub.cpp
LINK knewstickercommon-static kio-shared LINK knewstickercommon-static tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -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 :) It's also possible that you've just been too impatient :)
Kopete installs several .desktop files that have to be processed by a 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 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, console and restart Kopete when it finishes. If that doesn't help,
please read on. please read on.

@ -14,7 +14,7 @@ add_subdirectory( addcontactwizard )
add_subdirectory( contactlist ) add_subdirectory( contactlist )
add_subdirectory( chatwindow ) add_subdirectory( chatwindow )
add_subdirectory( config ) add_subdirectory( config )
add_subdirectory( kconf_update ) add_subdirectory( tdeconf_update )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

@ -23,7 +23,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
KDE_ICON = AUTO KDE_ICON = AUTO
METASOURCES = AUTO METASOURCES = AUTO
SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . kconf_update SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . tdeconf_update
bin_PROGRAMS = kopete bin_PROGRAMS = kopete
kopete_SOURCES = main.cpp kopeteapplication.cpp kopeteiface.cpp \ kopete_SOURCES = main.cpp kopeteapplication.cpp kopeteiface.cpp \

@ -46,7 +46,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -50,7 +50,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tdehtmlview.h> #include <tdehtmlview.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -60,8 +60,8 @@
#include <kstringhandler.h> #include <kstringhandler.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kinputdialog.h> #include <kinputdialog.h>

@ -32,7 +32,7 @@
#include "kopetecontactlist.h" #include "kopetecontactlist.h"
#include "kopeteviewmanager.h" #include "kopeteviewmanager.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <ktabwidget.h> #include <ktabwidget.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>

@ -30,7 +30,7 @@
#include <kcursor.h> #include <kcursor.h>
#include <klocale.h> #include <klocale.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>

@ -30,9 +30,9 @@
#include <kzip.h> #include <kzip.h>
#include <ktar.h> #include <ktar.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include "kopetechatwindowstyle.h" #include "kopetechatwindowstyle.h"

@ -20,7 +20,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqmap.h> #include <tqmap.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kopete_export.h> #include <kopete_export.h>
class ChatWindowStyle; class ChatWindowStyle;

@ -34,7 +34,7 @@
#include <kaction.h> #include <kaction.h>
#include <kapplication.h> #include <kapplication.h>
#include <kcolordialog.h> #include <kcolordialog.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcursor.h> #include <kcursor.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeversion.h> #include <tdeversion.h>

@ -4,7 +4,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqclipboard.h> #include <tqclipboard.h>

@ -43,11 +43,11 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcolorcombo.h> #include <kcolorcombo.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kconfig.h> // for KNewStuff emoticon fetching #include <tdeconfig.h> // for KNewStuff emoticon fetching
#include <kdebug.h> #include <kdebug.h>
#include <kfontrequester.h> #include <kfontrequester.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <tdehtmlview.h> #include <tdehtmlview.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>
@ -59,7 +59,7 @@
#include <kurlrequesterdlg.h> #include <kurlrequesterdlg.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <krun.h> #include <krun.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <knewstuff/downloaddialog.h> // knewstuff emoticon and chatwindow fetching #include <knewstuff/downloaddialog.h> // knewstuff emoticon and chatwindow fetching
#include <knewstuff/engine.h> // " #include <knewstuff/engine.h> // "
@ -696,7 +696,7 @@ void AppearanceConfig::slotGetChatStyles()
// you have to do this by hand when providing your own Engine // you have to do this by hand when providing your own Engine
KNS::ProviderLoader *provider = new KNS::ProviderLoader( this ); KNS::ProviderLoader *provider = new KNS::ProviderLoader( this );
TQObject::connect( provider, TQT_SIGNAL( providersLoaded(Provider::List*) ), downloadDialog, TQT_SLOT( slotProviders (Provider::List *) ) ); 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(); downloadDialog->exec();
} }
@ -856,7 +856,7 @@ void AppearanceConfig::slotGetEmoticonThemes()
TDEConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
config->setGroup( "KNewStuff" ); config->setGroup( "KNewStuff" );
config->writeEntry( "ProvidersUrl", 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( "StandardResource", "emoticons" );
config->writeEntry( "Uncompress", "application/x-gzip" ); config->writeEntry( "Uncompress", "application/x-gzip" );
config->sync(); config->sync();

@ -23,8 +23,8 @@
#include <klocale.h> #include <klocale.h>
#include <klistview.h> #include <klistview.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqheader.h> #include <tqheader.h>
#include <tqlayout.h> #include <tqlayout.h>

@ -32,7 +32,7 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <ktrader.h> #include <ktrader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <tqimage.h> #include <tqimage.h>
#include <tqpixmap.h> #include <tqpixmap.h>

@ -33,7 +33,7 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <ktrader.h> #include <ktrader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klineedit.h> #include <klineedit.h>
#include "kopeteprefs.h" #include "kopeteprefs.h"

@ -30,7 +30,7 @@
// KDE includes // KDE includes
#include <kcombobox.h> #include <kcombobox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kdebug.h> #include <kdebug.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
@ -45,7 +45,7 @@
#include <kmdcodec.h> #include <kmdcodec.h>
// KDE KIO includes // KDE KIO includes
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
// KDE KABC(AddressBook) includes // KDE KABC(AddressBook) includes
#include <kabc/addresseedialog.h> #include <kabc/addresseedialog.h>

@ -19,7 +19,7 @@
#define _IDENTITYCONFIG_H #define _IDENTITYCONFIG_H
#include <tdecmodule.h> #include <tdecmodule.h>
#include <kconfigdialog.h> #include <tdeconfigdialog.h>
#include "kopetemetacontact.h" #include "kopetemetacontact.h"

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=kopeteidentityconfigpreferences.kcfg File=kopeteidentityconfigpreferences.kcfg
ClassName=KopeteIdentityConfigPreferences ClassName=KopeteIdentityConfigPreferences
Singleton=true Singleton=true

@ -23,7 +23,7 @@
#include <tqlineedit.h> #include <tqlineedit.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include "customnotifications.h" #include "customnotifications.h"

@ -33,7 +33,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
@ -521,7 +521,7 @@ void KopeteMetaLVIProps::slotFromKABCClicked()
void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester ) 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 // only need to init this once
requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )),
this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * ))); this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * )));

@ -34,7 +34,7 @@
#include <kpassivepopup.h> #include <kpassivepopup.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kabc/addressbook.h> #include <kabc/addressbook.h>

@ -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
)

@ -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:

@ -1,4 +0,0 @@
Id=kopete0.9/r1
File=kopeterc
Script=kopete-jabberpriorityaddition-kconf_update.sh,sh

@ -1,4 +0,0 @@
Id=kopete0.9/r1
File=kopeterc
Script=kopete-jabberproxytype-kconf_update.sh,sh

@ -1,3 +0,0 @@
Id=kopete0.9/r1
File=kopeterc
Script=kopete-nameTracking-kconf_update

@ -23,7 +23,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>

@ -31,9 +31,9 @@
#include <ktoolbar.h> #include <ktoolbar.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kpixmapregionselectordialog.h> #include <kpixmapregionselectordialog.h>
// Kopete include // Kopete include

@ -17,7 +17,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include "kopeteiface.h" #include "kopeteiface.h"

@ -32,7 +32,7 @@
#include <kaction.h> #include <kaction.h>
#include <kactionclasses.h> #include <kactionclasses.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -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
)

@ -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:

@ -1,5 +1,5 @@
/* /*
kconf_update app for migrating kopete 0.6.x accounts to 0.7. Code is 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 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 :) supposed to run exactly once on each system that's good enough for me :)

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
IFS=: IFS=:
SUFF=kconf_update_bin/kopete-account-kconf_update SUFF=tdeconf_update_bin/kopete-account-tdeconf_update
for path in `tde-config --path lib`; do for path in `tde-config --path lib`; do
if test -x "$path/$SUFF"; then if test -x "$path/$SUFF"; then
exec "$path/$SUFF" exec "$path/$SUFF"

@ -1,6 +1,6 @@
Id=kopete0.7/r1 Id=kopete0.7/r1
File=kopeterc File=kopeterc
Script=kopete-account-kconf_update.sh,sh Script=kopete-account-tdeconf_update.sh,sh
#remove the PluginData_ProtocolID_ prefix from config keys #remove the PluginData_ProtocolID_ prefix from config keys
Id=kopete0.10/r1 Id=kopete0.10/r1

@ -0,0 +1,4 @@
Id=kopete0.9/r1
File=kopeterc
Script=kopete-jabberpriorityaddition-tdeconf_update.sh,sh

@ -0,0 +1,4 @@
Id=kopete0.9/r1
File=kopeterc
Script=kopete-jabberproxytype-tdeconf_update.sh,sh

@ -1,5 +1,5 @@
/* /*
kconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to tdeconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to
track the name of a subcontact. track the name of a subcontact.
Kopete (c) 2002-2004 by the Kopete developers <kopete-devel@kde.org> Kopete (c) 2002-2004 by the Kopete developers <kopete-devel@kde.org>

@ -0,0 +1,3 @@
Id=kopete0.9/r1
File=kopeterc
Script=kopete-nameTracking-tdeconf_update

@ -1,5 +1,5 @@
/* /*
kconf_update app for migrating the list of loaded plugins in tdeconf_update app for migrating the list of loaded plugins in
kopete 0.7.x to the new KPluginSelector format. kopete 0.7.x to the new KPluginSelector format.
Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
IFS=: IFS=:
SUFF=kconf_update_bin/kopete-pluginloader2-kconf_update SUFF=tdeconf_update_bin/kopete-pluginloader2-tdeconf_update
for path in `tde-config --path lib`; do for path in `tde-config --path lib`; do
if test -x "$path/$SUFF"; then if test -x "$path/$SUFF"; then
exec "$path/$SUFF" exec "$path/$SUFF"

@ -32,7 +32,7 @@
#include "videodevice.h" #include "videodevice.h"
#include "kopete_export.h" #include "kopete_export.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
namespace Kopete { namespace Kopete {

@ -23,7 +23,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <tqsqlpropertymap.h> #include <tqsqlpropertymap.h>
#include <tqobjectlist.h> #include <tqobjectlist.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <tdeversion.h> #include <tdeversion.h>
@ -101,8 +101,8 @@ public:
} }
}; };
KAutoConfig::KAutoConfig(TDEConfig *kconfig, TQObject *parent, KAutoConfig::KAutoConfig(TDEConfig *tdeconfig, TQObject *parent,
const char *name) : TQObject(parent, name), config(kconfig) { const char *name) : TQObject(parent, name), config(tdeconfig) {
d = new KAutoConfigPrivate(); d = new KAutoConfigPrivate();
} }

@ -119,12 +119,12 @@ signals:
public: public:
/** /**
* Constructor. * 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. * that KAutoConfig knows about.
* @param parent - Parent object. * @param parent - Parent object.
* @param name - Object name. * @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. * Constructor.

@ -24,7 +24,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kpassivepopup.h> #include <kpassivepopup.h>
#include <kactivelabel.h> #include <kactivelabel.h>
#include <kprocess.h> #include <kprocess.h>

@ -19,7 +19,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kdialogbase.h> #include <kdialogbase.h>

@ -22,7 +22,7 @@
#include <tqregexp.h> #include <tqregexp.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kplugininfo.h> #include <kplugininfo.h>

@ -29,7 +29,7 @@
#include "kopetecontact.h" #include "kopetecontact.h"
#include "kopeteprefs.h" #include "kopeteprefs.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kapplication.h> #include <kapplication.h>
#include <dcopref.h> #include <dcopref.h>

@ -17,7 +17,7 @@
#include "kopetecontact.h" #include "kopetecontact.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <tqstringlist.h> #include <tqstringlist.h>

@ -18,7 +18,7 @@
#include "kopetecontactlistelement.h" #include "kopetecontactlistelement.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>

@ -21,7 +21,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprogress.h> #include <kprogress.h>

@ -24,7 +24,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprogress.h> #include <kprogress.h>

@ -28,7 +28,7 @@
#include <kactivelabel.h> #include <kactivelabel.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <klocale.h>

@ -505,7 +505,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /*
TDEConfig *config = TDEGlobal::config(); TDEConfig *config = TDEGlobal::config();
config->setGroup( "Plugins" ); 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_" ) ) ) if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) )
pluginId.prepend( TQString::fromLatin1( "kopete_" ) ); pluginId.prepend( TQString::fromLatin1( "kopete_" ) );

@ -22,7 +22,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -18,10 +18,10 @@
#include <klocale.h> #include <klocale.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kio/observer.h> #include <tdeio/observer.h>
#include "kopetemetacontact.h" #include "kopetemetacontact.h"
#include "kopetecontact.h" #include "kopetecontact.h"

@ -24,7 +24,7 @@
#include <tqmap.h> #include <tqmap.h>
#include "kopete_export.h" #include "kopete_export.h"
#include <kio/job.h> #include <tdeio/job.h>
namespace Kopete namespace Kopete
{ {

@ -2,7 +2,7 @@
Kopete Utils. Kopete Utils.
Copyright (c) 2005 Duncan Mac-Vicar Prett <duncan@kde.org> Copyright (c) 2005 Duncan Mac-Vicar Prett <duncan@kde.org>
isHostReachable function code derived from KDE's HTTP kioslave isHostReachable function code derived from KDE's HTTP tdeioslave
Copyright (c) 2005 Waldo Bastian <bastian@kde.org> Copyright (c) 2005 Waldo Bastian <bastian@kde.org>
Kopete (c) 2002-2003 by the Kopete developers <kopete-devel@kde.org> Kopete (c) 2002-2003 by the Kopete developers <kopete-devel@kde.org>

@ -16,7 +16,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <tqptrlist.h> #include <tqptrlist.h>

@ -27,7 +27,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -18,9 +18,9 @@
#include <tqtextedit.h> #include <tqtextedit.h>
#include <klineedit.h> #include <klineedit.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -24,7 +24,7 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <tqtimer.h> #include <tqtimer.h>

@ -27,7 +27,7 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -25,7 +25,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_addbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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) ############## ##### kopete_addbookmarks (module) ##############

@ -19,4 +19,4 @@ service_DATA = kopete_addbookmarks.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_addbookmarks_config.desktop kcm_DATA = kopete_addbookmarks_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog

@ -16,7 +16,7 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kopeteplugin.h> #include <kopeteplugin.h>
#include <kbookmarkmanager.h> #include <kbookmarkmanager.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <tqcstring.h> #include <tqcstring.h>
#include <tqmap.h> #include <tqmap.h>

@ -10,7 +10,7 @@
// //
// //
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include "addbookmarksprefssettings.h" #include "addbookmarksprefssettings.h"

@ -26,7 +26,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_alias.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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) ##################### ##### kopete_alias (module) #####################

@ -15,5 +15,5 @@ service_DATA = kopete_alias.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_alias_config.desktop kcm_DATA = kopete_alias_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog

@ -14,7 +14,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <kplugininfo.h> #include <kplugininfo.h>

@ -26,7 +26,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_autoreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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) ############### ##### kopete_autoreplace (module) ###############

@ -17,5 +17,5 @@ service_DATA = kopete_autoreplace.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_autoreplace_config.desktop kcm_DATA = kopete_autoreplace_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog

@ -18,7 +18,7 @@
#include "autoreplaceconfig.h" #include "autoreplaceconfig.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

@ -26,7 +26,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_cryptography.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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 ) install( FILES cryptographyui.rc cryptographychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_cryptography )

@ -18,7 +18,7 @@ service_DATA = kopete_cryptography.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_cryptography_config.desktop kcm_DATA = kopete_cryptography_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
mydatadir = $(kde_datadir)/kopete_cryptography mydatadir = $(kde_datadir)/kopete_cryptography
mydata_DATA = cryptographyui.rc cryptographychatui.rc mydata_DATA = cryptographyui.rc cryptographychatui.rc

@ -21,7 +21,7 @@
#include "kopetechatsession.h" #include "kopetechatsession.h"
#include <kaction.h> #include <kaction.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>

@ -21,7 +21,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kaction.h> #include <kaction.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -43,7 +43,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klineedit.h> #include <klineedit.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "popuppublic.h" #include "popuppublic.h"

@ -28,7 +28,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_highlight.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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) ################# ##### kopete_highlight (module) #################

@ -18,4 +18,4 @@ service_DATA = kopete_highlight.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_highlight_config.desktop kcm_DATA = kopete_highlight_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog

@ -28,7 +28,7 @@ link_directories(
install( FILES kopete_history.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES kopete_history.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES historyui.rc historychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_history ) 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} ) install( FILES historyconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )

@ -21,6 +21,6 @@ mydatadir = $(kde_datadir)/kopete_history
mydata_DATA = historyui.rc historychatui.rc mydata_DATA = historyui.rc historychatui.rc
kcm_DATA = kopete_history_config.desktop kcm_DATA = kopete_history_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
kde_kcfg_DATA = historyconfig.kcfg kde_kcfg_DATA = historyconfig.kcfg

@ -20,7 +20,7 @@
#include "kopeteprotocol.h" #include "kopeteprotocol.h"
#include "kopeteuiglobal.h" #include "kopeteuiglobal.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=historyconfig.kcfg File=historyconfig.kcfg
ClassName=HistoryConfig ClassName=HistoryConfig
Singleton=true Singleton=true

@ -19,7 +19,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kaction.h> #include <kaction.h>
#include <kmessagebox.h> #include <kmessagebox.h>
//#include <kconfig.h> //#include <tdeconfig.h>
#include <kplugininfo.h> #include <kplugininfo.h>
#include <tdeversion.h> #include <tdeversion.h>

@ -27,7 +27,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_latex.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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( PROGRAMS kopete_latexconvert.sh DESTINATION ${BIN_INSTALL_DIR} )
install( FILES latexconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES latexconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES latexchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_latex ) install( FILES latexchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_latex )

@ -18,7 +18,7 @@ service_DATA = kopete_latex.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_latex_config.desktop kcm_DATA = kopete_latex_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
bin_SCRIPTS = kopete_latexconvert.sh bin_SCRIPTS = kopete_latexconvert.sh
kde_kcfg_DATA = latexconfig.kcfg kde_kcfg_DATA = latexconfig.kcfg

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=latexconfig.kcfg File=latexconfig.kcfg
ClassName=LatexConfig ClassName=LatexConfig
Singleton=true Singleton=true

@ -23,7 +23,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "kopetemessage.h" #include "kopetemessage.h"
#include "kopeteplugin.h" #include "kopeteplugin.h"

@ -26,7 +26,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_motionaway.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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} ) install( FILES motionawayconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )

@ -18,7 +18,7 @@ service_DATA = kopete_motionaway.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_motionaway_config.desktop kcm_DATA = kopete_motionaway_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
kde_kcfg_DATA = motionawayconfig.kcfg kde_kcfg_DATA = motionawayconfig.kcfg

@ -38,7 +38,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
@ -159,12 +159,12 @@ MotionAwayPlugin::~MotionAwayPlugin()
} }
void MotionAwayPlugin::loadSettings(){ void MotionAwayPlugin::loadSettings(){
TDEConfig *kconfig = TDEGlobal::config(); TDEConfig *tdeconfig = TDEGlobal::config();
kconfig->setGroup("MotionAway Plugin"); tdeconfig->setGroup("MotionAway Plugin");
awayTimeout = kconfig->readNumEntry("AwayTimeout", 1); awayTimeout = tdeconfig->readNumEntry("AwayTimeout", 1);
becomeAvailableWithActivity = kconfig->readBoolEntry("BecomeAvailableWithActivity", true); becomeAvailableWithActivity = tdeconfig->readBoolEntry("BecomeAvailableWithActivity", true);
videoDevice = kconfig->readEntry("VideoDevice", "/dev/video0"); videoDevice = tdeconfig->readEntry("VideoDevice", "/dev/video0");
m_awayTimer->changeInterval(awayTimeout * 60 * 1000); m_awayTimer->changeInterval(awayTimeout * 60 * 1000);
} }

@ -31,7 +31,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_netmeeting.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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 ) install( FILES netmeetingchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_netmeeting )

@ -20,4 +20,4 @@ kcm_kopete_netmeeting_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
kcm_DATA = kopete_netmeeting_config.desktop kcm_DATA = kopete_netmeeting_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog

@ -25,7 +25,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>

@ -21,7 +21,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <tdeparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <klistview.h> #include <klistview.h>

@ -29,7 +29,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_nowlistening.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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 nowlisteningconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES nowlisteningui.rc nowlisteningchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete ) install( FILES nowlisteningui.rc nowlisteningchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete )

@ -16,7 +16,7 @@ service_DATA = kopete_nowlistening.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_nowlistening_config.desktop kcm_DATA = kopete_nowlistening_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
kde_kcfg_DATA = nowlisteningconfig.kcfg kde_kcfg_DATA = nowlisteningconfig.kcfg

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=nowlisteningconfig.kcfg File=nowlisteningconfig.kcfg
ClassName=NowListeningConfig ClassName=NowListeningConfig
Singleton=true Singleton=true

@ -31,7 +31,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_smpppdcs.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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} ) install( FILES smpppdcs.kcfg DESTINATION ${KCFG_INSTALL_DIR} )

@ -26,7 +26,7 @@ service_DATA = kopete_smpppdcs.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_smpppdcs_config.desktop kcm_DATA = kopete_smpppdcs_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
kde_kcfg_DATA = smpppdcs.kcfg kde_kcfg_DATA = smpppdcs.kcfg

@ -16,7 +16,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include "iconnector.h" #include "iconnector.h"

@ -28,7 +28,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_texteffect.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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) ################ ##### kopete_texteffect (module) ################

@ -17,4 +17,4 @@ service_DATA = kopete_texteffect.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_texteffect_config.desktop kcm_DATA = kopete_texteffect_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog

@ -19,7 +19,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "texteffectconfig.h" #include "texteffectconfig.h"

@ -25,7 +25,7 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kopete_translator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) 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 ) install( FILES translatorui.rc translatorchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_translator )

@ -17,7 +17,7 @@ service_DATA = kopete_translator.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_translator_config.desktop kcm_DATA = kopete_translator_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
mydatadir = $(kde_datadir)/kopete_translator mydatadir = $(kde_datadir)/kopete_translator
mydata_DATA = translatorui.rc translatorchatui.rc mydata_DATA = translatorui.rc translatorchatui.rc

@ -23,7 +23,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "kopetemessage.h" #include "kopetemessage.h"
#include "kopeteplugin.h" #include "kopeteplugin.h"

@ -29,7 +29,7 @@
#include <kaction.h> #include <kaction.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -27,7 +27,7 @@
#include <tqintdict.h> #include <tqintdict.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "kopetemessage.h" #include "kopetemessage.h"
#include "kopeteplugin.h" #include "kopeteplugin.h"

@ -31,7 +31,7 @@ install( FILES
install( FILES install( FILES
kopete_webpresence_config.desktop kopete_webpresence_config.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
install( FILES install( FILES
webpresence_html.xsl webpresence_html_images.xsl webpresence_html.xsl webpresence_html_images.xsl

@ -17,7 +17,7 @@ service_DATA = kopete_webpresence.desktop
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)
kcm_DATA = kopete_webpresence_config.desktop kcm_DATA = kopete_webpresence_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
mydata_DATA = webpresence_html.xsl\ mydata_DATA = webpresence_html.xsl\
webpresence_html_images.xsl\ webpresence_html_images.xsl\

@ -25,7 +25,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ktempfile.h> #include <ktempfile.h>
@ -73,33 +73,33 @@ WebPresencePlugin::~WebPresencePlugin()
void WebPresencePlugin::loadSettings() void WebPresencePlugin::loadSettings()
{ {
TDEConfig *kconfig = TDEGlobal::config(); TDEConfig *tdeconfig = TDEGlobal::config();
kconfig->setGroup( "Web Presence Plugin" ); tdeconfig->setGroup( "Web Presence Plugin" );
frequency = kconfig->readNumEntry("UploadFrequency", 15); frequency = tdeconfig->readNumEntry("UploadFrequency", 15);
resultURL = kconfig->readPathEntry("uploadURL"); resultURL = tdeconfig->readPathEntry("uploadURL");
resultFormatting = WEB_UNDEFINED; resultFormatting = WEB_UNDEFINED;
if ( kconfig->readBoolEntry( "formatHTML", false ) ) { if ( tdeconfig->readBoolEntry( "formatHTML", false ) ) {
resultFormatting = WEB_HTML; resultFormatting = WEB_HTML;
} else if ( kconfig->readBoolEntry( "formatXHTML", false ) ) { } else if ( tdeconfig->readBoolEntry( "formatXHTML", false ) ) {
resultFormatting = WEB_XHTML; resultFormatting = WEB_XHTML;
} else if ( kconfig->readBoolEntry( "formatXML", false ) ) { } else if ( tdeconfig->readBoolEntry( "formatXML", false ) ) {
resultFormatting = WEB_XML; resultFormatting = WEB_XML;
} else if ( kconfig->readBoolEntry( "formatStylesheet", false ) ) { } else if ( tdeconfig->readBoolEntry( "formatStylesheet", false ) ) {
resultFormatting = WEB_CUSTOM; resultFormatting = WEB_CUSTOM;
userStyleSheet = kconfig->readEntry("formatStylesheetURL"); userStyleSheet = tdeconfig->readEntry("formatStylesheetURL");
} }
// Default to HTML if we dont get anything useful from config file. // Default to HTML if we dont get anything useful from config file.
if ( resultFormatting == WEB_UNDEFINED ) if ( resultFormatting == WEB_UNDEFINED )
resultFormatting = WEB_HTML; resultFormatting = WEB_HTML;
useImagesInHTML = kconfig->readBoolEntry( "useImagesHTML", false ); useImagesInHTML = tdeconfig->readBoolEntry( "useImagesHTML", false );
useImName = kconfig->readBoolEntry("showName", true); useImName = tdeconfig->readBoolEntry("showName", true);
userName = kconfig->readEntry("showThisName"); userName = tdeconfig->readEntry("showThisName");
showAddresses = kconfig->readBoolEntry("includeIMAddress", false); showAddresses = tdeconfig->readBoolEntry("includeIMAddress", false);
// Update file when settings are changed. // Update file when settings are changed.
slotWriteFile(); slotWriteFile();

@ -22,7 +22,7 @@
#include <tqvaluestack.h> #include <tqvaluestack.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "kopetecontact.h" #include "kopetecontact.h"
#include "kopeteonlinestatus.h" #include "kopeteonlinestatus.h"

@ -37,14 +37,14 @@
#include "kopeteglobal.h" #include "kopeteglobal.h"
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqdialog.h> #include <tqdialog.h>

@ -37,7 +37,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kaction.h> #include <kaction.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
class GaduAccountPrivate; class GaduAccountPrivate;

@ -23,7 +23,7 @@
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <kaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include "gaduaccount.h" #include "gaduaccount.h"

@ -22,7 +22,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <libgadu.h> #include <libgadu.h>

@ -24,7 +24,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kinputdialog.h> #include <kinputdialog.h>

@ -26,7 +26,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpassdlg.h> #include <kpassdlg.h>

@ -19,7 +19,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kopetecontact.h> #include <kopetecontact.h>
#include <kopeteglobal.h> #include <kopeteglobal.h>

@ -43,7 +43,7 @@
#include <kaction.h> #include <kaction.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcompletionbox.h> #include <kcompletionbox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>

@ -31,7 +31,7 @@
#include <kopetecontactlist.h> #include <kopetecontactlist.h>
#include <kopeteview.h> #include <kopeteview.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tqtimer.h> #include <tqtimer.h>
@ -67,7 +67,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou
this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* ))); this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* )));
socketTimeout = 15000; socketTimeout = 15000;
TQString timeoutPath = locate( "config", "kioslaverc" ); TQString timeoutPath = locate( "config", "tdeioslaverc" );
if( !timeoutPath.isEmpty() ) if( !timeoutPath.isEmpty() )
{ {
TDEConfig config( timeoutPath ); TDEConfig config( timeoutPath );

@ -23,7 +23,7 @@
#include "ircchannelcontact.h" #include "ircchannelcontact.h"
#include "irccontactmanager.h" #include "irccontactmanager.h"
#include "networkconfig.h" #include "networtdeconfig.h"
#include "channellist.h" #include "channellist.h"
#include "ircguiclient.h" #include "ircguiclient.h"
#include "ircusercontact.h" #include "ircusercontact.h"

@ -28,7 +28,7 @@
#include <kaction.h> #include <kaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <tqtimer.h> #include <tqtimer.h>

@ -24,7 +24,7 @@
#include "kircengine.h" #include "kircengine.h"
#include "ksslsocket.h" #include "ksslsocket.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kextsock.h> #include <kextsock.h>
#include <klocale.h> #include <klocale.h>

@ -184,16 +184,16 @@ void KSSLSocket::showInfoDialog()
{ {
if( socketStatus() == connected ) 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; TQByteArray data, ignore;
TQCString ignoretype; TQCString ignoretype;
TQDataStream arg(data, IO_WriteOnly); TQDataStream arg(data, IO_WriteOnly);
arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData; 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); "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); TQDataStream arg(data, IO_WriteOnly);
arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo; 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); "messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
if( returnType == "int" ) if( returnType == "int" )

@ -22,7 +22,7 @@
#include <tqvariant.h> #include <tqvariant.h>
#include <kextsock.h> #include <kextsock.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
class KSSLSocketPrivate; class KSSLSocketPrivate;

@ -26,5 +26,5 @@ include_directories(
tde_add_library( kopeteircui STATIC_PIC AUTOMOC tde_add_library( kopeteircui STATIC_PIC AUTOMOC
SOURCES SOURCES
ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui
channellist.cpp channellistdialog.cpp networkconfig.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui
) )

@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \ 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 EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp

@ -32,7 +32,7 @@
#include <klistview.h> #include <klistview.h>
#include <kdebug.h> #include <kdebug.h>
#include <kextsock.h> #include <kextsock.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kcharsets.h> #include <kcharsets.h>

@ -12,7 +12,7 @@
add_subdirectory( ui ) add_subdirectory( ui )
add_subdirectory( icons ) add_subdirectory( icons )
add_subdirectory( libiris ) add_subdirectory( libiris )
add_subdirectory( kioslave ) add_subdirectory( tdeioslave )
if( WITH_JINGLE ) if( WITH_JINGLE )
add_subdirectory( jingle ) add_subdirectory( jingle )

@ -5,7 +5,7 @@ JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jin
endif endif
METASOURCES = AUTO METASOURCES = AUTO
SUBDIRS = ui icons libiris $(JINGLE) . kioslave SUBDIRS = ui icons libiris $(JINGLE) . tdeioslave
AM_CPPFLAGS = $(KOPETE_INCLUDES) \ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
-I$(srcdir)/libiris/iris/include \ -I$(srcdir)/libiris/iris/include \
-I$(srcdir)/libiris/iris/xmpp-im \ -I$(srcdir)/libiris/iris/xmpp-im \

@ -37,7 +37,7 @@
#include <tqregexp.h> #include <tqregexp.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>

@ -24,7 +24,7 @@
#include <tqimage.h> #include <tqimage.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kopetegroup.h> #include <kopetegroup.h>

@ -25,7 +25,7 @@
#include <tqiconset.h> #include <tqiconset.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include "kopetechatsessionmanager.h" #include "kopetechatsessionmanager.h"
@ -38,7 +38,7 @@
#include "jabbercontact.h" #include "jabbercontact.h"
#include "jabberresource.h" #include "jabberresource.h"
#include "jabberresourcepool.h" #include "jabberresourcepool.h"
#include "kioslave/jabberdisco.h" #include "tdeioslave/jabberdisco.h"
JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user, JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user,

@ -31,11 +31,11 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kaction.h> #include <kaction.h>
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kopeteview.h> #include <kopeteview.h>

@ -21,7 +21,7 @@
#include "jabberfiletransfer.h" #include "jabberfiletransfer.h"
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "kopeteuiglobal.h" #include "kopeteuiglobal.h"
#include "kopetemetacontact.h" #include "kopetemetacontact.h"
#include "kopetecontactlist.h" #include "kopetecontactlist.h"

@ -20,7 +20,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include "jabberprotocol.h" #include "jabberprotocol.h"
#include "jabberaccount.h" #include "jabberaccount.h"

@ -19,7 +19,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "jabberprotocol.h" #include "jabberprotocol.h"
#include "jabberaccount.h" #include "jabberaccount.h"
#include "jabberfiletransfer.h" #include "jabberfiletransfer.h"

@ -19,7 +19,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

@ -34,7 +34,7 @@
#include <kaction.h> #include <kaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "xmpp_tasks.h" #include "xmpp_tasks.h"

@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC
LINK LINK
jabberclient-static jabberclient-static
iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-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 qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -22,4 +22,4 @@ protocol_DATA = jabberdisco.protocol
protocoldir = $(kde_servicesdir) protocoldir = $(kde_servicesdir)
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kio_jabberdisco.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_jabberdisco.pot

@ -25,8 +25,8 @@
#include <tqcstring.h> #include <tqcstring.h>
#include <kurl.h> #include <kurl.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <jabberclient.h> #include <jabberclient.h>
#define JABBER_DISCO_DEBUG 0 #define JABBER_DISCO_DEBUG 0

@ -10,35 +10,35 @@ linking=false
moving=false moving=false
Icon=remote Icon=remote
Description=A KIO slave for Jabber Service Discovery Description=A KIO slave for Jabber Service Discovery
Description[be]=Модуль kioslave для пошуку сервісаў Jabber Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber
Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ
Description[bs]=KIO slave za otkrivanje Jabber servisa Description[bs]=KIO slave za otkrivanje Jabber servisa
Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber
Description[cs]=Pomocný protokol pro zjišťování služeb Jabber Description[cs]=Pomocný protokol pro zjišťování služeb Jabber
Description[da]=En kioslave til at opdage jabber service Description[da]=En tdeioslave til at opdage jabber service
Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten
Description[el]=Ένα kioslave για την ανίχνευση υπηρεσίας Jabber Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber
Description[es]=Un «kioslave» para el servicio de descubrimiento jabber Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber
Description[et]=Jabberi teenuste tuvastamise KIO-moodul Description[et]=Jabberi teenuste tuvastamise KIO-moodul
Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat
Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber
Description[fr]=Un module d'entrée / sortie pour la recherche de service 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[gl]=Un KIO slave para Jabber Service Discovery
Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához
Description[is]=kioslave fyrir Jabber þjónustu uppgötvun Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun
Description[it]=Un KIO slave per il servizio di discovery per Jabber Description[it]=Un KIO slave per il servizio di discovery per Jabber
Description[ja]=Jabber Service Discovery の KIO スレーブ Description[ja]=Jabber Service Discovery の KIO スレーブ
Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის
Description[kk]=Jabber қызметін байқау KIO slave қызметі Description[kk]=Jabber қызметін байқау KIO slave қызметі
Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber
Description[lt]=Priedas (kioslave) FISH protokolui Description[lt]=Priedas (tdeioslave) FISH protokolui
Description[nb]=En kioslave for Jabber tjenestesøk Description[nb]=En tdeioslave for Jabber tjenestesøk
Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten
Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ
Description[nl]=Een kioslave voor Jabber Service Discovery Description[nl]=Een tdeioslave voor Jabber Service Discovery
Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging 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[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]=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[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber
Description[ru]=Обработчик KIO для обнаружения служб Jabber Description[ru]=Обработчик KIO для обнаружения служб Jabber
Description[sk]=KIO otrok pre Jabber Service Discovery Description[sk]=KIO otrok pre Jabber Service Discovery
@ -50,4 +50,4 @@ Description[tr]=Jabber Servis Bulucu için KIOSlave
Description[uk]=Підлеглий В/В для виявлення служби Jabber Description[uk]=Підлеглий В/В для виявлення служби Jabber
Description[zh_CN]=Jabber 服务发现的 KIO slave Description[zh_CN]=Jabber 服务发现的 KIO slave
Description[zh_HK]=用於發現 Jabber 服務的 KIO slave Description[zh_HK]=用於發現 Jabber 服務的 KIO slave
Description[zh_TW]=Jabber 服務的 kioslave Description[zh_TW]=Jabber 服務的 tdeioslave

@ -36,8 +36,8 @@
#include <kurllabel.h> #include <kurllabel.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <krun.h> #include <krun.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kpixmapregionselectordialog.h> #include <kpixmapregionselectordialog.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -21,9 +21,9 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <tqtable.h> #include <tqtable.h>
#include <tqlabel.h> #include <tqlabel.h>
#include "jabberprotocol.h" #include "jabberprotocol.h"

@ -25,7 +25,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kpassdlg.h> #include <kpassdlg.h>

@ -28,7 +28,7 @@
#include <kaction.h> #include <kaction.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <klocale.h> #include <klocale.h>
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include "kopeteaway.h" #include "kopeteaway.h"
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -25,7 +25,7 @@ link_directories(
install( FILES install( FILES
kopete_msn_config.desktop kopete_msn_config.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
##### kcm_kopete_msn (module) ################### ##### kcm_kopete_msn (module) ###################

@ -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) kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_msn_config.desktop service_DATA = kopete_msn_config.desktop
servicedir = $(kde_servicesdir)/kconfiguredialog servicedir = $(kde_servicesdir)/tdeconfiguredialog

@ -22,7 +22,7 @@
#include <config.h> #include <config.h>
#include <kaction.h> #include <kaction.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -24,7 +24,7 @@
#include <tqiconset.h> #include <tqiconset.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <klocale.h> #include <klocale.h>

@ -26,17 +26,17 @@
#undef KDE_NO_COMPAT #undef KDE_NO_COMPAT
#include <kaction.h> #include <kaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <krun.h> #include <krun.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "kopetecontactlist.h" #include "kopetecontactlist.h"
#include "kopetechatsessionmanager.h" #include "kopetechatsessionmanager.h"

@ -27,7 +27,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kserversocket.h> #include <kserversocket.h>
#include <kbufferedsocket.h> #include <kbufferedsocket.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include "kopetetransfermanager.h" #include "kopetetransfermanager.h"

@ -40,9 +40,9 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <krun.h> #include <krun.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <tqfile.h> #include <tqfile.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <knotification.h> #include <knotification.h>
#include "kopeteuiglobal.h" #include "kopeteuiglobal.h"

@ -22,7 +22,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -20,7 +20,7 @@
#include <tqregexp.h> #include <tqregexp.h>
// KDE includes // KDE includes
#include <kio/job.h> #include <tdeio/job.h>
#include <kurl.h> #include <kurl.h>
#include <kdebug.h> #include <kdebug.h>

@ -27,7 +27,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kbufferedsocket.h> #include <kbufferedsocket.h>
#include <kserversocket.h> #include <kserversocket.h>
#include <kresolver.h> #include <kresolver.h>

@ -39,7 +39,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmdcodec.h> #include <kmdcodec.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktempfile.h> #include <ktempfile.h>

@ -31,15 +31,15 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kautoconfig.h> #include <kautoconfig.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <krun.h> #include <krun.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kpixmapregionselectordialog.h> #include <kpixmapregionselectordialog.h>
#include "kopeteuiglobal.h" #include "kopeteuiglobal.h"

@ -28,7 +28,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqevent.h> #include <tqevent.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "dispatcher.h" #include "dispatcher.h"

@ -17,7 +17,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

@ -11,7 +11,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <krun.h> #include <krun.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "kopetepassword.h" #include "kopetepassword.h"
#include "kopetepasswordwidget.h" #include "kopetepasswordwidget.h"

@ -17,7 +17,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

@ -25,7 +25,7 @@
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <klocale.h>

@ -42,7 +42,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpassivepopup.h> #include <kpassivepopup.h>

@ -20,8 +20,8 @@
#include <tqmutex.h> #include <tqmutex.h>
#include <kdebug.h> #include <kdebug.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>

@ -28,7 +28,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include <unistd.h> #include <unistd.h>
#include <gsmlib/gsm_me_ta.h> #include <gsmlib/gsm_me_ta.h>

@ -22,7 +22,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include "kopeteaccount.h" #include "kopeteaccount.h"
#include "kopeteuiglobal.h" #include "kopeteuiglobal.h"

@ -20,7 +20,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include <klineedit.h> #include <klineedit.h>
#include <klocale.h> #include <klocale.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -18,7 +18,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqfile.h> #include <tqfile.h>
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include <kprocess.h> #include <kprocess.h>
#include <klineedit.h> #include <klineedit.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -16,7 +16,7 @@
#undef KDE_NO_COMPAT #undef KDE_NO_COMPAT
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include <kaction.h> #include <kaction.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kprocess.h> #include <kprocess.h>

@ -15,7 +15,7 @@
*/ */
#undef KDE_NO_COMPAT #undef KDE_NO_COMPAT
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include <kaction.h> #include <kaction.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>

@ -22,7 +22,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <kconfigbase.h> #include <tdeconfigbase.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <krestrictedline.h> #include <krestrictedline.h>

@ -16,7 +16,7 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include "kopeteaccountmanager.h" #include "kopeteaccountmanager.h"

@ -27,7 +27,7 @@
// KDE Includes // KDE Includes
#include <kprocio.h> #include <kprocio.h>
#include <kfileitem.h> #include <tdefileitem.h>
const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup"); const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");

@ -25,7 +25,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
// Kopete Includes // Kopete Includes

@ -32,7 +32,7 @@
#include <knuminput.h> #include <knuminput.h>
#include <klineedit.h> #include <klineedit.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -29,7 +29,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <stdlib.h> #include <stdlib.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kmdcodec.h> #include <kmdcodec.h>
extern "C" extern "C"

@ -25,9 +25,9 @@
#include <tqdatastream.h> #include <tqdatastream.h>
#include <tqdom.h> #include <tqdom.h>
#include <klocale.h> #include <klocale.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kbufferedsocket.h> #include <kbufferedsocket.h>
using namespace KNetwork; using namespace KNetwork;

@ -24,9 +24,9 @@
#include <tqfile.h> #include <tqfile.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent) ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent)
{ {

@ -25,7 +25,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kstreamsocket.h> #include <kstreamsocket.h>
#include <kio/global.h> #include <tdeio/global.h>
using namespace KNetwork; using namespace KNetwork;

@ -22,9 +22,9 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqfile.h> #include <tqfile.h>
#include <tqdatastream.h> #include <tqdatastream.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kbufferedsocket.h> #include <kbufferedsocket.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>

@ -22,9 +22,9 @@
#include "client.h" #include "client.h"
#include <tqstring.h> #include <tqstring.h>
#include <tqdatastream.h> #include <tqdatastream.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <klocale.h> #include <klocale.h>
YABTask::YABTask(Task* parent) : Task(parent) YABTask::YABTask(Task* parent) : Task(parent)

@ -21,9 +21,9 @@
// KDE Includes // KDE Includes
#include <kdebug.h> #include <kdebug.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kurl.h> #include <kurl.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klocale.h> #include <klocale.h>

@ -22,9 +22,9 @@
#include "client.h" #include "client.h"
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <tqdom.h> #include <tqdom.h>
YahooChatTask::YahooChatTask(Task* parent) : Task(parent) YahooChatTask::YahooChatTask(Task* parent) : Task(parent)

@ -33,7 +33,7 @@
// KDE // KDE
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kaction.h> #include <kaction.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>

@ -21,7 +21,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqiconset.h> #include <tqiconset.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <klocale.h> #include <klocale.h>

@ -21,7 +21,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kopetecontactaction.h> #include <kopetecontactaction.h>
#include <kopetecontactlist.h> #include <kopetecontactlist.h>

@ -52,13 +52,13 @@
#include <kshortcut.h> #include <kshortcut.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kurl.h> #include <kurl.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kimageio.h> #include <kimageio.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact ) YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact )
: Kopete::Contact( account, userId, metaContact ) : Kopete::Contact( account, userId, metaContact )

@ -32,9 +32,9 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <krun.h> #include <krun.h>
#include <kurl.h> #include <kurl.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kpixmapregionselectordialog.h> #include <kpixmapregionselectordialog.h>

@ -23,9 +23,9 @@
#include <klineedit.h> #include <klineedit.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <klocale.h> #include <klocale.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
// Kopete Includes // Kopete Includes

@ -33,7 +33,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>

@ -35,7 +35,7 @@ tde_add_kpart( kpf_panelapplet AUTOMOC
ErrorMessageConfigDialog.cpp ActiveMonitor.cpp ActiveMonitorItem.cpp ErrorMessageConfigDialog.cpp ActiveMonitor.cpp ActiveMonitorItem.cpp
ActiveMonitorWindow.cpp BandwidthGraph.cpp ServerWizard.cpp ActiveMonitorWindow.cpp BandwidthGraph.cpp ServerWizard.cpp
AppletItem.cpp Applet.cpp Defaults.cpp Help.cpp AppletItem.cpp Applet.cpp Defaults.cpp Help.cpp
LINK tdednssd-shared kio-shared LINK tdednssd-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -46,6 +46,6 @@ tde_add_kpart( kpfpropertiesdialog AUTOMOC
SOURCES SOURCES
PropertiesDialogPlugin.cpp StartingKPFDialog.cpp WebServer.stub PropertiesDialogPlugin.cpp StartingKPFDialog.cpp WebServer.stub
WebServerManager.stub Defaults.cpp Help.cpp WebServerManager.stub Defaults.cpp Help.cpp
LINK tdednssd-shared kio-shared LINK tdednssd-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -30,7 +30,7 @@
#include <klocale.h> #include <klocale.h>
#include <kseparator.h> #include <kseparator.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "Defines.h" #include "Defines.h"
#include "ErrorMessageConfigDialog.h" #include "ErrorMessageConfigDialog.h"

@ -29,7 +29,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kdialog.h> #include <kdialog.h>

@ -39,7 +39,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kseparator.h> #include <kseparator.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>

@ -25,7 +25,7 @@
#include <tqtextstream.h> #include <tqtextstream.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "Defines.h" #include "Defines.h"
#include "Utils.h" #include "Utils.h"

@ -33,7 +33,7 @@
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <klocale.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "Defines.h" #include "Defines.h"
#include "ServerWizard.h" #include "ServerWizard.h"

@ -33,7 +33,7 @@
// KDE includes // KDE includes
#include "config.h" #include "config.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>

@ -22,7 +22,7 @@
*/ */
// KDE includes // KDE includes
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kapplication.h> #include <kapplication.h>

@ -46,6 +46,6 @@ tde_add_executable( kppp SETUID AUTOMOC
acctselect.cpp ruleset.cpp docking.cpp runtests.cpp loginterm.cpp acctselect.cpp ruleset.cpp docking.cpp runtests.cpp loginterm.cpp
ppplog.cpp newwidget.cpp requester.cpp opener.cpp modemdb.cpp ppplog.cpp newwidget.cpp requester.cpp opener.cpp modemdb.cpp
utils.cpp providerdb.cpp modems.cpp KPPPIface.skel utils.cpp providerdb.cpp modems.cpp KPPPIface.skel
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -1028,7 +1028,7 @@
* some KDE style guide conformant changes * some KDE style guide conformant changes
* some code cleanups * some code cleanups
* removed -lkfile and -lkfm from Makefile.am * removed -ltdefile and -lkfm from Makefile.am
* added debug switch to pppd command line when debugging * added debug switch to pppd command line when debugging
is turned on is turned on
* Improved the response time for modem output. Modem output is * Improved the response time for modem output. Modem output is

@ -40,7 +40,7 @@
#include <kbuttonbox.h> #include <kbuttonbox.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> // For BarIcon #include <kiconloader.h> // For BarIcon
#include <klocale.h> #include <klocale.h>

@ -33,6 +33,6 @@ install( FILES
tde_add_executable( kppplogview AUTOMOC tde_add_executable( kppplogview AUTOMOC
SOURCES SOURCES
main.cpp loginfo.cpp log.cpp monthly.cpp export.cpp main.cpp loginfo.cpp log.cpp monthly.cpp export.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -33,7 +33,7 @@
#include <kwizard.h> #include <kwizard.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
class Export; class Export;

@ -39,7 +39,7 @@
#include <klocale.h> #include <klocale.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqlistbox.h> #include <tqlistbox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>
ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) { ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) {

@ -28,7 +28,7 @@
#include "runtests.h" #include "runtests.h"
#include "devices.h" #include "devices.h"
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kapplication.h> #include <kapplication.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>

@ -21,7 +21,7 @@
#include "rdp/rdphostpref.h" #include "rdp/rdphostpref.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <tqregexp.h> #include <tqregexp.h>

@ -21,7 +21,7 @@
#include "hostpreferences.h" #include "hostpreferences.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kurl.h> #include <kurl.h>

@ -21,7 +21,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdewallet.h> #include <tdewallet.h>
#include <tqwindowdefs.h> #include <tqwindowdefs.h>

@ -18,7 +18,7 @@
*/ */
#include "rdphostpref.h" #include "rdphostpref.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
const TQString RdpHostPref::RdpType = "RDP"; const TQString RdpHostPref::RdpType = "RDP";

@ -16,7 +16,7 @@
***************************************************************************/ ***************************************************************************/
#include "vnchostpref.h" #include "vnchostpref.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
const TQString VncHostPref::VncType = "VNC"; const TQString VncHostPref::VncType = "VNC";

@ -30,6 +30,6 @@ install( FILES kcmkrfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_krfb AUTOMOC tde_add_kpart( kcm_krfb AUTOMOC
SOURCES configurationwidget.ui kcm_krfb.cpp SOURCES configurationwidget.ui kcm_krfb.cpp
LINK krfbconfig-static srvloc-static tdednssd-shared kio-shared LINK krfbconfig-static srvloc-static tdednssd-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -32,7 +32,7 @@
#include <knuminput.h> #include <knuminput.h>
#include <klocale.h> #include <klocale.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kdatastream.h> #include <kdatastream.h>
#include <kdebug.h> #include <kdebug.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=krfb Icon=krfb
Type=Application Type=Application
Exec=kcmshell kcmkrfb Exec=tdecmshell kcmkrfb
DocPath=krfb/krfb-configuration.html DocPath=krfb/krfb-configuration.html
X-TDE-ModuleType=Library X-TDE-ModuleType=Library

@ -25,7 +25,7 @@
#include <kservicetype.h> #include <kservicetype.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <ksockaddr.h> #include <ksockaddr.h>
#include <kextsock.h> #include <kextsock.h>

@ -39,7 +39,7 @@ tde_add_executable( krfb AUTOMOC
rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
LINK LINK
krfbconfig-static vncserver-static srvloc-static tdeui-shared kio-shared jpeg Xext pthread ${XTST_LIBRARIES} krfbconfig-static vncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -467,7 +467,7 @@ void Configuration::inviteEmail() {
////////////// invoke kcontrol module ////////////////////////// ////////////// invoke kcontrol module //////////////////////////
void Configuration::showConfigurationModule() { void Configuration::showConfigurationModule() {
KRun::run( "kcmshell kcmkrfb", KURL::List() ); KRun::run( "tdecmshell kcmkrfb", KURL::List() );
} }

@ -25,7 +25,7 @@
#include "invitedialog.h" #include "invitedialog.h"
#include <dcopref.h> #include <dcopref.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <tqobject.h> #include <tqobject.h>
#include <tqvalidator.h> #include <tqvalidator.h>

@ -20,7 +20,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <klistview.h> #include <klistview.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqdatetime.h> #include <tqdatetime.h>

@ -68,5 +68,5 @@ tde_add_tdeinit_executable( ksirc AUTOMOC
dccNewbase.ui dccNew.cpp dccNewbase.ui dccNew.cpp
LINK LINK
ksprefs-static ksprogress-static ksopenksirc-static ksticker-static ksprefs-static ksprogress-static ksopenksirc-static ksticker-static
kio-shared tdeio-shared
) )

@ -15,7 +15,7 @@
#include <tqlineedit.h> #include <tqlineedit.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -24,7 +24,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmdcodec.h> #include <kmdcodec.h>

@ -17,7 +17,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <knuminput.h> #include <knuminput.h>

@ -14,7 +14,7 @@
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kdebug.h> #include <kdebug.h>

@ -11,7 +11,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name) PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name)

@ -13,7 +13,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "page_looknfeel.h" #include "page_looknfeel.h"
PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name) PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name)

@ -13,7 +13,7 @@
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name) PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name)
{ {

@ -12,7 +12,7 @@
#include <tqlistbox.h> #include <tqlistbox.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <keditlistbox.h> #include <keditlistbox.h>
#include <kdebug.h> #include <kdebug.h>

@ -17,7 +17,7 @@
#include "../ksopts.h" #include "../ksopts.h"
#include "../nickColourMaker.h" #include "../nickColourMaker.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <twin.h> #include <twin.h>
#include <kdebug.h> #include <kdebug.h>

@ -1,5 +1,5 @@
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqsocketnotifier.h> #include <tqsocketnotifier.h>
#include <tqregexp.h> #include <tqregexp.h>

@ -1,5 +1,5 @@
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <tqhbox.h> #include <tqhbox.h>

@ -17,7 +17,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klocale.h> #include <klocale.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kcombobox.h> #include <kcombobox.h>

@ -84,7 +84,7 @@
#include <tdeversion.h> #include <tdeversion.h>
#include <kprocess.h> #include <kprocess.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
int KSircIOController::counter = 0; int KSircIOController::counter = 0;

@ -21,7 +21,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
//#include "cdate.h" //#include "cdate.h"

@ -107,7 +107,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -1,6 +1,6 @@
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#if KDE_IS_VERSION(3,1,92) #if KDE_IS_VERSION(3,1,92)
#include <kuser.h> #include <kuser.h>

@ -32,8 +32,8 @@
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kurldrag.h> #include <kurldrag.h>
#include "ksopts.h" #include "ksopts.h"

@ -5,7 +5,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <klocale.h> #include <klocale.h>

@ -12,7 +12,7 @@ libpuke_la_SOURCES = pwidget.cpp pobject.cpp \
pprogress.cpp ptablevw.cpp plistbox.cpp \ pprogress.cpp ptablevw.cpp plistbox.cpp \
plabel.cpp pmenudta.cpp ppopmenu.cpp \ plabel.cpp pmenudta.cpp ppopmenu.cpp \
palistbox.cpp ptabdialog.cpp \ palistbox.cpp ptabdialog.cpp \
pkfiledialog.cpp pobjfinder.cpp ptdefiledialog.cpp pobjfinder.cpp
$(srcdir)/HOWTO-PUKE.txt: HOWTO-PUKE.pod $(srcdir)/HOWTO-PUKE.txt: HOWTO-PUKE.pod
pod2text $(srcdir)/HOWTO-PUKE.pod > HOWTO-PUKE.txt pod2text $(srcdir)/HOWTO-PUKE.pod > HOWTO-PUKE.txt
@ -34,7 +34,7 @@ perl_DATA = commands-handler.pl commands-perl.pl convert_commands.pl \
puke.pl small.pl test.pl tester.pl \ puke.pl small.pl test.pl tester.pl \
dcc_progress.pm dcc_status.pm load_all.pm \ dcc_progress.pm dcc_status.pm load_all.pm \
palistbox.pm pbase.pm pboxlayout.pm pbutton.pm pframe.pm \ palistbox.pm pbase.pm pboxlayout.pm pbutton.pm pframe.pm \
pkfiledialog.pm plabel.pm plined.pm plistbox.pm pmenudta.pm \ ptdefiledialog.pm plabel.pm plined.pm plistbox.pm pmenudta.pm \
ppopmenu.pm pprogress.pm ppushbt.pm ptabdialog.pm ptablevw.pm \ ppopmenu.pm pprogress.pm ppushbt.pm ptabdialog.pm ptablevw.pm \
pwidget.pm pobjfinder.pm pwidget.pm pobjfinder.pm

@ -30,7 +30,7 @@ using namespace std; // iostream.h include cstring which puts strlen into
#include "palistbox.h" #include "palistbox.h"
#include "pbutton.h" #include "pbutton.h"
#include "pframe.h" #include "pframe.h"
#include "pkfiledialog.h" #include "ptdefiledialog.h"
#include "plabel.h" #include "plabel.h"
#include "ptqlayout.h" #include "ptqlayout.h"
#include "plined.h" #include "plined.h"

@ -11,7 +11,7 @@
&docommand("/load pbutton.pm"); &docommand("/load pbutton.pm");
&docommand("/load ppushbt.pm"); &docommand("/load ppushbt.pm");
&docommand("/load plined.pm"); &docommand("/load plined.pm");
&docommand("/load pkfiledialog.pm"); &docommand("/load ptdefiledialog.pm");
&docommand("/load ppopmenu.pm"); &docommand("/load ppopmenu.pm");
&docommand("/load dcc_progress.pm"); &docommand("/load dcc_progress.pm");

@ -10,5 +10,5 @@
&docommand("/load plistbox.pm"); &docommand("/load plistbox.pm");
&docommand("/load ppopmenu.pm"); &docommand("/load ppopmenu.pm");
&docommand("/load ptabdialog.pm"); &docommand("/load ptabdialog.pm");
&docommand("/load pkfiledialog.pm"); &docommand("/load ptdefiledialog.pm");
&docommand("/load pobjfinder.pm"); &docommand("/load pobjfinder.pm");

@ -3,8 +3,8 @@
#include <kdebug.h> #include <kdebug.h>
#include "pkfiledialog.h" #include "ptdefiledialog.h"
#include "pkfiledialog-cmd.h" #include "ptdefiledialog-cmd.h"
PObject * PObject *
PKFileDialog::createWidget(CreateArgs &ca) PKFileDialog::createWidget(CreateArgs &ca)
@ -120,4 +120,4 @@ KFileDialog *PKFileDialog::widget()
return kfbd; return kfbd;
} }
#include "pkfiledialog.moc" #include "ptdefiledialog.moc"

@ -3,7 +3,7 @@
class PKFileDialog; class PKFileDialog;
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "pmessage.h" #include "pmessage.h"
#include "pwidget.h" #include "pwidget.h"
#include "controller.h" #include "controller.h"

@ -2,7 +2,7 @@
&::PukeSendMessage($PUKE_WIDGET_LOAD, &::PukeSendMessage($PUKE_WIDGET_LOAD,
$::PUKE_CONTROLLER, $::PUKE_CONTROLLER,
$PWIDGET_KFILEDIALOG, $PWIDGET_KFILEDIALOG,
"pkfiledialog.so", "ptdefiledialog.so",
sub { my %ARG = %{shift()}; sub { my %ARG = %{shift()};
if($ARG{'iArg'} == 1){ if($ARG{'iArg'} == 1){
print "*E* PKFileDialog Load failed!\n"; print "*E* PKFileDialog Load failed!\n";

@ -82,7 +82,7 @@
#include <tqregexp.h> #include <tqregexp.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <twin.h> #include <twin.h>

@ -21,8 +21,8 @@
#include <krun.h> #include <krun.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kio/job.h> #include <tdeio/job.h>
#include "ksopts.h" #include "ksopts.h"
#include "ksparser.h" #include "ksparser.h"

@ -67,9 +67,9 @@
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <klocale.h> #include <klocale.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kaction.h> #include <kaction.h>

@ -1,7 +1,7 @@
#include "usercontrolmenu.h" #include "usercontrolmenu.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
TQPtrList<UserControlMenu> UserControlMenu::UserMenu; TQPtrList<UserControlMenu> UserControlMenu::UserMenu;

@ -32,6 +32,6 @@ install( FILES kcmktalkd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
tde_add_kpart( kcm_ktalkd AUTOMOC tde_add_kpart( kcm_ktalkd AUTOMOC
SOURCES SOURCES
main.cpp soundpage.cpp answmachpage.cpp forwmachpage.cpp main.cpp soundpage.cpp answmachpage.cpp forwmachpage.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -2,7 +2,7 @@
Icon=ktalkd Icon=ktalkd
Type=Application Type=Application
DocPath=kcontrol/kcmtalkd/index.html DocPath=kcontrol/kcmtalkd/index.html
Exec=kcmshell kcmktalkd Exec=tdecmshell kcmktalkd
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=ktalkd X-TDE-Library=ktalkd

@ -50,7 +50,7 @@
#include <pwd.h> #include <pwd.h>
/* KDE & TQt includes */ /* KDE & TQt includes */
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kinstance.h> #include <kinstance.h>
#include <tqfile.h> #include <tqfile.h>

@ -33,7 +33,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaudioplayer.h> #include <kaudioplayer.h>
#include <klocale.h> #include <klocale.h>

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Icon=samba Icon=samba
Exec=kcmshell kcmkiolan Exec=tdecmshell kcmkiolan
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=lanbrowser X-TDE-Library=lanbrowser
@ -9,7 +9,7 @@ X-TDE-FactoryName=kiolan
Name=LAN KIO Slave Name=LAN KIO Slave
Name[ar]=الشبكة المحلية KIO Slave Name[ar]=الشبكة المحلية KIO Slave
Name[be]=Модуль kioslave для мясцовай сетцы Name[be]=Модуль tdeioslave для мясцовай сетцы
Name[bn]=ল্যান কে-আই-ও স্লেভ Name[bn]=ল্যান কে-আই-ও স্লেভ
Name[br]=Sklav LAN evit KIO Name[br]=Sklav LAN evit KIO
Name[bs]=LAN KIO slave Name[bs]=LAN KIO slave

@ -23,7 +23,7 @@
#include "portsettingsbar.h" #include "portsettingsbar.h"
#include <tdecmodule.h> #include <tdecmodule.h>
#include <kconfig.h> #include <tdeconfig.h>
class TQCheckBox; class TQCheckBox;
class TQLineEdit; class TQLineEdit;

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Icon=samba Icon=samba
Exec=kcmshell kcmlisa Exec=tdecmshell kcmlisa
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=lanbrowser X-TDE-Library=lanbrowser

@ -21,7 +21,7 @@
#ifndef KCMLISA_H #ifndef KCMLISA_H
#define KCMLISA_H #define KCMLISA_H
#include <kconfig.h> #include <tdeconfig.h>
#include <tdecmodule.h> #include <tdecmodule.h>
class TQPushButton; class TQPushButton;

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Icon=samba Icon=samba
Exec=kcmshell kcmreslisa Exec=tdecmshell kcmreslisa
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=lanbrowser X-TDE-Library=lanbrowser

@ -22,7 +22,7 @@
#define KCMRESLISA_H #define KCMRESLISA_H
#include <tdecmodule.h> #include <tdecmodule.h>
#include <kconfig.h> #include <tdeconfig.h>
class TQSpinBox; class TQSpinBox;

@ -43,6 +43,6 @@ install( FILES
tde_add_kpart( kio_lan tde_add_kpart( kio_lan
SOURCES kio_lan.cpp SOURCES kio_lan.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,4 +1,4 @@
## Makefile.am of tdebase/kioslave/man ## Makefile.am of tdebase/tdeioslave/man
INCLUDES= $(all_includes) INCLUDES= $(all_includes)
@ -27,5 +27,5 @@ konq_sidebartreedir = $(kde_datadir)/konqsidebartng/virtual_folders/services
METASOURCES = AUTO METASOURCES = AUTO
messages: messages:
$(XGETTEXT) *.cpp -o $(podir)/kio_lan.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_lan.pot

@ -8,9 +8,9 @@ use the automake/configure stuff.
On some systems (e.g. Solaris) you will have to add some libraries, like On some systems (e.g. Solaris) you will have to add some libraries, like
-lnsl, I think. -lnsl, I think.
Copy this directory e.g. under tdebase/kioslave and enter it in Copy this directory e.g. under tdebase/tdeioslave and enter it in
tdebase/kioslave/Makefile.am in the SUBDIR line. The rerun make in tdebase/tdeioslave/Makefile.am in the SUBDIR line. The rerun make in
tdebase/kioslave. tdebase/tdeioslave.
Alexander Neundorf Alexander Neundorf
<neundorf@kde.org> <neundorf@kde.org>

@ -24,7 +24,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kinstance.h> #include <kinstance.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kprocess.h> #include <kprocess.h>

@ -20,9 +20,9 @@
#ifndef KIO_XLAN_H #ifndef KIO_XLAN_H
#define KIO_XLAN_H #define KIO_XLAN_H
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <kio/tcpslavebase.h> #include <tdeio/tcpslavebase.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <tqvaluevector.h> #include <tqvaluevector.h>
#include <tqcstring.h> #include <tqcstring.h>

@ -10,6 +10,6 @@ makedir=false
deleting=false deleting=false
linking=false linking=false
moving=false moving=false
DocPath=kioslave/lan.html DocPath=tdeioslave/lan.html
Icon=network_local Icon=network_local
Class=:local Class=:local

@ -10,6 +10,6 @@ makedir=false
deleting=false deleting=false
linking=false linking=false
moving=false moving=false
DocPath=kioslave/rlan.html DocPath=tdeioslave/rlan.html
Icon=network_local Icon=network_local
Class=:local Class=:local

@ -36,7 +36,7 @@ tde_add_library( rss SHARED AUTOMOC
article.cpp document.cpp image.cpp textinput.cpp tools_p.cpp article.cpp document.cpp image.cpp textinput.cpp tools_p.cpp
loader.cpp loader.cpp
VERSION 1.0.0 VERSION 1.0.0
LINK kio-shared LINK tdeio-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -11,7 +11,7 @@
#include "image.h" #include "image.h"
#include "tools_p.h" #include "tools_p.h"
#include <kio/job.h> #include <tdeio/job.h>
#include <kurl.h> #include <kurl.h>
#include <tqbuffer.h> #include <tqbuffer.h>

@ -11,7 +11,7 @@
#include "loader.h" #include "loader.h"
#include "document.h" #include "document.h"
#include <kio/job.h> #include <tdeio/job.h>
#include <kprocess.h> #include <kprocess.h>
#include <kurl.h> #include <kurl.h>

@ -113,7 +113,7 @@ namespace RSS
/** /**
* @return The error code for the last process of retrieving data. * @return The error code for the last process of retrieving data.
* The returned numbers correspond directly to the error codes * The returned numbers correspond directly to the error codes
* <a href="http://developer.kde.org/documentation/library/cvs-api/classref/kio/KIO.html#Error">as * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
* defined by KIO</a>. * defined by KIO</a>.
*/ */
virtual int errorCode() const; virtual int errorCode() const;

@ -39,6 +39,6 @@ install( FILES
tde_add_kpart( kio_zeroconf AUTOMOC tde_add_kpart( kio_zeroconf AUTOMOC
SOURCES dnssd.cpp SOURCES dnssd.cpp
LINK tdednssd-shared kio-shared LINK tdednssd-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -37,7 +37,7 @@ UserEntry=u
PasswordEntry=p PasswordEntry=p
Resolved URL will be ssh://user:password@machine:port/ . ssh is helper protocol so ktelnetservice will be launched for Resolved URL will be ssh://user:password@machine:port/ . ssh is helper protocol so tdetelnetservice will be launched for
this URL. this URL.

@ -16,6 +16,6 @@ remote_DATA = zeroconf.desktop
remotedir = $(kde_datadir)/remoteview remotedir = $(kde_datadir)/remoteview
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kio_zeroconf.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_zeroconf.pot
METASOURCES = AUTO METASOURCES = AUTO

@ -31,7 +31,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kinstance.h> #include <kinstance.h>

@ -26,8 +26,8 @@
#include <tqobject.h> #include <tqobject.h>
#include <kurl.h> #include <kurl.h>
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <dnssd/servicebrowser.h> #include <dnssd/servicebrowser.h>
#include <dnssd/remoteservice.h> #include <dnssd/remoteservice.h>
#include <tqstringlist.h> #include <tqstringlist.h>

@ -12,52 +12,52 @@ deleting=false
linking=false linking=false
moving=false moving=false
Icon=network_local Icon=network_local
Description=A kioslave for ZeroConf Description=A tdeioslave for ZeroConf
Description[be]=Модуль kioslave для ZeroConf Description[be]=Модуль tdeioslave для ZeroConf
Description[bn]=জিরো-কন্ফ এর জন্য একটি কে-আই-ও স্লেভ Description[bn]=জিরো-কন্ফ এর জন্য একটি কে-আই-ও স্লেভ
Description[br]=Ur c'hioslave evit ZeroConf Description[br]=Ur c'hioslave evit ZeroConf
Description[bs]=kioslave za ZeroConf Description[bs]=tdeioslave za ZeroConf
Description[ca]=Un kioslave per ZeroConf Description[ca]=Un tdeioslave per ZeroConf
Description[cs]=Pomocný protokol pro Zeroconf Description[cs]=Pomocný protokol pro Zeroconf
Description[da]=En kioslave for Zeroconf Description[da]=En tdeioslave for Zeroconf
Description[de]=Ein Ein-/Ausgabemodul für ZeroConf Description[de]=Ein Ein-/Ausgabemodul für ZeroConf
Description[el]=Ένα kioslave για το ZeroConf Description[el]=Ένα tdeioslave για το ZeroConf
Description[es]=Un «kioslave» para ZeroConf Description[es]=Un «tdeioslave» para ZeroConf
Description[et]=ZeroConfi I/O-moodul Description[et]=ZeroConfi I/O-moodul
Description[eu]= kioslave bat ZeroConf-erako Description[eu]= tdeioslave bat ZeroConf-erako
Description[fa]=یک kioslave برای ZeroConf Description[fa]=یک tdeioslave برای ZeroConf
Description[fi]=Siirräntätyöskentelijä ZeroConfille Description[fi]=Siirräntätyöskentelijä ZeroConfille
Description[fr]=Un module d'entrée / sortie pour ZeroConf Description[fr]=Un module d'entrée / sortie pour ZeroConf
Description[gl]=Un kioslabe para ZeroConf Description[gl]=Un kioslabe para ZeroConf
Description[he]=kioslave בשביל ZeroConf Description[he]=tdeioslave בשביל ZeroConf
Description[hu]=KDE-protokoll a Zeroconf használatához Description[hu]=KDE-protokoll a Zeroconf használatához
Description[is]=kioslave fyrir ZeroConf Description[is]=tdeioslave fyrir ZeroConf
Description[it]=Un kioslave per Zeroconf Description[it]=Un tdeioslave per Zeroconf
Description[ja]=ZeroConf の kioslave Description[ja]=ZeroConf の tdeioslave
Description[ka]= kioslave ZeroConfსთვის Description[ka]= tdeioslave ZeroConfსთვის
Description[kk]=ZeroConf-тың kioslave-і Description[kk]=ZeroConf-тың tdeioslave-і
Description[km]=kioslave មួយ​សម្រាប់ ZeroConf Description[km]=tdeioslave មួយ​សម្រាប់ ZeroConf
Description[lt]=Antrinė KDE programa skirta ZeroConf Description[lt]=Antrinė KDE programa skirta ZeroConf
Description[nb]=En kioslave for ZeroConf Description[nb]=En tdeioslave for ZeroConf
Description[nds]=In-/Utgaavmoduul för ZeroConf Description[nds]=In-/Utgaavmoduul för ZeroConf
Description[ne]=जेरोकन्फका लागि कियोस्लाभ Description[ne]=जेरोकन्फका लागि कियोस्लाभ
Description[nl]=Een kioslave voor ZeroConf Description[nl]=Een tdeioslave voor ZeroConf
Description[nn]=Ein kio-slave for ZeroConf Description[nn]=Ein kio-slave for ZeroConf
Description[pl]=Wtyczka protokołu ZeroConf Description[pl]=Wtyczka protokołu ZeroConf
Description[pt]=Um 'kioslave' para o ZeroConf Description[pt]=Um 'tdeioslave' para o ZeroConf
Description[pt_BR]=Um IO-Slave para o ZeroConf Description[pt_BR]=Um IO-Slave para o ZeroConf
Description[ro]=Un dispozitiv de I/E pentru ZeroConf Description[ro]=Un dispozitiv de I/E pentru ZeroConf
Description[ru]=Kioslave для ZeroConf Description[ru]=Kioslave для ZeroConf
Description[sk]=kioslave pre ZeroConf Description[sk]=tdeioslave pre ZeroConf
Description[sl]=Kioslave za ZeroConf Description[sl]=Kioslave za ZeroConf
Description[sr]=kioslave за ZeroConf Description[sr]=tdeioslave за ZeroConf
Description[sr@Latn]=kioslave za ZeroConf Description[sr@Latn]=tdeioslave za ZeroConf
Description[sv]=En I/O-slav för Zeroconf Description[sv]=En I/O-slav för Zeroconf
Description[tr]=Zeroconf kioslave'i Description[tr]=Zeroconf tdeioslave'i
Description[uk]=Kioslave для ZeroConf Description[uk]=Kioslave для ZeroConf
Description[zh_CN]=ZeroConf 的 kioslave Description[zh_CN]=ZeroConf 的 tdeioslave
Description[zh_HK]=用於 ZeroConf 的 kioslave Description[zh_HK]=用於 ZeroConf 的 tdeioslave
Description[zh_TW]=ZeroConf 的 kioslave Description[zh_TW]=ZeroConf 的 tdeioslave
maxInstances=4 maxInstances=4
Class=:local Class=:local

@ -23,16 +23,16 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES install( FILES
kfile_torrent.desktop tdefile_torrent.desktop
DESTINATION ${SERVICES_INSTALL_DIR} ) DESTINATION ${SERVICES_INSTALL_DIR} )
##### kfile_torrent (module) #################### ##### tdefile_torrent (module) ####################
tde_add_kpart( kfile_torrent AUTOMOC tde_add_kpart( tdefile_torrent AUTOMOC
SOURCES SOURCES
bytetape.cpp bint.cpp bstring.cpp blist.cpp bytetape.cpp bint.cpp bstring.cpp blist.cpp
bdict.cpp kfile_torrent.cpp bdict.cpp tdefile_torrent.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -0,0 +1,22 @@
## Makefile.am for folder file meta info plugin
INCLUDES = $(all_includes)
# these are the headers for your project
noinst_HEADERS = tdefile_torrent.h bbase.h bdict.h bytetape.h \
bstring.h bint.h blist.h
kde_module_LTLIBRARIES = tdefile_torrent.la
tdefile_torrent_la_SOURCES = bytetape.cpp bint.cpp bstring.cpp blist.cpp bdict.cpp tdefile_torrent.cpp
tdefile_torrent_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
tdefile_torrent_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
services_DATA = tdefile_torrent.desktop
servicesdir = $(kde_servicesdir)
messages:
$(XGETTEXT) *.cpp -o $(podir)/tdefile_torrent.pot

@ -3,5 +3,5 @@ This is a meta information plugin for BitTorrent files (*.torrent).
It doesn't depend on BitTorrent or any non-standard library being installed. It doesn't depend on BitTorrent or any non-standard library being installed.
The .torrent files used by BitTorrent are coded in what is called a b-encoding The .torrent files used by BitTorrent are coded in what is called a b-encoding
by the BitTorrent author. Please see the actual kfile plugin source code for by the BitTorrent author. Please see the actual tdefile plugin source code for
more information on the encoding. more information on the encoding.

@ -25,14 +25,14 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include "kfile_torrent.h" #include "tdefile_torrent.h"
#include "bdict.h" #include "bdict.h"
#include "blist.h" #include "blist.h"
#include "bint.h" #include "bint.h"
#include "bstring.h" #include "bstring.h"
typedef KGenericFactory<KTorrentPlugin> TorrentFactory; typedef KGenericFactory<KTorrentPlugin> TorrentFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_torrent, TorrentFactory("kfile_torrent")) K_EXPORT_COMPONENT_FACTORY(tdefile_torrent, TorrentFactory("tdefile_torrent"))
TQStringList filesList (BList *list); TQStringList filesList (BList *list);
TQ_ULLONG filesLength (BList *list); TQ_ULLONG filesLength (BList *list);
@ -399,6 +399,6 @@ bool KTorrentPlugin::writeInfo(const KFileMetaInfo &info) const
return m_dict->writeToDevice(*TQT_TQIODEVICE(&output)); return m_dict->writeToDevice(*TQT_TQIODEVICE(&output));
} }
#include "kfile_torrent.moc" #include "tdefile_torrent.moc"
// vim: set ts=4 sw=4 et: // vim: set ts=4 sw=4 et:

@ -49,7 +49,7 @@ Name[zh_CN]=BitTorrent 信息
Name[zh_HK]=Bit Torrent 資訊 Name[zh_HK]=Bit Torrent 資訊
Name[zh_TW]=Bit Torrent 資訊 Name[zh_TW]=Bit Torrent 資訊
ServiceTypes=KFilePlugin ServiceTypes=KFilePlugin
X-TDE-Library=kfile_torrent X-TDE-Library=tdefile_torrent
# change MimeType here! (example: inode/directory) # change MimeType here! (example: inode/directory)
MimeType=application/x-bittorrent MimeType=application/x-bittorrent
# change PreferredGroups here! (example: FolderInfo) # change PreferredGroups here! (example: FolderInfo)

@ -19,7 +19,7 @@
#ifndef _KFILE_TORRENT_H #ifndef _KFILE_TORRENT_H
#define _KFILE_TORRENT_H #define _KFILE_TORRENT_H
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include "bdict.h" #include "bdict.h"

@ -33,6 +33,6 @@ tde_add_kpart( kcm_wifi AUTOMOC
wificonfig.cpp kcmwifi.cpp configcrypto.ui ifconfigpagebase.ui wificonfig.cpp kcmwifi.cpp configcrypto.ui ifconfigpagebase.ui
configpower.ui mainconfigbase.ui mainconfig.cpp ifconfigpage.cpp configpower.ui mainconfigbase.ui mainconfig.cpp ifconfigpage.cpp
vendorconfig.cpp vendorconfig.cpp
LINK kio-shared LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Icon=kwifimanager Icon=kwifimanager
Type=Application Type=Application
Exec=kcmshell kcmwifi Exec=tdecmshell kcmwifi
DocPath= DocPath=
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=wifi X-TDE-Library=wifi

@ -31,7 +31,7 @@
// include files for KDE // include files for KDE
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <klocale.h> #include <klocale.h>
#include <kstdaction.h> #include <kstdaction.h>
@ -558,7 +558,7 @@ void
KWiFiManagerApp::slotStartConfigEditor () KWiFiManagerApp::slotStartConfigEditor ()
{ {
TDEProcess startConf; TDEProcess startConf;
startConf << "tdesu" << locate("exe", "kcmshell") << "kcmwifi"; startConf << "tdesu" << locate("exe", "tdecmshell") << "kcmwifi";
startConf.start (TDEProcess::DontCare); startConf.start (TDEProcess::DontCare);
} }
@ -612,7 +612,7 @@ TQStringList usedInterfacesList()
client->registerAs( "kwifimanager" ); client->registerAs( "kwifimanager" );
client->setDefaultObject( "dcop_interface" ); client->setDefaultObject( "dcop_interface" );
// shamelessly stolen from tdelibs/kio/booksmarks/kbookmarkimporter_crash.cc // shamelessly stolen from tdelibs/tdeio/booksmarks/kbookmarkimporter_crash.cc
TQStringList ignoreInterfaces; TQStringList ignoreInterfaces;
QCStringList apps = client->registeredApplications(); QCStringList apps = client->registeredApplications();
for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )

@ -9,7 +9,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -16,7 +16,7 @@
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <tqstring.h> #include <tqstring.h>
#include <kconfig.h> #include <tdeconfig.h>
class KWireLessWidget; class KWireLessWidget;

Loading…
Cancel
Save