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/management/kmconfigdialog.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/management/kmconfigdialog.cpp')
| -rw-r--r-- | tdeprint/management/kmconfigdialog.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index d26b2082d..50eabe9b1 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -30,9 +30,9 @@ #include "kmconfigjobs.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name) : KDialogBase(IconList,i18n("TDE Print Configuration"),Ok|Cancel,Ok,parent,name,true,true) @@ -47,7 +47,7 @@ KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name) KMFactory::self()->uiManager()->setupConfigDialog(this); // initialize pages - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQPtrListIterator<KMConfigPage> it(m_pages); for (;it.current();++it) it.current()->loadConfig(conf); @@ -60,10 +60,10 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) { if (page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pagePixmap(), - KIcon::NoGroup, - KIcon::SizeMedium + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); TQFrame *frame = addPage(page->pageName(),page->pageHeader(),icon); @@ -77,7 +77,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) void KMConfigDialog::slotOk() { // save configuration - KConfig *conf = KMFactory::self()->printConfig(); + TDEConfig *conf = KMFactory::self()->printConfig(); TQPtrListIterator<KMConfigPage> it(m_pages); for (;it.current();++it) it.current()->saveConfig(conf); |