From 79f7061c5e7cc9c38e2a98dad7c005ce4ff836c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:04:18 -0600 Subject: [PATCH] Rename obsolete tq methods to standard names (cherry picked from commit de122aa7805984226a4270c63b0f69e7b5022930) --- src/kchmbookmarkwindow.cpp | 14 ++--- src/kchmdialogchooseurlfromlist.cpp | 14 ++--- src/kchmindexwindow.cpp | 10 +-- src/kchmmainwindow.cpp | 2 +- src/kchmsearchwindow.cpp | 26 ++++---- src/kchmsetupdialog.cpp | 92 ++++++++++++++-------------- src/kchmsetupdialog.ui | 6 +- src/kchmtreeviewitem.cpp | 2 +- src/kde/kchmviewwindow_khtmlpart.cpp | 2 +- 9 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/kchmbookmarkwindow.cpp b/src/kchmbookmarkwindow.cpp index 0f90284..a95953c 100644 --- a/src/kchmbookmarkwindow.cpp +++ b/src/kchmbookmarkwindow.cpp @@ -30,24 +30,24 @@ KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *parent, const char *name) : TQWidget(parent, name) { - TQVBoxLayout * tqlayout = new TQVBoxLayout (this); - tqlayout->setMargin (5); + TQVBoxLayout * layout = new TQVBoxLayout (this); + layout->setMargin (5); m_bookmarkList = new KQListView (this); m_bookmarkList->addColumn( "bookmark" ); // no need to i18n - the column is hidden m_bookmarkList->header()->hide(); - tqlayout->addWidget (m_bookmarkList); + layout->addWidget (m_bookmarkList); new KCHMListItemTooltip( m_bookmarkList ); - TQHBoxLayout * htqlayout = new TQHBoxLayout (tqlayout); + TQHBoxLayout * hlayout = new TQHBoxLayout (layout); TQPushButton * add = new TQPushButton ( i18n( "&Add" ), this); TQPushButton * edit = new TQPushButton ( i18n( "&Edit" ), this); TQPushButton * del = new TQPushButton ( i18n( "&Del" ), this); - htqlayout->addWidget (add); - htqlayout->addWidget (edit); - htqlayout->addWidget (del); + hlayout->addWidget (add); + hlayout->addWidget (edit); + hlayout->addWidget (del); connect( m_bookmarkList, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), diff --git a/src/kchmdialogchooseurlfromlist.cpp b/src/kchmdialogchooseurlfromlist.cpp index 57db28e..41bc64a 100644 --- a/src/kchmdialogchooseurlfromlist.cpp +++ b/src/kchmdialogchooseurlfromlist.cpp @@ -27,8 +27,8 @@ KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& urls, const TQStringList& titles, TQWidget* parent) : TQDialog(parent, 0, true) { - TQVBoxLayout * tqlayout = new TQVBoxLayout (this); - tqlayout->setMargin (5); + TQVBoxLayout * layout = new TQVBoxLayout (this); + layout->setMargin (5); TQListView * m_urlsList = new TQListView (this); m_urlsList->addColumn( i18n( "Topics" ) ); @@ -36,15 +36,15 @@ KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& url for ( unsigned int i = 0; i < urls.size(); i++ ) new KCHMSingleTreeViewItem (m_urlsList, titles[i], urls[i]); - tqlayout->addWidget ( new TQLabel( i18n( "Please select one of the topics below:"), this) ); - tqlayout->addWidget ( m_urlsList ); + layout->addWidget ( new TQLabel( i18n( "Please select one of the topics below:"), this) ); + layout->addWidget ( m_urlsList ); - TQHBoxLayout * htqlayout = new TQHBoxLayout (tqlayout); + TQHBoxLayout * hlayout = new TQHBoxLayout (layout); TQPushButton * bok = new TQPushButton( i18n( "&Ok" ), this); TQPushButton * bcancel = new TQPushButton( i18n( "&Cancel" ), this); - htqlayout->addWidget (bok); - htqlayout->addWidget (bcancel); + hlayout->addWidget (bok); + hlayout->addWidget (bcancel); connect( m_urlsList, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) ); connect( m_urlsList, TQT_SIGNAL( currentChanged ( TQListViewItem *) ), this, TQT_SLOT( onCurrentChanged ( TQListViewItem *) ) ); diff --git a/src/kchmindexwindow.cpp b/src/kchmindexwindow.cpp index 9473cf2..a4c8f60 100644 --- a/src/kchmindexwindow.cpp +++ b/src/kchmindexwindow.cpp @@ -34,8 +34,8 @@ KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags f ) : TQWidget (parent, name, f) { - TQVBoxLayout * tqlayout = new TQVBoxLayout (this); - tqlayout->setMargin (5); + TQVBoxLayout * layout = new TQVBoxLayout (this); + layout->setMargin (5); m_indexFinder = new TQLineEdit (this); m_indexFinder->setFocus(); @@ -47,9 +47,9 @@ KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags m_indexList->setShowToolTips(true); //m_indexList->setSorting( 0, true ); - tqlayout->addWidget (m_indexFinder); - tqlayout->addSpacing (10); - tqlayout->addWidget (m_indexList); + layout->addWidget (m_indexFinder); + layout->addSpacing (10); + layout->addWidget (m_indexList); connect( m_indexFinder, TQT_SIGNAL( textChanged (const TQString &) ), diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp index 9a3ad17..dcdd1dc 100644 --- a/src/kchmmainwindow.cpp +++ b/src/kchmmainwindow.cpp @@ -82,7 +82,7 @@ KCHMMainWindow::KCHMMainWindow() m_currentSettings = new KCHMSettings; - // Create the initial tqlayout - a splitter with tab window in left, and text browser in right + // Create the initial layout - a splitter with tab window in left, and text browser in right m_windowSplitter = new TQSplitter(this); m_tabWidget = new KTQTabWidget( m_windowSplitter ); m_viewWindowMgr = new KCHMViewWindowMgr( m_windowSplitter ); diff --git a/src/kchmsearchwindow.cpp b/src/kchmsearchwindow.cpp index c760339..be0122c 100644 --- a/src/kchmsearchwindow.cpp +++ b/src/kchmsearchwindow.cpp @@ -34,21 +34,21 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags f ) : TQWidget (parent, name, f) { - TQVBoxLayout * tqlayout = new TQVBoxLayout (this); - tqlayout->setMargin(6); - tqlayout->setSpacing(6); + TQVBoxLayout * layout = new TQVBoxLayout (this); + layout->setMargin(6); + layout->setSpacing(6); // Labels and - TQHBoxLayout * labeltqlayout = new TQHBoxLayout(); - labeltqlayout->addWidget( new TQLabel( i18n( "Type in word(s) to search for:"), this) ); - labeltqlayout->addStretch( 10 ); + TQHBoxLayout * labellayout = new TQHBoxLayout(); + labellayout->addWidget( new TQLabel( i18n( "Type in word(s) to search for:"), this) ); + labellayout->addStretch( 10 ); KCHMClickableLabel * helplink = new KCHMClickableLabel( i18n( "Help"), this ); connect( helplink, TQT_SIGNAL( clicked() ), this, TQT_SLOT( onHelpClicked() ) ); helplink->setCursor( TQCursor( TQt::PointingHandCursor ) ); - labeltqlayout->addWidget ( helplink ); - tqlayout->addLayout( labeltqlayout ); + labellayout->addWidget ( helplink ); + layout->addLayout( labellayout ); m_searchQuery = new TQComboBox (TRUE, this); m_searchQuery->setFocus(); @@ -58,9 +58,9 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags TQPushButton * searchButton = new TQPushButton ( i18n("Go"), this); searchButton->setSizePolicy ( TQSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); - TQHBoxLayout * htqlayout = new TQHBoxLayout ( tqlayout ); - htqlayout->addWidget ( m_searchQuery ); - htqlayout->addWidget ( searchButton ); + TQHBoxLayout * hlayout = new TQHBoxLayout ( layout ); + hlayout->addWidget ( m_searchQuery ); + hlayout->addWidget ( searchButton ); m_searchList = new KQListView (this); m_searchList->addColumn( i18n( "Title" ) ); @@ -87,8 +87,8 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags this, TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) ); - //tqlayout->addSpacing (10); - tqlayout->addWidget (m_searchList); + //layout->addSpacing (10); + layout->addWidget (m_searchList); new KCHMListItemTooltip( m_searchList ); m_contextMenu = 0; diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp index a9b5668..a1d6b9b 100644 --- a/src/kchmsetupdialog.cpp +++ b/src/kchmsetupdialog.cpp @@ -47,13 +47,13 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal Widget8 = new TQWidget( tabWidget, "Widget8" ); Widget8Layout = new TQVBoxLayout( Widget8, 11, 6, "Widget8Layout"); - tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); + layout4 = new TQHBoxLayout( 0, 0, 6, "layout4"); buttonGroup1 = new TQButtonGroup( Widget8, "buttonGroup1" ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->tqlayout()->setSpacing( 6 ); - buttonGroup1->tqlayout()->setMargin( 11 ); - buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() ); + buttonGroup1->layout()->setSpacing( 6 ); + buttonGroup1->layout()->setMargin( 11 ); + buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); buttonGroup1Layout->setAlignment( TQt::AlignTop ); m_radioOnBeginOpenDialog = new TQRadioButton( buttonGroup1, "m_radioOnBeginOpenDialog" ); @@ -61,45 +61,45 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal m_radioOnBeginOpenLast = new TQRadioButton( buttonGroup1, "m_radioOnBeginOpenLast" ); buttonGroup1Layout->addWidget( m_radioOnBeginOpenLast ); - tqlayout4->addWidget( buttonGroup1 ); + layout4->addWidget( buttonGroup1 ); buttonGroup2 = new TQButtonGroup( Widget8, "buttonGroup2" ); buttonGroup2->setColumnLayout(0, Qt::Vertical ); - buttonGroup2->tqlayout()->setSpacing( 6 ); - buttonGroup2->tqlayout()->setMargin( 11 ); - buttonGroup2Layout = new TQVBoxLayout( buttonGroup2->tqlayout() ); + buttonGroup2->layout()->setSpacing( 6 ); + buttonGroup2->layout()->setMargin( 11 ); + buttonGroup2Layout = new TQVBoxLayout( buttonGroup2->layout() ); buttonGroup2Layout->setAlignment( TQt::AlignTop ); - tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); + layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); textLabel1 = new TQLabel( buttonGroup2, "textLabel1" ); - tqlayout3->addWidget( textLabel1 ); + layout3->addWidget( textLabel1 ); m_historySize = new TQSpinBox( buttonGroup2, "m_historySize" ); m_historySize->setValue( 10 ); - tqlayout3->addWidget( m_historySize ); + layout3->addWidget( m_historySize ); textLabel2 = new TQLabel( buttonGroup2, "textLabel2" ); - tqlayout3->addWidget( textLabel2 ); - buttonGroup2Layout->addLayout( tqlayout3 ); + layout3->addWidget( textLabel2 ); + buttonGroup2Layout->addLayout( layout3 ); m_rememberHistoryInfo = new TQCheckBox( buttonGroup2, "m_rememberHistoryInfo" ); buttonGroup2Layout->addWidget( m_rememberHistoryInfo ); - tqlayout4->addWidget( buttonGroup2 ); - Widget8Layout->addLayout( tqlayout4 ); + layout4->addWidget( buttonGroup2 ); + Widget8Layout->addLayout( layout4 ); groupBox1 = new TQGroupBox( Widget8, "groupBox1" ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); - groupBox1Layout = new TQHBoxLayout( groupBox1->tqlayout() ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + groupBox1Layout = new TQHBoxLayout( groupBox1->layout() ); groupBox1Layout->setAlignment( TQt::AlignTop ); buttonGroup4 = new TQButtonGroup( groupBox1, "buttonGroup4" ); buttonGroup4->setColumnLayout(0, Qt::Vertical ); - buttonGroup4->tqlayout()->setSpacing( 6 ); - buttonGroup4->tqlayout()->setMargin( 11 ); - buttonGroup4Layout = new TQVBoxLayout( buttonGroup4->tqlayout() ); + buttonGroup4->layout()->setSpacing( 6 ); + buttonGroup4->layout()->setMargin( 11 ); + buttonGroup4Layout = new TQVBoxLayout( buttonGroup4->layout() ); buttonGroup4Layout->setAlignment( TQt::AlignTop ); m_radioExtLinkOpenAlways = new TQRadioButton( buttonGroup4, "m_radioExtLinkOpenAlways" ); @@ -114,9 +114,9 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal buttonGroup5 = new TQButtonGroup( groupBox1, "buttonGroup5" ); buttonGroup5->setColumnLayout(0, Qt::Vertical ); - buttonGroup5->tqlayout()->setSpacing( 6 ); - buttonGroup5->tqlayout()->setMargin( 11 ); - buttonGroup5Layout = new TQVBoxLayout( buttonGroup5->tqlayout() ); + buttonGroup5->layout()->setSpacing( 6 ); + buttonGroup5->layout()->setMargin( 11 ); + buttonGroup5Layout = new TQVBoxLayout( buttonGroup5->layout() ); buttonGroup5Layout->setAlignment( TQt::AlignTop ); m_radioNewChmOpenAlways = new TQRadioButton( buttonGroup5, "m_radioNewChmOpenAlways" ); @@ -136,9 +136,9 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal m_groupQtsettings = new TQGroupBox( Widget9, "m_groupQtsettings" ); m_groupQtsettings->setColumnLayout(0, Qt::Vertical ); - m_groupQtsettings->tqlayout()->setSpacing( 6 ); - m_groupQtsettings->tqlayout()->setMargin( 11 ); - m_groupQtsettingsLayout = new TQHBoxLayout( m_groupQtsettings->tqlayout() ); + m_groupQtsettings->layout()->setSpacing( 6 ); + m_groupQtsettings->layout()->setMargin( 11 ); + m_groupQtsettingsLayout = new TQHBoxLayout( m_groupQtsettings->layout() ); m_groupQtsettingsLayout->setAlignment( TQt::AlignTop ); textLabel1_2 = new TQLabel( m_groupQtsettings, "textLabel1_2" ); @@ -154,16 +154,16 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal m_groupKDEsettings = new TQGroupBox( Widget9, "m_groupKDEsettings" ); m_groupKDEsettings->setColumnLayout(0, Qt::Vertical ); - m_groupKDEsettings->tqlayout()->setSpacing( 6 ); - m_groupKDEsettings->tqlayout()->setMargin( 11 ); - m_groupKDEsettingsLayout = new TQHBoxLayout( m_groupKDEsettings->tqlayout() ); + m_groupKDEsettings->layout()->setSpacing( 6 ); + m_groupKDEsettings->layout()->setMargin( 11 ); + m_groupKDEsettingsLayout = new TQHBoxLayout( m_groupKDEsettings->layout() ); m_groupKDEsettingsLayout->setAlignment( TQt::AlignTop ); buttonGroup5_2 = new TQButtonGroup( m_groupKDEsettings, "buttonGroup5_2" ); buttonGroup5_2->setColumnLayout(0, Qt::Vertical ); - buttonGroup5_2->tqlayout()->setSpacing( 6 ); - buttonGroup5_2->tqlayout()->setMargin( 11 ); - buttonGroup5_2Layout = new TQVBoxLayout( buttonGroup5_2->tqlayout() ); + buttonGroup5_2->layout()->setSpacing( 6 ); + buttonGroup5_2->layout()->setMargin( 11 ); + buttonGroup5_2Layout = new TQVBoxLayout( buttonGroup5_2->layout() ); buttonGroup5_2Layout->setAlignment( TQt::AlignTop ); m_radioUseQtextBrowser = new TQRadioButton( buttonGroup5_2, "m_radioUseQtextBrowser" ); @@ -175,9 +175,9 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal groupKhtmlSecurity = new TQGroupBox( m_groupKDEsettings, "groupKhtmlSecurity" ); groupKhtmlSecurity->setColumnLayout(0, Qt::Vertical ); - groupKhtmlSecurity->tqlayout()->setSpacing( 6 ); - groupKhtmlSecurity->tqlayout()->setMargin( 11 ); - groupKhtmlSecurityLayout = new TQGridLayout( groupKhtmlSecurity->tqlayout() ); + groupKhtmlSecurity->layout()->setSpacing( 6 ); + groupKhtmlSecurity->layout()->setMargin( 11 ); + groupKhtmlSecurityLayout = new TQGridLayout( groupKhtmlSecurity->layout() ); groupKhtmlSecurityLayout->setAlignment( TQt::AlignTop ); m_enableJS = new TQCheckBox( groupKhtmlSecurity, "m_enableJS" ); @@ -204,9 +204,9 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal buttonGroup7 = new TQButtonGroup( TabPage, "buttonGroup7" ); buttonGroup7->setColumnLayout(0, Qt::Vertical ); - buttonGroup7->tqlayout()->setSpacing( 6 ); - buttonGroup7->tqlayout()->setMargin( 11 ); - buttonGroup7Layout = new TQVBoxLayout( buttonGroup7->tqlayout() ); + buttonGroup7->layout()->setSpacing( 6 ); + buttonGroup7->layout()->setMargin( 11 ); + buttonGroup7Layout = new TQVBoxLayout( buttonGroup7->layout() ); buttonGroup7Layout->setAlignment( TQt::AlignTop ); m_advViewSourceInternal = new TQRadioButton( buttonGroup7, "m_advViewSourceInternal" ); @@ -215,21 +215,21 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal m_advViewSourceExternal = new TQRadioButton( buttonGroup7, "m_advViewSourceExternal" ); buttonGroup7Layout->addWidget( m_advViewSourceExternal ); - tqlayout4_2 = new TQHBoxLayout( 0, 0, 6, "tqlayout4_2"); + layout4_2 = new TQHBoxLayout( 0, 0, 6, "layout4_2"); textLabel1_3 = new TQLabel( buttonGroup7, "textLabel1_3" ); - tqlayout4_2->addWidget( textLabel1_3 ); + layout4_2->addWidget( textLabel1_3 ); m_advExternalProgramName = new TQLineEdit( buttonGroup7, "m_advExternalProgramName" ); - tqlayout4_2->addWidget( m_advExternalProgramName ); - buttonGroup7Layout->addLayout( tqlayout4_2 ); + layout4_2->addWidget( m_advExternalProgramName ); + buttonGroup7Layout->addLayout( layout4_2 ); TabPageLayout->addWidget( buttonGroup7 ); groupBox6 = new TQButtonGroup( TabPage, "groupBox6" ); groupBox6->setColumnLayout(0, Qt::Vertical ); - groupBox6->tqlayout()->setSpacing( 6 ); - groupBox6->tqlayout()->setMargin( 11 ); - groupBox6Layout = new TQGridLayout( groupBox6->tqlayout() ); + groupBox6->layout()->setSpacing( 6 ); + groupBox6->layout()->setMargin( 11 ); + groupBox6Layout = new TQGridLayout( groupBox6->layout() ); groupBox6Layout->setAlignment( TQt::AlignTop ); m_useSearchEngineInternal = new TQRadioButton( groupBox6, "m_useSearchEngineInternal" ); diff --git a/src/kchmsetupdialog.ui b/src/kchmsetupdialog.ui index 6c60c73..f4e3ca0 100644 --- a/src/kchmsetupdialog.ui +++ b/src/kchmsetupdialog.ui @@ -59,7 +59,7 @@ - tqlayout4 + layout4 @@ -110,7 +110,7 @@ - tqlayout3 + layout3 @@ -470,7 +470,7 @@ - tqlayout4 + layout4 diff --git a/src/kchmtreeviewitem.cpp b/src/kchmtreeviewitem.cpp index ccd4776..210be77 100644 --- a/src/kchmtreeviewitem.cpp +++ b/src/kchmtreeviewitem.cpp @@ -101,7 +101,7 @@ void KCHMIndTocItem::paintBranches( TQPainter * p, const TQColorGroup & cg, int TQStyleOption opt( 0, 0 ); TQStyle::SFlags how = TQStyle::Style_Default | TQStyle::Style_Enabled; - listView()->tqstyle().drawComplexControl( TQStyle::CC_ListView, + listView()->style().drawComplexControl( TQStyle::CC_ListView, p, listView(), TQRect( 0, 0, w, h ), cg, how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); diff --git a/src/kde/kchmviewwindow_khtmlpart.cpp b/src/kde/kchmviewwindow_khtmlpart.cpp index 4fe3b47..a2f02e1 100644 --- a/src/kde/kchmviewwindow_khtmlpart.cpp +++ b/src/kde/kchmviewwindow_khtmlpart.cpp @@ -152,7 +152,7 @@ void KCHMViewWindow_KHTMLPart::clipCopy() TQString text = selectedText(); if ( !text.isEmpty() ) - TQApplication::tqclipboard()->setText( text ); + TQApplication::clipboard()->setText( text ); } void KCHMViewWindow_KHTMLPart::onPopupMenu ( const TQString &url, const TQPoint & point )