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/kmspecialmanager.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/kmspecialmanager.cpp')
| -rw-r--r-- | tdeprint/kmspecialmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index d26515a16..84e120e77 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -47,7 +47,7 @@ bool KMSpecialManager::savePrinters() if (getuid() == 0) { confname = locate("data", "tdeprint/specials.desktop"); - if (confname.startsWith(KGlobal::dirs()->localtdedir())) + if (confname.startsWith(TDEGlobal::dirs()->localtdedir())) { // seems there's a problem here m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " @@ -107,8 +107,8 @@ bool KMSpecialManager::loadPrinters() if (m_loaded) return true; bool result(true); - TQString localDir = KGlobal::dirs()->localtdedir(); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); + TQString localDir = TDEGlobal::dirs()->localtdedir(); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); // local files should processed last, so we need to reorder the list // and put local files at the end TQStringList orderedFiles; |