diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:56:20 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:56:20 +0200 |
| commit | 78f893d50026b6cd010868d4cfb68dbd0801f9a8 (patch) | |
| tree | 92793aadff9f8c342ad1b4405c2ad623aaec684e | |
| parent | a36bb41f586af1cde823a0be0ca677740cfdcca4 (diff) | |
| download | basket-78f893d50026b6cd010868d4cfb68dbd0801f9a8.tar.gz basket-78f893d50026b6cd010868d4cfb68dbd0801f9a8.zip | |
Additional k => tde renaming and fixes
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | file-integration/Makefile.am | 2 | ||||
| -rw-r--r-- | po/it.po | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/likeback.cpp | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5910ba6..1e627b9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2068,35 +2068,35 @@ fi if test $kde_qtver = 3; then 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_TDEABC, "-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_TDEFILE, "-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_TDEFILE, "-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 -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/file-integration/Makefile.am b/file-integration/Makefile.am index 555edcb..1838f15 100644 --- a/file-integration/Makefile.am +++ b/file-integration/Makefile.am @@ -10,7 +10,7 @@ magic_DATA = basket.magic INCLUDES = $(all_includes) kde_module_LTLIBRARIES = basketthumbcreator.la basketthumbcreator_la_SOURCES = basketthumbcreator.cpp -basketthumbcreator_la_LIBADD = $(LIB_KIO) +basketthumbcreator_la_LIBADD = $(LIB_TDEIO) basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx kde_services_DATA = basketthumbcreator.desktop @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2007-01-13 15:57+0100\n" "PO-Revision-Date: 2007-01-31 20:31+0100\n" "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n" -"Language-Team: italian <tde-i18n-it@kde.org>\n" +"Language-Team: italian <kde-i18n-it@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/src/Makefile.am b/src/Makefile.am index 11555aa..2e29e97 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,7 @@ AM_CPPFLAGS = $(GPGME_CFLAGS) libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -ltdeio $(LIB_TDEUI) $(LIB_TDECORE) \ - $(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_KPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_QT) -ltdefx -ldl -lartsc + $(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_QT) -ltdefx -ldl -lartsc libbasketcommon_la_SOURCES = \ archive.cpp bnpview.cpp settings.cpp basket.cpp basketproperties.cpp \ @@ -55,7 +55,7 @@ libbasketcommon_la_SOURCES = \ bin_PROGRAMS = basket # the application source, library search path, and link libraries -basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KUTILS) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde +basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUTILS) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde basket_LDADD = libbasketcommon.la # this is where the desktop file will go diff --git a/src/likeback.cpp b/src/likeback.cpp index 0c7f45f..abfdc87 100644 --- a/src/likeback.cpp +++ b/src/likeback.cpp @@ -604,7 +604,7 @@ void LikeBack::fetchUserEmail() // m_process = 0; // m_configureEmail->setEnabled(true); - // ### KDE4: why oh why is KEmailSettings in kio? + // ### KDE4: why oh why is KEmailSettings in tdeio? TDEConfig emailConf( TQString::fromLatin1("emaildefaults") ); // find out the default profile |