From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/kprintaction.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'kdeprint/kprintaction.cpp') diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp index a319e64eb..4e62e791b 100644 --- a/kdeprint/kprintaction.cpp +++ b/kdeprint/kprintaction.cpp @@ -31,33 +31,33 @@ public: KPrintActionPrivate() { type = All; - tqparentWidget = 0; + parentWidget = 0; } PrinterType type; QStringList printers; - TQWidget *tqparentWidget; + TQWidget *parentWidget; }; -KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) : KActionMenu(text, parent, name) { d = new KPrintActionPrivate(); - initialize(type, tqparentWidget); + initialize(type, parentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, tqparentWidget); + initialize(type, parentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, tqparentWidget); + initialize(type, parentWidget); } KPrintAction::~KPrintAction() @@ -65,13 +65,13 @@ KPrintAction::~KPrintAction() delete d; } -void KPrintAction::initialize(PrinterType type, TQWidget *tqparentWidget) +void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); d->type = type; - d->tqparentWidget = tqparentWidget; + d->parentWidget = parentWidget; } void KPrintAction::slotAboutToShow() @@ -104,27 +104,27 @@ void KPrintAction::slotAboutToShow() void KPrintAction::slotActivated(int ID) { KPrinter printer(false); - KMPrinter *mprt = KMManager::self()->tqfindPrinter(d->printers[ID]); - if (mprt && mprt->autoConfigure(&printer, d->tqparentWidget)) + KMPrinter *mprt = KMManager::self()->findPrinter(d->printers[ID]); + if (mprt && mprt->autoConfigure(&printer, d->parentWidget)) { // emit the signal emit print(&printer); } } -KPrintAction* KPrintAction::exportAll(TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportAll(TQWidget *parentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), All, tqparentWidget, parent, (name ? name : "export_all")); + return new KPrintAction(i18n("&Export..."), All, parentWidget, parent, (name ? name : "export_all")); } -KPrintAction* KPrintAction::exportRegular(TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportRegular(TQWidget *parentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Regular, tqparentWidget, parent, (name ? name : "export_regular")); + return new KPrintAction(i18n("&Export..."), Regular, parentWidget, parent, (name ? name : "export_regular")); } -KPrintAction* KPrintAction::exportSpecial(TQWidget *tqparentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportSpecial(TQWidget *parentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Specials, tqparentWidget, parent, (name ? name : "export_special")); + return new KPrintAction(i18n("&Export..."), Specials, parentWidget, parent, (name ? name : "export_special")); } #include "kprintaction.moc" -- cgit v1.2.1