From d0bdd0d7a768f9935b521f3bd12a4cd72739b96f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:08:43 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/app/bookmarkdialogbase.ui | 4 ++-- src/app/bookmarkviewcontroller.cpp | 2 +- src/app/configdialog.cpp | 2 +- src/app/configfileoperationspage.ui | 2 +- src/app/configfullscreenpage.ui | 4 ++-- src/app/configimagelistpage.ui | 8 ++++---- src/app/configimageviewpage.ui | 4 ++-- src/app/configmiscpage.ui | 8 ++++---- src/app/configslideshowpage.ui | 2 +- src/app/mainwindow.cpp | 4 ++-- src/app/truncatedtextlabel.h | 8 ++++---- 11 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/app') diff --git a/src/app/bookmarkdialogbase.ui b/src/app/bookmarkdialogbase.ui index d4db944..08ccea2 100644 --- a/src/app/bookmarkdialogbase.ui +++ b/src/app/bookmarkdialogbase.ui @@ -20,7 +20,7 @@ 0 - + 400 0 @@ -88,7 +88,7 @@ Expanding - + 383 16 diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp index b40f70e..68ee9f0 100644 --- a/src/app/bookmarkviewcontroller.cpp +++ b/src/app/bookmarkviewcontroller.cpp @@ -98,7 +98,7 @@ public: if ( !item) return; if (item->mBookmark.isGroup()) return; - TQRect rect=mListView->tqitemRect(item); + TQRect rect=mListView->itemRect(item); tip(rect, item->mBookmark.url().prettyURL()); }; diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp index 0fb33df..d274188 100644 --- a/src/app/configdialog.cpp +++ b/src/app/configdialog.cpp @@ -289,7 +289,7 @@ void ConfigDialog::emptyCache() { KURL url; url.setPath(dir); - if (KIO::NetAccess::del(url, tqtopLevelWidget()) ) { + if (KIO::NetAccess::del(url, topLevelWidget()) ) { KMessageBox::information( this,i18n("Cache emptied.") ); } } diff --git a/src/app/configfileoperationspage.ui b/src/app/configfileoperationspage.ui index 78ac6d3..451a030 100644 --- a/src/app/configfileoperationspage.ui +++ b/src/app/configfileoperationspage.ui @@ -93,7 +93,7 @@ Fixed - + 21 16 diff --git a/src/app/configfullscreenpage.ui b/src/app/configfullscreenpage.ui index e7da709..855869f 100644 --- a/src/app/configfullscreenpage.ui +++ b/src/app/configfullscreenpage.ui @@ -43,7 +43,7 @@ Fixed - + 21 16 @@ -131,7 +131,7 @@ You can use the following keywords to format the On Screen Display: Expanding - + 21 18 diff --git a/src/app/configimagelistpage.ui b/src/app/configimagelistpage.ui index 6670dbd..e2fb15b 100644 --- a/src/app/configimagelistpage.ui +++ b/src/app/configimagelistpage.ui @@ -40,7 +40,7 @@ Fixed - + 21 16 @@ -131,7 +131,7 @@ Expanding - + 20 0 @@ -166,7 +166,7 @@ Fixed - + 21 20 @@ -217,7 +217,7 @@ Fixed - + 21 16 diff --git a/src/app/configimageviewpage.ui b/src/app/configimageviewpage.ui index a99b945..32fb346 100644 --- a/src/app/configimageviewpage.ui +++ b/src/app/configimageviewpage.ui @@ -56,7 +56,7 @@ Expanding - + 181 21 @@ -238,7 +238,7 @@ Use this option if your computer is not very fast. Fixed - + 21 16 diff --git a/src/app/configmiscpage.ui b/src/app/configmiscpage.ui index 9b69c2d..9df8e96 100644 --- a/src/app/configmiscpage.ui +++ b/src/app/configmiscpage.ui @@ -92,7 +92,7 @@ Fixed - + 20 24 @@ -120,7 +120,7 @@ Fixed - + 20 24 @@ -153,7 +153,7 @@ Fixed - + 11 20 @@ -191,7 +191,7 @@ Expanding - + 21 41 diff --git a/src/app/configslideshowpage.ui b/src/app/configslideshowpage.ui index 62ab807..ccf0c15 100644 --- a/src/app/configslideshowpage.ui +++ b/src/app/configslideshowpage.ui @@ -88,7 +88,7 @@ When this option is enabled, the slideshow will stop on the last image of the fo Expanding - + 180 20 diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 1464a09..f9acc9b 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -871,7 +871,7 @@ void MainWindow::createWidgets() { tqlayout->setAutoAdd(true); mCentralStack->addWidget(mViewModeWidget); - // tqStatus bar + // Status bar mSBDetailLabel=new TQLabel("", statusBar()); mSBHintLabel=new TruncatedTextLabel(statusBar()); @@ -1216,7 +1216,7 @@ void MainWindow::createLocationToolBar() { // Do not let the combobox get wider than available space, as this would // hide the toolbuttons after it - mURLEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + mURLEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); // Avoid stealing focus mURLEdit->setFocusPolicy(TQ_ClickFocus); diff --git a/src/app/truncatedtextlabel.h b/src/app/truncatedtextlabel.h index 8e126ed..2351890 100644 --- a/src/app/truncatedtextlabel.h +++ b/src/app/truncatedtextlabel.h @@ -39,14 +39,14 @@ public: TruncatedTextLabel(TQWidget* parent) : TQLabel(parent) {} - TQSize tqminimumSizeHint() const { - TQSize size=TQLabel::tqminimumSizeHint(); + TQSize minimumSizeHint() const { + TQSize size=TQLabel::minimumSizeHint(); size.setWidth(-1); return size; } - TQSize tqsizeHint() const { - return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); + TQSize sizeHint() const { + return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); } void setText(const TQString& text) { -- cgit v1.2.1