diff options
author | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdeprint/kmjobmanager.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/kmjobmanager.cpp')
-rw-r--r-- | tdeprint/kmjobmanager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index 30a1fb993..de71d4dc7 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -22,9 +22,9 @@ #include "kmthreadjob.h" #include "kmfactory.h" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> KMJobManager::KMJobManager(TQObject *parent, const char *name) : TQObject(parent,name) @@ -203,12 +203,12 @@ int KMJobManager::actions() return 0; } -TQValueList<KAction*> KMJobManager::createPluginActions(KActionCollection*) +TQValueList<TDEAction*> KMJobManager::createPluginActions(TDEActionCollection*) { - return TQValueList<KAction*>(); + return TQValueList<TDEAction*>(); } -void KMJobManager::validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&) +void KMJobManager::validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&) { } @@ -242,14 +242,14 @@ bool KMJobManager::doPluginAction(int, const TQPtrList<KMJob>&) void KMJobManager::setLimit(int val) { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); conf->writeEntry("Limit", val); } int KMJobManager::limit() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); return conf->readNumEntry("Limit", 0); } |