From 04fccf73370ad95a70b8e107240e50f9fdbf98fc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:03:56 -0600 Subject: Rename obsolete tq methods to standard names --- src/gvcore/deletedialogbase.ui | 2 +- src/gvcore/externaltooldialogbase.ui | 2 +- src/gvcore/filethumbnailview.cpp | 6 +++--- src/gvcore/fileviewcontroller.cpp | 8 ++++---- src/gvcore/fullscreenbar.cpp | 2 +- src/gvcore/imageviewconfig.kcfg | 2 +- src/gvcore/imageviewcontroller.cpp | 6 +++--- src/gvcore/printdialog.cpp | 4 ++-- src/gvcore/printdialogpagebase.ui | 6 +++--- src/gvcore/thumbnaildetailsdialogbase.ui | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/gvcore') diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui index f7d6f90..7a8ffd4 100644 --- a/src/gvcore/deletedialogbase.ui +++ b/src/gvcore/deletedialogbase.ui @@ -21,7 +21,7 @@ - tqlayout3 + layout3 diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui index 2c25a92..e35f222 100644 --- a/src/gvcore/externaltooldialogbase.ui +++ b/src/gvcore/externaltooldialogbase.ui @@ -153,7 +153,7 @@ - tqlayout3 + layout3 diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index c6760fe..4867781 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/src/gvcore/filethumbnailview.cpp @@ -77,8 +77,8 @@ public: ProgressWidget(FileThumbnailView* view, int count) : TQFrame(view) { - TQHBoxLayout* tqlayout=new TQHBoxLayout(this, 3, 3); - tqlayout->setAutoAdd(true); + TQHBoxLayout* layout=new TQHBoxLayout(this, 3, 3); + layout->setAutoAdd(true); setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); mStop=new TQPushButton(this); @@ -93,7 +93,7 @@ public: void polish() { TQFrame::polish(); - setMinimumWidth(tqlayout()->minimumSize().width()); + setMinimumWidth(layout()->minimumSize().width()); //setFixedHeight( mProgressBar->height() ); setFixedHeight( mStop->height() ); } diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp index 1cd795e..86a0282 100644 --- a/src/gvcore/fileviewcontroller.cpp +++ b/src/gvcore/fileviewcontroller.cpp @@ -268,10 +268,10 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio d->initFilterCombo(); d->mStack=new TQWidgetStack(this); - TQVBoxLayout *tqlayout=new TQVBoxLayout(this); - tqlayout->addWidget(d->mToolBar); - tqlayout->addWidget(d->mFilterBar); - tqlayout->addWidget(d->mStack); + TQVBoxLayout *layout=new TQVBoxLayout(this); + layout->addWidget(d->mToolBar); + layout->addWidget(d->mFilterBar); + layout->addWidget(d->mStack); // Actions mSelectFirst=new KAction(i18n("&First"), diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp index be2b517..bc8375f 100644 --- a/src/gvcore/fullscreenbar.cpp +++ b/src/gvcore/fullscreenbar.cpp @@ -123,7 +123,7 @@ void FullScreenBar::showEvent(TQShowEvent* event) { if (!d->mFirstShow) return; d->mFirstShow=false; move(0, -height()); - tqlayout()->setResizeMode(TQLayout::Fixed); + layout()->setResizeMode(TQLayout::Fixed); } diff --git a/src/gvcore/imageviewconfig.kcfg b/src/gvcore/imageviewconfig.kcfg index 6424202..e5c1e04 100644 --- a/src/gvcore/imageviewconfig.kcfg +++ b/src/gvcore/imageviewconfig.kcfg @@ -18,7 +18,7 @@ false - TQApplication::tqpalette().active().dark() + TQApplication::palette().active().dark() false diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index f24a2e8..7387cb8 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -275,12 +275,12 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K d->mContainer=new TQWidget(parent); d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size - TQVBoxLayout* tqlayout=new TQVBoxLayout(d->mContainer); + TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer); d->mToolBar=new KToolBar(d->mContainer, "", true); - tqlayout->add(d->mToolBar); + layout->add(d->mToolBar); d->mStack=new TQWidgetStack(d->mContainer); - tqlayout->add(d->mStack); + layout->add(d->mStack); d->mImageView=new ImageView(d->mStack, document, actionCollection); d->mStack->addWidget(d->mImageView); diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp index 003fb3a..3b013b3 100644 --- a/src/gvcore/printdialog.cpp +++ b/src/gvcore/printdialog.cpp @@ -82,8 +82,8 @@ PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const ch mContent = new PrintDialogPageBase(this); setTitle( mContent->caption() ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( mContent ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( mContent ); connect(mContent->mWidth, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotWidthChanged( double ))); connect(mContent->mHeight, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotHeightChanged( double ))); diff --git a/src/gvcore/printdialogpagebase.ui b/src/gvcore/printdialogpagebase.ui index 543877c..6ae7696 100644 --- a/src/gvcore/printdialogpagebase.ui +++ b/src/gvcore/printdialogpagebase.ui @@ -24,7 +24,7 @@ - tqlayout2 + layout2 @@ -170,7 +170,7 @@ - tqlayout4 + layout4 @@ -236,7 +236,7 @@ - tqlayout4 + layout4 diff --git a/src/gvcore/thumbnaildetailsdialogbase.ui b/src/gvcore/thumbnaildetailsdialogbase.ui index e9ef011..ae03c98 100644 --- a/src/gvcore/thumbnaildetailsdialogbase.ui +++ b/src/gvcore/thumbnaildetailsdialogbase.ui @@ -29,7 +29,7 @@ - tqlayout6 + layout6 -- cgit v1.2.1