Fix a few remaining references to kio_

pull/1/head
Timothy Pearson 12 years ago
parent 5ca1541a32
commit ad976f3329

@ -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 provides a progressbar which bounces back and forth.
It takes one argument, which is the url to the mountpoint to safely remove. It takes one argument, which is the url to the mountpoint to safely remove.

@ -40,7 +40,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos) 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 KDE_SET_PREFIX

@ -1,6 +1,6 @@
#MIN_CONFIG(3.2.0) #MIN_CONFIG(3.2.0)
AM_INIT_AUTOMAKE(kio_umountwrapper, 0.2) AM_INIT_AUTOMAKE(tdeio_umountwrapper, 0.2)
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN AC_CHECK_KDEMAXPATHLEN

@ -2,7 +2,7 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# these are the headers for your project # 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) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO
@ -18,10 +18,10 @@ KDE_ICON = AUTO
######################################################################### #########################################################################
# this is the program that gets installed. it's name is used for all # this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables # of the other Makefile.am variables
bin_PROGRAMS = kio_umountwrapper bin_PROGRAMS = tdeio_umountwrapper
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kio_umountwrapper_SOURCES = main.cpp kio_umountwrapper.cpp tdeio_umountwrapper_SOURCES = main.cpp tdeio_umountwrapper.cpp
kio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdeio_umountwrapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kio_umountwrapper_LDADD = $(LIB_TDEUI) tdeio_umountwrapper_LDADD = $(LIB_TDEUI)

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "kio_umountwrapper.h" #include "tdeio_umountwrapper.h"
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <klocale.h> #include <klocale.h>
@ -39,20 +39,20 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) 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"); TDEAboutData::License_GPL, "(C) 2007 Frode M. Døving", 0, 0, "frode@lnix.net");
about.addAuthor( "Frode M. Døving", 0, "frode@lnix.net" ); about.addAuthor( "Frode M. Døving", 0, "frode@lnix.net" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
kio_umountwrapper *app; tdeio_umountwrapper *app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
kdDebug() << "arg0: " << args->arg(0) << endl; kdDebug() << "arg0: " << args->arg(0) << endl;
if (args->count() == 0) if (args->count() == 0)
TDECmdLineArgs::usage(i18n("No URL specified!")); 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(); args->clear();

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "kio_umountwrapper.h" #include "tdeio_umountwrapper.h"
#include <cstdlib> #include <cstdlib>
#include <tqtimer.h> #include <tqtimer.h>
@ -31,7 +31,7 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kdebug.h> #include <kdebug.h>
kio_umountwrapper::kio_umountwrapper(const TQString& url) tdeio_umountwrapper::tdeio_umountwrapper(const TQString& url)
: TDEApplication() : TDEApplication()
{ {
m_progress = new KProgressDialog(); m_progress = new KProgressDialog();
@ -48,7 +48,7 @@ kio_umountwrapper::kio_umountwrapper(const TQString& url)
t->start(10, FALSE); t->start(10, FALSE);
TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this)); TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this));
*p << "kio_media_mounthelper"; *p << "tdeio_media_mounthelper";
*p << "-s"; *p << "-s";
*p << url; *p << url;
kdDebug() << "TDEProcess: " << url << endl; kdDebug() << "TDEProcess: " << url << endl;
@ -57,12 +57,12 @@ kio_umountwrapper::kio_umountwrapper(const TQString& url)
p->start(); p->start();
} }
void kio_umountwrapper::progressAdvance() void tdeio_umountwrapper::progressAdvance()
{ {
m_progress->progressBar()->advance(1); m_progress->progressBar()->advance(1);
} }
void kio_umountwrapper::processFinished(TDEProcess* p) void tdeio_umountwrapper::processFinished(TDEProcess* p)
{ {
if (p->normalExit() && p->exitStatus() == 0) if (p->normalExit() && p->exitStatus() == 0)
{ {
@ -74,4 +74,4 @@ void kio_umountwrapper::processFinished(TDEProcess* p)
} }
} }
#include "kio_umountwrapper.moc" #include "tdeio_umountwrapper.moc"

@ -30,12 +30,12 @@
#include <kprogress.h> #include <kprogress.h>
#include <kprocess.h> #include <kprocess.h>
class kio_umountwrapper : public TDEApplication class tdeio_umountwrapper : public TDEApplication
{ {
Q_OBJECT Q_OBJECT
public: public:
kio_umountwrapper(const TQString&); tdeio_umountwrapper(const TQString&);
private: private:
KProgressDialog *m_progress; KProgressDialog *m_progress;

Loading…
Cancel
Save