diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:02:55 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 21:02:00 +0200 |
commit | 533bad2a1503973aaf8186691422c2eda91d02d4 (patch) | |
tree | f7e52f62416048859aa9bde8425e20aac0e7c669 /tderesources/scalix | |
parent | 8144d5434bbd1c4448a37695aed6ad3d348043d8 (diff) | |
download | tdepim-533bad2a1503973aaf8186691422c2eda91d02d4.tar.gz tdepim-533bad2a1503973aaf8186691422c2eda91d02d4.zip |
Additional k => tde renaming and fixes
Diffstat (limited to 'tderesources/scalix')
-rw-r--r-- | tderesources/scalix/README | 2 | ||||
-rw-r--r-- | tderesources/scalix/kcal/resourcescalix.cpp | 2 | ||||
-rw-r--r-- | tderesources/scalix/scalixadmin/Makefile.am | 2 | ||||
-rw-r--r-- | tderesources/scalix/tdeabc/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tderesources/scalix/tdeabc/Makefile.am | 10 | ||||
-rw-r--r-- | tderesources/scalix/tdeabc/resourcescalix.h | 2 | ||||
-rw-r--r-- | tderesources/scalix/tdeioslave/Makefile.am | 2 | ||||
-rw-r--r-- | tderesources/scalix/tdeioslave/scalix.cpp | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/tderesources/scalix/README b/tderesources/scalix/README index 34a00e9ad..d2519102c 100644 --- a/tderesources/scalix/README +++ b/tderesources/scalix/README @@ -3,7 +3,7 @@ groupware servers use a similar storage concept (storing pim items as email attachments on an IMAP server). However the Scalix Resource has several modifications, e.g. the XML storage -type was removed and freebusy handling is done via a separated KIO slave. +type was removed and freebusy handling is done via a separated TDEIO slave. If you have any problems, questions or suggestions contact me under Tobias Koenig <tokoe@kde.org> diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index 25963a29b..ff9158d10 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -154,7 +154,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, if ( !count ) return true; - const int nbMessages = 200; // read 200 mails at a time (see kabc resource) + const int nbMessages = 200; // read 200 mails at a time (see tdeabc resource) const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." ) : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." ) diff --git a/tderesources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am index 4d072ac47..0758ccfc2 100644 --- a/tderesources/scalix/scalixadmin/Makefile.am +++ b/tderesources/scalix/scalixadmin/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin INCLUDES = $(all_includes) -scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor scalixadmin_LDADD = $(LIB_TDEABC) scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \ otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \ diff --git a/tderesources/scalix/tdeabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt index bfdaa3478..5875d5ac7 100644 --- a/tderesources/scalix/tdeabc/CMakeLists.txt +++ b/tderesources/scalix/tdeabc/CMakeLists.txt @@ -38,14 +38,14 @@ install( tde_add_kpart( tdeabc_scalix AUTOMOC SOURCES resourcescalix_plugin.cpp - LINK kabcscalix-shared + LINK tdeabcscalix-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kabcscalix (shared) ####################### +##### tdeabcscalix (shared) ####################### -tde_add_library( kabcscalix SHARED AUTOMOC +tde_add_library( tdeabcscalix SHARED AUTOMOC SOURCES resourcescalix.cpp contact.cpp VERSION 0.0.0 LINK resourcescalixshared-static kgroupwarebase-shared diff --git a/tderesources/scalix/tdeabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am index 88cf96d14..79577d8dd 100644 --- a/tderesources/scalix/tdeabc/Makefile.am +++ b/tderesources/scalix/tdeabc/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/tderesources/scalix/shared -I$(top_srcdir) $(all_includes) # The scalix wizard links to this library too -lib_LTLIBRARIES = libkabcscalix.la +lib_LTLIBRARIES = libtdeabcscalix.la -libkabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp -libkabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined -libkabcscalix_la_LIBADD = \ +libtdeabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp +libtdeabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined +libtdeabcscalix_la_LIBADD = \ $(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \ -ltderesources -ltdeabc @@ -17,7 +17,7 @@ noinst_HEADERS = resourcescalix.h tdeabc_scalix_la_SOURCES = resourcescalix_plugin.cpp tdeabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -tdeabc_scalix_la_LIBADD = libkabcscalix.la +tdeabc_scalix_la_LIBADD = libtdeabcscalix.la servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = scalix.desktop diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index 0fa58cdff..f9d4c3092 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -157,7 +157,7 @@ protected: TQ_UINT32 sernum, const KMailICalIface::StorageFormat format ); TQString configFile() const { - return Scalix::ResourceScalixBase::configFile( "kabc" ); + return Scalix::ResourceScalixBase::configFile( "tdeabc" ); } // The list of subresources diff --git a/tderesources/scalix/tdeioslave/Makefile.am b/tderesources/scalix/tdeioslave/Makefile.am index 70c0951b9..7b306ea3a 100644 --- a/tderesources/scalix/tdeioslave/Makefile.am +++ b/tderesources/scalix/tdeioslave/Makefile.am @@ -10,7 +10,7 @@ kdelnk_DATA = scalix.protocol scalixs.protocol kde_module_LTLIBRARIES = tdeio_scalix.la tdeio_scalix_la_SOURCES = scalix.cpp -tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) +tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) tdeio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) messages: rc.cpp diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 268b164bf..5ce8dca1d 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -157,7 +157,7 @@ void Scalix::publishFreeBusy( const KURL &url ) const int newSize = readData(buffer); if ( newSize < 0 ) { // read error: network in unknown state so disconnect - error( TDEIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") ); + error( TDEIO::ERR_COULD_NOT_READ, i18n("TDEIO data supply error.") ); return; } |