diff options
Diffstat (limited to 'tdeprint/cups/cupsdconf2/cupsddialog.cpp')
| -rw-r--r-- | tdeprint/cups/cupsdconf2/cupsddialog.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index bc91f9ffe..22a3b2d54 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -33,15 +33,15 @@ #include <tqdir.h> #include <tqvbox.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqstringlist.h> #include <tqwhatsthis.h> -#include <kio/passdlg.h> +#include <tdeio/passdlg.h> #include <kguiitem.h> #include <kprocess.h> @@ -95,7 +95,7 @@ const char* getPassword(const char*) TQString user(cupsUser()); TQString pass; - if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) + if (TDEIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) { cupsSetUser(user.latin1()); pass_string = pass; @@ -113,8 +113,8 @@ const char* getPassword(const char*) CupsdDialog::CupsdDialog(TQWidget *parent, const char *name) : KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) { - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("cupsdconf"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("cupsdconf"); setShowIconsInTreeList(true); setRootIsDecorated(false); @@ -136,10 +136,10 @@ CupsdDialog::~CupsdDialog() void CupsdDialog::addConfPage(CupsdPage *page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pixmap(), - KIcon::NoGroup, - KIcon::SizeMedium + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); TQVBox *box = addVBoxPage(page->pageLabel(), page->header(), icon); @@ -207,9 +207,9 @@ bool CupsdDialog::restartServer(TQString& msg) else { bool success = false; - KProcess proc; + TDEProcess proc; proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart"; - success = proc.start( KProcess::Block ) && proc.normalExit(); + success = proc.start( TDEProcess::Block ) && proc.normalExit(); if( !success ) msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); } @@ -256,7 +256,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString } else { - KGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" + TDEGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" CupsdDialog dlg(parent); if (dlg.setConfigFile(fn) && dlg.exec()) { |