From 56605e6c2b9f31f219831f78342442890776245a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 20:56:13 -0600 Subject: Rename kiobuffer and KHTML --- acinclude.m4 | 4 +-- cmake | 2 +- src/kio_umountwrapper.cpp | 77 --------------------------------------------- src/kio_umountwrapper.h | 49 ----------------------------- src/tdeio_umountwrapper.cpp | 77 +++++++++++++++++++++++++++++++++++++++++++++ src/tdeio_umountwrapper.h | 49 +++++++++++++++++++++++++++++ 6 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 src/kio_umountwrapper.cpp delete mode 100644 src/kio_umountwrapper.h create mode 100644 src/tdeio_umountwrapper.cpp create mode 100644 src/tdeio_umountwrapper.h 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/kio_umountwrapper.cpp deleted file mode 100644 index 775215c..0000000 --- a/src/kio_umountwrapper.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Frode M. Døving * - * frode@lnix.net * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - - -#include "kio_umountwrapper.h" - -#include -#include - -#include -#include -#include -#include -#include -#include - -kio_umountwrapper::kio_umountwrapper(const TQString& url) - : TDEApplication() -{ - m_progress = new KProgressDialog(); - setMainWidget(m_progress); - m_progress->setLabel(i18n("Synchronising data to disk, please wait")+"..."); - m_progress->setAutoClose(true); - m_progress->setAllowCancel(false); - m_progress->progressBar()->setTextEnabled(false); - m_progress->progressBar()->setTotalSteps(0); - m_progress->show(); - - TQTimer *t = new TQTimer(this); - connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(progressAdvance())); - t->start(10, FALSE); - - TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this)); - *p << "kio_media_mounthelper"; - *p << "-s"; - *p << url; - kdDebug() << "TDEProcess: " << url << endl; - connect(p, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(processFinished(TDEProcess *))); - p->start(); -} - -void kio_umountwrapper::progressAdvance() -{ - m_progress->progressBar()->advance(1); -} - -void kio_umountwrapper::processFinished(TDEProcess* p) -{ - if (p->normalExit() && p->exitStatus() == 0) - { - ::exit(0); - } - else - { - ::exit(1); - } -} - -#include "kio_umountwrapper.moc" diff --git a/src/kio_umountwrapper.h b/src/kio_umountwrapper.h deleted file mode 100644 index eb670b8..0000000 --- a/src/kio_umountwrapper.h +++ /dev/null @@ -1,49 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Frode M. Døving * - * frode@lnix.net * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - - -#ifndef _KIO_UMOUNTWRAPPER_H_ -#define _KIO_UMOUNTWRAPPER_H_ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include - -class kio_umountwrapper : public TDEApplication -{ - Q_OBJECT - -public: - kio_umountwrapper(const TQString&); - -private: - KProgressDialog *m_progress; - -private slots: - void progressAdvance(); - void processFinished(TDEProcess* p); - -}; - -#endif // _KIO_UMOUNTWRAPPER_H_ diff --git a/src/tdeio_umountwrapper.cpp b/src/tdeio_umountwrapper.cpp new file mode 100644 index 0000000..775215c --- /dev/null +++ b/src/tdeio_umountwrapper.cpp @@ -0,0 +1,77 @@ +/*************************************************************************** + * Copyright (C) 2007 by Frode M. Døving * + * frode@lnix.net * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + + +#include "kio_umountwrapper.h" + +#include +#include + +#include +#include +#include +#include +#include +#include + +kio_umountwrapper::kio_umountwrapper(const TQString& url) + : TDEApplication() +{ + m_progress = new KProgressDialog(); + setMainWidget(m_progress); + m_progress->setLabel(i18n("Synchronising data to disk, please wait")+"..."); + m_progress->setAutoClose(true); + m_progress->setAllowCancel(false); + m_progress->progressBar()->setTextEnabled(false); + m_progress->progressBar()->setTotalSteps(0); + m_progress->show(); + + TQTimer *t = new TQTimer(this); + connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(progressAdvance())); + t->start(10, FALSE); + + TDEProcess *p = new TDEProcess(TQT_TQOBJECT(this)); + *p << "kio_media_mounthelper"; + *p << "-s"; + *p << url; + kdDebug() << "TDEProcess: " << url << endl; + connect(p, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(processFinished(TDEProcess *))); + p->start(); +} + +void kio_umountwrapper::progressAdvance() +{ + m_progress->progressBar()->advance(1); +} + +void kio_umountwrapper::processFinished(TDEProcess* p) +{ + if (p->normalExit() && p->exitStatus() == 0) + { + ::exit(0); + } + else + { + ::exit(1); + } +} + +#include "kio_umountwrapper.moc" diff --git a/src/tdeio_umountwrapper.h b/src/tdeio_umountwrapper.h new file mode 100644 index 0000000..eb670b8 --- /dev/null +++ b/src/tdeio_umountwrapper.h @@ -0,0 +1,49 @@ +/*************************************************************************** + * Copyright (C) 2007 by Frode M. Døving * + * frode@lnix.net * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + + +#ifndef _KIO_UMOUNTWRAPPER_H_ +#define _KIO_UMOUNTWRAPPER_H_ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +class kio_umountwrapper : public TDEApplication +{ + Q_OBJECT + +public: + kio_umountwrapper(const TQString&); + +private: + KProgressDialog *m_progress; + +private slots: + void progressAdvance(); + void processFinished(TDEProcess* p); + +}; + +#endif // _KIO_UMOUNTWRAPPER_H_ -- cgit v1.2.1