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

pull/21/head
Timothy Pearson 11 лет назад
Родитель 61bddfe3a7
Сommit b363d2579a

@ -109,7 +109,7 @@ option( BUILD_KORGANIZER "Build korganizer" ${BUILD_ALL} )
option( BUILD_PLUGINS "Build plugins" ${BUILD_ALL} )
option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
option( BUILD_KODE "Build kode" ${BUILD_ALL} )
option( BUILD_KRESOURCES "Build kresources" ${BUILD_ALL} )
option( BUILD_KRESOURCES "Build tderesources" ${BUILD_ALL} )
option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} )
option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
@ -181,7 +181,7 @@ tde_conditional_add_subdirectory( BUILD_KORGANIZER korganizer )
tde_conditional_add_subdirectory( BUILD_PLUGINS plugins )
tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
tde_conditional_add_subdirectory( BUILD_KODE kode )
tde_conditional_add_subdirectory( BUILD_KRESOURCES kresources )
tde_conditional_add_subdirectory( BUILD_KRESOURCES tderesources )
tde_conditional_add_subdirectory( BUILD_WIZARDS wizards )
tde_conditional_add_subdirectory( BUILD_KABC kabc )
tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )

@ -11,7 +11,7 @@
COMPILE_AFTER_libkmime = libemailfunctions
COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
COMPILE_AFTER_libkholidays = korganizer kontact
COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes kresources kfile-plugins
COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources kfile-plugins
COMPILE_AFTER_mimelib = korn kmail
COMPILE_AFTER_libtdenetwork = kmail knode
COMPILE_AFTER_libksieve = kmail
@ -25,14 +25,14 @@ COMPILE_BEFORE_kaddressbook = libtdepim certmanager akregator
COMPILE_BEFORE_kandy = libtdepim
COMPILE_BEFORE_kmail= libtdepim libkpimidentities certmanager libkpgp libkmime
COMPILE_BEFORE_knode= libtdepim libkpgp libkmime
COMPILE_BEFORE_karm = libtdepim kresources
COMPILE_BEFORE_karm = libtdepim tderesources
COMPILE_BEFORE_plugins = kmail libtdepim libkcal
COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
COMPILE_BEFORE_kioslaves = libkmime libtdepim
COMPILE_BEFORE_libkpimexchange = libtdepim
COMPILE_BEFORE_kalarm = libtdepim libkmime
COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode
COMPILE_BEFORE_wizards = libtdepim kresources korganizer kaddressbook kmail
COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode
COMPILE_BEFORE_wizards = libtdepim tderesources korganizer kaddressbook kmail
COMPILE_BEFORE_korn = libtdenetwork
COMPILE_BEFORE_kitchensync = libtdepim
COMPILE_BEFORE_akregator = libtdepim

@ -76,7 +76,7 @@ General Notes:
==============
Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion
is as follows:
1. All available addressbook resources as seen in "kcmshell kresources", section "kabc"
1. All available addressbook resources as seen in "kcmshell tderesources", section "kabc"
2. LDAP
Nothing special, AFAIK

@ -92,7 +92,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC
tde_add_executable( akregator AUTOMOC
SOURCES main.cpp mainwindow.cpp
LINK akregatorprivate-shared tdepim-shared kparts-shared
LINK akregatorprivate-shared tdepim-shared tdeparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@ -117,6 +117,6 @@ tde_add_kpart( libakregatorpart AUTOMOC
tagpropertieswidgetbase.ui treenodeitem.cpp
viewer.cpp ${TDE_INCLUDE_DIR}/kspeechsink.skel
${TDE_INCLUDE_DIR}/kspeech.stub listtabwidget.cpp
LINK akregatorprivate-shared tdepim-shared khtml-shared
LINK akregatorprivate-shared tdepim-shared tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -20,7 +20,7 @@ bin_PROGRAMS = akregator
# the application source, library search path, and link libraries
akregator_SOURCES = main.cpp mainwindow.cpp
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la

@ -32,7 +32,7 @@
#include <kconfigdialog.h>
#include <kfiledialog.h>
#include <kglobalsettings.h>
#include <khtmldefaults.h>
#include <tdehtmldefaults.h>
#include <kinstance.h>
#include <kmainwindow.h>
#include <kmessagebox.h>
@ -45,9 +45,9 @@
#include <ktempfile.h>
#include <ktrader.h>
#include <kio/netaccess.h>
#include <kparts/browserinterface.h>
#include <kparts/genericfactory.h>
#include <kparts/partmanager.h>
#include <tdeparts/browserinterface.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/partmanager.h>
#include <tqfile.h>
#include <tqobjectlist.h>

@ -26,8 +26,8 @@
#ifndef _AKREGATORPART_H_
#define _AKREGATORPART_H_
#include <kparts/browserextension.h>
#include <kparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>
#include <kurl.h>
#include "config.h"

@ -25,7 +25,7 @@
#ifndef AKREGATOR_RUN_H
#define AKREGATOR_RUN_H
#include <kparts/browserrun.h>
#include <tdeparts/browserrun.h>
namespace Akregator
{

@ -67,8 +67,8 @@
#include <kdialog.h>
#include <kfiledialog.h>
#include <kfileitem.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klineedit.h>
@ -82,7 +82,7 @@
#include <kstandarddirs.h>
#include <kurl.h>
#include <kxmlguifactory.h>
#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>

@ -31,7 +31,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kglobalsettings.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <klocale.h>
#include <kprocess.h>
#include <krun.h>

@ -43,7 +43,7 @@
#include <kiconeffect.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <kstringhandler.h>
#include <kurldrag.h>

@ -28,8 +28,8 @@
#include <kactioncollection.h>
#include <kdebug.h>
#include <klocale.h>
#include <kparts/browserextension.h>
#include <kparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>
#include <libtdepim/progressmanager.h>

@ -27,7 +27,7 @@
#include "folder.h"
#include "treenode.h"
#include <kmultitabbar.h>
#include <tdemultitabbar.h>
#include <tqiconset.h>
#include <tqlayout.h>

@ -41,7 +41,7 @@
#include <klibloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>
#include <ksqueezedtextlabel.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
@ -237,7 +237,7 @@ bool MainWindow::queryExit()
kdDebug() << "MainWindow::queryExit()" << endl;
if ( !kapp->sessionSaving() )
{
delete m_part; // delete that here instead of dtor to ensure nested khtmlparts are deleted before singleton objects like KHTMLPageCache
delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache
m_part = 0;
}
else

@ -30,9 +30,9 @@
#endif
#include <kapplication.h>
#include <kparts/mainwindow.h>
#include <kparts/browserinterface.h>
#include <kparts/browserextension.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/browserinterface.h>
#include <tdeparts/browserextension.h>
#include <kio/job.h>
class KActionCollection;

@ -35,14 +35,14 @@
#include <kbookmarkmanager.h>
#include <kconfig.h>
#include <kglobalsettings.h>
#include <khtml_settings.h>
#include <khtmlview.h>
#include <tdehtml_settings.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
#include <kstdaccel.h>
#include <kparts/browserinterface.h>
#include <tdeparts/browserinterface.h>
#include <tqclipboard.h>
#include <tqcstring.h>

@ -41,8 +41,8 @@
#include <kpopupmenu.h>
#include <krun.h>
#include <klocale.h>
#include <khtmlview.h>
#include <khtml_part.h>
#include <tdehtmlview.h>
#include <tdehtml_part.h>
#include <kiconloader.h>
#include <kurl.h>
#include <kurldrag.h>

@ -26,7 +26,7 @@
#include <kaction.h>
#include <kapplication.h>
#include <kfiledialog.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
@ -35,7 +35,7 @@
#include <krun.h>
#include <kshell.h>
#include <kurl.h>
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
#include <tqaccel.h>
#include <tqclipboard.h>

@ -25,7 +25,7 @@
#ifndef VIEWER_H
#define VIEWER_H
#include <khtml_part.h>
#include <tdehtml_part.h>
class KURL;

@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
certificateinfowidget.ui certificateinfowidgetimpl.cpp
crlview.cpp storedtransferjob.cpp certlistview.cpp
LINK conf-static kleopatra-shared kutils-shared kabc-shared
LINK conf-static kleopatra-shared tdeutils-shared kabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@ -17,7 +17,7 @@ kleopatra_SOURCES = \
METASOURCES = AUTO
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kleopatra

@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
METASOURCES = AUTO
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kwatchgnupg

@ -6,18 +6,18 @@ digraph "inter-dependency graph for tdepim" {
"certmanager" -> "kmail";
"certmanager" -> "libkpimidentities";
"kaddressbook" -> "kontact";
"kaddressbook" -> "kresources";
"kaddressbook" -> "tderesources";
"kaddressbook" -> "wizards";
"kgantt" -> "korganizer";
"kmail" -> "plugins";
"kmail" -> "wizards";
"knotes" -> "kontact";
"knotes" -> "kresources";
"kode" -> "kresources";
"knotes" -> "tderesources";
"kode" -> "tderesources";
"korganizer" -> "kontact";
"korganizer" -> "wizards";
"kresources" -> "karm";
"kresources" -> "wizards";
"tderesources" -> "karm";
"tderesources" -> "wizards";
"ktnef" -> "libkcal";
"libemailfunctions" -> "kmail";
"libemailfunctions" -> "korganizer";
@ -31,7 +31,7 @@ digraph "inter-dependency graph for tdepim" {
"libkcal" -> "konsolekalendar";
"libkcal" -> "korganizer";
"libkcal" -> "kpilot";
"libkcal" -> "kresources";
"libkcal" -> "tderesources";
"libkcal" -> "libtdepim";
"libkcal" -> "libkpimexchange";
"libkcal" -> "plugins";
@ -64,7 +64,7 @@ digraph "inter-dependency graph for tdepim" {
"libkpgp" -> "kmail";
"libkpgp" -> "knode";
"libkpimexchange" -> "korganizer";
"libkpimexchange" -> "kresources";
"libkpimexchange" -> "tderesources";
"libkpimidentities" -> "kmail";
"libkpimidentities" -> "korganizer";
"libksieve" -> "kmail";

@ -2100,9 +2100,9 @@ attachment window.</para>
</menuchoice>
</term>
<listitem>
<para>Uses <ulink url="/kspell/">&kspell;</ulink> to check the spelling in the body of your
<para>Uses <ulink url="/tdespell/">&tdespell;</ulink> to check the spelling in the body of your
message. Note that
you have to configure &kspell; with <menuchoice><guimenu>Settings</guimenu>
you have to configure &tdespell; with <menuchoice><guimenu>Settings</guimenu>
<guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the
first time.</para>
</listitem>
@ -2163,7 +2163,7 @@ tools to change certain properties of the composed text.</para>
</menuchoice>
</term>
<listitem>
<para>Allows you to configure <ulink url="/kspell/">&kspell;</ulink>, &kde;'s spellchecker.</para>
<para>Allows you to configure <ulink url="/tdespell/">&tdespell;</ulink>, &kde;'s spellchecker.</para>
</listitem>
</varlistentry>

@ -366,7 +366,7 @@ automatic spellchecking in the <menuchoice><guimenu>Options</guimenu></menuchoic
<para>To check the spelling of your message using a dialog, select
<menuchoice><guimenu>Tools</guimenu>
<guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses
<ulink url="/kspell/">&kspell;</ulink> to
<ulink url="/tdespell/">&tdespell;</ulink> to
check spelling, which is the &kde; frontend to the
<application>ispell</application> or <application>aspell</application> spelling
checker. Note that you may first need to configure the spellchecker using

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcfrontend
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabcfrontend_LDADD = -lkabc $(LIB_TDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabc2mutt
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabc2mutt_LDADD = -lkabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcdistlistupdater
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp

@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC
LINK
kabcommon-static kabim-static printer-static
kabinterfaces-shared
tdepim-shared kabc_file-shared tdeprint-shared kutils-shared
tdepim-shared kabc_file-shared tdeprint-shared tdeutils-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook
kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kaddressbook_LDADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la

@ -26,7 +26,7 @@ endif
libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources
libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -ltderesources
noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h

@ -36,7 +36,7 @@
#include <kinputdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kresources/configdialog.h>
#include <tderesources/configdialog.h>
#include "core.h"

@ -52,13 +52,13 @@
#include <kcmultidialog.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprinter.h>
#include <kprotocolinfo.h>
#include <kpushbutton.h>
#include <kresources/selectdialog.h>
#include <tderesources/selectdialog.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kstdguiitem.h>

@ -29,8 +29,8 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <klocale.h>
#include <kparts/genericfactory.h>
#include <kparts/statusbarextension.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/statusbarextension.h>
#include <kstatusbar.h>
#include "kabcore.h"

@ -23,9 +23,9 @@
#ifndef KADDRESSBOOK_PART_H
#define KADDRESSBOOK_PART_H
#include <kparts/event.h>
#include <kparts/factory.h>
#include <kparts/part.h>
#include <tdeparts/event.h>
#include <tdeparts/factory.h>
#include <tdeparts/part.h>
#include "kaddressbookiface.h"

@ -35,7 +35,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <ktempdir.h>
#include <ktrader.h>
#include <kurldrag.h>

@ -38,7 +38,7 @@
#include <kurl.h>
#include <kabc/addressbook.h>
#include <kabc/addressee.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include "kaddressbooktableview.h"

@ -48,7 +48,7 @@
#include <kmessagebox.h>
#include <kurl.h>
#include <kurlrequester.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include "configuretableviewdialog.h"
#include "contactlistview.h"

@ -74,6 +74,6 @@ tde_add_executable( kalarm AUTOMOC
kalarmd/alarmguiiface.skel
LINK
kalarm-static kalarmd-static
kpimidentities-shared kutils-shared ${ARTS_LIBRARIES}
kpimidentities-shared tdeutils-shared ${ARTS_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)

@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \
$(top_builddir)/kalarm/kalarmd/libkalarmd.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkpimidentities/libkpimidentities.la \
-lkabc -lkutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
-lkabc -ltdeutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \
editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \

@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
noinst_LTLIBRARIES = libkalarmd.la
libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkalarmd_la_LIBADD = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub
bin_PROGRAMS = kalarmd
kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
INCLUDES = -I$(top_srcdir) $(all_includes)
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@ -19,7 +19,7 @@ KDE_ICON = kandy
noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \
commanditem.h mobilegui.h commandscheduler.h
kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kandy_client_LDADD = $(LIB_TDECORE)
kandy_client_SOURCES = kandy_client.cpp

@ -13,7 +13,7 @@ tde_import( libkmime )
tde_import( ktnef )
tde_import( libkcal )
tde_import( libtdepim )
tde_import( kresources )
tde_import( tderesources )
add_subdirectory( support )
add_subdirectory( pics )
@ -25,7 +25,7 @@ include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/libkcal
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/kresources/remote
${CMAKE_SOURCE_DIR}/tderesources/remote
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

@ -1,13 +1,13 @@
############ Autoconf-generated variables ###################
INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/kresources/remote -I$(top_srcdir) $(all_includes)
INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/tderesources/remote -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = karm
SUBDIRS = support pics test
METASOURCES = AUTO
COMPILE_BEFORE_karm = libtdepim kresources
COMPILE_BEFORE_karm = libtdepim tderesources
noinst_LTLIBRARIES = libkarm_shared.la
@ -19,11 +19,11 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
csvexportdialog_base.ui csvexportdialog.cpp plannerparser.cpp \
karmdcopiface.skel taskviewwhatsthis.cpp
libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/kresources/remote/libkcal_resourceremote.la \
$(top_builddir)/tderesources/remote/libkcal_resourceremote.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint
karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h kaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \

@ -156,7 +156,7 @@ void karmPart::makeMenus()
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");

@ -1,9 +1,9 @@
#ifndef _KARMPART_H_
#define _KARMPART_H_
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "karmerrors.h"
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include <karmdcopiface.h>
#include "reportcriteria.h"
#include <tqlistview.h>

@ -294,7 +294,7 @@ void MainWindow::makeMenus()
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");

@ -1,7 +1,7 @@
#ifndef KARM_MAIN_WINDOW_H
#define KARM_MAIN_WINDOW_H
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
#include "karmerrors.h"
#include <karmdcopiface.h>

@ -3,11 +3,11 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking
runscripts_SOURCES = script.cpp runscripts.cpp
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)

@ -128,7 +128,7 @@ int main( int argc, char *argv[] )
short rval = 0;
// Use another directory than the real one, just to keep things clean
// TDEHOME needs to be writable though, for a ksycoca database
// TDEHOME needs to be writable though, for a tdesycoca database
// FIXME: Delete this directory when done with test.
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true );

@ -15,7 +15,7 @@ DCOPID=`dcop | grep karm 2>/dev/null`
if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi;
if [ -e $TESTFILE_LOCAL ]; then rm $TESTFILE_LOCAL; fi
# if the file does not exist, kresources pops up a modal dialog box
# if the file does not exist, tderesources pops up a modal dialog box
# telling us that a file does not exist.
touch $TESTFILE_LOCAL

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/opengroupware/soap \
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/opengroupware/soap \
$(all_includes)
noinst_HEADERS = opengroupware.h

@ -72,6 +72,6 @@ tde_add_library( kitchensync SHARED AUTOMOC
configguijescs.cpp configguievo2.cpp configguimoto.cpp
configguisynce.cpp configguisunbird.cpp
VERSION 0.0.0
LINK qopensync-shared tdepim-shared khtml-shared
LINK qopensync-shared tdepim-shared tdehtml-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
bin_PROGRAMS = kitchensync
kitchensync_SOURCES = main.cpp mainwindow.cpp
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kitchensync_LDADD = libkitchensync.la
xdg_apps_DATA = kitchensync.desktop

@ -24,8 +24,8 @@
#include <kaboutdata.h>
#include <kapplication.h>
#include <kdebug.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <krun.h>

@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <klocale.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include "mainwidget.h"

@ -21,9 +21,9 @@
#ifndef PART_H
#define PART_H
#include <kparts/event.h>
#include <kparts/factory.h>
#include <kparts/part.h>
#include <tdeparts/event.h>
#include <tdeparts/factory.h>
#include <tdeparts/part.h>
class TDEAboutData;

@ -140,7 +140,7 @@ set( ${target}_SRCS
kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp
kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp klistboxdialog.cpp
kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp
kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp
filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp
kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp
@ -151,7 +151,7 @@ set( ${target}_SRCS
kmkernel.cpp accountdialog.cpp searchwindow.cpp vcardviewer.cpp vacationdialog.cpp
vacation.cpp sievedebugdialog.cpp sieveconfig.cpp sievejob.cpp kmpopheaders.cpp
kmpopfiltercnfrmdlg.cpp kmmimeparttree.cpp mailinglist-magic.cpp kmacctmaildir.cpp
headerstyle.cpp headerstrategy.cpp khtmlparthtmlwriter.cpp filehtmlwriter.cpp
headerstyle.cpp headerstrategy.cpp tdehtmlparthtmlwriter.cpp filehtmlwriter.cpp
teehtmlwriter.cpp mailcomposerIface.skel objecttreeparser.cpp objecttreeparser_p.cpp
attachmentcollector.cpp bodypartformatterfactory.cpp bodypartformatter.cpp partNode.cpp
mailsourceviewer.cpp kmcommands.cpp kmreadermainwin.cpp kmstartup.cpp kmmainwidget.cpp
@ -191,7 +191,7 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
LINK
emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared
mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY}
mimelib-shared ksieve-shared tdehtml-shared ${INDEX_LIBRARY}
DESTINATION ${LIB_INSTALL_DIR}
)

@ -42,7 +42,7 @@ access to all the core KMail functionality.
FIXME this has moved to libkpimidentities, right?
Files: identity*, kmidentity.{h,cpp}, configuredialog.cpp,
Files: identity*, tdemidentity.{h,cpp}, configuredialog.cpp,
signatureconfigurator.{h,cpp}
Contact Marc Mutz <mutz@kde.org> on questions...

@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
csshelper.cpp klistboxdialog.cpp \
actionscheduler.cpp messageproperty.cpp \
kmmsgpart.cpp kmmsginfo.cpp \
accountmanager.cpp kmacctfolder.cpp kmdict.cpp \
accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \
kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
@ -88,7 +88,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
kmmimeparttree.cpp \
mailinglist-magic.cpp kmacctmaildir.cpp \
attachmentstrategy.cpp \
headerstrategy.cpp headerstyle.cpp khtmlparthtmlwriter.cpp \
headerstrategy.cpp headerstyle.cpp tdehtmlparthtmlwriter.cpp \
filehtmlwriter.cpp teehtmlwriter.cpp \
mailcomposerIface.skel objecttreeparser.cpp \
objecttreeparser_p.cpp \

@ -1135,7 +1135,7 @@ bool EncodingDetector::analyze(const char *data, int len)
case EncodingDetector::WesternEuropean:
if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding))
return true;
else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for khtml
else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for tdehtml
{
return setEncoding("iso-8859-15",AutoDetectedEncoding);
}

@ -42,7 +42,7 @@
#ifdef TQ_WS_WIN
#undef UNICODE
#endif
namespace khtml {
namespace tdehtml {
class guess_arc {
public:
unsigned int next; /* next state */
@ -50,7 +50,7 @@ namespace khtml {
};
}
using namespace khtml;
using namespace tdehtml;
typedef signed char dfa_table[256];
@ -62,7 +62,7 @@ extern guess_arc guess_sjis_ar[6];
extern const dfa_table guess_utf8_st[];
extern guess_arc guess_utf8_ar[11];
namespace khtml {
namespace tdehtml {
class guess_dfa {
public:

@ -53,7 +53,7 @@ using namespace KPIM;
#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <kabc/stdaddressbook.h>
#include <kabc/addresseelist.h>
#include <kmdcodec.h>

@ -44,8 +44,8 @@ using KMail::AccountManager;
using KRecentAddress::RecentAddresses;
#include <kapplication.h>
#include <kparts/mainwindow.h>
#include <kparts/genericfactory.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/genericfactory.h>
#include <knotifyclient.h>
#include <dcopclient.h>
#include <kiconloader.h>

@ -28,11 +28,11 @@
#include "kmailpartIface.h"
#include <tdeversion.h>
#include <kparts/browserextension.h>
#include <kparts/statusbarextension.h>
#include <kparts/factory.h>
#include <kparts/event.h>
#include <kparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/statusbarextension.h>
#include <tdeparts/factory.h>
#include <tdeparts/event.h>
#include <tdeparts/part.h>
#include <tqwidget.h>
#include <tdepimmacros.h>

@ -67,13 +67,13 @@
#include <kdirselectdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
#include <kprogress.h>
#include <krun.h>
#include <kbookmarkmanager.h>
#include <kstandarddirs.h>
#include <ktempfile.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <kuserprofile.h>
// KIO headers
#include <kio/job.h>

@ -109,8 +109,8 @@ using KRecentAddress::RecentAddresses;
#include "globalsettings.h"
#include "replyphrases.h"
#include <kspell.h>
#include <kspelldlg.h>
#include <tdespell.h>
#include <tdespelldlg.h>
#include <spellingfilter.h>
#include <ksyntaxhighlighter.h>
#include <kcolordialog.h>

@ -38,8 +38,8 @@ using KPIM::MailListDrag;
#include "globalsettings.h"
#include "replyphrases.h"
#include <kspell.h>
#include <kspelldlg.h>
#include <tdespell.h>
#include <tdespelldlg.h>
#include <spellingfilter.h>
#include <ksyntaxhighlighter.h>

@ -7,7 +7,7 @@
#include <tdeversion.h>
#include <keditcl.h>
#include <kspell.h>
#include <tdespell.h>
#include <ksyntaxhighlighter.h>
#include <tqmap.h>
#include <tqstringlist.h>

@ -2401,7 +2401,7 @@ void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e )
if( count == 1 )
pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
else
pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) );
pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );
// Calculate hotspot (as in Konqueror)
if( !pixmap.isNull() ) {

@ -69,7 +69,7 @@ using KMail::FolderIface;
#include <kpgp.h>
#include <kdebug.h>
#include <kio/netaccess.h>
#include <kwallet.h>
#include <tdewallet.h>
using KWallet::Wallet;
#include "actionscheduler.h"

@ -11,7 +11,7 @@
#include <kconfig.h>
#include <tdeversion.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <tdepimmacros.h>
#include "kmailIface.h"

@ -38,7 +38,7 @@ using KMail::HeaderStrategy;
#include <kglobalsettings.h>
#include <kdebug.h>
#include <kconfig.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kuser.h>
#include <kidna.h>
#include <kasciistricmp.h>

@ -4,7 +4,7 @@
#include "kmfolderindex.h"
#include "kmfolder.h"
#include "kmmsgdict.h"
#include "kmdict.h"
#include "tdemdict.h"
#include "globalsettings.h"
#include "folderstorage.h"

@ -37,7 +37,7 @@ using KMail::AttachmentStrategy;
using KMail::HeaderStrategy;
#include "headerstyle.h"
using KMail::HeaderStyle;
#include "khtmlparthtmlwriter.h"
#include "tdehtmlparthtmlwriter.h"
using KMail::HtmlWriter;
using KMail::KHtmlPartHtmlWriter;
#include "htmlstatusbar.h"
@ -80,9 +80,9 @@ using KMail::TeeHtmlWriter;
#include <kabc/addressee.h>
#include <kabc/vcardconverter.h>
// khtml headers
#include <khtml_part.h>
#include <khtmlview.h> // So that we can get rid of the frames
// tdehtml headers
#include <tdehtml_part.h>
#include <tdehtmlview.h> // So that we can get rid of the frames
#include <dom/html_element.h>
#include <dom/html_block.h>
#include <dom/html_document.h>

@ -38,7 +38,7 @@
#include <kmessagebox.h>
#include <kseparator.h>
#include <kdebug.h>
#include <kwallet.h>
#include <tdewallet.h>
using KWallet::Wallet;
#include <kprotocolinfo.h>
@ -87,7 +87,7 @@ void KMTransportInfo::readConfig(int id)
return;
if ( !mPasswd.isEmpty() ) {
// migration to kwallet if available
// migration to tdewallet if available
if ( Wallet::isEnabled() ) {
config->deleteEntry( "pass" );
mPasswdDirty = true;

@ -37,7 +37,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
#include <kwallet.h>
#include <tdewallet.h>
using TDEIO::MetaData;
using KWallet::Wallet;

@ -89,7 +89,7 @@
#include <klocale.h>
#include <kmimetype.h>
#include <kglobal.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <ktempfile.h>
#include <kstandarddirs.h>
#include <kapplication.h>

@ -38,7 +38,7 @@
#include <klocale.h>
#include <klineedit.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h>
#include <kdialog.h>

@ -95,7 +95,7 @@ class MatchListView : public KListView
if( mailList.count() == 1 )
pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
else
pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) );
pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );
d->setPixmap( pixmap );
return d;

@ -19,8 +19,8 @@
#include <tqtooltip.h>
#include <tqrect.h>
#include <ktexteditor/editinterface.h>
#include <ktexteditor/view.h>
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/view.h>
#include "snippetconfig.h"
class KDevProject;

@ -1,5 +1,5 @@
/* -*- c++ -*-
khtmlparthtmlwriter.cpp
tdehtmlparthtmlwriter.cpp
This file is part of KMail, the KDE mail client.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>
@ -31,11 +31,11 @@
#include <config.h>
#include "khtmlparthtmlwriter.h"
#include "tdehtmlparthtmlwriter.h"
#include <kdebug.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <dom/dom_string.h>
#include <dom/html_document.h>
@ -151,4 +151,4 @@ namespace KMail {
} // namespace KMail
#include "khtmlparthtmlwriter.moc"
#include "tdehtmlparthtmlwriter.moc"

@ -1,5 +1,5 @@
/* -*- c++ -*-
khtmlparthtmlwriter.h
tdehtmlparthtmlwriter.h
This file is part of KMail, the KDE mail client.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>

@ -5,7 +5,7 @@
#include <config.h>
#endif
#include "kmdict.h"
#include "tdemdict.h"
#include "kmglobal.h"
#include <kdebug.h>

@ -2,22 +2,22 @@ INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes)
AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\"
METASOURCES = AUTO
check_LTLIBRARIES = kunittest_storagelayermodule.la \
kunittest_utilmodule.la \
kunittest_mimelibmodule.la
check_LTLIBRARIES = tdeunittest_storagelayermodule.la \
tdeunittest_utilmodule.la \
tdeunittest_mimelibmodule.la
kunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp
kunittest_storagelayermodule_la_LIBADD = -lkunittest
kunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
kunittest_utilmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
kunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
kunittest_mimelibmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp
tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest
tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
tdeunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
tdeunittest_mimelibmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
#LIBADD = -lkunittest
#LIBADD = -ltdeunittest
AM_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local:
kunittestmodrunner
tdeunittestmodrunner
guicheck:
kunittestguimodrunner
tdeunittestguimodrunner

@ -4,10 +4,10 @@
*/
#include <kdebug.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "kmdict.h"
#include "tdemdict.h"
#include "messagedicttests.h"

@ -7,7 +7,7 @@
#ifndef MESSAGEDICTTESTS_H
#define MESSAGEDICTTESTS_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class KMDict;

@ -21,12 +21,12 @@
#include "mimelibtests.moc"
#include <kdebug.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_mimelibmodule, "Mimelib Tests" );
KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
#include <mimelib/string.h>
@ -56,7 +56,7 @@ static TQString makePrintable( const DwString& str )
TQCString MimeLibTester::readFile(const TQString& fileName)
{
TQFile file( fileName );
// #!@#$& kunittest... VERIFY() does nothing in setUp. Using assert instead.
// #!@#$& tdeunittest... VERIFY() does nothing in setUp. Using assert instead.
bool ok = file.open( IO_ReadOnly );
if ( !ok ) {
kdError() << fileName << " not found!" << endl;

@ -20,7 +20,7 @@
#ifndef MIMELIBTEST_H
#define MIMELIBTEST_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class DwString;
class MimeLibTester : public KUnitTest::SlotTester

@ -5,12 +5,12 @@
* have to fix it" license.
*/
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "messagedicttests.h"
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_storagelayermodule, "KMail Storage Layer Tests" );
KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );

@ -4,13 +4,13 @@
*/
#include <kdebug.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "utiltests.h"
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_utilmodule, "KMail::Util Tests" );
KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
KUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
#include "util.h"

@ -7,7 +7,7 @@
#ifndef UTILTESTS_H
#define UTILTESTS_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class UtilTester : public KUnitTest::SlotTester
{

@ -47,7 +47,7 @@
#include <kstandarddirs.h>
#include <kurldrag.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <kurl.h>
#include <algorithm>
@ -399,7 +399,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW
#include <klocale.h>
#include <kprocess.h>
#include <kmessagebox.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <tqstring.h>

@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
kmailcvt_METASOURCES = AUTO
# the library search path.
kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
KDE_ICON=AUTO

@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
INCLUDES = $(all_includes)
kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmobile_LDADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP
EXTRA_PROGRAMS = testlibkmobile
testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testlibkmobile_LDADD = libkmobileclient.la
testlibkmobile_SOURCES = testlibkmobile.cpp

@ -80,7 +80,7 @@ tde_add_library( knodecommon SHARED AUTOMOC
kncollectionview.cpp articlewidget.cpp csshelper.cpp
smtpaccountwidget_base.ui
VERSION 3.0.0
LINK emailfunctions-static tdepim-shared kpgp-shared khtml-shared
LINK emailfunctions-static tdepim-shared kpgp-shared tdehtml-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -17,7 +17,7 @@ SUBDIRS = pics filters
bin_PROGRAMS = knode
knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
knode_LDADD = libknodecommon.la
kcm_knode_la_SOURCES = knconfigpages.cpp

@ -32,8 +32,8 @@
#include <kapplication.h>
#include <kbookmarkmanager.h>
#include <kcharsets.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmdcodec.h>

@ -21,7 +21,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kwallet.h>
#include <tdewallet.h>
#include "kngroupmanager.h"
#include "knnntpaccount.h"

@ -16,7 +16,7 @@
#include <tqtextcodec.h>
#include <tqclipboard.h>
#include <tqapplication.h>
#include <kspelldlg.h>
#include <tdespelldlg.h>
#include <tdeversion.h>
#include "addressesdialog.h"
using KPIM::AddressesDialog;
@ -35,7 +35,7 @@ using KRecentAddress::RecentAddresses;
#include <kdebug.h>
#include <klineedit.h>
#include <kcombobox.h>
#include <kspell.h>
#include <tdespell.h>
#include <ktempfile.h>
#include <kpgp.h>
#include <kpgpblock.h>

@ -27,7 +27,7 @@
#include <kuserprofile.h>
#include <kopenwith.h>
#include <kscoringeditor.h>
#include <kspell.h>
#include <tdespell.h>
#include <kcombobox.h>
#include <kpgpui.h>
#include <kurlcompletion.h>

@ -32,8 +32,8 @@
#include "sidebarextension.h"
#include <kapplication.h>
#include <kparts/genericfactory.h>
#include <kparts/statusbarextension.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/statusbarextension.h>
#include <knotifyclient.h>
#include <dcopclient.h>
#include <kiconloader.h>

@ -26,10 +26,10 @@
#include <tdeversion.h>
#include <kparts/browserextension.h>
#include <kparts/factory.h>
#include <kparts/event.h>
#include <kparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/factory.h>
#include <tdeparts/event.h>
#include <tdeparts/part.h>
#include <tqwidget.h>

@ -17,7 +17,7 @@
#include <kconfig.h>
#include <klocale.h>
#include <kdebug.h>
#include <kwallet.h>
#include <tdewallet.h>
using namespace KWallet;
#include "knglobals.h"

@ -42,8 +42,8 @@ install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR}
install( FILES knotes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES knoteconfig.kcfg knotesglobalconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES knotesappui.rc knotesui.rc DESTINATION ${DATA_INSTALL_DIR}/knotes )
install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes )
install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources )
install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )
install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
##### knotes (executable) #######################
@ -76,7 +76,7 @@ tde_add_library( knotes SHARED AUTOMOC
knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp knotealarmdlg.cpp
knotesalarm.cpp
VERSION 0.0.0
LINK tdepim-shared kutils-shared tdeprint-shared
LINK tdepim-shared tdeutils-shared tdeprint-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -219,7 +219,7 @@ ChangeLog for KNotes
2004/04/23 Michael Brade <brade@kde.org>
* fixed adding a new resource every start of KNotes. Please delete
your .kde/share/config/kresources/notes/stdrc file to make KNotes start
your .kde/share/config/tderesources/notes/stdrc file to make KNotes start
fast again. KNotes is ready for release now :)
2004/04/21 Michael Brade <brade@kde.org>

@ -27,15 +27,15 @@ libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.
knotes_SOURCES = main.cpp knotesapp.cpp KNotesAppIface.skel
knotes_LDADD = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -lkresources -ltdeprint -lkutils
knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
$(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -ltderesources -ltdeprint -ltdeutils
knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
knotes_COMPILE_FIRST = knoteconfig.h
kde_module_LTLIBRARIES = knotes_local.la
knotes_local_la_SOURCES = resourcelocal_plugin.cpp
knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
knotes_local_la_LIBADD = libknotesresources.la libknotesconfig.la libknotesprinting.la \
$(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lkresources
$(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltderesources
METASOURCES = AUTO
@ -46,10 +46,10 @@ ui_DATA = knotesappui.rc knotesui.rc
uidir = $(kde_datadir)/knotes
service_DATA = local.desktop
servicedir = $(kde_servicesdir)/kresources/knotes
servicedir = $(kde_servicesdir)/tderesources/knotes
manager_DATA = knotes_manager.desktop
managerdir = $(kde_servicesdir)/kresources
managerdir = $(kde_servicesdir)/tderesources
KDE_OPTIONS = nofinal

@ -23,7 +23,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <kurlrequester.h>
#include "resourcelocal.h"

@ -21,7 +21,7 @@
#ifndef RESOURCELOCALCONFIG_H
#define RESOURCELOCALCONFIG_H
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
class KURLRequester;

@ -35,7 +35,7 @@
#define KNOTES_RESOURCEMANAGER_H
#include <knotes/resourcenotes.h>
#include <kresources/manager.h>
#include <tderesources/manager.h>
#include <libkcal/alarm.h>

@ -33,7 +33,7 @@
#ifndef RESOURCENOTES_H
#define RESOURCENOTES_H
#include <kresources/resource.h>
#include <tderesources/resource.h>
#include <tdepimmacros.h>
#include <libkcal/alarm.h>
@ -47,7 +47,7 @@ namespace KCal {
/**
* This class provides the interfaces for a KNotes resource. It makes use of
* the kresources framework.
* the tderesources framework.
*
* \warning This code is still under heavy development. Don't expect source or
* binary compatibility in future versions.

@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore
bin_PROGRAMS = kode
kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kode_LDADD = libkode.la -lkabc
kode_SOURCES = kodemain.cpp

@ -11,7 +11,7 @@ libwsdl_la_LIBADD = -ltdecore schema/libschema.la
bin_PROGRAMS = kwsdl_compiler
kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kwsdl_compiler_LDADD = ../libkode.la libwsdl.la
kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \
namemapper.cpp

@ -1,12 +1,12 @@
INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)
bin_PROGRAMS = kung
kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \
integerinputfield.cpp listinputfield.cpp loader.cpp main.cpp outputdialog.cpp pageinputfield.cpp simplebaseinputfield.cpp \
stringinputfield.cpp timeinputfield.cpp transport.cpp wsclconversationmanager.cpp
kung_LDADD = ../schema/libschema.la ../wscl/libwscl.la ../libwsdl.la -lkparts
kung_LDADD = ../schema/libschema.la ../wscl/libwscl.la ../libwsdl.la -ltdeparts
METASOURCES = AUTO

@ -25,8 +25,8 @@
#include <kmessagebox.h>
#include <kmimemagic.h>
#include <klocale.h>
#include <kparts/part.h>
#include <kparts/componentfactory.h>
#include <tdeparts/part.h>
#include <tdeparts/componentfactory.h>
#include <ktempfile.h>
#include <tqfile.h>

@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libschema_la_LIBADD = -lqt-mt -ltdecore -lkio
#bin_PROGRAMS = schematest
#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#schematest_SOURCES = main.cpp
#schematest_LDADD = libschema.la

@ -5,5 +5,5 @@ bin_PROGRAMS = googletest
googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
googletest_LDADD = -ltdecore -lkio
googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libwscl_la_LIBADD = -lqt-mt
#bin_PROGRAMS = wscltest
#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#wscltest_SOURCES = main.cpp
#wscltest_LDADD = libwscl.la

@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
bin_PROGRAMS = kxml_compiler
kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kxml_compiler_LDADD = ../libkode.la -ltdecore
kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp

@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
stdcalendar.cpp main.cpp
konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop

@ -1,6 +1,6 @@
SUBDIRS = interfaces plugins src pics profiles
DOXYGEN_REFERENCES = tdeui kparts libkcal
DOXYGEN_REFERENCES = tdeui tdeparts libkcal
include $(top_srcdir)/admin/Doxyfile.am

@ -154,7 +154,7 @@ Don: I agree that it is desireable to have common actions always
Don: available (and parts too like the todo list)
Don:
Don: But are you sure Kparts is limited in this way? KOrganizer can load
Don: multiple plugins simultaneously. And all of these plugins are kparts
Don: multiple plugins simultaneously. And all of these plugins are tdeparts
Don: (eg. birthday import), and kactions for all loaded plugins are
Don: created and made available simultaneously.
Don:
@ -210,7 +210,7 @@ d We need a more sophisticated handling (progressbar, etc)
Don: Definitely.
# We now have tdelibs/kparts/statusbarextension. This is intended to solve these
# We now have tdelibs/tdeparts/statusbarextension. This is intended to solve these
# problems, right?
d: Right. Simply add it as childobject in your part and use it's API. Works even
@ -348,7 +348,7 @@ h: see Opies OPimRecord for a bit too huge base class
Security
--------
d If we use the kparts (ktrader) approach to find a parts by looking
d If we use the tdeparts (ktrader) approach to find a parts by looking
d for an application with the correct mime type this might raise security
d problems. (Martin's concern)

@ -23,8 +23,8 @@
#include "core.h"
#include <kparts/part.h>
#include <kparts/componentfactory.h>
#include <tdeparts/part.h>
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
#include <tqtimer.h>
#include <klocale.h>

@ -25,8 +25,8 @@
#include <tqdatetime.h>
#include <tdepimmacros.h>
#include <kparts/mainwindow.h>
#include <kparts/part.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/part.h>
class KAction;

@ -25,7 +25,7 @@
#include <dcopclient.h>
#include <kaboutdata.h>
#include <kglobal.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
#include <kinstance.h>
#include <krun.h>

@ -34,7 +34,7 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <core.h>
#include <plugin.h>

@ -26,9 +26,9 @@
#define AKREGATOR_PLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <plugin.h>
#include "akregator_partiface_stub.h"
#include <uniqueapphandler.h>

@ -31,7 +31,7 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kaddrbook.h>
#include <kabc/addressbook.h>

@ -26,7 +26,7 @@
#define KADDRESSBOOK_PLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "kaddressbookiface_stub.h"
#include "plugin.h"

@ -24,7 +24,7 @@
*/
#include <kgenericfactory.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "core.h"
#include "plugin.h"

@ -27,7 +27,7 @@
#define KARM_PLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "karmdcopiface_stub.h"
#include "plugin.h"

@ -31,7 +31,7 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "core.h"
#include "plugin.h"

@ -26,7 +26,7 @@
#define KITCHENSYNC_PLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "plugin.h"

@ -28,7 +28,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kstandarddirs.h>
#include <dcopclient.h>
#include <ktempfile.h>

@ -25,7 +25,7 @@
#define KMAIL_PLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "kmailIface_stub.h"
#include <plugin.h>

@ -33,7 +33,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "core.h"
#include "summary.h"

@ -30,7 +30,7 @@
#include <dcopobject.h>
#include <kurllabel.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "plugin.h"
#include "summary.h"

@ -27,7 +27,7 @@
#include "core.h"
#include <kapplication.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kgenericfactory.h>
#include <kapplication.h>
#include <kaction.h>

@ -26,7 +26,7 @@
#define KNODE_PLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "knodeiface_stub.h"
#include "plugin.h"

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkontact_knotesplugin.la
libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
$(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkcal/libkcal.la -lkresources -ltdeprint \
$(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \
$(top_builddir)/knotes/libknotesresources.la \
$(top_builddir)/knotes/libknoteseditor.la \
$(top_builddir)/knotes/libknotesprinting.la

@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <libkcal/journal.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "knotes/KNotesIface.h"

@ -25,7 +25,7 @@
#define KONTACT_JOURNALPLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "kcalendariface_stub.h"
#include "plugin.h"

@ -26,7 +26,7 @@
#define KORGANIZER_PLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "kcalendariface_stub.h"
#include "korganizeriface_stub.h"

@ -30,7 +30,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
#include <kurllabel.h>

@ -25,7 +25,7 @@
#define KONTACT_TODOPLUGIN_H
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "kcalendariface_stub.h"
#include "plugin.h"

@ -30,7 +30,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
#include <kurllabel.h>

@ -23,7 +23,7 @@
#include <kaboutdata.h>
#include <kgenericfactory.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "core.h"
#include "summarywidget.h"

@ -20,7 +20,7 @@
#include <kgenericfactory.h>
#include <klocale.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "core.h"
#include "summarywidget.h"

@ -37,7 +37,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
#include <kurllabel.h>

@ -26,7 +26,7 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "core.h"
#include "sdsummarywidget.h"

@ -36,7 +36,7 @@ install( FILES kontactsummary_part.rc DESTINATION ${DATA_INSTALL_DIR}/kontactsum
tde_add_kpart( libkontact_summaryplugin AUTOMOC
SOURCES
summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp
LINK kpinterfaces-shared tdepim-shared kpimidentities-shared kutils-shared
LINK kpinterfaces-shared tdepim-shared kpimidentities-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@ -45,6 +45,6 @@ tde_add_kpart( libkontact_summaryplugin AUTOMOC
tde_add_kpart( kcm_kontactsummary AUTOMOC
SOURCES kcmkontactsummary.cpp
LINK tdeui-shared kutils-shared
LINK tdeui-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \
kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la
libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkontact_summaryplugin_la_LIBADD = -lkutils \
libkontact_summaryplugin_la_LIBADD = -ltdeutils \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
$(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la

@ -43,8 +43,8 @@
#include <klocale.h>
#include <kcmultidialog.h>
#include <kparts/componentfactory.h>
#include <kparts/event.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/event.h>
#include <libkpimidentities/identity.h>
#include <libkpimidentities/identitymanager.h>

@ -27,7 +27,7 @@
#include <tqdatetime.h>
#include <tqmap.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include "core.h"
#include "dropwidget.h"

@ -23,7 +23,7 @@
#include <dcopref.h>
#include <kgenericfactory.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kaboutdata.h>
#include <kaction.h>

@ -24,7 +24,7 @@
#include "plugin.h"
#include <klocale.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <tqmap.h>

@ -26,7 +26,7 @@
#include <kparts/part.h>
#include <tdeparts/part.h>
class TQTextEdit;
class KAddressBookIface_stub;

@ -20,7 +20,7 @@
#include <kaboutdata.h>
#include <kgenericfactory.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "core.h"
#include "summarywidget.h"

@ -50,7 +50,7 @@ tde_add_executable( kontact AUTOMOC
main.cpp mainwindow.cpp sidepanebase.cpp iconsidepane.cpp
aboutdialog.cpp profilemanager.cpp profiledialog.cpp
kontactiface.skel
LINK kontact-shared kpinterfaces-shared kutils-shared khtml-shared
LINK kontact-shared kpinterfaces-shared tdeutils-shared tdehtml-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc
bin_PROGRAMS = kontact
kontact_METASOURCES = AUTO
kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)

@ -46,7 +46,7 @@
#include <klistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kplugininfo.h>
#include <kpopupmenu.h>
#include <ksettings/dialog.h>
@ -60,8 +60,8 @@
#include <ksettings/componentsdialog.h>
#include <kstringhandler.h>
#include <krsqueezedtextlabel.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <libtdepim/kfileio.h>
#include <kcursor.h>
#include <krun.h>

@ -28,9 +28,9 @@
#include <tqptrlist.h>
#include <tqwidgetstack.h>
#include <kparts/mainwindow.h>
#include <kparts/part.h>
#include <kparts/partmanager.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/part.h>
#include <tdeparts/partmanager.h>
#include <kdcopservicestarter.h>
#include "core.h"

@ -205,7 +205,7 @@ tde_add_library( korganizer SHARED AUTOMOC
kdgantt-static
korganizer_eventviewer-shared korganizer_calendar-shared korg_stdprinting-shared
kholidays-shared kpimidentities-shared
kutils-shared knewstuff-shared
tdeutils-shared knewstuff-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -14,7 +14,7 @@ INCLUDES = \
bin_PROGRAMS = korganizer
korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
korganizer_LDADD = libkorganizer.la
korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
korganizer_COMPILE_FIRST = koprefs_base.h
@ -36,12 +36,12 @@ libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
check_PROGRAMS = korgplugins timezone
korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
korgplugins_LDADD = libkorganizer.la $(LIB_KSYCOCA)
korgplugins_SOURCES = korgplugins.cpp
korgplugins_COMPILE_FIRST = koprefs_base.h
timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA)
timezone_SOURCES = timezone.cpp
timezone_COMPILE_FIRST = koprefs_base.h
@ -63,7 +63,7 @@ libkorganizer_la_LIBADD = \
$(top_builddir)/libkholidays/libkholidays.la \
$(top_builddir)/libkmime/libkmime.la \
$(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \
-ltdeprint -lkabc -lkutils
-ltdeprint -lkabc -ltdeutils
libkorganizer_la_COMPILE_FIRST = \
kogroupwareprefspage.ui \

@ -24,7 +24,7 @@
#include <tqstring.h>
#include <klibloader.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <korganizer/mainwindow.h>

@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
bin_PROGRAMS = korgac
korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
korgac_LDADD = $(LIB_TDEUI) \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
check_PROGRAMS = testalarmdlg
testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp

@ -35,7 +35,7 @@
#include <korganizer/mainwindow.h>
#include <korganizer/part.h>
#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>
class KTempFile;
class KRecentFilesAction;

@ -51,9 +51,9 @@
#include <kprocess.h>
#include <ktempfile.h>
#include <kstatusbar.h>
#include <kparts/genericfactory.h>
#include <kparts/partmanager.h>
#include <kparts/statusbarextension.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/partmanager.h>
#include <tdeparts/statusbarextension.h>
#include <sidebarextension.h>
#include <infoextension.h>

@ -26,7 +26,7 @@
#define KORGANIZER_PART_H
#include <kurl.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <korganizer/mainwindow.h>

@ -37,8 +37,8 @@
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <kiconloader.h>
#include <kresources/resource.h>
#include <kresources/configdialog.h>
#include <tderesources/resource.h>
#include <tderesources/configdialog.h>
#include <libkcal/calendarresources.h>
#include <kconfig.h>

@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_RTTI)
INCLUDES = -I$(top_srcdir)/libkmime \
$(all_includes)
#INCLUDES = -I$(top_srcdir)/mimelib -I$(top_srcdir)/libkmime $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO

@ -8,5 +8,5 @@ kconf_PROGRAMS = korn-3-4-config_change
kconfdir = $(libdir)/kconf_update_bin
korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp
korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
korn_3_4_config_change_LDADD = $(LIB_QT)

@ -21,7 +21,7 @@
#include <kconfig.h>
#include <kdebug.h>
#include <kwallet.h>
#include <tdewallet.h>
#include <tqstring.h>
#include <tqstringlist.h>

@ -4,7 +4,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktnef
ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ktnef_LDADD = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
attachpropertydialog.cpp messagepropertydialog.cpp \

@ -4,7 +4,7 @@ LDADD = ../lib/libktnef.la $(LIB_TDECORE)
check_PROGRAMS = parsertest
TESTS = parsertest
parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
parsertest_SOURCES = parsertest.cpp
METASOURCES = AUTO

@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_TDECORE)
check_PROGRAMS = testidmapper testemail
TESTS = testemail
testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testidmapper_SOURCES = testidmapper.cpp
testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testemail_SOURCES = testemail.cpp
METASOURCES = AUTO

@ -54,8 +54,8 @@ install( FILES
##### other data ################################
install( FILES local.desktop localdir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
install( FILES kcal_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources )
install( FILES local.desktop localdir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
install( FILES kcal_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
##### kcal_local (module) #######################

@ -12,7 +12,7 @@ libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \
$(top_builddir)/ktnef/lib/libktnef.la \
../libkmime/libkmime.la \
../libemailfunctions/libemailfunctions.la \
-lkresources -lkabc
-ltderesources -lkabc
libkcal_la_SOURCES = \
assignmentvisitor.cpp comparisonvisitor.cpp \
@ -65,16 +65,16 @@ EXTRA_PROGRAMS = convertqtopia
convertqtopia_SOURCES = convertqtopia.cpp
convertqtopia_LDADD = libkcal.la
servicedir = $(kde_servicesdir)/kresources/kcal
servicedir = $(kde_servicesdir)/tderesources/kcal
service_DATA = local.desktop localdir.desktop
manager_DATA = kcal_manager.desktop
managerdir = $(kde_servicesdir)/kresources
managerdir = $(kde_servicesdir)/tderesources
METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/libkcal.pot
DOXYGEN_REFERENCES=kresources
DOXYGEN_REFERENCES=tderesources
include $(top_srcdir)/admin/Doxyfile.am

@ -44,8 +44,8 @@
#include "journal.h"
#include "filestorage.h"
#include <kresources/manager.h>
#include <kresources/selectdialog.h>
#include <tderesources/manager.h>
#include <tderesources/selectdialog.h>
#include <kabc/lock.h>
#include "resourcecalendar.h"

@ -37,7 +37,7 @@
#include "libkcal_export.h"
#include <kresources/manager.h>
#include <tderesources/manager.h>
class TQWidget;

@ -417,7 +417,7 @@ KPIM::IdMapper& ResourceCached::idMapper()
TQString ResourceCached::cacheFile() const
{
return locateLocal( "cache", "kcal/kresources/" + identifier() );
return locateLocal( "cache", "kcal/tderesources/" + identifier() );
}
TQString ResourceCached::changesCacheFile( const TQString &type ) const

@ -38,8 +38,8 @@
#include "calendar.h"
#include "exceptions.h"
#include <kresources/resource.h>
#include <kresources/manager.h>
#include <tderesources/resource.h>
#include <tderesources/manager.h>
#include <kabc/lock.h>
#include <tdepimmacros.h>
@ -49,7 +49,7 @@ class CalFormat;
/**
This class provides the interfaces for a calendar resource. It makes use of
the kresources framework.
the tderesources framework.
\warning This code is still under heavy development. Don't expect source or
binary compatibility in future versions.

@ -42,7 +42,7 @@
#include "journal.h"
#include "filestorage.h"
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include "resourcelocalconfig.h"

@ -26,8 +26,8 @@
#include <tqbuttongroup.h>
#include <kurlrequester.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
#include <tderesources/resource.h>
#include <tderesources/configwidget.h>
#include <tdepimmacros.h>
#include "libkcal_export.h"

@ -44,7 +44,7 @@
#include "journal.h"
#include "filestorage.h"
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include "resourcelocaldirconfig.h"

@ -27,8 +27,8 @@
#include <tqbuttongroup.h>
#include <kurlrequester.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
#include <tderesources/resource.h>
#include <tderesources/configwidget.h>
#include "libkcal_export.h"

@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \
METASOURCES = AUTO
testincidence_SOURCES = testincidence.cpp
testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testincidence_LDADD = ../libkcal.la
testcalendar_SOURCES = testcalendar.cpp
testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testcalendar_LDADD = ../libkcal.la
testtostring_SOURCES = testtostring.cpp
testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testtostring_LDADD = ../libkcal.la
fbrecurring_SOURCES = fbrecurring.cpp
fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
fbrecurring_LDADD = ../libkcal.la
readandwrite_SOURCES = readandwrite.cpp
readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
readandwrite_LDADD = ../libkcal.la
testresource_SOURCES = testresource.cpp
testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testresource_LDADD = ../libkcal.la
testrecurrence_SOURCES = testrecurrence.cpp
testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testrecurrence_LDADD = ../libkcal.la
testrecurprevious_SOURCES = testrecurprevious.cpp
testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testrecurprevious_LDADD = ../libkcal.la
testrecurson_SOURCES = testrecurson.cpp
testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testrecurson_LDADD = ../libkcal.la
testrecurrencetype_SOURCES = testrecurrencetype.cpp
testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testrecurrencetype_LDADD = ../libkcal.la
testvcalexport_SOURCES = testvcalexport.cpp
testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testvcalexport_LDADD = ../libkcal.la
testfields_SOURCES = testfields.cpp
testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testfields_LDADD = ../libkcal.la
testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"'
testfb_SOURCES = testfb.cpp
testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testfb_LDADD = ../libkcal.la
testcalselectdialog_SOURCES = testcalselectdialog.cpp
testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testcalselectdialog_LDADD = ../libkcal.la
TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics

@ -29,7 +29,7 @@
#include <kdebug.h>
#include <kcmdlineargs.h>
#include <kinputdialog.h>
#include <kresources/factory.h>
#include <tderesources/factory.h>
#include <tqdir.h>
#include <tqfileinfo.h>
@ -55,7 +55,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
// Use another directory than the real one, just to keep things clean
// TDEHOME needs to be writable though, for a ksycoca database
// TDEHOME needs to be writable though, for a tdesycoca database
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

@ -1,5 +1,5 @@
// -*- mode: C++; c-file-style: "gnu" -*-
// kmidentity.cpp
// tdemidentity.cpp
// License: GPL
#ifdef HAVE_CONFIG_H

@ -19,7 +19,7 @@ tde_import( ktnef )
add_subdirectory( icons )
add_subdirectory( pics )
add_subdirectory( kpartsdesignerplugin )
add_subdirectory( tdepartsdesignerplugin )
add_subdirectory( about )
include_directories(
@ -98,7 +98,7 @@ tde_add_library( tdepim SHARED AUTOMOC
csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp
sendsmsdialog.cpp kmailcompletion.cpp
VERSION 1.0.0
LINK kcal-shared kimproxy-shared kparts-shared ${TQUI_LIBRARIES}
LINK kcal-shared tdeimproxy-shared tdeparts-shared ${TQUI_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)

@ -1,4 +1,4 @@
SUBDIRS = cfgc interfaces tests icons pics kpartsdesignerplugin about
SUBDIRS = cfgc interfaces tests icons pics tdepartsdesignerplugin about
INCLUDES = -I$(top_srcdir) $(all_includes)

@ -26,7 +26,7 @@
#include <kabc/addressee.h>
#include <ktextbrowser.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <tdepimmacros.h>
namespace TDEIO {

@ -32,7 +32,7 @@
#ifdef TDEPIM_NEW_DISTRLISTS
#include "distributionlist.h"
#include <kresources/selectdialog.h>
#include <tderesources/selectdialog.h>
#include <kabc/resource.h>
#else
#include <kabc/distributionlist.h>

@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example
#autoexample
example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
example_LDADD = ../libtdepim.la $(LIB_TDECORE)
example_SOURCES = example.cpp exampleprefs_base.kcfgc
#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#autoexample_LDADD = ../libtdepim.la $(LIB_TDECORE)
#autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp

@ -59,7 +59,7 @@ The default completion weights are as follow:
LDAP: 50, 49, 48 etc. (see ldapclient.cpp)
KABC non-imap resources: 60 (see addresseelineedit.cpp and SimpleCompletionItem here)
Distribution lists: 60 (see addresseelineedit.cpp and SimpleCompletionItem here)
KABC imap resources: 80 (see kresources/imap/kabc/resourceimap.cpp)
KABC imap resources: 80 (see tderesources/imap/kabc/resourceimap.cpp)
This dialog allows to change those weights, by showing one item per:
- LDAP server

@ -591,7 +591,7 @@ namespace KPIM {
"}\n\n"
"div.fancy.header table {\n"
" padding: 2px ! important;\n" // ### khtml bug: this is ignored
" padding: 2px ! important;\n" // ### tdehtml bug: this is ignored
" text-align: left ! important\n"
"}\n\n"

@ -2,7 +2,7 @@
This file is part of libtdepim.
Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
Part of loadContents() copied from the kpartsdesignerplugin:
Part of loadContents() copied from the tdepartsdesignerplugin:
Copyright (C) 2005, David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or
@ -22,9 +22,9 @@
*/
#include "embeddedurlpage.h"
#include <kparts/componentfactory.h>
#include <kparts/browserextension.h>
#include <kparts/part.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>
#include <kmimetype.h>
#include <klocale.h>
#include <tqlayout.h>

@ -22,7 +22,7 @@
#include "infoextension.h"
#include <tqwidget.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
using namespace KParts;

@ -342,7 +342,7 @@ KABC::Addressee::List ResourceCached::deletedAddressees() const
TQString ResourceCached::cacheFile() const
{
return locateLocal( "cache", "kabc/kresources/" + identifier() );
return locateLocal( "cache", "kabc/tderesources/" + identifier() );
}
TQString ResourceCached::changesCacheFile( const TQString &type ) const

@ -22,7 +22,7 @@
#include <kabc/stdaddressbook.h>
#include <kabc/vcardconverter.h>
#include <kabc/errorhandler.h>
#include <kresources/selectdialog.h>
#include <tderesources/selectdialog.h>
#include <dcopref.h>
#include <dcopclient.h>

@ -6,7 +6,7 @@ lib_LTLIBRARIES = libkomposer.la
libkomposer_la_SOURCES = plugin.cpp editor.cpp core.cpp attachment.cpp corewidget.cpp \
settings.kcfgc pluginmanager.cpp komposerIface.skel
libkomposer_la_LDFLAGS = -no-undefined $(KDE_RPATH) -version-info 1:0:0 $(all_libraries)
libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -lkutils
libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -ltdeutils
#kde_module_LTLIBRARIES = kcm_komposer.la

@ -32,7 +32,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kplugininfo.h>
#include <ksettings/dispatcher.h>
#include <ksimpleconfig.h>

@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer
METASOURCES = AUTO
testfactory_SOURCES = main.cpp managertest.cpp
testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testfactory_LDADD = ../libkomposer.la
testmanager_SOURCES = testmanager.cpp
testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testmanager_LDADD = ../libkomposer.la
testkomposer_SOURCES = testkomposer.cpp
testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testkomposer_LDADD = ../libkomposer.la
check: testfactory

@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes)
LDADD = $(LIB_KPARTS) ../core/libkomposer.la
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
check_PROGRAMS = test

@ -1,8 +0,0 @@
AM_CXXFLAGS = -DQT_PLUGIN
METASOURCES = AUTO
INCLUDES = $(all_includes)
kde_widget_LTLIBRARIES = kpartsdesignerplugin.la
kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio
kpartsdesignerplugin_la_LIBADD = $(LIB_KPARTS)
kpartsdesignerplugin_la_SOURCES = kpartsdesignerplugin.cpp

@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <tqlabel.h>

@ -22,7 +22,7 @@
#include "sidebarextension.h"
#include <tqwidget.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
using namespace KParts;

@ -23,10 +23,10 @@ link_directories(
)
##### kpartsdesignerplugin (module) #############
##### tdepartsdesignerplugin (module) #############
tde_add_kpart( kpartsdesignerplugin AUTOMOC
SOURCES kpartsdesignerplugin.cpp
LINK kparts-shared kio-shared
tde_add_kpart( tdepartsdesignerplugin AUTOMOC
SOURCES tdepartsdesignerplugin.cpp
LINK tdeparts-shared kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
)

@ -0,0 +1,8 @@
AM_CXXFLAGS = -DQT_PLUGIN
METASOURCES = AUTO
INCLUDES = $(all_includes)
kde_widget_LTLIBRARIES = tdepartsdesignerplugin.la
tdepartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio
tdepartsdesignerplugin_la_LIBADD = $(LIB_KPARTS)
tdepartsdesignerplugin_la_SOURCES = tdepartsdesignerplugin.cpp

@ -1,2 +1,2 @@
When moving this to tdelibs: the KPartsGenericPart class should move to libkparts so
When moving this to tdelibs: the KPartsGenericPart class should move to libtdeparts so
that it's possible to add an accessor for m_part there.

@ -17,10 +17,10 @@
Boston, MA 02110-1301, USA.
*/
#include "kpartsdesignerplugin.h"
#include "tdepartsdesignerplugin.h"
#include <kparts/componentfactory.h>
#include <kparts/part.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/part.h>
#include <kmimetype.h>
#include <tqlayout.h>
#include <kapplication.h>
@ -113,5 +113,5 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const {
KDE_TQ_EXPORT_PLUGIN( KPartsWidgetPlugin )
#include "kpartsdesignerplugin.moc"
#include "tdepartsdesignerplugin.moc"

@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
LDADD = ../libtdepim.la $(LIB_TDECORE)
check_PROGRAMS = testwizard testaddresseelineedit \
@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
METASOURCES = AUTO
#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#example_LDADD = ../libtdepim.la $(LIB_TDECORE)
#example_SOURCES = example.cpp exampleprefs_base.kcfgc

@ -42,7 +42,7 @@ using KPIM::DistributionList;
int main(int argc, char *argv[])
{
// Use another directory than the real one, just to keep things clean
// TDEHOME needs to be writable though, for a ksycoca database
// TDEHOME needs to be writable though, for a tdesycoca database
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testdistrlist" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

@ -36,7 +36,7 @@
#include <interfaces/bodypartformatter.h>
#include <interfaces/bodypart.h>
#include <interfaces/bodyparturlhandler.h>
#include <khtmlparthtmlwriter.h>
#include <tdehtmlparthtmlwriter.h>
#include <libtdepim/kfileio.h>

@ -51,8 +51,8 @@
#include "interfaces/bodypart.h"
using KMail::Interface::BodyPart;
#include "interfaces/bodyparturlhandler.h"
#include "khtmlparthtmlwriter.h"
#include <kimproxy.h>
#include "tdehtmlparthtmlwriter.h"
#include <tdeimproxy.h>
#include <kpopupmenu.h>
#include <kabc/vcardconverter.h>

@ -32,7 +32,7 @@
#include <interfaces/bodypartformatter.h>
#include <interfaces/bodypart.h>
#include <interfaces/bodyparturlhandler.h>
#include <khtmlparthtmlwriter.h>
#include <tdehtmlparthtmlwriter.h>
#include <kmail/callback.h>
#include <kmail/kmmessage.h>
@ -85,7 +85,7 @@ namespace {
TQString tableStyle = TQString::fromLatin1(
"style=\""
"text-align: -khtml-auto; "
"text-align: -tdehtml-auto; "
"border: solid black 1px; "
"padding: 0.5em; "
"margin: 0em;\"");

@ -9,7 +9,7 @@
#
#################################################
project( kresources )
project( tderesources )
tde_import( libkmime )
tde_import( ktnef )

@ -33,7 +33,7 @@ install( FILES
##### other data ################################
install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
##### kcal_kabc (module) #######################

@ -13,7 +13,7 @@ kcal_kabc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
libkcalincludedir = $(includedir)/libkcal
libkcalinclude_HEADERS = resourcekabc.h resourcekabcconfig.h
servicedir = $(kde_servicesdir)/kresources/kcal
servicedir = $(kde_servicesdir)/tderesources/kcal
service_DATA = kabc.desktop
METASOURCES = AUTO

@ -48,7 +48,7 @@
#include <libemailfunctions/email.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include "resourcekabcconfig.h"

@ -28,8 +28,8 @@
#include <klistview.h>
#include <krestrictedline.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
#include <tderesources/resource.h>
#include <tderesources/configwidget.h>
namespace KCal {

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib -I../lib -I$(top_srcdir)/kresources/blogging/libkblog/ $(all_includes)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib -I../lib -I$(top_srcdir)/tderesources/blogging/libkblog/ $(all_includes)
lib_LTLIBRARIES = libkcal_blogging.la
kde_module_LTLIBRARIES = kcal_blogging.la
@ -18,7 +18,7 @@ kcal_blogging_la_SOURCES = kcal_resourceblogging_plugin.cpp
kcal_blogging_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
kcal_blogging_la_LIBADD = libkcal_blogging.la
kcal_servicedir = $(kde_servicesdir)/kresources/kcal
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = blogging.desktop
METASOURCES = AUTO
@ -26,4 +26,4 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kres_blogging.pot
kcal_resourceblogging.lo: ../lib/kresources_groupwareprefs.h
kcal_resourceblogging.lo: ../lib/tderesources_groupwareprefs.h

@ -22,7 +22,7 @@
#include "API_Blogger.h"
#include "kcal_resourceblogging.h"
#include <kresources_groupwareprefs.h>
#include <tderesources_groupwareprefs.h>
using namespace KCal;

@ -30,7 +30,7 @@ link_directories(
install(
FILES kcal_caldav.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
##### kcal_caldav (module) ######################

@ -25,7 +25,7 @@ kcal_caldav_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_caldav_la_LIBADD = libkcal_caldav.la
kcal_caldav_la_COMPILE_FIRST = prefsskel.h
kcal_servicedir = $(kde_servicesdir)/kresources/kcal
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_caldav.desktop
METASOURCES = AUTO

@ -20,7 +20,7 @@
#include "resource.h"
#include <kdemacros.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
class TQLineEdit;
class TQCheckBox;

@ -33,7 +33,7 @@
#ifndef KRESOURCES_TDEPIM_EXPORT_H
#define KRESOURCES_TDEPIM_EXPORT_H
/** Exports a function returning kresources plugin factory, for resource class @a resourceclass,
/** Exports a function returning tderesources plugin factory, for resource class @a resourceclass,
* @a resourceconfigclass config class and @a catalog catalog.
*/
#define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \

@ -16,7 +16,7 @@
#include "preferences.h"
#include <kwallet.h>
#include <tdewallet.h>
#include <tqstring.h>
#include <tqurl.h>
#include <kdebug.h>

@ -19,7 +19,7 @@
#include "prefsskel.h"
#include <kwallet.h>
#include <tdewallet.h>
#include <kdebug.h>
class TQString;

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_caldavrc" />
<kcfgfile name="tderesources_caldavrc" />
<group name="General" >
<entry key="Url" type="String" >

@ -30,7 +30,7 @@ link_directories(
install(
FILES kabc_carddav.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_carddav (module) #####################

@ -26,7 +26,7 @@ kabc_carddav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
kabc_carddav_la_LIBADD = libkabc_carddav.la
kabc_carddav_la_COMPILE_FIRST = prefsskel.h
kabc_servicedir = $(kde_servicesdir)/kresources/kabc
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_carddav.desktop
METASOURCES = AUTO

@ -19,7 +19,7 @@
#include "resource.h"
#include <kdemacros.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
class TQLineEdit;
class TQCheckBox;

@ -33,7 +33,7 @@
#ifndef KRESOURCES_TDEPIM_EXPORT_H
#define KRESOURCES_TDEPIM_EXPORT_H
/** Exports a function returning kresources plugin factory, for resource class @a resourceclass,
/** Exports a function returning tderesources plugin factory, for resource class @a resourceclass,
* @a resourceconfigclass config class and @a catalog catalog.
*/
#define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \

@ -15,7 +15,7 @@
#include "preferences.h"
#include <kwallet.h>
#include <tdewallet.h>
#include <tqstring.h>
#include <tqurl.h>
#include <kdebug.h>

@ -18,7 +18,7 @@
#include "prefsskel.h"
#include <kwallet.h>
#include <tdewallet.h>
#include <kdebug.h>
class TQString;

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_caldavrc" />
<kcfgfile name="tderesources_caldavrc" />
<group name="General" >
<entry key="Url" type="String" >

@ -33,9 +33,9 @@ install( FILES
##### other data ################################
install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
install( FILES kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes )
install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
install( FILES kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )
##### egwcommon (static) ########################

@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/kaddressbook \
-I$(top_builddir)/kaddressbook/common \
-I$(top_srcdir)/kaddressbook/common \
-I$(top_builddir)/kresources/egroupware \
-I$(top_builddir)/tderesources/egroupware \
$(all_includes)
noinst_HEADERS = kabc_resourcexmlrpcconfig.h kcal_resourcexmlrpcconfig.h \
@ -56,13 +56,13 @@ knotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpcplugin.cpp
knotes_xmlrpc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
knotes_xmlrpc_la_LIBADD = libknotes_xmlrpc.la
kabc_servicedir = $(kde_servicesdir)/kresources/kabc
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_xmlrpc.desktop
kcal_servicedir = $(kde_servicesdir)/kresources/kcal
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_xmlrpc.desktop
knotes_servicedir = $(kde_servicesdir)/kresources/knotes
knotes_servicedir = $(kde_servicesdir)/tderesources/knotes
knotes_service_DATA = knotes_xmlrpc.desktop
METASOURCES = AUTO

@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler
File=kresources_kabc_egroupware.kcfg
File=tderesources_kabc_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KABC
Singleton=false

@ -21,7 +21,7 @@
#ifndef RESOURCEXMLRPCCONFIG_H
#define RESOURCEXMLRPCCONFIG_H
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <tdepimmacros.h>
class KLineEdit;

@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler
File=kresources_kcal_egroupware.kcfg
File=tderesources_kcal_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KCal
Singleton=false

@ -31,7 +31,7 @@
#include <kabc/locknull.h>
#include <kdebug.h>
#include <klocale.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
#include <kurl.h>

@ -21,7 +21,7 @@
#ifndef RESOURCEXMLRPCCONFIG_H
#define RESOURCEXMLRPCCONFIG_H
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <tdepimmacros.h>
class KIntSpinBox;

@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler
File=kresources_knotes_egroupware.kcfg
File=tderesources_knotes_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KNotes
Singleton=false

@ -21,7 +21,7 @@
#ifndef RESOURCEXMLRPCCONFIG_H
#define RESOURCEXMLRPCCONFIG_H
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <tdepimmacros.h>
class KIntSpinBox;

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kabc_egroupwarerc"/>
<kcfgfile name="tderesources_kabc_egroupwarerc"/>
<group name="General">
<entry type="String" name="Url">

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_knotes_egroupwarerc"/>
<kcfgfile name="tderesources_kcal_egroupwarerc"/>
<group name="General">
<entry type="String" name="Url">

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kcal_egroupwarerc"/>
<kcfgfile name="tderesources_knotes_egroupwarerc"/>
<group name="General">
<entry type="String" name="Url">

@ -27,7 +27,7 @@ link_directories(
##### other data ################################
install( FILES exchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
install( FILES exchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
##### resourcecalendarexchange (module) #########

@ -12,11 +12,11 @@ kde_module_LTLIBRARIES = resourcecalendarexchange.la
resourcecalendarexchange_la_SOURCES = resourceexchange.cpp resourceexchangeconfig.cpp dateset.cpp
resourcecalendarexchange_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
resourcecalendarexchange_la_LIBADD= -lkresources \
resourcecalendarexchange_la_LIBADD= -ltderesources \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libkpimexchange/libkpimexchange.la
servicedir = $(kde_servicesdir)/kresources/kcal
servicedir = $(kde_servicesdir)/tderesources/kcal
service_DATA= exchange.desktop
messages: rc.cpp

@ -36,7 +36,7 @@
#include <libkcal/calendar.h>
#include <libkcal/journal.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <kabc/locknull.h>

@ -29,8 +29,8 @@
#include <klineedit.h>
#include <knuminput.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
#include <tderesources/resource.h>
#include <tderesources/configwidget.h>
namespace KCal {

@ -38,7 +38,7 @@ link_directories(
install( FILES
kcal_resourcefeatureplan.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
##### kcal_resourcefeatureplan (module) #########

@ -23,17 +23,17 @@ kcal_resourcefeatureplan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_resourcefeatureplan_la_LIBADD = libkcal_resourcefeatureplan.la
kcal_resourcefeatureplan_la_COMPILE_FIRST = kde-features.h prefs.h
kcal_servicedir = $(kde_servicesdir)/kresources/kcal
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_resourcefeatureplan.desktop
check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
dumpfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
dumpfeaturelist_COMPILE_FIRST = kde-features.h
benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
benchmarkfeaturelist_COMPILE_FIRST = kde-features.h

@ -35,7 +35,7 @@
#include <kabc/locknull.h>
#include <kdebug.h>
#include <klocale.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
#include <kurl.h>

@ -22,7 +22,7 @@
#ifndef RESOURCEFEATUREPLANCONFIG_H
#define RESOURCEFEATUREPLANCONFIG_H
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <tdepimmacros.h>
class KLineEdit;

@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler
File=kresources_kcal_featureplan.kcfg
File=tderesources_kcal_featureplan.kcfg
ClassName=Prefs
#NameSpace=KBB
Singleton=false

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kcal_bugzillarc"/>
<kcfgfile name="tderesources_kcal_bugzillarc"/>
<group name="General">
<entry type="String" name="Filename">

@ -26,10 +26,10 @@ link_directories(
##### other data ################################
install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal RENAME kcal_opengroupware.desktop )
install( FILES kabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc RENAME kabc_opengroupware.desktop)
install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal RENAME kcal_opengroupware.desktop )
install( FILES kabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc RENAME kabc_opengroupware.desktop)
##### kcal_groupdav (module) ####################

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib \
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib \
-I../lib $(all_includes)
lib_LTLIBRARIES = libkcal_groupdav.la libkabc_groupdav.la
@ -31,22 +31,22 @@ kabc_groupdav_la_SOURCES = kabc_resourcegroupdav_plugin.cpp
kabc_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
kabc_groupdav_la_LIBADD = libkabc_groupdav.la
kcal_servicedir = $(kde_servicesdir)/kresources/kcal
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupdav.desktop
kabc_servicedir = $(kde_servicesdir)/kresources/kabc
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_groupdav.desktop
METASOURCES = AUTO
install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/kresources/kabc
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/kresources/kcal
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kresources/kabc/kabc_opengroupware.desktop
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kresources/kcal/kcal_opengroupware.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kabc
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kcal
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kabc/kabc_opengroupware.desktop
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kres_groupdav.pot
kabc_resourcegroupdav.lo: ../lib/kresources_groupwareprefs.h
kabc_resourcegroupdav.lo: ../lib/tderesources_groupwareprefs.h

@ -21,7 +21,7 @@
*/
#include "groupdavaddressbookadaptor.h"
#include "kresources_groupwareprefs.h"
#include "tderesources_groupwareprefs.h"
#include "kabc_resourcegroupdav.h"

@ -30,10 +30,10 @@ kabc_groupware_la_SOURCES = kabc_resourcegroupware_plugin.cpp
kabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kabc_groupware_la_LIBADD = libkabc_groupware.la
kcal_servicedir = $(kde_servicesdir)/kresources/kcal
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupware.desktop
kabc_servicedir = $(kde_servicesdir)/kresources/kabc
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_groupware.desktop
METASOURCES = AUTO

@ -1,5 +1,5 @@
ClassName=GroupwarePrefs
File=kresources_kabc_groupware.kcfg
File=tderesources_kabc_groupware.kcfg
GlobalEnums=true
IncludeFiles=libtdepim/kresourceprefs.h
Inherits=KResourcePrefs

@ -20,7 +20,7 @@
#ifndef KABC_RESOURCEGROUPWARECONFIG_H
#define KABC_RESOURCEGROUPWARECONFIG_H
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <tqmap.h>

@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler
File=kresources_kcal_groupware.kcfg
File=tderesources_kcal_groupware.kcfg
ClassName=GroupwarePrefsBase
NameSpace=KCal
Singleton=false

@ -37,7 +37,7 @@
#include <kabc/locknull.h>
#include <kdebug.h>
#include <klocale.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
#include <kurl.h>

@ -22,8 +22,8 @@
#include <kurlrequester.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
#include <tderesources/resource.h>
#include <tderesources/configwidget.h>
class TQCheckBox;
class KLineEdit;

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kabc_groupwarerc" />
<kcfgfile name="tderesources_kabc_groupwarerc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kcal_groupwarerc" />
<kcfgfile name="tderesources_kcal_groupwarerc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>

@ -28,8 +28,8 @@ link_directories(
##### other data ################################
install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kcal_groupwise (module) ###################

@ -34,10 +34,10 @@ kabc_groupwise_la_SOURCES = kabc_resourcegroupwise_plugin.cpp
kabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kabc_groupwise_la_LIBADD = libkabc_groupwise.la
kcal_servicedir = $(kde_servicesdir)/kresources/kcal
kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_groupwise.desktop
kabc_servicedir = $(kde_servicesdir)/kresources/kabc
kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_groupwise.desktop
METASOURCES = AUTO

@ -1,5 +1,5 @@
ClassName=GroupwisePrefs
File=kresources_kabc_groupwise.kcfg
File=tderesources_kabc_groupwise.kcfg
GlobalEnums=true
IncludeFiles=libtdepim/kresourceprefs.h
Inherits=KResourcePrefs

@ -22,7 +22,7 @@
#include "soap/groupwiseserver.h"
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <tdepimmacros.h>
#include <tqmap.h>

@ -1,5 +1,5 @@
# Code generation options for kconfig_compiler
File=kresources_kcal_groupwise.kcfg
File=tderesources_kcal_groupwise.kcfg
ClassName=GroupwisePrefsBase
NameSpace=KCal
Singleton=false

@ -39,7 +39,7 @@
#include <kabc/locknull.h>
#include <kdebug.h>
#include <klocale.h>
#include <kresources/configwidget.h>
#include <tderesources/configwidget.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
#include <kurl.h>

@ -23,8 +23,8 @@
#include <kurlrequester.h>
#include <tdepimmacros.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
#include <tderesources/resource.h>
#include <tderesources/configwidget.h>
class TQCheckBox;
class KLineEdit;

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/groupwise/soap \
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/groupwise/soap \
-I$(top_builddir)/libtdepim $(all_includes)
noinst_HEADERS = groupwise.h

@ -1,11 +1,11 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/groupwise $(all_includes)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/groupwise $(all_includes)
#AM_CPPFLAGS = -DDEBUG
KDE_CXXFLAGS = -Wno-non-virtual-dtor
check_PROGRAMS = soapdebug
soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
soapdebug_LDADD = libgwsoap.la -ltdecore \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la

@ -28,5 +28,5 @@ type_typo.diff
socklen.diff:
Adriaan de Groot <groot@kde.org>: The attached patch is needed for me to get
kresources/groupwise/soap/stdsoap2.cpp to build -- it's the pretty usual
tderesources/groupwise/soap/stdsoap2.cpp to build -- it's the pretty usual
socklen_t type mixups (that are only serious on 64-bitters).

@ -1,6 +1,6 @@
Index: soap/stdsoap2.cpp
===================================================================
RCS file: /home/kde/tdepim/kresources/groupwise/soap/stdsoap2.cpp,v
RCS file: /home/kde/tdepim/tderesources/groupwise/soap/stdsoap2.cpp,v
retrieving revision 1.3
diff -u -3 -p -r1.3 stdsoap2.cpp
--- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3

@ -1,6 +1,6 @@
Index: soap/soapC.cpp
===================================================================
RCS file: /home/kde/tdepim/kresources/groupwise/soap/soapC.cpp,v
RCS file: /home/kde/tdepim/tderesources/groupwise/soap/soapC.cpp,v
retrieving revision 1.4.2.3
diff -u -3 -p -r1.4.2.3 soapC.cpp
--- soap/soapC.cpp 25 Oct 2004 13:58:20 -0000 1.4.2.3

@ -1,5 +1,5 @@
--- kresources/groupwise/soap/stdsoap2.cpp
+++ kresources/groupwise/soap/stdsoap2.cpp 2004/10/15 12:42:53
--- tderesources/groupwise/soap/stdsoap2.cpp
+++ tderesources/groupwise/soap/stdsoap2.cpp 2004/10/15 12:42:53
@@ -6470,7 +6470,11 @@
}
#endif

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kabc_groupwiserc" />
<kcfgfile name="tderesources_kabc_groupwiserc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kresources_kcal_groupwiserc" />
<kcfgfile name="tderesources_kcal_groupwiserc" />
<group name="General" >
<entry key="Url" type="String" >
<label>Server URL</label>

@ -27,11 +27,11 @@ link_directories(
install(
FILES kolab.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc
RENAME imap.desktop )

@ -1,6 +1,6 @@
METASOURCES = AUTO
INCLUDES = -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) $(all_includes)
INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) $(all_includes)
# The kolab wizard links to this library too
lib_LTLIBRARIES = libkabckolab.la
@ -8,8 +8,8 @@ lib_LTLIBRARIES = libkabckolab.la
libkabckolab_la_SOURCES = resourcekolab.cpp contact.cpp
libkabckolab_la_LDFLAGS = $(all_libraries) -no-undefined
libkabckolab_la_LIBADD = \
$(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \
-lkresources -lkabc
$(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
-ltderesources -lkabc
kde_module_LTLIBRARIES = kabc_kolab.la
@ -19,7 +19,7 @@ kabc_kolab_la_SOURCES = resourcekolab_plugin.cpp
kabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
kabc_kolab_la_LIBADD = libkabckolab.la
servicedir = $(kde_servicesdir)/kresources/kabc
servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = kolab.desktop
install-data-local: $(srcdir)/../uninstall.desktop

@ -28,11 +28,11 @@ link_directories(
install(
FILES kolab.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal
RENAME imap.desktop)

@ -1,6 +1,6 @@
METASOURCES = AUTO
INCLUDES = -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \
INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) \
-I$(top_builddir)/libtdepim $(all_includes)
# The kolab wizard links to this library too
@ -9,8 +9,8 @@ lib_LTLIBRARIES = libkcalkolab.la
libkcalkolab_la_SOURCES = incidence.cpp event.cpp task.cpp journal.cpp resourcekolab.cpp
libkcalkolab_la_LDFLAGS = $(all_libraries) -no-undefined
libkcalkolab_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \
-lkresources
$(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
-ltderesources
kde_module_LTLIBRARIES = kcal_kolab.la
@ -18,7 +18,7 @@ kcal_kolab_la_SOURCES = resourcekolab_plugin.cpp
kcal_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
kcal_kolab_la_LIBADD = libkcalkolab.la
servicedir = $(kde_servicesdir)/kresources/kcal
servicedir = $(kde_servicesdir)/tderesources/kcal
service_DATA = kolab.desktop
install-data-local: $(srcdir)/../uninstall.desktop

@ -28,11 +28,11 @@ link_directories(
install(
FILES kolabresource.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes )
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes
DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes
RENAME imap.desktop )

@ -1,6 +1,6 @@
METASOURCES = AUTO
INCLUDES = -I$(top_srcdir)/kresources/kolab/shared \
INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared \
-I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes)
# The kolab wizard links to this library too
@ -9,10 +9,10 @@ lib_LTLIBRARIES = libknoteskolab.la
libknoteskolab_la_SOURCES = resourcekolab.cpp note.cpp
libknoteskolab_la_LDFLAGS = $(all_libraries) -no-undefined
libknoteskolab_la_LIBADD = \
$(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \
$(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
$(top_builddir)/knotes/libknotesresources.la \
$(top_builddir)/libkcal/libkcal.la \
-lkresources -ltdeprint
-ltderesources -ltdeprint
kde_module_LTLIBRARIES = knotes_kolab.la
@ -20,7 +20,7 @@ knotes_kolab_la_SOURCES = resourcekolab_plugin.cpp
knotes_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
knotes_kolab_la_LIBADD = libknoteskolab.la
servicedir = $(kde_servicesdir)/kresources/knotes
servicedir = $(kde_servicesdir)/tderesources/knotes
service_DATA = kolabresource.desktop
install-data-local: $(srcdir)/../uninstall.desktop

@ -1,12 +1,12 @@
# Update the name of the resource
Id=kolab-calendar-resource-rename
File=kresources/calendar/stdrc
File=tderesources/calendar/stdrc
Script=upgrade-resourcetype.pl,perl
Id=kolab-contact-resource-rename
File=kresources/contact/stdrc
File=tderesources/contact/stdrc
Script=upgrade-resourcetype.pl,perl
Id=kolab-notes-resource-rename
File=kresources/notes/stdrc
File=tderesources/notes/stdrc
Script=upgrade-resourcetype.pl,perl

@ -12,7 +12,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kresources/lib
${CMAKE_SOURCE_DIR}/tderesources/lib
${CMAKE_SOURCE_DIR}/libtdepim
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib $(all_includes)
noinst_HEADERS = resourcekolabbase.h kolabbase.h subresource.h

@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource,
TQString ResourceKolabBase::configFile( const TQString& type ) const
{
return locateLocal( "config",
TQString( "kresources/kolab/%1rc" ).arg( type ) );
TQString( "tderesources/kolab/%1rc" ).arg( type ) );
}
bool ResourceKolabBase::connectToKMail() const

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше

Загрузка…
Отмена
Сохранить