TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/21/head
Timothy Pearson 12 years ago
parent 61bddfe3a7
commit b363d2579a
708 changed files with 652 additions and 652 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -109,7 +109,7 @@ option( BUILD_KORGANIZER "Build korganizer" ${BUILD_ALL} )
option( BUILD_PLUGINS "Build plugins" ${BUILD_ALL} ) option( BUILD_PLUGINS "Build plugins" ${BUILD_ALL} )
option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} ) option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
option( BUILD_KODE "Build kode" ${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_WIZARDS "Build wizards" ${BUILD_ALL} )
option( BUILD_KABC "Build kabc" ${BUILD_ALL} ) option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${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_PLUGINS plugins )
tde_conditional_add_subdirectory( BUILD_KNOTES knotes ) tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
tde_conditional_add_subdirectory( BUILD_KODE kode ) 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_WIZARDS wizards )
tde_conditional_add_subdirectory( BUILD_KABC kabc ) tde_conditional_add_subdirectory( BUILD_KABC kabc )
tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar ) tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )

8
Makefile.am.in
Unescape View File

@ -11,7 +11,7 @@
COMPILE_AFTER_libkmime = libemailfunctions COMPILE_AFTER_libkmime = libemailfunctions
COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
COMPILE_AFTER_libkholidays = korganizer kontact 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_mimelib = korn kmail
COMPILE_AFTER_libtdenetwork = kmail knode COMPILE_AFTER_libtdenetwork = kmail knode
COMPILE_AFTER_libksieve = kmail COMPILE_AFTER_libksieve = kmail
@ -25,14 +25,14 @@ COMPILE_BEFORE_kaddressbook = libtdepim certmanager akregator
COMPILE_BEFORE_kandy = libtdepim COMPILE_BEFORE_kandy = libtdepim
COMPILE_BEFORE_kmail= libtdepim libkpimidentities certmanager libkpgp libkmime COMPILE_BEFORE_kmail= libtdepim libkpimidentities certmanager libkpgp libkmime
COMPILE_BEFORE_knode= libtdepim 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_plugins = kmail libtdepim libkcal
COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
COMPILE_BEFORE_kioslaves = libkmime libtdepim COMPILE_BEFORE_kioslaves = libkmime libtdepim
COMPILE_BEFORE_libkpimexchange = libtdepim COMPILE_BEFORE_libkpimexchange = libtdepim
COMPILE_BEFORE_kalarm = libtdepim libkmime COMPILE_BEFORE_kalarm = libtdepim libkmime
COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode
COMPILE_BEFORE_wizards = libtdepim kresources korganizer kaddressbook kmail COMPILE_BEFORE_wizards = libtdepim tderesources korganizer kaddressbook kmail
COMPILE_BEFORE_korn = libtdenetwork COMPILE_BEFORE_korn = libtdenetwork
COMPILE_BEFORE_kitchensync = libtdepim COMPILE_BEFORE_kitchensync = libtdepim
COMPILE_BEFORE_akregator = libtdepim COMPILE_BEFORE_akregator = libtdepim

2
README.Kolab
Unescape View File

@ -76,7 +76,7 @@ General Notes:
============== ==============
Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion
is as follows: 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 2. LDAP
Nothing special, AFAIK Nothing special, AFAIK

4
akregator/src/CMakeLists.txt
Unescape View File

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

2
akregator/src/Makefile.am
Unescape View File

@ -20,7 +20,7 @@ bin_PROGRAMS = akregator
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
akregator_SOURCES = main.cpp mainwindow.cpp 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
#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la

8
akregator/src/akregator_part.cpp
Unescape View File

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

4
akregator/src/akregator_part.h
Unescape View File

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

2
akregator/src/akregator_run.h
Unescape View File

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

6
akregator/src/akregator_view.cpp
Unescape View File

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

2
akregator/src/articleviewer.cpp
Unescape View File

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

2
akregator/src/feedlistview.cpp
Unescape View File

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

4
akregator/src/frame.cpp
Unescape View File

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

2
akregator/src/listtabwidget.cpp
Unescape View File

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

4
akregator/src/mainwindow.cpp
Unescape View File

@ -41,7 +41,7 @@
#include <klibloader.h> #include <klibloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kparts/partmanager.h> #include <tdeparts/partmanager.h>
#include <ksqueezedtextlabel.h> #include <ksqueezedtextlabel.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kstatusbar.h> #include <kstatusbar.h>
@ -237,7 +237,7 @@ bool MainWindow::queryExit()
kdDebug() << "MainWindow::queryExit()" << endl; kdDebug() << "MainWindow::queryExit()" << endl;
if ( !kapp->sessionSaving() ) 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; m_part = 0;
} }
else else

6
akregator/src/mainwindow.h
Unescape View File

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

6
akregator/src/pageviewer.cpp
Unescape View File

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

4
akregator/src/tabwidget.cpp
Unescape View File

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

4
akregator/src/viewer.cpp
Unescape View File

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

2
akregator/src/viewer.h
Unescape View File

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

2
certmanager/CMakeLists.txt
Unescape View File

@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
certificateinfowidget.ui certificateinfowidgetimpl.cpp certificateinfowidget.ui certificateinfowidgetimpl.cpp
crlview.cpp storedtransferjob.cpp certlistview.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} DESTINATION ${BIN_INSTALL_DIR}
) )

2
certmanager/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ kleopatra_SOURCES = \
METASOURCES = AUTO 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) kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kleopatra rcdir = $(kde_datadir)/kleopatra

2
certmanager/kwatchgnupg/Makefile.am
Unescape View File

@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
METASOURCES = AUTO 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) kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kwatchgnupg rcdir = $(kde_datadir)/kwatchgnupg

14
dependency-graph.dot
Unescape View File

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

6
doc/kmail/menus.docbook
Unescape View File

@ -2100,9 +2100,9 @@ attachment window.</para>
</menuchoice> </menuchoice>
</term> </term>
<listitem> <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 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 <guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the
first time.</para> first time.</para>
</listitem> </listitem>
@ -2163,7 +2163,7 @@ tools to change certain properties of the composed text.</para>
</menuchoice> </menuchoice>
</term> </term>
<listitem> <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> </listitem>
</varlistentry> </varlistentry>

2
doc/kmail/using-kmail.docbook
Unescape View File

@ -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 <para>To check the spelling of your message using a dialog, select
<menuchoice><guimenu>Tools</guimenu> <menuchoice><guimenu>Tools</guimenu>
<guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses <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 check spelling, which is the &kde; frontend to the
<application>ispell</application> or <application>aspell</application> spelling <application>ispell</application> or <application>aspell</application> spelling
checker. Note that you may first need to configure the spellchecker using checker. Note that you may first need to configure the spellchecker using

2
kabc/frontend/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcfrontend 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_LDADD = -lkabc $(LIB_TDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui kabcfrontend_SOURCES = main.cpp mainWindow.ui

2
kabc/kabc2mutt/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabc2mutt 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_LDADD = -lkabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp

2
kabc/kabcdistlistupdater/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcdistlistupdater 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_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp

2
kaddressbook/CMakeLists.txt
Unescape View File

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

2
kaddressbook/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook bin_PROGRAMS = kaddressbook
kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp 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 kaddressbook_LDADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la kde_module_LTLIBRARIES = libkaddressbookpart.la

2
kaddressbook/features/Makefile.am
Unescape View File

@ -26,7 +26,7 @@ endif
libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined 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 noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h

2
kaddressbook/features/resourceselection.cpp
Unescape View File

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

4
kaddressbook/kabcore.cpp
Unescape View File

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

4
kaddressbook/kaddressbook_part.cpp
Unescape View File

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

6
kaddressbook/kaddressbook_part.h
Unescape View File

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

2
kaddressbook/viewmanager.cpp
Unescape View File

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

2
kaddressbook/views/contactlistview.cpp
Unescape View File

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

2
kaddressbook/views/kaddressbooktableview.cpp
Unescape View File

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

2
kalarm/CMakeLists.txt
Unescape View File

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

2
kalarm/Makefile.am
Unescape View File

@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \
$(top_builddir)/kalarm/kalarmd/libkalarmd.la \ $(top_builddir)/kalarm/kalarmd/libkalarmd.la \
$(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkpimidentities/libkpimidentities.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 \ noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \ alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \
editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \ editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \

4
kalarm/kalarmd/Makefile.am
Unescape View File

@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
noinst_LTLIBRARIES = libkalarmd.la 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_LIBADD = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub
bin_PROGRAMS = kalarmd 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_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \ kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \ adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

4
kandy/src/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
INCLUDES = -I$(top_srcdir) $(all_includes) 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_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \ kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \ cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@ -19,7 +19,7 @@ KDE_ICON = kandy
noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \ noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \
commanditem.h mobilegui.h commandscheduler.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_LDADD = $(LIB_TDECORE)
kandy_client_SOURCES = kandy_client.cpp kandy_client_SOURCES = kandy_client.cpp

4
karm/CMakeLists.txt
Unescape View File

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

8
karm/Makefile.am
Unescape View File

@ -1,13 +1,13 @@
############ Autoconf-generated variables ################### ############ 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 bin_PROGRAMS = karm
SUBDIRS = support pics test SUBDIRS = support pics test
METASOURCES = AUTO METASOURCES = AUTO
COMPILE_BEFORE_karm = libtdepim kresources COMPILE_BEFORE_karm = libtdepim tderesources
noinst_LTLIBRARIES = libkarm_shared.la noinst_LTLIBRARIES = libkarm_shared.la
@ -19,11 +19,11 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
csvexportdialog_base.ui csvexportdialog.cpp plannerparser.cpp \ csvexportdialog_base.ui csvexportdialog.cpp plannerparser.cpp \
karmdcopiface.skel taskviewwhatsthis.cpp karmdcopiface.skel taskviewwhatsthis.cpp
libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ 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 $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint
karm_SOURCES = main.cpp karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la 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 \ noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h kaccelmenuwatch.h timekard.h \ idletimedetector.h kaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \ karmutility.h ktimewidget.h karmstorage.h mainwindow.h \

2
karm/karm_part.cpp
Unescape View File

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

4
karm/karm_part.h
Unescape View File

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

2
karm/mainwindow.cpp
Unescape View File

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

2
karm/mainwindow.h
Unescape View File

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

4
karm/test/Makefile.am
Unescape View File

@ -3,11 +3,11 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking check_PROGRAMS = runscripts locking
runscripts_SOURCES = script.cpp runscripts.cpp 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) runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp 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 locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS) KDE_CXXFLAGS = $(USE_EXCEPTIONS)

2
karm/test/locking.cpp
Unescape View File

@ -128,7 +128,7 @@ int main( int argc, char *argv[] )
short rval = 0; short rval = 0;
// Use another directory than the real one, just to keep things clean // 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. // FIXME: Delete this directory when done with test.
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true ); setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true );

2
karm/test/remote_storage.sh
Unescape View File

@ -15,7 +15,7 @@ DCOPID=`dcop | grep karm 2>/dev/null`
if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi; if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi;
if [ -e $TESTFILE_LOCAL ]; then rm $TESTFILE_LOCAL; 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. # telling us that a file does not exist.
touch $TESTFILE_LOCAL touch $TESTFILE_LOCAL

2
kioslaves/opengroupware/Makefile.am
Unescape View File

@ -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) $(all_includes)
noinst_HEADERS = opengroupware.h noinst_HEADERS = opengroupware.h

2
kitchensync/src/CMakeLists.txt
Unescape View File

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

2
kitchensync/src/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
bin_PROGRAMS = kitchensync bin_PROGRAMS = kitchensync
kitchensync_SOURCES = main.cpp mainwindow.cpp 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 kitchensync_LDADD = libkitchensync.la
xdg_apps_DATA = kitchensync.desktop xdg_apps_DATA = kitchensync.desktop

4
kitchensync/src/aboutpage.cpp
Unescape View File

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

2
kitchensync/src/part.cpp
Unescape View File

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

6
kitchensync/src/part.h
Unescape View File

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

6
kmail/CMakeLists.txt
Unescape View File

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

2
kmail/Mainpage.dox
Unescape View File

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

4
kmail/Makefile.am
Unescape View File

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

2
kmail/encodingdetector.cpp
Unescape View File

@ -1135,7 +1135,7 @@ bool EncodingDetector::analyze(const char *data, int len)
case EncodingDetector::WesternEuropean: case EncodingDetector::WesternEuropean:
if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding)) if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding))
return true; 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); return setEncoding("iso-8859-15",AutoDetectedEncoding);
} }

6
kmail/encodingdetector_ja_p.h
Unescape View File

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

2
kmail/headerstyle.cpp
Unescape View File

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

4
kmail/kmail_part.cpp
Unescape View File

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

10
kmail/kmail_part.h
Unescape View File

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

4
kmail/kmcommands.cpp
Unescape View File

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

4
kmail/kmcomposewin.cpp
Unescape View File

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

4
kmail/kmedit.cpp
Unescape View File

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

2
kmail/kmedit.h
Unescape View File

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

2
kmail/kmheaders.cpp
Unescape View File

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

2
kmail/kmkernel.cpp
Unescape View File

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

2
kmail/kmkernel.h
Unescape View File

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

2
kmail/kmmessage.cpp
Unescape View File

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

2
kmail/kmmsgdict.cpp
Unescape View File

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

8
kmail/kmreaderwin.cpp
Unescape View File

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

4
kmail/kmtransport.cpp
Unescape View File

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

2
kmail/networkaccount.cpp
Unescape View File

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

2
kmail/objecttreeparser.cpp
Unescape View File

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

2
kmail/regexplineedit.cpp
Unescape View File

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

2
kmail/searchwindow.cpp
Unescape View File

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

4
kmail/snippetwidget.h
Unescape View File

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

10
kmail/khtmlparthtmlwriter.cpp → kmail/tdehtmlparthtmlwriter.cpp
Unescape View File

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

2
kmail/khtmlparthtmlwriter.h → kmail/tdehtmlparthtmlwriter.h
Unescape View File

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

2
kmail/kmdict.cpp → kmail/tdemdict.cpp
Unescape View File

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

0
kmail/kmdict.h → kmail/tdemdict.h
Unescape View File

24
kmail/tests/Makefile.am
Unescape View File

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

6
kmail/tests/messagedicttests.cpp
Unescape View File

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

2
kmail/tests/messagedicttests.h
Unescape View File

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

8
kmail/tests/mimelibtests.cpp
Unescape View File

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

2
kmail/tests/mimelibtests.h
Unescape View File

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

6
kmail/tests/storagelayermodule.cpp
Unescape View File

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

6
kmail/tests/utiltests.cpp
Unescape View File

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

2
kmail/tests/utiltests.h
Unescape View File

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

4
kmail/urlhandlermanager.cpp
Unescape View File

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

2
kmailcvt/Makefile.am
Unescape View File

@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
kmailcvt_METASOURCES = AUTO kmailcvt_METASOURCES = AUTO
# the library search path. # 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 KDE_ICON=AUTO

4
kmobile/Makefile.am
Unescape View File

@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
INCLUDES = $(all_includes) 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_LDADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\ kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \ 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 libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP
EXTRA_PROGRAMS = testlibkmobile 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_LDADD = libkmobileclient.la
testlibkmobile_SOURCES = testlibkmobile.cpp testlibkmobile_SOURCES = testlibkmobile.cpp

2
knode/CMakeLists.txt
Unescape View File

@ -80,7 +80,7 @@ tde_add_library( knodecommon SHARED AUTOMOC
kncollectionview.cpp articlewidget.cpp csshelper.cpp kncollectionview.cpp articlewidget.cpp csshelper.cpp
smtpaccountwidget_base.ui smtpaccountwidget_base.ui
VERSION 3.0.0 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} DESTINATION ${LIB_INSTALL_DIR}
) )

2
knode/Makefile.am
Unescape View File

@ -17,7 +17,7 @@ SUBDIRS = pics filters
bin_PROGRAMS = knode 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 knode_LDADD = libknodecommon.la
kcm_knode_la_SOURCES = knconfigpages.cpp kcm_knode_la_SOURCES = knconfigpages.cpp

4
knode/articlewidget.cpp
Unescape View File

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

2
knode/knaccountmanager.cpp
Unescape View File

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

4
knode/kncomposer.cpp
Unescape View File

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

2
knode/knconfigwidgets.cpp
Unescape View File

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

4
knode/knode_part.cpp
Unescape View File

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

8
knode/knode_part.h
Unescape View File

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

2
knode/knserverinfo.cpp
Unescape View File

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

6
knotes/CMakeLists.txt
Unescape View File

@ -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 knotes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES knoteconfig.kcfg knotesglobalconfig.kcfg DESTINATION ${KCFG_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 knotesappui.rc knotesui.rc DESTINATION ${DATA_INSTALL_DIR}/knotes )
install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes ) install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )
install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources ) install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
##### knotes (executable) ####################### ##### knotes (executable) #######################
@ -76,7 +76,7 @@ tde_add_library( knotes SHARED AUTOMOC
knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp knotealarmdlg.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp knotealarmdlg.cpp
knotesalarm.cpp knotesalarm.cpp
VERSION 0.0.0 VERSION 0.0.0
LINK tdepim-shared kutils-shared tdeprint-shared LINK tdepim-shared tdeutils-shared tdeprint-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

2
knotes/ChangeLog
Unescape View File

@ -219,7 +219,7 @@ ChangeLog for KNotes
2004/04/23 Michael Brade <brade@kde.org> 2004/04/23 Michael Brade <brade@kde.org>
* fixed adding a new resource every start of KNotes. Please delete * 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 :) fast again. KNotes is ready for release now :)
2004/04/21 Michael Brade <brade@kde.org> 2004/04/21 Michael Brade <brade@kde.org>

10
knotes/Makefile.am
Unescape View File

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

2
knotes/resourcelocalconfig.cpp
Unescape View File

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

2
knotes/resourcelocalconfig.h
Unescape View File

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

2
knotes/resourcemanager.h
Unescape View File

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

4
knotes/resourcenotes.h
Unescape View File

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

2
kode/Makefile.am
Unescape View File

@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore
bin_PROGRAMS = kode 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_LDADD = libkode.la -lkabc
kode_SOURCES = kodemain.cpp kode_SOURCES = kodemain.cpp

2
kode/kwsdl/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ libwsdl_la_LIBADD = -ltdecore schema/libschema.la
bin_PROGRAMS = kwsdl_compiler 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_LDADD = ../libkode.la libwsdl.la
kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \ kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \
namemapper.cpp namemapper.cpp

4
kode/kwsdl/kung/Makefile.am
Unescape View File

@ -1,12 +1,12 @@
INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes) INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)
bin_PROGRAMS = kung 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 \ kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \ doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \ inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \
integerinputfield.cpp listinputfield.cpp loader.cpp main.cpp outputdialog.cpp pageinputfield.cpp simplebaseinputfield.cpp \ integerinputfield.cpp listinputfield.cpp loader.cpp main.cpp outputdialog.cpp pageinputfield.cpp simplebaseinputfield.cpp \
stringinputfield.cpp timeinputfield.cpp transport.cpp wsclconversationmanager.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 METASOURCES = AUTO

4
kode/kwsdl/kung/binaryinputfield.cpp
Unescape View File

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

2
kode/kwsdl/schema/Makefile.am
Unescape View File

@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libschema_la_LIBADD = -lqt-mt -ltdecore -lkio libschema_la_LIBADD = -lqt-mt -ltdecore -lkio
#bin_PROGRAMS = schematest #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_SOURCES = main.cpp
#schematest_LDADD = libschema.la #schematest_LDADD = libschema.la

2
kode/kwsdl/tests/google/Makefile.am
Unescape View File

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

2
kode/kwsdl/wscl/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libwscl_la_LIBADD = -lqt-mt libwscl_la_LIBADD = -lqt-mt
#bin_PROGRAMS = wscltest #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_SOURCES = main.cpp
#wscltest_LDADD = libwscl.la #wscltest_LDADD = libwscl.la

2
kode/kxml_compiler/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
bin_PROGRAMS = kxml_compiler 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_LDADD = ../libkode.la -ltdecore
kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp

2
konsolekalendar/Makefile.am
Unescape View File

@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \ konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
stdcalendar.cpp main.cpp stdcalendar.cpp main.cpp
konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la 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 appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop xdg_apps_DATA = konsolekalendar.desktop

2
kontact/Makefile.am
Unescape View File

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

6
kontact/Thoughts
Unescape View File

@ -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: available (and parts too like the todo list)
Don: Don:
Don: But are you sure Kparts is limited in this way? KOrganizer can load 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: (eg. birthday import), and kactions for all loaded plugins are
Don: created and made available simultaneously. Don: created and made available simultaneously.
Don: Don:
@ -210,7 +210,7 @@ d We need a more sophisticated handling (progressbar, etc)
Don: Definitely. 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? # problems, right?
d: Right. Simply add it as childobject in your part and use it's API. Works even 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 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 for an application with the correct mime type this might raise security
d problems. (Martin's concern) d problems. (Martin's concern)

4
kontact/interfaces/core.cpp
Unescape View File

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

4
kontact/interfaces/core.h
Unescape View File

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

2
kontact/interfaces/plugin.cpp
Unescape View File

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

2
kontact/plugins/akregator/akregator_plugin.cpp
Unescape View File

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

4
kontact/plugins/akregator/akregator_plugin.h
Unescape View File

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

2
kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
Unescape View File

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

2
kontact/plugins/kaddressbook/kaddressbook_plugin.h
Unescape View File

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

2
kontact/plugins/karm/karm_plugin.cpp
Unescape View File

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

2
kontact/plugins/karm/karm_plugin.h
Unescape View File

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

2
kontact/plugins/kitchensync/kitchensync_plugin.cpp
Unescape View File

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

2
kontact/plugins/kitchensync/kitchensync_plugin.h
Unescape View File

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

2
kontact/plugins/kmail/kmail_plugin.cpp
Unescape View File

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

2
kontact/plugins/kmail/kmail_plugin.h
Unescape View File

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

2
kontact/plugins/kmail/summarywidget.cpp
Unescape View File

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

2
kontact/plugins/kmail/summarywidget.h
Unescape View File

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

2
kontact/plugins/knode/knode_plugin.cpp
Unescape View File

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

2
kontact/plugins/knode/knode_plugin.h
Unescape View File

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

2
kontact/plugins/knotes/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkontact_knotesplugin.la
libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
$(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.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/libknotesresources.la \
$(top_builddir)/knotes/libknoteseditor.la \ $(top_builddir)/knotes/libknoteseditor.la \
$(top_builddir)/knotes/libknotesprinting.la $(top_builddir)/knotes/libknotesprinting.la

2
kontact/plugins/knotes/knotes_part.h
Unescape View File

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

2
kontact/plugins/korganizer/journalplugin.h
Unescape View File

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

2
kontact/plugins/korganizer/korganizerplugin.h
Unescape View File

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

2
kontact/plugins/korganizer/summarywidget.cpp
Unescape View File

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

2
kontact/plugins/korganizer/todoplugin.h
Unescape View File

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

2
kontact/plugins/korganizer/todosummarywidget.cpp
Unescape View File

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

2
kontact/plugins/kpilot/kpilot_plugin.cpp
Unescape View File

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

2
kontact/plugins/newsticker/newsticker_plugin.cpp
Unescape View File

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

2
kontact/plugins/specialdates/sdsummarywidget.cpp
Unescape View File

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

2
kontact/plugins/specialdates/specialdates_plugin.cpp
Unescape View File

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

4
kontact/plugins/summary/CMakeLists.txt
Unescape View File

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

2
kontact/plugins/summary/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \
kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la
libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) 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)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
$(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la

4
kontact/plugins/summary/summaryview_part.cpp
Unescape View File

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

2
kontact/plugins/summary/summaryview_part.h
Unescape View File

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

2
kontact/plugins/summary/summaryview_plugin.cpp
Unescape View File

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

2
kontact/plugins/summary/summaryview_plugin.h
Unescape View File

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

2
kontact/plugins/test/test_part.h
Unescape View File

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

2
kontact/plugins/weather/weather_plugin.cpp
Unescape View File

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

2
kontact/src/CMakeLists.txt
Unescape View File

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

2
kontact/src/Makefile.am
Unescape View File

@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc
bin_PROGRAMS = kontact bin_PROGRAMS = kontact
kontact_METASOURCES = AUTO 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 \ kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)

6
kontact/src/mainwindow.cpp
Unescape View File

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

6
kontact/src/mainwindow.h
Unescape View File

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

2
korganizer/CMakeLists.txt
Unescape View File

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

8
korganizer/Makefile.am
Unescape View File

@ -14,7 +14,7 @@ INCLUDES = \
bin_PROGRAMS = korganizer 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_LDADD = libkorganizer.la
korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
korganizer_COMPILE_FIRST = koprefs_base.h korganizer_COMPILE_FIRST = koprefs_base.h
@ -36,12 +36,12 @@ libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
check_PROGRAMS = korgplugins timezone 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_LDADD = libkorganizer.la $(LIB_KSYCOCA)
korgplugins_SOURCES = korgplugins.cpp korgplugins_SOURCES = korgplugins.cpp
korgplugins_COMPILE_FIRST = koprefs_base.h 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_LDADD = libkorganizer.la $(LIB_KSYCOCA)
timezone_SOURCES = timezone.cpp timezone_SOURCES = timezone.cpp
timezone_COMPILE_FIRST = koprefs_base.h timezone_COMPILE_FIRST = koprefs_base.h
@ -63,7 +63,7 @@ libkorganizer_la_LIBADD = \
$(top_builddir)/libkholidays/libkholidays.la \ $(top_builddir)/libkholidays/libkholidays.la \
$(top_builddir)/libkmime/libkmime.la \ $(top_builddir)/libkmime/libkmime.la \
$(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \ $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \
-ltdeprint -lkabc -lkutils -ltdeprint -lkabc -ltdeutils
libkorganizer_la_COMPILE_FIRST = \ libkorganizer_la_COMPILE_FIRST = \
kogroupwareprefspage.ui \ kogroupwareprefspage.ui \

2
korganizer/interfaces/korganizer/part.h
Unescape View File

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

4
korganizer/korgac/Makefile.am
Unescape View File

@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
bin_PROGRAMS = korgac 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) \ korgac_LDADD = $(LIB_TDEUI) \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la $(top_builddir)/korganizer/libkorganizer_eventviewer.la
korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
check_PROGRAMS = testalarmdlg 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 \ testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la $(top_builddir)/korganizer/libkorganizer_eventviewer.la
testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp

2
korganizer/korganizer.h
Unescape View File

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

6
korganizer/korganizer_part.cpp
Unescape View File

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

2
korganizer/korganizer_part.h
Unescape View File

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

4
korganizer/resourceview.cpp
Unescape View File

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

2
korn/Makefile.am
Unescape View File

@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_RTTI)
INCLUDES = -I$(top_srcdir)/libkmime \ INCLUDES = -I$(top_srcdir)/libkmime \
$(all_includes) $(all_includes)
#INCLUDES = -I$(top_srcdir)/mimelib -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 METASOURCES = AUTO

2
korn/kconf_update/Makefile.am
Unescape View File

@ -8,5 +8,5 @@ kconf_PROGRAMS = korn-3-4-config_change
kconfdir = $(libdir)/kconf_update_bin kconfdir = $(libdir)/kconf_update_bin
korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp 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) korn_3_4_config_change_LDADD = $(LIB_QT)

2
korn/password.cpp
Unescape View File

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

2
ktnef/gui/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktnef 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_LDADD = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \ ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
attachpropertydialog.cpp messagepropertydialog.cpp \ attachpropertydialog.cpp messagepropertydialog.cpp \

2
ktnef/tests/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ LDADD = ../lib/libktnef.la $(LIB_TDECORE)
check_PROGRAMS = parsertest check_PROGRAMS = parsertest
TESTS = 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 parsertest_SOURCES = parsertest.cpp
METASOURCES = AUTO METASOURCES = AUTO

4
libemailfunctions/tests/Makefile.am
Unescape View File

@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_TDECORE)
check_PROGRAMS = testidmapper testemail check_PROGRAMS = testidmapper testemail
TESTS = 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 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 testemail_SOURCES = testemail.cpp
METASOURCES = AUTO METASOURCES = AUTO

4
libkcal/CMakeLists.txt
Unescape View File

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

8
libkcal/Makefile.am
Unescape View File

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

4
libkcal/calendarresources.cpp
Unescape View File

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

2
libkcal/calendarresources.h
Unescape View File

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

2
libkcal/resourcecached.cpp
Unescape View File

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

6
libkcal/resourcecalendar.h
Unescape View File

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

2
libkcal/resourcelocal.cpp
Unescape View File

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

4
libkcal/resourcelocalconfig.h
Unescape View File

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

2
libkcal/resourcelocaldir.cpp
Unescape View File

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

4
libkcal/resourcelocaldirconfig.h
Unescape View File

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

28
libkcal/tests/Makefile.am
Unescape View File

@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \
METASOURCES = AUTO METASOURCES = AUTO
testincidence_SOURCES = testincidence.cpp 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 testincidence_LDADD = ../libkcal.la
testcalendar_SOURCES = testcalendar.cpp 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 testcalendar_LDADD = ../libkcal.la
testtostring_SOURCES = testtostring.cpp 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 testtostring_LDADD = ../libkcal.la
fbrecurring_SOURCES = fbrecurring.cpp 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 fbrecurring_LDADD = ../libkcal.la
readandwrite_SOURCES = readandwrite.cpp 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 readandwrite_LDADD = ../libkcal.la
testresource_SOURCES = testresource.cpp 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 testresource_LDADD = ../libkcal.la
testrecurrence_SOURCES = testrecurrence.cpp 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 testrecurrence_LDADD = ../libkcal.la
testrecurprevious_SOURCES = testrecurprevious.cpp 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 testrecurprevious_LDADD = ../libkcal.la
testrecurson_SOURCES = testrecurson.cpp 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 testrecurson_LDADD = ../libkcal.la
testrecurrencetype_SOURCES = testrecurrencetype.cpp 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 testrecurrencetype_LDADD = ../libkcal.la
testvcalexport_SOURCES = testvcalexport.cpp 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 testvcalexport_LDADD = ../libkcal.la
testfields_SOURCES = testfields.cpp 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_LDADD = ../libkcal.la
testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"' testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"'
testfb_SOURCES = testfb.cpp 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 testfb_LDADD = ../libkcal.la
testcalselectdialog_SOURCES = testcalselectdialog.cpp 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 testcalselectdialog_LDADD = ../libkcal.la
TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics

4
libkcal/tests/testresource.cpp
Unescape View File

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

2
libkpimidentities/identity.cpp
Unescape View File

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

4
libtdepim/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ tde_import( ktnef )
add_subdirectory( icons ) add_subdirectory( icons )
add_subdirectory( pics ) add_subdirectory( pics )
add_subdirectory( kpartsdesignerplugin ) add_subdirectory( tdepartsdesignerplugin )
add_subdirectory( about ) add_subdirectory( about )
include_directories( include_directories(
@ -98,7 +98,7 @@ tde_add_library( tdepim SHARED AUTOMOC
csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp
sendsmsdialog.cpp kmailcompletion.cpp sendsmsdialog.cpp kmailcompletion.cpp
VERSION 1.0.0 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} DESTINATION ${LIB_INSTALL_DIR}
) )

2
libtdepim/Makefile.am
Unescape View File

@ -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) INCLUDES = -I$(top_srcdir) $(all_includes)

2
libtdepim/addresseeview.h
Unescape View File

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

2
libtdepim/addressesdialog.cpp
Unescape View File

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

4
libtdepim/cfgc/Makefile.am
Unescape View File

@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example check_PROGRAMS = example
#autoexample #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_LDADD = ../libtdepim.la $(LIB_TDECORE)
example_SOURCES = example.cpp exampleprefs_base.kcfgc 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_LDADD = ../libtdepim.la $(LIB_TDECORE)
#autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp #autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp

2
libtdepim/completionordereditor.cpp
Unescape View File

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

2
libtdepim/csshelper.cpp
Unescape View File

@ -591,7 +591,7 @@ namespace KPIM {
"}\n\n" "}\n\n"
"div.fancy.header table {\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" " text-align: left ! important\n"
"}\n\n" "}\n\n"

8
libtdepim/embeddedurlpage.cpp
Unescape View File

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

2
libtdepim/infoextension.cpp
Unescape View File

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

2
libtdepim/kabcresourcecached.cpp
Unescape View File

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

2
libtdepim/kaddrbook.cpp
Unescape View File

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

2
libtdepim/komposer/core/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ lib_LTLIBRARIES = libkomposer.la
libkomposer_la_SOURCES = plugin.cpp editor.cpp core.cpp attachment.cpp corewidget.cpp \ libkomposer_la_SOURCES = plugin.cpp editor.cpp core.cpp attachment.cpp corewidget.cpp \
settings.kcfgc pluginmanager.cpp komposerIface.skel settings.kcfgc pluginmanager.cpp komposerIface.skel
libkomposer_la_LDFLAGS = -no-undefined $(KDE_RPATH) -version-info 1:0:0 $(all_libraries) 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 #kde_module_LTLIBRARIES = kcm_komposer.la

2
libtdepim/komposer/core/pluginmanager.cpp
Unescape View File

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

6
libtdepim/komposer/core/tests/Makefile.am
Unescape View File

@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer
METASOURCES = AUTO METASOURCES = AUTO
testfactory_SOURCES = main.cpp managertest.cpp 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 testfactory_LDADD = ../libkomposer.la
testmanager_SOURCES = testmanager.cpp 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 testmanager_LDADD = ../libkomposer.la
testkomposer_SOURCES = testkomposer.cpp 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 testkomposer_LDADD = ../libkomposer.la
check: testfactory check: testfactory

2
libtdepim/komposer/test/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes) AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes)
LDADD = $(LIB_KPARTS) ../core/libkomposer.la 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 check_PROGRAMS = test

8
libtdepim/kpartsdesignerplugin/Makefile.am
Unescape View File

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

2
libtdepim/kscoringeditor.cpp
Unescape View File

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

2
libtdepim/sidebarextension.cpp
Unescape View File

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

8
libtdepim/kpartsdesignerplugin/CMakeLists.txt → libtdepim/tdepartsdesignerplugin/CMakeLists.txt
Unescape View File

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

8
libtdepim/tdepartsdesignerplugin/Makefile.am
Unescape View File

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

2
libtdepim/kpartsdesignerplugin/README → libtdepim/tdepartsdesignerplugin/README
Unescape View File

@ -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. that it's possible to add an accessor for m_part there.

8
libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp → libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
Unescape View File

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

0
libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h → libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h
Unescape View File

4
libtdepim/tests/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes) 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) LDADD = ../libtdepim.la $(LIB_TDECORE)
check_PROGRAMS = testwizard testaddresseelineedit \ check_PROGRAMS = testwizard testaddresseelineedit \
@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
METASOURCES = AUTO 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_LDADD = ../libtdepim.la $(LIB_TDECORE)
#example_SOURCES = example.cpp exampleprefs_base.kcfgc #example_SOURCES = example.cpp exampleprefs_base.kcfgc

2
libtdepim/tests/testdistrlist.cpp
Unescape View File

@ -42,7 +42,7 @@ using KPIM::DistributionList;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// Use another directory than the real one, just to keep things clean // 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( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testdistrlist" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

2
plugins/kmail/bodypartformatter/text_calendar.cpp
Unescape View File

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

4
plugins/kmail/bodypartformatter/text_vcard.cpp
Unescape View File

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

4
plugins/kmail/bodypartformatter/text_xdiff.cpp
Unescape View File

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

2
kresources/CMakeLists.txt → tderesources/CMakeLists.txt
Unescape View File

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

0
kresources/Makefile.am → tderesources/Makefile.am
Unescape View File

2
kresources/birthdays/CMakeLists.txt → tderesources/birthdays/CMakeLists.txt
Unescape View File

@ -33,7 +33,7 @@ install( FILES
##### other data ################################ ##### 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) ####################### ##### kcal_kabc (module) #######################

2
kresources/birthdays/Makefile.am → tderesources/birthdays/Makefile.am
Unescape View File

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

0
kresources/birthdays/kabc.desktop → tderesources/birthdays/kabc.desktop
Unescape View File

2
kresources/birthdays/resourcekabc.cpp → tderesources/birthdays/resourcekabc.cpp
Unescape View File

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

0
kresources/birthdays/resourcekabc.h → tderesources/birthdays/resourcekabc.h
Unescape View File

0
kresources/birthdays/resourcekabcconfig.cpp → tderesources/birthdays/resourcekabcconfig.cpp
Unescape View File

4
kresources/birthdays/resourcekabcconfig.h → tderesources/birthdays/resourcekabcconfig.h
Unescape View File

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

0
kresources/blogging/API_Blog.cpp → tderesources/blogging/API_Blog.cpp
Unescape View File

0
kresources/blogging/API_Blog.h → tderesources/blogging/API_Blog.h
Unescape View File

0
kresources/blogging/API_Blogger.cpp → tderesources/blogging/API_Blogger.cpp
Unescape View File

0
kresources/blogging/API_Blogger.h → tderesources/blogging/API_Blogger.h
Unescape View File

6
kresources/blogging/Makefile.am → tderesources/blogging/Makefile.am
Unescape View File

@ -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 lib_LTLIBRARIES = libkcal_blogging.la
kde_module_LTLIBRARIES = kcal_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_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
kcal_blogging_la_LIBADD = libkcal_blogging.la kcal_blogging_la_LIBADD = libkcal_blogging.la
kcal_servicedir = $(kde_servicesdir)/kresources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = blogging.desktop kcal_service_DATA = blogging.desktop
METASOURCES = AUTO METASOURCES = AUTO
@ -26,4 +26,4 @@ METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kres_blogging.pot $(XGETTEXT) *.cpp -o $(podir)/kres_blogging.pot
kcal_resourceblogging.lo: ../lib/kresources_groupwareprefs.h kcal_resourceblogging.lo: ../lib/tderesources_groupwareprefs.h

0
kresources/blogging/blogging.desktop → tderesources/blogging/blogging.desktop
Unescape View File

0
kresources/blogging/bloggingcalendaradaptor.cpp → tderesources/blogging/bloggingcalendaradaptor.cpp
Unescape View File

0
kresources/blogging/bloggingcalendaradaptor.h → tderesources/blogging/bloggingcalendaradaptor.h
Unescape View File

0
kresources/blogging/bloggingglobals.cpp → tderesources/blogging/bloggingglobals.cpp
Unescape View File

0
kresources/blogging/bloggingglobals.h → tderesources/blogging/bloggingglobals.h
Unescape View File

2
kresources/blogging/kcal_resourceblogging.cpp → tderesources/blogging/kcal_resourceblogging.cpp
Unescape View File

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

0
kresources/blogging/kcal_resourceblogging.h → tderesources/blogging/kcal_resourceblogging.h
Unescape View File

0
kresources/blogging/kcal_resourceblogging_plugin.cpp → tderesources/blogging/kcal_resourceblogging_plugin.cpp
Unescape View File

0
kresources/blogging/kcal_resourcebloggingconfig.cpp → tderesources/blogging/kcal_resourcebloggingconfig.cpp
Unescape View File

0
kresources/blogging/kcal_resourcebloggingconfig.h → tderesources/blogging/kcal_resourcebloggingconfig.h
Unescape View File

0
kresources/blogging/resourcebloggingsettings.ui → tderesources/blogging/resourcebloggingsettings.ui
Unescape View File

0
kresources/blogging/xmlrpcjob.cpp → tderesources/blogging/xmlrpcjob.cpp
Unescape View File

0
kresources/blogging/xmlrpcjob.h → tderesources/blogging/xmlrpcjob.h
Unescape View File

2
kresources/caldav/CMakeLists.txt → tderesources/caldav/CMakeLists.txt
Unescape View File

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

0
kresources/caldav/ConfigureChecks.cmake → tderesources/caldav/ConfigureChecks.cmake
Unescape View File

2
kresources/caldav/Makefile.am → tderesources/caldav/Makefile.am
Unescape View File

@ -25,7 +25,7 @@ kcal_caldav_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_caldav_la_LIBADD = libkcal_caldav.la kcal_caldav_la_LIBADD = libkcal_caldav.la
kcal_caldav_la_COMPILE_FIRST = prefsskel.h 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 kcal_service_DATA = kcal_caldav.desktop
METASOURCES = AUTO METASOURCES = AUTO

0
kresources/caldav/config.cpp → tderesources/caldav/config.cpp
Unescape View File

2
kresources/caldav/config.h → tderesources/caldav/config.h
Unescape View File

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

0
kresources/caldav/configwidgets.cpp → tderesources/caldav/configwidgets.cpp
Unescape View File

0
kresources/caldav/configwidgets.h → tderesources/caldav/configwidgets.h
Unescape View File

2
kresources/carddav/export.h → tderesources/caldav/export.h
Unescape View File

@ -33,7 +33,7 @@
#ifndef KRESOURCES_TDEPIM_EXPORT_H #ifndef KRESOURCES_TDEPIM_EXPORT_H
#define 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. * @a resourceconfigclass config class and @a catalog catalog.
*/ */
#define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \ #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \

0
kresources/caldav/job.cpp → tderesources/caldav/job.cpp
Unescape View File

0
kresources/caldav/job.h → tderesources/caldav/job.h
Unescape View File

0
kresources/caldav/kcal_caldav.desktop → tderesources/caldav/kcal_caldav.desktop
Unescape View File

0
kresources/caldav/plugin.cpp → tderesources/caldav/plugin.cpp
Unescape View File

2
kresources/caldav/preferences.cpp → tderesources/caldav/preferences.cpp
Unescape View File

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

2
kresources/caldav/preferences.h → tderesources/caldav/preferences.h
Unescape View File

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

2
kresources/caldav/prefsskel.kcfg → tderesources/caldav/prefsskel.kcfg
Unescape View File

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

0
kresources/caldav/prefsskel.kcfgc → tderesources/caldav/prefsskel.kcfgc
Unescape View File

0
kresources/caldav/reader.cpp → tderesources/caldav/reader.cpp
Unescape View File

0
kresources/caldav/reader.h → tderesources/caldav/reader.h
Unescape View File

0
kresources/caldav/resource.cpp → tderesources/caldav/resource.cpp
Unescape View File

0
kresources/caldav/resource.h → tderesources/caldav/resource.h
Unescape View File

0
kresources/caldav/uninstall.desktop → tderesources/caldav/uninstall.desktop
Unescape View File

0
kresources/caldav/writer.cpp → tderesources/caldav/writer.cpp
Unescape View File

0
kresources/caldav/writer.h → tderesources/caldav/writer.h
Unescape View File

2
kresources/carddav/CMakeLists.txt → tderesources/carddav/CMakeLists.txt
Unescape View File

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

0
kresources/carddav/ConfigureChecks.cmake → tderesources/carddav/ConfigureChecks.cmake
Unescape View File

2
kresources/carddav/Makefile.am → tderesources/carddav/Makefile.am
Unescape View File

@ -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_LIBADD = libkabc_carddav.la
kabc_carddav_la_COMPILE_FIRST = prefsskel.h 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 kabc_service_DATA = kabc_carddav.desktop
METASOURCES = AUTO METASOURCES = AUTO

0
kresources/carddav/config.cpp → tderesources/carddav/config.cpp
Unescape View File

2
kresources/carddav/config.h → tderesources/carddav/config.h
Unescape View File

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

0
kresources/carddav/configwidgets.cpp → tderesources/carddav/configwidgets.cpp
Unescape View File

0
kresources/carddav/configwidgets.h → tderesources/carddav/configwidgets.h
Unescape View File

2
kresources/caldav/export.h → tderesources/carddav/export.h
Unescape View File

@ -33,7 +33,7 @@
#ifndef KRESOURCES_TDEPIM_EXPORT_H #ifndef KRESOURCES_TDEPIM_EXPORT_H
#define 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. * @a resourceconfigclass config class and @a catalog catalog.
*/ */
#define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \ #define EXPORT_KRESOURCES_PLUGIN( resourceclass, resourceconfigclass, catalog ) \

0
kresources/carddav/job.cpp → tderesources/carddav/job.cpp
Unescape View File

0
kresources/carddav/job.h → tderesources/carddav/job.h
Unescape View File

0
kresources/carddav/kabc_carddav.desktop → tderesources/carddav/kabc_carddav.desktop
Unescape View File

0
kresources/carddav/plugin.cpp → tderesources/carddav/plugin.cpp
Unescape View File

2
kresources/carddav/preferences.cpp → tderesources/carddav/preferences.cpp
Unescape View File

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

2
kresources/carddav/preferences.h → tderesources/carddav/preferences.h
Unescape View File

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

2
kresources/carddav/prefsskel.kcfg → tderesources/carddav/prefsskel.kcfg
Unescape View File

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

0
kresources/carddav/prefsskel.kcfgc → tderesources/carddav/prefsskel.kcfgc
Unescape View File

0
kresources/carddav/reader.cpp → tderesources/carddav/reader.cpp
Unescape View File

0
kresources/carddav/reader.h → tderesources/carddav/reader.h
Unescape View File

0
kresources/carddav/resource.cpp → tderesources/carddav/resource.cpp
Unescape View File

0
kresources/carddav/resource.h → tderesources/carddav/resource.h
Unescape View File

0
kresources/carddav/uninstall.desktop → tderesources/carddav/uninstall.desktop
Unescape View File

0
kresources/carddav/writer.cpp → tderesources/carddav/writer.cpp
Unescape View File

0
kresources/carddav/writer.h → tderesources/carddav/writer.h
Unescape View File

6
kresources/egroupware/CMakeLists.txt → tderesources/egroupware/CMakeLists.txt
Unescape View File

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

8
kresources/egroupware/Makefile.am → tderesources/egroupware/Makefile.am
Unescape View File

@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/kaddressbook \ -I$(top_builddir)/kaddressbook \
-I$(top_builddir)/kaddressbook/common \ -I$(top_builddir)/kaddressbook/common \
-I$(top_srcdir)/kaddressbook/common \ -I$(top_srcdir)/kaddressbook/common \
-I$(top_builddir)/kresources/egroupware \ -I$(top_builddir)/tderesources/egroupware \
$(all_includes) $(all_includes)
noinst_HEADERS = kabc_resourcexmlrpcconfig.h kcal_resourcexmlrpcconfig.h \ 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_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
knotes_xmlrpc_la_LIBADD = libknotes_xmlrpc.la 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 kabc_service_DATA = kabc_xmlrpc.desktop
kcal_servicedir = $(kde_servicesdir)/kresources/kcal kcal_servicedir = $(kde_servicesdir)/tderesources/kcal
kcal_service_DATA = kcal_xmlrpc.desktop kcal_service_DATA = kcal_xmlrpc.desktop
knotes_servicedir = $(kde_servicesdir)/kresources/knotes knotes_servicedir = $(kde_servicesdir)/tderesources/knotes
knotes_service_DATA = knotes_xmlrpc.desktop knotes_service_DATA = knotes_xmlrpc.desktop
METASOURCES = AUTO METASOURCES = AUTO

0
kresources/egroupware/access.h → tderesources/egroupware/access.h
Unescape View File

0
kresources/egroupware/debugdialog.cpp → tderesources/egroupware/debugdialog.cpp
Unescape View File

0
kresources/egroupware/debugdialog.h → tderesources/egroupware/debugdialog.h
Unescape View File

2
kresources/egroupware/kabc_egroupwareprefs.kcfgc → tderesources/egroupware/kabc_egroupwareprefs.kcfgc
Unescape View File

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

0
kresources/egroupware/kabc_resourcexmlrpc.cpp → tderesources/egroupware/kabc_resourcexmlrpc.cpp
Unescape View File

0
kresources/egroupware/kabc_resourcexmlrpc.h → tderesources/egroupware/kabc_resourcexmlrpc.h
Unescape View File

0
kresources/egroupware/kabc_resourcexmlrpcconfig.cpp → tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp
Unescape View File

2
kresources/egroupware/kabc_resourcexmlrpcconfig.h → tderesources/egroupware/kabc_resourcexmlrpcconfig.h
Unescape View File

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

0
kresources/egroupware/kabc_resourcexmlrpcplugin.cpp → tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp
Unescape View File

0
kresources/egroupware/kabc_xmlrpc.desktop → tderesources/egroupware/kabc_xmlrpc.desktop
Unescape View File

2
kresources/egroupware/kcal_egroupwareprefs.kcfgc → tderesources/egroupware/kcal_egroupwareprefs.kcfgc
Unescape View File

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

2
kresources/egroupware/kcal_resourcexmlrpc.cpp → tderesources/egroupware/kcal_resourcexmlrpc.cpp
Unescape View File

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

0
kresources/egroupware/kcal_resourcexmlrpc.h → tderesources/egroupware/kcal_resourcexmlrpc.h
Unescape View File

0
kresources/egroupware/kcal_resourcexmlrpcconfig.cpp → tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp
Unescape View File

2
kresources/egroupware/kcal_resourcexmlrpcconfig.h → tderesources/egroupware/kcal_resourcexmlrpcconfig.h
Unescape View File

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

0
kresources/egroupware/kcal_resourcexmlrpcplugin.cpp → tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp
Unescape View File

0
kresources/egroupware/kcal_xmlrpc.desktop → tderesources/egroupware/kcal_xmlrpc.desktop
Unescape View File

2
kresources/egroupware/knotes_egroupwareprefs.kcfgc → tderesources/egroupware/knotes_egroupwareprefs.kcfgc
Unescape View File

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

0
kresources/egroupware/knotes_resourcexmlrpc.cpp → tderesources/egroupware/knotes_resourcexmlrpc.cpp
Unescape View File

0
kresources/egroupware/knotes_resourcexmlrpc.h → tderesources/egroupware/knotes_resourcexmlrpc.h
Unescape View File

0
kresources/egroupware/knotes_resourcexmlrpcconfig.cpp → tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp
Unescape View File

2
kresources/egroupware/knotes_resourcexmlrpcconfig.h → tderesources/egroupware/knotes_resourcexmlrpcconfig.h
Unescape View File

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

0
kresources/egroupware/knotes_resourcexmlrpcplugin.cpp → tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp
Unescape View File

0
kresources/egroupware/knotes_xmlrpc.desktop → tderesources/egroupware/knotes_xmlrpc.desktop
Unescape View File

0
kresources/egroupware/synchronizer.cpp → tderesources/egroupware/synchronizer.cpp
Unescape View File

0
kresources/egroupware/synchronizer.h → tderesources/egroupware/synchronizer.h
Unescape View File

2
kresources/egroupware/kresources_kabc_egroupware.kcfg → tderesources/egroupware/tderesources_kabc_egroupware.kcfg
Unescape View File

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

2
kresources/egroupware/kresources_kcal_egroupware.kcfg → tderesources/egroupware/tderesources_kcal_egroupware.kcfg
Unescape View File

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

2
kresources/egroupware/kresources_knotes_egroupware.kcfg → tderesources/egroupware/tderesources_knotes_egroupware.kcfg
Unescape View File

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

0
kresources/egroupware/todostatemapper.cpp → tderesources/egroupware/todostatemapper.cpp
Unescape View File

0
kresources/egroupware/todostatemapper.h → tderesources/egroupware/todostatemapper.h
Unescape View File

0
kresources/egroupware/xmlrpciface.cpp → tderesources/egroupware/xmlrpciface.cpp
Unescape View File

0
kresources/egroupware/xmlrpciface.h → tderesources/egroupware/xmlrpciface.h
Unescape View File

2
kresources/exchange/CMakeLists.txt → tderesources/exchange/CMakeLists.txt
Unescape View File

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

4
kresources/exchange/Makefile.am → tderesources/exchange/Makefile.am
Unescape View File

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

0
kresources/exchange/dateset.cpp → tderesources/exchange/dateset.cpp
Unescape View File

0
kresources/exchange/dateset.h → tderesources/exchange/dateset.h
Unescape View File

0
kresources/exchange/exchange.desktop → tderesources/exchange/exchange.desktop
Unescape View File

0
kresources/exchange/exchange_deprecated.desktop → tderesources/exchange/exchange_deprecated.desktop
Unescape View File

2
kresources/exchange/resourceexchange.cpp → tderesources/exchange/resourceexchange.cpp
Unescape View File

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

0
kresources/exchange/resourceexchange.h → tderesources/exchange/resourceexchange.h
Unescape View File

0
kresources/exchange/resourceexchangeconfig.cpp → tderesources/exchange/resourceexchangeconfig.cpp
Unescape View File

4
kresources/exchange/resourceexchangeconfig.h → tderesources/exchange/resourceexchangeconfig.h
Unescape View File

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

2
kresources/featureplan/CMakeLists.txt → tderesources/featureplan/CMakeLists.txt
Unescape View File

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

6
kresources/featureplan/Makefile.am → tderesources/featureplan/Makefile.am
Unescape View File

@ -23,17 +23,17 @@ kcal_resourcefeatureplan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kcal_resourcefeatureplan_la_LIBADD = libkcal_resourcefeatureplan.la kcal_resourcefeatureplan_la_LIBADD = libkcal_resourcefeatureplan.la
kcal_resourcefeatureplan_la_COMPILE_FIRST = kde-features.h prefs.h 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 kcal_service_DATA = kcal_resourcefeatureplan.desktop
check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist 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_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
dumpfeaturelist_SOURCES = dumpfeaturelist.cpp dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
dumpfeaturelist_COMPILE_FIRST = kde-features.h 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_LDADD = libfeatureplancommon.la $(LIB_TDECORE)
benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
benchmarkfeaturelist_COMPILE_FIRST = kde-features.h benchmarkfeaturelist_COMPILE_FIRST = kde-features.h

0
kresources/featureplan/benchmarkfeaturelist.cpp → tderesources/featureplan/benchmarkfeaturelist.cpp
Unescape View File

0
kresources/featureplan/dumpfeaturelist.cpp → tderesources/featureplan/dumpfeaturelist.cpp
Unescape View File

2
kresources/featureplan/kcal_resourcefeatureplan.cpp → tderesources/featureplan/kcal_resourcefeatureplan.cpp
Unescape View File

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

0
kresources/featureplan/kcal_resourcefeatureplan.desktop → tderesources/featureplan/kcal_resourcefeatureplan.desktop
Unescape View File

0
kresources/featureplan/kcal_resourcefeatureplan.h → tderesources/featureplan/kcal_resourcefeatureplan.h
Unescape View File

0
kresources/featureplan/kcal_resourcefeatureplanconfig.cpp → tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp
Unescape View File

2
kresources/featureplan/kcal_resourcefeatureplanconfig.h → tderesources/featureplan/kcal_resourcefeatureplanconfig.h
Unescape View File

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

0
kresources/featureplan/kcal_resourcefeatureplanplugin.cpp → tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp
Unescape View File

0
kresources/featureplan/kde-features.dtd → tderesources/featureplan/kde-features.dtd
Unescape View File

0
kresources/featureplan/kde-features.rng → tderesources/featureplan/kde-features.rng
Unescape View File

2
kresources/featureplan/prefs.kcfgc → tderesources/featureplan/prefs.kcfgc
Unescape View File

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

2
kresources/featureplan/kresources_kcal_featureplan.kcfg → tderesources/featureplan/tderesources_kcal_featureplan.kcfg
Unescape View File

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

8
kresources/groupdav/CMakeLists.txt → tderesources/groupdav/CMakeLists.txt
Unescape View File

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

16
kresources/groupdav/Makefile.am → tderesources/groupdav/Makefile.am
Unescape View File

@ -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) -I../lib $(all_includes)
lib_LTLIBRARIES = libkcal_groupdav.la libkabc_groupdav.la 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_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN)
kabc_groupdav_la_LIBADD = libkabc_groupdav.la 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 kcal_service_DATA = kcal_groupdav.desktop
kabc_servicedir = $(kde_servicesdir)/kresources/kabc kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_groupdav.desktop kabc_service_DATA = kabc_groupdav.desktop
METASOURCES = AUTO METASOURCES = AUTO
install-data-local: uninstall.desktop install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/kresources/kabc $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kabc
$(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/kresources/kcal $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kcal
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kresources/kabc/kabc_opengroupware.desktop $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kabc/kabc_opengroupware.desktop
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/kresources/kcal/kcal_opengroupware.desktop $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kres_groupdav.pot $(XGETTEXT) *.cpp -o $(podir)/kres_groupdav.pot
kabc_resourcegroupdav.lo: ../lib/kresources_groupwareprefs.h kabc_resourcegroupdav.lo: ../lib/tderesources_groupwareprefs.h

0
kresources/groupdav/groupdavaddressbookadaptor.cpp → tderesources/groupdav/groupdavaddressbookadaptor.cpp
Unescape View File

0
kresources/groupdav/groupdavaddressbookadaptor.h → tderesources/groupdav/groupdavaddressbookadaptor.h
Unescape View File

0
kresources/groupdav/groupdavcalendaradaptor.cpp → tderesources/groupdav/groupdavcalendaradaptor.cpp
Unescape View File

0
kresources/groupdav/groupdavcalendaradaptor.h → tderesources/groupdav/groupdavcalendaradaptor.h
Unescape View File

0
kresources/groupdav/groupdavglobals.cpp → tderesources/groupdav/groupdavglobals.cpp
Unescape View File

0
kresources/groupdav/groupdavglobals.h → tderesources/groupdav/groupdavglobals.h
Unescape View File

0
kresources/groupdav/kabc_groupdav.desktop → tderesources/groupdav/kabc_groupdav.desktop
Unescape View File

2
kresources/groupdav/kabc_resourcegroupdav.cpp → tderesources/groupdav/kabc_resourcegroupdav.cpp
Unescape View File

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

0
kresources/groupdav/kabc_resourcegroupdav.h → tderesources/groupdav/kabc_resourcegroupdav.h
Unescape View File

0
kresources/groupdav/kabc_resourcegroupdav_plugin.cpp → tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp
Unescape View File

0
kresources/groupdav/kcal_groupdav.desktop → tderesources/groupdav/kcal_groupdav.desktop
Unescape View File

0
kresources/groupdav/kcal_resourcegroupdav.cpp → tderesources/groupdav/kcal_resourcegroupdav.cpp
Unescape View File

0
kresources/groupdav/kcal_resourcegroupdav.h → tderesources/groupdav/kcal_resourcegroupdav.h
Unescape View File

0
kresources/groupdav/kcal_resourcegroupdav_plugin.cpp → tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp
Unescape View File

0
kresources/groupdav/uninstall.desktop → tderesources/groupdav/uninstall.desktop
Unescape View File

4
kresources/groupware/Makefile.am → tderesources/groupware/Makefile.am
Unescape View File

@ -30,10 +30,10 @@ kabc_groupware_la_SOURCES = kabc_resourcegroupware_plugin.cpp
kabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kabc_groupware_la_LIBADD = libkabc_groupware.la 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 kcal_service_DATA = kcal_groupware.desktop
kabc_servicedir = $(kde_servicesdir)/kresources/kabc kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_groupware.desktop kabc_service_DATA = kabc_groupware.desktop
METASOURCES = AUTO METASOURCES = AUTO

0
kresources/groupware/kabc_groupware.desktop → tderesources/groupware/kabc_groupware.desktop
Unescape View File

2
kresources/groupware/kabc_groupwareprefs.kcfgc → tderesources/groupware/kabc_groupwareprefs.kcfgc
Unescape View File

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

0
kresources/groupware/kabc_resourcegroupware.cpp → tderesources/groupware/kabc_resourcegroupware.cpp
Unescape View File

0
kresources/groupware/kabc_resourcegroupware.h → tderesources/groupware/kabc_resourcegroupware.h
Unescape View File

0
kresources/groupware/kabc_resourcegroupware_plugin.cpp → tderesources/groupware/kabc_resourcegroupware_plugin.cpp
Unescape View File

0
kresources/groupware/kabc_resourcegroupwareconfig.cpp → tderesources/groupware/kabc_resourcegroupwareconfig.cpp
Unescape View File

2
kresources/groupware/kabc_resourcegroupwareconfig.h → tderesources/groupware/kabc_resourcegroupwareconfig.h
Unescape View File

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

0
kresources/groupware/kcal_groupware.desktop → tderesources/groupware/kcal_groupware.desktop
Unescape View File

2
kresources/groupware/kcal_groupwareprefsbase.kcfgc → tderesources/groupware/kcal_groupwareprefsbase.kcfgc
Unescape View File

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

2
kresources/groupware/kcal_resourcegroupware.cpp → tderesources/groupware/kcal_resourcegroupware.cpp
Unescape View File

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

0
kresources/groupware/kcal_resourcegroupware.h → tderesources/groupware/kcal_resourcegroupware.h
Unescape View File

0
kresources/groupware/kcal_resourcegroupware_plugin.cpp → tderesources/groupware/kcal_resourcegroupware_plugin.cpp
Unescape View File

0
kresources/groupware/kcal_resourcegroupwareconfig.cpp → tderesources/groupware/kcal_resourcegroupwareconfig.cpp
Unescape View File

4
kresources/groupware/kcal_resourcegroupwareconfig.h → tderesources/groupware/kcal_resourcegroupwareconfig.h
Unescape View File

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

2
kresources/groupware/kresources_kabc_groupware.kcfg → tderesources/groupware/tderesources_kabc_groupware.kcfg
Unescape View File

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

2
kresources/groupware/kresources_kcal_groupware.kcfg → tderesources/groupware/tderesources_kcal_groupware.kcfg
Unescape View File

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

4
kresources/groupwise/CMakeLists.txt → tderesources/groupwise/CMakeLists.txt
Unescape View File

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

4
kresources/groupwise/Makefile.am → tderesources/groupwise/Makefile.am
Unescape View File

@ -34,10 +34,10 @@ kabc_groupwise_la_SOURCES = kabc_resourcegroupwise_plugin.cpp
kabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kabc_groupwise_la_LIBADD = libkabc_groupwise.la 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 kcal_service_DATA = kcal_groupwise.desktop
kabc_servicedir = $(kde_servicesdir)/kresources/kabc kabc_servicedir = $(kde_servicesdir)/tderesources/kabc
kabc_service_DATA = kabc_groupwise.desktop kabc_service_DATA = kabc_groupwise.desktop
METASOURCES = AUTO METASOURCES = AUTO

0
kresources/groupwise/TODO → tderesources/groupwise/TODO
Unescape View File

0
kresources/groupwise/groupwisesettingswidget.cpp → tderesources/groupwise/groupwisesettingswidget.cpp
Unescape View File

0
kresources/groupwise/groupwisesettingswidget.h → tderesources/groupwise/groupwisesettingswidget.h
Unescape View File

0
kresources/groupwise/groupwisesettingswidgetbase.ui → tderesources/groupwise/groupwisesettingswidgetbase.ui
Unescape View File

0
kresources/groupwise/kabc_groupwise.desktop → tderesources/groupwise/kabc_groupwise.desktop
Unescape View File

2
kresources/groupwise/kabc_groupwiseprefs.kcfgc → tderesources/groupwise/kabc_groupwiseprefs.kcfgc
Unescape View File

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

0
kresources/groupwise/kabc_resourcegroupwise.cpp → tderesources/groupwise/kabc_resourcegroupwise.cpp
Unescape View File

0
kresources/groupwise/kabc_resourcegroupwise.h → tderesources/groupwise/kabc_resourcegroupwise.h
Unescape View File

0
kresources/groupwise/kabc_resourcegroupwise_plugin.cpp → tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp
Unescape View File

0
kresources/groupwise/kabc_resourcegroupwiseconfig.cpp → tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp
Unescape View File

2
kresources/groupwise/kabc_resourcegroupwiseconfig.h → tderesources/groupwise/kabc_resourcegroupwiseconfig.h
Unescape View File

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

0
kresources/groupwise/kcal_groupwise.desktop → tderesources/groupwise/kcal_groupwise.desktop
Unescape View File

0
kresources/groupwise/kcal_groupwiseprefs.cpp → tderesources/groupwise/kcal_groupwiseprefs.cpp
Unescape View File

0
kresources/groupwise/kcal_groupwiseprefs.h → tderesources/groupwise/kcal_groupwiseprefs.h
Unescape View File

2
kresources/groupwise/kcal_groupwiseprefsbase.kcfgc → tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc
Unescape View File

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

2
kresources/groupwise/kcal_resourcegroupwise.cpp → tderesources/groupwise/kcal_resourcegroupwise.cpp
Unescape View File

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

0
kresources/groupwise/kcal_resourcegroupwise.h → tderesources/groupwise/kcal_resourcegroupwise.h
Unescape View File

0
kresources/groupwise/kcal_resourcegroupwise_plugin.cpp → tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp
Unescape View File

0
kresources/groupwise/kcal_resourcegroupwiseconfig.cpp → tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
Unescape View File

4
kresources/groupwise/kcal_resourcegroupwiseconfig.h → tderesources/groupwise/kcal_resourcegroupwiseconfig.h
Unescape View File

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

0
kresources/groupwise/kioslave/CMakeLists.txt → tderesources/groupwise/kioslave/CMakeLists.txt
Unescape View File

2
kresources/groupwise/kioslave/Makefile.am → tderesources/groupwise/kioslave/Makefile.am
Unescape View File

@ -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) -I$(top_builddir)/libtdepim $(all_includes)
noinst_HEADERS = groupwise.h noinst_HEADERS = groupwise.h

0
kresources/groupwise/kioslave/groupwise.cpp → tderesources/groupwise/kioslave/groupwise.cpp
Unescape View File

0
kresources/groupwise/kioslave/groupwise.h → tderesources/groupwise/kioslave/groupwise.h
Unescape View File

0
kresources/groupwise/kioslave/groupwise.protocol → tderesources/groupwise/kioslave/groupwise.protocol
Unescape View File

0
kresources/groupwise/kioslave/groupwises.protocol → tderesources/groupwise/kioslave/groupwises.protocol
Unescape View File

0
kresources/groupwise/soap/CMakeLists.txt → tderesources/groupwise/soap/CMakeLists.txt
Unescape View File

0
kresources/groupwise/soap/GroupWiseBinding.nsmap → tderesources/groupwise/soap/GroupWiseBinding.nsmap
Unescape View File

4
kresources/groupwise/soap/Makefile.am → tderesources/groupwise/soap/Makefile.am
Unescape View File

@ -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 #AM_CPPFLAGS = -DDEBUG
KDE_CXXFLAGS = -Wno-non-virtual-dtor KDE_CXXFLAGS = -Wno-non-virtual-dtor
check_PROGRAMS = soapdebug 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 \ soapdebug_LDADD = libgwsoap.la -ltdecore \
$(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libtdepim/libtdepim.la

0
kresources/groupwise/soap/README → tderesources/groupwise/soap/README
Unescape View File

0
kresources/groupwise/soap/contactconverter.cpp → tderesources/groupwise/soap/contactconverter.cpp
Unescape View File

0
kresources/groupwise/soap/contactconverter.h → tderesources/groupwise/soap/contactconverter.h
Unescape View File

0
kresources/groupwise/soap/events.xsd → tderesources/groupwise/soap/events.xsd
Unescape View File

0
kresources/groupwise/soap/extractxml.pl → tderesources/groupwise/soap/extractxml.pl
Unescape View File

0
kresources/groupwise/soap/fixup_groupwise.h.pl → tderesources/groupwise/soap/fixup_groupwise.h.pl
Unescape View File

0
kresources/groupwise/soap/groupwise.wsdl → tderesources/groupwise/soap/groupwise.wsdl
Unescape View File

0
kresources/groupwise/soap/groupwiseserver.cpp → tderesources/groupwise/soap/groupwiseserver.cpp
Unescape View File

0
kresources/groupwise/soap/groupwiseserver.h → tderesources/groupwise/soap/groupwiseserver.h
Unescape View File

0
kresources/groupwise/soap/gwconverter.cpp → tderesources/groupwise/soap/gwconverter.cpp
Unescape View File

0
kresources/groupwise/soap/gwconverter.h → tderesources/groupwise/soap/gwconverter.h
Unescape View File

0
kresources/groupwise/soap/gwjobs.cpp → tderesources/groupwise/soap/gwjobs.cpp
Unescape View File

0
kresources/groupwise/soap/gwjobs.h → tderesources/groupwise/soap/gwjobs.h
Unescape View File

0
kresources/groupwise/soap/incidenceconverter.cpp → tderesources/groupwise/soap/incidenceconverter.cpp
Unescape View File

0
kresources/groupwise/soap/incidenceconverter.h → tderesources/groupwise/soap/incidenceconverter.h
Unescape View File

0
kresources/groupwise/soap/ksslsocket.cpp → tderesources/groupwise/soap/ksslsocket.cpp
Unescape View File

0
kresources/groupwise/soap/ksslsocket.h → tderesources/groupwise/soap/ksslsocket.h
Unescape View File

0
kresources/groupwise/soap/methods.xsd → tderesources/groupwise/soap/methods.xsd
Unescape View File

2
kresources/groupwise/soap/patches/README → tderesources/groupwise/soap/patches/README
Unescape View File

@ -28,5 +28,5 @@ type_typo.diff
socklen.diff: socklen.diff:
Adriaan de Groot <groot@kde.org>: The attached patch is needed for me to get 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). socklen_t type mixups (that are only serious on 64-bitters).

0
kresources/groupwise/soap/patches/broken_namespace.diff → tderesources/groupwise/soap/patches/broken_namespace.diff
Unescape View File

2
kresources/groupwise/soap/patches/socklen.diff → tderesources/groupwise/soap/patches/socklen.diff
Unescape View File

@ -1,6 +1,6 @@
Index: soap/stdsoap2.cpp 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 retrieving revision 1.3
diff -u -3 -p -r1.3 stdsoap2.cpp diff -u -3 -p -r1.3 stdsoap2.cpp
--- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3 --- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3

2
kresources/groupwise/soap/patches/type_typo.diff → tderesources/groupwise/soap/patches/type_typo.diff
Unescape View File

@ -1,6 +1,6 @@
Index: soap/soapC.cpp 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 retrieving revision 1.4.2.3
diff -u -3 -p -r1.4.2.3 soapC.cpp diff -u -3 -p -r1.4.2.3 soapC.cpp
--- soap/soapC.cpp 25 Oct 2004 13:58:20 -0000 1.4.2.3 --- soap/soapC.cpp 25 Oct 2004 13:58:20 -0000 1.4.2.3

4
kresources/groupwise/soap/patches/utf8_entities.diff → tderesources/groupwise/soap/patches/utf8_entities.diff
Unescape View File

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

0
kresources/groupwise/soap/soapC.cpp → tderesources/groupwise/soap/soapC.cpp
Unescape View File

0
kresources/groupwise/soap/soapClient.cpp → tderesources/groupwise/soap/soapClient.cpp
Unescape View File

0
kresources/groupwise/soap/soapGroupWiseBindingProxy.h → tderesources/groupwise/soap/soapGroupWiseBindingProxy.h
Unescape View File

0
kresources/groupwise/soap/soapH.h → tderesources/groupwise/soap/soapH.h
Unescape View File

0
kresources/groupwise/soap/soapStub.h → tderesources/groupwise/soap/soapStub.h
Unescape View File

0
kresources/groupwise/soap/soapdebug.cpp → tderesources/groupwise/soap/soapdebug.cpp
Unescape View File

0
kresources/groupwise/soap/stdsoap2.cpp → tderesources/groupwise/soap/stdsoap2.cpp
Unescape View File

0
kresources/groupwise/soap/stdsoap2.h → tderesources/groupwise/soap/stdsoap2.h
Unescape View File

0
kresources/groupwise/soap/stl.h → tderesources/groupwise/soap/stl.h
Unescape View File

0
kresources/groupwise/soap/stldeque.h → tderesources/groupwise/soap/stldeque.h
Unescape View File

0
kresources/groupwise/soap/stllist.h → tderesources/groupwise/soap/stllist.h
Unescape View File

0
kresources/groupwise/soap/stlset.h → tderesources/groupwise/soap/stlset.h
Unescape View File

0
kresources/groupwise/soap/stlvector.h → tderesources/groupwise/soap/stlvector.h
Unescape View File

0
kresources/groupwise/soap/typemap.dat → tderesources/groupwise/soap/typemap.dat
Unescape View File

0
kresources/groupwise/soap/types.xsd → tderesources/groupwise/soap/types.xsd
Unescape View File

2
kresources/groupwise/kresources_kabc_groupwise.kcfg → tderesources/groupwise/tderesources_kabc_groupwise.kcfg
Unescape View File

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

2
kresources/groupwise/kresources_kcal_groupwise.kcfg → tderesources/groupwise/tderesources_kcal_groupwise.kcfg
Unescape View File

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

0
kresources/kolab/CMakeLists.txt → tderesources/kolab/CMakeLists.txt
Unescape View File

0
kresources/kolab/Makefile.am → tderesources/kolab/Makefile.am
Unescape View File

4
kresources/kolab/kabc/CMakeLists.txt → tderesources/kolab/kabc/CMakeLists.txt
Unescape View File

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

8
kresources/kolab/kabc/Makefile.am → tderesources/kolab/kabc/Makefile.am
Unescape View File

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

0
kresources/kolab/kabc/contact.cpp → tderesources/kolab/kabc/contact.cpp
Unescape View File

0
kresources/kolab/kabc/contact.h → tderesources/kolab/kabc/contact.h
Unescape View File

0
kresources/kolab/kabc/kolab.desktop → tderesources/kolab/kabc/kolab.desktop
Unescape View File

0
kresources/kolab/kabc/resourcekolab.cpp → tderesources/kolab/kabc/resourcekolab.cpp
Unescape View File

0
kresources/kolab/kabc/resourcekolab.h → tderesources/kolab/kabc/resourcekolab.h
Unescape View File

0
kresources/kolab/kabc/resourcekolab_plugin.cpp → tderesources/kolab/kabc/resourcekolab_plugin.cpp
Unescape View File

4
kresources/kolab/kcal/CMakeLists.txt → tderesources/kolab/kcal/CMakeLists.txt
Unescape View File

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

8
kresources/kolab/kcal/Makefile.am → tderesources/kolab/kcal/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
METASOURCES = AUTO 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) -I$(top_builddir)/libtdepim $(all_includes)
# The kolab wizard links to this library too # 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_SOURCES = incidence.cpp event.cpp task.cpp journal.cpp resourcekolab.cpp
libkcalkolab_la_LDFLAGS = $(all_libraries) -no-undefined libkcalkolab_la_LDFLAGS = $(all_libraries) -no-undefined
libkcalkolab_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ libkcalkolab_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \ $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
-lkresources -ltderesources
kde_module_LTLIBRARIES = kcal_kolab.la 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_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
kcal_kolab_la_LIBADD = libkcalkolab.la kcal_kolab_la_LIBADD = libkcalkolab.la
servicedir = $(kde_servicesdir)/kresources/kcal servicedir = $(kde_servicesdir)/tderesources/kcal
service_DATA = kolab.desktop service_DATA = kolab.desktop
install-data-local: $(srcdir)/../uninstall.desktop install-data-local: $(srcdir)/../uninstall.desktop

0
kresources/kolab/kcal/event.cpp → tderesources/kolab/kcal/event.cpp
Unescape View File

0
kresources/kolab/kcal/event.h → tderesources/kolab/kcal/event.h
Unescape View File

0
kresources/kolab/kcal/incidence.cpp → tderesources/kolab/kcal/incidence.cpp
Unescape View File

0
kresources/kolab/kcal/incidence.h → tderesources/kolab/kcal/incidence.h
Unescape View File

0
kresources/kolab/kcal/journal.cpp → tderesources/kolab/kcal/journal.cpp
Unescape View File

0
kresources/kolab/kcal/journal.h → tderesources/kolab/kcal/journal.h
Unescape View File

0
kresources/kolab/kcal/kolab.desktop → tderesources/kolab/kcal/kolab.desktop
Unescape View File

0
kresources/kolab/kcal/resourcekolab.cpp → tderesources/kolab/kcal/resourcekolab.cpp
Unescape View File

0
kresources/kolab/kcal/resourcekolab.h → tderesources/kolab/kcal/resourcekolab.h
Unescape View File

0
kresources/kolab/kcal/resourcekolab_plugin.cpp → tderesources/kolab/kcal/resourcekolab_plugin.cpp
Unescape View File

0
kresources/kolab/kcal/task.cpp → tderesources/kolab/kcal/task.cpp
Unescape View File

0
kresources/kolab/kcal/task.h → tderesources/kolab/kcal/task.h
Unescape View File

4
kresources/kolab/knotes/CMakeLists.txt → tderesources/kolab/knotes/CMakeLists.txt
Unescape View File

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

8
kresources/kolab/knotes/Makefile.am → tderesources/kolab/knotes/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
METASOURCES = AUTO 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) -I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes)
# The kolab wizard links to this library too # 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_SOURCES = resourcekolab.cpp note.cpp
libknoteskolab_la_LDFLAGS = $(all_libraries) -no-undefined libknoteskolab_la_LDFLAGS = $(all_libraries) -no-undefined
libknoteskolab_la_LIBADD = \ libknoteskolab_la_LIBADD = \
$(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \ $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
$(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/knotes/libknotesresources.la \
$(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libkcal/libkcal.la \
-lkresources -ltdeprint -ltderesources -ltdeprint
kde_module_LTLIBRARIES = knotes_kolab.la 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_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
knotes_kolab_la_LIBADD = libknoteskolab.la knotes_kolab_la_LIBADD = libknoteskolab.la
servicedir = $(kde_servicesdir)/kresources/knotes servicedir = $(kde_servicesdir)/tderesources/knotes
service_DATA = kolabresource.desktop service_DATA = kolabresource.desktop
install-data-local: $(srcdir)/../uninstall.desktop install-data-local: $(srcdir)/../uninstall.desktop

0
kresources/kolab/knotes/kolabresource.desktop → tderesources/kolab/knotes/kolabresource.desktop
Unescape View File

0
kresources/kolab/knotes/note.cpp → tderesources/kolab/knotes/note.cpp
Unescape View File

0
kresources/kolab/knotes/note.h → tderesources/kolab/knotes/note.h
Unescape View File

0
kresources/kolab/knotes/resourcekolab.cpp → tderesources/kolab/knotes/resourcekolab.cpp
Unescape View File

0
kresources/kolab/knotes/resourcekolab.h → tderesources/kolab/knotes/resourcekolab.h
Unescape View File

0
kresources/kolab/knotes/resourcekolab_plugin.cpp → tderesources/kolab/knotes/resourcekolab_plugin.cpp
Unescape View File

6
kresources/kolab/kolab-resource.upd → tderesources/kolab/kolab-resource.upd
Unescape View File

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

2
kresources/kolab/shared/CMakeLists.txt → tderesources/kolab/shared/CMakeLists.txt
Unescape View File

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

2
kresources/kolab/shared/Makefile.am → tderesources/kolab/shared/Makefile.am
Unescape View File

@ -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 noinst_HEADERS = resourcekolabbase.h kolabbase.h subresource.h

0
kresources/kolab/shared/kmailconnection.cpp → tderesources/kolab/shared/kmailconnection.cpp
Unescape View File

0
kresources/kolab/shared/kmailconnection.h → tderesources/kolab/shared/kmailconnection.h
Unescape View File

0
kresources/kolab/shared/kolabbase.cpp → tderesources/kolab/shared/kolabbase.cpp
Unescape View File

0
kresources/kolab/shared/kolabbase.h → tderesources/kolab/shared/kolabbase.h
Unescape View File

2
kresources/kolab/shared/resourcekolabbase.cpp → tderesources/kolab/shared/resourcekolabbase.cpp
Unescape View File

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

0
kresources/kolab/shared/resourcekolabbase.h → tderesources/kolab/shared/resourcekolabbase.h
Unescape View File

0
kresources/kolab/shared/subresource.cpp → tderesources/kolab/shared/subresource.cpp
Unescape View File

0
kresources/kolab/shared/subresource.h → tderesources/kolab/shared/subresource.h
Unescape View File

0
kresources/kolab/uninstall.desktop → tderesources/kolab/uninstall.desktop
Unescape View File

0
kresources/kolab/upgrade-resourcetype.pl → tderesources/kolab/upgrade-resourcetype.pl
Unescape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save