From 55a37a1d284211acad70227b09952c24aa56e15d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:07:23 -0600 Subject: Rename obsolete tq methods to standard names (cherry picked from commit c7d9d93a4d21d05023118477400b605efc8e4369) --- src/kdesvnview.cpp | 4 ++-- src/ksvnwidgets/authdlg.ui | 4 ++-- src/ksvnwidgets/logmessage.ui | 4 ++-- src/settings/cmdexecsettings.ui | 4 ++-- src/settings/diffmergesettings.ui | 4 ++-- src/settings/dispcolor_settings.ui | 2 +- src/settings/display_settings.ui | 6 +++--- src/settings/revisiontree_settings.ui | 10 +++++----- src/svnfrontend/copymoveview.ui | 2 +- src/svnfrontend/createrepo_dlg.ui | 4 ++-- src/svnfrontend/dumprepo_dlg.ui | 4 ++-- src/svnfrontend/editpropsdlg.ui | 6 +++--- src/svnfrontend/fronthelpers/checkoutinfo.ui | 6 +++--- src/svnfrontend/hotcopydlg.ui | 2 +- src/svnfrontend/kdesvnfilelist.cpp | 4 ++-- src/svnfrontend/loaddmpdlg.ui | 2 +- src/svnfrontend/merge_dlg.ui | 6 +++--- src/svnfrontend/stopdlg.cpp | 10 +++++----- src/svnfrontend/stopdlg.h | 2 +- src/svnfrontend/svnactions.cpp | 2 +- src/svnfrontend/svnfiletip.cpp | 8 ++++---- src/svnfrontend/svnlogdlg.ui | 6 +++--- 22 files changed, 51 insertions(+), 51 deletions(-) (limited to 'src') diff --git a/src/kdesvnview.cpp b/src/kdesvnview.cpp index 34a4314..756f414 100644 --- a/src/kdesvnview.cpp +++ b/src/kdesvnview.cpp @@ -94,7 +94,7 @@ kdesvnView::kdesvnView(KActionCollection*aCollection,TQWidget *parent,const char connect(m_flist,TQT_SIGNAL(sigUrlChanged( const TQString& )),this,TQT_SLOT(slotUrlChanged(const TQString&))); connect(m_flist,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG))); connect(this,TQT_SIGNAL(sigMakeBaseDirs()),m_flist,TQT_SLOT(slotMkBaseDirs())); - KConfigGroup cs(Kdesvnsettings::self()->config(),"kdesvn-maintqlayout"); + KConfigGroup cs(Kdesvnsettings::self()->config(),"kdesvn-mainlayout"); TQString t1 = cs.readEntry("split1",TQString()); if (!t1.isEmpty()) { TQTextStream st1(&t1,IO_ReadOnly); @@ -116,7 +116,7 @@ void kdesvnView::slotAppendLog(const TQString& text) kdesvnView::~kdesvnView() { - KConfigGroup cs(Kdesvnsettings::self()->config(),"kdesvn-maintqlayout"); + KConfigGroup cs(Kdesvnsettings::self()->config(),"kdesvn-mainlayout"); TQString t1,t2; TQTextStream st1(&t1,IO_WriteOnly); st1 << *m_Splitter; diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui index d4ae7d2..6b18120 100644 --- a/src/ksvnwidgets/authdlg.ui +++ b/src/ksvnwidgets/authdlg.ui @@ -32,7 +32,7 @@ - tqlayout4 + layout4 @@ -82,7 +82,7 @@ - tqlayout3 + layout3 diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui index 8e36d3d..fda99d2 100644 --- a/src/ksvnwidgets/logmessage.ui +++ b/src/ksvnwidgets/logmessage.ui @@ -92,7 +92,7 @@ - tqlayout5 + layout5 @@ -181,7 +181,7 @@ - tqlayout6 + layout6 diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui index 968b832..0b0837c 100644 --- a/src/settings/cmdexecsettings.ui +++ b/src/settings/cmdexecsettings.ui @@ -29,7 +29,7 @@ - tqlayout2 + layout2 @@ -84,7 +84,7 @@ - tqlayout2 + layout2 diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui index 2c4019b..7592338 100644 --- a/src/settings/diffmergesettings.ui +++ b/src/settings/diffmergesettings.ui @@ -75,7 +75,7 @@ - tqlayout2 + layout2 @@ -94,7 +94,7 @@ - tqlayout2 + layout2 diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui index 88c3a3b..d2bc5c7 100644 --- a/src/settings/dispcolor_settings.ui +++ b/src/settings/dispcolor_settings.ui @@ -32,7 +32,7 @@ - tqlayout2 + layout2 diff --git a/src/settings/display_settings.ui b/src/settings/display_settings.ui index 11847f8..82d92e4 100644 --- a/src/settings/display_settings.ui +++ b/src/settings/display_settings.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -127,7 +127,7 @@ If networking is disabled, then this flag is ignored. - tqlayout2_2 + layout2_2 @@ -160,7 +160,7 @@ When kde-default is wanted for opening on double click, enter &quot;default& - tqlayout3 + layout3 diff --git a/src/settings/revisiontree_settings.ui b/src/settings/revisiontree_settings.ui index f17dfd6..b8a9ce4 100644 --- a/src/settings/revisiontree_settings.ui +++ b/src/settings/revisiontree_settings.ui @@ -66,7 +66,7 @@ - tqlayout4 + layout4 @@ -95,7 +95,7 @@ - tqlayout3 + layout3 @@ -124,7 +124,7 @@ - tqlayout2 + layout2 @@ -153,7 +153,7 @@ - tqlayout5 + layout5 @@ -182,7 +182,7 @@ - tqlayout6 + layout6 diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui index d36fdac..f16b5b0 100644 --- a/src/svnfrontend/copymoveview.ui +++ b/src/svnfrontend/copymoveview.ui @@ -54,7 +54,7 @@ - tqlayout5 + layout5 diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui index e80aab6..0ca5ef5 100644 --- a/src/svnfrontend/createrepo_dlg.ui +++ b/src/svnfrontend/createrepo_dlg.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -119,7 +119,7 @@ Create trunk, tags and branches folder - If this is set then the base tqlayout (<tt>/trunk</tt>,<tt>/branches</tt> and <tt>/tags</tt>) will created after opening the fresh repository. + If this is set then the base layout (<tt>/trunk</tt>,<tt>/branches</tt> and <tt>/tags</tt>) will created after opening the fresh repository. diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui index aad99e6..5238574 100644 --- a/src/svnfrontend/dumprepo_dlg.ui +++ b/src/svnfrontend/dumprepo_dlg.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -105,7 +105,7 @@ - tqlayout6 + layout6 diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui index 5d8535e..68aa585 100644 --- a/src/svnfrontend/editpropsdlg.ui +++ b/src/svnfrontend/editpropsdlg.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -79,7 +79,7 @@ - tqlayout24 + layout24 @@ -105,7 +105,7 @@ - tqlayout23 + layout23 diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui index 33aa873..1f3d2da 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo.ui +++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui @@ -21,7 +21,7 @@ - tqlayout2 + layout2 @@ -96,7 +96,7 @@ - tqlayout2 + layout2 @@ -134,7 +134,7 @@ - tqlayout4 + layout4 diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui index 74aecee..6dd3193 100644 --- a/src/svnfrontend/hotcopydlg.ui +++ b/src/svnfrontend/hotcopydlg.ui @@ -18,7 +18,7 @@ - tqlayout2 + layout2 diff --git a/src/svnfrontend/kdesvnfilelist.cpp b/src/svnfrontend/kdesvnfilelist.cpp index b57de87..a15415f 100644 --- a/src/svnfrontend/kdesvnfilelist.cpp +++ b/src/svnfrontend/kdesvnfilelist.cpp @@ -1673,7 +1673,7 @@ void kdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) KListView::viewportPaintEvent(ev); if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) { TQPainter painter(viewport()); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), + style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), TQStyle::Style_FocusAtBorder); } } @@ -2307,7 +2307,7 @@ void kdesvnfilelist::slotMkBaseDirs() targets.append(parentDir+"/trunk"); targets.append(parentDir+"/branches"); targets.append(parentDir+"/tags"); - TQString msg = i18n("Automatic generated base tqlayout by kdesvn"); + TQString msg = i18n("Automatic generated base layout by kdesvn"); isopen = m_SvnWrapper->makeMkdir(targets,msg); if (isopen) { slotDirAdded(targets[0],0); diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui index ae05cc9..470a266 100644 --- a/src/svnfrontend/loaddmpdlg.ui +++ b/src/svnfrontend/loaddmpdlg.ui @@ -18,7 +18,7 @@ - tqlayout9 + layout9 diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui index c0f5ba7..547b07b 100644 --- a/src/svnfrontend/merge_dlg.ui +++ b/src/svnfrontend/merge_dlg.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 @@ -29,7 +29,7 @@ - tqlayout6 + layout6 @@ -87,7 +87,7 @@ - tqlayout4 + layout4 diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index 2d064f3..2487f8a 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -49,15 +49,15 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt mCancelText = actionButton(KDialogBase::Cancel)->text(); TQFrame* mainWidget = plainPage(); - tqlayout = new TQVBoxLayout(mainWidget, 10); + layout = new TQVBoxLayout(mainWidget, 10); mLabel = new TQLabel(text, mainWidget); - tqlayout->addWidget(mLabel); + layout->addWidget(mLabel); m_ProgressBar=new KProgress(15,mainWidget); m_ProgressBar->setCenterIndicator (false); m_ProgressBar->setTextEnabled(false); - tqlayout->addWidget(m_ProgressBar); + layout->addWidget(m_ProgressBar); m_NetBar = new KProgress(15,mainWidget); - tqlayout->addWidget(m_NetBar); + layout->addWidget(m_NetBar); mWait = false; m_LogWindow = 0; @@ -162,7 +162,7 @@ void StopDlg::slotExtraMessage(const TQString&msg) if (!m_LogWindow) { TQFrame* mainWidget = plainPage(); m_LogWindow = new KTextBrowser(mainWidget); - tqlayout->addWidget(m_LogWindow); + layout->addWidget(m_LogWindow); m_LogWindow->show(); resize( TQSize(500, 400).expandedTo(minimumSizeHint()) ); } diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h index 0194fcc..ba86772 100644 --- a/src/svnfrontend/stopdlg.h +++ b/src/svnfrontend/stopdlg.h @@ -62,7 +62,7 @@ protected: bool m_netBarShown; TQTime m_StopTick; KTextBrowser*m_LogWindow; - TQVBoxLayout*tqlayout; + TQVBoxLayout*layout; TQString m_lastLog; unsigned int m_lastLogLines; diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index 2edd964..06ab0e4 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -1458,7 +1458,7 @@ void SvnActions::prepareUpdate(bool ask) return; } rdlg->setStartOnly(true); - /* just here cause tqlayout has changed meanwhile */ + /* just here cause layout has changed meanwhile */ dlg->resize( TQSize(120,60).expandedTo(dlg->minimumSizeHint()) ); int result; if ((result=dlg->exec())==TQDialog::Accepted) { diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index 80e8877..7f4c857 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -48,10 +48,10 @@ SvnFileTip::SvnFileTip(TQScrollView*parent) m_textLabel = new TQLabel(this); m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop); - TQGridLayout* tqlayout = new TQGridLayout(this, 1, 2, 8, 0); - tqlayout->addWidget(m_iconLabel, 0, 0); - tqlayout->addWidget(m_textLabel, 0, 1); - tqlayout->setResizeMode(TQLayout::Fixed); + TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0); + layout->addWidget(m_iconLabel, 0, 0); + layout->addWidget(m_textLabel, 0, 1); + layout->setResizeMode(TQLayout::Fixed); setPalette( TQToolTip::palette() ); setMargin( 1 ); diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui index 86a7b6a..fd93f35 100644 --- a/src/svnfrontend/svnlogdlg.ui +++ b/src/svnfrontend/svnlogdlg.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 @@ -29,7 +29,7 @@ - tqlayout4 + layout4 @@ -246,7 +246,7 @@ - tqlayout3 + layout3 -- cgit v1.2.1