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/kmfactory.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/kmfactory.cpp')
| -rw-r--r-- | tdeprint/kmfactory.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 8daa2fe20..16ec56c32 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -32,18 +32,18 @@ #include <tqsettings.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstaticdeleter.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <dcopref.h> -#include <kio/authinfo.h> +#include <tdeio/authinfo.h> #include <unistd.h> @@ -113,8 +113,8 @@ KMFactory::KMFactory() if ( !ok ) settings.writeEntry( "/qt/embedFonts", true ); - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("tdeprint"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("tdeprint"); // create DCOP signal connection connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); @@ -224,11 +224,11 @@ void KMFactory::loadFactory(const TQString& syst) } } -KConfig* KMFactory::printConfig(const TQString& group) +TDEConfig* KMFactory::printConfig(const TQString& group) { if (!m_printconfig) { - m_printconfig = new KConfig("tdeprintrc"); + m_printconfig = new TDEConfig("tdeprintrc"); TQ_CHECK_PTR(m_printconfig); } if (!group.isEmpty()) @@ -238,7 +238,7 @@ KConfig* KMFactory::printConfig(const TQString& group) TQString KMFactory::printSystem() { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->setGroup("General"); TQString sys = conf->readEntry("PrintSystem"); if (sys.isEmpty()) @@ -276,7 +276,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst) unload(); if (saveSyst) { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->setGroup("General"); conf->writeEntry("PrintSystem", syst); conf->sync(); @@ -403,7 +403,7 @@ void KMFactory::slot_configChanged() void KMFactory::saveConfig() { - KConfig *conf = printConfig(); + TDEConfig *conf = printConfig(); conf->sync(); kdDebug(500) << "KMFactory (" << getpid() << ") emitting DCOP signal configChanged()" << endl; emit configChanged(); |