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/kprinter.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/kprinter.cpp')
| -rw-r--r-- | tdeprint/kprinter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 86ef04f66..4b9a1c98f 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -33,17 +33,17 @@ #include <tqtl.h> #include <tqdir.h> #include <tqguardedptr.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> -#include <kglobal.h> -#include <kconfig.h> +#include <tdeglobal.h> +#include <tdeconfig.h> #include <krun.h> #include <knotifyclient.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> static void dumpOptions(const TQMap<TQString,TQString>& opts); static void reportError(KPrinter*); @@ -174,7 +174,7 @@ void KPrinter::loadSettings() setSearchName(option("kde-searchname")); d->m_options.remove("kde-searchname"); - KConfig *conf = KGlobal::config(), *pconf = KMFactory::self()->printConfig(); + TDEConfig *conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig(); conf->setGroup("KPrinter Settings"); pconf->setGroup("General"); @@ -199,7 +199,7 @@ void KPrinter::saveSettings() } // save latest used printer to config file - KConfig *conf = KGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("Printer",searchName()); // latest used print command @@ -850,7 +850,7 @@ void KPrinter::setFromTo(int m, int M) // if no page size defined, use the localized one KPrinter::PageSize KPrinter::pageSize() const -{ return (option("kde-pagesize").isEmpty() ? (PageSize)KGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } +{ return (option("kde-pagesize").isEmpty() ? (PageSize)TDEGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } KPrinter::PageSetType KPrinter::pageSet() const { return (option("kde-pageset").isEmpty() ? AllPages : (PageSetType)(option("kde-pageset").toInt())); } |