diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index 9443100..79689a5 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -31,8 +31,8 @@ #include "aboutwidget.h" -AboutWidget::AboutWidget( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name, TQt::WShowModal ) +AboutWidget::AboutWidget( TQWidget *parent, const char *name ) + : TQVBox( parent, name, TQt::WShowModal ) { KWin::setType( winId(), NET::Override ); KWin::setState( winId(), NET::SkipTaskbar ); diff --git a/kuickshow/src/aboutwidget.h b/kuickshow/src/aboutwidget.h index c3bd487..7fd3455 100644 --- a/kuickshow/src/aboutwidget.h +++ b/kuickshow/src/aboutwidget.h @@ -30,7 +30,7 @@ class AboutWidget : public TQVBox TQ_OBJECT public: - AboutWidget(TQWidget *tqparent = 0, const char *name = 0); + AboutWidget(TQWidget *parent = 0, const char *name = 0); protected: ~AboutWidget(); diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp index c059678..c0bef52 100644 --- a/kuickshow/src/defaultswidget.cpp +++ b/kuickshow/src/defaultswidget.cpp @@ -31,8 +31,8 @@ #include "imlibwidget.h" #include "defaultswidget.h" -DefaultsWidget::DefaultsWidget( TQWidget *tqparent, const char *name) - : TQWidget( tqparent, name ) +DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) + : TQWidget( parent, name ) { imFiltered = 0L; diff --git a/kuickshow/src/defaultswidget.h b/kuickshow/src/defaultswidget.h index c9f74b6..3cc92ba 100644 --- a/kuickshow/src/defaultswidget.h +++ b/kuickshow/src/defaultswidget.h @@ -36,7 +36,7 @@ class DefaultsWidget : public TQWidget TQ_OBJECT public: - DefaultsWidget( TQWidget *tqparent, const char *name ); + DefaultsWidget( TQWidget *parent, const char *name ); ~DefaultsWidget(); void loadSettings( const KuickData& data ); diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp index a549f4e..b8fe2bf 100644 --- a/kuickshow/src/filefinder.cpp +++ b/kuickshow/src/filefinder.cpp @@ -26,8 +26,8 @@ #include "filefinder.h" -FileFinder::FileFinder( TQWidget *tqparent, const char *name ) - : KLineEdit( tqparent, name ) +FileFinder::FileFinder( TQWidget *parent, const char *name ) + : KLineEdit( parent, name ) { // make this widget just as large, as the font is + 8 Pixels int height = fontMetrics().height() + 8; diff --git a/kuickshow/src/filefinder.h b/kuickshow/src/filefinder.h index 3ec7679..ab41222 100644 --- a/kuickshow/src/filefinder.h +++ b/kuickshow/src/filefinder.h @@ -31,7 +31,7 @@ class FileFinder : public KLineEdit TQ_OBJECT public: - FileFinder( TQWidget *tqparent=0, const char *name=0 ); + FileFinder( TQWidget *parent=0, const char *name=0 ); ~FileFinder(); KURLCompletion *completion() { diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 0f1068f..7bd5283 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -35,8 +35,8 @@ #undef KeyPress #endif -FileWidget::FileWidget( const KURL& url, TQWidget *tqparent, const char *name ) - : KDirOperator( url, tqparent, name ), +FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name ) + : KDirOperator( url, parent, name ), m_validCompletion( false ), m_fileFinder( 0L ) { diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h index 8591f9b..64f1160 100644 --- a/kuickshow/src/filewidget.h +++ b/kuickshow/src/filewidget.h @@ -34,7 +34,7 @@ class FileWidget : public KDirOperator public: enum WhichItem { Previous, Next, Current }; - FileWidget( const KURL& url, TQWidget *tqparent = 0L, const char *name = 0L ); + FileWidget( const KURL& url, TQWidget *parent = 0L, const char *name = 0L ); ~FileWidget(); bool hasFiles() const; diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp index 3b9b035..bde353d 100644 --- a/kuickshow/src/generalwidget.cpp +++ b/kuickshow/src/generalwidget.cpp @@ -33,8 +33,8 @@ #include "generalwidget.h" -GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); tqlayout->setSpacing( KDialog::spacingHint() ); diff --git a/kuickshow/src/generalwidget.h b/kuickshow/src/generalwidget.h index d966517..c8d6bec 100644 --- a/kuickshow/src/generalwidget.h +++ b/kuickshow/src/generalwidget.h @@ -35,7 +35,7 @@ class GeneralWidget : public TQWidget TQ_OBJECT public: - GeneralWidget( TQWidget *tqparent, const char *name ); + GeneralWidget( TQWidget *parent, const char *name ); ~GeneralWidget(); void loadSettings( const KuickData& data ); diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 915443b..215c8ad 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -74,15 +74,15 @@ TQCursor *ImageWindow::s_handCursor = 0L; -ImageWindow::ImageWindow( ImData *_idata, ImlibData *id, TQWidget *tqparent, +ImageWindow::ImageWindow( ImData *_idata, ImlibData *id, TQWidget *parent, const char *name ) - : ImlibWidget( _idata, id, tqparent, name ) + : ImlibWidget( _idata, id, parent, name ) { init(); } -ImageWindow::ImageWindow( ImData *_idata, TQWidget *tqparent, const char *name ) - : ImlibWidget( _idata, tqparent, name ) +ImageWindow::ImageWindow( ImData *_idata, TQWidget *parent, const char *name ) + : ImlibWidget( _idata, parent, name ) { init(); } diff --git a/kuickshow/src/imagewindow.h b/kuickshow/src/imagewindow.h index f755866..611f4fc 100644 --- a/kuickshow/src/imagewindow.h +++ b/kuickshow/src/imagewindow.h @@ -41,9 +41,9 @@ class ImageWindow : public ImlibWidget TQ_OBJECT public: - ImageWindow( ImData *_idata, ImlibData *id, TQWidget *tqparent=0, + ImageWindow( ImData *_idata, ImlibData *id, TQWidget *parent=0, const char *name=0 ); - ImageWindow( ImData *_idata=0, TQWidget *tqparent=0, const char *name=0 ); + ImageWindow( ImData *_idata=0, TQWidget *parent=0, const char *name=0 ); bool showNextImage( KuickFile * file ); bool showNextImage( const KURL& url ); diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 14964b3..f42e6c1 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -43,8 +43,8 @@ const int ImlibWidget::ImlibOffset = 256; -ImlibWidget::ImlibWidget( ImData *_idata, TQWidget *tqparent, const char *name ) : - TQWidget( tqparent, name, WDestructiveClose ) +ImlibWidget::ImlibWidget( ImData *_idata, TQWidget *parent, const char *name ) : + TQWidget( parent, name, WDestructiveClose ) { idata = _idata; deleteImData = false; @@ -82,9 +82,9 @@ ImlibWidget::ImlibWidget( ImData *_idata, TQWidget *tqparent, const char *name ) } -ImlibWidget::ImlibWidget( ImData *_idata, ImlibData *_id, TQWidget *tqparent, +ImlibWidget::ImlibWidget( ImData *_idata, ImlibData *_id, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name, WDestructiveClose ) + : TQWidget( parent, name, WDestructiveClose ) { id = _id; idata = _idata; @@ -525,13 +525,13 @@ void ImlibWidget::restoreCursor() // destroying the Imlib image X window. Therefore it needs to be temporarily reparented // away and reparented back to the new X window. // Reparenting may happen e.g. when doing the old-style (non-NETWM) fullscreen changes. -void ImlibWidget::reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, bool showIt ) +void ImlibWidget::reparent( TQWidget* parent, WFlags f, const TQPoint& p, bool showIt ) { XWindowAttributes attr; XGetWindowAttributes( x11Display(), win, &attr ); XUnmapWindow( x11Display(), win ); XReparentWindow( x11Display(), win, attr.root, 0, 0 ); - TQWidget::reparent( tqparent, f, p, showIt ); + TQWidget::reparent( parent, f, p, showIt ); XReparentWindow( x11Display(), win, winId(), attr.x, attr.y ); if( attr.map_state != IsUnmapped ) XMapWindow( x11Display(), win ); diff --git a/kuickshow/src/imlibwidget.h b/kuickshow/src/imlibwidget.h index 7e9dfd2..a05dab1 100644 --- a/kuickshow/src/imlibwidget.h +++ b/kuickshow/src/imlibwidget.h @@ -80,8 +80,8 @@ class ImlibWidget : public TQWidget public: - ImlibWidget( ImData *_idata=0, TQWidget *tqparent=0, const char *name=0 ); - ImlibWidget( ImData *_idata, ImlibData *id, TQWidget *tqparent=0, + ImlibWidget( ImData *_idata=0, TQWidget *parent=0, const char *name=0 ); + ImlibWidget( ImData *_idata, ImlibData *id, TQWidget *parent=0, const char *name=0 ); virtual ~ImlibWidget(); @@ -121,7 +121,7 @@ public: ImlibData* getImlibData() const { return id; } - virtual void reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, bool showIt = FALSE ); + virtual void reparent( TQWidget* parent, WFlags f, const TQPoint& p, bool showIt = FALSE ); public slots: void rotate90(); diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp index 3d981e1..140c90d 100644 --- a/kuickshow/src/kuickconfigdlg.cpp +++ b/kuickshow/src/kuickconfigdlg.cpp @@ -38,11 +38,11 @@ #include "kuickdata.h" -KuickConfigDialog::KuickConfigDialog( KActionCollection *_coll, TQWidget *tqparent, +KuickConfigDialog::KuickConfigDialog( KActionCollection *_coll, TQWidget *parent, const char *name, bool modal ) : KDialogBase( Tabbed, i18n("Configure"), Help | Default | Ok | Apply | Cancel, Ok, - tqparent, name, modal ) + parent, name, modal ) { coll = _coll; TQVBox *box = addVBoxPage( i18n("&General") ); diff --git a/kuickshow/src/kuickconfigdlg.h b/kuickshow/src/kuickconfigdlg.h index 9d7657b..cab6655 100644 --- a/kuickshow/src/kuickconfigdlg.h +++ b/kuickshow/src/kuickconfigdlg.h @@ -36,7 +36,7 @@ class KuickConfigDialog : public KDialogBase TQ_OBJECT public: - KuickConfigDialog( KActionCollection *coll, TQWidget *tqparent=0, + KuickConfigDialog( KActionCollection *coll, TQWidget *parent=0, const char *name=0, bool modal=true); ~KuickConfigDialog(); diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 9aead63..22f553b 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -94,7 +94,7 @@ bool KuickFile::download() return m_job != 0L; } -KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *tqparent ) +KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent ) { if ( isAvailable() ) return OK; @@ -104,7 +104,7 @@ KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *tqparent ) return ERROR; } - KProgressDialog *dialog = new KProgressDialog( tqparent ); + KProgressDialog *dialog = new KProgressDialog( parent ); dialog->setModal( true ); dialog->setCaption( i18n("Downloading %1...").tqarg( m_url.fileName() ) ); dialog->setLabel( i18n("Please wait while downloading\n%1").tqarg( m_url.prettyURL() )); diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h index 08fa455..af92355 100644 --- a/kuickshow/src/kuickfile.h +++ b/kuickshow/src/kuickfile.h @@ -72,7 +72,7 @@ public: * immediately. * @return true when the download has finished or false when the user aborted the dialog */ - KuickFile::DownloadtqStatus waitForDownload( TQWidget *tqparent ); + KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent ); // bool needsDownload(); diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 8752203..bff2caa 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -631,7 +631,7 @@ void KuickShow::slotTrashCurrentImage(ImageWindow *viewer) performTrashCurrentImage(viewer); } -void KuickShow::performDeleteCurrentImage(TQWidget *tqparent) +void KuickShow::performDeleteCurrentImage(TQWidget *parent) { assert(fileWidget != 0L); @@ -640,7 +640,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *tqparent) list.append (item); if (KMessageBox::warningContinueCancel( - tqparent, + parent, i18n("Do you really want to delete\n '%1'?").tqarg(item->url().pathOrURL()), i18n("Delete File"), KStdGuiItem::del(), @@ -654,7 +654,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *tqparent) fileWidget->del(list, false, false); } -void KuickShow::performTrashCurrentImage(TQWidget *tqparent) +void KuickShow::performTrashCurrentImage(TQWidget *parent) { assert(fileWidget != 0L); @@ -665,7 +665,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *tqparent) list.append (item); if (KMessageBox::warningContinueCancel( - tqparent, + parent, i18n("Do you really want to trash\n '%1'?").tqarg(item->url().pathOrURL()), i18n("Trash File"), KGuiItem(i18n("to trash", "&Trash"),"edittrash"), @@ -676,7 +676,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *tqparent) } tryShowNextImage(); - fileWidget->trash(list, tqparent, false, false); + fileWidget->trash(list, parent, false, false); } void KuickShow::tryShowNextImage() diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h index c874528..56c1b20 100644 --- a/kuickshow/src/kuickshow.h +++ b/kuickshow/src/kuickshow.h @@ -156,8 +156,8 @@ private: void delayAction(DelayedRepeatEvent *event); void replayAdvance(DelayedRepeatEvent *event); - void performDeleteCurrentImage(TQWidget *tqparent); - void performTrashCurrentImage(TQWidget *tqparent); + void performDeleteCurrentImage(TQWidget *parent); + void performTrashCurrentImage(TQWidget *parent); uint viewItem, renameItem, deleteItem, printItem; uint m_slideshowCycle; diff --git a/kuickshow/src/kurlwidget.cpp b/kuickshow/src/kurlwidget.cpp index 3d23106..342c78c 100644 --- a/kuickshow/src/kurlwidget.cpp +++ b/kuickshow/src/kurlwidget.cpp @@ -23,8 +23,8 @@ #include "kurlwidget.h" -KURLWidget::KURLWidget(const TQString& text, TQWidget *tqparent, const char *name) - : KURLLabel( tqparent, name ) +KURLWidget::KURLWidget(const TQString& text, TQWidget *parent, const char *name) + : KURLLabel( parent, name ) { setText( text ); connect( this, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( run() )); diff --git a/kuickshow/src/mainwidget.cpp b/kuickshow/src/mainwidget.cpp index b9e6357..d94d332 100644 --- a/kuickshow/src/mainwidget.cpp +++ b/kuickshow/src/mainwidget.cpp @@ -21,8 +21,8 @@ #include "mainwidget.h" -MainWidget::MainWidget( TQString startDir, TQWidget *tqparent, - const char *name ) : TQWidget ( tqparent, name ) +MainWidget::MainWidget( TQString startDir, TQWidget *parent, + const char *name ) : TQWidget ( parent, name ) { box = new FileView( startDir, true, (TQDir::Dirs | TQDir::Files), this, "fileview" ); diff --git a/kuickshow/src/mainwidget.h b/kuickshow/src/mainwidget.h index 875fbce..acee576 100644 --- a/kuickshow/src/mainwidget.h +++ b/kuickshow/src/mainwidget.h @@ -31,7 +31,7 @@ class MainWidget : public TQWidget TQ_OBJECT public: - MainWidget( TQString, TQWidget *tqparent, const char *name=0L); + MainWidget( TQString, TQWidget *parent, const char *name=0L); ~MainWidget(); FileView* getFileBox() { return box; } diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp index b77696d..2c78a92 100644 --- a/kuickshow/src/printing.cpp +++ b/kuickshow/src/printing.cpp @@ -43,16 +43,16 @@ #include "printing.h" #include "version.h" -bool Printing::printImage( ImageWindow& imageWin, TQWidget *tqparent ) +bool Printing::printImage( ImageWindow& imageWin, TQWidget *parent ) { TQString imageURL = imageWin.url().prettyURL(); KPrinter printer; printer.setDocName( imageURL ); printer.setCreator( "KuickShow-" KUICKSHOWVERSION ); - KPrinter::addDialogPage( new KuickPrintDialogPage( tqparent, "kuick page")); + KPrinter::addDialogPage( new KuickPrintDialogPage( parent, "kuick page")); - if ( printer.setup( tqparent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) ) + if ( printer.setup( parent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) ) { KTempFile tmpFile( TQString(), ".png" ); if ( tmpFile.status() == 0 ) @@ -194,8 +194,8 @@ TQString Printing::minimizeString( TQString text, const TQFontMetrics& /////////////////////////////////////////////////////////////////// -KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { setTitle( i18n("Image Settings") ); diff --git a/kuickshow/src/printing.h b/kuickshow/src/printing.h index f58f05d..065ea31 100644 --- a/kuickshow/src/printing.h +++ b/kuickshow/src/printing.h @@ -36,7 +36,7 @@ class ImageWindow; class Printing { public: - static bool printImage( ImageWindow& imageWin, TQWidget *tqparent = 0L); + static bool printImage( ImageWindow& imageWin, TQWidget *parent = 0L); static bool printImageWithTQt( const TQString& filename, KPrinter& printer, const TQString& originalFileName ); @@ -53,7 +53,7 @@ class KuickPrintDialogPage : public KPrintDialogPage TQ_OBJECT public: - KuickPrintDialogPage( TQWidget *tqparent = 0L, const char *name = 0 ); + KuickPrintDialogPage( TQWidget *parent = 0L, const char *name = 0 ); ~KuickPrintDialogPage(); virtual void getOptions(TQMap& opts, bool incldef = false); diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp index a35f159..ed2bedc 100644 --- a/kuickshow/src/slideshowwidget.cpp +++ b/kuickshow/src/slideshowwidget.cpp @@ -26,8 +26,8 @@ #include "slideshowwidget.h" -SlideShowWidget::SlideShowWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { // setTitle( i18n("Slideshow") ); diff --git a/kuickshow/src/slideshowwidget.h b/kuickshow/src/slideshowwidget.h index 4408b20..a966442 100644 --- a/kuickshow/src/slideshowwidget.h +++ b/kuickshow/src/slideshowwidget.h @@ -29,7 +29,7 @@ class SlideShowWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - SlideShowWidget( TQWidget *tqparent, const char *name ); + SlideShowWidget( TQWidget *parent, const char *name ); ~SlideShowWidget(); virtual void loadSettings( const KuickData& data );