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/kmmanager.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/kmmanager.cpp')
| -rw-r--r-- | tdeprint/kmmanager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index c9730adba..d43239fd7 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -29,10 +29,10 @@ #include <zlib.h> #include <tqfile.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <klibloader.h> #include <unistd.h> @@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname) if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213) { f.close(); - destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); + destname = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); f.setName(destname); if (f.open(IO_WriteOnly)) @@ -418,7 +418,7 @@ bool KMManager::configureServer(TQWidget*) TQString KMManager::testPage() { - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); QString tpage = conf->readPathEntry("TestPage"); if (tpage.isEmpty()) @@ -511,11 +511,11 @@ bool KMManager::invokeOptionsDialog(TQWidget *parent) return false; } -void KMManager::createPluginActions(KActionCollection*) +void KMManager::createPluginActions(TDEActionCollection*) { } -void KMManager::validatePluginActions(KActionCollection*, KMPrinter*) +void KMManager::validatePluginActions(TDEActionCollection*, KMPrinter*) { } |