diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 72 | ||||
| m--------- | admin | 0 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | configure.in.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/main.cpp | 28 | ||||
| -rw-r--r-- | src/tdeio_umountwrapper.cpp (renamed from src/kio_umountwrapper.cpp) | 28 | ||||
| -rw-r--r-- | src/tdeio_umountwrapper.h (renamed from src/kio_umountwrapper.h) | 8 |
10 files changed, 77 insertions, 77 deletions
@@ -1,4 +1,4 @@ -Simple unmount wrapper around 'kio_media_mounthelper -s <URL>' +Simple unmount wrapper around 'tdeio_media_mounthelper -s <URL>' 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/acinclude.m4 b/acinclude.m4 index 468849e..694ad74 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,11 +602,11 @@ 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 - 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=""]) @@ -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 @@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> 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"); @@ -2070,41 +2070,41 @@ 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") - AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_TDEABC, "-ltdeabc") + AC_SUBST(LIB_TDEHTML, "-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") + AC_SUBST(LIB_KSYCOCA, "-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, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_TDEHTML, "-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)") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -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/admin b/admin deleted file mode 160000 -Subproject 4af57bf22967e6ad80ab898980ed505df6eae5b diff --git a/cmake b/cmake deleted file mode 160000 -Subproject d2f658ca47faefe569bcd1885b9238691fa1328 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 5812439..509c91d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,14 +2,14 @@ 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 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 @@ -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) -lktexteditor -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 8c2782f..dec5793 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ -#include "kio_umountwrapper.h" -#include <kaboutdata.h> -#include <kcmdlineargs.h> -#include <klocale.h> +#include "tdeio_umountwrapper.h" +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdelocale.h> #include <kdebug.h> @@ -31,28 +31,28 @@ 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) { - KAboutData about("kio_umountwrapper", I18N_NOOP("kio_umountwrapper"), version, description, - KAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "[email protected]"); + TDEAboutData about("tdeio_umountwrapper", I18N_NOOP("tdeio_umountwrapper"), version, description, + TDEAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "[email protected]"); about.addAuthor( "Frode M. Døving", 0, "[email protected]" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); - kio_umountwrapper *app; + tdeio_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!")); - else app = new kio_umountwrapper(TQString(args->arg(0))); + TDECmdLineArgs::usage(i18n("No URL specified!")); + else app = new tdeio_umountwrapper(TQString(args->arg(0))); args->clear(); diff --git a/src/kio_umountwrapper.cpp b/src/tdeio_umountwrapper.cpp index 41c7f76..26ab35d 100644 --- a/src/kio_umountwrapper.cpp +++ b/src/tdeio_umountwrapper.cpp @@ -19,20 +19,20 @@ ***************************************************************************/ -#include "kio_umountwrapper.h" +#include "tdeio_umountwrapper.h" #include <cstdlib> #include <tqtimer.h> -#include <kapplication.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdelocale.h> #include <kprogress.h> #include <kprocess.h> -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> #include <kdebug.h> -kio_umountwrapper::kio_umountwrapper(const TQString& url) - : KApplication() +tdeio_umountwrapper::tdeio_umountwrapper(const TQString& url) + : TDEApplication() { m_progress = new KProgressDialog(); setMainWidget(m_progress); @@ -47,22 +47,22 @@ 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)); - *p << "kio_media_mounthelper"; + TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this)); + *p << "tdeio_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(); } -void kio_umountwrapper::progressAdvance() +void tdeio_umountwrapper::progressAdvance() { m_progress->progressBar()->advance(1); } -void kio_umountwrapper::processFinished(KProcess* p) +void tdeio_umountwrapper::processFinished(TDEProcess* p) { if (p->normalExit() && p->exitStatus() == 0) { @@ -74,4 +74,4 @@ void kio_umountwrapper::processFinished(KProcess* p) } } -#include "kio_umountwrapper.moc" +#include "tdeio_umountwrapper.moc" diff --git a/src/kio_umountwrapper.h b/src/tdeio_umountwrapper.h index c790bcd..14cdc24 100644 --- a/src/kio_umountwrapper.h +++ b/src/tdeio_umountwrapper.h @@ -26,23 +26,23 @@ #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <kprogress.h> #include <kprocess.h> -class kio_umountwrapper : public KApplication +class tdeio_umountwrapper : public TDEApplication { Q_OBJECT public: - kio_umountwrapper(const TQString&); + tdeio_umountwrapper(const TQString&); private: KProgressDialog *m_progress; private slots: void progressAdvance(); - void processFinished(KProcess* p); + void processFinished(TDEProcess* p); }; |