diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdeprint/kprinter.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint/kprinter.cpp')
| -rw-r--r-- | tdeprint/kprinter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 86ef04f66..e62bf635b 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -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(); + KConfig *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(); + KConfig *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())); } |