From 721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kreplacements/kreplacements.cpp | 122 ++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'src/kreplacements/kreplacements.cpp') diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp index eb27f86..75894a1 100644 --- a/src/kreplacements/kreplacements.cpp +++ b/src/kreplacements/kreplacements.cpp @@ -122,37 +122,37 @@ TQString getTranslationDir() } // static -void KMessageBox::error( TQWidget* tqparent, const TQString& text, const TQString& caption ) +void KMessageBox::error( TQWidget* parent, const TQString& text, const TQString& caption ) { - TQMessageBox::critical( tqparent, caption, text ); + TQMessageBox::critical( parent, caption, text ); } -int KMessageBox::warningContinueCancel( TQWidget* tqparent, const TQString& text, const TQString& caption, +int KMessageBox::warningContinueCancel( TQWidget* parent, const TQString& text, const TQString& caption, const TQString& button1 ) { - return 0 == TQMessageBox::warning( tqparent, caption, text, button1, "Cancel" ) ? Continue : Cancel; + return 0 == TQMessageBox::warning( parent, caption, text, button1, "Cancel" ) ? Continue : Cancel; } -void KMessageBox::sorry( TQWidget* tqparent, const TQString& text, const TQString& caption ) +void KMessageBox::sorry( TQWidget* parent, const TQString& text, const TQString& caption ) { - TQMessageBox::information( tqparent, caption, text ); + TQMessageBox::information( parent, caption, text ); } -void KMessageBox::information( TQWidget* tqparent, const TQString& text, const TQString& caption ) +void KMessageBox::information( TQWidget* parent, const TQString& text, const TQString& caption ) { - TQMessageBox::information( tqparent, caption, text ); + TQMessageBox::information( parent, caption, text ); } -int KMessageBox::warningYesNo( TQWidget* tqparent, const TQString& text, const TQString& caption, +int KMessageBox::warningYesNo( TQWidget* parent, const TQString& text, const TQString& caption, const TQString& button1, const TQString& button2 ) { - return 0 == TQMessageBox::warning( tqparent, caption, text, button1, button2, TQString(), 1, 1 ) ? Yes : No; + return 0 == TQMessageBox::warning( parent, caption, text, button1, button2, TQString(), 1, 1 ) ? Yes : No; } -int KMessageBox::warningYesNoCancel( TQWidget* tqparent, const TQString& text, const TQString& caption, +int KMessageBox::warningYesNoCancel( TQWidget* parent, const TQString& text, const TQString& caption, const TQString& button1, const TQString& button2 ) { - int val = TQMessageBox::warning( tqparent, caption, text, + int val = TQMessageBox::warning( parent, caption, text, button1, button2, i18n("Cancel") ); if ( val==0 ) return Yes; if ( val==1 ) return No; @@ -160,9 +160,9 @@ int KMessageBox::warningYesNoCancel( TQWidget* tqparent, const TQString& text, c } -KDialogBase::KDialogBase( int, const TQString& caption, int, int, TQWidget* tqparent, const char* name, +KDialogBase::KDialogBase( int, const TQString& caption, int, int, TQWidget* parent, const char* name, bool /*modal*/, bool ) -: TQTabDialog( tqparent, name, true /* modal */ ) +: TQTabDialog( parent, name, true /* modal */ ) { setCaption( caption ); setDefaultButton(); @@ -254,35 +254,35 @@ void KDialogBase::slotHelp( ) KURL KFileDialog::getSaveURL( const TQString &startDir, const TQString &filter, - TQWidget *tqparent, const TQString &caption) + TQWidget *parent, const TQString &caption) { - TQString s = TQFileDialog::getSaveFileName(startDir, filter, tqparent, 0, caption); + TQString s = TQFileDialog::getSaveFileName(startDir, filter, parent, 0, caption); return KURL(s); } KURL KFileDialog::getOpenURL( const TQString & startDir, const TQString & filter, - TQWidget * tqparent, + TQWidget * parent, const TQString & caption ) { - TQString s = TQFileDialog::getOpenFileName(startDir, filter, tqparent, 0, caption); + TQString s = TQFileDialog::getOpenFileName(startDir, filter, parent, 0, caption); return KURL(s); } KURL KFileDialog::getExistingURL( const TQString & startDir, - TQWidget * tqparent, + TQWidget * parent, const TQString & caption) { - TQString s = TQFileDialog::getExistingDirectory(startDir, tqparent, 0, caption); + TQString s = TQFileDialog::getExistingDirectory(startDir, parent, 0, caption); return KURL(s); } TQString KFileDialog::getSaveFileName (const TQString &startDir, const TQString &filter, - TQWidget *tqparent, + TQWidget *parent, const TQString &caption) { - return TQFileDialog::getSaveFileName( startDir, filter, tqparent, 0, caption ); + return TQFileDialog::getSaveFileName( startDir, filter, parent, 0, caption ); } @@ -303,15 +303,15 @@ void KToolBar::setBarPos(BarPosition bp) else if ( bp == Top ) m_pMainWindow->moveDockWindow( this, DockTop ); } -KToolBar::KToolBar( TQMainWindow* tqparent ) -: TQToolBar( tqparent ) +KToolBar::KToolBar( TQMainWindow* parent ) +: TQToolBar( parent ) { - m_pMainWindow = tqparent; + m_pMainWindow = parent; } -KMainWindow::KMainWindow( TQWidget* tqparent, const char* name ) -: TQMainWindow( tqparent, name ), m_actionCollection(this) +KMainWindow::KMainWindow( TQWidget* parent, const char* name ) +: TQMainWindow( parent, name ), m_actionCollection(this) { fileMenu = new TQPopupMenu(); menuBar()->insertItem(i18n("&File"), fileMenu); @@ -582,101 +582,101 @@ bool KToggleAction::isChecked() //static -KAction* KStdAction::open( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::open( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { #include "../xpm/fileopen.xpm" KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Open"), TQIconSet(TQPixmap(fileopen)), TQt::CTRL+TQt::Key_O, tqparent, slot, actionCollection, "open", false, false); + KAction* a = new KAction( i18n("Open"), TQIconSet(TQPixmap(fileopen)), TQt::CTRL+TQt::Key_O, parent, slot, actionCollection, "open", false, false); if(p){ a->addTo( p->fileMenu ); } return a; } -KAction* KStdAction::save( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection ) +KAction* KStdAction::save( TQWidget* parent, const char* slot, KActionCollection* actionCollection ) { #include "../xpm/filesave.xpm" KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Save"), TQIconSet(TQPixmap(filesave)), TQt::CTRL+TQt::Key_S, tqparent, slot, actionCollection, "save", false, false); + KAction* a = new KAction( i18n("Save"), TQIconSet(TQPixmap(filesave)), TQt::CTRL+TQt::Key_S, parent, slot, actionCollection, "save", false, false); if(p){ a->addTo( p->fileMenu ); } return a; } -KAction* KStdAction::saveAs( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::saveAs( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Save As..."), 0, tqparent, slot, actionCollection, "saveas", false, false); + KAction* a = new KAction( i18n("Save As..."), 0, parent, slot, actionCollection, "saveas", false, false); if(p) a->addTo( p->fileMenu ); return a; } -KAction* KStdAction::print( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::print( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { #include "../xpm/fileprint.xpm" KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Print..."), TQIconSet(TQPixmap(fileprint)),TQt::CTRL+TQt::Key_P, tqparent, slot, actionCollection, "print", false, false); + KAction* a = new KAction( i18n("Print..."), TQIconSet(TQPixmap(fileprint)),TQt::CTRL+TQt::Key_P, parent, slot, actionCollection, "print", false, false); if(p) a->addTo( p->fileMenu ); return a; } -KAction* KStdAction::quit( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::quit( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Quit"), TQt::CTRL+TQt::Key_Q, tqparent, slot, actionCollection, "quit", false, false); + KAction* a = new KAction( i18n("Quit"), TQt::CTRL+TQt::Key_Q, parent, slot, actionCollection, "quit", false, false); if(p) a->addTo( p->fileMenu ); return a; } -KAction* KStdAction::cut( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::cut( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Cut"), TQt::CTRL+TQt::Key_X, tqparent, slot, actionCollection, "cut", false, false ); + KAction* a = new KAction( i18n("Cut"), TQt::CTRL+TQt::Key_X, parent, slot, actionCollection, "cut", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::copy( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::copy( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Copy"), TQt::CTRL+TQt::Key_C, tqparent, slot, actionCollection, "copy", false, false ); + KAction* a = new KAction( i18n("Copy"), TQt::CTRL+TQt::Key_C, parent, slot, actionCollection, "copy", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::paste( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::paste( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Paste"), TQt::CTRL+TQt::Key_V, tqparent, slot, actionCollection, "paste", false, false ); + KAction* a = new KAction( i18n("Paste"), TQt::CTRL+TQt::Key_V, parent, slot, actionCollection, "paste", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::selectAll( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::selectAll( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Select All"), TQt::CTRL+TQt::Key_A, tqparent, slot, actionCollection, "selectall", false, false ); + KAction* a = new KAction( i18n("Select All"), TQt::CTRL+TQt::Key_A, parent, slot, actionCollection, "selectall", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KToggleAction* KStdAction::showToolbar( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KToggleAction* KStdAction::showToolbar( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KToggleAction* a = new KToggleAction( i18n("Show Toolbar"), 0, tqparent, slot, actionCollection, "showtoolbar", false ); + KToggleAction* a = new KToggleAction( i18n("Show Toolbar"), 0, parent, slot, actionCollection, "showtoolbar", false ); if(p) a->addTo( p->settingsMenu ); return a; } -KToggleAction* KStdAction::showStatusbar( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KToggleAction* KStdAction::showStatusbar( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KToggleAction* a = new KToggleAction( i18n("Show &Statusbar"), 0, tqparent, slot, actionCollection, "showstatusbar", false ); + KToggleAction* a = new KToggleAction( i18n("Show &Statusbar"), 0, parent, slot, actionCollection, "showstatusbar", false ); if(p) a->addTo( p->settingsMenu ); return a; } -KAction* KStdAction::preferences( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::preferences( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("&Configure %1...").tqarg("KDiff3"), 0, tqparent, slot, actionCollection, "settings", false, false ); + KAction* a = new KAction( i18n("&Configure %1...").tqarg("KDiff3"), 0, parent, slot, actionCollection, "settings", false, false ); if(p) a->addTo( p->settingsMenu ); return a; } @@ -685,10 +685,10 @@ KAction* KStdAction::keyBindings( TQWidget*, const char*, KActionCollection*) return 0; } -KAction* KStdAction::about( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::about( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("About")+" KDiff3", 0, tqparent, slot, actionCollection, "about_kdiff3", false, false ); + KAction* a = new KAction( i18n("About")+" KDiff3", 0, parent, slot, actionCollection, "about_kdiff3", false, false ); if(p) a->addTo( p->helpMenu ); return a; } @@ -701,25 +701,25 @@ KAction* KStdAction::aboutTQt( KActionCollection* actionCollection ) return a; } -KAction* KStdAction::help( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::help( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Help"), TQt::Key_F1, tqparent, slot, actionCollection, "help", false, false ); + KAction* a = new KAction( i18n("Help"), TQt::Key_F1, parent, slot, actionCollection, "help", false, false ); if(p) a->addTo( p->helpMenu ); return a; } -KAction* KStdAction::find( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::find( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Find"), TQt::CTRL+TQt::Key_F, tqparent, slot, actionCollection, "find", false, false ); + KAction* a = new KAction( i18n("Find"), TQt::CTRL+TQt::Key_F, parent, slot, actionCollection, "find", false, false ); if(p) a->addTo( p->editMenu ); return a; } -KAction* KStdAction::findNext( TQWidget* tqparent, const char* slot, KActionCollection* actionCollection) +KAction* KStdAction::findNext( TQWidget* parent, const char* slot, KActionCollection* actionCollection) { KMainWindow* p = actionCollection->m_pMainWindow; - KAction* a = new KAction( i18n("Find Next"), TQt::Key_F3, tqparent, slot, actionCollection, "findNext", false, false ); + KAction* a = new KAction( i18n("Find Next"), TQt::Key_F3, parent, slot, actionCollection, "findNext", false, false ); if(p) a->addTo( p->editMenu ); return a; } @@ -785,8 +785,8 @@ void KFontChooser::slotSelectFont() } -KColorButton::KColorButton(TQWidget* tqparent) -: TQPushButton(tqparent) +KColorButton::KColorButton(TQWidget* parent) +: TQPushButton(parent) { connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); } -- cgit v1.2.1