From ad976f3329af690e4f1a4299a12444dc869f7d25 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 30 Jan 2013 13:41:03 -0600 Subject: [PATCH] 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;