From c3155c1e38cc48b4eead745f90592daad8ae8a92 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 12 Jun 2012 18:29:54 -0500 Subject: [PATCH 01/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index e47cc63..ce9e1ce 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc +Subproject commit ce9e1ce4299a2e5b5fa2e354c9a02c1c2dd42c19 From 6148f5f083abc9cf1e0c077247293a11ee2ac3f9 Mon Sep 17 00:00:00 2001 From: Automated System Date: Thu, 14 Jun 2012 02:58:58 -0500 Subject: [PATCH 02/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index ce9e1ce..07921f2 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ce9e1ce4299a2e5b5fa2e354c9a02c1c2dd42c19 +Subproject commit 07921f23f88ede05bf40f01d870e18dee8868902 From f334f96561ece397f3969d374e1ff7e378f6a0b1 Mon Sep 17 00:00:00 2001 From: Automated System Date: Fri, 15 Jun 2012 09:49:49 -0500 Subject: [PATCH 03/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 07921f2..477d071 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 07921f23f88ede05bf40f01d870e18dee8868902 +Subproject commit 477d071b5db5544ace5449f0c2eea6d5c01d693b From a990bc694f9a90d790743792deafb27a68ac68f0 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 19 Jun 2012 17:44:46 -0500 Subject: [PATCH 04/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 06098ef..69a6474 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a +Subproject commit 69a6474abe53412a0e0958021c0bb78d593b14aa From b01bfba4b2b85d921a648346085cec8c1432e1cd Mon Sep 17 00:00:00 2001 From: Automated System Date: Thu, 21 Jun 2012 21:22:19 -0500 Subject: [PATCH 05/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 69a6474..ac762db 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 69a6474abe53412a0e0958021c0bb78d593b14aa +Subproject commit ac762db5a07d3ab5909e058f7051d82aef384224 From 8096c0d4b1a15b60c7daebfe4bc8ed620bc55fd5 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 7 Aug 2012 03:06:56 -0500 Subject: [PATCH 06/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 477d071..cd6c861 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 477d071b5db5544ace5449f0c2eea6d5c01d693b +Subproject commit cd6c8614e972ea4ffbd7316d473b7b6e48ea67ff From f5016fcd425a6217e91c3a453b514da78a1d5903 Mon Sep 17 00:00:00 2001 From: Automated System Date: Mon, 10 Sep 2012 02:41:24 -0500 Subject: [PATCH 07/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index cd6c861..f1cea7f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit cd6c8614e972ea4ffbd7316d473b7b6e48ea67ff +Subproject commit f1cea7f894713183e061fa6d2b69b05889a90a03 From ef9d33f17588febc8c07f7229b2f8f3b9af8e381 Mon Sep 17 00:00:00 2001 From: Automated System Date: Fri, 14 Sep 2012 20:13:34 -0500 Subject: [PATCH 08/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index ac762db..efdff81 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit ac762db5a07d3ab5909e058f7051d82aef384224 +Subproject commit efdff81cd246d0737ecb1a82ef6fd588c0a6bc08 From 87f3ce1b744898f40f0cd476f679b62ceac33e5c Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 20 Nov 2012 07:21:40 -0600 Subject: [PATCH 09/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index efdff81..a84dfb9 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit efdff81cd246d0737ecb1a82ef6fd588c0a6bc08 +Subproject commit a84dfb918b09c3e577b5ebd811761daf4fc8226c From 6813154659f9e96759746e8e5cb19292f9e5662b Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 20 Nov 2012 07:21:45 -0600 Subject: [PATCH 10/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index f1cea7f..3e0a4c9 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit f1cea7f894713183e061fa6d2b69b05889a90a03 +Subproject commit 3e0a4c9f3bb710512f7f21dc63970804ee09d09c From 8306fa792790991ee985db44d956bc1f3c8bb530 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 27 Nov 2012 07:27:45 -0600 Subject: [PATCH 11/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index a84dfb9..24a4b8a 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit a84dfb918b09c3e577b5ebd811761daf4fc8226c +Subproject commit 24a4b8adb3917095752bd4bee8674006e97e9141 From e198991437f7d59076942e5edcb865c3b9f0fd93 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 27 Nov 2012 07:27:54 -0600 Subject: [PATCH 12/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 3e0a4c9..0953d90 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 3e0a4c9f3bb710512f7f21dc63970804ee09d09c +Subproject commit 0953d90e24d84a91d72f741f3f8ea5791d84f41b From daaccdab8a2e808b004b535691f7279f7b64e284 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:27 -0600 Subject: [PATCH 13/42] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8c2782f..9e249b5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -42,16 +42,16 @@ int main(int argc, char **argv) KAboutData about("kio_umountwrapper", I18N_NOOP("kio_umountwrapper"), version, description, KAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "frode@lnix.net"); about.addAuthor( "Frode M. Døving", 0, "frode@lnix.net" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); kio_umountwrapper *app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); kdDebug() << "arg0: " << args->arg(0) << endl; if (args->count() == 0) - KCmdLineArgs::usage(i18n("No URL specified!")); + TDECmdLineArgs::usage(i18n("No URL specified!")); else app = new kio_umountwrapper(TQString(args->arg(0))); args->clear(); From 841de5e17d45bb701d48b4856c7c24bd1c29923f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:55:24 -0600 Subject: [PATCH 14/42] Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- acinclude.m4 | 26 +++++++++++++------------- src/kio_umountwrapper.cpp | 2 +- src/kio_umountwrapper.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 2845c79..ada42ca 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext < int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); diff --git a/src/kio_umountwrapper.cpp b/src/kio_umountwrapper.cpp index 41c7f76..72ca45a 100644 --- a/src/kio_umountwrapper.cpp +++ b/src/kio_umountwrapper.cpp @@ -32,7 +32,7 @@ #include kio_umountwrapper::kio_umountwrapper(const TQString& url) - : KApplication() + : TDEApplication() { m_progress = new KProgressDialog(); setMainWidget(m_progress); diff --git a/src/kio_umountwrapper.h b/src/kio_umountwrapper.h index c790bcd..da9b041 100644 --- a/src/kio_umountwrapper.h +++ b/src/kio_umountwrapper.h @@ -30,7 +30,7 @@ #include #include -class kio_umountwrapper : public KApplication +class kio_umountwrapper : public TDEApplication { Q_OBJECT From d1cbe3f6822d451f667ac7a286dd6f7a63547aae Mon Sep 17 00:00:00 2001 From: Automated System Date: Sun, 20 Jan 2013 00:29:48 -0600 Subject: [PATCH 15/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 24a4b8a..f30a3ae 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 24a4b8adb3917095752bd4bee8674006e97e9141 +Subproject commit f30a3aea2526bd980eb0665c7f209dc6cadecb4f From 9900fe99ce0165168fe3169610532948856b3e2e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:53:09 -0600 Subject: [PATCH 16/42] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9e249b5..c35ebda 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,8 +39,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kio_umountwrapper", I18N_NOOP("kio_umountwrapper"), version, description, - KAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "frode@lnix.net"); + TDEAboutData about("kio_umountwrapper", I18N_NOOP("kio_umountwrapper"), version, description, + TDEAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "frode@lnix.net"); about.addAuthor( "Frode M. Døving", 0, "frode@lnix.net" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); From 2a9c6671f71594a3ab5261dfcd1e983cce603800 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 22 Jan 2013 21:56:10 -0600 Subject: [PATCH 17/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index f30a3ae..dacb3c2 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit f30a3aea2526bd980eb0665c7f209dc6cadecb4f +Subproject commit dacb3c251a579dd140d3a27a9863215b85752eea From 3858c9720a0f7c205cf35da7becbf061612fbbf2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:58 -0600 Subject: [PATCH 18/42] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/kio_umountwrapper.cpp | 10 +++++----- src/kio_umountwrapper.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kio_umountwrapper.cpp b/src/kio_umountwrapper.cpp index 72ca45a..775215c 100644 --- a/src/kio_umountwrapper.cpp +++ b/src/kio_umountwrapper.cpp @@ -47,13 +47,13 @@ kio_umountwrapper::kio_umountwrapper(const TQString& url) connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(progressAdvance())); t->start(10, FALSE); - KProcess *p = new KProcess(TQT_TQOBJECT(this)); + TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this)); *p << "kio_media_mounthelper"; *p << "-s"; *p << url; - kdDebug() << "KProcess: " << url << endl; - connect(p, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(processFinished(KProcess *))); + kdDebug() << "TDEProcess: " << url << endl; + connect(p, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(processFinished(TDEProcess *))); p->start(); } @@ -62,7 +62,7 @@ void kio_umountwrapper::progressAdvance() m_progress->progressBar()->advance(1); } -void kio_umountwrapper::processFinished(KProcess* p) +void kio_umountwrapper::processFinished(TDEProcess* p) { if (p->normalExit() && p->exitStatus() == 0) { diff --git a/src/kio_umountwrapper.h b/src/kio_umountwrapper.h index da9b041..eb670b8 100644 --- a/src/kio_umountwrapper.h +++ b/src/kio_umountwrapper.h @@ -42,7 +42,7 @@ private: private slots: void progressAdvance(); - void processFinished(KProcess* p); + void processFinished(TDEProcess* p); }; From 125736d8cb3d7d19083707f01d6195007fcffb38 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:09:14 -0600 Subject: [PATCH 19/42] Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 26 +++++++++++++------------- src/Makefile.am | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index ada42ca..a1cd4ec 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/src/Makefile.am b/src/Makefile.am index 5812439..2063327 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,6 +22,6 @@ bin_PROGRAMS = kio_umountwrapper # the application source, library search path, and link libraries kio_umountwrapper_SOURCES = main.cpp kio_umountwrapper.cpp -kio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kio_umountwrapper_LDADD = $(LIB_TDEUI) From 9beca5555ec0f68c27c89626e376140b585d19be Mon Sep 17 00:00:00 2001 From: Automated System Date: Sat, 26 Jan 2013 15:56:16 -0600 Subject: [PATCH 20/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index dacb3c2..38cacb8 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit dacb3c251a579dd140d3a27a9863215b85752eea +Subproject commit 38cacb89dda0605c17b203fa3a646b7f6469fd5c From a2248aa50ad85834c4d439c67e4502e3c9f14980 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:53:14 -0600 Subject: [PATCH 21/42] Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 8 ++++---- src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index a1cd4ec..70db1a8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/src/Makefile.am b/src/Makefile.am index 2063327..87ccbed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ METASOURCES = AUTO messages: rc.cpp $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_umountwrapper.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_umountwrapper.pot KDE_ICON = AUTO From 615c7473f6887b1b1d00635efcf0caf42362139a Mon Sep 17 00:00:00 2001 From: Automated System Date: Sun, 27 Jan 2013 02:30:43 -0600 Subject: [PATCH 22/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 38cacb8..b6d5b67 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 38cacb89dda0605c17b203fa3a646b7f6469fd5c +Subproject commit b6d5b675493a44e3e789cc914da0d18914d2bb39 From aefa9862a0f84a347e6a2ed4f23931031fd64eea Mon Sep 17 00:00:00 2001 From: Automated System Date: Sun, 27 Jan 2013 02:30:45 -0600 Subject: [PATCH 23/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 0953d90..9a21790 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 0953d90e24d84a91d72f741f3f8ea5791d84f41b +Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d From 56605e6c2b9f31f219831f78342442890776245a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 20:56:13 -0600 Subject: [PATCH 24/42] Rename kiobuffer and KHTML --- acinclude.m4 | 4 ++-- cmake | 2 +- src/{kio_umountwrapper.cpp => tdeio_umountwrapper.cpp} | 0 src/{kio_umountwrapper.h => tdeio_umountwrapper.h} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{kio_umountwrapper.cpp => tdeio_umountwrapper.cpp} (100%) rename src/{kio_umountwrapper.h => tdeio_umountwrapper.h} (100%) diff --git a/acinclude.m4 b/acinclude.m4 index 70db1a8..60dea53 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,7 +2075,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") @@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") diff --git a/cmake b/cmake index 9a21790..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/src/kio_umountwrapper.cpp b/src/tdeio_umountwrapper.cpp similarity index 100% rename from src/kio_umountwrapper.cpp rename to src/tdeio_umountwrapper.cpp diff --git a/src/kio_umountwrapper.h b/src/tdeio_umountwrapper.h similarity index 100% rename from src/kio_umountwrapper.h rename to src/tdeio_umountwrapper.h From 1ee4314b2abef867b68b522fcad5ebee0430074c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 28 Jan 2013 10:22:21 -0600 Subject: [PATCH 25/42] Fix up remaining references to -lkio --- acinclude.m4 | 8 ++++---- admin | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 60dea53..e93b679 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,7 +2070,7 @@ 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, "-lkio") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") @@ -2086,12 +2086,12 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-lkio") - AC_SUBST(LIB_KFILE, "-lkio") + AC_SUBST(LIB_KSYCOCA, "-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, "-lkio") + AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") diff --git a/admin b/admin index b6d5b67..b234091 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b6d5b675493a44e3e789cc914da0d18914d2bb39 +Subproject commit b2340915fde2845f481d9aad9e5e89820fbfedca From 3869d28ffc18a47a799cc1712d1703a8aec9bd35 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:21:09 -0600 Subject: [PATCH 26/42] Rename a few build variables for overall consistency --- acinclude.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index e93b679..eb8c45b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2087,14 +2087,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-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_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) From 5ca1541a32bf9364fba37abc4cd70eb4368ca96d Mon Sep 17 00:00:00 2001 From: Automated System Date: Wed, 30 Jan 2013 01:03:41 -0600 Subject: [PATCH 27/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index b234091..c5cef80 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b2340915fde2845f481d9aad9e5e89820fbfedca +Subproject commit c5cef804fe69e65e2e2f76df31fdbc7d4a4650e0 From ad976f3329af690e4f1a4299a12444dc869f7d25 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 30 Jan 2013 13:41:03 -0600 Subject: [PATCH 28/42] Fix a few remaining references to kio_ --- README | 2 +- configure.in | 2 +- configure.in.in | 2 +- src/Makefile.am | 10 +++++----- src/main.cpp | 8 ++++---- src/tdeio_umountwrapper.cpp | 12 ++++++------ src/tdeio_umountwrapper.h | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README b/README index ba06940..3145e62 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Simple unmount wrapper around 'kio_media_mounthelper -s ' +Simple unmount wrapper around 'tdeio_media_mounthelper -s ' It provides a progressbar which bounces back and forth. It takes one argument, which is the url to the mountpoint to safely remove. diff --git a/configure.in b/configure.in index 1bfa1f3..6b08ca7 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,7 @@ dnl Perform program name transformation AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(kio_umountwrapper, 0.2) dnl searches for some needed programs +AM_INIT_AUTOMAKE(tdeio_umountwrapper, 0.2) dnl searches for some needed programs KDE_SET_PREFIX diff --git a/configure.in.in b/configure.in.in index e4491a1..1a8169a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,6 +1,6 @@ #MIN_CONFIG(3.2.0) -AM_INIT_AUTOMAKE(kio_umountwrapper, 0.2) +AM_INIT_AUTOMAKE(tdeio_umountwrapper, 0.2) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN diff --git a/src/Makefile.am b/src/Makefile.am index 87ccbed..509c91d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) # these are the headers for your project -noinst_HEADERS = kio_umountwrapper.h +noinst_HEADERS = tdeio_umountwrapper.h # let automoc handle all of the meta source files (moc) METASOURCES = AUTO @@ -18,10 +18,10 @@ KDE_ICON = AUTO ######################################################################### # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables -bin_PROGRAMS = kio_umountwrapper +bin_PROGRAMS = tdeio_umountwrapper # the application source, library search path, and link libraries -kio_umountwrapper_SOURCES = main.cpp kio_umountwrapper.cpp -kio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kio_umountwrapper_LDADD = $(LIB_TDEUI) +tdeio_umountwrapper_SOURCES = main.cpp tdeio_umountwrapper.cpp +tdeio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeio_umountwrapper_LDADD = $(LIB_TDEUI) diff --git a/src/main.cpp b/src/main.cpp index c35ebda..2127de9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ -#include "kio_umountwrapper.h" +#include "tdeio_umountwrapper.h" #include #include #include @@ -39,20 +39,20 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData about("kio_umountwrapper", I18N_NOOP("kio_umountwrapper"), version, description, + TDEAboutData about("tdeio_umountwrapper", I18N_NOOP("tdeio_umountwrapper"), version, description, TDEAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "frode@lnix.net"); about.addAuthor( "Frode M. Døving", 0, "frode@lnix.net" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - kio_umountwrapper *app; + tdeio_umountwrapper *app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); kdDebug() << "arg0: " << args->arg(0) << endl; if (args->count() == 0) TDECmdLineArgs::usage(i18n("No URL specified!")); - else app = new kio_umountwrapper(TQString(args->arg(0))); + else app = new tdeio_umountwrapper(TQString(args->arg(0))); args->clear(); diff --git a/src/tdeio_umountwrapper.cpp b/src/tdeio_umountwrapper.cpp index 775215c..183b63d 100644 --- a/src/tdeio_umountwrapper.cpp +++ b/src/tdeio_umountwrapper.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ -#include "kio_umountwrapper.h" +#include "tdeio_umountwrapper.h" #include #include @@ -31,7 +31,7 @@ #include #include -kio_umountwrapper::kio_umountwrapper(const TQString& url) +tdeio_umountwrapper::tdeio_umountwrapper(const TQString& url) : TDEApplication() { m_progress = new KProgressDialog(); @@ -48,7 +48,7 @@ kio_umountwrapper::kio_umountwrapper(const TQString& url) t->start(10, FALSE); TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this)); - *p << "kio_media_mounthelper"; + *p << "tdeio_media_mounthelper"; *p << "-s"; *p << url; kdDebug() << "TDEProcess: " << url << endl; @@ -57,12 +57,12 @@ kio_umountwrapper::kio_umountwrapper(const TQString& url) p->start(); } -void kio_umountwrapper::progressAdvance() +void tdeio_umountwrapper::progressAdvance() { m_progress->progressBar()->advance(1); } -void kio_umountwrapper::processFinished(TDEProcess* p) +void tdeio_umountwrapper::processFinished(TDEProcess* p) { if (p->normalExit() && p->exitStatus() == 0) { @@ -74,4 +74,4 @@ void kio_umountwrapper::processFinished(TDEProcess* p) } } -#include "kio_umountwrapper.moc" +#include "tdeio_umountwrapper.moc" diff --git a/src/tdeio_umountwrapper.h b/src/tdeio_umountwrapper.h index eb670b8..8689022 100644 --- a/src/tdeio_umountwrapper.h +++ b/src/tdeio_umountwrapper.h @@ -30,12 +30,12 @@ #include #include -class kio_umountwrapper : public TDEApplication +class tdeio_umountwrapper : public TDEApplication { Q_OBJECT public: - kio_umountwrapper(const TQString&); + tdeio_umountwrapper(const TQString&); private: KProgressDialog *m_progress; From fc7929f4e6a267c6b412f714937f4e26cbe51df2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:33:56 -0600 Subject: [PATCH 29/42] Rename KCmd to avoid conflicts with KDE4 --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2127de9..a49ae89 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,10 +31,10 @@ static const char description[] = static const char version[] = "0.2"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "URL to Safely Remove" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) From 56e35c9ab8830bbfd14f707929ff684118607cb2 Mon Sep 17 00:00:00 2001 From: Automated System Date: Mon, 11 Feb 2013 05:47:21 -0600 Subject: [PATCH 30/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index c5cef80..39466b7 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit c5cef804fe69e65e2e2f76df31fdbc7d4a4650e0 +Subproject commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d From 20eeec1071fd0f8d6d0da7989025cdfe520adac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:05:32 -0600 Subject: [PATCH 31/42] Rename common header files for consistency with class renaming --- src/main.cpp | 4 ++-- src/tdeio_umountwrapper.cpp | 4 ++-- src/tdeio_umountwrapper.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index a49ae89..0f8841a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,8 +20,8 @@ #include "tdeio_umountwrapper.h" -#include -#include +#include +#include #include #include diff --git a/src/tdeio_umountwrapper.cpp b/src/tdeio_umountwrapper.cpp index 183b63d..7b3feb8 100644 --- a/src/tdeio_umountwrapper.cpp +++ b/src/tdeio_umountwrapper.cpp @@ -24,11 +24,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include tdeio_umountwrapper::tdeio_umountwrapper(const TQString& url) diff --git a/src/tdeio_umountwrapper.h b/src/tdeio_umountwrapper.h index 8689022..14cdc24 100644 --- a/src/tdeio_umountwrapper.h +++ b/src/tdeio_umountwrapper.h @@ -26,7 +26,7 @@ #include #endif -#include +#include #include #include From a7eaa0d2e8a8483981b6401ab5f313e61d4d59de Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:46:28 -0600 Subject: [PATCH 32/42] Rename additional header files to avoid conflicts with KDE4 --- src/main.cpp | 2 +- src/tdeio_umountwrapper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 0f8841a..dec5793 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,7 +22,7 @@ #include "tdeio_umountwrapper.h" #include #include -#include +#include #include diff --git a/src/tdeio_umountwrapper.cpp b/src/tdeio_umountwrapper.cpp index 7b3feb8..26ab35d 100644 --- a/src/tdeio_umountwrapper.cpp +++ b/src/tdeio_umountwrapper.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include From b4c86641c01f568dfe5150ca9f44481f732e1ea1 Mon Sep 17 00:00:00 2001 From: Automated System Date: Sat, 16 Feb 2013 00:58:39 -0600 Subject: [PATCH 33/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 39466b7..50c5954 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 39466b7b95f25a3e0f6da52b156b194b10cbac9d +Subproject commit 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d From 529c6eb876d8fcb8579a783ca557285e65478695 Mon Sep 17 00:00:00 2001 From: Automated System Date: Sat, 16 Feb 2013 00:58:41 -0600 Subject: [PATCH 34/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 274366f..5438330 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 +Subproject commit 5438330f961347e3026326e78e0e70a1ec083aaf From 73ea8c73adf8413e0781e1ade6ab231c77fb3e9a Mon Sep 17 00:00:00 2001 From: Automated System Date: Sat, 16 Feb 2013 14:28:39 -0600 Subject: [PATCH 35/42] Reset submodule main/applications/kio-umountwrapper/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 5438330..d53ac2d 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 5438330f961347e3026326e78e0e70a1ec083aaf +Subproject commit d53ac2db87e84aff35dd619566c005e90d4fec02 From af3e6035d9ceb7e941fcfcced6b1d785fbaffba8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Feb 2013 22:45:50 -0600 Subject: [PATCH 36/42] Fix references to lkabc --- acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index eb8c45b..e5ea341 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2074,7 +2074,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") + AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") From b21d37d65bd250119a45b7656be17de581aa4343 Mon Sep 17 00:00:00 2001 From: Automated System Date: Mon, 18 Feb 2013 14:39:56 -0600 Subject: [PATCH 37/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 50c5954..8918209 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d +Subproject commit 8918209f54f22935aa67a92dfea78b9a1623361b From abb4a984ff802cb59699b36e9937613b49253679 Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 19 Feb 2013 01:36:46 -0600 Subject: [PATCH 38/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 8918209..02e2842 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 8918209f54f22935aa67a92dfea78b9a1623361b +Subproject commit 02e2842b6f2a692e432f4ebc10fbe3759a15347a From 3e677715c8d042b069f071fe812b21b85b4ea931 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:14:34 -0600 Subject: [PATCH 39/42] Rename KABC namespace --- acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index e5ea341..6a707fc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2074,7 +2074,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") From a04ee4486affe01964a604fab7c405991ff91e0e Mon Sep 17 00:00:00 2001 From: Automated System Date: Wed, 20 Feb 2013 19:27:00 -0600 Subject: [PATCH 40/42] Reset submodule main/applications/kio-umountwrapper/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index 02e2842..d3351c9 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 02e2842b6f2a692e432f4ebc10fbe3759a15347a +Subproject commit d3351c945e680cea403e463eb9898467db140ecc From 8d6a397fadafd7a357a9d035b4a6dafdb9ad39f9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 21 Feb 2013 13:18:45 -0600 Subject: [PATCH 41/42] Rename makekdewidgets --- acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6a707fc..a7d8381 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -606,7 +606,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then - KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) + KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) From 7048da84fc926fffd2284dbce0808f1c57eb8742 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 21 Feb 2013 15:09:37 -0600 Subject: [PATCH 42/42] Second part of prior commit --- admin | 2 +- cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin b/admin index d3351c9..4027b87 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit d3351c945e680cea403e463eb9898467db140ecc +Subproject commit 4027b878fb556a51ed29affd578e78aa70997480 diff --git a/cmake b/cmake index d53ac2d..ba27b9f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit d53ac2db87e84aff35dd619566c005e90d4fec02 +Subproject commit ba27b9f2328dabe778a9e129e96b706797da85fe