diff --git a/acinclude.m4 b/acinclude.m4 index a4f5aa5..77e0341 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_KFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/doc/html/classConfigElem.html b/doc/html/classConfigElem.html index d9994a1..caf3a02 100644 --- a/doc/html/classConfigElem.html +++ b/doc/html/classConfigElem.html @@ -1485,7 +1485,7 @@ Commits the downloading of mail bodies. Starts a pop3 job that will do the commi
-Creates a POP3 transfer job (KIO Job), which will be stored in pop3Job.
path | command and parameters of the job as URL path |
-First step of the refresh cycle. Gets the UIDs of the available mails from the server. It starts a KIO job to get the UIDs. The UIDs will be stored in receivedUIDs by slotReceiveUID(). When the job is ready, it will invoke slotUIDsReceived(). +First step of the refresh cycle. Gets the UIDs of the available mails from the server. It starts a TDEIO job to get the UIDs. The UIDs will be stored in receivedUIDs by slotReceiveUID(). When the job is ready, it will invoke slotUIDsReceived().
@@ -1548,7 +1548,7 @@ First step of the refresh cycle. Gets the UIDs of the available mails from the s
-Second step of the refresh cycle. Gets the sizes of the available mails from the server. It starts a KIO job to get these. The Sizes will be temporarily stored in receivedSizes by slotReceiveSize(). When the job is ready, it will invoke slotSizesReceived(). +Second step of the refresh cycle. Gets the sizes of the available mails from the server. It starts a TDEIO job to get these. The Sizes will be temporarily stored in receivedSizes by slotReceiveSize(). When the job is ready, it will invoke slotSizesReceived().
diff --git a/doc/html/configelem_8cpp-source.html b/doc/html/configelem_8cpp-source.html index 72ef9a0..1ae135e 100644 --- a/doc/html/configelem_8cpp-source.html +++ b/doc/html/configelem_8cpp-source.html @@ -434,7 +434,7 @@ 00417 m_url.setPath( path ); 00418 00419 //print debug message -00420 kdDebug() << "ConfigElem::startKIOJob: start KIO job on URL " << m_url.url() << endl; +00420 kdDebug() << "ConfigElem::startKIOJob: start TDEIO job on URL " << m_url.url() << endl; 00421 00422 //start the job and get handle to it 00423 pop3Job = TDEIO::get( m_url, false, false ); @@ -853,7 +853,7 @@ 00836 //set account state to idle 00837 state = AccountIdle; 00838 -00839 //we don't need an error message, because the KIO job has shown one +00839 //we don't need an error message, because the TDEIO job has shown one 00840 } 00841 00842 void ConfigElem::slotFinalizeRefresh( TDEIO::Job* ) diff --git a/doc/html/namespaces.html b/doc/html/namespaces.html index 91351c3..f12b8a2 100644 --- a/doc/html/namespaces.html +++ b/doc/html/namespaces.html @@ -22,7 +22,7 @@