summaryrefslogtreecommitdiffstats
path: root/kdeprint
diff options
context:
space:
mode:
Diffstat (limited to 'kdeprint')
-rw-r--r--kdeprint/cups/imagepreview.cpp2
-rw-r--r--kdeprint/kprintaction.cpp34
-rw-r--r--kdeprint/kprintaction.h14
-rw-r--r--kdeprint/kprintdialog.cpp4
-rw-r--r--kdeprint/management/kxmlcommanddlg.cpp8
-rw-r--r--kdeprint/management/networkscanner.cpp2
-rw-r--r--kdeprint/messagewindow.cpp6
7 files changed, 35 insertions, 35 deletions
diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp
index 878c2fa43..16a6271cb 100644
--- a/kdeprint/cups/imagepreview.cpp
+++ b/kdeprint/cups/imagepreview.cpp
@@ -59,7 +59,7 @@ void ImagePreview::paintEvent(TQPaintEvent*){
int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2;
QPixmap buffer(width(), height());
- buffer.fill(tqparentWidget(), 0, 0);
+ buffer.fill(parentWidget(), 0, 0);
QPainter p(&buffer);
p.drawImage(x,y,tmpImage);
p.end();
diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp
index 8b51ccfb6..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()
@@ -105,26 +105,26 @@ void KPrintAction::slotActivated(int ID)
{
KPrinter printer(false);
KMPrinter *mprt = KMManager::self()->findPrinter(d->printers[ID]);
- if (mprt && mprt->autoConfigure(&printer, d->tqparentWidget))
+ 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"
diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h
index b9ba54add..eb23d6e31 100644
--- a/kdeprint/kprintaction.h
+++ b/kdeprint/kprintaction.h
@@ -30,14 +30,14 @@ class KDEPRINT_EXPORT KPrintAction : public KActionMenu
public:
enum PrinterType { All, Regular, Specials };
- KPrintAction(const TQString& text, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
- KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
- KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
+ KPrintAction(const TQString& text, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+ KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+ KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
virtual ~KPrintAction();
- static KPrintAction* exportAll(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
- static KPrintAction* exportRegular(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
- static KPrintAction* exportSpecial(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0);
+ static KPrintAction* exportAll(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+ static KPrintAction* exportRegular(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
+ static KPrintAction* exportSpecial(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0);
signals:
void print(KPrinter*);
@@ -47,7 +47,7 @@ protected slots:
void slotActivated(int);
protected:
- void initialize(PrinterType type, TQWidget *tqparentWidget);
+ void initialize(PrinterType type, TQWidget *parentWidget);
private:
class KPrintActionPrivate;
diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp
index 8146b841a..c62730fde 100644
--- a/kdeprint/kprintdialog.cpp
+++ b/kdeprint/kprintdialog.cpp
@@ -546,7 +546,7 @@ void KPrintDialog::initialize(KPrinter *printer)
TQPtrList<KMPrinter> *plist = KMFactory::self()->manager()->printerList();
if (!KMManager::self()->errorMsg().isEmpty())
{
- KMessageBox::error(tqparentWidget(),
+ KMessageBox::error(parentWidget(),
"<qt><nobr>"+
i18n("An error occurred while retrieving the printer list:")
+"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>");
@@ -934,7 +934,7 @@ void KPrintDialog::slotUpdatePossible( bool flag )
{
MessageWindow::remove( this );
if ( !flag )
- KMessageBox::error(tqparentWidget(),
+ KMessageBox::error(parentWidget(),
"<qt><nobr>"+
i18n("An error occurred while retrieving the printer list:")
+"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>");
diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp
index c0377993a..9d6688001 100644
--- a/kdeprint/management/kxmlcommanddlg.cpp
+++ b/kdeprint/management/kxmlcommanddlg.cpp
@@ -735,10 +735,10 @@ void KXmlCommandAdvancedDlg::slotMoveDown()
void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd)
{
- m_inputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1);
- m_outputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1);
+ m_inputfile->parentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1);
+ m_outputfile->parentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1);
m_view->setEnabled(cmd.tqfind("%filterargs") != -1);
- m_name->tqparentWidget()->setEnabled(m_view->isEnabled());
+ m_name->parentWidget()->setEnabled(m_view->isEnabled());
slotSelectionChanged((m_view->isEnabled() ? m_view->currentItem() : 0));
m_view->setOpen(m_view->firstChild(), m_view->isEnabled());
}
@@ -1025,7 +1025,7 @@ void KXmlCommandDlg::slotRemoveMime()
void KXmlCommandDlg::slotEditCommand()
{
- KXmlCommandAdvancedDlg::editCommand(m_cmd, tqparentWidget());
+ KXmlCommandAdvancedDlg::editCommand(m_cmd, parentWidget());
}
void KXmlCommandDlg::slotAddReq()
diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp
index 307dbaeee..ab025748b 100644
--- a/kdeprint/management/networkscanner.cpp
+++ b/kdeprint/management/networkscanner.cpp
@@ -157,7 +157,7 @@ void NetworkScanner::slotScanClicked()
if ( !d->scanning )
{
if ( d->localPrefix() == d->prefixaddress ||
- KMessageBox::warningContinueCancel( this->tqparentWidget(),
+ KMessageBox::warningContinueCancel( this->parentWidget(),
i18n( "You are about to scan a subnet (%1.*) that does not "
"correspond to the current subnet of this computer (%2.*). Do you want "
"to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ),
diff --git a/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp
index 5504fa411..77931d165 100644
--- a/kdeprint/messagewindow.cpp
+++ b/kdeprint/messagewindow.cpp
@@ -55,13 +55,13 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent,
MessageWindow::~MessageWindow()
{
- m_windows.remove( tqparentWidget() );
+ m_windows.remove( parentWidget() );
}
void MessageWindow::slotTimer()
{
- TQSize psz = tqparentWidget()->size(), sz = tqsizeHint();
- move( tqparentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
+ TQSize psz = parentWidget()->size(), sz = tqsizeHint();
+ move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
if ( !isVisible() )
{
show();