diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
tree | c76702a7f6310fbe9d437e347535422e836e94e9 /knewstuff/knewstuffgeneric.cpp | |
parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'knewstuff/knewstuffgeneric.cpp')
-rw-r--r-- | knewstuff/knewstuffgeneric.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index 8438e25ea..ef6a37456 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -24,11 +24,11 @@ #include <tqdir.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ktar.h> #include "entry.h" @@ -40,7 +40,7 @@ using namespace std; KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent ) : KNewStuff( type, parent ) { - mConfig = KGlobal::config(); + mConfig = TDEGlobal::config(); } KNewStuffGeneric::~KNewStuffGeneric() @@ -72,9 +72,9 @@ bool KNewStuffGeneric::install( const TQString &fileName ) for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { list2 << (*it).replace("%f", fileName); } - KProcess proc; + TDEProcess proc; proc << list2; - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); } return true; @@ -134,7 +134,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry ) { TQString file = destinationPath(entry); - if ( KStandardDirs::exists( file ) ) { + if ( TDEStandardDirs::exists( file ) ) { int result = KMessageBox::warningContinueCancel( parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .arg( file ), |