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 /tdeprint/kxmlcommand.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 'tdeprint/kxmlcommand.cpp')
-rw-r--r-- | tdeprint/kxmlcommand.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 212b53fb5..2d5712674 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -30,13 +30,13 @@ #include <tqmap.h> #include <tqvaluelist.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kdialogbase.h> #include <kdebug.h> #include <kprocess.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> static void setOptionText(DrBase *opt, const TQString& s) { @@ -393,7 +393,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi } else { - format.replace( re, KProcess::quote( dopt->valueText() ) ); + format.replace( re, TDEProcess::quote( dopt->valueText() ) ); } str.append(format).append(" "); } @@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList() { if (d->m_cmdlist.isEmpty()) { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeprint/filters/"); for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) { |